3 // TortoiseSVN - a Windows shell extension for easy version control
\r
5 // Copyright (C) 2003-2008 - TortoiseSVN
\r
7 // This program is free software; you can redistribute it and/or
\r
8 // modify it under the terms of the GNU General Public License
\r
9 // as published by the Free Software Foundation; either version 2
\r
10 // of the License, or (at your option) any later version.
\r
12 // This program is distributed in the hope that it will be useful,
\r
13 // but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
14 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
\r
15 // GNU General Public License for more details.
\r
17 // You should have received a copy of the GNU General Public License
\r
18 // along with this program; if not, write to the Free Software Foundation,
\r
19 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\r
23 #include "GitStatusListCtrl.h"
\r
24 #include "resource.h"
\r
25 #include "..\\TortoiseShell\resource.h"
\r
26 #include "MessageBox.h"
\r
27 #include "MyMemDC.h"
\r
28 #include "UnicodeUtils.h"
\r
29 #include "AppUtils.h"
\r
30 #include "PathUtils.h"
\r
31 #include "TempFile.h"
\r
32 #include "StringUtils.h"
\r
33 #include "DirFileEnum.h"
\r
34 #include "GitConfig.h"
\r
35 //#include "SVNProperties.h"
\r
37 #include "GitDiff.h"
\r
38 //#include "LogDlg.h"
\r
39 //#include "SVNProgressDlg.h"
\r
40 #include "SysImageList.h"
\r
41 //#include "Svnstatuslistctrl.h"
\r
42 #include "TGitPath.h"
\r
43 #include "Registry.h"
\r
44 #include "GitStatus.h"
\r
45 //#include "SVNHelpers.h"
\r
46 #include "InputDlg.h"
\r
47 #include "ShellUpdater.h"
\r
48 #include "GitAdminDir.h"
\r
49 //#include "DropFiles.h"
\r
50 #include "IconMenu.h"
\r
51 //#include "AddDlg.h"
\r
52 //#include "EditPropertiesDlg.h"
\r
53 //#include "CreateChangelistDlg.h"
\r
54 #include "XPTheme.h"
\r
55 #include "CommonResource.h"
\r
57 const UINT CGitStatusListCtrl::SVNSLNM_ITEMCOUNTCHANGED
\r
58 = ::RegisterWindowMessage(_T("GITSLNM_ITEMCOUNTCHANGED"));
\r
59 const UINT CGitStatusListCtrl::SVNSLNM_NEEDSREFRESH
\r
60 = ::RegisterWindowMessage(_T("GITSLNM_NEEDSREFRESH"));
\r
61 const UINT CGitStatusListCtrl::SVNSLNM_ADDFILE
\r
62 = ::RegisterWindowMessage(_T("GITSLNM_ADDFILE"));
\r
63 const UINT CGitStatusListCtrl::SVNSLNM_CHECKCHANGED
\r
64 = ::RegisterWindowMessage(_T("GITSLNM_CHECKCHANGED"));
\r
69 BEGIN_MESSAGE_MAP(CGitStatusListCtrl, CListCtrl)
\r
70 ON_NOTIFY(HDN_ITEMCLICKA, 0, OnHdnItemclick)
\r
71 ON_NOTIFY(HDN_ITEMCLICKW, 0, OnHdnItemclick)
\r
72 ON_NOTIFY(HDN_ENDTRACK, 0, OnColumnResized)
\r
73 ON_NOTIFY(HDN_ENDDRAG, 0, OnColumnMoved)
\r
74 ON_NOTIFY_REFLECT_EX(LVN_ITEMCHANGED, OnLvnItemchanged)
\r
76 ON_NOTIFY_REFLECT(NM_DBLCLK, OnNMDblclk)
\r
77 ON_NOTIFY_REFLECT(LVN_GETINFOTIP, OnLvnGetInfoTip)
\r
78 ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, OnNMCustomdraw)
\r
81 ON_NOTIFY_REFLECT(NM_RETURN, OnNMReturn)
\r
83 ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTW, 0, 0xFFFF, OnToolTipText)
\r
84 ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTA, 0, 0xFFFF, OnToolTipText)
\r
86 ON_NOTIFY(HDN_BEGINTRACKA, 0, &CGitStatusListCtrl::OnHdnBegintrack)
\r
87 ON_NOTIFY(HDN_BEGINTRACKW, 0, &CGitStatusListCtrl::OnHdnBegintrack)
\r
88 ON_NOTIFY(HDN_ITEMCHANGINGA, 0, &CGitStatusListCtrl::OnHdnItemchanging)
\r
89 ON_NOTIFY(HDN_ITEMCHANGINGW, 0, &CGitStatusListCtrl::OnHdnItemchanging)
\r
91 ON_NOTIFY_REFLECT(LVN_BEGINDRAG, OnBeginDrag)
\r
92 ON_NOTIFY_REFLECT(LVN_ITEMCHANGING, &CGitStatusListCtrl::OnLvnItemchanging)
\r
97 CGitStatusListCtrl::CGitStatusListCtrl() : CListCtrl()
\r
98 //, m_HeadRev(GitRev::REV_HEAD)
\r
99 , m_pbCanceled(NULL)
\r
100 , m_pStatLabel(NULL)
\r
101 , m_pSelectButton(NULL)
\r
102 , m_pConfirmButton(NULL)
\r
105 , m_bUnversionedRecurse(true)
\r
106 , m_bShowIgnores(false)
\r
107 , m_pDropTarget(NULL)
\r
108 , m_bIgnoreRemoveOnly(false)
\r
109 , m_bCheckChildrenWithParent(false)
\r
110 , m_bUnversionedLast(true)
\r
111 , m_bHasChangeLists(false)
\r
112 , m_bHasLocks(false)
\r
114 , m_bBlockUI(false)
\r
115 , m_bHasCheckboxes(false)
\r
116 , m_bCheckIfGroupsExist(true)
\r
117 , m_bFileDropsEnabled(false)
\r
118 , m_bOwnDrag(false)
\r
119 , m_dwDefaultColumns(0)
\r
120 , m_ColumnManager(this)
\r
121 , m_bAscending(false)
\r
122 , m_nSortedColumn(-1)
\r
123 , m_sNoPropValueText(MAKEINTRESOURCE(IDS_STATUSLIST_NOPROPVALUE))
\r
129 CGitStatusListCtrl::~CGitStatusListCtrl()
\r
131 // if (m_pDropTarget)
\r
132 // delete m_pDropTarget;
\r
133 ClearStatusArray();
\r
136 void CGitStatusListCtrl::ClearStatusArray()
\r
139 Locker lock(m_critSec);
\r
140 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
142 delete m_arStatusArray[i];
\r
144 m_arStatusArray.clear();
\r
148 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetListEntry(UINT_PTR index)
\r
151 if (index >= (UINT_PTR)m_arListArray.size())
\r
153 if (m_arListArray[index] >= m_arStatusArray.size())
\r
155 return m_arStatusArray[m_arListArray[index]];
\r
161 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetVisibleListEntry(const CTGitPath& path)
\r
163 int itemCount = GetItemCount();
\r
164 for (int i=0; i < itemCount; i++)
\r
166 FileEntry * entry = GetListEntry(i);
\r
167 if (entry->GetPath().IsEquivalentTo(path))
\r
174 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetListEntry(const CTGitPath& path)
\r
177 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
179 FileEntry * entry = m_arStatusArray[i];
\r
180 if (entry->GetPath().IsEquivalentTo(path))
\r
189 int CGitStatusListCtrl::GetIndex(const CTGitPath& path)
\r
191 int itemCount = GetItemCount();
\r
192 for (int i=0; i < itemCount; i++)
\r
194 FileEntry * entry = GetListEntry(i);
\r
195 if (entry->GetPath().IsEquivalentTo(path))
\r
202 void CGitStatusListCtrl::Init(DWORD dwColumns, const CString& sColumnInfoContainer, unsigned __int64 dwContextMenus /* = GitSLC_POPALL */, bool bHasCheckboxes /* = true */)
\r
204 Locker lock(m_critSec);
\r
206 m_dwDefaultColumns = dwColumns | 1;
\r
207 m_dwContextMenus = dwContextMenus;
\r
208 m_bHasCheckboxes = bHasCheckboxes;
\r
210 // set the extended style of the listcontrol
\r
211 // the style LVS_EX_FULLROWSELECT interferes with the background watermark image but it's more important to be able to select in the whole row.
\r
212 CRegDWORD regFullRowSelect(_T("Software\\TortoiseGit\\FullRowSelect"), TRUE);
\r
213 DWORD exStyle = LVS_EX_HEADERDRAGDROP | LVS_EX_DOUBLEBUFFER | LVS_EX_INFOTIP | LVS_EX_SUBITEMIMAGES;
\r
214 if (DWORD(regFullRowSelect))
\r
215 exStyle |= LVS_EX_FULLROWSELECT;
\r
216 exStyle |= (bHasCheckboxes ? LVS_EX_CHECKBOXES : 0);
\r
218 SetExtendedStyle(exStyle);
\r
221 theme.SetWindowTheme(m_hWnd, L"Explorer", NULL);
\r
223 m_nIconFolder = SYS_IMAGE_LIST().GetDirIconIndex();
\r
224 SetImageList(&SYS_IMAGE_LIST(), LVSIL_SMALL);
\r
226 m_ColumnManager.ReadSettings (m_dwDefaultColumns, sColumnInfoContainer);
\r
228 // enable file drops
\r
230 if (m_pDropTarget == NULL)
\r
232 m_pDropTarget = new CGitStatusListCtrlDropTarget(this);
\r
233 RegisterDragDrop(m_hWnd,m_pDropTarget);
\r
234 // create the supported formats:
\r
235 FORMATETC ftetc={0};
\r
236 ftetc.dwAspect = DVASPECT_CONTENT;
\r
238 ftetc.tymed = TYMED_HGLOBAL;
\r
239 ftetc.cfFormat=CF_HDROP;
\r
240 m_pDropTarget->AddSuportedFormat(ftetc);
\r
246 m_bUnversionedRecurse = !!((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\UnversionedRecurse"), TRUE));
\r
249 bool CGitStatusListCtrl::SetBackgroundImage(UINT nID)
\r
251 return CAppUtils::SetListCtrlBackgroundImage(GetSafeHwnd(), nID);
\r
254 BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList* pathList
\r
255 , bool bUpdate /* = FALSE */
\r
256 , bool bShowIgnores /* = false */
\r
258 , bool bShowUserProps /* = false */)
\r
260 Locker lock(m_critSec);
\r
261 int mask= CGitStatusListCtrl::FILELIST_MODIFY;
\r
263 mask|= CGitStatusListCtrl::FILELIST_IGNORE;
\r
265 mask|= CGitStatusListCtrl::FILELIST_UNVER;
\r
266 this->UpdateFileList(mask,bUpdate,(CTGitPathList*)pathList);
\r
271 int refetchcounter = 0;
\r
274 // force the cursor to change
\r
277 SetCursorPos(pt.x, pt.y);
\r
279 m_mapFilenameToChecked.clear();
\r
280 //m_StatusUrlList.Clear();
\r
281 bool bHasChangelists = (m_changelists.size()>1 || (m_changelists.size()>0 && !m_bHasIgnoreGroup));
\r
282 m_changelists.clear();
\r
283 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
285 FileEntry * entry = m_arStatusArray[i];
\r
286 if ( bHasChangelists && entry->checked)
\r
288 // If change lists are present, remember all checked entries
\r
289 CString path = entry->GetPath().GetGitPathString();
\r
290 m_mapFilenameToChecked[path] = true;
\r
292 if ( (entry->status==git_wc_status_unversioned || entry->status==git_wc_status_missing ) && entry->checked )
\r
294 // The user manually selected an unversioned or missing file. We remember
\r
295 // this so that the selection can be restored when refreshing.
\r
296 CString path = entry->GetPath().GetGitPathString();
\r
297 m_mapFilenameToChecked[path] = true;
\r
299 else if ( entry->status > git_wc_status_normal && !entry->checked )
\r
301 // The user manually deselected a versioned file. We remember
\r
302 // this so that the deselection can be restored when refreshing.
\r
303 CString path = entry->GetPath().GetGitPathString();
\r
304 m_mapFilenameToChecked[path] = false;
\r
308 // use a sorted path list to make sure we fetch the status of
\r
309 // parent items first, *then* the child items (if any)
\r
310 CTGitPathList sortedPathList = pathList;
\r
311 sortedPathList.SortByPathname();
\r
315 m_nTargetCount = 0;
\r
316 m_bHasExternalsFromDifferentRepos = FALSE;
\r
317 m_bHasExternals = FALSE;
\r
318 m_bHasUnversionedItems = FALSE;
\r
319 m_bHasLocks = false;
\r
320 m_bHasChangeLists = false;
\r
321 m_bShowIgnores = bShowIgnores;
\r
322 m_nSortedColumn = 0;
\r
328 // first clear possible status data left from
\r
329 // previous GetStatus() calls
\r
330 ClearStatusArray();
\r
332 m_StatusFileList = sortedPathList;
\r
334 // Since Git_client_status() returns all files, even those in
\r
335 // folders included with Git:externals we need to check if all
\r
336 // files we get here belongs to the same repository.
\r
337 // It is possible to commit changes in an external folder, as long
\r
338 // as the folder belongs to the same repository (but another path),
\r
339 // but it is not possible to commit all files if the externals are
\r
340 // from a different repository.
\r
342 // To check if all files belong to the same repository, we compare the
\r
343 // UUID's - if they're identical then the files belong to the same
\r
344 // repository and can be committed. But if they're different, then
\r
345 // tell the user to commit all changes in the external folders
\r
347 CStringA sUUID; // holds the repo UUID
\r
348 CTGitPathList arExtPaths; // list of Git:external paths
\r
354 m_nTargetCount = sortedPathList.GetCount();
\r
356 GitStatus status(m_pbCanceled);
\r
357 if(m_nTargetCount > 1 && sortedPathList.AreAllPathsFilesInOneDirectory())
\r
359 // This is a special case, where we've been given a list of files
\r
360 // all from one folder
\r
361 // We handle them by setting a status filter, then requesting the Git status of
\r
362 // all the files in the directory, filtering for the ones we're interested in
\r
363 status.SetFilter(sortedPathList);
\r
365 // if all selected entries are files, we don't do a recursive status
\r
366 // fetching. But if only one is a directory, we have to recurse.
\r
367 git_depth_t depth = git_depth_files;
\r
368 // We have set a filter. If all selected items were files or we fetch
\r
369 // the status not recursively, then we have to include
\r
370 // ignored items too - the user has selected them
\r
371 bool bShowIgnoresRight = true;
\r
372 for (int fcindex=0; fcindex<sortedPathList.GetCount(); ++fcindex)
\r
374 if (sortedPathList[fcindex].IsDirectory())
\r
376 depth = git_depth_infinity;
\r
377 bShowIgnoresRight = false;
\r
381 if(!FetchStatusForSingleTarget(config, status, sortedPathList.GetCommonDirectory(), bUpdate, sUUID, arExtPaths, true, depth, bShowIgnoresRight))
\r
388 for(int nTarget = 0; nTarget < m_nTargetCount; nTarget++)
\r
390 // check whether the path we want the status for is already fetched due to status-fetching
\r
391 // of a parent path.
\r
392 // this check is only done for file paths, because folder paths could be included already
\r
393 // but not recursively
\r
394 if (sortedPathList[nTarget].IsDirectory() || GetListEntry(sortedPathList[nTarget]) == NULL)
\r
396 if(!FetchStatusForSingleTarget(config, status, sortedPathList[nTarget], bUpdate, sUUID,
\r
397 arExtPaths, false, git_depth_infinity, bShowIgnores))
\r
405 // remove the 'helper' files of conflicted items from the list.
\r
406 // otherwise they would appear as unversioned files.
\r
407 for (INT_PTR cind = 0; cind < m_ConflictFileList.GetCount(); ++cind)
\r
409 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
411 if (m_arStatusArray[i]->GetPath().IsEquivalentTo(m_ConflictFileList[cind]))
\r
413 delete m_arStatusArray[i];
\r
414 m_arStatusArray.erase(m_arStatusArray.begin()+i);
\r
420 } while(!BuildStatistics() && (refetchcounter < 2) && (*m_pbCanceled==false));
\r
422 if (bShowUserProps)
\r
423 FetchUserProperties();
\r
425 m_ColumnManager.UpdateUserPropList (m_arStatusArray);
\r
430 SetCursorPos(pt.x, pt.y);
\r
438 // Fetch all local properties for all elements in the status array
\r
440 void CGitStatusListCtrl::FetchUserProperties()
\r
443 GitPool globalPool;
\r
445 for (size_t i = 0, count = m_arStatusArray.size(); i < count; ++i)
\r
447 // local / temp pool to hold parameters and props for a single item
\r
449 GitPool localPool ((apr_pool_t*)globalPool);
\r
451 // open working copy for this path
\r
453 const char* path = m_arStatusArray[i]->path.GetGitApiPath (localPool);
\r
455 Git_wc_adm_access_t *adm_access = NULL;
\r
456 Git_error_t * error = Git_wc_adm_probe_open3 ( &adm_access
\r
459 , FALSE // no write lock
\r
460 , 0 // lock just the directory/file itself
\r
466 // get the props and add them to the status info
\r
468 apr_hash_t* props = NULL;
\r
469 Git_error_t * error = Git_wc_prop_list ( &props
\r
475 for ( apr_hash_index_t *index
\r
476 = apr_hash_first (localPool, props)
\r
478 ; index = apr_hash_next (index))
\r
480 // extract next entry from hash
\r
482 const char* key = NULL;
\r
484 const char** val = NULL;
\r
486 apr_hash_this ( index
\r
487 , reinterpret_cast<const void**>(&key)
\r
489 , reinterpret_cast<void**>(&val));
\r
491 // decode / dispatch it
\r
493 CString name = CUnicodeUtils::GetUnicode (key);
\r
494 CString value = CUnicodeUtils::GetUnicode (*val);
\r
496 // store in property container (truncate it after ~100 chars)
\r
498 m_arStatusArray[i]->present_props[name]
\r
499 = value.Left (GitSLC_MAXUSERPROPLENGTH);
\r
502 error = Git_wc_adm_close2 (adm_access, localPool);
\r
504 Git_error_clear (error);
\r
511 // Work on a single item from the list of paths which is provided to us
\r
513 bool CGitStatusListCtrl::FetchStatusForSingleTarget(
\r
516 const CTGitPath& target,
\r
517 bool bFetchStatusFromRepository,
\r
518 CStringA& strCurrentRepositoryUUID,
\r
519 CTGitPathList& arExtPaths,
\r
526 config.GetDefaultIgnores();
\r
528 CTGitPath workingTarget(target);
\r
530 git_wc_status2_t * s;
\r
532 s = status.GetFirstFileStatus(workingTarget, GitPath, bFetchStatusFromRepository, depth, bShowIgnores);
\r
534 m_HeadRev = SVNRev(status.headrev);
\r
537 Git_wc_status_kind wcFileStatus = GitStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
539 // This one fixes a problem with externals:
\r
540 // If a strLine is a file, Git:externals and its parent directory
\r
541 // will also be returned by GetXXXFileStatus. Hence, we skip all
\r
542 // status info until we find the one matching workingTarget.
\r
543 if (!workingTarget.IsDirectory())
\r
545 if (!workingTarget.IsEquivalentTo(GitPath))
\r
549 s = status.GetNextFileStatus(GitPath);
\r
550 if(workingTarget.IsEquivalentTo(GitPath))
\r
557 m_sLastError = status.GetLastErrorMsg();
\r
560 // Now, set working target to be the base folder of this item
\r
561 workingTarget = workingTarget.GetDirectory();
\r
564 bool bEntryFromDifferentRepo = false;
\r
565 // Is this a versioned item with an associated repos UUID?
\r
566 if ((s->entry)&&(s->entry->uuid))
\r
568 // Have we seen a repos UUID yet?
\r
569 if (strCurrentRepositoryUUID.IsEmpty())
\r
571 // This is the first repos UUID we've seen - record it
\r
572 strCurrentRepositoryUUID = s->entry->uuid;
\r
573 m_sUUID = strCurrentRepositoryUUID;
\r
577 if (strCurrentRepositoryUUID.Compare(s->entry->uuid)!=0)
\r
579 // This item comes from a different repository than our main one
\r
580 m_bHasExternalsFromDifferentRepos = TRUE;
\r
581 bEntryFromDifferentRepo = true;
\r
582 if (s->entry->kind == Git_node_dir)
\r
583 arExtPaths.AddPath(workingTarget);
\r
587 else if (strCurrentRepositoryUUID.IsEmpty() && (s->text_status == Git_wc_status_added))
\r
589 // An added entry doesn't have an UUID assigned to it yet.
\r
590 // So we fetch the status of the parent directory instead and
\r
591 // check if that one has an UUID assigned to it.
\r
592 Git_wc_status2_t * sparent;
\r
593 CTGitPath path = workingTarget;
\r
596 CTGitPath GitParentPath;
\r
597 GitStatus tempstatus;
\r
598 sparent = tempstatus.GetFirstFileStatus(path.GetContainingDirectory(), GitParentPath, false, Git_depth_empty, false);
\r
599 path = GitParentPath;
\r
600 } while ( (sparent) && (sparent->entry) && (!sparent->entry->uuid) && (sparent->text_status==Git_wc_status_added) );
\r
601 if (sparent && sparent->entry && sparent->entry->uuid)
\r
603 strCurrentRepositoryUUID = sparent->entry->uuid;
\r
604 m_sUUID = strCurrentRepositoryUUID;
\r
608 if ((wcFileStatus == Git_wc_status_unversioned)&& GitPath.IsDirectory())
\r
610 // check if the unversioned folder is maybe versioned. This
\r
611 // could happen with nested layouts
\r
612 Git_wc_status_kind st = GitStatus::GetAllStatus(workingTarget);
\r
613 if ((st != Git_wc_status_unversioned)&&(st != Git_wc_status_none))
\r
615 return true; // ignore nested layouts
\r
618 if (status.IsExternal(GitPath))
\r
620 m_bHasExternals = TRUE;
\r
623 AddNewFileEntry(s, GitPath, workingTarget, true, m_bHasExternals, bEntryFromDifferentRepo);
\r
625 if (((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none)||((wcFileStatus == Git_wc_status_ignored)&&(m_bShowIgnores))) && GitPath.IsDirectory())
\r
627 // we have an unversioned folder -> get all files in it recursively!
\r
628 AddUnversionedFolder(GitPath, workingTarget.GetContainingDirectory(), &config);
\r
631 // for folders, get all statuses inside it too
\r
632 if(workingTarget.IsDirectory())
\r
634 ReadRemainingItemsStatus(status, workingTarget, strCurrentRepositoryUUID, arExtPaths, &config, bAllDirect);
\r
640 m_sLastError = status.GetLastErrorMsg();
\r
647 const CGitStatusListCtrl::FileEntry*
\r
648 CGitStatusListCtrl::AddNewFileEntry(
\r
649 const git_wc_status2_t* pGitStatus, // The return from the Git GetStatus functions
\r
650 const CTGitPath& path, // The path of the item we're adding
\r
651 const CTGitPath& basePath, // The base directory for this status build
\r
652 bool bDirectItem, // Was this item the first found by GetFirstFileStatus or by a subsequent GetNextFileStatus call
\r
653 bool bInExternal, // Are we in an 'external' folder
\r
654 bool bEntryfromDifferentRepo // if the entry is from a different repository
\r
657 FileEntry * entry = new FileEntry();
\r
660 entry->path = path;
\r
661 entry->basepath = basePath;
\r
662 entry->status = GitStatus::GetMoreImportant(pGitStatus->text_status, pGitStatus->prop_status);
\r
663 entry->textstatus = pGitStatus->text_status;
\r
664 entry->propstatus = pGitStatus->prop_status;
\r
665 // entry->remotestatus = GitStatus::GetMoreImportant(pGitStatus->repos_text_status, pGitStatus->repos_prop_status);
\r
666 // entry->remotetextstatus = pGitStatus->repos_text_status;
\r
667 // entry->remotepropstatus = pGitStatus->repos_prop_status;
\r
668 entry->inexternal = bInExternal;
\r
669 entry->differentrepo = bEntryfromDifferentRepo;
\r
670 entry->direct = bDirectItem;
\r
671 // entry->copied = !!pGitStatus->copied;
\r
672 // entry->switched = !!pGitStatus->switched;
\r
674 entry->last_commit_date = pGitStatus->ood_last_cmt_date;
\r
675 if ((entry->last_commit_date == NULL)&&(pGitStatus->entry))
\r
676 entry->last_commit_date = pGitStatus->entry->cmt_date;
\r
677 entry->remoterev = pGitStatus->ood_last_cmt_rev;
\r
678 if (pGitStatus->entry)
\r
679 entry->last_commit_rev = pGitStatus->entry->cmt_rev;
\r
680 if (pGitStatus->ood_last_cmt_author)
\r
681 entry->last_commit_author = CUnicodeUtils::GetUnicode(pGitStatus->ood_last_cmt_author);
\r
682 if ((entry->last_commit_author.IsEmpty())&&(pGitStatus->entry)&&(pGitStatus->entry->cmt_author))
\r
683 entry->last_commit_author = CUnicodeUtils::GetUnicode(pGitStatus->entry->cmt_author);
\r
685 if (pGitStatus->entry)
\r
686 entry->isConflicted = (pGitStatus->entry->conflict_wrk && PathFileExists(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_wrk))) ? true : false;
\r
688 if ((entry->status == Git_wc_status_conflicted)||(entry->isConflicted))
\r
690 entry->isConflicted = true;
\r
691 if (pGitStatus->entry)
\r
694 if (pGitStatus->entry->conflict_wrk)
\r
696 cpath = path.GetDirectory();
\r
697 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_wrk));
\r
698 m_ConflictFileList.AddPath(cpath);
\r
700 if (pGitStatus->entry->conflict_old)
\r
702 cpath = path.GetDirectory();
\r
703 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_old));
\r
704 m_ConflictFileList.AddPath(cpath);
\r
706 if (pGitStatus->entry->conflict_new)
\r
708 cpath = path.GetDirectory();
\r
709 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_new));
\r
710 m_ConflictFileList.AddPath(cpath);
\r
712 if (pGitStatus->entry->prejfile)
\r
714 cpath = path.GetDirectory();
\r
715 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->prejfile));
\r
716 m_ConflictFileList.AddPath(cpath);
\r
721 if (pGitStatus->entry)
\r
723 entry->isfolder = (pGitStatus->entry->kind == Git_node_dir);
\r
724 entry->Revision = pGitStatus->entry->revision;
\r
725 entry->keeplocal = !!pGitStatus->entry->keep_local;
\r
726 entry->working_size = pGitStatus->entry->working_size;
\r
727 entry->depth = pGitStatus->entry->depth;
\r
729 if (pGitStatus->entry->url)
\r
731 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(pGitStatus->entry->url));
\r
733 if (pGitStatus->entry->copyfrom_url)
\r
735 entry->copyfrom_url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(pGitStatus->entry->copyfrom_url));
\r
736 entry->copyfrom_rev = pGitStatus->entry->copyfrom_rev;
\r
739 entry->copyfrom_rev = 0;
\r
743 if (m_sURL.IsEmpty())
\r
744 m_sURL = entry->url;
\r
746 m_sURL.LoadString(IDS_STATUSLIST_MULTIPLETARGETS);
\r
747 m_StatusUrlList.AddPath(CTGitPath(entry->url));
\r
749 if (pGitStatus->entry->lock_owner)
\r
750 entry->lock_owner = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_owner);
\r
751 if (pGitStatus->entry->lock_token)
\r
753 entry->lock_token = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_token);
\r
754 m_bHasLocks = true;
\r
756 if (pGitStatus->entry->lock_comment)
\r
757 entry->lock_comment = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_comment);
\r
759 if (pGitStatus->entry->present_props)
\r
761 entry->present_props = pGitStatus->entry->present_props;
\r
764 if (pGitStatus->entry->changelist)
\r
766 entry->changelist = CUnicodeUtils::GetUnicode(pGitStatus->entry->changelist);
\r
767 m_changelists[entry->changelist] = -1;
\r
768 m_bHasChangeLists = true;
\r
770 entry->needslock = (pGitStatus->entry->present_props && (strstr(pGitStatus->entry->present_props, "Git:needs-lock")!=NULL) );
\r
774 if (pGitStatus->ood_kind == Git_node_none)
\r
775 entry->isfolder = path.IsDirectory();
\r
777 entry->isfolder = (pGitStatus->ood_kind == Git_node_dir);
\r
779 if (pGitStatus->repos_lock)
\r
781 if (pGitStatus->repos_lock->owner)
\r
782 entry->lock_remoteowner = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->owner);
\r
783 if (pGitStatus->repos_lock->token)
\r
784 entry->lock_remotetoken = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->token);
\r
785 if (pGitStatus->repos_lock->comment)
\r
786 entry->lock_comment = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->comment);
\r
789 // Pass ownership of the entry to the array
\r
790 m_arStatusArray.push_back(entry);
\r
796 void CGitStatusListCtrl::AddUnversionedFolder(const CTGitPath& folderName,
\r
797 const CTGitPath& basePath,
\r
798 GitConfig * config)
\r
801 if (!m_bUnversionedRecurse)
\r
803 CSimpleFileFind filefinder(folderName.GetWinPathString());
\r
805 CTGitPath filename;
\r
806 m_bHasUnversionedItems = TRUE;
\r
807 while (filefinder.FindNextFileNoDots())
\r
809 filename.SetFromWin(filefinder.GetFilePath(), filefinder.IsDirectory());
\r
811 bool bMatchIgnore = !!config->MatchIgnorePattern(filename.GetFileOrDirectoryName());
\r
812 bMatchIgnore = bMatchIgnore || config->MatchIgnorePattern(filename.GetGitPathString());
\r
813 if (((bMatchIgnore)&&(m_bShowIgnores))||(!bMatchIgnore))
\r
815 FileEntry * entry = new FileEntry();
\r
816 entry->path = filename;
\r
817 entry->basepath = basePath;
\r
818 entry->inunversionedfolder = true;
\r
819 entry->isfolder = filefinder.IsDirectory();
\r
821 m_arStatusArray.push_back(entry);
\r
822 if (entry->isfolder)
\r
824 if (!g_GitAdminDir.HasAdminDir(entry->path.GetWinPathString(), true))
\r
825 AddUnversionedFolder(entry->path, basePath, config);
\r
833 void CGitStatusListCtrl::ReadRemainingItemsStatus(GitStatus& status, const CTGitPath& basePath,
\r
834 CStringA& strCurrentRepositoryUUID,
\r
835 CTGitPathList& arExtPaths, GitConfig * config, bool bAllDirect)
\r
838 git_wc_status2_t * s;
\r
840 CTGitPath lastexternalpath;
\r
842 while ((s = status.GetNextFileStatus(GitPath)) != NULL)
\r
844 Git_wc_status_kind wcFileStatus = GitStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
845 if ((wcFileStatus == Git_wc_status_unversioned) && (GitPath.IsDirectory()))
\r
847 // check if the unversioned folder is maybe versioned. This
\r
848 // could happen with nested layouts
\r
849 Git_wc_status_kind st = GitStatus::GetAllStatus(GitPath);
\r
850 if ((st != Git_wc_status_unversioned)&&(st != Git_wc_status_none))
\r
852 FileEntry * entry = new FileEntry();
\r
853 entry->path = GitPath;
\r
854 entry->basepath = basePath;
\r
855 entry->inunversionedfolder = true;
\r
856 entry->isfolder = true;
\r
857 entry->isNested = true;
\r
858 m_arStatusArray.push_back(entry);
\r
862 bool bDirectoryIsExternal = false;
\r
863 bool bEntryfromDifferentRepo = false;
\r
866 if (s->entry->uuid)
\r
868 if (strCurrentRepositoryUUID.IsEmpty())
\r
869 strCurrentRepositoryUUID = s->entry->uuid;
\r
872 if (strCurrentRepositoryUUID.Compare(s->entry->uuid)!=0)
\r
874 bEntryfromDifferentRepo = true;
\r
875 if (GitStatus::IsImportant(wcFileStatus))
\r
876 m_bHasExternalsFromDifferentRepos = TRUE;
\r
877 if (s->entry->kind == Git_node_dir)
\r
879 if ((lastexternalpath.IsEmpty())||(!lastexternalpath.IsAncestorOf(GitPath)))
\r
881 arExtPaths.AddPath(GitPath);
\r
882 lastexternalpath = GitPath;
\r
890 // we don't have an UUID - maybe an added file/folder
\r
891 if (!strCurrentRepositoryUUID.IsEmpty())
\r
893 if ((!lastexternalpath.IsEmpty())&&
\r
894 (lastexternalpath.IsAncestorOf(GitPath)))
\r
896 bEntryfromDifferentRepo = true;
\r
897 m_bHasExternalsFromDifferentRepos = TRUE;
\r
904 // if unversioned items lie around in external
\r
905 // directories from different repos, we have to mark them
\r
907 if (!strCurrentRepositoryUUID.IsEmpty())
\r
909 if ((!lastexternalpath.IsEmpty())&&
\r
910 (lastexternalpath.IsAncestorOf(GitPath)))
\r
912 bEntryfromDifferentRepo = true;
\r
916 if (status.IsExternal(GitPath))
\r
918 arExtPaths.AddPath(GitPath);
\r
919 m_bHasExternals = TRUE;
\r
921 if ((!bEntryfromDifferentRepo)&&(status.IsInExternal(GitPath)))
\r
923 // if the externals are inside an unversioned folder (this happens if
\r
924 // the externals are specified with e.g. "ext\folder url" instead of just
\r
925 // "folder url"), then a commit won't succeed.
\r
926 // therefore, we treat those as if the externals come from a different
\r
928 CTGitPath extpath = GitPath;
\r
929 while (basePath.IsAncestorOf(extpath))
\r
931 if (!extpath.HasAdminDir())
\r
933 bEntryfromDifferentRepo = true;
\r
936 extpath = extpath.GetContainingDirectory();
\r
939 // Do we have any external paths?
\r
940 if(arExtPaths.GetCount() > 0)
\r
942 // If do have external paths, we need to check if the current item belongs
\r
944 for (int ix=0; ix<arExtPaths.GetCount(); ix++)
\r
946 if (arExtPaths[ix].IsAncestorOf(GitPath))
\r
948 bDirectoryIsExternal = true;
\r
954 if ((wcFileStatus == Git_wc_status_unversioned)&&(!bDirectoryIsExternal))
\r
955 m_bHasUnversionedItems = TRUE;
\r
957 const FileEntry* entry = AddNewFileEntry(s, GitPath, basePath, bAllDirect, bDirectoryIsExternal, bEntryfromDifferentRepo);
\r
959 bool bMatchIgnore = !!config->MatchIgnorePattern(entry->path.GetFileOrDirectoryName());
\r
960 bMatchIgnore = bMatchIgnore || config->MatchIgnorePattern(entry->path.GetGitPathString());
\r
961 if ((((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none))&&(!bMatchIgnore))||
\r
962 ((wcFileStatus == Git_wc_status_ignored)&&(m_bShowIgnores))||
\r
963 (((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none))&&(bMatchIgnore)&&(m_bShowIgnores)))
\r
965 if (entry->isfolder)
\r
967 // we have an unversioned folder -> get all files in it recursively!
\r
968 AddUnversionedFolder(GitPath, basePath, config);
\r
971 } // while ((s = status.GetNextFileStatus(GitPath)) != NULL)
\r
975 // Get the show-flags bitmap value which corresponds to a particular Git status
\r
976 DWORD CGitStatusListCtrl::GetShowFlagsFromGitStatus(git_wc_status_kind status)
\r
980 case git_wc_status_none:
\r
981 case git_wc_status_unversioned:
\r
982 return SVNSLC_SHOWUNVERSIONED;
\r
983 case git_wc_status_ignored:
\r
984 if (!m_bShowIgnores)
\r
985 return SVNSLC_SHOWDIRECTS;
\r
986 return SVNSLC_SHOWDIRECTS|SVNSLC_SHOWIGNORED;
\r
987 case git_wc_status_incomplete:
\r
988 return SVNSLC_SHOWINCOMPLETE;
\r
989 case git_wc_status_normal:
\r
990 return SVNSLC_SHOWNORMAL;
\r
991 case git_wc_status_external:
\r
992 return SVNSLC_SHOWEXTERNAL;
\r
993 case git_wc_status_added:
\r
994 return SVNSLC_SHOWADDED;
\r
995 case git_wc_status_missing:
\r
996 return SVNSLC_SHOWMISSING;
\r
997 case git_wc_status_deleted:
\r
998 return SVNSLC_SHOWREMOVED;
\r
999 case git_wc_status_replaced:
\r
1000 return SVNSLC_SHOWREPLACED;
\r
1001 case git_wc_status_modified:
\r
1002 return SVNSLC_SHOWMODIFIED;
\r
1003 case git_wc_status_merged:
\r
1004 return SVNSLC_SHOWMERGED;
\r
1005 case git_wc_status_conflicted:
\r
1006 return SVNSLC_SHOWCONFLICTED;
\r
1007 case git_wc_status_obstructed:
\r
1008 return SVNSLC_SHOWOBSTRUCTED;
\r
1010 // we should NEVER get here!
\r
1017 void CGitStatusListCtrl::Show(DWORD dwShow, DWORD dwCheck /*=0*/, bool bShowFolders /* = true */,BOOL UpdateStatusList)
\r
1019 CWinApp * pApp = AfxGetApp();
\r
1021 pApp->DoWaitCursor(1);
\r
1023 Locker lock(m_critSec);
\r
1024 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
1026 //SetItemCount(listIndex);
\r
1032 if(UpdateStatusList)
\r
1034 m_arStatusArray.clear();
\r
1035 for(int i=0;i<this->m_StatusFileList.GetCount();i++)
\r
1037 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
\r
1040 for(int i=0;i<this->m_UnRevFileList.GetCount();i++)
\r
1042 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
\r
1045 for(int i=0;i<this->m_IgnoreFileList.GetCount();i++)
\r
1047 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
\r
1051 for(int i=0;i<this->m_arStatusArray.size();i++)
\r
1053 //set default checkbox status
\r
1054 if(((CTGitPath*)m_arStatusArray[i])->m_Action & dwCheck)
\r
1055 ((CTGitPath*)m_arStatusArray[i])->m_Checked=true;
\r
1057 if(((CTGitPath*)m_arStatusArray[i])->m_Action & dwShow)
\r
1059 AddEntry((CTGitPath*)m_arStatusArray[i],langID,index);
\r
1064 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1065 for (int col = 0; col <= maxcol; col++)
\r
1066 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1069 GetStatisticsString();
\r
1071 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1072 HDITEM HeaderItem = {0};
\r
1073 HeaderItem.mask = HDI_FORMAT;
\r
1074 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1076 pHeader->GetItem(i, &HeaderItem);
\r
1077 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1078 pHeader->SetItem(i, &HeaderItem);
\r
1080 if (m_nSortedColumn)
\r
1082 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1083 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1084 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1088 if (nSelectedEntry)
\r
1090 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1091 EnsureVisible(nSelectedEntry, false);
\r
1095 // Restore the item at the top of the list.
\r
1096 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1098 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1106 pApp->DoWaitCursor(-1);
\r
1110 m_dwShow = dwShow;
\r
1114 CWinApp * pApp = AfxGetApp();
\r
1116 pApp->DoWaitCursor(1);
\r
1118 m_bShowFolders = bShowFolders;
\r
1120 int nTopIndex = GetTopIndex();
\r
1121 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
\r
1122 int nSelectedEntry = 0;
\r
1123 if (posSelectedEntry)
\r
1124 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
\r
1130 m_arListArray.clear();
\r
1132 m_arListArray.reserve(m_arStatusArray.size());
\r
1133 SetItemCount (static_cast<int>(m_arStatusArray.size()));
\r
1135 int listIndex = 0;
\r
1136 for (size_t i=0; i < m_arStatusArray.size(); ++i)
\r
1138 FileEntry * entry = m_arStatusArray[i];
\r
1139 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
\r
1141 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
\r
1143 if (entry->IsFolder() && (!bShowFolders))
\r
1144 continue; // don't show folders if they're not wanted.
\r
1147 git_wc_status_kind status = GitStatus::GetMoreImportant(entry->status, entry->remotestatus);
\r
1148 DWORD showFlags = GetShowFlagsFromGitStatus(status);
\r
1149 if (entry->IsLocked())
\r
1150 showFlags |= SVNSLC_SHOWLOCKS;
\r
1151 if (entry->switched)
\r
1152 showFlags |= SVNSLC_SHOWSWITCHED;
\r
1153 if (!entry->changelist.IsEmpty())
\r
1154 showFlags |= SVNSLC_SHOWINCHANGELIST;
\r
1156 bool bAllowCheck = ((entry->changelist.Compare(SVNSLC_IGNORECHANGELIST) != 0)
\r
1157 && (m_bCheckIfGroupsExist || (m_changelists.size()==0 || (m_changelists.size()==1 && m_bHasIgnoreGroup))));
\r
1159 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
\r
1161 if (status != Git_wc_status_ignored || (entry->direct) || (dwShow & GitSLC_SHOWIGNORED))
\r
1163 if ((!entry->IsFolder()) && (status == Git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
\r
1165 if (PathFileExists(entry->GetPath().GetWinPath()))
\r
1167 m_arListArray.push_back(i);
\r
1168 if ((dwCheck & SVNSLC_SHOWREMOVEDANDPRESENT)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1171 entry->checked = true;
\r
1173 AddEntry(entry, langID, listIndex++);
\r
1176 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
\r
1178 m_arListArray.push_back(i);
\r
1179 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1182 entry->checked = true;
\r
1184 AddEntry(entry, langID, listIndex++);
\r
1186 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
\r
1188 m_arListArray.push_back(i);
\r
1189 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1192 entry->checked = true;
\r
1194 AddEntry(entry, langID, listIndex++);
\r
1200 SetItemCount(listIndex);
\r
1202 m_ColumnManager.UpdateRelevance (m_arStatusArray, m_arListArray);
\r
1204 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1205 for (int col = 0; col <= maxcol; col++)
\r
1206 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1209 GetStatisticsString();
\r
1211 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1212 HDITEM HeaderItem = {0};
\r
1213 HeaderItem.mask = HDI_FORMAT;
\r
1214 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1216 pHeader->GetItem(i, &HeaderItem);
\r
1217 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1218 pHeader->SetItem(i, &HeaderItem);
\r
1220 if (m_nSortedColumn)
\r
1222 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1223 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1224 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1227 if (nSelectedEntry)
\r
1229 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1230 EnsureVisible(nSelectedEntry, false);
\r
1234 // Restore the item at the top of the list.
\r
1235 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1237 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1245 pApp->DoWaitCursor(-1);
\r
1247 m_bEmpty = (GetItemCount() == 0);
\r
1253 void CGitStatusListCtrl::Show(DWORD dwShow, const CTGitPathList& checkedList, bool bShowFolders /* = true */)
\r
1258 Locker lock(m_critSec);
\r
1259 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
1261 CWinApp * pApp = AfxGetApp();
\r
1263 pApp->DoWaitCursor(1);
\r
1264 m_dwShow = dwShow;
\r
1265 m_bShowFolders = bShowFolders;
\r
1267 int nTopIndex = GetTopIndex();
\r
1268 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
\r
1269 int nSelectedEntry = 0;
\r
1270 if (posSelectedEntry)
\r
1271 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
\r
1277 m_arListArray.clear();
\r
1279 m_arListArray.reserve(m_arStatusArray.size());
\r
1280 SetItemCount (static_cast<int>(m_arStatusArray.size()));
\r
1282 int listIndex = 0;
\r
1283 for (size_t i=0; i < m_arStatusArray.size(); ++i)
\r
1285 FileEntry * entry = m_arStatusArray[i];
\r
1286 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
\r
1288 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
\r
1290 if (entry->IsFolder() && (!bShowFolders))
\r
1291 continue; // don't show folders if they're not wanted.
\r
1293 git_wc_status_kind status = SVNStatus::GetMoreImportant(entry->status, entry->remotestatus);
\r
1294 DWORD showFlags = GetShowFlagsFromSVNStatus(status);
\r
1295 if (entry->IsLocked())
\r
1296 showFlags |= SVNSLC_SHOWLOCKS;
\r
1297 if (!entry->changelist.IsEmpty())
\r
1298 showFlags |= SVNSLC_SHOWINCHANGELIST;
\r
1300 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
\r
1301 if (status != git_wc_status_ignored || (entry->direct) || (dwShow & SVNSLC_SHOWIGNORED))
\r
1303 for (int npath = 0; npath < checkedList.GetCount(); ++npath)
\r
1305 if (entry->GetPath().IsEquivalentTo(checkedList[npath]))
\r
1307 entry->checked = true;
\r
1311 if ((!entry->IsFolder()) && (status == git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
\r
1313 if (PathFileExists(entry->GetPath().GetWinPath()))
\r
1315 m_arListArray.push_back(i);
\r
1316 AddEntry(entry, langID, listIndex++);
\r
1319 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
\r
1321 m_arListArray.push_back(i);
\r
1322 AddEntry(entry, langID, listIndex++);
\r
1324 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
\r
1326 m_arListArray.push_back(i);
\r
1327 AddEntry(entry, langID, listIndex++);
\r
1329 else if (entry->switched)
\r
1331 m_arListArray.push_back(i);
\r
1332 AddEntry(entry, langID, listIndex++);
\r
1338 SetItemCount(listIndex);
\r
1340 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1341 for (int col = 0; col <= maxcol; col++)
\r
1342 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1345 GetStatisticsString();
\r
1347 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1348 HDITEM HeaderItem = {0};
\r
1349 HeaderItem.mask = HDI_FORMAT;
\r
1350 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1352 pHeader->GetItem(i, &HeaderItem);
\r
1353 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1354 pHeader->SetItem(i, &HeaderItem);
\r
1356 if (m_nSortedColumn)
\r
1358 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1359 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1360 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1363 if (nSelectedEntry)
\r
1365 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1366 EnsureVisible(nSelectedEntry, false);
\r
1370 // Restore the item at the top of the list.
\r
1371 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1373 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1381 pApp->DoWaitCursor(-1);
\r
1383 m_bEmpty = (GetItemCount() == 0);
\r
1388 int CGitStatusListCtrl::GetColumnIndex(int mask)
\r
1398 void CGitStatusListCtrl::AddEntry(CTGitPath * GitPath, WORD langID, int listIndex)
\r
1400 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
1401 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
1403 CString path = GitPath->GetGitPathString();
\r
1407 int index = listIndex;
\r
1409 CString entryname = GitPath->GetGitPathString();
\r
1411 if (GitPath->IsDirectory())
\r
1412 icon_idx = m_nIconFolder;
\r
1415 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(*GitPath);
\r
1419 rename.Format(_T("(from %s)"),GitPath->GetGitOldPathString());
\r
1420 if(GitPath->m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY))
\r
1421 entryname+=rename;
\r
1423 InsertItem(index, entryname, icon_idx);
\r
1425 this->SetItemData(index, (DWORD_PTR)GitPath);
\r
1426 // SVNSLC_COLFILENAME
\r
1427 SetItemText(index, nCol++, GitPath->GetFileOrDirectoryName());
\r
1429 SetItemText(index, nCol++, GitPath->GetFileExtension());
\r
1430 // SVNSLC_COLSTATUS
\r
1431 SetItemText(index, nCol++, GitPath->GetActionName());
\r
1433 SetItemText(index, GetColumnIndex(SVNSLC_COLADD),GitPath->m_StatAdd);
\r
1434 SetItemText(index, GetColumnIndex(SVNSLC_COLDEL),GitPath->m_StatDel);
\r
1437 SetCheck(index, GitPath->m_Checked);
\r
1438 if (GitPath->m_Checked)
\r
1442 if( GitPath->m_Action & CTGitPath::LOGACTIONS_IGNORE)
\r
1443 SetItemGroup(index, 2);
\r
1444 else if( GitPath->m_Action & CTGitPath::LOGACTIONS_UNVER)
\r
1445 SetItemGroup(index,1);
\r
1447 SetItemGroup(index,0);
\r
1453 void CGitStatusListCtrl::AddEntry(FileEntry * entry, WORD langID, int listIndex)
\r
1455 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
1456 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
1458 CString path = entry->GetPath().GetGitPathString();
\r
1459 if ( m_mapFilenameToChecked.size()!=0 && m_mapFilenameToChecked.find(path) != m_mapFilenameToChecked.end() )
\r
1461 // The user manually de-/selected an item. We now restore this status
\r
1462 // when refreshing.
\r
1463 entry->checked = m_mapFilenameToChecked[path];
\r
1468 int index = listIndex;
\r
1470 CString entryname = entry->GetDisplayName();
\r
1472 if (entry->isfolder)
\r
1473 icon_idx = m_nIconFolder;
\r
1476 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(entry->path);
\r
1479 InsertItem(index, entryname, icon_idx);
\r
1480 // SVNSLC_COLFILENAME
\r
1481 SetItemText(index, nCol++, entry->path.GetFileOrDirectoryName());
\r
1483 SetItemText(index, nCol++, entry->path.GetFileExtension());
\r
1484 // SVNSLC_COLSTATUS
\r
1485 if (entry->isNested)
\r
1487 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1488 SetItemText(index, nCol++, sTemp);
\r
1492 GitStatus::GetStatusString(hResourceHandle, entry->status, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1493 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1494 _tcscat_s(buf, 100, _T(" (+)"));
\r
1495 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1496 _tcscat_s(buf, 100, _T(" (s)"));
\r
1498 if ((entry->status == entry->propstatus)&&
\r
1499 (entry->status != git_wc_status_normal)&&
\r
1500 (entry->status != git_wc_status_unversioned)&&
\r
1501 (!GitStatus::IsImportant(entry->textstatus)))
\r
1502 _tcscat_s(buf, 100, ponly);
\r
1504 SetItemText(index, nCol++, buf);
\r
1506 // SVNSLC_COLREMOTESTATUS
\r
1507 if (entry->isNested)
\r
1509 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1510 SetItemText(index, nCol++, sTemp);
\r
1515 SVNStatus::GetStatusString(hResourceHandle, entry->remotestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1516 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1517 _tcscat_s(buf, 100, _T(" (+)"));
\r
1518 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1519 _tcscat_s(buf, 100, _T(" (s)"));
\r
1520 if ((entry->remotestatus == entry->remotepropstatus)&&
\r
1521 (entry->remotestatus != git_wc_status_none)&&
\r
1522 (entry->remotestatus != git_wc_status_normal)&&
\r
1523 (entry->remotestatus != git_wc_status_unversioned)&&
\r
1524 (!SVNStatus::IsImportant(entry->remotetextstatus)))
\r
1525 _tcscat_s(buf, 100, ponly);
\r
1527 SetItemText(index, nCol++, buf);
\r
1529 // SVNSLC_COLTEXTSTATUS
\r
1530 if (entry->isNested)
\r
1532 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1533 SetItemText(index, nCol++, sTemp);
\r
1538 SVNStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1539 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1540 _tcscat_s(buf, 100, _T(" (+)"));
\r
1541 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1542 _tcscat_s(buf, 100, _T(" (s)"));
\r
1544 SetItemText(index, nCol++, buf);
\r
1546 // SVNSLC_COLPROPSTATUS
\r
1547 if (entry->isNested)
\r
1549 SetItemText(index, nCol++, _T(""));
\r
1554 SVNStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1555 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1556 _tcscat_s(buf, 100, _T(" (+)"));
\r
1557 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1558 _tcscat_s(buf, 100, _T(" (s)"));
\r
1560 SetItemText(index, nCol++, buf);
\r
1562 // SVNSLC_COLREMOTETEXT
\r
1563 if (entry->isNested)
\r
1565 SetItemText(index, nCol++, _T(""));
\r
1570 SVNStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1571 SetItemText(index, nCol++, buf);
\r
1574 // SVNSLC_COLREMOTEPROP
\r
1575 if (entry->isNested)
\r
1577 SetItemText(index, nCol++, _T(""));
\r
1581 // SVNStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1582 SetItemText(index, nCol++, buf);
\r
1585 // SetItemText(index, nCol++, entry->url);
\r
1588 if (!m_HeadRev.IsHead())
\r
1590 // we have contacted the repository
\r
1592 // decision-matrix
\r
1593 // wc repository text
\r
1596 // UID1 UID1 owner
\r
1597 // UID1 "" lock has been broken
\r
1598 // UID1 UID2 lock has been stolen
\r
1599 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))
\r
1601 if (entry->lock_owner.IsEmpty())
\r
1602 SetItemText(index, nCol++, entry->lock_remoteowner);
\r
1604 SetItemText(index, nCol++, entry->lock_owner);
\r
1606 else if (entry->lock_remotetoken.IsEmpty())
\r
1609 CString temp(MAKEINTRESOURCE(IDS_STATUSLIST_LOCKBROKEN));
\r
1610 SetItemText(index, nCol++, temp);
\r
1616 temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);
\r
1617 SetItemText(index, nCol++, temp);
\r
1621 SetItemText(index, nCol++, entry->lock_owner);
\r
1622 // SVNSLC_COLLOCKCOMMENT
\r
1623 SetItemText(index, nCol++, entry->lock_comment);
\r
1624 // SVNSLC_COLAUTHOR
\r
1625 SetItemText(index, nCol++, entry->last_commit_author);
\r
1626 // SVNSLC_COLREVISION
\r
1628 temp.Format(_T("%ld"), entry->last_commit_rev);
\r
1629 if (entry->last_commit_rev > 0)
\r
1630 SetItemText(index, nCol++, temp);
\r
1632 SetItemText(index, nCol++, _T(""));
\r
1633 // SVNSLC_COLREMOTEREVISION
\r
1634 temp.Format(_T("%ld"), entry->remoterev);
\r
1635 if (entry->remoterev > 0)
\r
1636 SetItemText(index, nCol++, temp);
\r
1638 SetItemText(index, nCol++, _T(""));
\r
1640 TCHAR datebuf[SVN_DATE_BUFFER];
\r
1641 apr_time_t date = entry->last_commit_date;
\r
1642 SVN::formatDate(datebuf, date, true);
\r
1644 SetItemText(index, nCol++, datebuf);
\r
1646 SetItemText(index, nCol++, _T(""));
\r
1647 // SVNSLC_COLSVNNEEDSLOCK
\r
1648 BOOL bFoundSVNNeedsLock = entry->present_props.IsNeedsLockSet();
\r
1649 CString strSVNNeedsLock = (bFoundSVNNeedsLock) ? _T("*") : _T("");
\r
1650 SetItemText(index, nCol++, strSVNNeedsLock);
\r
1651 // SVNSLC_COLCOPYFROM
\r
1652 if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)
\r
1653 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());
\r
1655 temp = entry->copyfrom_url;
\r
1656 SetItemText(index, nCol++, temp);
\r
1657 // SVNSLC_COLMODIFICATIONDATE
\r
1658 __int64 filetime = entry->GetPath().GetLastWriteTime();
\r
1659 if ( (filetime) && (entry->status!=git_wc_status_deleted) )
\r
1661 FILETIME* f = (FILETIME*)(__int64*)&filetime;
\r
1662 TCHAR datebuf[SVN_DATE_BUFFER];
\r
1663 SVN::formatDate(datebuf,*f,true);
\r
1664 SetItemText(index, nCol++, datebuf);
\r
1668 SetItemText(index, nCol++, _T(""));
\r
1671 // user-defined properties
\r
1672 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
\r
1676 assert (i == nCol++);
\r
1677 assert (m_ColumnManager.IsUserProp (i));
\r
1679 CString name = m_ColumnManager.GetName(i);
\r
1680 if (entry->present_props.HasProperty (name))
\r
1682 const CString& propVal = entry->present_props [name];
\r
1683 if (propVal.IsEmpty())
\r
1684 SetItemText(index, i, m_sNoPropValueText);
\r
1686 SetItemText(index, i, propVal);
\r
1689 SetItemText(index, i, _T(""));
\r
1692 SetCheck(index, entry->checked);
\r
1693 if (entry->checked)
\r
1695 if (m_changelists.find(entry->changelist) != m_changelists.end())
\r
1696 SetItemGroup(index, m_changelists[entry->changelist]);
\r
1698 SetItemGroup(index, 0);
\r
1703 bool CGitStatusListCtrl::SetItemGroup(int item, int groupindex)
\r
1705 // if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS) == NULL)
\r
1707 if (groupindex < 0)
\r
1710 i.mask = LVIF_GROUPID;
\r
1713 i.iGroupId = groupindex;
\r
1715 return !!SetItem(&i);
\r
1718 void CGitStatusListCtrl::Sort()
\r
1720 Locker lock(m_critSec);
\r
1722 CSorter predicate (&m_ColumnManager, m_nSortedColumn, m_bAscending);
\r
1724 std::sort(m_arStatusArray.begin(), m_arStatusArray.end(), predicate);
\r
1725 SaveColumnWidths();
\r
1726 Show(m_dwShow, 0, m_bShowFolders);
\r
1730 void CGitStatusListCtrl::OnHdnItemclick(NMHDR *pNMHDR, LRESULT *pResult)
\r
1732 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
1737 if (m_nSortedColumn == phdr->iItem)
\r
1738 m_bAscending = !m_bAscending;
\r
1740 m_bAscending = TRUE;
\r
1741 m_nSortedColumn = phdr->iItem;
\r
1742 m_mapFilenameToChecked.clear();
\r
1745 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1746 HDITEM HeaderItem = {0};
\r
1747 HeaderItem.mask = HDI_FORMAT;
\r
1748 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1750 pHeader->GetItem(i, &HeaderItem);
\r
1751 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1752 pHeader->SetItem(i, &HeaderItem);
\r
1754 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1755 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1756 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1758 // the checked state of the list control items must be restored
\r
1760 for (int i=0; i<GetItemCount(); ++i)
\r
1762 CTGitPath * entry = (CTGitPath*)GetItemData(i);
\r
1765 SetCheck(i, entry->m_Checked);
\r
1771 void CGitStatusListCtrl::OnLvnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
\r
1773 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1776 #define ISCHECKED(x) ((x) ? ((((x)&LVIS_STATEIMAGEMASK)>>12)-1) : FALSE)
\r
1777 if ((m_bBlock)&&(m_bBlockUI))
\r
1779 // if we're blocked, prevent changing of the check state
\r
1780 if ((!ISCHECKED(pNMLV->uOldState) && ISCHECKED(pNMLV->uNewState))||
\r
1781 (ISCHECKED(pNMLV->uOldState) && !ISCHECKED(pNMLV->uNewState)))
\r
1786 BOOL CGitStatusListCtrl::OnLvnItemchanged(NMHDR *pNMHDR, LRESULT *pResult)
\r
1788 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1790 if ((pNMLV->uNewState==0)||(pNMLV->uNewState & LVIS_SELECTED)||(pNMLV->uNewState & LVIS_FOCUSED))
\r
1796 bool bSelected = !!(ListView_GetItemState(m_hWnd, pNMLV->iItem, LVIS_SELECTED) & LVIS_SELECTED);
\r
1797 int nListItems = GetItemCount();
\r
1800 // was the item checked?
\r
1802 //CTGitPath *gitpath=(CTGitPath*)GetItemData(pNMLV->iItem);
\r
1803 //gitpath->m_Checked=GetCheck(pNMLV->iItem);
\r
1805 if (GetCheck(pNMLV->iItem))
\r
1807 CheckEntry(pNMLV->iItem, nListItems);
\r
1810 POSITION pos = GetFirstSelectedItemPosition();
\r
1812 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
1814 if (index != pNMLV->iItem)
\r
1815 CheckEntry(index, nListItems);
\r
1821 UncheckEntry(pNMLV->iItem, nListItems);
\r
1824 POSITION pos = GetFirstSelectedItemPosition();
\r
1826 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
1828 if (index != pNMLV->iItem)
\r
1829 UncheckEntry(index, nListItems);
\r
1834 GetStatisticsString();
\r
1841 void CGitStatusListCtrl::OnColumnResized(NMHDR *pNMHDR, LRESULT *pResult)
\r
1843 LPNMHEADER header = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
1844 if ( (header != NULL)
\r
1845 && (header->iItem >= 0)
\r
1846 && (header->iItem < m_ColumnManager.GetColumnCount()))
\r
1848 m_ColumnManager.ColumnResized (header->iItem);
\r
1854 void CGitStatusListCtrl::OnColumnMoved(NMHDR *pNMHDR, LRESULT *pResult)
\r
1856 LPNMHEADER header = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
1858 if ( (header != NULL)
\r
1859 && (header->iItem >= 0)
\r
1860 && (header->iItem < m_ColumnManager.GetColumnCount())
\r
1861 // only allow the reordering if the column was not moved left of the first
\r
1862 // visible item - otherwise the 'invisible' columns are not at the far left
\r
1863 // anymore and we get all kinds of redrawing problems.
\r
1864 && (header->pitem)
\r
1865 && (header->pitem->iOrder > m_ColumnManager.GetInvisibleCount()))
\r
1867 m_ColumnManager.ColumnMoved (header->iItem, header->pitem->iOrder);
\r
1871 Invalidate(FALSE);
\r
1874 void CGitStatusListCtrl::CheckEntry(int index, int nListItems)
\r
1876 Locker lock(m_critSec);
\r
1877 //FileEntry * entry = GetListEntry(index);
\r
1878 CTGitPath *path=(CTGitPath*)GetItemData(index);
\r
1879 ASSERT(path != NULL);
\r
1882 SetCheck(index, TRUE);
\r
1883 //entry = GetListEntry(index);
\r
1884 // if an unversioned item was checked, then we need to check if
\r
1885 // the parent folders are unversioned too. If the parent folders actually
\r
1886 // are unversioned, then check those too.
\r
1888 if (entry->status == git_wc_status_unversioned)
\r
1890 // we need to check the parent folder too
\r
1891 const CTGitPath& folderpath = entry->path;
\r
1892 for (int i=0; i< nListItems; ++i)
\r
1894 FileEntry * testEntry = GetListEntry(i);
\r
1895 ASSERT(testEntry != NULL);
\r
1896 if (testEntry == NULL)
\r
1898 if (!testEntry->checked)
\r
1900 if (testEntry->path.IsAncestorOf(folderpath) && (!testEntry->path.IsEquivalentTo(folderpath)))
\r
1902 SetEntryCheck(testEntry,i,true);
\r
1908 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
1909 if ( (entry->status == git_wc_status_deleted) || (m_bCheckChildrenWithParent) || (bShift) )
\r
1911 // if a deleted folder gets checked, we have to check all
\r
1912 // children of that folder too.
\r
1913 if (entry->path.IsDirectory())
\r
1915 SetCheckOnAllDescendentsOf(entry, true);
\r
1918 // if a deleted file or folder gets checked, we have to
\r
1919 // check all parents of this item too.
\r
1920 for (int i=0; i<nListItems; ++i)
\r
1922 FileEntry * testEntry = GetListEntry(i);
\r
1923 ASSERT(testEntry != NULL);
\r
1924 if (testEntry == NULL)
\r
1926 if (!testEntry->checked)
\r
1928 if (testEntry->path.IsAncestorOf(entry->path) && (!testEntry->path.IsEquivalentTo(entry->path)))
\r
1930 if ((testEntry->status == git_wc_status_deleted)||(m_bCheckChildrenWithParent))
\r
1932 SetEntryCheck(testEntry,i,true);
\r
1934 // now we need to check all children of this parent folder
\r
1935 SetCheckOnAllDescendentsOf(testEntry, true);
\r
1942 if ( !path->m_Checked )
\r
1944 path->m_Checked = TRUE;
\r
1949 void CGitStatusListCtrl::UncheckEntry(int index, int nListItems)
\r
1951 Locker lock(m_critSec);
\r
1952 CTGitPath *path=(CTGitPath*)GetItemData(index);
\r
1953 ASSERT(path != NULL);
\r
1956 SetCheck(index, FALSE);
\r
1957 //entry = GetListEntry(index);
\r
1958 // item was unchecked
\r
1960 if (entry->path.IsDirectory())
\r
1962 // disable all files within an unselected folder, except when unchecking a folder with property changes
\r
1963 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
1964 if ( (entry->status != git_wc_status_modified) || (bShift) )
\r
1966 SetCheckOnAllDescendentsOf(entry, false);
\r
1969 else if (entry->status == git_wc_status_deleted)
\r
1971 // a "deleted" file was unchecked, so uncheck all parent folders
\r
1972 // and all children of those parents
\r
1973 for (int i=0; i<nListItems; i++)
\r
1975 FileEntry * testEntry = GetListEntry(i);
\r
1976 ASSERT(testEntry != NULL);
\r
1977 if (testEntry == NULL)
\r
1979 if (testEntry->checked)
\r
1981 if (testEntry->path.IsAncestorOf(entry->path))
\r
1983 if (testEntry->status == git_wc_status_deleted)
\r
1985 SetEntryCheck(testEntry,i,false);
\r
1988 SetCheckOnAllDescendentsOf(testEntry, false);
\r
1995 if ( path->m_Checked )
\r
1997 path->m_Checked = FALSE;
\r
2002 bool CGitStatusListCtrl::EntryPathCompareNoCase(const FileEntry* pEntry1, const FileEntry* pEntry2)
\r
2004 return pEntry1->path < pEntry2->path;
\r
2007 bool CGitStatusListCtrl::IsEntryVersioned(const FileEntry* pEntry1)
\r
2009 return pEntry1->status != git_wc_status_unversioned;
\r
2012 bool CGitStatusListCtrl::BuildStatistics()
\r
2015 bool bRefetchStatus = false;
\r
2017 // now gather some statistics
\r
2018 m_nUnversioned = 0;
\r
2023 m_nConflicted = 0;
\r
2027 for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2029 int status=((CTGitPath*)m_arStatusArray[i])->m_Action;
\r
2031 if(status&(CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))
\r
2034 if(status&CTGitPath::LOGACTIONS_DELETED)
\r
2037 if(status&(CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_MODIFIED))
\r
2040 if(status&CTGitPath::LOGACTIONS_UNMERGED)
\r
2043 if(status&(CTGitPath::LOGACTIONS_IGNORE|CTGitPath::LOGACTIONS_UNVER))
\r
2048 // } // switch (entry->status)
\r
2049 // } // if (entry)
\r
2050 } // for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2051 return !bRefetchStatus;
\r
2056 void CGitStatusListCtrl::GetMinMaxRevisions(git_revnum_t& rMin, git_revnum_t& rMax, bool bShownOnly, bool bCheckedOnly)
\r
2059 Locker lock(m_critSec);
\r
2063 if ((bShownOnly)||(bCheckedOnly))
\r
2065 for (int i=0; i<GetItemCount(); ++i)
\r
2067 const FileEntry * entry = GetListEntry(i);
\r
2069 if ((entry)&&(entry->last_commit_rev))
\r
2071 if ((!bCheckedOnly)||(entry->IsChecked()))
\r
2073 if (entry->last_commit_rev >= 0)
\r
2075 rMin = min(rMin, entry->last_commit_rev);
\r
2076 rMax = max(rMax, entry->last_commit_rev);
\r
2084 for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2086 const FileEntry * entry = m_arStatusArray[i];
\r
2087 if ((entry)&&(entry->last_commit_rev))
\r
2089 if (entry->last_commit_rev >= 0)
\r
2091 rMin = min(rMin, entry->last_commit_rev);
\r
2092 rMax = max(rMax, entry->last_commit_rev);
\r
2097 if (rMin == LONG_MAX)
\r
2102 int CGitStatusListCtrl::GetGroupFromPoint(POINT * ppt)
\r
2104 // the point must be relative to the upper left corner of the control
\r
2108 if (!IsGroupViewEnabled())
\r
2116 GetWindowRect(&rc);
\r
2117 while (((flags & LVHT_BELOW) == 0)&&(pt.y < rc.bottom))
\r
2119 nItem = HitTest(pt, &flags);
\r
2120 if ((flags & LVHT_ONITEM)||(flags & LVHT_EX_GROUP_HEADER))
\r
2122 // the first item below the point
\r
2124 // check if the point is too much right (i.e. if the point
\r
2125 // is farther to the right than the width of the item)
\r
2127 GetItemRect(nItem, &r, LVIR_LABEL);
\r
2128 if (ppt->x > r.right)
\r
2132 lv.mask = LVIF_GROUPID;
\r
2135 int groupID = lv.iGroupId;
\r
2136 // now we search upwards and check if the item above this one
\r
2137 // belongs to another group. If it belongs to the same group,
\r
2138 // we're not over a group header
\r
2142 nItem = HitTest(pt, &flags);
\r
2143 if ((flags & LVHT_ONITEM)&&(nItem >= 0))
\r
2145 // the first item below the point
\r
2147 lv.mask = LVIF_GROUPID;
\r
2150 if (lv.iGroupId != groupID)
\r
2165 void CGitStatusListCtrl::OnContextMenuGroup(CWnd * /*pWnd*/, CPoint point)
\r
2167 POINT clientpoint = point;
\r
2168 ScreenToClient(&clientpoint);
\r
2169 if ((IsGroupViewEnabled())&&(GetGroupFromPoint(&clientpoint) >= 0))
\r
2172 if (popup.CreatePopupMenu())
\r
2175 temp.LoadString(IDS_STATUSLIST_CHECKGROUP);
\r
2176 popup.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CHECKGROUP, temp);
\r
2177 temp.LoadString(IDS_STATUSLIST_UNCHECKGROUP);
\r
2178 popup.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_UNCHECKGROUP, temp);
\r
2179 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2180 bool bCheck = false;
\r
2183 case IDSVNLC_CHECKGROUP:
\r
2185 // fall through here
\r
2186 case IDSVNLC_UNCHECKGROUP:
\r
2188 int group = GetGroupFromPoint(&clientpoint);
\r
2189 // go through all items and check/uncheck those assigned to the group
\r
2190 // but block the OnLvnItemChanged handler
\r
2193 for (int i=0; i<GetItemCount(); ++i)
\r
2195 SecureZeroMemory(&lv, sizeof(LVITEM));
\r
2196 lv.mask = LVIF_GROUPID;
\r
2200 if (lv.iGroupId == group)
\r
2202 CTGitPath * entry = (CTGitPath*)GetItemData(i);
\r
2205 bool bOldCheck = entry->m_Checked;
\r
2206 SetEntryCheck(entry, i, bCheck);
\r
2207 if (bCheck != bOldCheck)
\r
2218 GetStatisticsString();
\r
2228 void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
\r
2231 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
2233 bool XPorLater = false;
\r
2234 OSVERSIONINFOEX inf;
\r
2235 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
2236 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
2237 GetVersionEx((OSVERSIONINFO *)&inf);
\r
2238 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
2239 if (fullver >= 0x0501)
\r
2241 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
2242 CTGitPath * filepath;
\r
2244 int selIndex = GetSelectionMark();
\r
2245 if ((point.x == -1) && (point.y == -1))
\r
2248 GetItemRect(selIndex, &rect, LVIR_LABEL);
\r
2249 ClientToScreen(&rect);
\r
2250 point = rect.CenterPoint();
\r
2252 if ((GetSelectedCount() == 0)&&(XPorLater)&&(m_bHasCheckboxes))
\r
2254 // nothing selected could mean the context menu is requested for
\r
2256 OnContextMenuGroup(pWnd, point);
\r
2258 else if (selIndex >= 0)
\r
2260 //FileEntry * entry = GetListEntry(selIndex);
\r
2262 filepath = (CTGitPath * )GetItemData(selIndex);
\r
2264 ASSERT(filepath != NULL);
\r
2265 if (filepath == NULL)
\r
2268 //const CTGitPath& filepath = entry->path;
\r
2269 int wcStatus = filepath->m_Action;
\r
2270 // entry is selected, now show the popup menu
\r
2271 Locker lock(m_critSec);
\r
2273 CMenu changelistSubMenu;
\r
2274 CMenu ignoreSubMenu;
\r
2275 if (popup.CreatePopupMenu())
\r
2277 //Add Menu for verion controled file
\r
2279 if (wcStatus & CTGitPath::LOGACTIONS_UNMERGED)
\r
2281 if ((m_dwContextMenus & SVNSLC_POPCONFLICT)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
\r
2283 popup.AppendMenuIcon(IDSVNLC_EDITCONFLICT, IDS_MENUCONFLICT, IDI_CONFLICT);
\r
2285 if (m_dwContextMenus & SVNSLC_POPRESOLVE)
\r
2287 popup.AppendMenuIcon(IDSVNLC_RESOLVECONFLICT, IDS_STATUSLIST_CONTEXT_RESOLVED, IDI_RESOLVE);
\r
2289 if ((m_dwContextMenus & SVNSLC_POPRESOLVE)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
\r
2291 //popup.AppendMenuIcon(IDSVNLC_RESOLVETHEIRS, IDS_SVNPROGRESS_MENUUSETHEIRS, IDI_RESOLVE);
\r
2292 //popup.AppendMenuIcon(IDSVNLC_RESOLVEMINE, IDS_SVNPROGRESS_MENUUSEMINE, IDI_RESOLVE);
\r
2294 if ((m_dwContextMenus & SVNSLC_POPCONFLICT)||(m_dwContextMenus & SVNSLC_POPRESOLVE))
\r
2295 popup.AppendMenu(MF_SEPARATOR);
\r
2298 if (!(wcStatus &CTGitPath::LOGACTIONS_UNVER))
\r
2300 if (m_dwContextMenus & SVNSLC_POPCOMPAREWITHBASE)
\r
2302 popup.AppendMenuIcon(IDSVNLC_COMPARE, IDS_LOG_COMPAREWITHBASE, IDI_DIFF);
\r
2303 popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2306 if (m_dwContextMenus & this->GetContextMenuBit(IDSVNLC_COMPAREWC))
\r
2308 if( (!m_CurrentVersion.IsEmpty()) && m_CurrentVersion != GIT_REV_ZERO)
\r
2309 popup.AppendMenuIcon(IDSVNLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
\r
2311 //Select one items
\r
2312 if (GetSelectedCount() == 1)
\r
2314 bool bEntryAdded = false;
\r
2315 //if (entry->remotestatus <= git_wc_status_normal)
\r
2317 // if (wcStatus > git_wc_status_normal)
\r
2319 // if ((m_dwContextMenus & SVNSLC_POPGNUDIFF)&&(wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing))
\r
2321 if(!g_Git.IsInitRepos())
\r
2322 popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
\r
2324 bEntryAdded = true;
\r
2329 //else if (wcStatus != git_wc_status_deleted)
\r
2331 // if (m_dwContextMenus & SVNSLC_POPCOMPARE)
\r
2333 // popup.AppendMenuIcon(IDSVNLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
\r
2334 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2335 // bEntryAdded = true;
\r
2337 // if (m_dwContextMenus & SVNSLC_POPGNUDIFF)
\r
2339 // popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
\r
2340 // bEntryAdded = true;
\r
2344 popup.AppendMenu(MF_SEPARATOR);
\r
2346 //else if (GetSelectedCount() > 1)
\r
2348 // if (m_dwContextMenus & SVNSLC_POPCOMMIT)
\r
2350 // popup.AppendMenuIcon(IDSVNLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);
\r
2351 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2357 ///Select Multi item
\r
2358 //if (GetSelectedCount() > 0)
\r
2360 // if ((GetSelectedCount() == 2)&&(m_dwContextMenus & SVNSLC_POPREPAIRMOVE))
\r
2362 // POSITION pos = GetFirstSelectedItemPosition();
\r
2363 // int index = GetNextSelectedItem(pos);
\r
2364 // if (index >= 0)
\r
2366 // FileEntry * entry = GetListEntry(index);
\r
2367 // git_wc_status_kind status1 = git_wc_status_none;
\r
2368 // git_wc_status_kind status2 = git_wc_status_none;
\r
2370 // status1 = entry->status;
\r
2371 // index = GetNextSelectedItem(pos);
\r
2372 // if (index >= 0)
\r
2374 // entry = GetListEntry(index);
\r
2376 // status2 = entry->status;
\r
2377 // if ((status1 == git_wc_status_missing && status2 == git_wc_status_unversioned) ||
\r
2378 // (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned))
\r
2380 // popup.AppendMenuIcon(IDSVNLC_REPAIRMOVE, IDS_STATUSLIST_CONTEXT_REPAIRMOVE);
\r
2385 // if (wcStatus > git_wc_status_normal)
\r
2387 // if (m_dwContextMenus & SVNSLC_POPREVERT)
\r
2389 // // reverting missing folders is not possible
\r
2390 // if (!entry->IsFolder() || (wcStatus != git_wc_status_missing))
\r
2392 // popup.AppendMenuIcon(IDSVNLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
\r
2396 // if (entry->remotestatus > git_wc_status_normal)
\r
2398 // if (m_dwContextMenus & SVNSLC_POPUPDATE)
\r
2400 // popup.AppendMenuIcon(IDSVNLC_UPDATE, IDS_MENUUPDATE, IDI_UPDATE);
\r
2405 if ( (GetSelectedCount() >0 ) && (!(wcStatus & CTGitPath::LOGACTIONS_UNVER)))
\r
2407 if (m_dwContextMenus & SVNSLC_POPREVERT)
\r
2409 popup.AppendMenuIcon(IDSVNLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
\r
2412 if ((m_dwContextMenus & GetContextMenuBit(IDSVNLC_REVERTTOREV)) && ( !this->m_CurrentVersion.IsEmpty() )
\r
2413 && this->m_CurrentVersion != GIT_REV_ZERO)
\r
2415 popup.AppendMenuIcon(IDSVNLC_REVERTTOREV, IDS_LOG_POPUP_REVERTTOREV, IDI_REVERT);
\r
2419 if ((GetSelectedCount() == 1)&&(!(wcStatus & CTGitPath::LOGACTIONS_UNVER))
\r
2420 &&(!(wcStatus & CTGitPath::LOGACTIONS_IGNORE)))
\r
2422 if (m_dwContextMenus & SVNSLC_POPSHOWLOG)
\r
2424 popup.AppendMenuIcon(IDSVNLC_LOG, IDS_REPOBROWSE_SHOWLOG, IDI_LOG);
\r
2426 if (m_dwContextMenus & SVNSLC_POPBLAME)
\r
2428 popup.AppendMenuIcon(IDSVNLC_BLAME, IDS_MENUBLAME, IDI_BLAME);
\r
2431 // if ((wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing) && (GetSelectedCount() == 1))
\r
2432 if ( (GetSelectedCount() == 1) )
\r
2434 if (m_dwContextMenus & this->GetContextMenuBit(IDSVNLC_SAVEAS) )
\r
2436 popup.AppendMenuIcon(IDSVNLC_SAVEAS, IDS_LOG_POPUP_SAVE, IDI_SAVEAS);
\r
2439 if (m_dwContextMenus & SVNSLC_POPOPEN)
\r
2441 popup.AppendMenuIcon(IDSVNLC_VIEWREV, IDS_LOG_POPUP_VIEWREV);
\r
2442 popup.AppendMenuIcon(IDSVNLC_OPEN, IDS_REPOBROWSE_OPEN, IDI_OPEN);
\r
2443 popup.AppendMenuIcon(IDSVNLC_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
\r
2446 if (m_dwContextMenus & SVNSLC_POPEXPLORE)
\r
2448 popup.AppendMenuIcon(IDSVNLC_EXPLORE, IDS_STATUSLIST_CONTEXT_EXPLORE, IDI_EXPLORER);
\r
2452 if (GetSelectedCount() > 0)
\r
2454 // if (((wcStatus == git_wc_status_unversioned)||(wcStatus == git_wc_status_ignored))&&(m_dwContextMenus & SVNSLC_POPDELETE))
\r
2456 // popup.AppendMenuIcon(IDSVNLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
\r
2458 // if ((wcStatus != Git_wc_status_unversioned)&&(wcStatus != git_wc_status_ignored)&&(wcStatus != Git_wc_status_deleted)&&(wcStatus != Git_wc_status_added)&&(m_dwContextMenus & GitSLC_POPDELETE))
\r
2461 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVEKEEP, IDI_DELETE);
\r
2463 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVE, IDI_DELETE);
\r
2465 if ((wcStatus & CTGitPath::LOGACTIONS_UNVER)/*||(wcStatus == git_wc_status_deleted)*/)
\r
2467 if (m_dwContextMenus & SVNSLC_POPADD)
\r
2469 //if ( entry->IsFolder() )
\r
2471 // popup.AppendMenuIcon(IDSVNLC_ADD_RECURSIVE, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE, IDI_ADD);
\r
2475 popup.AppendMenuIcon(IDSVNLC_ADD, IDS_STATUSLIST_CONTEXT_ADD, IDI_ADD);
\r
2479 //if ( (wcStatus == git_wc_status_unversioned) || (wcStatus == git_wc_status_deleted) )
\r
2481 if (m_dwContextMenus & SVNSLC_POPIGNORE)
\r
2484 CTGitPathList ignorelist;
\r
2485 FillListOfSelectedItemPaths(ignorelist);
\r
2486 //check if all selected entries have the same extension
\r
2487 bool bSameExt = true;
\r
2489 for (int i=0; i<ignorelist.GetCount(); ++i)
\r
2491 if (sExt.IsEmpty() && (i==0))
\r
2492 sExt = ignorelist[i].GetFileExtension();
\r
2493 else if (sExt.CompareNoCase(ignorelist[i].GetFileExtension())!=0)
\r
2498 if (ignoreSubMenu.CreateMenu())
\r
2500 CString ignorepath;
\r
2501 if (ignorelist.GetCount()==1)
\r
2502 ignorepath = ignorelist[0].GetFileOrDirectoryName();
\r
2504 ignorepath.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
\r
2505 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_IGNORE, ignorepath);
\r
2506 ignorepath = _T("*")+sExt;
\r
2507 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_IGNOREMASK, ignorepath);
\r
2509 temp.LoadString(IDS_MENUIGNORE);
\r
2510 popup.InsertMenu((UINT)-1, MF_BYPOSITION | MF_POPUP, (UINT_PTR)ignoreSubMenu.m_hMenu, temp);
\r
2516 if (ignorelist.GetCount()==1)
\r
2518 temp.LoadString(IDS_MENUIGNORE);
\r
2522 temp.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
\r
2524 popup.AppendMenuIcon(IDSVNLC_IGNORE, temp, IDI_IGNORE);
\r
2532 if (GetSelectedCount() > 0)
\r
2535 if ((!entry->IsFolder())&&(wcStatus >= git_wc_status_normal)
\r
2536 &&(wcStatus!=git_wc_status_missing)&&(wcStatus!=git_wc_status_deleted)
\r
2537 &&(wcStatus!=git_wc_status_added))
\r
2539 popup.AppendMenu(MF_SEPARATOR);
\r
2540 if ((entry->lock_token.IsEmpty())&&(!entry->IsFolder()))
\r
2542 if (m_dwContextMenus & SVNSLC_POPLOCK)
\r
2544 popup.AppendMenuIcon(IDSVNLC_LOCK, IDS_MENU_LOCK, IDI_LOCK);
\r
2547 if ((!entry->lock_token.IsEmpty())&&(!entry->IsFolder()))
\r
2549 if (m_dwContextMenus & SVNSLC_POPUNLOCK)
\r
2551 popup.AppendMenuIcon(IDSVNLC_UNLOCK, IDS_MENU_UNLOCK, IDI_UNLOCK);
\r
2556 if ((!entry->IsFolder())&&((!entry->lock_token.IsEmpty())||(!entry->lock_remotetoken.IsEmpty())))
\r
2558 if (m_dwContextMenus & SVNSLC_POPUNLOCKFORCE)
\r
2560 popup.AppendMenuIcon(IDSVNLC_UNLOCKFORCE, IDS_MENU_UNLOCKFORCE, IDI_UNLOCK);
\r
2564 if (wcStatus != git_wc_status_missing && wcStatus != git_wc_status_deleted &&wcStatus!=git_wc_status_unversioned)
\r
2566 popup.AppendMenu(MF_SEPARATOR);
\r
2567 popup.AppendMenuIcon(IDSVNLC_PROPERTIES, IDS_STATUSLIST_CONTEXT_PROPERTIES, IDI_PROPERTIES);
\r
2570 popup.AppendMenu(MF_SEPARATOR);
\r
2571 popup.AppendMenuIcon(IDSVNLC_COPY, IDS_STATUSLIST_CONTEXT_COPY, IDI_COPYCLIP);
\r
2572 popup.AppendMenuIcon(IDSVNLC_COPYEXT, IDS_STATUSLIST_CONTEXT_COPYEXT, IDI_COPYCLIP);
\r
2574 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS)&&(XPorLater)
\r
2575 &&(wcStatus != git_wc_status_unversioned)&&(wcStatus != git_wc_status_none))
\r
2577 popup.AppendMenu(MF_SEPARATOR);
\r
2578 // changelist commands
\r
2579 size_t numChangelists = GetNumberOfChangelistsInSelection();
\r
2580 if (numChangelists > 0)
\r
2582 popup.AppendMenuIcon(IDSVNLC_REMOVEFROMCS, IDS_STATUSLIST_CONTEXT_REMOVEFROMCS);
\r
2584 if ((!entry->IsFolder())&&(changelistSubMenu.CreateMenu()))
\r
2587 temp.LoadString(IDS_STATUSLIST_CONTEXT_CREATECS);
\r
2588 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATECS, temp);
\r
2590 if (entry->changelist.Compare(SVNSLC_IGNORECHANGELIST))
\r
2592 changelistSubMenu.AppendMenu(MF_SEPARATOR);
\r
2593 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATEIGNORECS, SVNSLC_IGNORECHANGELIST);
\r
2596 if (m_changelists.size() > 0)
\r
2598 // find the changelist names
\r
2599 bool bNeedSeparator = true;
\r
2600 int cmdID = IDSVNLC_MOVETOCS;
\r
2601 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
2603 if ((entry->changelist.Compare(it->first))&&(it->first.Compare(SVNSLC_IGNORECHANGELIST)))
\r
2605 if (bNeedSeparator)
\r
2607 changelistSubMenu.AppendMenu(MF_SEPARATOR);
\r
2608 bNeedSeparator = false;
\r
2610 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, cmdID, it->first);
\r
2615 temp.LoadString(IDS_STATUSLIST_CONTEXT_MOVETOCS);
\r
2616 popup.AppendMenu(MF_POPUP|MF_STRING, (UINT_PTR)changelistSubMenu.GetSafeHmenu(), temp);
\r
2622 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2625 AfxGetApp()->DoWaitCursor(1);
\r
2626 int iItemCountBeforeMenuCmd = GetItemCount();
\r
2627 bool bForce = false;
\r
2630 case IDSVNLC_VIEWREV:
\r
2631 OpenFile(filepath,NOTEPAD2);
\r
2633 case IDSVNLC_OPEN:
\r
2634 OpenFile(filepath,OPEN);
\r
2636 case IDSVNLC_OPENWITH:
\r
2637 OpenFile(filepath,OPEN_WITH);
\r
2639 case IDSVNLC_EXPLORE:
\r
2641 ShellExecute(this->m_hWnd, _T("explore"), filepath->GetDirectory().GetWinPath(), NULL, NULL, SW_SHOW);
\r
2645 // Compare current version and work copy.
\r
2646 case IDSVNLC_COMPAREWC:
\r
2648 POSITION pos = GetFirstSelectedItemPosition();
\r
2651 int index = GetNextSelectedItem(pos);
\r
2652 StartDiffWC(index);
\r
2656 // Compare with base version. when current version is zero, compare workcopy and HEAD.
\r
2657 case IDSVNLC_COMPARE:
\r
2659 POSITION pos = GetFirstSelectedItemPosition();
\r
2662 int index = GetNextSelectedItem(pos);
\r
2667 case IDSVNLC_GNUDIFF1:
\r
2669 // SVNDiff diff(NULL, this->m_hWnd, true);
\r
2671 // if (entry->remotestatus <= git_wc_status_normal)
\r
2672 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
\r
2674 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
\r
2675 if(m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
\r
2676 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,GitRev::GetWorkingCopy(),
\r
2677 *filepath,GitRev::GetHead());
\r
2679 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,m_CurrentVersion,
\r
2680 *filepath,m_CurrentVersion+_T("~1"));
\r
2684 { // The add went ok, but we now need to run through the selected items again
\r
2685 // and update their status
\r
2686 std::vector<int> selectIndex;
\r
2688 POSITION pos = GetFirstSelectedItemPosition();
\r
2690 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
2692 selectIndex.push_back(index);
\r
2694 for(int i=0;i<selectIndex.size();i++)
\r
2696 index=selectIndex[i];
\r
2698 CTGitPath * path=(CTGitPath*)GetItemData(index);
\r
2703 cmd.Format(_T("git.exe add \"%s\""),path->GetGitPathString());
\r
2705 if(!g_Git.Run(cmd,&output,CP_ACP))
\r
2707 path->m_Action = CTGitPath::LOGACTIONS_ADDED;
\r
2708 SetEntryCheck(path,index,true);
\r
2709 SetItemGroup(index,0);
\r
2710 this->m_StatusFileList.AddPath(*path);
\r
2711 this->m_UnRevFileList.RemoveItem(*path);
\r
2712 this->m_IgnoreFileList.RemoveItem(*path);
\r
2713 Show(this->m_dwShow,0,true,true);
\r
2720 case IDSVNLC_BLAME:
\r
2723 sCmd.Format(_T("\"%s\" /command:blame /path:\"%s\""),
\r
2724 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), g_Git.m_CurrentDir+_T("\\")+filepath->GetWinPath());
\r
2726 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
2733 sCmd.Format(_T("\"%s\" /command:log /path:\"%s\""),
\r
2734 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), g_Git.m_CurrentDir+_T("\\")+filepath->GetWinPath());
\r
2736 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
2740 case IDSVNLC_EDITCONFLICT:
\r
2742 CAppUtils::ConflictEdit(*filepath);
\r
2745 case IDSVNLC_RESOLVECONFLICT:
\r
2747 if (CMessageBox::Show(m_hWnd, IDS_PROC_RESOLVE, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO)==IDYES)
\r
2749 POSITION pos = GetFirstSelectedItemPosition();
\r
2753 index = GetNextSelectedItem(pos);
\r
2754 CTGitPath * fentry =(CTGitPath*) this->GetItemData(index);
\r
2755 if(fentry == NULL)
\r
2758 if ( fentry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
\r
2760 CString cmd,output;
\r
2761 cmd.Format(_T("git.exe add \"%s\""),fentry->GetGitPathString());
\r
2762 if(g_Git.Run(cmd,&output,CP_ACP))
\r
2764 CMessageBox::Show(m_hWnd, output, _T("TortoiseSVN"), MB_ICONERROR);
\r
2767 fentry->m_Action |= CTGitPath::LOGACTIONS_MODIFIED;
\r
2768 fentry->m_Action &=~CTGitPath::LOGACTIONS_UNMERGED;
\r
2773 Show(m_dwShow, 0, m_bShowFolders);
\r
2778 case IDSVNLC_IGNORE:
\r
2780 CTGitPathList ignorelist;
\r
2781 //std::vector<CString> toremove;
\r
2782 FillListOfSelectedItemPaths(ignorelist, true);
\r
2785 if(!CAppUtils::IgnoreFile(ignorelist,false))
\r
2788 for(int i=0;i<ignorelist.GetCount();i++)
\r
2790 int nListboxEntries = GetItemCount();
\r
2791 for (int nItem=0; nItem<nListboxEntries; ++nItem)
\r
2793 CTGitPath *path=(CTGitPath*)GetItemData(nItem);
\r
2794 if (path->GetGitPathString()==ignorelist[i].GetGitPathString())
\r
2796 RemoveListEntry(nItem);
\r
2804 CTSVNPathList ignorelist;
\r
2805 std::vector<CString> toremove;
\r
2806 FillListOfSelectedItemPaths(ignorelist, true);
\r
2808 for (int j=0; j<ignorelist.GetCount(); ++j)
\r
2810 int nListboxEntries = GetItemCount();
\r
2811 for (int i=0; i<nListboxEntries; ++i)
\r
2813 if (GetListEntry(i)->GetPath().IsEquivalentTo(ignorelist[j]))
\r
2819 CString name = CPathUtils::PathPatternEscape(ignorelist[j].GetFileOrDirectoryName());
\r
2820 CTSVNPath parentfolder = ignorelist[j].GetContainingDirectory();
\r
2821 SVNProperties props(parentfolder, SVNRev::REV_WC, false);
\r
2823 for (int i=0; i<props.GetCount(); i++)
\r
2825 CString propname(props.GetItemName(i).c_str());
\r
2826 if (propname.CompareNoCase(_T("git:ignore"))==0)
\r
2829 // treat values as normal text even if they're not
\r
2830 value = (char *)props.GetItemValue(i).c_str();
\r
2833 if (value.IsEmpty())
\r
2837 value = value.Trim("\n\r");
\r
2840 value.Remove('\r');
\r
2842 if (!props.Add(_T("git:ignore"), (LPCSTR)value))
\r
2845 temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
\r
2846 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);
\r
2849 if (GetCheck(selIndex))
\r
2853 // now, if we ignored a folder, remove all its children
\r
2854 if (ignorelist[j].IsDirectory())
\r
2856 for (int i=0; i<(int)m_arListArray.size(); ++i)
\r
2858 FileEntry * entry = GetListEntry(i);
\r
2859 if (entry->status == git_wc_status_unversioned)
\r
2861 if (!ignorelist[j].IsEquivalentTo(entry->GetPath())&&(ignorelist[j].IsAncestorOf(entry->GetPath())))
\r
2863 entry->status = git_wc_status_ignored;
\r
2864 entry->textstatus = git_wc_status_ignored;
\r
2867 toremove.push_back(entry->GetPath().GetSVNPathString());
\r
2873 CTSVNPath basepath = m_arStatusArray[m_arListArray[selIndex]]->basepath;
\r
2875 FileEntry * entry = m_arStatusArray[m_arListArray[selIndex]];
\r
2876 if ( entry->status == git_wc_status_unversioned ) // keep "deleted" items
\r
2877 toremove.push_back(entry->GetPath().GetSVNPathString());
\r
2879 if (!m_bIgnoreRemoveOnly)
\r
2882 git_wc_status2_t * s;
\r
2883 CTSVNPath gitPath;
\r
2884 s = status.GetFirstFileStatus(parentfolder, gitPath, false, git_depth_empty);
\r
2885 // first check if the folder isn't already present in the list
\r
2886 bool bFound = false;
\r
2887 nListboxEntries = GetItemCount();
\r
2888 for (int i=0; i<nListboxEntries; ++i)
\r
2890 FileEntry * entry = GetListEntry(i);
\r
2891 if (entry->path.IsEquivalentTo(gitPath))
\r
2901 FileEntry * entry = new FileEntry();
\r
2902 entry->path = gitPath;
\r
2903 entry->basepath = basepath;
\r
2904 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
2905 entry->textstatus = s->text_status;
\r
2906 entry->propstatus = s->prop_status;
\r
2907 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);
\r
2908 entry->remotetextstatus = s->repos_text_status;
\r
2909 entry->remotepropstatus = s->repos_prop_status;
\r
2910 entry->inunversionedfolder = FALSE;
\r
2911 entry->checked = true;
\r
2912 entry->inexternal = false;
\r
2913 entry->direct = false;
\r
2914 entry->isfolder = true;
\r
2915 entry->last_commit_date = 0;
\r
2916 entry->last_commit_rev = 0;
\r
2917 entry->remoterev = 0;
\r
2920 if (s->entry->url)
\r
2922 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));
\r
2925 if (s->entry && s->entry->present_props)
\r
2927 entry->present_props = s->entry->present_props;
\r
2929 m_arStatusArray.push_back(entry);
\r
2930 m_arListArray.push_back(m_arStatusArray.size()-1);
\r
2931 AddEntry(entry, langID, GetItemCount());
\r
2936 for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)
\r
2938 int nListboxEntries = GetItemCount();
\r
2939 for (int i=0; i<nListboxEntries; ++i)
\r
2941 if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)
\r
2943 RemoveListEntry(i);
\r
2952 case IDSVNLC_IGNOREMASK:
\r
2955 CString ext=filepath->GetFileExtension();
\r
2956 CTGitPathList ignorelist;
\r
2957 FillListOfSelectedItemPaths(ignorelist, true);
\r
2960 CAppUtils::IgnoreFile(ignorelist,true);
\r
2961 common=ignorelist.GetCommonRoot().GetGitPathString();
\r
2963 for (int i=0; i< GetItemCount(); ++i)
\r
2965 CTGitPath *path=(CTGitPath*)GetItemData(i);
\r
2966 if(!( path->m_Action & CTGitPath::LOGACTIONS_UNVER))
\r
2968 if( path->GetGitPathString().Left(common.GetLength()) == common )
\r
2970 if (path->GetFileExtension()==ext)
\r
2972 RemoveListEntry(i);
\r
2973 i--; // remove index i at item, new one will replace.
\r
2981 std::set<CTSVNPath> parentlist;
\r
2982 for (int i=0; i<ignorelist.GetCount(); ++i)
\r
2984 parentlist.insert(ignorelist[i].GetContainingDirectory());
\r
2986 std::set<CTSVNPath>::iterator it;
\r
2987 std::vector<CString> toremove;
\r
2989 for (it = parentlist.begin(); it != parentlist.end(); ++it)
\r
2991 CTSVNPath parentFolder = (*it).GetDirectory();
\r
2992 SVNProperties props(parentFolder, SVNRev::REV_WC, false);
\r
2994 for (int i=0; i<props.GetCount(); i++)
\r
2996 CString propname(props.GetItemName(i).c_str());
\r
2997 if (propname.CompareNoCase(_T("git:ignore"))==0)
\r
3000 // treat values as normal text even if they're not
\r
3001 value = (char *)props.GetItemValue(i).c_str();
\r
3004 if (value.IsEmpty())
\r
3008 value = value.Trim("\n\r");
\r
3011 value.Remove('\r');
\r
3013 if (!props.Add(_T("git:ignore"), (LPCSTR)value))
\r
3016 temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
\r
3017 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);
\r
3021 CTSVNPath basepath;
\r
3022 int nListboxEntries = GetItemCount();
\r
3023 for (int i=0; i<nListboxEntries; ++i)
\r
3025 FileEntry * entry = GetListEntry(i);
\r
3026 ASSERT(entry != NULL);
\r
3027 if (entry == NULL)
\r
3029 if (basepath.IsEmpty())
\r
3030 basepath = entry->basepath;
\r
3031 // since we ignored files with a mask (e.g. *.exe)
\r
3032 // we have to find find all files in the same
\r
3033 // folder (IsAncestorOf() returns TRUE for _all_ children,
\r
3034 // not just the immediate ones) which match the
\r
3035 // mask and remove them from the list too.
\r
3036 if ((entry->status == git_wc_status_unversioned)&&(parentFolder.IsAncestorOf(entry->path)))
\r
3038 CString f = entry->path.GetSVNPathString();
\r
3039 if (f.Mid(parentFolder.GetSVNPathString().GetLength()).Find('/')<=0)
\r
3041 if (CStringUtils::WildCardMatch(name, f))
\r
3046 toremove.push_back(f);
\r
3051 if (!m_bIgnoreRemoveOnly)
\r
3054 git_wc_status2_t * s;
\r
3055 CTSVNPath gitPath;
\r
3056 s = status.GetFirstFileStatus(parentFolder, gitPath, false, git_depth_empty);
\r
3059 // first check if the folder isn't already present in the list
\r
3060 bool bFound = false;
\r
3061 for (int i=0; i<nListboxEntries; ++i)
\r
3063 FileEntry * entry = GetListEntry(i);
\r
3064 if (entry->path.IsEquivalentTo(gitPath))
\r
3072 FileEntry * entry = new FileEntry();
\r
3073 entry->path = gitPath;
\r
3074 entry->basepath = basepath;
\r
3075 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
3076 entry->textstatus = s->text_status;
\r
3077 entry->propstatus = s->prop_status;
\r
3078 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);
\r
3079 entry->remotetextstatus = s->repos_text_status;
\r
3080 entry->remotepropstatus = s->repos_prop_status;
\r
3081 entry->inunversionedfolder = false;
\r
3082 entry->checked = true;
\r
3083 entry->inexternal = false;
\r
3084 entry->direct = false;
\r
3085 entry->isfolder = true;
\r
3086 entry->last_commit_date = 0;
\r
3087 entry->last_commit_rev = 0;
\r
3088 entry->remoterev = 0;
\r
3091 if (s->entry->url)
\r
3093 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));
\r
3096 if (s->entry && s->entry->present_props)
\r
3098 entry->present_props = s->entry->present_props;
\r
3100 m_arStatusArray.push_back(entry);
\r
3101 m_arListArray.push_back(m_arStatusArray.size()-1);
\r
3102 AddEntry(entry, langID, GetItemCount());
\r
3108 for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)
\r
3110 int nListboxEntries = GetItemCount();
\r
3111 for (int i=0; i<nListboxEntries; ++i)
\r
3113 if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)
\r
3115 RemoveListEntry(i);
\r
3125 case IDSVNLC_REVERT:
\r
3127 // If at least one item is not in the status "added"
\r
3128 // we ask for a confirmation
\r
3129 BOOL bConfirm = FALSE;
\r
3130 POSITION pos = GetFirstSelectedItemPosition();
\r
3132 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3134 //FileEntry * fentry = GetListEntry(index);
\r
3135 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
\r
3136 if(fentry && fentry->m_Action &CTGitPath::LOGACTIONS_MODIFIED )
\r
3144 str.Format(IDS_PROC_WARNREVERT,GetSelectedCount());
\r
3146 if (!bConfirm || CMessageBox::Show(this->m_hWnd, str, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION)==IDYES)
\r
3148 CTGitPathList targetList;
\r
3149 FillListOfSelectedItemPaths(targetList);
\r
3151 // make sure that the list is reverse sorted, so that
\r
3152 // children are removed before any parents
\r
3153 targetList.SortByPathname(true);
\r
3155 // put all reverted files in the trashbin, except the ones with 'added'
\r
3156 // status because they are not restored by the revert.
\r
3157 CTGitPathList delList;
\r
3158 POSITION pos = GetFirstSelectedItemPosition();
\r
3160 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3162 CTGitPath *entry=(CTGitPath *)GetItemData(index);
\r
3163 if (entry&&(!(entry->m_Action& CTGitPath::LOGACTIONS_ADDED)))
\r
3164 delList.AddPath(*entry);
\r
3166 if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))
\r
3167 delList.DeleteAllFiles(true);
\r
3169 if (g_Git.Revert(targetList))
\r
3171 CMessageBox::Show(this->m_hWnd, _T("Revert Fail"), _T("TortoiseSVN"), MB_ICONERROR);
\r
3175 for(int i=0;i<targetList.GetCount();i++)
\r
3177 int nListboxEntries = GetItemCount();
\r
3178 for (int nItem=0; nItem<nListboxEntries; ++nItem)
\r
3180 CTGitPath *path=(CTGitPath*)GetItemData(nItem);
\r
3181 if (path->GetGitPathString()==targetList[i].GetGitPathString())
\r
3183 if(path->m_Action & CTGitPath::LOGACTIONS_ADDED)
\r
3185 path->m_Action = CTGitPath::LOGACTIONS_UNVER;
\r
3186 SetEntryCheck(path,nItem,false);
\r
3187 SetItemGroup(nItem,1);
\r
3188 this->m_StatusFileList.RemoveItem(*path);
\r
3189 this->m_UnRevFileList.AddPath(*path);
\r
3190 //this->m_IgnoreFileList.RemoveItem(*path);
\r
3194 RemoveListEntry(nItem);
\r
3201 SaveColumnWidths();
\r
3202 Show(m_dwShow, 0, m_bShowFolders);
\r
3209 case IDSVNLC_COPY:
\r
3210 CopySelectedEntriesToClipboard(0);
\r
3212 case IDSVNLC_COPYEXT:
\r
3213 CopySelectedEntriesToClipboard((DWORD)-1);
\r
3216 case IDSVNLC_SAVEAS:
\r
3217 FileSaveAs(filepath);
\r
3220 case IDSVNLC_REVERTTOREV:
\r
3221 RevertSelectedItemToVersion();
\r
3224 case IDSVNLC_PROPERTIES:
\r
3226 CTSVNPathList targetList;
\r
3227 FillListOfSelectedItemPaths(targetList);
\r
3228 CEditPropertiesDlg dlg;
\r
3229 dlg.SetPathList(targetList);
\r
3231 if (dlg.HasChanged())
\r
3233 // since the user might have changed/removed/added
\r
3234 // properties recursively, we don't really know
\r
3235 // which items have changed their status.
\r
3236 // So tell the parent to do a refresh.
\r
3237 CWnd* pParent = GetParent();
\r
3238 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3240 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3245 case IDSVNLC_COMMIT:
\r
3247 CTSVNPathList targetList;
\r
3248 FillListOfSelectedItemPaths(targetList);
\r
3249 CTSVNPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
\r
3250 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
\r
3251 CString commandline = CPathUtils::GetAppDirectory();
\r
3252 commandline += _T("TortoiseProc.exe /command:commit /pathfile:\"");
\r
3253 commandline += tempFile.GetWinPathString();
\r
3254 commandline += _T("\"");
\r
3255 commandline += _T(" /deletepathfile");
\r
3256 CAppUtils::LaunchApplication(commandline, NULL, false);
\r
3260 case IDSVNLC_COMPAREWC:
\r
3262 POSITION pos = GetFirstSelectedItemPosition();
\r
3265 int index = GetNextSelectedItem(pos);
\r
3266 FileEntry * entry = GetListEntry(index);
\r
3267 ASSERT(entry != NULL);
\r
3268 if (entry == NULL)
\r
3270 SVNDiff diff(NULL, m_hWnd, true);
\r
3271 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
3272 git_revnum_t baseRev = entry->Revision;
\r
3273 diff.DiffFileAgainstBase(
\r
3274 entry->path, baseRev, entry->textstatus, entry->propstatus);
\r
3278 case IDSVNLC_GNUDIFF1:
\r
3280 SVNDiff diff(NULL, this->m_hWnd, true);
\r
3282 if (entry->remotestatus <= git_wc_status_normal)
\r
3283 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
\r
3285 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
\r
3288 case IDSVNLC_UPDATE:
\r
3290 CTSVNPathList targetList;
\r
3291 FillListOfSelectedItemPaths(targetList);
\r
3292 bool bAllExist = true;
\r
3293 for (int i=0; i<targetList.GetCount(); ++i)
\r
3295 if (!targetList[i].Exists())
\r
3297 bAllExist = false;
\r
3303 CSVNProgressDlg dlg;
\r
3304 dlg.SetCommand(CSVNProgressDlg::SVNProgress_Update);
\r
3305 dlg.SetPathList(targetList);
\r
3306 dlg.SetRevision(SVNRev::REV_HEAD);
\r
3311 CString sTempFile = CTempFiles::Instance().GetTempFilePath(false).GetWinPathString();
\r
3312 targetList.WriteToFile(sTempFile, false);
\r
3314 sCmd.Format(_T("\"%s\" /command:update /rev /pathfile:\"%s\" /deletepathfile"),
\r
3315 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), (LPCTSTR)sTempFile);
\r
3317 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
3322 case IDSVNLC_REMOVE:
\r
3325 CTSVNPathList itemsToRemove;
\r
3326 FillListOfSelectedItemPaths(itemsToRemove);
\r
3328 // We must sort items before removing, so that files are always removed
\r
3329 // *before* their parents
\r
3330 itemsToRemove.SortByPathname(true);
\r
3332 bool bSuccess = false;
\r
3333 if (git.Remove(itemsToRemove, FALSE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))
\r
3339 if ((git.Err->apr_err == SVN_ERR_UNVERSIONED_RESOURCE) ||
\r
3340 (git.Err->apr_err == SVN_ERR_CLIENT_MODIFIED))
\r
3342 CString msg, yes, no, yestoall;
\r
3343 msg.Format(IDS_PROC_REMOVEFORCE, (LPCTSTR)git.GetLastErrorMessage());
\r
3344 yes.LoadString(IDS_MSGBOX_YES);
\r
3345 no.LoadString(IDS_MSGBOX_NO);
\r
3346 yestoall.LoadString(IDS_PROC_YESTOALL);
\r
3347 UINT ret = CMessageBox::Show(m_hWnd, msg, _T("TortoiseSVN"), 2, IDI_ERROR, yes, no, yestoall);
\r
3348 if ((ret == 1)||(ret==3))
\r
3350 if (!git.Remove(itemsToRemove, TRUE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))
\r
3352 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3359 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3363 // The remove went ok, but we now need to run through the selected items again
\r
3364 // and update their status
\r
3365 POSITION pos = GetFirstSelectedItemPosition();
\r
3367 std::vector<int> entriesToRemove;
\r
3368 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3370 FileEntry * e = GetListEntry(index);
\r
3372 ((e->textstatus == git_wc_status_unversioned)||
\r
3373 (e->textstatus == git_wc_status_none)||
\r
3374 (e->textstatus == git_wc_status_ignored)))
\r
3376 if (GetCheck(index))
\r
3379 entriesToRemove.push_back(index);
\r
3383 e->textstatus = git_wc_status_deleted;
\r
3384 e->status = git_wc_status_deleted;
\r
3385 SetEntryCheck(e,index,true);
\r
3388 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)
\r
3390 RemoveListEntry(*it);
\r
3393 SaveColumnWidths();
\r
3394 Show(m_dwShow, 0, m_bShowFolders);
\r
3398 case IDSVNLC_DELETE:
\r
3400 CTSVNPathList pathlist;
\r
3401 FillListOfSelectedItemPaths(pathlist);
\r
3402 pathlist.RemoveChildren();
\r
3404 for (INT_PTR i=0; i<pathlist.GetCount(); ++i)
\r
3406 filelist += pathlist[i].GetWinPathString();
\r
3407 filelist += _T("|");
\r
3409 filelist += _T("|");
\r
3410 int len = filelist.GetLength();
\r
3411 TCHAR * buf = new TCHAR[len+2];
\r
3412 _tcscpy_s(buf, len+2, filelist);
\r
3413 for (int i=0; i<len; ++i)
\r
3414 if (buf[i] == '|')
\r
3416 SHFILEOPSTRUCT fileop;
\r
3417 fileop.hwnd = this->m_hWnd;
\r
3418 fileop.wFunc = FO_DELETE;
\r
3419 fileop.pFrom = buf;
\r
3420 fileop.pTo = NULL;
\r
3421 fileop.fFlags = FOF_NO_CONNECTED_ELEMENTS | ((GetAsyncKeyState(VK_SHIFT) & 0x8000) ? 0 : FOF_ALLOWUNDO);
\r
3422 fileop.lpszProgressTitle = _T("deleting file");
\r
3423 int result = SHFileOperation(&fileop);
\r
3426 if ( (result==0) && (!fileop.fAnyOperationsAborted) )
\r
3429 POSITION pos = NULL;
\r
3430 CTSVNPathList deletedlist; // to store list of deleted folders
\r
3431 while ((pos = GetFirstSelectedItemPosition()) != 0)
\r
3433 int index = GetNextSelectedItem(pos);
\r
3434 if (GetCheck(index))
\r
3437 FileEntry * fentry = GetListEntry(index);
\r
3438 if ((fentry)&&(fentry->isfolder))
\r
3439 deletedlist.AddPath(fentry->path);
\r
3440 RemoveListEntry(index);
\r
3442 // now go through the list of deleted folders
\r
3443 // and remove all their children from the list too!
\r
3444 int nListboxEntries = GetItemCount();
\r
3445 for (int folderindex = 0; folderindex < deletedlist.GetCount(); ++folderindex)
\r
3447 CTSVNPath folderpath = deletedlist[folderindex];
\r
3448 for (int i=0; i<nListboxEntries; ++i)
\r
3450 FileEntry * entry = GetListEntry(i);
\r
3451 if (folderpath.IsAncestorOf(entry->path))
\r
3453 RemoveListEntry(i--);
\r
3454 nListboxEntries--;
\r
3467 CTSVNPathList itemsToAdd;
\r
3468 FillListOfSelectedItemPaths(itemsToAdd);
\r
3470 // We must sort items before adding, so that folders are always added
\r
3471 // *before* any of their children
\r
3472 itemsToAdd.SortByPathname();
\r
3474 ProjectProperties props;
\r
3475 props.ReadPropsPathList(itemsToAdd);
\r
3476 if (git.Add(itemsToAdd, &props, git_depth_empty, TRUE, TRUE, TRUE))
\r
3478 // The add went ok, but we now need to run through the selected items again
\r
3479 // and update their status
\r
3480 POSITION pos = GetFirstSelectedItemPosition();
\r
3482 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3484 FileEntry * e = GetListEntry(index);
\r
3485 e->textstatus = git_wc_status_added;
\r
3486 e->propstatus = git_wc_status_none;
\r
3487 e->status = git_wc_status_added;
\r
3488 SetEntryCheck(e,index,true);
\r
3493 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3495 SaveColumnWidths();
\r
3496 Show(m_dwShow, 0, m_bShowFolders);
\r
3500 case IDSVNLC_ADD_RECURSIVE:
\r
3502 CTSVNPathList itemsToAdd;
\r
3503 FillListOfSelectedItemPaths(itemsToAdd);
\r
3506 dlg.m_pathList = itemsToAdd;
\r
3507 if (dlg.DoModal() == IDOK)
\r
3509 if (dlg.m_pathList.GetCount() == 0)
\r
3511 CSVNProgressDlg progDlg;
\r
3512 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Add);
\r
3513 progDlg.SetPathList(dlg.m_pathList);
\r
3514 ProjectProperties props;
\r
3515 props.ReadPropsPathList(dlg.m_pathList);
\r
3516 progDlg.SetProjectProperties(props);
\r
3517 progDlg.SetItemCount(dlg.m_pathList.GetCount());
\r
3518 progDlg.DoModal();
\r
3521 CWnd* pParent = GetParent();
\r
3522 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3524 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3530 case IDSVNLC_REPAIRMOVE:
\r
3532 POSITION pos = GetFirstSelectedItemPosition();
\r
3533 int index = GetNextSelectedItem(pos);
\r
3534 FileEntry * entry1 = NULL;
\r
3535 FileEntry * entry2 = NULL;
\r
3538 entry1 = GetListEntry(index);
\r
3539 git_wc_status_kind status1 = git_wc_status_none;
\r
3540 git_wc_status_kind status2 = git_wc_status_none;
\r
3543 status1 = entry1->status;
\r
3544 index = GetNextSelectedItem(pos);
\r
3547 entry2 = GetListEntry(index);
\r
3550 status2 = entry2->status;
\r
3551 if (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned)
\r
3553 FileEntry * tempentry = entry1;
\r
3555 entry2 = tempentry;
\r
3557 // entry1 was renamed to entry2 but outside of Subversion
\r
3558 // fix this by moving entry2 back to entry1 first,
\r
3559 // then do an git-move from entry1 to entry2
\r
3560 if (MoveFile(entry2->GetPath().GetWinPath(), entry1->GetPath().GetWinPath()))
\r
3563 if (!git.Move(CTSVNPathList(entry1->GetPath()), entry2->GetPath(), TRUE))
\r
3565 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3569 // check the previously unversioned item
\r
3570 entry1->checked = true;
\r
3571 // fixing the move was successful. We have to adjust the new status of the
\r
3573 // Since we don't know if the moved/renamed file had local modifications or not,
\r
3574 // we can't guess the new status. That means we have to refresh...
\r
3575 CWnd* pParent = GetParent();
\r
3576 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3578 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3585 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
\r
3586 FORMAT_MESSAGE_FROM_SYSTEM |
\r
3587 FORMAT_MESSAGE_IGNORE_INSERTS,
\r
3590 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
\r
3591 (LPTSTR) &lpMsgBuf,
\r
3595 MessageBox((LPCTSTR)lpMsgBuf, _T("Error"), MB_OK | MB_ICONINFORMATION );
\r
3596 LocalFree( lpMsgBuf );
\r
3604 case IDSVNLC_REMOVEFROMCS:
\r
3606 CTSVNPathList changelistItems;
\r
3607 FillListOfSelectedItemPaths(changelistItems);
\r
3610 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
\r
3612 // The changelists were removed, but we now need to run through the selected items again
\r
3613 // and update their changelist
\r
3614 POSITION pos = GetFirstSelectedItemPosition();
\r
3616 std::vector<int> entriesToRemove;
\r
3617 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3619 FileEntry * e = GetListEntry(index);
\r
3622 e->changelist.Empty();
\r
3623 if (e->status == git_wc_status_normal)
\r
3625 // remove the entry completely
\r
3626 entriesToRemove.push_back(index);
\r
3629 SetItemGroup(index, 0);
\r
3632 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)
\r
3634 RemoveListEntry(*it);
\r
3636 // TODO: Should we go through all entries here and check if we also could
\r
3637 // remove the changelist from m_changelists ?
\r
3641 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3646 case IDSVNLC_CREATEIGNORECS:
\r
3647 CreateChangeList(SVNSLC_IGNORECHANGELIST);
\r
3649 case IDSVNLC_CREATECS:
\r
3651 CCreateChangelistDlg dlg;
\r
3652 if (dlg.DoModal() == IDOK)
\r
3654 CreateChangeList(dlg.m_sName);
\r
3660 if (cmd < IDSVNLC_MOVETOCS)
\r
3662 CTSVNPathList changelistItems;
\r
3663 FillListOfSelectedItemPaths(changelistItems);
\r
3665 // find the changelist name
\r
3666 CString sChangelist;
\r
3667 int cmdID = IDSVNLC_MOVETOCS;
\r
3669 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
3671 if ((it->first.Compare(SVNSLC_IGNORECHANGELIST))&&(entry->changelist.Compare(it->first)))
\r
3675 sChangelist = it->first;
\r
3680 if (!sChangelist.IsEmpty())
\r
3683 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
\r
3685 // The changelists were moved, but we now need to run through the selected items again
\r
3686 // and update their changelist
\r
3687 POSITION pos = GetFirstSelectedItemPosition();
\r
3689 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3691 FileEntry * e = GetListEntry(index);
\r
3692 e->changelist = sChangelist;
\r
3693 if (!e->IsFolder())
\r
3695 if (m_changelists.find(e->changelist)!=m_changelists.end())
\r
3696 SetItemGroup(index, m_changelists[e->changelist]);
\r
3698 SetItemGroup(index, 0);
\r
3704 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3714 AfxGetApp()->DoWaitCursor(-1);
\r
3715 GetStatisticsString();
\r
3716 int iItemCountAfterMenuCmd = GetItemCount();
\r
3717 //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)
\r
3719 // CWnd* pParent = GetParent();
\r
3720 // if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3722 // pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);
\r
3725 } // if (popup.CreatePopupMenu())
\r
3726 } // if (selIndex >= 0)
\r
3730 void CGitStatusListCtrl::OnContextMenuHeader(CWnd * pWnd, CPoint point)
\r
3732 bool XPorLater = false;
\r
3733 OSVERSIONINFOEX inf;
\r
3734 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
3735 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
3736 GetVersionEx((OSVERSIONINFO *)&inf);
\r
3737 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
3738 if (fullver >= 0x0501)
\r
3741 CHeaderCtrl * pHeaderCtrl = (CHeaderCtrl *)pWnd;
\r
3742 if ((point.x == -1) && (point.y == -1))
\r
3745 pHeaderCtrl->GetItemRect(0, &rect);
\r
3746 ClientToScreen(&rect);
\r
3747 point = rect.CenterPoint();
\r
3749 Locker lock(m_critSec);
\r
3751 if (popup.CreatePopupMenu())
\r
3753 int columnCount = m_ColumnManager.GetColumnCount();
\r
3756 UINT uCheckedFlags = MF_STRING | MF_ENABLED | MF_CHECKED;
\r
3757 UINT uUnCheckedFlags = MF_STRING | MF_ENABLED;
\r
3759 // build control menu
\r
3763 temp.LoadString(IDS_STATUSLIST_SHOWGROUPS);
\r
3764 popup.AppendMenu(IsGroupViewEnabled() ? uCheckedFlags : uUnCheckedFlags, columnCount, temp);
\r
3767 if (m_ColumnManager.AnyUnusedProperties())
\r
3769 temp.LoadString(IDS_STATUSLIST_REMOVEUNUSEDPROPS);
\r
3770 popup.AppendMenu(uUnCheckedFlags, columnCount+1, temp);
\r
3773 temp.LoadString(IDS_STATUSLIST_RESETCOLUMNORDER);
\r
3774 popup.AppendMenu(uUnCheckedFlags, columnCount+2, temp);
\r
3775 popup.AppendMenu(MF_SEPARATOR);
\r
3777 // standard columns
\r
3779 for (int i = 1; i < SVNSLC_NUMCOLUMNS; ++i)
\r
3781 popup.AppendMenu ( m_ColumnManager.IsVisible(i)
\r
3785 , m_ColumnManager.GetName(i));
\r
3788 // user-prop columns:
\r
3789 // find relevant ones and sort 'em
\r
3791 std::map<CString, int> sortedProps;
\r
3792 for (int i = SVNSLC_NUMCOLUMNS; i < columnCount; ++i)
\r
3793 if (m_ColumnManager.IsRelevant(i))
\r
3794 sortedProps[m_ColumnManager.GetName(i)] = i;
\r
3796 if (!sortedProps.empty())
\r
3798 // add 'em to the menu
\r
3800 popup.AppendMenu(MF_SEPARATOR);
\r
3802 typedef std::map<CString, int>::const_iterator CIT;
\r
3803 for ( CIT iter = sortedProps.begin(), end = sortedProps.end()
\r
3807 popup.AppendMenu ( m_ColumnManager.IsVisible(iter->second)
\r
3815 // show menu & let user pick an entry
\r
3817 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
3818 if ((cmd >= 1)&&(cmd < columnCount))
\r
3820 m_ColumnManager.SetVisible (cmd, !m_ColumnManager.IsVisible(cmd));
\r
3822 else if (cmd == columnCount)
\r
3824 EnableGroupView(!IsGroupViewEnabled());
\r
3826 else if (cmd == columnCount+1)
\r
3828 m_ColumnManager.RemoveUnusedProps();
\r
3830 else if (cmd == columnCount+2)
\r
3832 m_ColumnManager.ResetColumns (m_dwDefaultColumns);
\r
3837 void CGitStatusListCtrl::OnContextMenu(CWnd* pWnd, CPoint point)
\r
3842 OnContextMenuList(pWnd, point);
\r
3843 } // if (pWnd == this)
\r
3844 else if (pWnd == GetHeaderCtrl())
\r
3846 OnContextMenuHeader(pWnd, point);
\r
3850 void CGitStatusListCtrl::CreateChangeList(const CString& name)
\r
3853 CTGitPathList changelistItems;
\r
3854 FillListOfSelectedItemPaths(changelistItems);
\r
3856 if (git.AddToChangeList(changelistItems, name, git_depth_empty))
\r
3858 TCHAR groupname[1024];
\r
3859 LVGROUP grp = {0};
\r
3860 grp.cbSize = sizeof(LVGROUP);
\r
3861 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
3862 _tcsncpy_s(groupname, 1024, name, 1023);
\r
3863 grp.pszHeader = groupname;
\r
3864 grp.iGroupId = (int)m_changelists.size();
\r
3865 grp.uAlign = LVGA_HEADER_LEFT;
\r
3866 m_changelists[name] = InsertGroup(-1, &grp);
\r
3868 PrepareGroups(true);
\r
3870 POSITION pos = GetFirstSelectedItemPosition();
\r
3872 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3874 FileEntry * e = GetListEntry(index);
\r
3875 e->changelist = name;
\r
3876 SetEntryCheck(e, index, FALSE);
\r
3879 for (index = 0; index < GetItemCount(); ++index)
\r
3881 FileEntry * e = GetListEntry(index);
\r
3882 if (m_changelists.find(e->changelist)!=m_changelists.end())
\r
3883 SetItemGroup(index, m_changelists[e->changelist]);
\r
3885 SetItemGroup(index, 0);
\r
3890 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("Tortoisegit"), MB_ICONERROR);
\r
3895 void CGitStatusListCtrl::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
\r
3898 Locker lock(m_critSec);
\r
3899 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
3904 if (pNMLV->iItem < 0)
\r
3906 if (!IsGroupViewEnabled())
\r
3909 DWORD ptW = GetMessagePos();
\r
3910 pt.x = GET_X_LPARAM(ptW);
\r
3911 pt.y = GET_Y_LPARAM(ptW);
\r
3912 ScreenToClient(&pt);
\r
3913 int group = GetGroupFromPoint(&pt);
\r
3916 // check/uncheck the whole group depending on the check-state
\r
3917 // of the first item in the group
\r
3919 bool bCheck = false;
\r
3920 bool bFirst = false;
\r
3922 for (int i=0; i<GetItemCount(); ++i)
\r
3924 SecureZeroMemory(&lv, sizeof(LVITEM));
\r
3925 lv.mask = LVIF_GROUPID;
\r
3928 if (lv.iGroupId == group)
\r
3930 CTGitPath *entry=(CTGitPath*)GetItemData(i);
\r
3934 bCheck = !GetCheck(i);
\r
3939 bool bOldCheck = !!GetCheck(i);
\r
3940 SetEntryCheck(entry, i, bCheck);
\r
3941 if (bCheck != bOldCheck)
\r
3951 GetStatisticsString();
\r
3957 CTGitPath *file=(CTGitPath*)GetItemData(pNMLV->iItem);
\r
3959 if( file->m_Action&CTGitPath::LOGACTIONS_UNMERGED )
\r
3961 CAppUtils::ConflictEdit(*file,false);
\r
3965 StartDiff(pNMLV->iItem);
\r
3969 void CGitStatusListCtrl::StartDiffWC(int fileindex)
\r
3975 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
\r
3978 CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);
\r
3980 CGitDiff::Diff(&file1,&file1,
\r
3981 CString(GIT_REV_ZERO),
\r
3982 m_CurrentVersion);
\r
3986 void CGitStatusListCtrl::StartDiff(int fileindex)
\r
3991 CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);
\r
3993 if(file1.m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY))
\r
3995 file2.SetFromGit(file1.GetGitOldPathString());
\r
4001 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
\r
4003 if( g_Git.IsInitRepos())
\r
4004 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
\r
4005 CString(GIT_REV_ZERO));
\r
4006 else if( file1.m_Action&CTGitPath::LOGACTIONS_DELETED )
\r
4007 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
\r
4008 GitRev::GetHead(),false);
\r
4010 CGitDiff::Diff(&file1,&file2,
\r
4011 CString(GIT_REV_ZERO),
\r
4012 GitRev::GetHead());
\r
4015 CGitDiff::Diff(&file1,&file2,
\r
4017 m_CurrentVersion+_T("~1"));
\r
4020 if (fileindex < 0)
\r
4022 FileEntry * entry = GetListEntry(fileindex);
\r
4023 ASSERT(entry != NULL);
\r
4024 if (entry == NULL)
\r
4026 if (((entry->status == git_wc_status_normal)&&(entry->remotestatus <= git_wc_status_normal))||
\r
4027 (entry->status == git_wc_status_unversioned)||(entry->status == git_wc_status_none))
\r
4029 int ret = (int)ShellExecute(this->m_hWnd, NULL, entry->path.GetWinPath(), NULL, NULL, SW_SHOW);
\r
4030 if (ret <= HINSTANCE_ERROR)
\r
4032 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
4033 cmd += entry->path.GetWinPathString();
\r
4034 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
4039 GitDiff diff(NULL, m_hWnd, true);
\r
4040 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
4042 entry->path, entry->textstatus, entry->propstatus,
\r
4043 entry->remotetextstatus, entry->remotepropstatus);
\r
4047 CString CGitStatusListCtrl::GetStatisticsString()
\r
4050 CString sNormal, sAdded, sDeleted, sModified, sConflicted, sUnversioned;
\r
4051 WORD langID = (WORD)(DWORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
4052 TCHAR buf[MAX_STATUS_STRING_LENGTH];
\r
4053 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_normal, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4055 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_added, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4057 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_deleted, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4059 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_modified, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4061 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_conflicted, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4062 sConflicted = buf;
\r
4063 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_unversioned, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4064 sUnversioned = buf;
\r
4066 sToolTip.Format(_T("%s = %d\n%s = %d\n%s = %d\n%s = %d\n%s = %d\n%s = %d"),
\r
4067 (LPCTSTR)sNormal, m_nNormal,
\r
4068 (LPCTSTR)sUnversioned, m_nUnversioned,
\r
4069 (LPCTSTR)sModified, m_nModified,
\r
4070 (LPCTSTR)sAdded, m_nAdded,
\r
4071 (LPCTSTR)sDeleted, m_nDeleted,
\r
4072 (LPCTSTR)sConflicted, m_nConflicted
\r
4075 sStats.Format(IDS_COMMITDLG_STATISTICSFORMAT, m_nSelected, GetItemCount());
\r
4078 m_pStatLabel->SetWindowText(sStats);
\r
4081 if (m_pSelectButton)
\r
4083 if (m_nSelected == 0)
\r
4084 m_pSelectButton->SetCheck(BST_UNCHECKED);
\r
4085 else if (m_nSelected != GetItemCount())
\r
4086 m_pSelectButton->SetCheck(BST_INDETERMINATE);
\r
4088 m_pSelectButton->SetCheck(BST_CHECKED);
\r
4091 if (m_pConfirmButton)
\r
4093 m_pConfirmButton->EnableWindow(m_nSelected>0);
\r
4101 CString CGitStatusListCtrl::GetCommonDirectory(bool bStrict)
\r
4105 // not strict means that the selected folder has priority
\r
4106 if (!m_StatusFileList.GetCommonDirectory().IsEmpty())
\r
4107 return m_StatusFileList.GetCommonDirectory().GetWinPath();
\r
4110 CTGitPath commonBaseDirectory;
\r
4111 int nListItems = GetItemCount();
\r
4112 for (int i=0; i<nListItems; ++i)
\r
4114 CTGitPath baseDirectory,*p= (CTGitPath*)this->GetItemData(i);
\r
4118 baseDirectory = p->GetDirectory();
\r
4120 if(commonBaseDirectory.IsEmpty())
\r
4122 commonBaseDirectory = baseDirectory;
\r
4126 if (commonBaseDirectory.GetWinPathString().GetLength() > baseDirectory.GetWinPathString().GetLength())
\r
4128 if (baseDirectory.IsAncestorOf(commonBaseDirectory))
\r
4129 commonBaseDirectory = baseDirectory;
\r
4133 return g_Git.m_CurrentDir+CString(_T("\\"))+commonBaseDirectory.GetWinPath();
\r
4136 CTGitPath CGitStatusListCtrl::GetCommonURL(bool bStrict)
\r
4138 CTGitPath commonBaseURL;
\r
4143 // not strict means that the selected folder has priority
\r
4144 if (!m_StatusUrlList.GetCommonDirectory().IsEmpty())
\r
4145 return m_StatusUrlList.GetCommonDirectory();
\r
4148 int nListItems = GetItemCount();
\r
4149 for (int i=0; i<nListItems; ++i)
\r
4151 const CTGitPath& baseURL = CTGitPath(GetListEntry(i)->GetURL());
\r
4152 if (baseURL.IsEmpty())
\r
4153 continue; // item has no url
\r
4154 if(commonBaseURL.IsEmpty())
\r
4156 commonBaseURL = baseURL;
\r
4160 if (commonBaseURL.GetGitPathString().GetLength() > baseURL.GetGitPathString().GetLength())
\r
4162 if (baseURL.IsAncestorOf(commonBaseURL))
\r
4163 commonBaseURL = baseURL;
\r
4169 return commonBaseURL;
\r
4172 void CGitStatusListCtrl::SelectAll(bool bSelect, bool bIncludeNoCommits)
\r
4174 CWaitCursor waitCursor;
\r
4175 // block here so the LVN_ITEMCHANGED messages
\r
4180 int nListItems = GetItemCount();
\r
4182 m_nSelected = nListItems;
\r
4186 for (int i=0; i<nListItems; ++i)
\r
4188 //FileEntry * entry = GetListEntry(i);
\r
4189 //ASSERT(entry != NULL);
\r
4190 CTGitPath *path = (CTGitPath *) GetItemData(i);
\r
4193 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))
\r
4194 SetEntryCheck(path,i,bSelect);
\r
4197 // unblock before redrawing
\r
4200 GetStatisticsString();
\r
4204 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR *pNMHDR, LRESULT *pResult)
\r
4206 LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast<LPNMLVGETINFOTIP>(pNMHDR);
\r
4211 if (GetListEntry(pGetInfoTip->iItem >= 0))
\r
4212 if (pGetInfoTip->cchTextMax > GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString().GetLength())
\r
4214 if (GetListEntry(pGetInfoTip->iItem)->GetRelativeGitPath().Compare(GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString())!= 0)
\r
4215 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString(), pGetInfoTip->cchTextMax);
\r
4216 else if (GetStringWidth(GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString()) > GetColumnWidth(pGetInfoTip->iItem))
\r
4217 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString(), pGetInfoTip->cchTextMax);
\r
4222 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult)
\r
4224 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
4226 // Take the default processing unless we set this to something else below.
\r
4227 *pResult = CDRF_DODEFAULT;
\r
4229 // First thing - check the draw stage. If it's the control's prepaint
\r
4230 // stage, then tell Windows we want messages for every item.
\r
4232 switch (pLVCD->nmcd.dwDrawStage)
\r
4234 case CDDS_PREPAINT:
\r
4235 *pResult = CDRF_NOTIFYITEMDRAW;
\r
4237 case CDDS_ITEMPREPAINT:
\r
4239 // This is the prepaint stage for an item. Here's where we set the
\r
4240 // item's text color. Our return value will tell Windows to draw the
\r
4241 // item itself, but it will use the new color we set here.
\r
4243 // Tell Windows to paint the control itself.
\r
4244 *pResult = CDRF_DODEFAULT;
\r
4248 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
4250 if (m_arStatusArray.size() > (DWORD_PTR)pLVCD->nmcd.dwItemSpec)
\r
4253 //FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);
\r
4254 CTGitPath *entry=(CTGitPath *)GetItemData((int)pLVCD->nmcd.dwItemSpec);
\r
4255 if (entry == NULL)
\r
4260 // black : unversioned, normal
\r
4262 // blue : modified
\r
4263 // brown : missing, deleted, replaced
\r
4264 // green : merged (or potential merges)
\r
4265 // red : conflicts or sure conflicts
\r
4266 if(entry->m_Action & CTGitPath::LOGACTIONS_GRAY)
\r
4268 crText = RGB(128,128,128);
\r
4270 }else if(entry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
\r
4272 crText = m_Colors.GetColor(CColors::Conflict);
\r
4274 }else if(entry->m_Action & (CTGitPath::LOGACTIONS_MODIFIED))
\r
4276 crText = m_Colors.GetColor(CColors::Modified);
\r
4278 }else if(entry->m_Action & (CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))
\r
4280 crText = m_Colors.GetColor(CColors::Added);
\r
4282 else if(entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
\r
4284 crText = m_Colors.GetColor(CColors::DeletedNode);
\r
4286 else if(entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
\r
4288 crText = m_Colors.GetColor(CColors::RenamedNode);
\r
4291 crText = GetSysColor(COLOR_WINDOWTEXT);
\r
4293 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
4294 pLVCD->clrText = crText;
\r
4301 BOOL CGitStatusListCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
\r
4304 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
\r
4307 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
\r
4309 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
\r
4311 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
\r
4316 void CGitStatusListCtrl::RemoveListEntry(int index)
\r
4319 Locker lock(m_critSec);
\r
4320 DeleteItem(index);
\r
4322 m_arStatusArray.erase(m_arStatusArray.begin()+index);
\r
4325 delete m_arStatusArray[m_arListArray[index]];
\r
4326 m_arStatusArray.erase(m_arStatusArray.begin()+m_arListArray[index]);
\r
4327 m_arListArray.erase(m_arListArray.begin()+index);
\r
4328 for (int i=index; i< (int)m_arListArray.size(); ++i)
\r
4330 m_arListArray[i]--;
\r
4335 ///< Set a checkbox on an entry in the listbox
\r
4336 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync
\r
4337 void CGitStatusListCtrl::SetEntryCheck(CTGitPath* pEntry, int listboxIndex, bool bCheck)
\r
4339 pEntry->m_Checked = bCheck;
\r
4340 SetCheck(listboxIndex, bCheck);
\r
4344 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry* parentEntry, bool bCheck)
\r
4347 int nListItems = GetItemCount();
\r
4348 for (int j=0; j< nListItems ; ++j)
\r
4350 FileEntry * childEntry = GetListEntry(j);
\r
4351 ASSERT(childEntry != NULL);
\r
4352 if (childEntry == NULL || childEntry == parentEntry)
\r
4354 if (childEntry->checked != bCheck)
\r
4356 if (parentEntry->path.IsAncestorOf(childEntry->path))
\r
4358 SetEntryCheck(childEntry,j,bCheck);
\r
4374 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList& pathList)
\r
4378 int nListItems = GetItemCount();
\r
4379 for (int i=0; i< nListItems; i++)
\r
4381 CTGitPath * entry = (CTGitPath*)GetItemData(i);
\r
4382 ASSERT(entry != NULL);
\r
4383 if (entry->m_Checked)
\r
4385 pathList.AddPath(*entry);
\r
4388 pathList.SortByPathname();
\r
4393 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)
\r
4394 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList& pathList, bool bNoIgnored)
\r
4398 POSITION pos = GetFirstSelectedItemPosition();
\r
4400 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
4402 CTGitPath * entry = (CTGitPath*)GetItemData(index);
\r
4403 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))
\r
4405 pathList.AddPath(*entry);
\r
4409 UINT CGitStatusListCtrl::OnGetDlgCode()
\r
4411 // we want to process the return key and not have that one
\r
4412 // routed to the default pushbutton
\r
4413 return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS;
\r
4416 void CGitStatusListCtrl::OnNMReturn(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
4421 POSITION pos = GetFirstSelectedItemPosition();
\r
4424 int index = GetNextSelectedItem(pos);
\r
4429 void CGitStatusListCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
\r
4431 // Since we catch all keystrokes (to have the enter key processed here instead
\r
4432 // of routed to the default pushbutton) we have to make sure that other
\r
4433 // keys like Tab and Esc still do what they're supposed to do
\r
4434 // Tab = change focus to next/previous control
\r
4435 // Esc = quit the dialog
\r
4440 ::PostMessage(GetParent()->GetSafeHwnd(), WM_NEXTDLGCTL, GetKeyState(VK_SHIFT)&0x8000, 0);
\r
4446 ::SendMessage(GetParent()->GetSafeHwnd(), WM_CLOSE, 0, 0);
\r
4451 CListCtrl::OnKeyDown(nChar, nRepCnt, nFlags);
\r
4454 void CGitStatusListCtrl::PreSubclassWindow()
\r
4456 CListCtrl::PreSubclassWindow();
\r
4457 EnableToolTips(TRUE);
\r
4458 m_Theme.SetWindowTheme(GetSafeHwnd(), L"Explorer", NULL);
\r
4461 INT_PTR CGitStatusListCtrl::OnToolHitTest(CPoint point, TOOLINFO* pTI) const
\r
4465 row = CellRectFromPoint(point, &cellrect, &col );
\r
4471 pTI->hwnd = m_hWnd;
\r
4472 pTI->uId = (UINT)((row<<10)+(col&0x3ff)+1);
\r
4473 pTI->lpszText = LPSTR_TEXTCALLBACK;
\r
4475 pTI->rect = cellrect;
\r
4480 int CGitStatusListCtrl::CellRectFromPoint(CPoint& point, RECT *cellrect, int *col) const
\r
4484 // Make sure that the ListView is in LVS_REPORT
\r
4485 if ((GetWindowLong(m_hWnd, GWL_STYLE) & LVS_TYPEMASK) != LVS_REPORT)
\r
4488 // Get the top and bottom row visible
\r
4489 int row = GetTopIndex();
\r
4490 int bottom = row + GetCountPerPage();
\r
4491 if (bottom > GetItemCount())
\r
4492 bottom = GetItemCount();
\r
4494 // Get the number of columns
\r
4495 CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
\r
4496 int nColumnCount = pHeader->GetItemCount();
\r
4498 // Loop through the visible rows
\r
4499 for ( ;row <=bottom;row++)
\r
4501 // Get bounding rect of item and check whether point falls in it.
\r
4503 GetItemRect(row, &rect, LVIR_BOUNDS);
\r
4504 if (rect.PtInRect(point))
\r
4506 // Now find the column
\r
4507 for (colnum = 0; colnum < nColumnCount; colnum++)
\r
4509 int colwidth = GetColumnWidth(colnum);
\r
4510 if (point.x >= rect.left && point.x <= (rect.left + colwidth))
\r
4513 GetClientRect(&rectClient);
\r
4516 rect.right = rect.left + colwidth;
\r
4518 // Make sure that the right extent does not exceed
\r
4519 // the client area
\r
4520 if (rect.right > rectClient.right)
\r
4521 rect.right = rectClient.right;
\r
4525 rect.left += colwidth;
\r
4532 BOOL CGitStatusListCtrl::OnToolTipText(UINT /*id*/, NMHDR *pNMHDR, LRESULT *pResult)
\r
4535 TOOLTIPTEXTW* pTTTW = (TOOLTIPTEXTW*)pNMHDR;
\r
4536 CString strTipText;
\r
4537 UINT_PTR nID = pNMHDR->idFrom;
\r
4542 UINT_PTR row = ((nID-1) >> 10) & 0x3fffff;
\r
4543 UINT_PTR col = (nID-1) & 0x3ff;
\r
4546 return FALSE; // no custom tooltip for the path, we use the infotip there!
\r
4548 // get the internal column from the visible columns
\r
4549 int internalcol = 0;
\r
4550 UINT_PTR currentcol = 0;
\r
4551 for (; (currentcol != col)
\r
4552 && (internalcol < m_ColumnManager.GetColumnCount()-1)
\r
4555 if (m_ColumnManager.IsVisible (internalcol))
\r
4559 AFX_MODULE_THREAD_STATE* pModuleThreadState = AfxGetModuleThreadState();
\r
4560 CToolTipCtrl* pToolTip = pModuleThreadState->m_pToolTip;
\r
4561 pToolTip->SendMessage(TTM_SETMAXTIPWIDTH, 0, 300);
\r
4564 if ((internalcol == 2)||(internalcol == 4))
\r
4566 FileEntry *fentry = GetListEntry(row);
\r
4569 if (fentry->copied)
\r
4572 url.Format(IDS_STATUSLIST_COPYFROM, (LPCTSTR)CPathUtils::PathUnescape(fentry->copyfrom_url), (LONG)fentry->copyfrom_rev);
\r
4573 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);
\r
4576 if (fentry->switched)
\r
4579 url.Format(IDS_STATUSLIST_SWITCHEDTO, (LPCTSTR)CPathUtils::PathUnescape(fentry->url));
\r
4580 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);
\r
4583 if (fentry->keeplocal)
\r
4585 lstrcpyn(pTTTW->szText, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_KEEPLOCAL)), 80);
\r
4594 void CGitStatusListCtrl::OnPaint()
\r
4597 if ((m_bBusy)||(m_bEmpty))
\r
4602 if (m_sBusy.IsEmpty())
\r
4603 str.LoadString(IDS_STATUSLIST_BUSYMSG);
\r
4609 if (m_sEmpty.IsEmpty())
\r
4610 str.LoadString(IDS_STATUSLIST_EMPTYMSG);
\r
4614 COLORREF clrText = ::GetSysColor(COLOR_WINDOWTEXT);
\r
4615 COLORREF clrTextBk;
\r
4616 if (IsWindowEnabled())
\r
4617 clrTextBk = ::GetSysColor(COLOR_WINDOW);
\r
4619 clrTextBk = ::GetSysColor(COLOR_3DFACE);
\r
4622 GetClientRect(&rc);
\r
4624 pHC = GetHeaderCtrl();
\r
4628 pHC->GetItemRect(0, &rcH);
\r
4629 rc.top += rcH.bottom;
\r
4631 CDC* pDC = GetDC();
\r
4633 CMyMemDC memDC(pDC, &rc);
\r
4635 memDC.SetTextColor(clrText);
\r
4636 memDC.SetBkColor(clrTextBk);
\r
4637 memDC.FillSolidRect(rc, clrTextBk);
\r
4639 CGdiObject * oldfont = memDC.SelectStockObject(DEFAULT_GUI_FONT);
\r
4640 memDC.DrawText(str, rc, DT_CENTER | DT_VCENTER |
\r
4641 DT_WORDBREAK | DT_NOPREFIX | DT_NOCLIP);
\r
4642 memDC.SelectObject(oldfont);
\r
4648 // prevent users from extending our hidden (size 0) columns
\r
4649 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR *pNMHDR, LRESULT *pResult)
\r
4651 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
4653 if ((phdr->iItem < 0)||(phdr->iItem >= SVNSLC_NUMCOLUMNS))
\r
4656 if (m_ColumnManager.IsVisible (phdr->iItem))
\r
4663 // prevent any function from extending our hidden (size 0) columns
\r
4664 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
\r
4666 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
4668 if ((phdr->iItem < 0)||(phdr->iItem >= m_ColumnManager.GetColumnCount()))
\r
4674 // visible columns may be modified
\r
4676 if (m_ColumnManager.IsVisible (phdr->iItem))
\r
4682 // columns already marked as "invisible" internally may be (re-)sized to 0
\r
4684 if ( (phdr->pitem != NULL)
\r
4685 && (phdr->pitem->mask == HDI_WIDTH)
\r
4686 && (phdr->pitem->cxy == 0))
\r
4692 if ( (phdr->pitem != NULL)
\r
4693 && (phdr->pitem->mask != HDI_WIDTH))
\r
4702 void CGitStatusListCtrl::OnDestroy()
\r
4704 SaveColumnWidths(true);
\r
4705 CListCtrl::OnDestroy();
\r
4708 void CGitStatusListCtrl::OnBeginDrag(NMHDR* /*pNMHDR*/, LRESULT* pResult)
\r
4711 Locker lock(m_critSec);
\r
4712 CDropFiles dropFiles; // class for creating DROPFILES struct
\r
4715 POSITION pos = GetFirstSelectedItemPosition();
\r
4716 while ( (index = GetNextSelectedItem(pos)) >= 0 )
\r
4718 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
\r
4719 CTGitPath path = fentry->GetPath();
\r
4720 dropFiles.AddFile( path.GetWinPathString() );
\r
4723 if ( dropFiles.GetCount()>0 )
\r
4725 m_bOwnDrag = true;
\r
4726 dropFiles.CreateStructure();
\r
4727 m_bOwnDrag = false;
\r
4733 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry /* = false */)
\r
4735 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
4736 for (int col = 0; col <= maxcol; col++)
\r
4737 if (m_ColumnManager.IsVisible (col))
\r
4738 m_ColumnManager.ColumnResized (col);
\r
4740 if (bSaveToRegistry)
\r
4741 m_ColumnManager.WriteSettings();
\r
4744 bool CGitStatusListCtrl::EnableFileDrop()
\r
4746 m_bFileDropsEnabled = true;
\r
4750 bool CGitStatusListCtrl::HasPath(const CTGitPath& path)
\r
4753 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
4755 FileEntry * entry = m_arStatusArray[i];
\r
4756 if (entry->GetPath().IsEquivalentTo(path))
\r
4763 bool CGitStatusListCtrl::IsPathShown(const CTGitPath& path)
\r
4766 int itemCount = GetItemCount();
\r
4767 for (int i=0; i < itemCount; i++)
\r
4769 FileEntry * entry = GetListEntry(i);
\r
4770 if (entry->GetPath().IsEquivalentTo(path))
\r
4777 BOOL CGitStatusListCtrl::PreTranslateMessage(MSG* pMsg)
\r
4779 if (pMsg->message == WM_KEYDOWN)
\r
4781 switch (pMsg->wParam)
\r
4785 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
\r
4787 // select all entries
\r
4788 for (int i=0; i<GetItemCount(); ++i)
\r
4790 SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
\r
4799 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
\r
4801 // copy all selected paths to the clipboard
\r
4802 if (GetAsyncKeyState(VK_SHIFT)&0x8000)
\r
4803 CopySelectedEntriesToClipboard(SVNSLC_COLSTATUS);
\r
4805 CopySelectedEntriesToClipboard(0);
\r
4813 return CListCtrl::PreTranslateMessage(pMsg);
\r
4816 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols)
\r
4819 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
4820 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
4821 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
4823 CString sClipboard;
\r
4826 if (GetSelectedCount() == 0)
\r
4828 // first add the column titles as the first line
\r
4829 temp.LoadString(IDS_STATUSLIST_COLFILE);
\r
4830 sClipboard = temp;
\r
4832 DWORD selection = 0;
\r
4833 for (int i = 0, count = m_ColumnManager.GetColumnCount(); i < count; ++i)
\r
4834 if ( ((dwCols == -1) && m_ColumnManager.IsVisible (i))
\r
4835 || ((dwCols != 1) && (i < 32) && ((dwCols & (1 << i)) != 0)))
\r
4837 sClipboard += _T("\t") + m_ColumnManager.GetName(i);
\r
4840 selection += 1 << i;
\r
4843 sClipboard += _T("\r\n");
\r
4845 POSITION pos = GetFirstSelectedItemPosition();
\r
4847 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
4849 CTGitPath * entry = (CTGitPath*)GetItemData(index);
\r
4853 sClipboard += entry->GetWinPathString();
\r
4854 if (selection & SVNSLC_COLFILENAME)
\r
4856 sClipboard += _T("\t")+entry->GetFileOrDirectoryName();
\r
4858 if (selection & SVNSLC_COLEXT)
\r
4860 sClipboard += _T("\t")+entry->GetFileExtension();
\r
4863 if (selection & SVNSLC_COLSTATUS)
\r
4866 if (entry->isNested)
\r
4868 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
4872 GitStatus::GetStatusString(hResourceHandle, entry->status, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4873 if ((entry->copied)&&(_tcslen(buf)>1))
\r
4874 _tcscat_s(buf, 100, _T(" (+)"));
\r
4875 if ((entry->switched)&&(_tcslen(buf)>1))
\r
4876 _tcscat_s(buf, 100, _T(" (s)"));
\r
4877 if ((entry->status == entry->propstatus)&&
\r
4878 (entry->status != git_wc_status_normal)&&
\r
4879 (entry->status != git_wc_status_unversioned)&&
\r
4880 (!GitStatus::IsImportant(entry->textstatus)))
\r
4881 _tcscat_s(buf, 100, ponly);
\r
4885 sClipboard += _T("\t")+entry->GetActionName();
\r
4888 if (selection & SVNSLC_COLTEXTSTATUS)
\r
4891 if (entry->isNested)
\r
4893 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
4897 GitStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4898 if ((entry->copied)&&(_tcslen(buf)>1))
\r
4899 _tcscat_s(buf, 100, _T(" (+)"));
\r
4900 if ((entry->switched)&&(_tcslen(buf)>1))
\r
4901 _tcscat_s(buf, 100, _T(" (s)"));
\r
4904 sClipboard += _T("\t")+temp;
\r
4908 if (selection & SVNSLC_COLREMOTESTATUS)
\r
4910 if (entry->isNested)
\r
4912 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
4916 GitStatus::GetStatusString(hResourceHandle, entry->remotestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4917 if ((entry->copied)&&(_tcslen(buf)>1))
\r
4918 _tcscat_s(buf, 100, _T(" (+)"));
\r
4919 if ((entry->switched)&&(_tcslen(buf)>1))
\r
4920 _tcscat_s(buf, 100, _T(" (s)"));
\r
4921 if ((entry->remotestatus == entry->remotepropstatus)&&
\r
4922 (entry->remotestatus != git_wc_status_none)&&
\r
4923 (entry->remotestatus != git_wc_status_normal)&&
\r
4924 (entry->remotestatus != git_wc_status_unversioned)&&
\r
4925 (!SVNStatus::IsImportant(entry->remotetextstatus)))
\r
4926 _tcscat_s(buf, 100, ponly);
\r
4929 sClipboard += _T("\t")+temp;
\r
4931 if (selection & GitSLC_COLPROPSTATUS)
\r
4933 if (entry->isNested)
\r
4939 GitStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4940 if ((entry->copied)&&(_tcslen(buf)>1))
\r
4941 _tcscat_s(buf, 100, _T(" (+)"));
\r
4942 if ((entry->switched)&&(_tcslen(buf)>1))
\r
4943 _tcscat_s(buf, 100, _T(" (s)"));
\r
4946 sClipboard += _T("\t")+temp;
\r
4948 if (selection & SVNSLC_COLREMOTETEXT)
\r
4950 if (entry->isNested)
\r
4956 GitStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4959 sClipboard += _T("\t")+temp;
\r
4961 if (selection & SVNSLC_COLREMOTEPROP)
\r
4963 // SVNSLC_COLREMOTEPROP
\r
4964 if (entry->isNested)
\r
4970 GitStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4973 sClipboard += _T("\t")+temp;
\r
4975 if (selection & SVNSLC_COLURL)
\r
4976 sClipboard += _T("\t")+entry->url;
\r
4977 if (selection & SVNSLC_COLLOCK)
\r
4979 if (!m_HeadRev.IsHead())
\r
4981 // we have contacted the repository
\r
4983 // decision-matrix
\r
4984 // wc repository text
\r
4987 // UID1 UID1 owner
\r
4988 // UID1 "" lock has been broken
\r
4989 // UID1 UID2 lock has been stolen
\r
4990 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))
\r
4992 if (entry->lock_owner.IsEmpty())
\r
4993 temp = entry->lock_remoteowner;
\r
4995 temp = entry->lock_owner;
\r
4997 else if (entry->lock_remotetoken.IsEmpty())
\r
5000 temp.LoadString(IDS_STATUSLIST_LOCKBROKEN);
\r
5005 temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);
\r
5009 temp = entry->lock_owner;
\r
5010 sClipboard += _T("\t")+temp;
\r
5012 if (selection & SVNSLC_COLLOCKCOMMENT)
\r
5013 sClipboard += _T("\t")+entry->lock_comment;
\r
5014 if (selection & SVNSLC_COLAUTHOR)
\r
5015 sClipboard += _T("\t")+entry->last_commit_author;
\r
5016 if (selection & SVNSLC_COLREVISION)
\r
5018 temp.Format(_T("%ld"), entry->last_commit_rev);
\r
5019 if (entry->last_commit_rev == 0)
\r
5021 sClipboard += _T("\t")+temp;
\r
5023 if (selection & SVNSLC_COLREMOTEREVISION)
\r
5025 temp.Format(_T("%ld"), entry->remoterev);
\r
5026 if (entry->remoterev == 0)
\r
5028 sClipboard += _T("\t")+temp;
\r
5031 if (selection & SVNSLC_COLDATE)
\r
5033 TCHAR datebuf[SVN_DATE_BUFFER];
\r
5034 apr_time_t date = entry->last_commit_date;
\r
5035 SVN::formatDate(datebuf, date, true);
\r
5040 sClipboard += _T("\t")+temp;
\r
5042 if (selection & SVNSLC_COLCOPYFROM)
\r
5044 if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)
\r
5045 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());
\r
5047 temp = entry->copyfrom_url;
\r
5048 sClipboard += _T("\t")+temp;
\r
5051 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
\r
5055 if ((dwCols == -1) && m_ColumnManager.IsVisible (i))
\r
5058 = entry->present_props[m_ColumnManager.GetName(i)];
\r
5059 sClipboard += _T("\t") + value;
\r
5063 if (selection & SVNSLC_COLADD)
\r
5065 sClipboard += _T("\t")+entry->m_StatAdd;
\r
5067 if (selection & SVNSLC_COLDEL)
\r
5069 sClipboard += _T("\t")+entry->m_StatDel;
\r
5072 sClipboard += _T("\r\n");
\r
5075 return CStringUtils::WriteAsciiStringToClipboard(sClipboard);
\r
5081 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()
\r
5084 std::set<CString> changelists;
\r
5085 POSITION pos = GetFirstSelectedItemPosition();
\r
5087 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
5089 FileEntry * entry = GetListEntry(index);
\r
5090 if (!entry->changelist.IsEmpty())
\r
5091 changelists.insert(entry->changelist);
\r
5093 return changelists.size();
\r
5098 bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
\r
5101 bool bHasGroups=false;
\r
5102 if ( this->m_UnRevFileList.GetCount()>0 ||
\r
5103 this->m_IgnoreFileList.GetCount()>0 || bForce)
\r
5105 bHasGroups = true;
\r
5108 RemoveAllGroups();
\r
5109 EnableGroupView(bHasGroups);
\r
5111 TCHAR groupname[1024];
\r
5112 int groupindex = 0;
\r
5116 LVGROUP grp = {0};
\r
5117 grp.cbSize = sizeof(LVGROUP);
\r
5118 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5119 CString sUnassignedName(_T("Modified File"));
\r
5120 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
\r
5121 grp.pszHeader = groupname;
\r
5122 grp.iGroupId = groupindex;
\r
5123 grp.uAlign = LVGA_HEADER_LEFT;
\r
5124 InsertGroup(groupindex++, &grp);
\r
5126 //if(m_UnRevFileList.GetCount()>0)
\r
5128 _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("Not Versioned"), 1023);
\r
5129 grp.pszHeader = groupname;
\r
5130 grp.iGroupId = groupindex;
\r
5131 grp.uAlign = LVGA_HEADER_LEFT;
\r
5132 InsertGroup(groupindex++, &grp);
\r
5135 //if(m_IgnoreFileList.GetCount()>0)
\r
5137 _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("Ignored"), 1023);
\r
5138 grp.pszHeader = groupname;
\r
5139 grp.iGroupId = groupindex;
\r
5140 grp.uAlign = LVGA_HEADER_LEFT;
\r
5141 InsertGroup(groupindex++, &grp);
\r
5147 m_bHasIgnoreGroup = false;
\r
5149 // now add the items which don't belong to a group
\r
5150 LVGROUP grp = {0};
\r
5151 grp.cbSize = sizeof(LVGROUP);
\r
5152 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5153 CString sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET));
\r
5154 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
\r
5155 grp.pszHeader = groupname;
\r
5156 grp.iGroupId = groupindex;
\r
5157 grp.uAlign = LVGA_HEADER_LEFT;
\r
5158 InsertGroup(groupindex++, &grp);
\r
5160 for (std::map<CString,int>::iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
5162 if (it->first.Compare(SVNSLC_IGNORECHANGELIST)!=0)
\r
5164 LVGROUP grp = {0};
\r
5165 grp.cbSize = sizeof(LVGROUP);
\r
5166 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5167 _tcsncpy_s(groupname, 1024, it->first, 1023);
\r
5168 grp.pszHeader = groupname;
\r
5169 grp.iGroupId = groupindex;
\r
5170 grp.uAlign = LVGA_HEADER_LEFT;
\r
5171 it->second = InsertGroup(groupindex++, &grp);
\r
5174 m_bHasIgnoreGroup = true;
\r
5177 if (m_bHasIgnoreGroup)
\r
5179 // and now add the group 'ignore-on-commit'
\r
5180 std::map<CString,int>::iterator it = m_changelists.find(SVNSLC_IGNORECHANGELIST);
\r
5181 if (it != m_changelists.end())
\r
5183 grp.cbSize = sizeof(LVGROUP);
\r
5184 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5185 _tcsncpy_s(groupname, 1024, SVNSLC_IGNORECHANGELIST, 1023);
\r
5186 grp.pszHeader = groupname;
\r
5187 grp.iGroupId = groupindex;
\r
5188 grp.uAlign = LVGA_HEADER_LEFT;
\r
5189 it->second = InsertGroup(groupindex, &grp);
\r
5193 return bHasGroups;
\r
5196 void CGitStatusListCtrl::NotifyCheck()
\r
5198 CWnd* pParent = GetParent();
\r
5199 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
5201 pParent->SendMessage(SVNSLNM_CHECKCHANGED, m_nSelected);
\r
5205 int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash,CTGitPathList *list)
\r
5208 this->m_bBusy=TRUE;
\r
5209 m_CurrentVersion=hash;
\r
5215 count = list->GetCount();
\r
5217 if(hash == GIT_REV_ZERO)
\r
5219 for(int i=0;i<count;i++)
\r
5221 BYTE_VECTOR cmdout;
\r
5224 if(!g_Git.IsInitRepos())
\r
5227 cmd=(_T("git.exe diff-index --raw HEAD --numstat -C -M -z"));
\r
5229 cmd.Format(_T("git.exe diff-index --raw HEAD --numstat -C -M -z -- \"%s\""),(*list)[i].GetGitPathString());
\r
5231 if(g_Git.Run(cmd,&cmdout))
\r
5235 if(g_Git.Run(_T("git.exe rev-parse --revs-only HEAD"),&strout,CP_UTF8))
\r
5237 CMessageBox::Show(NULL,strout,_T("TortoiseGit"),MB_OK);
\r
5240 if(strout.IsEmpty())
\r
5241 break; //this is initial repositoyr, there are no any history
\r
5243 CMessageBox::Show(NULL,strout,_T("TortoiseGit"),MB_OK);
\r
5249 cmd=(_T("git.exe diff-index --cached --raw HEAD --numstat -C -M -z"));
\r
5251 cmd.Format(_T("git.exe diff-index --cached --raw HEAD --numstat -C -M -z -- \"%s\""),(*list)[i].GetGitPathString());
\r
5253 g_Git.Run(cmd,&cmdout);
\r
5255 out.append(cmdout,0);
\r
5257 else // Init Repository
\r
5260 cmd=_T("git.exe ls-files -s -t -z");
\r
5262 cmd.Format(_T("git.exe ls-files -s -t -z -- \"%s\""),(*list)[i].GetGitPathString());
\r
5264 g_Git.Run(cmd,&cmdout);
\r
5266 out.append(cmdout,0);
\r
5270 if(g_Git.IsInitRepos())
\r
5272 m_StatusFileList.ParserFromLsFile(out);
\r
5273 for(int i=0;i<m_StatusFileList.GetCount();i++)
\r
5274 ((CTGitPath&)(m_StatusFileList[i])).m_Action=CTGitPath::LOGACTIONS_ADDED;
\r
5277 this->m_StatusFileList.ParserFromLog(out);
\r
5279 //handle delete conflict case, when remote : modified, local : deleted.
\r
5280 for(int i=0;i<count;i++)
\r
5282 BYTE_VECTOR cmdout;
\r
5286 cmd=_T("git.exe ls-files -u -t -z");
\r
5288 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),(*list)[i].GetGitPathString());
\r
5290 g_Git.Run(cmd,&cmdout);
\r
5292 CTGitPathList conflictlist;
\r
5293 conflictlist.ParserFromLog(cmdout);
\r
5294 for(int i=0;i<conflictlist.GetCount();i++)
\r
5296 CTGitPath *p=m_StatusFileList.LookForGitPath(conflictlist[i].GetGitPathString());
\r
5298 p->m_Action|=CTGitPath::LOGACTIONS_UNMERGED;
\r
5300 m_StatusFileList.AddPath(conflictlist[i]);
\r
5310 count = list->GetCount();
\r
5312 for(int i=0;i<count;i++)
\r
5314 BYTE_VECTOR cmdout;
\r
5317 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M -z %s"),hash);
\r
5319 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M %s -z -- \"%s\""),hash,(*list)[i].GetGitPathString());
\r
5321 g_Git.Run(cmd,&cmdout);
\r
5323 out.append(cmdout);
\r
5325 this->m_StatusFileList.ParserFromLog(out);
\r
5329 for(int i=0;i<m_StatusFileList.GetCount();i++)
\r
5331 CTGitPath * gitpatch=(CTGitPath*)&m_StatusFileList[i];
\r
5332 gitpatch->m_Checked = TRUE;
\r
5333 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
\r
5336 this->m_bBusy=FALSE;
\r
5340 int CGitStatusListCtrl::UpdateWithGitPathList(CTGitPathList &list)
\r
5342 m_arStatusArray.clear();
\r
5343 for(int i=0;i<list.GetCount();i++)
\r
5345 CTGitPath * gitpath=(CTGitPath*)&list[i];
\r
5347 if(gitpath ->m_Action & CTGitPath::LOGACTIONS_HIDE)
\r
5350 gitpath->m_Checked = TRUE;
\r
5351 m_arStatusArray.push_back((CTGitPath*)&list[i]);
\r
5356 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList *List)
\r
5358 this->m_UnRevFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER,List);
\r
5359 for(int i=0;i<m_UnRevFileList.GetCount();i++)
\r
5361 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
\r
5362 gitpatch->m_Checked = FALSE;
\r
5363 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
\r
5368 int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList *List)
\r
5370 this->m_IgnoreFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER|CTGitPath::LOGACTIONS_IGNORE,List);
\r
5371 for(int i=0;i<m_IgnoreFileList.GetCount();i++)
\r
5373 CTGitPath * gitpatch=(CTGitPath*)&m_IgnoreFileList[i];
\r
5374 gitpatch->m_Checked = FALSE;
\r
5375 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
\r
5379 int CGitStatusListCtrl::UpdateFileList(int mask,bool once,CTGitPathList *List)
\r
5381 if(mask&CGitStatusListCtrl::FILELIST_MODIFY)
\r
5383 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_MODIFY)))
\r
5385 UpdateFileList(git_revnum_t(GIT_REV_ZERO),List);
\r
5386 m_FileLoaded|=CGitStatusListCtrl::FILELIST_MODIFY;
\r
5389 if(mask&CGitStatusListCtrl::FILELIST_UNVER)
\r
5391 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_UNVER)))
\r
5393 UpdateUnRevFileList(List);
\r
5394 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
\r
5400 void CGitStatusListCtrl::Clear()
\r
5403 this->DeleteAllItems();
\r
5404 this->m_arListArray.clear();
\r
5405 this->m_arStatusArray.clear();
\r
5406 this->m_changelists.clear();
\r
5408 //////////////////////////////////////////////////////////////////////////
\r
5410 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium, DWORD * /*pdwEffect*/, POINTL pt)
\r
5412 if(pFmtEtc->cfFormat == CF_HDROP && medium.tymed == TYMED_HGLOBAL)
\r
5414 HDROP hDrop = (HDROP)GlobalLock(medium.hGlobal);
\r
5417 TCHAR szFileName[MAX_PATH];
\r
5419 UINT cFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
\r
5421 POINT clientpoint;
\r
5422 clientpoint.x = pt.x;
\r
5423 clientpoint.y = pt.y;
\r
5424 ScreenToClient(m_hTargetWnd, &clientpoint);
\r
5425 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
\r
5427 CTSVNPathList changelistItems;
\r
5428 for(UINT i = 0; i < cFiles; ++i)
\r
5430 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
\r
5431 changelistItems.AddPath(CTSVNPath(szFileName));
\r
5433 // find the changelist name
\r
5434 CString sChangelist;
\r
5435 LONG_PTR nGroup = m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint);
\r
5436 for (std::map<CString, int>::iterator it = m_pSVNStatusListCtrl->m_changelists.begin(); it != m_pSVNStatusListCtrl->m_changelists.end(); ++it)
\r
5437 if (it->second == nGroup)
\r
5438 sChangelist = it->first;
\r
5439 if (!sChangelist.IsEmpty())
\r
5442 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
\r
5444 for (int l=0; l<changelistItems.GetCount(); ++l)
\r
5446 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
\r
5449 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
\r
5452 e->changelist = sChangelist;
\r
5453 if (!e->IsFolder())
\r
5455 if (m_pSVNStatusListCtrl->m_changelists.find(e->changelist)!=m_pSVNStatusListCtrl->m_changelists.end())
\r
5456 m_pSVNStatusListCtrl->SetItemGroup(index, m_pSVNStatusListCtrl->m_changelists[e->changelist]);
\r
5458 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
\r
5464 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5465 if (hParentWnd != NULL)
\r
5466 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
\r
5472 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
5478 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
\r
5480 for (int l=0; l<changelistItems.GetCount(); ++l)
\r
5482 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
\r
5485 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
\r
5488 e->changelist = sChangelist;
\r
5489 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
\r
5494 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5495 if (hParentWnd != NULL)
\r
5496 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
\r
5502 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
5508 for(UINT i = 0; i < cFiles; ++i)
\r
5510 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
\r
5511 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5512 if (hParentWnd != NULL)
\r
5513 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)szFileName);
\r
5517 GlobalUnlock(medium.hGlobal);
\r
5519 return true; //let base free the medium
\r
5521 HRESULT STDMETHODCALLTYPE CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect)
\r
5523 CIDropTarget::DragOver(grfKeyState, pt, pdwEffect);
\r
5524 *pdwEffect = DROPEFFECT_COPY;
\r
5525 if (m_pSVNStatusListCtrl)
\r
5527 POINT clientpoint;
\r
5528 clientpoint.x = pt.x;
\r
5529 clientpoint.y = pt.y;
\r
5530 ScreenToClient(m_hTargetWnd, &clientpoint);
\r
5531 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
\r
5533 *pdwEffect = DROPEFFECT_MOVE;
\r
5535 else if ((!m_pSVNStatusListCtrl->m_bFileDropsEnabled)||(m_pSVNStatusListCtrl->m_bOwnDrag))
\r
5537 *pdwEffect = DROPEFFECT_NONE;
\r
5545 void CGitStatusListCtrl::FileSaveAs(CTGitPath *path)
\r
5548 filename.Format(_T("%s-%s%s"),path->GetBaseFilename(),this->m_CurrentVersion.Left(6),path->GetFileExtension());
\r
5549 CFileDialog dlg(FALSE,NULL,
\r
5551 OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
\r
5553 CString currentpath;
\r
5554 currentpath=g_Git.m_CurrentDir+_T("\\");
\r
5555 currentpath+=path->GetWinPathString();
\r
5557 dlg.m_ofn.lpstrInitialDir=currentpath.GetBuffer();
\r
5560 if(dlg.DoModal()==IDOK)
\r
5562 filename = dlg.GetFileName();
\r
5563 if(m_CurrentVersion == GIT_REV_ZERO)
\r
5565 cmd.Format(_T("copy /Y \"%s\" \"%s\""),path->GetWinPath(),filename);
\r
5566 if(g_Git.Run(cmd,&out,CP_ACP))
\r
5568 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
\r
5574 cmd.Format(_T("git.exe cat-file -p %s:\"%s\""),m_CurrentVersion,path->GetGitPathString());
\r
5575 if(g_Git.RunLogFile(cmd,filename))
\r
5577 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
\r
5585 int CGitStatusListCtrl::RevertSelectedItemToVersion()
\r
5587 if(this->m_CurrentVersion.IsEmpty())
\r
5589 if(this->m_CurrentVersion == GIT_REV_ZERO)
\r
5592 POSITION pos = GetFirstSelectedItemPosition();
\r
5596 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
5598 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
\r
5599 cmd.Format(_T("git.exe checkout %s -- \"%s\""),m_CurrentVersion,fentry->GetGitPathString());
\r
5601 if(g_Git.Run(cmd,&out,CP_ACP))
\r
5603 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
\r
5608 out.Format(_T("%d files revert to %s"),count,m_CurrentVersion.Left(6));
\r
5609 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
\r
5612 void CGitStatusListCtrl::OpenFile(CTGitPath*filepath,int mode)
\r
5615 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
\r
5617 file= filepath->GetWinPath();
\r
5621 GetTempPath(temppath);
\r
5622 file.Format(_T("%s%s_%s%s"),
\r
5624 filepath->GetBaseFilename(),
\r
5625 m_CurrentVersion.Left(6),
\r
5626 filepath->GetFileExtension());
\r
5628 cmd.Format(_T("git.exe cat-file -p %s:\"%s\""),m_CurrentVersion,filepath->GetGitPathString());
\r
5629 if(g_Git.RunLogFile(cmd,file))
\r
5631 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
\r
5636 if(mode == NOTEPAD2)
\r
5639 sCmd.Format(_T("\"%s\" \"%s\""),
\r
5640 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("notepad2.exe")), file);
\r
5642 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
5645 int ret = HINSTANCE_ERROR;
\r
5649 ret = (int)ShellExecute(this->m_hWnd, NULL,file, NULL, NULL, SW_SHOW);
\r
5651 if (ret > HINSTANCE_ERROR)
\r
5658 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
5660 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
OSDN Git Service
