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
56 const UINT CGitStatusListCtrl::SVNSLNM_ITEMCOUNTCHANGED
\r
57 = ::RegisterWindowMessage(_T("GITSLNM_ITEMCOUNTCHANGED"));
\r
58 const UINT CGitStatusListCtrl::SVNSLNM_NEEDSREFRESH
\r
59 = ::RegisterWindowMessage(_T("GITSLNM_NEEDSREFRESH"));
\r
60 const UINT CGitStatusListCtrl::SVNSLNM_ADDFILE
\r
61 = ::RegisterWindowMessage(_T("GITSLNM_ADDFILE"));
\r
62 const UINT CGitStatusListCtrl::SVNSLNM_CHECKCHANGED
\r
63 = ::RegisterWindowMessage(_T("GITSLNM_CHECKCHANGED"));
\r
65 #define IDSVNLC_REVERT 1
\r
66 #define IDSVNLC_COMPARE 2
\r
67 #define IDSVNLC_OPEN 3
\r
68 #define IDSVNLC_DELETE 4
\r
69 #define IDSVNLC_IGNORE 5
\r
70 #define IDSVNLC_GNUDIFF1 6
\r
71 #define IDSVNLC_UPDATE 7
\r
72 #define IDSVNLC_LOG 8
\r
73 #define IDSVNLC_EDITCONFLICT 9
\r
74 #define IDSVNLC_IGNOREMASK 10
\r
75 #define IDSVNLC_ADD 11
\r
76 #define IDSVNLC_RESOLVECONFLICT 12
\r
77 #define IDSVNLC_LOCK 13
\r
78 #define IDSVNLC_LOCKFORCE 14
\r
79 #define IDSVNLC_UNLOCK 15
\r
80 #define IDSVNLC_UNLOCKFORCE 16
\r
81 #define IDSVNLC_OPENWITH 17
\r
82 #define IDSVNLC_EXPLORE 18
\r
83 #define IDSVNLC_RESOLVETHEIRS 19
\r
84 #define IDSVNLC_RESOLVEMINE 20
\r
85 #define IDSVNLC_REMOVE 21
\r
86 #define IDSVNLC_COMMIT 22
\r
87 #define IDSVNLC_PROPERTIES 23
\r
88 #define IDSVNLC_COPY 24
\r
89 #define IDSVNLC_COPYEXT 25
\r
90 #define IDSVNLC_REPAIRMOVE 26
\r
91 #define IDSVNLC_REMOVEFROMCS 27
\r
92 #define IDSVNLC_CREATECS 28
\r
93 #define IDSVNLC_CREATEIGNORECS 29
\r
94 #define IDSVNLC_CHECKGROUP 30
\r
95 #define IDSVNLC_UNCHECKGROUP 31
\r
96 #define IDSVNLC_ADD_RECURSIVE 32
\r
97 #define IDSVNLC_COMPAREWC 33
\r
98 #define IDSVNLC_BLAME 34
\r
99 // the IDSVNLC_MOVETOCS *must* be the last index, because it contains a dynamic submenu where
\r
100 // the submenu items get command ID's sequent to this number
\r
101 #define IDSVNLC_MOVETOCS 35
\r
104 BEGIN_MESSAGE_MAP(CGitStatusListCtrl, CListCtrl)
\r
105 ON_NOTIFY(HDN_ITEMCLICKA, 0, OnHdnItemclick)
\r
106 ON_NOTIFY(HDN_ITEMCLICKW, 0, OnHdnItemclick)
\r
107 ON_NOTIFY(HDN_ENDTRACK, 0, OnColumnResized)
\r
108 ON_NOTIFY(HDN_ENDDRAG, 0, OnColumnMoved)
\r
109 ON_NOTIFY_REFLECT_EX(LVN_ITEMCHANGED, OnLvnItemchanged)
\r
110 ON_WM_CONTEXTMENU()
\r
111 ON_NOTIFY_REFLECT(NM_DBLCLK, OnNMDblclk)
\r
112 ON_NOTIFY_REFLECT(LVN_GETINFOTIP, OnLvnGetInfoTip)
\r
113 ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, OnNMCustomdraw)
\r
116 ON_NOTIFY_REFLECT(NM_RETURN, OnNMReturn)
\r
118 ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTW, 0, 0xFFFF, OnToolTipText)
\r
119 ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTA, 0, 0xFFFF, OnToolTipText)
\r
121 ON_NOTIFY(HDN_BEGINTRACKA, 0, &CGitStatusListCtrl::OnHdnBegintrack)
\r
122 ON_NOTIFY(HDN_BEGINTRACKW, 0, &CGitStatusListCtrl::OnHdnBegintrack)
\r
123 ON_NOTIFY(HDN_ITEMCHANGINGA, 0, &CGitStatusListCtrl::OnHdnItemchanging)
\r
124 ON_NOTIFY(HDN_ITEMCHANGINGW, 0, &CGitStatusListCtrl::OnHdnItemchanging)
\r
126 ON_NOTIFY_REFLECT(LVN_BEGINDRAG, OnBeginDrag)
\r
127 ON_NOTIFY_REFLECT(LVN_ITEMCHANGING, &CGitStatusListCtrl::OnLvnItemchanging)
\r
132 CGitStatusListCtrl::CGitStatusListCtrl() : CListCtrl()
\r
133 //, m_HeadRev(GitRev::REV_HEAD)
\r
134 , m_pbCanceled(NULL)
\r
135 , m_pStatLabel(NULL)
\r
136 , m_pSelectButton(NULL)
\r
137 , m_pConfirmButton(NULL)
\r
140 , m_bUnversionedRecurse(true)
\r
141 , m_bShowIgnores(false)
\r
142 , m_pDropTarget(NULL)
\r
143 , m_bIgnoreRemoveOnly(false)
\r
144 , m_bCheckChildrenWithParent(false)
\r
145 , m_bUnversionedLast(true)
\r
146 , m_bHasChangeLists(false)
\r
147 , m_bHasLocks(false)
\r
149 , m_bBlockUI(false)
\r
150 , m_bHasCheckboxes(false)
\r
151 , m_bCheckIfGroupsExist(true)
\r
152 , m_bFileDropsEnabled(false)
\r
153 , m_bOwnDrag(false)
\r
154 , m_dwDefaultColumns(0)
\r
155 , m_ColumnManager(this)
\r
156 , m_bAscending(false)
\r
157 , m_nSortedColumn(-1)
\r
158 , m_sNoPropValueText(MAKEINTRESOURCE(IDS_STATUSLIST_NOPROPVALUE))
\r
163 CGitStatusListCtrl::~CGitStatusListCtrl()
\r
166 delete m_pDropTarget;
\r
167 ClearStatusArray();
\r
170 void CGitStatusListCtrl::ClearStatusArray()
\r
173 Locker lock(m_critSec);
\r
174 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
176 delete m_arStatusArray[i];
\r
178 m_arStatusArray.clear();
\r
182 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetListEntry(UINT_PTR index)
\r
185 if (index >= (UINT_PTR)m_arListArray.size())
\r
187 if (m_arListArray[index] >= m_arStatusArray.size())
\r
189 return m_arStatusArray[m_arListArray[index]];
\r
194 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetVisibleListEntry(const CTGitPath& path)
\r
196 int itemCount = GetItemCount();
\r
197 for (int i=0; i < itemCount; i++)
\r
199 FileEntry * entry = GetListEntry(i);
\r
200 if (entry->GetPath().IsEquivalentTo(path))
\r
206 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetListEntry(const CTGitPath& path)
\r
209 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
211 FileEntry * entry = m_arStatusArray[i];
\r
212 if (entry->GetPath().IsEquivalentTo(path))
\r
219 int CGitStatusListCtrl::GetIndex(const CTGitPath& path)
\r
221 int itemCount = GetItemCount();
\r
222 for (int i=0; i < itemCount; i++)
\r
224 FileEntry * entry = GetListEntry(i);
\r
225 if (entry->GetPath().IsEquivalentTo(path))
\r
231 void CGitStatusListCtrl::Init(DWORD dwColumns, const CString& sColumnInfoContainer, DWORD dwContextMenus /* = GitSLC_POPALL */, bool bHasCheckboxes /* = true */)
\r
233 Locker lock(m_critSec);
\r
235 m_dwDefaultColumns = dwColumns | 1;
\r
236 m_dwContextMenus = dwContextMenus;
\r
237 m_bHasCheckboxes = bHasCheckboxes;
\r
239 // set the extended style of the listcontrol
\r
240 // 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
241 CRegDWORD regFullRowSelect(_T("Software\\TortoiseGit\\FullRowSelect"), TRUE);
\r
242 DWORD exStyle = LVS_EX_HEADERDRAGDROP | LVS_EX_DOUBLEBUFFER | LVS_EX_INFOTIP | LVS_EX_SUBITEMIMAGES;
\r
243 if (DWORD(regFullRowSelect))
\r
244 exStyle |= LVS_EX_FULLROWSELECT;
\r
245 exStyle |= (bHasCheckboxes ? LVS_EX_CHECKBOXES : 0);
\r
247 SetExtendedStyle(exStyle);
\r
250 theme.SetWindowTheme(m_hWnd, L"Explorer", NULL);
\r
252 m_nIconFolder = SYS_IMAGE_LIST().GetDirIconIndex();
\r
253 SetImageList(&SYS_IMAGE_LIST(), LVSIL_SMALL);
\r
255 m_ColumnManager.ReadSettings (m_dwDefaultColumns, sColumnInfoContainer);
\r
257 // enable file drops
\r
259 if (m_pDropTarget == NULL)
\r
261 m_pDropTarget = new CGitStatusListCtrlDropTarget(this);
\r
262 RegisterDragDrop(m_hWnd,m_pDropTarget);
\r
263 // create the supported formats:
\r
264 FORMATETC ftetc={0};
\r
265 ftetc.dwAspect = DVASPECT_CONTENT;
\r
267 ftetc.tymed = TYMED_HGLOBAL;
\r
268 ftetc.cfFormat=CF_HDROP;
\r
269 m_pDropTarget->AddSuportedFormat(ftetc);
\r
275 m_bUnversionedRecurse = !!((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\UnversionedRecurse"), TRUE));
\r
278 bool CGitStatusListCtrl::SetBackgroundImage(UINT nID)
\r
280 return CAppUtils::SetListCtrlBackgroundImage(GetSafeHwnd(), nID);
\r
283 BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList& pathList
\r
284 , bool bUpdate /* = FALSE */
\r
285 , bool bShowIgnores /* = false */
\r
286 , bool bShowUserProps /* = false */)
\r
289 Locker lock(m_critSec);
\r
290 int refetchcounter = 0;
\r
293 // force the cursor to change
\r
296 SetCursorPos(pt.x, pt.y);
\r
298 m_mapFilenameToChecked.clear();
\r
299 //m_StatusUrlList.Clear();
\r
300 bool bHasChangelists = (m_changelists.size()>1 || (m_changelists.size()>0 && !m_bHasIgnoreGroup));
\r
301 m_changelists.clear();
\r
302 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
304 FileEntry * entry = m_arStatusArray[i];
\r
305 if ( bHasChangelists && entry->checked)
\r
307 // If change lists are present, remember all checked entries
\r
308 CString path = entry->GetPath().GetGitPathString();
\r
309 m_mapFilenameToChecked[path] = true;
\r
311 if ( (entry->status==git_wc_status_unversioned || entry->status==git_wc_status_missing ) && entry->checked )
\r
313 // The user manually selected an unversioned or missing file. We remember
\r
314 // this so that the selection can be restored when refreshing.
\r
315 CString path = entry->GetPath().GetGitPathString();
\r
316 m_mapFilenameToChecked[path] = true;
\r
318 else if ( entry->status > git_wc_status_normal && !entry->checked )
\r
320 // The user manually deselected a versioned file. We remember
\r
321 // this so that the deselection can be restored when refreshing.
\r
322 CString path = entry->GetPath().GetGitPathString();
\r
323 m_mapFilenameToChecked[path] = false;
\r
327 // use a sorted path list to make sure we fetch the status of
\r
328 // parent items first, *then* the child items (if any)
\r
329 CTGitPathList sortedPathList = pathList;
\r
330 sortedPathList.SortByPathname();
\r
334 m_nTargetCount = 0;
\r
335 m_bHasExternalsFromDifferentRepos = FALSE;
\r
336 m_bHasExternals = FALSE;
\r
337 m_bHasUnversionedItems = FALSE;
\r
338 m_bHasLocks = false;
\r
339 m_bHasChangeLists = false;
\r
340 m_bShowIgnores = bShowIgnores;
\r
341 m_nSortedColumn = 0;
\r
347 // first clear possible status data left from
\r
348 // previous GetStatus() calls
\r
349 ClearStatusArray();
\r
351 m_StatusFileList = sortedPathList;
\r
353 // Since Git_client_status() returns all files, even those in
\r
354 // folders included with Git:externals we need to check if all
\r
355 // files we get here belongs to the same repository.
\r
356 // It is possible to commit changes in an external folder, as long
\r
357 // as the folder belongs to the same repository (but another path),
\r
358 // but it is not possible to commit all files if the externals are
\r
359 // from a different repository.
\r
361 // To check if all files belong to the same repository, we compare the
\r
362 // UUID's - if they're identical then the files belong to the same
\r
363 // repository and can be committed. But if they're different, then
\r
364 // tell the user to commit all changes in the external folders
\r
366 CStringA sUUID; // holds the repo UUID
\r
367 CTGitPathList arExtPaths; // list of Git:external paths
\r
373 m_nTargetCount = sortedPathList.GetCount();
\r
375 GitStatus status(m_pbCanceled);
\r
376 if(m_nTargetCount > 1 && sortedPathList.AreAllPathsFilesInOneDirectory())
\r
378 // This is a special case, where we've been given a list of files
\r
379 // all from one folder
\r
380 // We handle them by setting a status filter, then requesting the Git status of
\r
381 // all the files in the directory, filtering for the ones we're interested in
\r
382 status.SetFilter(sortedPathList);
\r
384 // if all selected entries are files, we don't do a recursive status
\r
385 // fetching. But if only one is a directory, we have to recurse.
\r
386 git_depth_t depth = git_depth_files;
\r
387 // We have set a filter. If all selected items were files or we fetch
\r
388 // the status not recursively, then we have to include
\r
389 // ignored items too - the user has selected them
\r
390 bool bShowIgnoresRight = true;
\r
391 for (int fcindex=0; fcindex<sortedPathList.GetCount(); ++fcindex)
\r
393 if (sortedPathList[fcindex].IsDirectory())
\r
395 depth = git_depth_infinity;
\r
396 bShowIgnoresRight = false;
\r
400 if(!FetchStatusForSingleTarget(config, status, sortedPathList.GetCommonDirectory(), bUpdate, sUUID, arExtPaths, true, depth, bShowIgnoresRight))
\r
407 for(int nTarget = 0; nTarget < m_nTargetCount; nTarget++)
\r
409 // check whether the path we want the status for is already fetched due to status-fetching
\r
410 // of a parent path.
\r
411 // this check is only done for file paths, because folder paths could be included already
\r
412 // but not recursively
\r
413 if (sortedPathList[nTarget].IsDirectory() || GetListEntry(sortedPathList[nTarget]) == NULL)
\r
415 if(!FetchStatusForSingleTarget(config, status, sortedPathList[nTarget], bUpdate, sUUID,
\r
416 arExtPaths, false, git_depth_infinity, bShowIgnores))
\r
424 // remove the 'helper' files of conflicted items from the list.
\r
425 // otherwise they would appear as unversioned files.
\r
426 for (INT_PTR cind = 0; cind < m_ConflictFileList.GetCount(); ++cind)
\r
428 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
430 if (m_arStatusArray[i]->GetPath().IsEquivalentTo(m_ConflictFileList[cind]))
\r
432 delete m_arStatusArray[i];
\r
433 m_arStatusArray.erase(m_arStatusArray.begin()+i);
\r
439 } while(!BuildStatistics() && (refetchcounter < 2) && (*m_pbCanceled==false));
\r
441 if (bShowUserProps)
\r
442 FetchUserProperties();
\r
444 m_ColumnManager.UpdateUserPropList (m_arStatusArray);
\r
449 SetCursorPos(pt.x, pt.y);
\r
456 // Fetch all local properties for all elements in the status array
\r
458 void CGitStatusListCtrl::FetchUserProperties()
\r
461 GitPool globalPool;
\r
463 for (size_t i = 0, count = m_arStatusArray.size(); i < count; ++i)
\r
465 // local / temp pool to hold parameters and props for a single item
\r
467 GitPool localPool ((apr_pool_t*)globalPool);
\r
469 // open working copy for this path
\r
471 const char* path = m_arStatusArray[i]->path.GetGitApiPath (localPool);
\r
473 Git_wc_adm_access_t *adm_access = NULL;
\r
474 Git_error_t * error = Git_wc_adm_probe_open3 ( &adm_access
\r
477 , FALSE // no write lock
\r
478 , 0 // lock just the directory/file itself
\r
484 // get the props and add them to the status info
\r
486 apr_hash_t* props = NULL;
\r
487 Git_error_t * error = Git_wc_prop_list ( &props
\r
493 for ( apr_hash_index_t *index
\r
494 = apr_hash_first (localPool, props)
\r
496 ; index = apr_hash_next (index))
\r
498 // extract next entry from hash
\r
500 const char* key = NULL;
\r
502 const char** val = NULL;
\r
504 apr_hash_this ( index
\r
505 , reinterpret_cast<const void**>(&key)
\r
507 , reinterpret_cast<void**>(&val));
\r
509 // decode / dispatch it
\r
511 CString name = CUnicodeUtils::GetUnicode (key);
\r
512 CString value = CUnicodeUtils::GetUnicode (*val);
\r
514 // store in property container (truncate it after ~100 chars)
\r
516 m_arStatusArray[i]->present_props[name]
\r
517 = value.Left (GitSLC_MAXUSERPROPLENGTH);
\r
520 error = Git_wc_adm_close2 (adm_access, localPool);
\r
522 Git_error_clear (error);
\r
529 // Work on a single item from the list of paths which is provided to us
\r
531 bool CGitStatusListCtrl::FetchStatusForSingleTarget(
\r
534 const CTGitPath& target,
\r
535 bool bFetchStatusFromRepository,
\r
536 CStringA& strCurrentRepositoryUUID,
\r
537 CTGitPathList& arExtPaths,
\r
544 config.GetDefaultIgnores();
\r
546 CTGitPath workingTarget(target);
\r
548 git_wc_status2_t * s;
\r
550 s = status.GetFirstFileStatus(workingTarget, GitPath, bFetchStatusFromRepository, depth, bShowIgnores);
\r
552 m_HeadRev = SVNRev(status.headrev);
\r
555 Git_wc_status_kind wcFileStatus = GitStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
557 // This one fixes a problem with externals:
\r
558 // If a strLine is a file, Git:externals and its parent directory
\r
559 // will also be returned by GetXXXFileStatus. Hence, we skip all
\r
560 // status info until we find the one matching workingTarget.
\r
561 if (!workingTarget.IsDirectory())
\r
563 if (!workingTarget.IsEquivalentTo(GitPath))
\r
567 s = status.GetNextFileStatus(GitPath);
\r
568 if(workingTarget.IsEquivalentTo(GitPath))
\r
575 m_sLastError = status.GetLastErrorMsg();
\r
578 // Now, set working target to be the base folder of this item
\r
579 workingTarget = workingTarget.GetDirectory();
\r
582 bool bEntryFromDifferentRepo = false;
\r
583 // Is this a versioned item with an associated repos UUID?
\r
584 if ((s->entry)&&(s->entry->uuid))
\r
586 // Have we seen a repos UUID yet?
\r
587 if (strCurrentRepositoryUUID.IsEmpty())
\r
589 // This is the first repos UUID we've seen - record it
\r
590 strCurrentRepositoryUUID = s->entry->uuid;
\r
591 m_sUUID = strCurrentRepositoryUUID;
\r
595 if (strCurrentRepositoryUUID.Compare(s->entry->uuid)!=0)
\r
597 // This item comes from a different repository than our main one
\r
598 m_bHasExternalsFromDifferentRepos = TRUE;
\r
599 bEntryFromDifferentRepo = true;
\r
600 if (s->entry->kind == Git_node_dir)
\r
601 arExtPaths.AddPath(workingTarget);
\r
605 else if (strCurrentRepositoryUUID.IsEmpty() && (s->text_status == Git_wc_status_added))
\r
607 // An added entry doesn't have an UUID assigned to it yet.
\r
608 // So we fetch the status of the parent directory instead and
\r
609 // check if that one has an UUID assigned to it.
\r
610 Git_wc_status2_t * sparent;
\r
611 CTGitPath path = workingTarget;
\r
614 CTGitPath GitParentPath;
\r
615 GitStatus tempstatus;
\r
616 sparent = tempstatus.GetFirstFileStatus(path.GetContainingDirectory(), GitParentPath, false, Git_depth_empty, false);
\r
617 path = GitParentPath;
\r
618 } while ( (sparent) && (sparent->entry) && (!sparent->entry->uuid) && (sparent->text_status==Git_wc_status_added) );
\r
619 if (sparent && sparent->entry && sparent->entry->uuid)
\r
621 strCurrentRepositoryUUID = sparent->entry->uuid;
\r
622 m_sUUID = strCurrentRepositoryUUID;
\r
626 if ((wcFileStatus == Git_wc_status_unversioned)&& GitPath.IsDirectory())
\r
628 // check if the unversioned folder is maybe versioned. This
\r
629 // could happen with nested layouts
\r
630 Git_wc_status_kind st = GitStatus::GetAllStatus(workingTarget);
\r
631 if ((st != Git_wc_status_unversioned)&&(st != Git_wc_status_none))
\r
633 return true; // ignore nested layouts
\r
636 if (status.IsExternal(GitPath))
\r
638 m_bHasExternals = TRUE;
\r
641 AddNewFileEntry(s, GitPath, workingTarget, true, m_bHasExternals, bEntryFromDifferentRepo);
\r
643 if (((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none)||((wcFileStatus == Git_wc_status_ignored)&&(m_bShowIgnores))) && GitPath.IsDirectory())
\r
645 // we have an unversioned folder -> get all files in it recursively!
\r
646 AddUnversionedFolder(GitPath, workingTarget.GetContainingDirectory(), &config);
\r
649 // for folders, get all statuses inside it too
\r
650 if(workingTarget.IsDirectory())
\r
652 ReadRemainingItemsStatus(status, workingTarget, strCurrentRepositoryUUID, arExtPaths, &config, bAllDirect);
\r
658 m_sLastError = status.GetLastErrorMsg();
\r
665 const CGitStatusListCtrl::FileEntry*
\r
666 CGitStatusListCtrl::AddNewFileEntry(
\r
667 const git_wc_status2_t* pGitStatus, // The return from the Git GetStatus functions
\r
668 const CTGitPath& path, // The path of the item we're adding
\r
669 const CTGitPath& basePath, // The base directory for this status build
\r
670 bool bDirectItem, // Was this item the first found by GetFirstFileStatus or by a subsequent GetNextFileStatus call
\r
671 bool bInExternal, // Are we in an 'external' folder
\r
672 bool bEntryfromDifferentRepo // if the entry is from a different repository
\r
675 FileEntry * entry = new FileEntry();
\r
678 entry->path = path;
\r
679 entry->basepath = basePath;
\r
680 entry->status = GitStatus::GetMoreImportant(pGitStatus->text_status, pGitStatus->prop_status);
\r
681 entry->textstatus = pGitStatus->text_status;
\r
682 entry->propstatus = pGitStatus->prop_status;
\r
683 // entry->remotestatus = GitStatus::GetMoreImportant(pGitStatus->repos_text_status, pGitStatus->repos_prop_status);
\r
684 // entry->remotetextstatus = pGitStatus->repos_text_status;
\r
685 // entry->remotepropstatus = pGitStatus->repos_prop_status;
\r
686 entry->inexternal = bInExternal;
\r
687 entry->differentrepo = bEntryfromDifferentRepo;
\r
688 entry->direct = bDirectItem;
\r
689 // entry->copied = !!pGitStatus->copied;
\r
690 // entry->switched = !!pGitStatus->switched;
\r
692 entry->last_commit_date = pGitStatus->ood_last_cmt_date;
\r
693 if ((entry->last_commit_date == NULL)&&(pGitStatus->entry))
\r
694 entry->last_commit_date = pGitStatus->entry->cmt_date;
\r
695 entry->remoterev = pGitStatus->ood_last_cmt_rev;
\r
696 if (pGitStatus->entry)
\r
697 entry->last_commit_rev = pGitStatus->entry->cmt_rev;
\r
698 if (pGitStatus->ood_last_cmt_author)
\r
699 entry->last_commit_author = CUnicodeUtils::GetUnicode(pGitStatus->ood_last_cmt_author);
\r
700 if ((entry->last_commit_author.IsEmpty())&&(pGitStatus->entry)&&(pGitStatus->entry->cmt_author))
\r
701 entry->last_commit_author = CUnicodeUtils::GetUnicode(pGitStatus->entry->cmt_author);
\r
703 if (pGitStatus->entry)
\r
704 entry->isConflicted = (pGitStatus->entry->conflict_wrk && PathFileExists(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_wrk))) ? true : false;
\r
706 if ((entry->status == Git_wc_status_conflicted)||(entry->isConflicted))
\r
708 entry->isConflicted = true;
\r
709 if (pGitStatus->entry)
\r
712 if (pGitStatus->entry->conflict_wrk)
\r
714 cpath = path.GetDirectory();
\r
715 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_wrk));
\r
716 m_ConflictFileList.AddPath(cpath);
\r
718 if (pGitStatus->entry->conflict_old)
\r
720 cpath = path.GetDirectory();
\r
721 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_old));
\r
722 m_ConflictFileList.AddPath(cpath);
\r
724 if (pGitStatus->entry->conflict_new)
\r
726 cpath = path.GetDirectory();
\r
727 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_new));
\r
728 m_ConflictFileList.AddPath(cpath);
\r
730 if (pGitStatus->entry->prejfile)
\r
732 cpath = path.GetDirectory();
\r
733 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->prejfile));
\r
734 m_ConflictFileList.AddPath(cpath);
\r
739 if (pGitStatus->entry)
\r
741 entry->isfolder = (pGitStatus->entry->kind == Git_node_dir);
\r
742 entry->Revision = pGitStatus->entry->revision;
\r
743 entry->keeplocal = !!pGitStatus->entry->keep_local;
\r
744 entry->working_size = pGitStatus->entry->working_size;
\r
745 entry->depth = pGitStatus->entry->depth;
\r
747 if (pGitStatus->entry->url)
\r
749 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(pGitStatus->entry->url));
\r
751 if (pGitStatus->entry->copyfrom_url)
\r
753 entry->copyfrom_url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(pGitStatus->entry->copyfrom_url));
\r
754 entry->copyfrom_rev = pGitStatus->entry->copyfrom_rev;
\r
757 entry->copyfrom_rev = 0;
\r
761 if (m_sURL.IsEmpty())
\r
762 m_sURL = entry->url;
\r
764 m_sURL.LoadString(IDS_STATUSLIST_MULTIPLETARGETS);
\r
765 m_StatusUrlList.AddPath(CTGitPath(entry->url));
\r
767 if (pGitStatus->entry->lock_owner)
\r
768 entry->lock_owner = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_owner);
\r
769 if (pGitStatus->entry->lock_token)
\r
771 entry->lock_token = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_token);
\r
772 m_bHasLocks = true;
\r
774 if (pGitStatus->entry->lock_comment)
\r
775 entry->lock_comment = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_comment);
\r
777 if (pGitStatus->entry->present_props)
\r
779 entry->present_props = pGitStatus->entry->present_props;
\r
782 if (pGitStatus->entry->changelist)
\r
784 entry->changelist = CUnicodeUtils::GetUnicode(pGitStatus->entry->changelist);
\r
785 m_changelists[entry->changelist] = -1;
\r
786 m_bHasChangeLists = true;
\r
788 entry->needslock = (pGitStatus->entry->present_props && (strstr(pGitStatus->entry->present_props, "Git:needs-lock")!=NULL) );
\r
792 if (pGitStatus->ood_kind == Git_node_none)
\r
793 entry->isfolder = path.IsDirectory();
\r
795 entry->isfolder = (pGitStatus->ood_kind == Git_node_dir);
\r
797 if (pGitStatus->repos_lock)
\r
799 if (pGitStatus->repos_lock->owner)
\r
800 entry->lock_remoteowner = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->owner);
\r
801 if (pGitStatus->repos_lock->token)
\r
802 entry->lock_remotetoken = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->token);
\r
803 if (pGitStatus->repos_lock->comment)
\r
804 entry->lock_comment = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->comment);
\r
807 // Pass ownership of the entry to the array
\r
808 m_arStatusArray.push_back(entry);
\r
813 void CGitStatusListCtrl::AddUnversionedFolder(const CTGitPath& folderName,
\r
814 const CTGitPath& basePath,
\r
815 GitConfig * config)
\r
818 if (!m_bUnversionedRecurse)
\r
820 CSimpleFileFind filefinder(folderName.GetWinPathString());
\r
822 CTGitPath filename;
\r
823 m_bHasUnversionedItems = TRUE;
\r
824 while (filefinder.FindNextFileNoDots())
\r
826 filename.SetFromWin(filefinder.GetFilePath(), filefinder.IsDirectory());
\r
828 bool bMatchIgnore = !!config->MatchIgnorePattern(filename.GetFileOrDirectoryName());
\r
829 bMatchIgnore = bMatchIgnore || config->MatchIgnorePattern(filename.GetGitPathString());
\r
830 if (((bMatchIgnore)&&(m_bShowIgnores))||(!bMatchIgnore))
\r
832 FileEntry * entry = new FileEntry();
\r
833 entry->path = filename;
\r
834 entry->basepath = basePath;
\r
835 entry->inunversionedfolder = true;
\r
836 entry->isfolder = filefinder.IsDirectory();
\r
838 m_arStatusArray.push_back(entry);
\r
839 if (entry->isfolder)
\r
841 if (!g_GitAdminDir.HasAdminDir(entry->path.GetWinPathString(), true))
\r
842 AddUnversionedFolder(entry->path, basePath, config);
\r
850 void CGitStatusListCtrl::ReadRemainingItemsStatus(GitStatus& status, const CTGitPath& basePath,
\r
851 CStringA& strCurrentRepositoryUUID,
\r
852 CTGitPathList& arExtPaths, GitConfig * config, bool bAllDirect)
\r
855 git_wc_status2_t * s;
\r
857 CTGitPath lastexternalpath;
\r
859 while ((s = status.GetNextFileStatus(GitPath)) != NULL)
\r
861 Git_wc_status_kind wcFileStatus = GitStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
862 if ((wcFileStatus == Git_wc_status_unversioned) && (GitPath.IsDirectory()))
\r
864 // check if the unversioned folder is maybe versioned. This
\r
865 // could happen with nested layouts
\r
866 Git_wc_status_kind st = GitStatus::GetAllStatus(GitPath);
\r
867 if ((st != Git_wc_status_unversioned)&&(st != Git_wc_status_none))
\r
869 FileEntry * entry = new FileEntry();
\r
870 entry->path = GitPath;
\r
871 entry->basepath = basePath;
\r
872 entry->inunversionedfolder = true;
\r
873 entry->isfolder = true;
\r
874 entry->isNested = true;
\r
875 m_arStatusArray.push_back(entry);
\r
879 bool bDirectoryIsExternal = false;
\r
880 bool bEntryfromDifferentRepo = false;
\r
883 if (s->entry->uuid)
\r
885 if (strCurrentRepositoryUUID.IsEmpty())
\r
886 strCurrentRepositoryUUID = s->entry->uuid;
\r
889 if (strCurrentRepositoryUUID.Compare(s->entry->uuid)!=0)
\r
891 bEntryfromDifferentRepo = true;
\r
892 if (GitStatus::IsImportant(wcFileStatus))
\r
893 m_bHasExternalsFromDifferentRepos = TRUE;
\r
894 if (s->entry->kind == Git_node_dir)
\r
896 if ((lastexternalpath.IsEmpty())||(!lastexternalpath.IsAncestorOf(GitPath)))
\r
898 arExtPaths.AddPath(GitPath);
\r
899 lastexternalpath = GitPath;
\r
907 // we don't have an UUID - maybe an added file/folder
\r
908 if (!strCurrentRepositoryUUID.IsEmpty())
\r
910 if ((!lastexternalpath.IsEmpty())&&
\r
911 (lastexternalpath.IsAncestorOf(GitPath)))
\r
913 bEntryfromDifferentRepo = true;
\r
914 m_bHasExternalsFromDifferentRepos = TRUE;
\r
921 // if unversioned items lie around in external
\r
922 // directories from different repos, we have to mark them
\r
924 if (!strCurrentRepositoryUUID.IsEmpty())
\r
926 if ((!lastexternalpath.IsEmpty())&&
\r
927 (lastexternalpath.IsAncestorOf(GitPath)))
\r
929 bEntryfromDifferentRepo = true;
\r
933 if (status.IsExternal(GitPath))
\r
935 arExtPaths.AddPath(GitPath);
\r
936 m_bHasExternals = TRUE;
\r
938 if ((!bEntryfromDifferentRepo)&&(status.IsInExternal(GitPath)))
\r
940 // if the externals are inside an unversioned folder (this happens if
\r
941 // the externals are specified with e.g. "ext\folder url" instead of just
\r
942 // "folder url"), then a commit won't succeed.
\r
943 // therefore, we treat those as if the externals come from a different
\r
945 CTGitPath extpath = GitPath;
\r
946 while (basePath.IsAncestorOf(extpath))
\r
948 if (!extpath.HasAdminDir())
\r
950 bEntryfromDifferentRepo = true;
\r
953 extpath = extpath.GetContainingDirectory();
\r
956 // Do we have any external paths?
\r
957 if(arExtPaths.GetCount() > 0)
\r
959 // If do have external paths, we need to check if the current item belongs
\r
961 for (int ix=0; ix<arExtPaths.GetCount(); ix++)
\r
963 if (arExtPaths[ix].IsAncestorOf(GitPath))
\r
965 bDirectoryIsExternal = true;
\r
971 if ((wcFileStatus == Git_wc_status_unversioned)&&(!bDirectoryIsExternal))
\r
972 m_bHasUnversionedItems = TRUE;
\r
974 const FileEntry* entry = AddNewFileEntry(s, GitPath, basePath, bAllDirect, bDirectoryIsExternal, bEntryfromDifferentRepo);
\r
976 bool bMatchIgnore = !!config->MatchIgnorePattern(entry->path.GetFileOrDirectoryName());
\r
977 bMatchIgnore = bMatchIgnore || config->MatchIgnorePattern(entry->path.GetGitPathString());
\r
978 if ((((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none))&&(!bMatchIgnore))||
\r
979 ((wcFileStatus == Git_wc_status_ignored)&&(m_bShowIgnores))||
\r
980 (((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none))&&(bMatchIgnore)&&(m_bShowIgnores)))
\r
982 if (entry->isfolder)
\r
984 // we have an unversioned folder -> get all files in it recursively!
\r
985 AddUnversionedFolder(GitPath, basePath, config);
\r
988 } // while ((s = status.GetNextFileStatus(GitPath)) != NULL)
\r
992 // Get the show-flags bitmap value which corresponds to a particular Git status
\r
993 DWORD CGitStatusListCtrl::GetShowFlagsFromGitStatus(git_wc_status_kind status)
\r
997 case git_wc_status_none:
\r
998 case git_wc_status_unversioned:
\r
999 return SVNSLC_SHOWUNVERSIONED;
\r
1000 case git_wc_status_ignored:
\r
1001 if (!m_bShowIgnores)
\r
1002 return SVNSLC_SHOWDIRECTS;
\r
1003 return SVNSLC_SHOWDIRECTS|SVNSLC_SHOWIGNORED;
\r
1004 case git_wc_status_incomplete:
\r
1005 return SVNSLC_SHOWINCOMPLETE;
\r
1006 case git_wc_status_normal:
\r
1007 return SVNSLC_SHOWNORMAL;
\r
1008 case git_wc_status_external:
\r
1009 return SVNSLC_SHOWEXTERNAL;
\r
1010 case git_wc_status_added:
\r
1011 return SVNSLC_SHOWADDED;
\r
1012 case git_wc_status_missing:
\r
1013 return SVNSLC_SHOWMISSING;
\r
1014 case git_wc_status_deleted:
\r
1015 return SVNSLC_SHOWREMOVED;
\r
1016 case git_wc_status_replaced:
\r
1017 return SVNSLC_SHOWREPLACED;
\r
1018 case git_wc_status_modified:
\r
1019 return SVNSLC_SHOWMODIFIED;
\r
1020 case git_wc_status_merged:
\r
1021 return SVNSLC_SHOWMERGED;
\r
1022 case git_wc_status_conflicted:
\r
1023 return SVNSLC_SHOWCONFLICTED;
\r
1024 case git_wc_status_obstructed:
\r
1025 return SVNSLC_SHOWOBSTRUCTED;
\r
1027 // we should NEVER get here!
\r
1034 void CGitStatusListCtrl::Show(DWORD dwShow, DWORD dwCheck /*=0*/, bool bShowFolders /* = true */)
\r
1036 CWinApp * pApp = AfxGetApp();
\r
1038 pApp->DoWaitCursor(1);
\r
1040 Locker lock(m_critSec);
\r
1041 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), GetUserDefaultLangID());
\r
1043 //SetItemCount(listIndex);
\r
1049 for(int i=0;i<this->m_arStatusArray.size();i++)
\r
1051 AddEntry((CTGitPath*)m_arStatusArray[i],langID,i);
\r
1054 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1055 for (int col = 0; col <= maxcol; col++)
\r
1056 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1059 GetStatisticsString();
\r
1061 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1062 HDITEM HeaderItem = {0};
\r
1063 HeaderItem.mask = HDI_FORMAT;
\r
1064 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1066 pHeader->GetItem(i, &HeaderItem);
\r
1067 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1068 pHeader->SetItem(i, &HeaderItem);
\r
1070 if (m_nSortedColumn)
\r
1072 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1073 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1074 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1078 if (nSelectedEntry)
\r
1080 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1081 EnsureVisible(nSelectedEntry, false);
\r
1085 // Restore the item at the top of the list.
\r
1086 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1088 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1096 pApp->DoWaitCursor(-1);
\r
1102 CWinApp * pApp = AfxGetApp();
\r
1104 pApp->DoWaitCursor(1);
\r
1105 m_dwShow = dwShow;
\r
1106 m_bShowFolders = bShowFolders;
\r
1108 int nTopIndex = GetTopIndex();
\r
1109 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
\r
1110 int nSelectedEntry = 0;
\r
1111 if (posSelectedEntry)
\r
1112 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
\r
1118 m_arListArray.clear();
\r
1120 m_arListArray.reserve(m_arStatusArray.size());
\r
1121 SetItemCount (static_cast<int>(m_arStatusArray.size()));
\r
1123 int listIndex = 0;
\r
1124 for (size_t i=0; i < m_arStatusArray.size(); ++i)
\r
1126 FileEntry * entry = m_arStatusArray[i];
\r
1127 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
\r
1129 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
\r
1131 if (entry->IsFolder() && (!bShowFolders))
\r
1132 continue; // don't show folders if they're not wanted.
\r
1135 git_wc_status_kind status = GitStatus::GetMoreImportant(entry->status, entry->remotestatus);
\r
1136 DWORD showFlags = GetShowFlagsFromGitStatus(status);
\r
1137 if (entry->IsLocked())
\r
1138 showFlags |= SVNSLC_SHOWLOCKS;
\r
1139 if (entry->switched)
\r
1140 showFlags |= SVNSLC_SHOWSWITCHED;
\r
1141 if (!entry->changelist.IsEmpty())
\r
1142 showFlags |= SVNSLC_SHOWINCHANGELIST;
\r
1144 bool bAllowCheck = ((entry->changelist.Compare(SVNSLC_IGNORECHANGELIST) != 0)
\r
1145 && (m_bCheckIfGroupsExist || (m_changelists.size()==0 || (m_changelists.size()==1 && m_bHasIgnoreGroup))));
\r
1147 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
\r
1149 if (status != Git_wc_status_ignored || (entry->direct) || (dwShow & GitSLC_SHOWIGNORED))
\r
1151 if ((!entry->IsFolder()) && (status == Git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
\r
1153 if (PathFileExists(entry->GetPath().GetWinPath()))
\r
1155 m_arListArray.push_back(i);
\r
1156 if ((dwCheck & SVNSLC_SHOWREMOVEDANDPRESENT)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1159 entry->checked = true;
\r
1161 AddEntry(entry, langID, listIndex++);
\r
1164 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
\r
1166 m_arListArray.push_back(i);
\r
1167 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1170 entry->checked = true;
\r
1172 AddEntry(entry, langID, listIndex++);
\r
1174 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
\r
1176 m_arListArray.push_back(i);
\r
1177 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1180 entry->checked = true;
\r
1182 AddEntry(entry, langID, listIndex++);
\r
1188 SetItemCount(listIndex);
\r
1190 m_ColumnManager.UpdateRelevance (m_arStatusArray, m_arListArray);
\r
1192 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1193 for (int col = 0; col <= maxcol; col++)
\r
1194 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1197 GetStatisticsString();
\r
1199 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1200 HDITEM HeaderItem = {0};
\r
1201 HeaderItem.mask = HDI_FORMAT;
\r
1202 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1204 pHeader->GetItem(i, &HeaderItem);
\r
1205 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1206 pHeader->SetItem(i, &HeaderItem);
\r
1208 if (m_nSortedColumn)
\r
1210 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1211 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1212 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1215 if (nSelectedEntry)
\r
1217 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1218 EnsureVisible(nSelectedEntry, false);
\r
1222 // Restore the item at the top of the list.
\r
1223 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1225 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1233 pApp->DoWaitCursor(-1);
\r
1235 m_bEmpty = (GetItemCount() == 0);
\r
1241 void CGitStatusListCtrl::Show(DWORD dwShow, const CTGitPathList& checkedList, bool bShowFolders /* = true */)
\r
1246 Locker lock(m_critSec);
\r
1247 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), GetUserDefaultLangID());
\r
1249 CWinApp * pApp = AfxGetApp();
\r
1251 pApp->DoWaitCursor(1);
\r
1252 m_dwShow = dwShow;
\r
1253 m_bShowFolders = bShowFolders;
\r
1255 int nTopIndex = GetTopIndex();
\r
1256 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
\r
1257 int nSelectedEntry = 0;
\r
1258 if (posSelectedEntry)
\r
1259 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
\r
1265 m_arListArray.clear();
\r
1267 m_arListArray.reserve(m_arStatusArray.size());
\r
1268 SetItemCount (static_cast<int>(m_arStatusArray.size()));
\r
1270 int listIndex = 0;
\r
1271 for (size_t i=0; i < m_arStatusArray.size(); ++i)
\r
1273 FileEntry * entry = m_arStatusArray[i];
\r
1274 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
\r
1276 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
\r
1278 if (entry->IsFolder() && (!bShowFolders))
\r
1279 continue; // don't show folders if they're not wanted.
\r
1281 git_wc_status_kind status = SVNStatus::GetMoreImportant(entry->status, entry->remotestatus);
\r
1282 DWORD showFlags = GetShowFlagsFromSVNStatus(status);
\r
1283 if (entry->IsLocked())
\r
1284 showFlags |= SVNSLC_SHOWLOCKS;
\r
1285 if (!entry->changelist.IsEmpty())
\r
1286 showFlags |= SVNSLC_SHOWINCHANGELIST;
\r
1288 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
\r
1289 if (status != git_wc_status_ignored || (entry->direct) || (dwShow & SVNSLC_SHOWIGNORED))
\r
1291 for (int npath = 0; npath < checkedList.GetCount(); ++npath)
\r
1293 if (entry->GetPath().IsEquivalentTo(checkedList[npath]))
\r
1295 entry->checked = true;
\r
1299 if ((!entry->IsFolder()) && (status == git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
\r
1301 if (PathFileExists(entry->GetPath().GetWinPath()))
\r
1303 m_arListArray.push_back(i);
\r
1304 AddEntry(entry, langID, listIndex++);
\r
1307 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
\r
1309 m_arListArray.push_back(i);
\r
1310 AddEntry(entry, langID, listIndex++);
\r
1312 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
\r
1314 m_arListArray.push_back(i);
\r
1315 AddEntry(entry, langID, listIndex++);
\r
1317 else if (entry->switched)
\r
1319 m_arListArray.push_back(i);
\r
1320 AddEntry(entry, langID, listIndex++);
\r
1326 SetItemCount(listIndex);
\r
1328 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1329 for (int col = 0; col <= maxcol; col++)
\r
1330 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1333 GetStatisticsString();
\r
1335 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1336 HDITEM HeaderItem = {0};
\r
1337 HeaderItem.mask = HDI_FORMAT;
\r
1338 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1340 pHeader->GetItem(i, &HeaderItem);
\r
1341 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1342 pHeader->SetItem(i, &HeaderItem);
\r
1344 if (m_nSortedColumn)
\r
1346 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1347 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1348 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1351 if (nSelectedEntry)
\r
1353 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1354 EnsureVisible(nSelectedEntry, false);
\r
1358 // Restore the item at the top of the list.
\r
1359 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1361 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1369 pApp->DoWaitCursor(-1);
\r
1371 m_bEmpty = (GetItemCount() == 0);
\r
1376 void CGitStatusListCtrl::AddEntry(CTGitPath * GitPath, WORD langID, int listIndex)
\r
1378 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
1379 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
1381 CString path = GitPath->GetGitPathString();
\r
1385 int index = listIndex;
\r
1387 CString entryname = GitPath->GetGitPathString();
\r
1389 // if (entry->isfolder)
\r
1390 // icon_idx = m_nIconFolder;
\r
1393 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(*GitPath);
\r
1396 InsertItem(index, entryname, icon_idx);
\r
1398 this->SetItemData(index, (DWORD_PTR)GitPath);
\r
1399 // SVNSLC_COLFILENAME
\r
1400 SetItemText(index, nCol++, GitPath->GetFileOrDirectoryName());
\r
1402 SetItemText(index, nCol++, GitPath->GetFileExtension());
\r
1403 // SVNSLC_COLSTATUS
\r
1404 // if (entry->isNested)
\r
1406 // CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1407 // SetItemText(index, nCol++, sTemp);
\r
1411 SetItemText(index, nCol++, GitPath->GetActionName());
\r
1413 // SVNSLC_COLREMOTESTATUS
\r
1414 // if (entry->isNested)
\r
1416 // CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1417 // SetItemText(index, nCol++, sTemp);
\r
1421 //SetItemText(index, nCol++, buf);
\r
1423 // SVNSLC_COLTEXTSTATUS
\r
1424 // if (entry->isNested)
\r
1426 // CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1427 // SetItemText(index, nCol++, sTemp);
\r
1432 SVNStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1433 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1434 _tcscat_s(buf, 100, _T(" (+)"));
\r
1435 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1436 _tcscat_s(buf, 100, _T(" (s)"));
\r
1438 // SetItemText(index, nCol++, buf);
\r
1440 // SVNSLC_COLPROPSTATUS
\r
1441 // if (entry->isNested)
\r
1443 // SetItemText(index, nCol++, _T(""));
\r
1448 SVNStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1449 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1450 _tcscat_s(buf, 100, _T(" (+)"));
\r
1451 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1452 _tcscat_s(buf, 100, _T(" (s)"));
\r
1454 // SetItemText(index, nCol++, buf);
\r
1456 // SVNSLC_COLREMOTETEXT
\r
1457 // if (entry->isNested)
\r
1459 // SetItemText(index, nCol++, _T(""));
\r
1464 SVNStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1465 SetItemText(index, nCol++, buf);
\r
1468 // SVNSLC_COLREMOTEPROP
\r
1469 // if (entry->isNested)
\r
1471 // SetItemText(index, nCol++, _T(""));
\r
1475 // SVNStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1476 // SetItemText(index, nCol++, buf);
\r
1479 // SetItemText(index, nCol++, entry->url);
\r
1482 if (!m_HeadRev.IsHead())
\r
1484 // we have contacted the repository
\r
1486 // decision-matrix
\r
1487 // wc repository text
\r
1490 // UID1 UID1 owner
\r
1491 // UID1 "" lock has been broken
\r
1492 // UID1 UID2 lock has been stolen
\r
1493 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))
\r
1495 if (entry->lock_owner.IsEmpty())
\r
1496 SetItemText(index, nCol++, entry->lock_remoteowner);
\r
1498 SetItemText(index, nCol++, entry->lock_owner);
\r
1500 else if (entry->lock_remotetoken.IsEmpty())
\r
1503 CString temp(MAKEINTRESOURCE(IDS_STATUSLIST_LOCKBROKEN));
\r
1504 SetItemText(index, nCol++, temp);
\r
1510 temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);
\r
1511 SetItemText(index, nCol++, temp);
\r
1515 SetItemText(index, nCol++, entry->lock_owner);
\r
1516 // SVNSLC_COLLOCKCOMMENT
\r
1517 SetItemText(index, nCol++, entry->lock_comment);
\r
1518 // SVNSLC_COLAUTHOR
\r
1519 SetItemText(index, nCol++, entry->last_commit_author);
\r
1520 // SVNSLC_COLREVISION
\r
1522 temp.Format(_T("%ld"), entry->last_commit_rev);
\r
1523 if (entry->last_commit_rev > 0)
\r
1524 SetItemText(index, nCol++, temp);
\r
1526 SetItemText(index, nCol++, _T(""));
\r
1527 // SVNSLC_COLREMOTEREVISION
\r
1528 temp.Format(_T("%ld"), entry->remoterev);
\r
1529 if (entry->remoterev > 0)
\r
1530 SetItemText(index, nCol++, temp);
\r
1532 SetItemText(index, nCol++, _T(""));
\r
1534 TCHAR datebuf[SVN_DATE_BUFFER];
\r
1535 apr_time_t date = entry->last_commit_date;
\r
1536 SVN::formatDate(datebuf, date, true);
\r
1538 SetItemText(index, nCol++, datebuf);
\r
1540 SetItemText(index, nCol++, _T(""));
\r
1541 // SVNSLC_COLSVNNEEDSLOCK
\r
1542 BOOL bFoundSVNNeedsLock = entry->present_props.IsNeedsLockSet();
\r
1543 CString strSVNNeedsLock = (bFoundSVNNeedsLock) ? _T("*") : _T("");
\r
1544 SetItemText(index, nCol++, strSVNNeedsLock);
\r
1545 // SVNSLC_COLCOPYFROM
\r
1546 if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)
\r
1547 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());
\r
1549 temp = entry->copyfrom_url;
\r
1550 SetItemText(index, nCol++, temp);
\r
1551 // SVNSLC_COLMODIFICATIONDATE
\r
1552 __int64 filetime = entry->GetPath().GetLastWriteTime();
\r
1553 if ( (filetime) && (entry->status!=git_wc_status_deleted) )
\r
1555 FILETIME* f = (FILETIME*)(__int64*)&filetime;
\r
1556 TCHAR datebuf[SVN_DATE_BUFFER];
\r
1557 SVN::formatDate(datebuf,*f,true);
\r
1558 SetItemText(index, nCol++, datebuf);
\r
1562 SetItemText(index, nCol++, _T(""));
\r
1565 // user-defined properties
\r
1566 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
\r
1570 assert (i == nCol++);
\r
1571 assert (m_ColumnManager.IsUserProp (i));
\r
1573 CString name = m_ColumnManager.GetName(i);
\r
1574 if (entry->present_props.HasProperty (name))
\r
1576 const CString& propVal = entry->present_props [name];
\r
1577 if (propVal.IsEmpty())
\r
1578 SetItemText(index, i, m_sNoPropValueText);
\r
1580 SetItemText(index, i, propVal);
\r
1583 SetItemText(index, i, _T(""));
\r
1586 SetCheck(index, GitPath->m_Checked);
\r
1587 if (GitPath->m_Checked)
\r
1591 // if (m_changelists.find(entry->changelist) != m_changelists.end())
\r
1592 // SetItemGroup(index, m_changelists[entry->changelist]);
\r
1594 if( GitPath->m_Action & CTGitPath::LOGACTIONS_IGNORE)
\r
1595 SetItemGroup(index, 2);
\r
1596 else if( GitPath->m_Action & CTGitPath::LOGACTIONS_UNVER)
\r
1597 SetItemGroup(index,1);
\r
1599 SetItemGroup(index,0);
\r
1605 void CGitStatusListCtrl::AddEntry(FileEntry * entry, WORD langID, int listIndex)
\r
1607 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
1608 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
1610 CString path = entry->GetPath().GetGitPathString();
\r
1611 if ( m_mapFilenameToChecked.size()!=0 && m_mapFilenameToChecked.find(path) != m_mapFilenameToChecked.end() )
\r
1613 // The user manually de-/selected an item. We now restore this status
\r
1614 // when refreshing.
\r
1615 entry->checked = m_mapFilenameToChecked[path];
\r
1620 int index = listIndex;
\r
1622 CString entryname = entry->GetDisplayName();
\r
1624 if (entry->isfolder)
\r
1625 icon_idx = m_nIconFolder;
\r
1628 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(entry->path);
\r
1631 InsertItem(index, entryname, icon_idx);
\r
1632 // SVNSLC_COLFILENAME
\r
1633 SetItemText(index, nCol++, entry->path.GetFileOrDirectoryName());
\r
1635 SetItemText(index, nCol++, entry->path.GetFileExtension());
\r
1636 // SVNSLC_COLSTATUS
\r
1637 if (entry->isNested)
\r
1639 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1640 SetItemText(index, nCol++, sTemp);
\r
1644 GitStatus::GetStatusString(hResourceHandle, entry->status, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1645 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1646 _tcscat_s(buf, 100, _T(" (+)"));
\r
1647 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1648 _tcscat_s(buf, 100, _T(" (s)"));
\r
1650 if ((entry->status == entry->propstatus)&&
\r
1651 (entry->status != git_wc_status_normal)&&
\r
1652 (entry->status != git_wc_status_unversioned)&&
\r
1653 (!GitStatus::IsImportant(entry->textstatus)))
\r
1654 _tcscat_s(buf, 100, ponly);
\r
1656 SetItemText(index, nCol++, buf);
\r
1658 // SVNSLC_COLREMOTESTATUS
\r
1659 if (entry->isNested)
\r
1661 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1662 SetItemText(index, nCol++, sTemp);
\r
1667 SVNStatus::GetStatusString(hResourceHandle, entry->remotestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1668 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1669 _tcscat_s(buf, 100, _T(" (+)"));
\r
1670 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1671 _tcscat_s(buf, 100, _T(" (s)"));
\r
1672 if ((entry->remotestatus == entry->remotepropstatus)&&
\r
1673 (entry->remotestatus != git_wc_status_none)&&
\r
1674 (entry->remotestatus != git_wc_status_normal)&&
\r
1675 (entry->remotestatus != git_wc_status_unversioned)&&
\r
1676 (!SVNStatus::IsImportant(entry->remotetextstatus)))
\r
1677 _tcscat_s(buf, 100, ponly);
\r
1679 SetItemText(index, nCol++, buf);
\r
1681 // SVNSLC_COLTEXTSTATUS
\r
1682 if (entry->isNested)
\r
1684 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1685 SetItemText(index, nCol++, sTemp);
\r
1690 SVNStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1691 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1692 _tcscat_s(buf, 100, _T(" (+)"));
\r
1693 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1694 _tcscat_s(buf, 100, _T(" (s)"));
\r
1696 SetItemText(index, nCol++, buf);
\r
1698 // SVNSLC_COLPROPSTATUS
\r
1699 if (entry->isNested)
\r
1701 SetItemText(index, nCol++, _T(""));
\r
1706 SVNStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1707 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1708 _tcscat_s(buf, 100, _T(" (+)"));
\r
1709 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1710 _tcscat_s(buf, 100, _T(" (s)"));
\r
1712 SetItemText(index, nCol++, buf);
\r
1714 // SVNSLC_COLREMOTETEXT
\r
1715 if (entry->isNested)
\r
1717 SetItemText(index, nCol++, _T(""));
\r
1722 SVNStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1723 SetItemText(index, nCol++, buf);
\r
1726 // SVNSLC_COLREMOTEPROP
\r
1727 if (entry->isNested)
\r
1729 SetItemText(index, nCol++, _T(""));
\r
1733 // SVNStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1734 SetItemText(index, nCol++, buf);
\r
1737 // SetItemText(index, nCol++, entry->url);
\r
1740 if (!m_HeadRev.IsHead())
\r
1742 // we have contacted the repository
\r
1744 // decision-matrix
\r
1745 // wc repository text
\r
1748 // UID1 UID1 owner
\r
1749 // UID1 "" lock has been broken
\r
1750 // UID1 UID2 lock has been stolen
\r
1751 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))
\r
1753 if (entry->lock_owner.IsEmpty())
\r
1754 SetItemText(index, nCol++, entry->lock_remoteowner);
\r
1756 SetItemText(index, nCol++, entry->lock_owner);
\r
1758 else if (entry->lock_remotetoken.IsEmpty())
\r
1761 CString temp(MAKEINTRESOURCE(IDS_STATUSLIST_LOCKBROKEN));
\r
1762 SetItemText(index, nCol++, temp);
\r
1768 temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);
\r
1769 SetItemText(index, nCol++, temp);
\r
1773 SetItemText(index, nCol++, entry->lock_owner);
\r
1774 // SVNSLC_COLLOCKCOMMENT
\r
1775 SetItemText(index, nCol++, entry->lock_comment);
\r
1776 // SVNSLC_COLAUTHOR
\r
1777 SetItemText(index, nCol++, entry->last_commit_author);
\r
1778 // SVNSLC_COLREVISION
\r
1780 temp.Format(_T("%ld"), entry->last_commit_rev);
\r
1781 if (entry->last_commit_rev > 0)
\r
1782 SetItemText(index, nCol++, temp);
\r
1784 SetItemText(index, nCol++, _T(""));
\r
1785 // SVNSLC_COLREMOTEREVISION
\r
1786 temp.Format(_T("%ld"), entry->remoterev);
\r
1787 if (entry->remoterev > 0)
\r
1788 SetItemText(index, nCol++, temp);
\r
1790 SetItemText(index, nCol++, _T(""));
\r
1792 TCHAR datebuf[SVN_DATE_BUFFER];
\r
1793 apr_time_t date = entry->last_commit_date;
\r
1794 SVN::formatDate(datebuf, date, true);
\r
1796 SetItemText(index, nCol++, datebuf);
\r
1798 SetItemText(index, nCol++, _T(""));
\r
1799 // SVNSLC_COLSVNNEEDSLOCK
\r
1800 BOOL bFoundSVNNeedsLock = entry->present_props.IsNeedsLockSet();
\r
1801 CString strSVNNeedsLock = (bFoundSVNNeedsLock) ? _T("*") : _T("");
\r
1802 SetItemText(index, nCol++, strSVNNeedsLock);
\r
1803 // SVNSLC_COLCOPYFROM
\r
1804 if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)
\r
1805 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());
\r
1807 temp = entry->copyfrom_url;
\r
1808 SetItemText(index, nCol++, temp);
\r
1809 // SVNSLC_COLMODIFICATIONDATE
\r
1810 __int64 filetime = entry->GetPath().GetLastWriteTime();
\r
1811 if ( (filetime) && (entry->status!=git_wc_status_deleted) )
\r
1813 FILETIME* f = (FILETIME*)(__int64*)&filetime;
\r
1814 TCHAR datebuf[SVN_DATE_BUFFER];
\r
1815 SVN::formatDate(datebuf,*f,true);
\r
1816 SetItemText(index, nCol++, datebuf);
\r
1820 SetItemText(index, nCol++, _T(""));
\r
1823 // user-defined properties
\r
1824 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
\r
1828 assert (i == nCol++);
\r
1829 assert (m_ColumnManager.IsUserProp (i));
\r
1831 CString name = m_ColumnManager.GetName(i);
\r
1832 if (entry->present_props.HasProperty (name))
\r
1834 const CString& propVal = entry->present_props [name];
\r
1835 if (propVal.IsEmpty())
\r
1836 SetItemText(index, i, m_sNoPropValueText);
\r
1838 SetItemText(index, i, propVal);
\r
1841 SetItemText(index, i, _T(""));
\r
1844 SetCheck(index, entry->checked);
\r
1845 if (entry->checked)
\r
1847 if (m_changelists.find(entry->changelist) != m_changelists.end())
\r
1848 SetItemGroup(index, m_changelists[entry->changelist]);
\r
1850 SetItemGroup(index, 0);
\r
1855 bool CGitStatusListCtrl::SetItemGroup(int item, int groupindex)
\r
1857 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS) == NULL)
\r
1859 if (groupindex < 0)
\r
1862 i.mask = LVIF_GROUPID;
\r
1865 i.iGroupId = groupindex;
\r
1867 return !!SetItem(&i);
\r
1870 void CGitStatusListCtrl::Sort()
\r
1872 Locker lock(m_critSec);
\r
1874 CSorter predicate (&m_ColumnManager, m_nSortedColumn, m_bAscending);
\r
1876 std::sort(m_arStatusArray.begin(), m_arStatusArray.end(), predicate);
\r
1877 SaveColumnWidths();
\r
1878 Show(m_dwShow, 0, m_bShowFolders);
\r
1882 void CGitStatusListCtrl::OnHdnItemclick(NMHDR *pNMHDR, LRESULT *pResult)
\r
1884 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
1889 if (m_nSortedColumn == phdr->iItem)
\r
1890 m_bAscending = !m_bAscending;
\r
1892 m_bAscending = TRUE;
\r
1893 m_nSortedColumn = phdr->iItem;
\r
1894 m_mapFilenameToChecked.clear();
\r
1897 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1898 HDITEM HeaderItem = {0};
\r
1899 HeaderItem.mask = HDI_FORMAT;
\r
1900 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1902 pHeader->GetItem(i, &HeaderItem);
\r
1903 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1904 pHeader->SetItem(i, &HeaderItem);
\r
1906 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1907 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1908 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1910 // the checked state of the list control items must be restored
\r
1912 for (int i=0; i<GetItemCount(); ++i)
\r
1914 CTGitPath * entry = (CTGitPath*)GetItemData(i);
\r
1915 SetCheck(i, entry->m_Checked);
\r
1921 void CGitStatusListCtrl::OnLvnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
\r
1923 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1926 #define ISCHECKED(x) ((x) ? ((((x)&LVIS_STATEIMAGEMASK)>>12)-1) : FALSE)
\r
1927 if ((m_bBlock)&&(m_bBlockUI))
\r
1929 // if we're blocked, prevent changing of the check state
\r
1930 if ((!ISCHECKED(pNMLV->uOldState) && ISCHECKED(pNMLV->uNewState))||
\r
1931 (ISCHECKED(pNMLV->uOldState) && !ISCHECKED(pNMLV->uNewState)))
\r
1936 BOOL CGitStatusListCtrl::OnLvnItemchanged(NMHDR *pNMHDR, LRESULT *pResult)
\r
1938 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1940 if ((pNMLV->uNewState==0)||(pNMLV->uNewState & LVIS_SELECTED)||(pNMLV->uNewState & LVIS_FOCUSED))
\r
1946 bool bSelected = !!(ListView_GetItemState(m_hWnd, pNMLV->iItem, LVIS_SELECTED) & LVIS_SELECTED);
\r
1947 int nListItems = GetItemCount();
\r
1950 // was the item checked?
\r
1952 //CTGitPath *gitpath=(CTGitPath*)GetItemData(pNMLV->iItem);
\r
1953 //gitpath->m_Checked=GetCheck(pNMLV->iItem);
\r
1955 if (GetCheck(pNMLV->iItem))
\r
1957 CheckEntry(pNMLV->iItem, nListItems);
\r
1960 POSITION pos = GetFirstSelectedItemPosition();
\r
1962 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
1964 if (index != pNMLV->iItem)
\r
1965 CheckEntry(index, nListItems);
\r
1971 UncheckEntry(pNMLV->iItem, nListItems);
\r
1974 POSITION pos = GetFirstSelectedItemPosition();
\r
1976 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
1978 if (index != pNMLV->iItem)
\r
1979 UncheckEntry(index, nListItems);
\r
1984 GetStatisticsString();
\r
1991 void CGitStatusListCtrl::OnColumnResized(NMHDR *pNMHDR, LRESULT *pResult)
\r
1993 LPNMHEADER header = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
1994 if ( (header != NULL)
\r
1995 && (header->iItem >= 0)
\r
1996 && (header->iItem < m_ColumnManager.GetColumnCount()))
\r
1998 m_ColumnManager.ColumnResized (header->iItem);
\r
2004 void CGitStatusListCtrl::OnColumnMoved(NMHDR *pNMHDR, LRESULT *pResult)
\r
2006 LPNMHEADER header = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
2008 if ( (header != NULL)
\r
2009 && (header->iItem >= 0)
\r
2010 && (header->iItem < m_ColumnManager.GetColumnCount())
\r
2011 // only allow the reordering if the column was not moved left of the first
\r
2012 // visible item - otherwise the 'invisible' columns are not at the far left
\r
2013 // anymore and we get all kinds of redrawing problems.
\r
2014 && (header->pitem)
\r
2015 && (header->pitem->iOrder > m_ColumnManager.GetInvisibleCount()))
\r
2017 m_ColumnManager.ColumnMoved (header->iItem, header->pitem->iOrder);
\r
2021 Invalidate(FALSE);
\r
2024 void CGitStatusListCtrl::CheckEntry(int index, int nListItems)
\r
2026 Locker lock(m_critSec);
\r
2027 //FileEntry * entry = GetListEntry(index);
\r
2028 CTGitPath *path=(CTGitPath*)GetItemData(index);
\r
2029 ASSERT(path != NULL);
\r
2032 SetCheck(index, TRUE);
\r
2033 //entry = GetListEntry(index);
\r
2034 // if an unversioned item was checked, then we need to check if
\r
2035 // the parent folders are unversioned too. If the parent folders actually
\r
2036 // are unversioned, then check those too.
\r
2038 if (entry->status == git_wc_status_unversioned)
\r
2040 // we need to check the parent folder too
\r
2041 const CTGitPath& folderpath = entry->path;
\r
2042 for (int i=0; i< nListItems; ++i)
\r
2044 FileEntry * testEntry = GetListEntry(i);
\r
2045 ASSERT(testEntry != NULL);
\r
2046 if (testEntry == NULL)
\r
2048 if (!testEntry->checked)
\r
2050 if (testEntry->path.IsAncestorOf(folderpath) && (!testEntry->path.IsEquivalentTo(folderpath)))
\r
2052 SetEntryCheck(testEntry,i,true);
\r
2058 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
2059 if ( (entry->status == git_wc_status_deleted) || (m_bCheckChildrenWithParent) || (bShift) )
\r
2061 // if a deleted folder gets checked, we have to check all
\r
2062 // children of that folder too.
\r
2063 if (entry->path.IsDirectory())
\r
2065 SetCheckOnAllDescendentsOf(entry, true);
\r
2068 // if a deleted file or folder gets checked, we have to
\r
2069 // check all parents of this item too.
\r
2070 for (int i=0; i<nListItems; ++i)
\r
2072 FileEntry * testEntry = GetListEntry(i);
\r
2073 ASSERT(testEntry != NULL);
\r
2074 if (testEntry == NULL)
\r
2076 if (!testEntry->checked)
\r
2078 if (testEntry->path.IsAncestorOf(entry->path) && (!testEntry->path.IsEquivalentTo(entry->path)))
\r
2080 if ((testEntry->status == git_wc_status_deleted)||(m_bCheckChildrenWithParent))
\r
2082 SetEntryCheck(testEntry,i,true);
\r
2084 // now we need to check all children of this parent folder
\r
2085 SetCheckOnAllDescendentsOf(testEntry, true);
\r
2092 if ( !path->m_Checked )
\r
2094 path->m_Checked = TRUE;
\r
2099 void CGitStatusListCtrl::UncheckEntry(int index, int nListItems)
\r
2101 Locker lock(m_critSec);
\r
2102 CTGitPath *path=(CTGitPath*)GetItemData(index);
\r
2103 ASSERT(path != NULL);
\r
2106 SetCheck(index, FALSE);
\r
2107 //entry = GetListEntry(index);
\r
2108 // item was unchecked
\r
2110 if (entry->path.IsDirectory())
\r
2112 // disable all files within an unselected folder, except when unchecking a folder with property changes
\r
2113 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
2114 if ( (entry->status != git_wc_status_modified) || (bShift) )
\r
2116 SetCheckOnAllDescendentsOf(entry, false);
\r
2119 else if (entry->status == git_wc_status_deleted)
\r
2121 // a "deleted" file was unchecked, so uncheck all parent folders
\r
2122 // and all children of those parents
\r
2123 for (int i=0; i<nListItems; i++)
\r
2125 FileEntry * testEntry = GetListEntry(i);
\r
2126 ASSERT(testEntry != NULL);
\r
2127 if (testEntry == NULL)
\r
2129 if (testEntry->checked)
\r
2131 if (testEntry->path.IsAncestorOf(entry->path))
\r
2133 if (testEntry->status == git_wc_status_deleted)
\r
2135 SetEntryCheck(testEntry,i,false);
\r
2138 SetCheckOnAllDescendentsOf(testEntry, false);
\r
2145 if ( path->m_Checked )
\r
2147 path->m_Checked = FALSE;
\r
2152 bool CGitStatusListCtrl::EntryPathCompareNoCase(const FileEntry* pEntry1, const FileEntry* pEntry2)
\r
2154 return pEntry1->path < pEntry2->path;
\r
2157 bool CGitStatusListCtrl::IsEntryVersioned(const FileEntry* pEntry1)
\r
2159 return pEntry1->status != git_wc_status_unversioned;
\r
2162 bool CGitStatusListCtrl::BuildStatistics()
\r
2165 bool bRefetchStatus = false;
\r
2166 FileEntryVector::iterator itFirstUnversionedEntry;
\r
2167 itFirstUnversionedEntry = std::partition(m_arStatusArray.begin(), m_arStatusArray.end(), IsEntryVersioned);
\r
2168 if (m_bUnversionedLast)
\r
2170 // We partition the list of items so that it's arrange with all the versioned items first
\r
2171 // then all the unversioned items afterwards.
\r
2172 // Then we sort the versioned part of this, so that we can do quick look-ups in it
\r
2173 std::sort(m_arStatusArray.begin(), itFirstUnversionedEntry, EntryPathCompareNoCase);
\r
2174 // Also sort the unversioned section, to make the list look nice...
\r
2175 std::sort(itFirstUnversionedEntry, m_arStatusArray.end(), EntryPathCompareNoCase);
\r
2178 // now gather some statistics
\r
2179 m_nUnversioned = 0;
\r
2184 m_nConflicted = 0;
\r
2187 for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2189 const FileEntry * entry = m_arStatusArray[i];
\r
2192 switch (entry->status)
\r
2194 case git_wc_status_normal:
\r
2197 case git_wc_status_added:
\r
2200 case git_wc_status_missing:
\r
2201 case git_wc_status_deleted:
\r
2204 case git_wc_status_replaced:
\r
2205 case git_wc_status_modified:
\r
2206 case git_wc_status_merged:
\r
2209 case git_wc_status_conflicted:
\r
2210 case git_wc_status_obstructed:
\r
2213 case git_wc_status_ignored:
\r
2219 if (GitStatus::IsImportant(entry->remotestatus))
\r
2222 // If an entry is in an unversioned folder, we don't have to do an expensive array search
\r
2223 // to find out if it got case-renamed: an unversioned folder can't have versioned files
\r
2224 // But nested folders are also considered to be in unversioned folders, we have to do the
\r
2225 // check in that case too, otherwise we would miss case-renamed folders - they show up
\r
2226 // as nested folders.
\r
2227 if (((!entry->inunversionedfolder)||(entry->isNested))&&(m_bUnversionedLast))
\r
2229 // check if the unversioned item is just
\r
2230 // a file differing in case but still versioned
\r
2231 FileEntryVector::iterator itMatchingItem;
\r
2232 if(std::binary_search(m_arStatusArray.begin(), itFirstUnversionedEntry, entry, EntryPathCompareNoCase))
\r
2234 // We've confirmed that there *is* a matching file
\r
2235 // Find its exact location
\r
2236 FileEntryVector::iterator itMatchingItem;
\r
2237 itMatchingItem = std::lower_bound(m_arStatusArray.begin(), itFirstUnversionedEntry, entry, EntryPathCompareNoCase);
\r
2239 // adjust the case of the filename
\r
2240 if (MoveFileEx(entry->path.GetWinPath(), (*itMatchingItem)->path.GetWinPath(), MOVEFILE_REPLACE_EXISTING))
\r
2242 // We successfully adjusted the case in the filename. But there is now a file with status 'missing'
\r
2243 // in the array, because that's the status of the file before we adjusted the case.
\r
2244 // We have to refetch the status of that file.
\r
2245 // Since fetching the status of single files/directories is very expensive and there can be
\r
2246 // multiple case-renames here, we just set a flag and refetch the status at the end from scratch.
\r
2247 bRefetchStatus = true;
\r
2249 m_arStatusArray.erase(m_arStatusArray.begin()+i);
\r
2253 // now that we removed an unversioned item from the array, find the first unversioned item in the 'new'
\r
2255 itFirstUnversionedEntry = std::partition(m_arStatusArray.begin(), m_arStatusArray.end(), IsEntryVersioned);
\r
2263 } // switch (entry->status)
\r
2265 } // for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2266 return !bRefetchStatus;
\r
2271 void CGitStatusListCtrl::GetMinMaxRevisions(git_revnum_t& rMin, git_revnum_t& rMax, bool bShownOnly, bool bCheckedOnly)
\r
2274 Locker lock(m_critSec);
\r
2278 if ((bShownOnly)||(bCheckedOnly))
\r
2280 for (int i=0; i<GetItemCount(); ++i)
\r
2282 const FileEntry * entry = GetListEntry(i);
\r
2284 if ((entry)&&(entry->last_commit_rev))
\r
2286 if ((!bCheckedOnly)||(entry->IsChecked()))
\r
2288 if (entry->last_commit_rev >= 0)
\r
2290 rMin = min(rMin, entry->last_commit_rev);
\r
2291 rMax = max(rMax, entry->last_commit_rev);
\r
2299 for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2301 const FileEntry * entry = m_arStatusArray[i];
\r
2302 if ((entry)&&(entry->last_commit_rev))
\r
2304 if (entry->last_commit_rev >= 0)
\r
2306 rMin = min(rMin, entry->last_commit_rev);
\r
2307 rMax = max(rMax, entry->last_commit_rev);
\r
2312 if (rMin == LONG_MAX)
\r
2317 int CGitStatusListCtrl::GetGroupFromPoint(POINT * ppt)
\r
2319 // the point must be relative to the upper left corner of the control
\r
2323 if (!IsGroupViewEnabled())
\r
2331 GetWindowRect(&rc);
\r
2332 while (((flags & LVHT_BELOW) == 0)&&(pt.y < rc.bottom))
\r
2334 nItem = HitTest(pt, &flags);
\r
2335 if ((flags & LVHT_ONITEM)||(flags & LVHT_EX_GROUP_HEADER))
\r
2337 // the first item below the point
\r
2339 // check if the point is too much right (i.e. if the point
\r
2340 // is farther to the right than the width of the item)
\r
2342 GetItemRect(nItem, &r, LVIR_LABEL);
\r
2343 if (ppt->x > r.right)
\r
2347 lv.mask = LVIF_GROUPID;
\r
2350 int groupID = lv.iGroupId;
\r
2351 // now we search upwards and check if the item above this one
\r
2352 // belongs to another group. If it belongs to the same group,
\r
2353 // we're not over a group header
\r
2357 nItem = HitTest(pt, &flags);
\r
2358 if ((flags & LVHT_ONITEM)&&(nItem >= 0))
\r
2360 // the first item below the point
\r
2362 lv.mask = LVIF_GROUPID;
\r
2365 if (lv.iGroupId != groupID)
\r
2380 void CGitStatusListCtrl::OnContextMenuGroup(CWnd * /*pWnd*/, CPoint point)
\r
2382 POINT clientpoint = point;
\r
2383 ScreenToClient(&clientpoint);
\r
2384 if ((IsGroupViewEnabled())&&(GetGroupFromPoint(&clientpoint) >= 0))
\r
2387 if (popup.CreatePopupMenu())
\r
2390 temp.LoadString(IDS_STATUSLIST_CHECKGROUP);
\r
2391 popup.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CHECKGROUP, temp);
\r
2392 temp.LoadString(IDS_STATUSLIST_UNCHECKGROUP);
\r
2393 popup.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_UNCHECKGROUP, temp);
\r
2394 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2395 bool bCheck = false;
\r
2398 case IDSVNLC_CHECKGROUP:
\r
2400 // fall through here
\r
2401 case IDSVNLC_UNCHECKGROUP:
\r
2403 int group = GetGroupFromPoint(&clientpoint);
\r
2404 // go through all items and check/uncheck those assigned to the group
\r
2405 // but block the OnLvnItemChanged handler
\r
2408 for (int i=0; i<GetItemCount(); ++i)
\r
2410 SecureZeroMemory(&lv, sizeof(LVITEM));
\r
2411 lv.mask = LVIF_GROUPID;
\r
2414 if (lv.iGroupId == group)
\r
2416 FileEntry * entry = GetListEntry(i);
\r
2419 bool bOldCheck = !!GetCheck(i);
\r
2420 //SetEntryCheck(entry, i, bCheck);
\r
2421 if (bCheck != bOldCheck)
\r
2431 GetStatisticsString();
\r
2441 void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
\r
2444 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
2446 bool XPorLater = false;
\r
2447 OSVERSIONINFOEX inf;
\r
2448 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
2449 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
2450 GetVersionEx((OSVERSIONINFO *)&inf);
\r
2451 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
2452 if (fullver >= 0x0501)
\r
2454 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
2455 CTGitPath * filepath;
\r
2457 int selIndex = GetSelectionMark();
\r
2458 if ((point.x == -1) && (point.y == -1))
\r
2461 GetItemRect(selIndex, &rect, LVIR_LABEL);
\r
2462 ClientToScreen(&rect);
\r
2463 point = rect.CenterPoint();
\r
2465 if ((GetSelectedCount() == 0)&&(XPorLater)&&(m_bHasCheckboxes))
\r
2467 // nothing selected could mean the context menu is requested for
\r
2469 OnContextMenuGroup(pWnd, point);
\r
2471 else if (selIndex >= 0)
\r
2473 //FileEntry * entry = GetListEntry(selIndex);
\r
2475 filepath = (CTGitPath * )GetItemData(selIndex);
\r
2477 ASSERT(filepath != NULL);
\r
2478 if (filepath == NULL)
\r
2481 //const CTGitPath& filepath = entry->path;
\r
2482 int wcStatus = filepath->m_Action;
\r
2483 // entry is selected, now show the popup menu
\r
2484 Locker lock(m_critSec);
\r
2486 CMenu changelistSubMenu;
\r
2487 CMenu ignoreSubMenu;
\r
2488 if (popup.CreatePopupMenu())
\r
2490 //Add Menu for verion controled file
\r
2491 if (!(wcStatus &CTGitPath::LOGACTIONS_UNVER))
\r
2493 if (m_dwContextMenus & SVNSLC_POPCOMPAREWITHBASE)
\r
2495 popup.AppendMenuIcon(IDSVNLC_COMPARE, IDS_LOG_COMPAREWITHBASE, IDI_DIFF);
\r
2496 popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2498 //Select one items
\r
2499 if (GetSelectedCount() == 1)
\r
2501 bool bEntryAdded = false;
\r
2502 //if (entry->remotestatus <= git_wc_status_normal)
\r
2504 // if (wcStatus > git_wc_status_normal)
\r
2506 // if ((m_dwContextMenus & SVNSLC_POPGNUDIFF)&&(wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing))
\r
2508 popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
\r
2509 bEntryAdded = true;
\r
2514 //else if (wcStatus != git_wc_status_deleted)
\r
2516 // if (m_dwContextMenus & SVNSLC_POPCOMPARE)
\r
2518 // popup.AppendMenuIcon(IDSVNLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
\r
2519 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2520 // bEntryAdded = true;
\r
2522 // if (m_dwContextMenus & SVNSLC_POPGNUDIFF)
\r
2524 // popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
\r
2525 // bEntryAdded = true;
\r
2529 popup.AppendMenu(MF_SEPARATOR);
\r
2531 //else if (GetSelectedCount() > 1)
\r
2533 // if (m_dwContextMenus & SVNSLC_POPCOMMIT)
\r
2535 // popup.AppendMenuIcon(IDSVNLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);
\r
2536 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2541 ///Select Multi item
\r
2542 //if (GetSelectedCount() > 0)
\r
2544 // if ((GetSelectedCount() == 2)&&(m_dwContextMenus & SVNSLC_POPREPAIRMOVE))
\r
2546 // POSITION pos = GetFirstSelectedItemPosition();
\r
2547 // int index = GetNextSelectedItem(pos);
\r
2548 // if (index >= 0)
\r
2550 // FileEntry * entry = GetListEntry(index);
\r
2551 // git_wc_status_kind status1 = git_wc_status_none;
\r
2552 // git_wc_status_kind status2 = git_wc_status_none;
\r
2554 // status1 = entry->status;
\r
2555 // index = GetNextSelectedItem(pos);
\r
2556 // if (index >= 0)
\r
2558 // entry = GetListEntry(index);
\r
2560 // status2 = entry->status;
\r
2561 // if ((status1 == git_wc_status_missing && status2 == git_wc_status_unversioned) ||
\r
2562 // (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned))
\r
2564 // popup.AppendMenuIcon(IDSVNLC_REPAIRMOVE, IDS_STATUSLIST_CONTEXT_REPAIRMOVE);
\r
2569 // if (wcStatus > git_wc_status_normal)
\r
2571 // if (m_dwContextMenus & SVNSLC_POPREVERT)
\r
2573 // // reverting missing folders is not possible
\r
2574 // if (!entry->IsFolder() || (wcStatus != git_wc_status_missing))
\r
2576 // popup.AppendMenuIcon(IDSVNLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
\r
2580 // if (entry->remotestatus > git_wc_status_normal)
\r
2582 // if (m_dwContextMenus & SVNSLC_POPUPDATE)
\r
2584 // popup.AppendMenuIcon(IDSVNLC_UPDATE, IDS_MENUUPDATE, IDI_UPDATE);
\r
2588 if ((GetSelectedCount() == 1)&&(!wcStatus & CTGitPath::LOGACTIONS_UNVER)
\r
2589 &&(!wcStatus & CTGitPath::LOGACTIONS_IGNORE))
\r
2591 if (m_dwContextMenus & SVNSLC_POPSHOWLOG)
\r
2593 popup.AppendMenuIcon(IDSVNLC_LOG, IDS_REPOBROWSE_SHOWLOG, IDI_LOG);
\r
2595 // if (m_dwContextMenus & SVNSLC_POPBLAME)
\r
2597 // popup.AppendMenuIcon(IDSVNLC_BLAME, IDS_MENUBLAME, IDI_BLAME);
\r
2600 // if ((wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing) && (GetSelectedCount() == 1))
\r
2602 if (m_dwContextMenus & SVNSLC_POPOPEN)
\r
2604 popup.AppendMenuIcon(IDSVNLC_OPEN, IDS_REPOBROWSE_OPEN, IDI_OPEN);
\r
2605 popup.AppendMenuIcon(IDSVNLC_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
\r
2607 if (m_dwContextMenus & SVNSLC_POPEXPLORE)
\r
2609 popup.AppendMenuIcon(IDSVNLC_EXPLORE, IDS_STATUSLIST_CONTEXT_EXPLORE, IDI_EXPLORER);
\r
2612 if (GetSelectedCount() > 0)
\r
2614 // if (((wcStatus == git_wc_status_unversioned)||(wcStatus == git_wc_status_ignored))&&(m_dwContextMenus & SVNSLC_POPDELETE))
\r
2616 // popup.AppendMenuIcon(IDSVNLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
\r
2618 // 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
2621 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVEKEEP, IDI_DELETE);
\r
2623 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVE, IDI_DELETE);
\r
2625 if ((wcStatus & CTGitPath::LOGACTIONS_UNVER)/*||(wcStatus == git_wc_status_deleted)*/)
\r
2627 if (m_dwContextMenus & SVNSLC_POPADD)
\r
2629 //if ( entry->IsFolder() )
\r
2631 // popup.AppendMenuIcon(IDSVNLC_ADD_RECURSIVE, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE, IDI_ADD);
\r
2635 popup.AppendMenuIcon(IDSVNLC_ADD, IDS_STATUSLIST_CONTEXT_ADD, IDI_ADD);
\r
2639 //if ( (wcStatus == git_wc_status_unversioned) || (wcStatus == git_wc_status_deleted) )
\r
2641 if (m_dwContextMenus & SVNSLC_POPIGNORE)
\r
2644 CTGitPathList ignorelist;
\r
2645 FillListOfSelectedItemPaths(ignorelist);
\r
2646 //check if all selected entries have the same extension
\r
2647 bool bSameExt = true;
\r
2649 for (int i=0; i<ignorelist.GetCount(); ++i)
\r
2651 if (sExt.IsEmpty() && (i==0))
\r
2652 sExt = ignorelist[i].GetFileExtension();
\r
2653 else if (sExt.CompareNoCase(ignorelist[i].GetFileExtension())!=0)
\r
2658 if (ignoreSubMenu.CreateMenu())
\r
2660 CString ignorepath;
\r
2661 if (ignorelist.GetCount()==1)
\r
2662 ignorepath = ignorelist[0].GetFileOrDirectoryName();
\r
2664 ignorepath.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
\r
2665 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_IGNORE, ignorepath);
\r
2666 ignorepath = _T("*")+sExt;
\r
2667 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_IGNOREMASK, ignorepath);
\r
2669 temp.LoadString(IDS_MENUIGNORE);
\r
2670 popup.InsertMenu((UINT)-1, MF_BYPOSITION | MF_POPUP, (UINT_PTR)ignoreSubMenu.m_hMenu, temp);
\r
2676 if (ignorelist.GetCount()==1)
\r
2678 temp.LoadString(IDS_MENUIGNORE);
\r
2682 temp.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
\r
2684 popup.AppendMenuIcon(IDSVNLC_IGNORE, temp, IDI_IGNORE);
\r
2690 if (((wcStatus == git_wc_status_conflicted)||(entry->isConflicted)))
\r
2692 if ((m_dwContextMenus & SVNSLC_POPCONFLICT)||(m_dwContextMenus & SVNSLC_POPRESOLVE))
\r
2693 popup.AppendMenu(MF_SEPARATOR);
\r
2695 if ((m_dwContextMenus & SVNSLC_POPCONFLICT)&&(entry->textstatus == git_wc_status_conflicted))
\r
2697 popup.AppendMenuIcon(IDSVNLC_EDITCONFLICT, IDS_MENUCONFLICT, IDI_CONFLICT);
\r
2699 if (m_dwContextMenus & SVNSLC_POPRESOLVE)
\r
2701 popup.AppendMenuIcon(IDSVNLC_RESOLVECONFLICT, IDS_STATUSLIST_CONTEXT_RESOLVED, IDI_RESOLVE);
\r
2703 if ((m_dwContextMenus & SVNSLC_POPRESOLVE)&&(entry->textstatus == git_wc_status_conflicted))
\r
2705 popup.AppendMenuIcon(IDSVNLC_RESOLVETHEIRS, IDS_SVNPROGRESS_MENUUSETHEIRS, IDI_RESOLVE);
\r
2706 popup.AppendMenuIcon(IDSVNLC_RESOLVEMINE, IDS_SVNPROGRESS_MENUUSEMINE, IDI_RESOLVE);
\r
2711 if (GetSelectedCount() > 0)
\r
2714 if ((!entry->IsFolder())&&(wcStatus >= git_wc_status_normal)
\r
2715 &&(wcStatus!=git_wc_status_missing)&&(wcStatus!=git_wc_status_deleted)
\r
2716 &&(wcStatus!=git_wc_status_added))
\r
2718 popup.AppendMenu(MF_SEPARATOR);
\r
2719 if ((entry->lock_token.IsEmpty())&&(!entry->IsFolder()))
\r
2721 if (m_dwContextMenus & SVNSLC_POPLOCK)
\r
2723 popup.AppendMenuIcon(IDSVNLC_LOCK, IDS_MENU_LOCK, IDI_LOCK);
\r
2726 if ((!entry->lock_token.IsEmpty())&&(!entry->IsFolder()))
\r
2728 if (m_dwContextMenus & SVNSLC_POPUNLOCK)
\r
2730 popup.AppendMenuIcon(IDSVNLC_UNLOCK, IDS_MENU_UNLOCK, IDI_UNLOCK);
\r
2735 if ((!entry->IsFolder())&&((!entry->lock_token.IsEmpty())||(!entry->lock_remotetoken.IsEmpty())))
\r
2737 if (m_dwContextMenus & SVNSLC_POPUNLOCKFORCE)
\r
2739 popup.AppendMenuIcon(IDSVNLC_UNLOCKFORCE, IDS_MENU_UNLOCKFORCE, IDI_UNLOCK);
\r
2743 if (wcStatus != git_wc_status_missing && wcStatus != git_wc_status_deleted &&wcStatus!=git_wc_status_unversioned)
\r
2745 popup.AppendMenu(MF_SEPARATOR);
\r
2746 popup.AppendMenuIcon(IDSVNLC_PROPERTIES, IDS_STATUSLIST_CONTEXT_PROPERTIES, IDI_PROPERTIES);
\r
2748 popup.AppendMenu(MF_SEPARATOR);
\r
2749 popup.AppendMenuIcon(IDSVNLC_COPY, IDS_STATUSLIST_CONTEXT_COPY, IDI_COPYCLIP);
\r
2750 popup.AppendMenuIcon(IDSVNLC_COPYEXT, IDS_STATUSLIST_CONTEXT_COPYEXT, IDI_COPYCLIP);
\r
2751 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS)&&(XPorLater)
\r
2752 &&(wcStatus != git_wc_status_unversioned)&&(wcStatus != git_wc_status_none))
\r
2754 popup.AppendMenu(MF_SEPARATOR);
\r
2755 // changelist commands
\r
2756 size_t numChangelists = GetNumberOfChangelistsInSelection();
\r
2757 if (numChangelists > 0)
\r
2759 popup.AppendMenuIcon(IDSVNLC_REMOVEFROMCS, IDS_STATUSLIST_CONTEXT_REMOVEFROMCS);
\r
2761 if ((!entry->IsFolder())&&(changelistSubMenu.CreateMenu()))
\r
2764 temp.LoadString(IDS_STATUSLIST_CONTEXT_CREATECS);
\r
2765 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATECS, temp);
\r
2767 if (entry->changelist.Compare(SVNSLC_IGNORECHANGELIST))
\r
2769 changelistSubMenu.AppendMenu(MF_SEPARATOR);
\r
2770 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATEIGNORECS, SVNSLC_IGNORECHANGELIST);
\r
2773 if (m_changelists.size() > 0)
\r
2775 // find the changelist names
\r
2776 bool bNeedSeparator = true;
\r
2777 int cmdID = IDSVNLC_MOVETOCS;
\r
2778 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
2780 if ((entry->changelist.Compare(it->first))&&(it->first.Compare(SVNSLC_IGNORECHANGELIST)))
\r
2782 if (bNeedSeparator)
\r
2784 changelistSubMenu.AppendMenu(MF_SEPARATOR);
\r
2785 bNeedSeparator = false;
\r
2787 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, cmdID, it->first);
\r
2792 temp.LoadString(IDS_STATUSLIST_CONTEXT_MOVETOCS);
\r
2793 popup.AppendMenu(MF_POPUP|MF_STRING, (UINT_PTR)changelistSubMenu.GetSafeHmenu(), temp);
\r
2798 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2801 AfxGetApp()->DoWaitCursor(1);
\r
2802 int iItemCountBeforeMenuCmd = GetItemCount();
\r
2803 bool bForce = false;
\r
2806 case IDSVNLC_OPEN:
\r
2808 int ret = (int)ShellExecute(this->m_hWnd, NULL, filepath->GetWinPath(), NULL, NULL, SW_SHOW);
\r
2809 if (ret <= HINSTANCE_ERROR)
\r
2811 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
2812 cmd += filepath->GetWinPath();
\r
2813 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
2817 case IDSVNLC_OPENWITH:
\r
2819 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
2820 cmd += filepath->GetWinPathString() + _T(" ");
\r
2821 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
2824 case IDSVNLC_EXPLORE:
\r
2826 ShellExecute(this->m_hWnd, _T("explore"), filepath->GetWinPath(), NULL, NULL, SW_SHOW);
\r
2829 case IDSVNLC_COMPARE:
\r
2831 POSITION pos = GetFirstSelectedItemPosition();
\r
2834 int index = GetNextSelectedItem(pos);
\r
2839 case IDSVNLC_GNUDIFF1:
\r
2841 // SVNDiff diff(NULL, this->m_hWnd, true);
\r
2843 // if (entry->remotestatus <= git_wc_status_normal)
\r
2844 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
\r
2846 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
\r
2847 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,GitRev::GetWorkingCopy(),
\r
2848 *filepath,GitRev::GetHead());
\r
2852 { // The add went ok, but we now need to run through the selected items again
\r
2853 // and update their status
\r
2854 POSITION pos = GetFirstSelectedItemPosition();
\r
2856 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
2858 CTGitPath * path=(CTGitPath*)GetItemData(index);
\r
2860 cmd.Format(_T("git.cmd add %s"),path->GetGitPathString());
\r
2862 g_Git.Run(cmd,&output);
\r
2863 path->m_Action = CTGitPath::LOGACTIONS_ADDED;
\r
2864 SetEntryCheck(path,index,true);
\r
2865 SetItemGroup(index,0);
\r
2866 this->m_StatusFileList.AddPath(*path);
\r
2867 this->m_UnRevFileList.RemoveItem(*path);
\r
2868 this->m_IgnoreFileList.RemoveItem(*path);
\r
2874 case IDSVNLC_COPY:
\r
2875 CopySelectedEntriesToClipboard(0);
\r
2877 case IDSVNLC_COPYEXT:
\r
2878 CopySelectedEntriesToClipboard((DWORD)-1);
\r
2880 case IDSVNLC_PROPERTIES:
\r
2882 CTSVNPathList targetList;
\r
2883 FillListOfSelectedItemPaths(targetList);
\r
2884 CEditPropertiesDlg dlg;
\r
2885 dlg.SetPathList(targetList);
\r
2887 if (dlg.HasChanged())
\r
2889 // since the user might have changed/removed/added
\r
2890 // properties recursively, we don't really know
\r
2891 // which items have changed their status.
\r
2892 // So tell the parent to do a refresh.
\r
2893 CWnd* pParent = GetParent();
\r
2894 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
2896 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
2901 case IDSVNLC_COMMIT:
\r
2903 CTSVNPathList targetList;
\r
2904 FillListOfSelectedItemPaths(targetList);
\r
2905 CTSVNPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
\r
2906 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
\r
2907 CString commandline = CPathUtils::GetAppDirectory();
\r
2908 commandline += _T("TortoiseProc.exe /command:commit /pathfile:\"");
\r
2909 commandline += tempFile.GetWinPathString();
\r
2910 commandline += _T("\"");
\r
2911 commandline += _T(" /deletepathfile");
\r
2912 CAppUtils::LaunchApplication(commandline, NULL, false);
\r
2915 case IDSVNLC_REVERT:
\r
2917 // If at least one item is not in the status "added"
\r
2918 // we ask for a confirmation
\r
2919 BOOL bConfirm = FALSE;
\r
2920 POSITION pos = GetFirstSelectedItemPosition();
\r
2922 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
2924 FileEntry * fentry = GetListEntry(index);
\r
2925 if (fentry->textstatus != git_wc_status_added)
\r
2933 str.Format(IDS_PROC_WARNREVERT,GetSelectedCount());
\r
2935 if (!bConfirm || CMessageBox::Show(this->m_hWnd, str, _T("TortoiseSVN"), MB_YESNO | MB_ICONQUESTION)==IDYES)
\r
2937 CTSVNPathList targetList;
\r
2938 FillListOfSelectedItemPaths(targetList);
\r
2940 // make sure that the list is reverse sorted, so that
\r
2941 // children are removed before any parents
\r
2942 targetList.SortByPathname(true);
\r
2946 // put all reverted files in the trashbin, except the ones with 'added'
\r
2947 // status because they are not restored by the revert.
\r
2948 CTSVNPathList delList;
\r
2949 POSITION pos = GetFirstSelectedItemPosition();
\r
2951 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
2953 FileEntry * entry = GetListEntry(index);
\r
2954 if (entry->status != git_wc_status_added)
\r
2955 delList.AddPath(entry->GetPath());
\r
2957 if (DWORD(CRegDWORD(_T("Software\\TortoiseSVN\\RevertWithRecycleBin"), TRUE)))
\r
2958 delList.DeleteAllFiles(true);
\r
2960 if (!git.Revert(targetList, CStringArray(), FALSE))
\r
2962 CMessageBox::Show(this->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
2966 // since the entries got reverted we need to remove
\r
2967 // them from the list too, if no remote changes are shown,
\r
2968 // if the unmodified files are not shown
\r
2969 // and if the item is not part of a changelist
\r
2972 while ((pos = GetFirstSelectedItemPosition())!=0)
\r
2975 index = GetNextSelectedItem(pos);
\r
2976 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
\r
2977 if ( fentry->IsFolder() )
\r
2980 CWnd* pParent = GetParent();
\r
2981 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
2983 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
2988 BOOL bAdded = (fentry->textstatus == git_wc_status_added);
\r
2989 fentry->status = git_wc_status_normal;
\r
2990 fentry->propstatus = git_wc_status_normal;
\r
2991 fentry->textstatus = git_wc_status_normal;
\r
2992 fentry->copied = false;
\r
2993 fentry->isConflicted = false;
\r
2994 if ((fentry->GetChangeList().IsEmpty()&&(fentry->remotestatus <= git_wc_status_normal))||(m_dwShow & SVNSLC_SHOWNORMAL))
\r
2998 // reverting added items makes them unversioned, not 'normal'
\r
2999 if (fentry->IsFolder())
\r
3000 fentry->propstatus = git_wc_status_none;
\r
3002 fentry->propstatus = git_wc_status_unversioned;
\r
3003 fentry->status = git_wc_status_unversioned;
\r
3004 fentry->textstatus = git_wc_status_unversioned;
\r
3005 SetItemState(index, 0, LVIS_SELECTED);
\r
3006 SetEntryCheck(fentry, index, false);
\r
3008 else if ((fentry->switched)||(m_dwShow & SVNSLC_SHOWNORMAL))
\r
3010 SetItemState(index, 0, LVIS_SELECTED);
\r
3015 if (GetCheck(index))
\r
3017 RemoveListEntry(index);
\r
3023 SetItemState(index, 0, LVIS_SELECTED);
\r
3027 SaveColumnWidths();
\r
3028 Show(m_dwShow, 0, m_bShowFolders);
\r
3034 case IDSVNLC_COMPARE:
\r
3036 POSITION pos = GetFirstSelectedItemPosition();
\r
3039 int index = GetNextSelectedItem(pos);
\r
3044 case IDSVNLC_COMPAREWC:
\r
3046 POSITION pos = GetFirstSelectedItemPosition();
\r
3049 int index = GetNextSelectedItem(pos);
\r
3050 FileEntry * entry = GetListEntry(index);
\r
3051 ASSERT(entry != NULL);
\r
3052 if (entry == NULL)
\r
3054 SVNDiff diff(NULL, m_hWnd, true);
\r
3055 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
3056 git_revnum_t baseRev = entry->Revision;
\r
3057 diff.DiffFileAgainstBase(
\r
3058 entry->path, baseRev, entry->textstatus, entry->propstatus);
\r
3062 case IDSVNLC_GNUDIFF1:
\r
3064 SVNDiff diff(NULL, this->m_hWnd, true);
\r
3066 if (entry->remotestatus <= git_wc_status_normal)
\r
3067 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
\r
3069 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
\r
3072 case IDSVNLC_UPDATE:
\r
3074 CTSVNPathList targetList;
\r
3075 FillListOfSelectedItemPaths(targetList);
\r
3076 bool bAllExist = true;
\r
3077 for (int i=0; i<targetList.GetCount(); ++i)
\r
3079 if (!targetList[i].Exists())
\r
3081 bAllExist = false;
\r
3087 CSVNProgressDlg dlg;
\r
3088 dlg.SetCommand(CSVNProgressDlg::SVNProgress_Update);
\r
3089 dlg.SetPathList(targetList);
\r
3090 dlg.SetRevision(SVNRev::REV_HEAD);
\r
3095 CString sTempFile = CTempFiles::Instance().GetTempFilePath(false).GetWinPathString();
\r
3096 targetList.WriteToFile(sTempFile, false);
\r
3098 sCmd.Format(_T("\"%s\" /command:update /rev /pathfile:\"%s\" /deletepathfile"),
\r
3099 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), (LPCTSTR)sTempFile);
\r
3101 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
3108 sCmd.Format(_T("\"%s\" /command:log /path:\"%s\""),
\r
3109 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), filepath.GetWinPath());
\r
3111 if (!filepath.IsUrl())
\r
3113 sCmd += _T(" /propspath:\"");
\r
3114 sCmd += filepath.GetWinPathString();
\r
3118 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
3121 case IDSVNLC_BLAME:
\r
3124 sCmd.Format(_T("\"%s\" /command:blame /path:\"%s\""),
\r
3125 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), filepath.GetWinPath());
\r
3127 if (!filepath.IsUrl())
\r
3129 sCmd += _T(" /propspath:\"");
\r
3130 sCmd += filepath.GetWinPathString();
\r
3134 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
3137 case IDSVNLC_OPEN:
\r
3139 int ret = (int)ShellExecute(this->m_hWnd, NULL, filepath.GetWinPath(), NULL, NULL, SW_SHOW);
\r
3140 if (ret <= HINSTANCE_ERROR)
\r
3142 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
3143 cmd += filepath.GetWinPathString();
\r
3144 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
3148 case IDSVNLC_OPENWITH:
\r
3150 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
3151 cmd += filepath.GetWinPathString() + _T(" ");
\r
3152 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
3155 case IDSVNLC_EXPLORE:
\r
3157 ShellExecute(this->m_hWnd, _T("explore"), filepath.GetDirectory().GetWinPath(), NULL, NULL, SW_SHOW);
\r
3160 case IDSVNLC_REMOVE:
\r
3163 CTSVNPathList itemsToRemove;
\r
3164 FillListOfSelectedItemPaths(itemsToRemove);
\r
3166 // We must sort items before removing, so that files are always removed
\r
3167 // *before* their parents
\r
3168 itemsToRemove.SortByPathname(true);
\r
3170 bool bSuccess = false;
\r
3171 if (git.Remove(itemsToRemove, FALSE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))
\r
3177 if ((git.Err->apr_err == SVN_ERR_UNVERSIONED_RESOURCE) ||
\r
3178 (git.Err->apr_err == SVN_ERR_CLIENT_MODIFIED))
\r
3180 CString msg, yes, no, yestoall;
\r
3181 msg.Format(IDS_PROC_REMOVEFORCE, (LPCTSTR)git.GetLastErrorMessage());
\r
3182 yes.LoadString(IDS_MSGBOX_YES);
\r
3183 no.LoadString(IDS_MSGBOX_NO);
\r
3184 yestoall.LoadString(IDS_PROC_YESTOALL);
\r
3185 UINT ret = CMessageBox::Show(m_hWnd, msg, _T("TortoiseSVN"), 2, IDI_ERROR, yes, no, yestoall);
\r
3186 if ((ret == 1)||(ret==3))
\r
3188 if (!git.Remove(itemsToRemove, TRUE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))
\r
3190 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3197 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3201 // The remove went ok, but we now need to run through the selected items again
\r
3202 // and update their status
\r
3203 POSITION pos = GetFirstSelectedItemPosition();
\r
3205 std::vector<int> entriesToRemove;
\r
3206 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3208 FileEntry * e = GetListEntry(index);
\r
3210 ((e->textstatus == git_wc_status_unversioned)||
\r
3211 (e->textstatus == git_wc_status_none)||
\r
3212 (e->textstatus == git_wc_status_ignored)))
\r
3214 if (GetCheck(index))
\r
3217 entriesToRemove.push_back(index);
\r
3221 e->textstatus = git_wc_status_deleted;
\r
3222 e->status = git_wc_status_deleted;
\r
3223 SetEntryCheck(e,index,true);
\r
3226 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)
\r
3228 RemoveListEntry(*it);
\r
3231 SaveColumnWidths();
\r
3232 Show(m_dwShow, 0, m_bShowFolders);
\r
3236 case IDSVNLC_DELETE:
\r
3238 CTSVNPathList pathlist;
\r
3239 FillListOfSelectedItemPaths(pathlist);
\r
3240 pathlist.RemoveChildren();
\r
3242 for (INT_PTR i=0; i<pathlist.GetCount(); ++i)
\r
3244 filelist += pathlist[i].GetWinPathString();
\r
3245 filelist += _T("|");
\r
3247 filelist += _T("|");
\r
3248 int len = filelist.GetLength();
\r
3249 TCHAR * buf = new TCHAR[len+2];
\r
3250 _tcscpy_s(buf, len+2, filelist);
\r
3251 for (int i=0; i<len; ++i)
\r
3252 if (buf[i] == '|')
\r
3254 SHFILEOPSTRUCT fileop;
\r
3255 fileop.hwnd = this->m_hWnd;
\r
3256 fileop.wFunc = FO_DELETE;
\r
3257 fileop.pFrom = buf;
\r
3258 fileop.pTo = NULL;
\r
3259 fileop.fFlags = FOF_NO_CONNECTED_ELEMENTS | ((GetAsyncKeyState(VK_SHIFT) & 0x8000) ? 0 : FOF_ALLOWUNDO);
\r
3260 fileop.lpszProgressTitle = _T("deleting file");
\r
3261 int result = SHFileOperation(&fileop);
\r
3264 if ( (result==0) && (!fileop.fAnyOperationsAborted) )
\r
3267 POSITION pos = NULL;
\r
3268 CTSVNPathList deletedlist; // to store list of deleted folders
\r
3269 while ((pos = GetFirstSelectedItemPosition()) != 0)
\r
3271 int index = GetNextSelectedItem(pos);
\r
3272 if (GetCheck(index))
\r
3275 FileEntry * fentry = GetListEntry(index);
\r
3276 if ((fentry)&&(fentry->isfolder))
\r
3277 deletedlist.AddPath(fentry->path);
\r
3278 RemoveListEntry(index);
\r
3280 // now go through the list of deleted folders
\r
3281 // and remove all their children from the list too!
\r
3282 int nListboxEntries = GetItemCount();
\r
3283 for (int folderindex = 0; folderindex < deletedlist.GetCount(); ++folderindex)
\r
3285 CTSVNPath folderpath = deletedlist[folderindex];
\r
3286 for (int i=0; i<nListboxEntries; ++i)
\r
3288 FileEntry * entry = GetListEntry(i);
\r
3289 if (folderpath.IsAncestorOf(entry->path))
\r
3291 RemoveListEntry(i--);
\r
3292 nListboxEntries--;
\r
3300 case IDSVNLC_IGNOREMASK:
\r
3302 CString name = _T("*")+filepath.GetFileExtension();
\r
3303 CTSVNPathList ignorelist;
\r
3304 FillListOfSelectedItemPaths(ignorelist, true);
\r
3305 std::set<CTSVNPath> parentlist;
\r
3306 for (int i=0; i<ignorelist.GetCount(); ++i)
\r
3308 parentlist.insert(ignorelist[i].GetContainingDirectory());
\r
3310 std::set<CTSVNPath>::iterator it;
\r
3311 std::vector<CString> toremove;
\r
3313 for (it = parentlist.begin(); it != parentlist.end(); ++it)
\r
3315 CTSVNPath parentFolder = (*it).GetDirectory();
\r
3316 SVNProperties props(parentFolder, SVNRev::REV_WC, false);
\r
3318 for (int i=0; i<props.GetCount(); i++)
\r
3320 CString propname(props.GetItemName(i).c_str());
\r
3321 if (propname.CompareNoCase(_T("git:ignore"))==0)
\r
3324 // treat values as normal text even if they're not
\r
3325 value = (char *)props.GetItemValue(i).c_str();
\r
3328 if (value.IsEmpty())
\r
3332 value = value.Trim("\n\r");
\r
3335 value.Remove('\r');
\r
3337 if (!props.Add(_T("git:ignore"), (LPCSTR)value))
\r
3340 temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
\r
3341 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);
\r
3345 CTSVNPath basepath;
\r
3346 int nListboxEntries = GetItemCount();
\r
3347 for (int i=0; i<nListboxEntries; ++i)
\r
3349 FileEntry * entry = GetListEntry(i);
\r
3350 ASSERT(entry != NULL);
\r
3351 if (entry == NULL)
\r
3353 if (basepath.IsEmpty())
\r
3354 basepath = entry->basepath;
\r
3355 // since we ignored files with a mask (e.g. *.exe)
\r
3356 // we have to find find all files in the same
\r
3357 // folder (IsAncestorOf() returns TRUE for _all_ children,
\r
3358 // not just the immediate ones) which match the
\r
3359 // mask and remove them from the list too.
\r
3360 if ((entry->status == git_wc_status_unversioned)&&(parentFolder.IsAncestorOf(entry->path)))
\r
3362 CString f = entry->path.GetSVNPathString();
\r
3363 if (f.Mid(parentFolder.GetSVNPathString().GetLength()).Find('/')<=0)
\r
3365 if (CStringUtils::WildCardMatch(name, f))
\r
3370 toremove.push_back(f);
\r
3375 if (!m_bIgnoreRemoveOnly)
\r
3378 git_wc_status2_t * s;
\r
3379 CTSVNPath gitPath;
\r
3380 s = status.GetFirstFileStatus(parentFolder, gitPath, false, git_depth_empty);
\r
3383 // first check if the folder isn't already present in the list
\r
3384 bool bFound = false;
\r
3385 for (int i=0; i<nListboxEntries; ++i)
\r
3387 FileEntry * entry = GetListEntry(i);
\r
3388 if (entry->path.IsEquivalentTo(gitPath))
\r
3396 FileEntry * entry = new FileEntry();
\r
3397 entry->path = gitPath;
\r
3398 entry->basepath = basepath;
\r
3399 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
3400 entry->textstatus = s->text_status;
\r
3401 entry->propstatus = s->prop_status;
\r
3402 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);
\r
3403 entry->remotetextstatus = s->repos_text_status;
\r
3404 entry->remotepropstatus = s->repos_prop_status;
\r
3405 entry->inunversionedfolder = false;
\r
3406 entry->checked = true;
\r
3407 entry->inexternal = false;
\r
3408 entry->direct = false;
\r
3409 entry->isfolder = true;
\r
3410 entry->last_commit_date = 0;
\r
3411 entry->last_commit_rev = 0;
\r
3412 entry->remoterev = 0;
\r
3415 if (s->entry->url)
\r
3417 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));
\r
3420 if (s->entry && s->entry->present_props)
\r
3422 entry->present_props = s->entry->present_props;
\r
3424 m_arStatusArray.push_back(entry);
\r
3425 m_arListArray.push_back(m_arStatusArray.size()-1);
\r
3426 AddEntry(entry, langID, GetItemCount());
\r
3432 for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)
\r
3434 int nListboxEntries = GetItemCount();
\r
3435 for (int i=0; i<nListboxEntries; ++i)
\r
3437 if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)
\r
3439 RemoveListEntry(i);
\r
3447 case IDSVNLC_IGNORE:
\r
3449 CTSVNPathList ignorelist;
\r
3450 std::vector<CString> toremove;
\r
3451 FillListOfSelectedItemPaths(ignorelist, true);
\r
3453 for (int j=0; j<ignorelist.GetCount(); ++j)
\r
3455 int nListboxEntries = GetItemCount();
\r
3456 for (int i=0; i<nListboxEntries; ++i)
\r
3458 if (GetListEntry(i)->GetPath().IsEquivalentTo(ignorelist[j]))
\r
3464 CString name = CPathUtils::PathPatternEscape(ignorelist[j].GetFileOrDirectoryName());
\r
3465 CTSVNPath parentfolder = ignorelist[j].GetContainingDirectory();
\r
3466 SVNProperties props(parentfolder, SVNRev::REV_WC, false);
\r
3468 for (int i=0; i<props.GetCount(); i++)
\r
3470 CString propname(props.GetItemName(i).c_str());
\r
3471 if (propname.CompareNoCase(_T("git:ignore"))==0)
\r
3474 // treat values as normal text even if they're not
\r
3475 value = (char *)props.GetItemValue(i).c_str();
\r
3478 if (value.IsEmpty())
\r
3482 value = value.Trim("\n\r");
\r
3485 value.Remove('\r');
\r
3487 if (!props.Add(_T("git:ignore"), (LPCSTR)value))
\r
3490 temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
\r
3491 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);
\r
3494 if (GetCheck(selIndex))
\r
3498 // now, if we ignored a folder, remove all its children
\r
3499 if (ignorelist[j].IsDirectory())
\r
3501 for (int i=0; i<(int)m_arListArray.size(); ++i)
\r
3503 FileEntry * entry = GetListEntry(i);
\r
3504 if (entry->status == git_wc_status_unversioned)
\r
3506 if (!ignorelist[j].IsEquivalentTo(entry->GetPath())&&(ignorelist[j].IsAncestorOf(entry->GetPath())))
\r
3508 entry->status = git_wc_status_ignored;
\r
3509 entry->textstatus = git_wc_status_ignored;
\r
3512 toremove.push_back(entry->GetPath().GetSVNPathString());
\r
3518 CTSVNPath basepath = m_arStatusArray[m_arListArray[selIndex]]->basepath;
\r
3520 FileEntry * entry = m_arStatusArray[m_arListArray[selIndex]];
\r
3521 if ( entry->status == git_wc_status_unversioned ) // keep "deleted" items
\r
3522 toremove.push_back(entry->GetPath().GetSVNPathString());
\r
3524 if (!m_bIgnoreRemoveOnly)
\r
3527 git_wc_status2_t * s;
\r
3528 CTSVNPath gitPath;
\r
3529 s = status.GetFirstFileStatus(parentfolder, gitPath, false, git_depth_empty);
\r
3530 // first check if the folder isn't already present in the list
\r
3531 bool bFound = false;
\r
3532 nListboxEntries = GetItemCount();
\r
3533 for (int i=0; i<nListboxEntries; ++i)
\r
3535 FileEntry * entry = GetListEntry(i);
\r
3536 if (entry->path.IsEquivalentTo(gitPath))
\r
3546 FileEntry * entry = new FileEntry();
\r
3547 entry->path = gitPath;
\r
3548 entry->basepath = basepath;
\r
3549 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
3550 entry->textstatus = s->text_status;
\r
3551 entry->propstatus = s->prop_status;
\r
3552 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);
\r
3553 entry->remotetextstatus = s->repos_text_status;
\r
3554 entry->remotepropstatus = s->repos_prop_status;
\r
3555 entry->inunversionedfolder = FALSE;
\r
3556 entry->checked = true;
\r
3557 entry->inexternal = false;
\r
3558 entry->direct = false;
\r
3559 entry->isfolder = true;
\r
3560 entry->last_commit_date = 0;
\r
3561 entry->last_commit_rev = 0;
\r
3562 entry->remoterev = 0;
\r
3565 if (s->entry->url)
\r
3567 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));
\r
3570 if (s->entry && s->entry->present_props)
\r
3572 entry->present_props = s->entry->present_props;
\r
3574 m_arStatusArray.push_back(entry);
\r
3575 m_arListArray.push_back(m_arStatusArray.size()-1);
\r
3576 AddEntry(entry, langID, GetItemCount());
\r
3581 for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)
\r
3583 int nListboxEntries = GetItemCount();
\r
3584 for (int i=0; i<nListboxEntries; ++i)
\r
3586 if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)
\r
3588 RemoveListEntry(i);
\r
3596 case IDSVNLC_EDITCONFLICT:
\r
3597 SVNDiff::StartConflictEditor(filepath);
\r
3599 case IDSVNLC_RESOLVECONFLICT:
\r
3600 case IDSVNLC_RESOLVEMINE:
\r
3601 case IDSVNLC_RESOLVETHEIRS:
\r
3603 git_wc_conflict_choice_t result = git_wc_conflict_choose_merged;
\r
3606 case IDSVNLC_RESOLVETHEIRS:
\r
3607 result = git_wc_conflict_choose_theirs_full;
\r
3609 case IDSVNLC_RESOLVEMINE:
\r
3610 result = git_wc_conflict_choose_mine_full;
\r
3612 case IDSVNLC_RESOLVECONFLICT:
\r
3613 result = git_wc_conflict_choose_merged;
\r
3616 if (CMessageBox::Show(m_hWnd, IDS_PROC_RESOLVE, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO)==IDYES)
\r
3619 POSITION pos = GetFirstSelectedItemPosition();
\r
3623 index = GetNextSelectedItem(pos);
\r
3624 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
\r
3625 if (!git.Resolve(fentry->GetPath(), result, FALSE))
\r
3627 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3631 fentry->status = git_wc_status_modified;
\r
3632 fentry->textstatus = git_wc_status_modified;
\r
3633 fentry->isConflicted = false;
\r
3636 Show(m_dwShow, 0, m_bShowFolders);
\r
3643 CTSVNPathList itemsToAdd;
\r
3644 FillListOfSelectedItemPaths(itemsToAdd);
\r
3646 // We must sort items before adding, so that folders are always added
\r
3647 // *before* any of their children
\r
3648 itemsToAdd.SortByPathname();
\r
3650 ProjectProperties props;
\r
3651 props.ReadPropsPathList(itemsToAdd);
\r
3652 if (git.Add(itemsToAdd, &props, git_depth_empty, TRUE, TRUE, TRUE))
\r
3654 // The add went ok, but we now need to run through the selected items again
\r
3655 // and update their status
\r
3656 POSITION pos = GetFirstSelectedItemPosition();
\r
3658 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3660 FileEntry * e = GetListEntry(index);
\r
3661 e->textstatus = git_wc_status_added;
\r
3662 e->propstatus = git_wc_status_none;
\r
3663 e->status = git_wc_status_added;
\r
3664 SetEntryCheck(e,index,true);
\r
3669 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3671 SaveColumnWidths();
\r
3672 Show(m_dwShow, 0, m_bShowFolders);
\r
3676 case IDSVNLC_ADD_RECURSIVE:
\r
3678 CTSVNPathList itemsToAdd;
\r
3679 FillListOfSelectedItemPaths(itemsToAdd);
\r
3682 dlg.m_pathList = itemsToAdd;
\r
3683 if (dlg.DoModal() == IDOK)
\r
3685 if (dlg.m_pathList.GetCount() == 0)
\r
3687 CSVNProgressDlg progDlg;
\r
3688 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Add);
\r
3689 progDlg.SetPathList(dlg.m_pathList);
\r
3690 ProjectProperties props;
\r
3691 props.ReadPropsPathList(dlg.m_pathList);
\r
3692 progDlg.SetProjectProperties(props);
\r
3693 progDlg.SetItemCount(dlg.m_pathList.GetCount());
\r
3694 progDlg.DoModal();
\r
3697 CWnd* pParent = GetParent();
\r
3698 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3700 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3705 case IDSVNLC_LOCK:
\r
3707 CTSVNPathList itemsToLock;
\r
3708 FillListOfSelectedItemPaths(itemsToLock);
\r
3710 inpDlg.m_sTitle.LoadString(IDS_MENU_LOCK);
\r
3711 CStringUtils::RemoveAccelerators(inpDlg.m_sTitle);
\r
3712 inpDlg.m_sHintText.LoadString(IDS_LOCK_MESSAGEHINT);
\r
3713 inpDlg.m_sCheckText.LoadString(IDS_LOCK_STEALCHECK);
\r
3714 ProjectProperties props;
\r
3715 props.ReadPropsPathList(itemsToLock);
\r
3716 props.nMinLogSize = 0; // the lock message is optional, so no minimum!
\r
3717 inpDlg.m_pProjectProperties = &props;
\r
3718 if (inpDlg.DoModal()==IDOK)
\r
3720 CSVNProgressDlg progDlg;
\r
3721 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Lock);
\r
3722 progDlg.SetOptions(inpDlg.m_iCheck ? ProgOptLockForce : ProgOptNone);
\r
3723 progDlg.SetPathList(itemsToLock);
\r
3724 progDlg.SetCommitMessage(inpDlg.m_sInputText);
\r
3725 progDlg.DoModal();
\r
3727 CWnd* pParent = GetParent();
\r
3728 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3730 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3735 case IDSVNLC_UNLOCKFORCE:
\r
3737 case IDSVNLC_UNLOCK:
\r
3739 CTSVNPathList itemsToUnlock;
\r
3740 FillListOfSelectedItemPaths(itemsToUnlock);
\r
3741 CSVNProgressDlg progDlg;
\r
3742 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Unlock);
\r
3743 progDlg.SetOptions(bForce ? ProgOptLockForce : ProgOptNone);
\r
3744 progDlg.SetPathList(itemsToUnlock);
\r
3745 progDlg.DoModal();
\r
3747 CWnd* pParent = GetParent();
\r
3748 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3750 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3754 case IDSVNLC_REPAIRMOVE:
\r
3756 POSITION pos = GetFirstSelectedItemPosition();
\r
3757 int index = GetNextSelectedItem(pos);
\r
3758 FileEntry * entry1 = NULL;
\r
3759 FileEntry * entry2 = NULL;
\r
3762 entry1 = GetListEntry(index);
\r
3763 git_wc_status_kind status1 = git_wc_status_none;
\r
3764 git_wc_status_kind status2 = git_wc_status_none;
\r
3767 status1 = entry1->status;
\r
3768 index = GetNextSelectedItem(pos);
\r
3771 entry2 = GetListEntry(index);
\r
3774 status2 = entry2->status;
\r
3775 if (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned)
\r
3777 FileEntry * tempentry = entry1;
\r
3779 entry2 = tempentry;
\r
3781 // entry1 was renamed to entry2 but outside of Subversion
\r
3782 // fix this by moving entry2 back to entry1 first,
\r
3783 // then do an git-move from entry1 to entry2
\r
3784 if (MoveFile(entry2->GetPath().GetWinPath(), entry1->GetPath().GetWinPath()))
\r
3787 if (!git.Move(CTSVNPathList(entry1->GetPath()), entry2->GetPath(), TRUE))
\r
3789 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3793 // check the previously unversioned item
\r
3794 entry1->checked = true;
\r
3795 // fixing the move was successful. We have to adjust the new status of the
\r
3797 // Since we don't know if the moved/renamed file had local modifications or not,
\r
3798 // we can't guess the new status. That means we have to refresh...
\r
3799 CWnd* pParent = GetParent();
\r
3800 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3802 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3809 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
\r
3810 FORMAT_MESSAGE_FROM_SYSTEM |
\r
3811 FORMAT_MESSAGE_IGNORE_INSERTS,
\r
3814 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
\r
3815 (LPTSTR) &lpMsgBuf,
\r
3819 MessageBox((LPCTSTR)lpMsgBuf, _T("Error"), MB_OK | MB_ICONINFORMATION );
\r
3820 LocalFree( lpMsgBuf );
\r
3828 case IDSVNLC_REMOVEFROMCS:
\r
3830 CTSVNPathList changelistItems;
\r
3831 FillListOfSelectedItemPaths(changelistItems);
\r
3834 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
\r
3836 // The changelists were removed, but we now need to run through the selected items again
\r
3837 // and update their changelist
\r
3838 POSITION pos = GetFirstSelectedItemPosition();
\r
3840 std::vector<int> entriesToRemove;
\r
3841 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3843 FileEntry * e = GetListEntry(index);
\r
3846 e->changelist.Empty();
\r
3847 if (e->status == git_wc_status_normal)
\r
3849 // remove the entry completely
\r
3850 entriesToRemove.push_back(index);
\r
3853 SetItemGroup(index, 0);
\r
3856 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)
\r
3858 RemoveListEntry(*it);
\r
3860 // TODO: Should we go through all entries here and check if we also could
\r
3861 // remove the changelist from m_changelists ?
\r
3865 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3870 case IDSVNLC_CREATEIGNORECS:
\r
3871 CreateChangeList(SVNSLC_IGNORECHANGELIST);
\r
3873 case IDSVNLC_CREATECS:
\r
3875 CCreateChangelistDlg dlg;
\r
3876 if (dlg.DoModal() == IDOK)
\r
3878 CreateChangeList(dlg.m_sName);
\r
3884 if (cmd < IDSVNLC_MOVETOCS)
\r
3886 CTSVNPathList changelistItems;
\r
3887 FillListOfSelectedItemPaths(changelistItems);
\r
3889 // find the changelist name
\r
3890 CString sChangelist;
\r
3891 int cmdID = IDSVNLC_MOVETOCS;
\r
3893 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
3895 if ((it->first.Compare(SVNSLC_IGNORECHANGELIST))&&(entry->changelist.Compare(it->first)))
\r
3899 sChangelist = it->first;
\r
3904 if (!sChangelist.IsEmpty())
\r
3907 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
\r
3909 // The changelists were moved, but we now need to run through the selected items again
\r
3910 // and update their changelist
\r
3911 POSITION pos = GetFirstSelectedItemPosition();
\r
3913 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3915 FileEntry * e = GetListEntry(index);
\r
3916 e->changelist = sChangelist;
\r
3917 if (!e->IsFolder())
\r
3919 if (m_changelists.find(e->changelist)!=m_changelists.end())
\r
3920 SetItemGroup(index, m_changelists[e->changelist]);
\r
3922 SetItemGroup(index, 0);
\r
3928 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3938 AfxGetApp()->DoWaitCursor(-1);
\r
3939 GetStatisticsString();
\r
3940 int iItemCountAfterMenuCmd = GetItemCount();
\r
3941 //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)
\r
3943 // CWnd* pParent = GetParent();
\r
3944 // if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3946 // pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);
\r
3949 } // if (popup.CreatePopupMenu())
\r
3950 } // if (selIndex >= 0)
\r
3954 void CGitStatusListCtrl::OnContextMenuHeader(CWnd * pWnd, CPoint point)
\r
3956 bool XPorLater = false;
\r
3957 OSVERSIONINFOEX inf;
\r
3958 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
3959 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
3960 GetVersionEx((OSVERSIONINFO *)&inf);
\r
3961 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
3962 if (fullver >= 0x0501)
\r
3965 CHeaderCtrl * pHeaderCtrl = (CHeaderCtrl *)pWnd;
\r
3966 if ((point.x == -1) && (point.y == -1))
\r
3969 pHeaderCtrl->GetItemRect(0, &rect);
\r
3970 ClientToScreen(&rect);
\r
3971 point = rect.CenterPoint();
\r
3973 Locker lock(m_critSec);
\r
3975 if (popup.CreatePopupMenu())
\r
3977 int columnCount = m_ColumnManager.GetColumnCount();
\r
3980 UINT uCheckedFlags = MF_STRING | MF_ENABLED | MF_CHECKED;
\r
3981 UINT uUnCheckedFlags = MF_STRING | MF_ENABLED;
\r
3983 // build control menu
\r
3987 temp.LoadString(IDS_STATUSLIST_SHOWGROUPS);
\r
3988 popup.AppendMenu(IsGroupViewEnabled() ? uCheckedFlags : uUnCheckedFlags, columnCount, temp);
\r
3991 if (m_ColumnManager.AnyUnusedProperties())
\r
3993 temp.LoadString(IDS_STATUSLIST_REMOVEUNUSEDPROPS);
\r
3994 popup.AppendMenu(uUnCheckedFlags, columnCount+1, temp);
\r
3997 temp.LoadString(IDS_STATUSLIST_RESETCOLUMNORDER);
\r
3998 popup.AppendMenu(uUnCheckedFlags, columnCount+2, temp);
\r
3999 popup.AppendMenu(MF_SEPARATOR);
\r
4001 // standard columns
\r
4003 for (int i = 1; i < SVNSLC_NUMCOLUMNS; ++i)
\r
4005 popup.AppendMenu ( m_ColumnManager.IsVisible(i)
\r
4009 , m_ColumnManager.GetName(i));
\r
4012 // user-prop columns:
\r
4013 // find relevant ones and sort 'em
\r
4015 std::map<CString, int> sortedProps;
\r
4016 for (int i = SVNSLC_NUMCOLUMNS; i < columnCount; ++i)
\r
4017 if (m_ColumnManager.IsRelevant(i))
\r
4018 sortedProps[m_ColumnManager.GetName(i)] = i;
\r
4020 if (!sortedProps.empty())
\r
4022 // add 'em to the menu
\r
4024 popup.AppendMenu(MF_SEPARATOR);
\r
4026 typedef std::map<CString, int>::const_iterator CIT;
\r
4027 for ( CIT iter = sortedProps.begin(), end = sortedProps.end()
\r
4031 popup.AppendMenu ( m_ColumnManager.IsVisible(iter->second)
\r
4039 // show menu & let user pick an entry
\r
4041 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
4042 if ((cmd >= 1)&&(cmd < columnCount))
\r
4044 m_ColumnManager.SetVisible (cmd, !m_ColumnManager.IsVisible(cmd));
\r
4046 else if (cmd == columnCount)
\r
4048 EnableGroupView(!IsGroupViewEnabled());
\r
4050 else if (cmd == columnCount+1)
\r
4052 m_ColumnManager.RemoveUnusedProps();
\r
4054 else if (cmd == columnCount+2)
\r
4056 m_ColumnManager.ResetColumns (m_dwDefaultColumns);
\r
4061 void CGitStatusListCtrl::OnContextMenu(CWnd* pWnd, CPoint point)
\r
4066 OnContextMenuList(pWnd, point);
\r
4067 } // if (pWnd == this)
\r
4068 else if (pWnd == GetHeaderCtrl())
\r
4070 OnContextMenuHeader(pWnd, point);
\r
4074 void CGitStatusListCtrl::CreateChangeList(const CString& name)
\r
4077 CTGitPathList changelistItems;
\r
4078 FillListOfSelectedItemPaths(changelistItems);
\r
4080 if (git.AddToChangeList(changelistItems, name, git_depth_empty))
\r
4082 TCHAR groupname[1024];
\r
4083 LVGROUP grp = {0};
\r
4084 grp.cbSize = sizeof(LVGROUP);
\r
4085 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
4086 _tcsncpy_s(groupname, 1024, name, 1023);
\r
4087 grp.pszHeader = groupname;
\r
4088 grp.iGroupId = (int)m_changelists.size();
\r
4089 grp.uAlign = LVGA_HEADER_LEFT;
\r
4090 m_changelists[name] = InsertGroup(-1, &grp);
\r
4092 PrepareGroups(true);
\r
4094 POSITION pos = GetFirstSelectedItemPosition();
\r
4096 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
4098 FileEntry * e = GetListEntry(index);
\r
4099 e->changelist = name;
\r
4100 SetEntryCheck(e, index, FALSE);
\r
4103 for (index = 0; index < GetItemCount(); ++index)
\r
4105 FileEntry * e = GetListEntry(index);
\r
4106 if (m_changelists.find(e->changelist)!=m_changelists.end())
\r
4107 SetItemGroup(index, m_changelists[e->changelist]);
\r
4109 SetItemGroup(index, 0);
\r
4114 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("Tortoisegit"), MB_ICONERROR);
\r
4119 void CGitStatusListCtrl::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
\r
4122 Locker lock(m_critSec);
\r
4123 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
4128 if (pNMLV->iItem < 0)
\r
4130 if (!IsGroupViewEnabled())
\r
4133 DWORD ptW = GetMessagePos();
\r
4134 pt.x = GET_X_LPARAM(ptW);
\r
4135 pt.y = GET_Y_LPARAM(ptW);
\r
4136 ScreenToClient(&pt);
\r
4137 int group = GetGroupFromPoint(&pt);
\r
4140 // check/uncheck the whole group depending on the check-state
\r
4141 // of the first item in the group
\r
4143 bool bCheck = false;
\r
4144 bool bFirst = false;
\r
4146 for (int i=0; i<GetItemCount(); ++i)
\r
4148 SecureZeroMemory(&lv, sizeof(LVITEM));
\r
4149 lv.mask = LVIF_GROUPID;
\r
4152 if (lv.iGroupId == group)
\r
4154 FileEntry * entry = GetListEntry(i);
\r
4157 bCheck = !GetCheck(i);
\r
4162 bool bOldCheck = !!GetCheck(i);
\r
4163 SetEntryCheck(entry, i, bCheck);
\r
4164 if (bCheck != bOldCheck)
\r
4174 GetStatisticsString();
\r
4180 // FileEntry * entry = GetListEntry(pNMLV->iItem);
\r
4183 // if (entry->isConflicted)
\r
4185 // gitDiff::StartConflictEditor(entry->GetPath());
\r
4189 StartDiff(pNMLV->iItem);
\r
4195 void CGitStatusListCtrl::StartDiff(int fileindex)
\r
4199 CGitDiff::Diff((CTGitPath*)GetItemData(fileindex),
\r
4200 CString(GIT_REV_ZERO),
\r
4201 GitRev::GetHead());
\r
4204 if (fileindex < 0)
\r
4206 FileEntry * entry = GetListEntry(fileindex);
\r
4207 ASSERT(entry != NULL);
\r
4208 if (entry == NULL)
\r
4210 if (((entry->status == git_wc_status_normal)&&(entry->remotestatus <= git_wc_status_normal))||
\r
4211 (entry->status == git_wc_status_unversioned)||(entry->status == git_wc_status_none))
\r
4213 int ret = (int)ShellExecute(this->m_hWnd, NULL, entry->path.GetWinPath(), NULL, NULL, SW_SHOW);
\r
4214 if (ret <= HINSTANCE_ERROR)
\r
4216 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
4217 cmd += entry->path.GetWinPathString();
\r
4218 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
4223 GitDiff diff(NULL, m_hWnd, true);
\r
4224 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
4226 entry->path, entry->textstatus, entry->propstatus,
\r
4227 entry->remotetextstatus, entry->remotepropstatus);
\r
4231 CString CGitStatusListCtrl::GetStatisticsString()
\r
4234 CString sNormal, sAdded, sDeleted, sModified, sConflicted, sUnversioned;
\r
4235 WORD langID = (WORD)(DWORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
4236 TCHAR buf[MAX_STATUS_STRING_LENGTH];
\r
4237 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_normal, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4239 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_added, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4241 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_deleted, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4243 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_modified, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4245 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_conflicted, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4246 sConflicted = buf;
\r
4247 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_unversioned, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4248 sUnversioned = buf;
\r
4250 sToolTip.Format(_T("%s = %d\n%s = %d\n%s = %d\n%s = %d\n%s = %d\n%s = %d"),
\r
4251 (LPCTSTR)sNormal, m_nNormal,
\r
4252 (LPCTSTR)sUnversioned, m_nUnversioned,
\r
4253 (LPCTSTR)sModified, m_nModified,
\r
4254 (LPCTSTR)sAdded, m_nAdded,
\r
4255 (LPCTSTR)sDeleted, m_nDeleted,
\r
4256 (LPCTSTR)sConflicted, m_nConflicted
\r
4259 sStats.Format(IDS_COMMITDLG_STATISTICSFORMAT, m_nSelected, GetItemCount());
\r
4262 m_pStatLabel->SetWindowText(sStats);
\r
4265 if (m_pSelectButton)
\r
4267 if (m_nSelected == 0)
\r
4268 m_pSelectButton->SetCheck(BST_UNCHECKED);
\r
4269 else if (m_nSelected != GetItemCount())
\r
4270 m_pSelectButton->SetCheck(BST_INDETERMINATE);
\r
4272 m_pSelectButton->SetCheck(BST_CHECKED);
\r
4275 if (m_pConfirmButton)
\r
4277 m_pConfirmButton->EnableWindow(m_nSelected>0);
\r
4285 CTGitPath CGitStatusListCtrl::GetCommonDirectory(bool bStrict)
\r
4289 // not strict means that the selected folder has priority
\r
4290 if (!m_StatusFileList.GetCommonDirectory().IsEmpty())
\r
4291 return m_StatusFileList.GetCommonDirectory();
\r
4294 CTGitPath commonBaseDirectory;
\r
4295 int nListItems = GetItemCount();
\r
4296 for (int i=0; i<nListItems; ++i)
\r
4298 const CTGitPath& baseDirectory = GetListEntry(i)->GetPath().GetDirectory();
\r
4299 if(commonBaseDirectory.IsEmpty())
\r
4301 commonBaseDirectory = baseDirectory;
\r
4305 if (commonBaseDirectory.GetWinPathString().GetLength() > baseDirectory.GetWinPathString().GetLength())
\r
4307 if (baseDirectory.IsAncestorOf(commonBaseDirectory))
\r
4308 commonBaseDirectory = baseDirectory;
\r
4312 return commonBaseDirectory;
\r
4315 CTGitPath CGitStatusListCtrl::GetCommonURL(bool bStrict)
\r
4317 CTGitPath commonBaseURL;
\r
4322 // not strict means that the selected folder has priority
\r
4323 if (!m_StatusUrlList.GetCommonDirectory().IsEmpty())
\r
4324 return m_StatusUrlList.GetCommonDirectory();
\r
4327 int nListItems = GetItemCount();
\r
4328 for (int i=0; i<nListItems; ++i)
\r
4330 const CTGitPath& baseURL = CTGitPath(GetListEntry(i)->GetURL());
\r
4331 if (baseURL.IsEmpty())
\r
4332 continue; // item has no url
\r
4333 if(commonBaseURL.IsEmpty())
\r
4335 commonBaseURL = baseURL;
\r
4339 if (commonBaseURL.GetGitPathString().GetLength() > baseURL.GetGitPathString().GetLength())
\r
4341 if (baseURL.IsAncestorOf(commonBaseURL))
\r
4342 commonBaseURL = baseURL;
\r
4348 return commonBaseURL;
\r
4351 void CGitStatusListCtrl::SelectAll(bool bSelect, bool bIncludeNoCommits)
\r
4353 CWaitCursor waitCursor;
\r
4354 // block here so the LVN_ITEMCHANGED messages
\r
4359 int nListItems = GetItemCount();
\r
4361 m_nSelected = nListItems;
\r
4365 for (int i=0; i<nListItems; ++i)
\r
4367 //FileEntry * entry = GetListEntry(i);
\r
4368 //ASSERT(entry != NULL);
\r
4369 CTGitPath *path = (CTGitPath *) GetItemData(i);
\r
4372 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))
\r
4373 SetEntryCheck(path,i,bSelect);
\r
4376 // unblock before redrawing
\r
4379 GetStatisticsString();
\r
4383 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR *pNMHDR, LRESULT *pResult)
\r
4385 LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast<LPNMLVGETINFOTIP>(pNMHDR);
\r
4389 if (GetListEntry(pGetInfoTip->iItem >= 0))
\r
4390 if (pGetInfoTip->cchTextMax > GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString().GetLength())
\r
4392 if (GetListEntry(pGetInfoTip->iItem)->GetRelativeGitPath().Compare(GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString())!= 0)
\r
4393 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString(), pGetInfoTip->cchTextMax);
\r
4394 else if (GetStringWidth(GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString()) > GetColumnWidth(pGetInfoTip->iItem))
\r
4395 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString(), pGetInfoTip->cchTextMax);
\r
4399 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult)
\r
4401 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
4403 // Take the default processing unless we set this to something else below.
\r
4404 *pResult = CDRF_DODEFAULT;
\r
4406 // First thing - check the draw stage. If it's the control's prepaint
\r
4407 // stage, then tell Windows we want messages for every item.
\r
4409 switch (pLVCD->nmcd.dwDrawStage)
\r
4411 case CDDS_PREPAINT:
\r
4412 *pResult = CDRF_NOTIFYITEMDRAW;
\r
4414 case CDDS_ITEMPREPAINT:
\r
4416 // This is the prepaint stage for an item. Here's where we set the
\r
4417 // item's text color. Our return value will tell Windows to draw the
\r
4418 // item itself, but it will use the new color we set here.
\r
4420 // Tell Windows to paint the control itself.
\r
4421 *pResult = CDRF_DODEFAULT;
\r
4425 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
4427 if (m_arListArray.size() > (DWORD_PTR)pLVCD->nmcd.dwItemSpec)
\r
4429 FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);
\r
4430 if (entry == NULL)
\r
4435 // black : unversioned, normal
\r
4437 // blue : modified
\r
4438 // brown : missing, deleted, replaced
\r
4439 // green : merged (or potential merges)
\r
4440 // red : conflicts or sure conflicts
\r
4441 switch (entry->status)
\r
4443 case git_wc_status_added:
\r
4444 // if (entry->remotestatus > git_wc_status_unversioned)
\r
4445 // locally added file, but file already exists in repository!
\r
4446 // crText = m_Colors.GetColor(CColors::Conflict);
\r
4448 crText = m_Colors.GetColor(CColors::Added);
\r
4450 case git_wc_status_missing:
\r
4451 case git_wc_status_deleted:
\r
4452 case git_wc_status_replaced:
\r
4453 crText = m_Colors.GetColor(CColors::Deleted);
\r
4455 case git_wc_status_modified:
\r
4456 // if (entry->remotestatus == git_wc_status_modified)
\r
4457 // indicate a merge (both local and remote changes will require a merge)
\r
4458 // crText = m_Colors.GetColor(CColors::Merged);
\r
4459 // else if (entry->remotestatus == git_wc_status_deleted)
\r
4460 // // locally modified, but already deleted in the repository
\r
4461 // crText = m_Colors.GetColor(CColors::Conflict);
\r
4463 crText = m_Colors.GetColor(CColors::Modified);
\r
4465 case git_wc_status_merged:
\r
4466 crText = m_Colors.GetColor(CColors::Merged);
\r
4468 case git_wc_status_conflicted:
\r
4469 case git_wc_status_obstructed:
\r
4470 crText = m_Colors.GetColor(CColors::Conflict);
\r
4472 case git_wc_status_none:
\r
4473 case git_wc_status_unversioned:
\r
4474 case git_wc_status_ignored:
\r
4475 case git_wc_status_incomplete:
\r
4476 case git_wc_status_normal:
\r
4477 case git_wc_status_external:
\r
4479 crText = GetSysColor(COLOR_WINDOWTEXT);
\r
4483 if (entry->isConflicted)
\r
4484 crText = m_Colors.GetColor(CColors::Conflict);
\r
4486 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
4487 pLVCD->clrText = crText;
\r
4494 BOOL CGitStatusListCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
\r
4497 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
\r
4500 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
\r
4502 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
\r
4504 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
\r
4509 void CGitStatusListCtrl::RemoveListEntry(int index)
\r
4512 Locker lock(m_critSec);
\r
4513 DeleteItem(index);
\r
4514 delete m_arStatusArray[m_arListArray[index]];
\r
4515 m_arStatusArray.erase(m_arStatusArray.begin()+m_arListArray[index]);
\r
4516 m_arListArray.erase(m_arListArray.begin()+index);
\r
4517 for (int i=index; i< (int)m_arListArray.size(); ++i)
\r
4519 m_arListArray[i]--;
\r
4524 ///< Set a checkbox on an entry in the listbox
\r
4525 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync
\r
4526 void CGitStatusListCtrl::SetEntryCheck(CTGitPath* pEntry, int listboxIndex, bool bCheck)
\r
4528 pEntry->m_Checked = bCheck;
\r
4529 SetCheck(listboxIndex, bCheck);
\r
4533 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry* parentEntry, bool bCheck)
\r
4536 int nListItems = GetItemCount();
\r
4537 for (int j=0; j< nListItems ; ++j)
\r
4539 FileEntry * childEntry = GetListEntry(j);
\r
4540 ASSERT(childEntry != NULL);
\r
4541 if (childEntry == NULL || childEntry == parentEntry)
\r
4543 if (childEntry->checked != bCheck)
\r
4545 if (parentEntry->path.IsAncestorOf(childEntry->path))
\r
4547 SetEntryCheck(childEntry,j,bCheck);
\r
4562 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList& pathList)
\r
4565 int nListItems = GetItemCount();
\r
4566 for (int i=0; i< nListItems; i++)
\r
4568 const FileEntry* entry = GetListEntry(i);
\r
4569 ASSERT(entry != NULL);
\r
4570 if (entry->IsChecked())
\r
4572 pathList.AddPath(entry->path);
\r
4575 pathList.SortByPathname();
\r
4579 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)
\r
4580 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList& pathList, bool bNoIgnored)
\r
4584 POSITION pos = GetFirstSelectedItemPosition();
\r
4586 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
4588 CTGitPath * entry = (CTGitPath*)GetItemData(index);
\r
4589 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))
\r
4591 pathList.AddPath(*entry);
\r
4595 UINT CGitStatusListCtrl::OnGetDlgCode()
\r
4597 // we want to process the return key and not have that one
\r
4598 // routed to the default pushbutton
\r
4599 return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS;
\r
4602 void CGitStatusListCtrl::OnNMReturn(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
4607 POSITION pos = GetFirstSelectedItemPosition();
\r
4610 int index = GetNextSelectedItem(pos);
\r
4615 void CGitStatusListCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
\r
4617 // Since we catch all keystrokes (to have the enter key processed here instead
\r
4618 // of routed to the default pushbutton) we have to make sure that other
\r
4619 // keys like Tab and Esc still do what they're supposed to do
\r
4620 // Tab = change focus to next/previous control
\r
4621 // Esc = quit the dialog
\r
4626 ::PostMessage(GetParent()->GetSafeHwnd(), WM_NEXTDLGCTL, GetKeyState(VK_SHIFT)&0x8000, 0);
\r
4632 ::SendMessage(GetParent()->GetSafeHwnd(), WM_CLOSE, 0, 0);
\r
4637 CListCtrl::OnKeyDown(nChar, nRepCnt, nFlags);
\r
4640 void CGitStatusListCtrl::PreSubclassWindow()
\r
4642 CListCtrl::PreSubclassWindow();
\r
4643 EnableToolTips(TRUE);
\r
4646 INT_PTR CGitStatusListCtrl::OnToolHitTest(CPoint point, TOOLINFO* pTI) const
\r
4650 row = CellRectFromPoint(point, &cellrect, &col );
\r
4656 pTI->hwnd = m_hWnd;
\r
4657 pTI->uId = (UINT)((row<<10)+(col&0x3ff)+1);
\r
4658 pTI->lpszText = LPSTR_TEXTCALLBACK;
\r
4660 pTI->rect = cellrect;
\r
4665 int CGitStatusListCtrl::CellRectFromPoint(CPoint& point, RECT *cellrect, int *col) const
\r
4669 // Make sure that the ListView is in LVS_REPORT
\r
4670 if ((GetWindowLong(m_hWnd, GWL_STYLE) & LVS_TYPEMASK) != LVS_REPORT)
\r
4673 // Get the top and bottom row visible
\r
4674 int row = GetTopIndex();
\r
4675 int bottom = row + GetCountPerPage();
\r
4676 if (bottom > GetItemCount())
\r
4677 bottom = GetItemCount();
\r
4679 // Get the number of columns
\r
4680 CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
\r
4681 int nColumnCount = pHeader->GetItemCount();
\r
4683 // Loop through the visible rows
\r
4684 for ( ;row <=bottom;row++)
\r
4686 // Get bounding rect of item and check whether point falls in it.
\r
4688 GetItemRect(row, &rect, LVIR_BOUNDS);
\r
4689 if (rect.PtInRect(point))
\r
4691 // Now find the column
\r
4692 for (colnum = 0; colnum < nColumnCount; colnum++)
\r
4694 int colwidth = GetColumnWidth(colnum);
\r
4695 if (point.x >= rect.left && point.x <= (rect.left + colwidth))
\r
4698 GetClientRect(&rectClient);
\r
4701 rect.right = rect.left + colwidth;
\r
4703 // Make sure that the right extent does not exceed
\r
4704 // the client area
\r
4705 if (rect.right > rectClient.right)
\r
4706 rect.right = rectClient.right;
\r
4710 rect.left += colwidth;
\r
4717 BOOL CGitStatusListCtrl::OnToolTipText(UINT /*id*/, NMHDR *pNMHDR, LRESULT *pResult)
\r
4720 TOOLTIPTEXTW* pTTTW = (TOOLTIPTEXTW*)pNMHDR;
\r
4721 CString strTipText;
\r
4722 UINT_PTR nID = pNMHDR->idFrom;
\r
4727 UINT_PTR row = ((nID-1) >> 10) & 0x3fffff;
\r
4728 UINT_PTR col = (nID-1) & 0x3ff;
\r
4731 return FALSE; // no custom tooltip for the path, we use the infotip there!
\r
4733 // get the internal column from the visible columns
\r
4734 int internalcol = 0;
\r
4735 UINT_PTR currentcol = 0;
\r
4736 for (; (currentcol != col)
\r
4737 && (internalcol < m_ColumnManager.GetColumnCount()-1)
\r
4740 if (m_ColumnManager.IsVisible (internalcol))
\r
4744 AFX_MODULE_THREAD_STATE* pModuleThreadState = AfxGetModuleThreadState();
\r
4745 CToolTipCtrl* pToolTip = pModuleThreadState->m_pToolTip;
\r
4746 pToolTip->SendMessage(TTM_SETMAXTIPWIDTH, 0, 300);
\r
4749 if ((internalcol == 2)||(internalcol == 4))
\r
4751 FileEntry *fentry = GetListEntry(row);
\r
4754 if (fentry->copied)
\r
4757 url.Format(IDS_STATUSLIST_COPYFROM, (LPCTSTR)CPathUtils::PathUnescape(fentry->copyfrom_url), (LONG)fentry->copyfrom_rev);
\r
4758 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);
\r
4761 if (fentry->switched)
\r
4764 url.Format(IDS_STATUSLIST_SWITCHEDTO, (LPCTSTR)CPathUtils::PathUnescape(fentry->url));
\r
4765 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);
\r
4768 if (fentry->keeplocal)
\r
4770 lstrcpyn(pTTTW->szText, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_KEEPLOCAL)), 80);
\r
4779 void CGitStatusListCtrl::OnPaint()
\r
4782 if ((m_bBusy)||(m_bEmpty))
\r
4787 if (m_sBusy.IsEmpty())
\r
4788 str.LoadString(IDS_STATUSLIST_BUSYMSG);
\r
4794 if (m_sEmpty.IsEmpty())
\r
4795 str.LoadString(IDS_STATUSLIST_EMPTYMSG);
\r
4799 COLORREF clrText = ::GetSysColor(COLOR_WINDOWTEXT);
\r
4800 COLORREF clrTextBk;
\r
4801 if (IsWindowEnabled())
\r
4802 clrTextBk = ::GetSysColor(COLOR_WINDOW);
\r
4804 clrTextBk = ::GetSysColor(COLOR_3DFACE);
\r
4807 GetClientRect(&rc);
\r
4809 pHC = GetHeaderCtrl();
\r
4813 pHC->GetItemRect(0, &rcH);
\r
4814 rc.top += rcH.bottom;
\r
4816 CDC* pDC = GetDC();
\r
4818 CMyMemDC memDC(pDC, &rc);
\r
4820 memDC.SetTextColor(clrText);
\r
4821 memDC.SetBkColor(clrTextBk);
\r
4822 memDC.FillSolidRect(rc, clrTextBk);
\r
4824 CGdiObject * oldfont = memDC.SelectStockObject(DEFAULT_GUI_FONT);
\r
4825 memDC.DrawText(str, rc, DT_CENTER | DT_VCENTER |
\r
4826 DT_WORDBREAK | DT_NOPREFIX | DT_NOCLIP);
\r
4827 memDC.SelectObject(oldfont);
\r
4833 // prevent users from extending our hidden (size 0) columns
\r
4834 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR *pNMHDR, LRESULT *pResult)
\r
4836 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
4838 if ((phdr->iItem < 0)||(phdr->iItem >= SVNSLC_NUMCOLUMNS))
\r
4841 if (m_ColumnManager.IsVisible (phdr->iItem))
\r
4848 // prevent any function from extending our hidden (size 0) columns
\r
4849 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
\r
4851 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
4853 if ((phdr->iItem < 0)||(phdr->iItem >= m_ColumnManager.GetColumnCount()))
\r
4859 // visible columns may be modified
\r
4861 if (m_ColumnManager.IsVisible (phdr->iItem))
\r
4867 // columns already marked as "invisible" internally may be (re-)sized to 0
\r
4869 if ( (phdr->pitem != NULL)
\r
4870 && (phdr->pitem->mask == HDI_WIDTH)
\r
4871 && (phdr->pitem->cxy == 0))
\r
4877 if ( (phdr->pitem != NULL)
\r
4878 && (phdr->pitem->mask != HDI_WIDTH))
\r
4887 void CGitStatusListCtrl::OnDestroy()
\r
4889 SaveColumnWidths(true);
\r
4890 CListCtrl::OnDestroy();
\r
4893 void CGitStatusListCtrl::OnBeginDrag(NMHDR* /*pNMHDR*/, LRESULT* pResult)
\r
4896 Locker lock(m_critSec);
\r
4897 CDropFiles dropFiles; // class for creating DROPFILES struct
\r
4900 POSITION pos = GetFirstSelectedItemPosition();
\r
4901 while ( (index = GetNextSelectedItem(pos)) >= 0 )
\r
4903 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
\r
4904 CTGitPath path = fentry->GetPath();
\r
4905 dropFiles.AddFile( path.GetWinPathString() );
\r
4908 if ( dropFiles.GetCount()>0 )
\r
4910 m_bOwnDrag = true;
\r
4911 dropFiles.CreateStructure();
\r
4912 m_bOwnDrag = false;
\r
4918 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry /* = false */)
\r
4920 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
4921 for (int col = 0; col <= maxcol; col++)
\r
4922 if (m_ColumnManager.IsVisible (col))
\r
4923 m_ColumnManager.ColumnResized (col);
\r
4925 if (bSaveToRegistry)
\r
4926 m_ColumnManager.WriteSettings();
\r
4929 bool CGitStatusListCtrl::EnableFileDrop()
\r
4931 m_bFileDropsEnabled = true;
\r
4935 bool CGitStatusListCtrl::HasPath(const CTGitPath& path)
\r
4938 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
4940 FileEntry * entry = m_arStatusArray[i];
\r
4941 if (entry->GetPath().IsEquivalentTo(path))
\r
4948 bool CGitStatusListCtrl::IsPathShown(const CTGitPath& path)
\r
4950 int itemCount = GetItemCount();
\r
4951 for (int i=0; i < itemCount; i++)
\r
4953 FileEntry * entry = GetListEntry(i);
\r
4954 if (entry->GetPath().IsEquivalentTo(path))
\r
4960 BOOL CGitStatusListCtrl::PreTranslateMessage(MSG* pMsg)
\r
4962 if (pMsg->message == WM_KEYDOWN)
\r
4964 switch (pMsg->wParam)
\r
4968 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
\r
4970 // select all entries
\r
4971 for (int i=0; i<GetItemCount(); ++i)
\r
4973 SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
\r
4982 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
\r
4984 // copy all selected paths to the clipboard
\r
4985 if (GetAsyncKeyState(VK_SHIFT)&0x8000)
\r
4986 CopySelectedEntriesToClipboard(SVNSLC_COLSTATUS);
\r
4988 CopySelectedEntriesToClipboard(0);
\r
4996 return CListCtrl::PreTranslateMessage(pMsg);
\r
4999 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols)
\r
5002 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
5003 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
5004 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
5006 CString sClipboard;
\r
5009 if (GetSelectedCount() == 0)
\r
5011 // first add the column titles as the first line
\r
5012 temp.LoadString(IDS_STATUSLIST_COLFILE);
\r
5013 sClipboard = temp;
\r
5015 DWORD selection = 0;
\r
5016 for (int i = 0, count = m_ColumnManager.GetColumnCount(); i < count; ++i)
\r
5017 if ( ((dwCols == -1) && m_ColumnManager.IsVisible (i))
\r
5018 || ((dwCols != 1) && (i < 32) && ((dwCols & (1 << i)) != 0)))
\r
5020 sClipboard += _T("\t") + m_ColumnManager.GetName(i);
\r
5023 selection += 1 << i;
\r
5026 sClipboard += _T("\r\n");
\r
5028 POSITION pos = GetFirstSelectedItemPosition();
\r
5030 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
5032 FileEntry * entry = GetListEntry(index);
\r
5033 sClipboard += entry->GetDisplayName();
\r
5034 if (selection & SVNSLC_COLFILENAME)
\r
5036 sClipboard += _T("\t")+entry->path.GetFileOrDirectoryName();
\r
5038 if (selection & SVNSLC_COLEXT)
\r
5040 sClipboard += _T("\t")+entry->path.GetFileExtension();
\r
5042 if (selection & SVNSLC_COLSTATUS)
\r
5044 if (entry->isNested)
\r
5046 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
5050 GitStatus::GetStatusString(hResourceHandle, entry->status, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
5051 if ((entry->copied)&&(_tcslen(buf)>1))
\r
5052 _tcscat_s(buf, 100, _T(" (+)"));
\r
5053 if ((entry->switched)&&(_tcslen(buf)>1))
\r
5054 _tcscat_s(buf, 100, _T(" (s)"));
\r
5055 if ((entry->status == entry->propstatus)&&
\r
5056 (entry->status != git_wc_status_normal)&&
\r
5057 (entry->status != git_wc_status_unversioned)&&
\r
5058 (!GitStatus::IsImportant(entry->textstatus)))
\r
5059 _tcscat_s(buf, 100, ponly);
\r
5062 sClipboard += _T("\t")+temp;
\r
5064 if (selection & SVNSLC_COLTEXTSTATUS)
\r
5066 if (entry->isNested)
\r
5068 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
5072 GitStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
5073 if ((entry->copied)&&(_tcslen(buf)>1))
\r
5074 _tcscat_s(buf, 100, _T(" (+)"));
\r
5075 if ((entry->switched)&&(_tcslen(buf)>1))
\r
5076 _tcscat_s(buf, 100, _T(" (s)"));
\r
5079 sClipboard += _T("\t")+temp;
\r
5081 if (selection & SVNSLC_COLREMOTESTATUS)
\r
5083 if (entry->isNested)
\r
5085 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
5089 GitStatus::GetStatusString(hResourceHandle, entry->remotestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
5090 if ((entry->copied)&&(_tcslen(buf)>1))
\r
5091 _tcscat_s(buf, 100, _T(" (+)"));
\r
5092 if ((entry->switched)&&(_tcslen(buf)>1))
\r
5093 _tcscat_s(buf, 100, _T(" (s)"));
\r
5094 if ((entry->remotestatus == entry->remotepropstatus)&&
\r
5095 (entry->remotestatus != git_wc_status_none)&&
\r
5096 (entry->remotestatus != git_wc_status_normal)&&
\r
5097 (entry->remotestatus != git_wc_status_unversioned)&&
\r
5098 (!SVNStatus::IsImportant(entry->remotetextstatus)))
\r
5099 _tcscat_s(buf, 100, ponly);
\r
5102 sClipboard += _T("\t")+temp;
\r
5104 if (selection & GitSLC_COLPROPSTATUS)
\r
5106 if (entry->isNested)
\r
5112 GitStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
5113 if ((entry->copied)&&(_tcslen(buf)>1))
\r
5114 _tcscat_s(buf, 100, _T(" (+)"));
\r
5115 if ((entry->switched)&&(_tcslen(buf)>1))
\r
5116 _tcscat_s(buf, 100, _T(" (s)"));
\r
5119 sClipboard += _T("\t")+temp;
\r
5121 if (selection & SVNSLC_COLREMOTETEXT)
\r
5123 if (entry->isNested)
\r
5129 GitStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
5132 sClipboard += _T("\t")+temp;
\r
5134 if (selection & SVNSLC_COLREMOTEPROP)
\r
5136 // SVNSLC_COLREMOTEPROP
\r
5137 if (entry->isNested)
\r
5143 GitStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
5146 sClipboard += _T("\t")+temp;
\r
5148 if (selection & SVNSLC_COLURL)
\r
5149 sClipboard += _T("\t")+entry->url;
\r
5150 if (selection & SVNSLC_COLLOCK)
\r
5152 if (!m_HeadRev.IsHead())
\r
5154 // we have contacted the repository
\r
5156 // decision-matrix
\r
5157 // wc repository text
\r
5160 // UID1 UID1 owner
\r
5161 // UID1 "" lock has been broken
\r
5162 // UID1 UID2 lock has been stolen
\r
5163 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))
\r
5165 if (entry->lock_owner.IsEmpty())
\r
5166 temp = entry->lock_remoteowner;
\r
5168 temp = entry->lock_owner;
\r
5170 else if (entry->lock_remotetoken.IsEmpty())
\r
5173 temp.LoadString(IDS_STATUSLIST_LOCKBROKEN);
\r
5178 temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);
\r
5182 temp = entry->lock_owner;
\r
5183 sClipboard += _T("\t")+temp;
\r
5185 if (selection & SVNSLC_COLLOCKCOMMENT)
\r
5186 sClipboard += _T("\t")+entry->lock_comment;
\r
5187 if (selection & SVNSLC_COLAUTHOR)
\r
5188 sClipboard += _T("\t")+entry->last_commit_author;
\r
5189 if (selection & SVNSLC_COLREVISION)
\r
5191 temp.Format(_T("%ld"), entry->last_commit_rev);
\r
5192 if (entry->last_commit_rev == 0)
\r
5194 sClipboard += _T("\t")+temp;
\r
5196 if (selection & SVNSLC_COLREMOTEREVISION)
\r
5198 temp.Format(_T("%ld"), entry->remoterev);
\r
5199 if (entry->remoterev == 0)
\r
5201 sClipboard += _T("\t")+temp;
\r
5203 if (selection & SVNSLC_COLDATE)
\r
5205 TCHAR datebuf[SVN_DATE_BUFFER];
\r
5206 apr_time_t date = entry->last_commit_date;
\r
5207 SVN::formatDate(datebuf, date, true);
\r
5212 sClipboard += _T("\t")+temp;
\r
5214 if (selection & SVNSLC_COLCOPYFROM)
\r
5216 if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)
\r
5217 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());
\r
5219 temp = entry->copyfrom_url;
\r
5220 sClipboard += _T("\t")+temp;
\r
5223 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
\r
5227 if ((dwCols == -1) && m_ColumnManager.IsVisible (i))
\r
5230 = entry->present_props[m_ColumnManager.GetName(i)];
\r
5231 sClipboard += _T("\t") + value;
\r
5235 sClipboard += _T("\r\n");
\r
5238 return CStringUtils::WriteAsciiStringToClipboard(sClipboard);
\r
5244 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()
\r
5246 std::set<CString> changelists;
\r
5247 POSITION pos = GetFirstSelectedItemPosition();
\r
5249 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
5251 FileEntry * entry = GetListEntry(index);
\r
5252 if (!entry->changelist.IsEmpty())
\r
5253 changelists.insert(entry->changelist);
\r
5255 return changelists.size();
\r
5258 bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
\r
5261 bool bHasGroups=false;
\r
5262 if ( this->m_UnRevFileList.GetCount()>0 ||
\r
5263 this->m_IgnoreFileList.GetCount()>0 || bForce)
\r
5265 bHasGroups = true;
\r
5268 RemoveAllGroups();
\r
5269 EnableGroupView(bHasGroups);
\r
5271 TCHAR groupname[1024];
\r
5272 int groupindex = 0;
\r
5276 LVGROUP grp = {0};
\r
5277 grp.cbSize = sizeof(LVGROUP);
\r
5278 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5279 CString sUnassignedName(_T("Modified File"));
\r
5280 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
\r
5281 grp.pszHeader = groupname;
\r
5282 grp.iGroupId = groupindex;
\r
5283 grp.uAlign = LVGA_HEADER_LEFT;
\r
5284 InsertGroup(groupindex++, &grp);
\r
5286 //if(m_UnRevFileList.GetCount()>0)
\r
5288 _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("No Version Control"), 1023);
\r
5289 grp.pszHeader = groupname;
\r
5290 grp.iGroupId = groupindex;
\r
5291 grp.uAlign = LVGA_HEADER_LEFT;
\r
5292 InsertGroup(groupindex++, &grp);
\r
5295 //if(m_IgnoreFileList.GetCount()>0)
\r
5297 _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("Ignored File"), 1023);
\r
5298 grp.pszHeader = groupname;
\r
5299 grp.iGroupId = groupindex;
\r
5300 grp.uAlign = LVGA_HEADER_LEFT;
\r
5301 InsertGroup(groupindex++, &grp);
\r
5307 m_bHasIgnoreGroup = false;
\r
5309 // now add the items which don't belong to a group
\r
5310 LVGROUP grp = {0};
\r
5311 grp.cbSize = sizeof(LVGROUP);
\r
5312 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5313 CString sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET));
\r
5314 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
\r
5315 grp.pszHeader = groupname;
\r
5316 grp.iGroupId = groupindex;
\r
5317 grp.uAlign = LVGA_HEADER_LEFT;
\r
5318 InsertGroup(groupindex++, &grp);
\r
5320 for (std::map<CString,int>::iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
5322 if (it->first.Compare(SVNSLC_IGNORECHANGELIST)!=0)
\r
5324 LVGROUP grp = {0};
\r
5325 grp.cbSize = sizeof(LVGROUP);
\r
5326 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5327 _tcsncpy_s(groupname, 1024, it->first, 1023);
\r
5328 grp.pszHeader = groupname;
\r
5329 grp.iGroupId = groupindex;
\r
5330 grp.uAlign = LVGA_HEADER_LEFT;
\r
5331 it->second = InsertGroup(groupindex++, &grp);
\r
5334 m_bHasIgnoreGroup = true;
\r
5337 if (m_bHasIgnoreGroup)
\r
5339 // and now add the group 'ignore-on-commit'
\r
5340 std::map<CString,int>::iterator it = m_changelists.find(SVNSLC_IGNORECHANGELIST);
\r
5341 if (it != m_changelists.end())
\r
5343 grp.cbSize = sizeof(LVGROUP);
\r
5344 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5345 _tcsncpy_s(groupname, 1024, SVNSLC_IGNORECHANGELIST, 1023);
\r
5346 grp.pszHeader = groupname;
\r
5347 grp.iGroupId = groupindex;
\r
5348 grp.uAlign = LVGA_HEADER_LEFT;
\r
5349 it->second = InsertGroup(groupindex, &grp);
\r
5353 return bHasGroups;
\r
5356 void CGitStatusListCtrl::NotifyCheck()
\r
5358 CWnd* pParent = GetParent();
\r
5359 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
5361 pParent->SendMessage(SVNSLNM_CHECKCHANGED, m_nSelected);
\r
5365 int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash)
\r
5368 this->m_bBusy=TRUE;
\r
5369 if(hash == GIT_REV_ZERO)
\r
5371 CString cmd(_T("git.cmd diff-index --raw HEAD --numstat -C -M"));
\r
5372 g_Git.Run(cmd,&out);
\r
5373 this->m_StatusFileList.ParserFromLog(out);
\r
5375 for(int i=0;i<m_StatusFileList.GetCount();i++)
\r
5377 CTGitPath * gitpatch=(CTGitPath*)&m_StatusFileList[i];
\r
5378 gitpatch->m_Checked = TRUE;
\r
5379 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
\r
5381 this->m_bBusy=FALSE;
\r
5384 int CGitStatusListCtrl::UpdateUnRevFileList()
\r
5386 this->m_UnRevFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER);
\r
5387 for(int i=0;i<m_UnRevFileList.GetCount();i++)
\r
5389 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
\r
5390 gitpatch->m_Checked = FALSE;
\r
5391 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
\r
5396 int CGitStatusListCtrl::UpdateIgnoreFileList()
\r
5398 this->m_IgnoreFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER|CTGitPath::LOGACTIONS_IGNORE);
\r
5399 for(int i=0;i<m_IgnoreFileList.GetCount();i++)
\r
5401 CTGitPath * gitpatch=(CTGitPath*)&m_IgnoreFileList[i];
\r
5402 gitpatch->m_Checked = FALSE;
\r
5403 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
\r
5407 int CGitStatusListCtrl::UpdateFileList(int mask,bool once)
\r
5409 if(mask&CGitStatusListCtrl::FILELIST_MODIFY)
\r
5411 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_MODIFY)))
\r
5413 UpdateFileList(GIT_REV_ZERO);
\r
5414 m_FileLoaded|=CGitStatusListCtrl::FILELIST_MODIFY;
\r
5417 if(mask&CGitStatusListCtrl::FILELIST_UNVER)
\r
5419 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_UNVER)))
\r
5421 UpdateUnRevFileList();
\r
5422 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
\r
5427 //////////////////////////////////////////////////////////////////////////
\r
5429 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium, DWORD * /*pdwEffect*/, POINTL pt)
\r
5431 if(pFmtEtc->cfFormat == CF_HDROP && medium.tymed == TYMED_HGLOBAL)
\r
5433 HDROP hDrop = (HDROP)GlobalLock(medium.hGlobal);
\r
5436 TCHAR szFileName[MAX_PATH];
\r
5438 UINT cFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
\r
5440 POINT clientpoint;
\r
5441 clientpoint.x = pt.x;
\r
5442 clientpoint.y = pt.y;
\r
5443 ScreenToClient(m_hTargetWnd, &clientpoint);
\r
5444 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
\r
5446 CTSVNPathList changelistItems;
\r
5447 for(UINT i = 0; i < cFiles; ++i)
\r
5449 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
\r
5450 changelistItems.AddPath(CTSVNPath(szFileName));
\r
5452 // find the changelist name
\r
5453 CString sChangelist;
\r
5454 LONG_PTR nGroup = m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint);
\r
5455 for (std::map<CString, int>::iterator it = m_pSVNStatusListCtrl->m_changelists.begin(); it != m_pSVNStatusListCtrl->m_changelists.end(); ++it)
\r
5456 if (it->second == nGroup)
\r
5457 sChangelist = it->first;
\r
5458 if (!sChangelist.IsEmpty())
\r
5461 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
\r
5463 for (int l=0; l<changelistItems.GetCount(); ++l)
\r
5465 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
\r
5468 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
\r
5471 e->changelist = sChangelist;
\r
5472 if (!e->IsFolder())
\r
5474 if (m_pSVNStatusListCtrl->m_changelists.find(e->changelist)!=m_pSVNStatusListCtrl->m_changelists.end())
\r
5475 m_pSVNStatusListCtrl->SetItemGroup(index, m_pSVNStatusListCtrl->m_changelists[e->changelist]);
\r
5477 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
\r
5483 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5484 if (hParentWnd != NULL)
\r
5485 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
\r
5491 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
5497 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
\r
5499 for (int l=0; l<changelistItems.GetCount(); ++l)
\r
5501 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
\r
5504 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
\r
5507 e->changelist = sChangelist;
\r
5508 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
\r
5513 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5514 if (hParentWnd != NULL)
\r
5515 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
\r
5521 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
5527 for(UINT i = 0; i < cFiles; ++i)
\r
5529 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
\r
5530 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5531 if (hParentWnd != NULL)
\r
5532 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)szFileName);
\r
5536 GlobalUnlock(medium.hGlobal);
\r
5538 return true; //let base free the medium
\r
5540 HRESULT STDMETHODCALLTYPE CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect)
\r
5542 CIDropTarget::DragOver(grfKeyState, pt, pdwEffect);
\r
5543 *pdwEffect = DROPEFFECT_COPY;
\r
5544 if (m_pSVNStatusListCtrl)
\r
5546 POINT clientpoint;
\r
5547 clientpoint.x = pt.x;
\r
5548 clientpoint.y = pt.y;
\r
5549 ScreenToClient(m_hTargetWnd, &clientpoint);
\r
5550 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
\r
5552 *pdwEffect = DROPEFFECT_MOVE;
\r
5554 else if ((!m_pSVNStatusListCtrl->m_bFileDropsEnabled)||(m_pSVNStatusListCtrl->m_bOwnDrag))
\r
5556 *pdwEffect = DROPEFFECT_NONE;
\r
OSDN Git Service
