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
164 CGitStatusListCtrl::~CGitStatusListCtrl()
\r
167 delete m_pDropTarget;
\r
168 ClearStatusArray();
\r
171 void CGitStatusListCtrl::ClearStatusArray()
\r
174 Locker lock(m_critSec);
\r
175 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
177 delete m_arStatusArray[i];
\r
179 m_arStatusArray.clear();
\r
183 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetListEntry(UINT_PTR index)
\r
186 if (index >= (UINT_PTR)m_arListArray.size())
\r
188 if (m_arListArray[index] >= m_arStatusArray.size())
\r
190 return m_arStatusArray[m_arListArray[index]];
\r
196 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetVisibleListEntry(const CTGitPath& path)
\r
198 int itemCount = GetItemCount();
\r
199 for (int i=0; i < itemCount; i++)
\r
201 FileEntry * entry = GetListEntry(i);
\r
202 if (entry->GetPath().IsEquivalentTo(path))
\r
209 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetListEntry(const CTGitPath& path)
\r
212 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
214 FileEntry * entry = m_arStatusArray[i];
\r
215 if (entry->GetPath().IsEquivalentTo(path))
\r
224 int CGitStatusListCtrl::GetIndex(const CTGitPath& path)
\r
226 int itemCount = GetItemCount();
\r
227 for (int i=0; i < itemCount; i++)
\r
229 FileEntry * entry = GetListEntry(i);
\r
230 if (entry->GetPath().IsEquivalentTo(path))
\r
237 void CGitStatusListCtrl::Init(DWORD dwColumns, const CString& sColumnInfoContainer, DWORD dwContextMenus /* = GitSLC_POPALL */, bool bHasCheckboxes /* = true */)
\r
239 Locker lock(m_critSec);
\r
241 m_dwDefaultColumns = dwColumns | 1;
\r
242 m_dwContextMenus = dwContextMenus;
\r
243 m_bHasCheckboxes = bHasCheckboxes;
\r
245 // set the extended style of the listcontrol
\r
246 // 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
247 CRegDWORD regFullRowSelect(_T("Software\\TortoiseGit\\FullRowSelect"), TRUE);
\r
248 DWORD exStyle = LVS_EX_HEADERDRAGDROP | LVS_EX_DOUBLEBUFFER | LVS_EX_INFOTIP | LVS_EX_SUBITEMIMAGES;
\r
249 if (DWORD(regFullRowSelect))
\r
250 exStyle |= LVS_EX_FULLROWSELECT;
\r
251 exStyle |= (bHasCheckboxes ? LVS_EX_CHECKBOXES : 0);
\r
253 SetExtendedStyle(exStyle);
\r
256 theme.SetWindowTheme(m_hWnd, L"Explorer", NULL);
\r
258 m_nIconFolder = SYS_IMAGE_LIST().GetDirIconIndex();
\r
259 SetImageList(&SYS_IMAGE_LIST(), LVSIL_SMALL);
\r
261 m_ColumnManager.ReadSettings (m_dwDefaultColumns, sColumnInfoContainer);
\r
263 // enable file drops
\r
265 if (m_pDropTarget == NULL)
\r
267 m_pDropTarget = new CGitStatusListCtrlDropTarget(this);
\r
268 RegisterDragDrop(m_hWnd,m_pDropTarget);
\r
269 // create the supported formats:
\r
270 FORMATETC ftetc={0};
\r
271 ftetc.dwAspect = DVASPECT_CONTENT;
\r
273 ftetc.tymed = TYMED_HGLOBAL;
\r
274 ftetc.cfFormat=CF_HDROP;
\r
275 m_pDropTarget->AddSuportedFormat(ftetc);
\r
281 m_bUnversionedRecurse = !!((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\UnversionedRecurse"), TRUE));
\r
284 bool CGitStatusListCtrl::SetBackgroundImage(UINT nID)
\r
286 return CAppUtils::SetListCtrlBackgroundImage(GetSafeHwnd(), nID);
\r
289 BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList& pathList
\r
290 , bool bUpdate /* = FALSE */
\r
291 , bool bShowIgnores /* = false */
\r
293 , bool bShowUserProps /* = false */)
\r
295 Locker lock(m_critSec);
\r
296 int mask= CGitStatusListCtrl::FILELIST_MODIFY;
\r
298 mask|= CGitStatusListCtrl::FILELIST_IGNORE;
\r
300 mask|= CGitStatusListCtrl::FILELIST_UNVER;
\r
301 this->UpdateFileList(mask,bUpdate,(CTGitPathList*)&pathList);
\r
305 int refetchcounter = 0;
\r
308 // force the cursor to change
\r
311 SetCursorPos(pt.x, pt.y);
\r
313 m_mapFilenameToChecked.clear();
\r
314 //m_StatusUrlList.Clear();
\r
315 bool bHasChangelists = (m_changelists.size()>1 || (m_changelists.size()>0 && !m_bHasIgnoreGroup));
\r
316 m_changelists.clear();
\r
317 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
319 FileEntry * entry = m_arStatusArray[i];
\r
320 if ( bHasChangelists && entry->checked)
\r
322 // If change lists are present, remember all checked entries
\r
323 CString path = entry->GetPath().GetGitPathString();
\r
324 m_mapFilenameToChecked[path] = true;
\r
326 if ( (entry->status==git_wc_status_unversioned || entry->status==git_wc_status_missing ) && entry->checked )
\r
328 // The user manually selected an unversioned or missing file. We remember
\r
329 // this so that the selection can be restored when refreshing.
\r
330 CString path = entry->GetPath().GetGitPathString();
\r
331 m_mapFilenameToChecked[path] = true;
\r
333 else if ( entry->status > git_wc_status_normal && !entry->checked )
\r
335 // The user manually deselected a versioned file. We remember
\r
336 // this so that the deselection can be restored when refreshing.
\r
337 CString path = entry->GetPath().GetGitPathString();
\r
338 m_mapFilenameToChecked[path] = false;
\r
342 // use a sorted path list to make sure we fetch the status of
\r
343 // parent items first, *then* the child items (if any)
\r
344 CTGitPathList sortedPathList = pathList;
\r
345 sortedPathList.SortByPathname();
\r
349 m_nTargetCount = 0;
\r
350 m_bHasExternalsFromDifferentRepos = FALSE;
\r
351 m_bHasExternals = FALSE;
\r
352 m_bHasUnversionedItems = FALSE;
\r
353 m_bHasLocks = false;
\r
354 m_bHasChangeLists = false;
\r
355 m_bShowIgnores = bShowIgnores;
\r
356 m_nSortedColumn = 0;
\r
362 // first clear possible status data left from
\r
363 // previous GetStatus() calls
\r
364 ClearStatusArray();
\r
366 m_StatusFileList = sortedPathList;
\r
368 // Since Git_client_status() returns all files, even those in
\r
369 // folders included with Git:externals we need to check if all
\r
370 // files we get here belongs to the same repository.
\r
371 // It is possible to commit changes in an external folder, as long
\r
372 // as the folder belongs to the same repository (but another path),
\r
373 // but it is not possible to commit all files if the externals are
\r
374 // from a different repository.
\r
376 // To check if all files belong to the same repository, we compare the
\r
377 // UUID's - if they're identical then the files belong to the same
\r
378 // repository and can be committed. But if they're different, then
\r
379 // tell the user to commit all changes in the external folders
\r
381 CStringA sUUID; // holds the repo UUID
\r
382 CTGitPathList arExtPaths; // list of Git:external paths
\r
388 m_nTargetCount = sortedPathList.GetCount();
\r
390 GitStatus status(m_pbCanceled);
\r
391 if(m_nTargetCount > 1 && sortedPathList.AreAllPathsFilesInOneDirectory())
\r
393 // This is a special case, where we've been given a list of files
\r
394 // all from one folder
\r
395 // We handle them by setting a status filter, then requesting the Git status of
\r
396 // all the files in the directory, filtering for the ones we're interested in
\r
397 status.SetFilter(sortedPathList);
\r
399 // if all selected entries are files, we don't do a recursive status
\r
400 // fetching. But if only one is a directory, we have to recurse.
\r
401 git_depth_t depth = git_depth_files;
\r
402 // We have set a filter. If all selected items were files or we fetch
\r
403 // the status not recursively, then we have to include
\r
404 // ignored items too - the user has selected them
\r
405 bool bShowIgnoresRight = true;
\r
406 for (int fcindex=0; fcindex<sortedPathList.GetCount(); ++fcindex)
\r
408 if (sortedPathList[fcindex].IsDirectory())
\r
410 depth = git_depth_infinity;
\r
411 bShowIgnoresRight = false;
\r
415 if(!FetchStatusForSingleTarget(config, status, sortedPathList.GetCommonDirectory(), bUpdate, sUUID, arExtPaths, true, depth, bShowIgnoresRight))
\r
422 for(int nTarget = 0; nTarget < m_nTargetCount; nTarget++)
\r
424 // check whether the path we want the status for is already fetched due to status-fetching
\r
425 // of a parent path.
\r
426 // this check is only done for file paths, because folder paths could be included already
\r
427 // but not recursively
\r
428 if (sortedPathList[nTarget].IsDirectory() || GetListEntry(sortedPathList[nTarget]) == NULL)
\r
430 if(!FetchStatusForSingleTarget(config, status, sortedPathList[nTarget], bUpdate, sUUID,
\r
431 arExtPaths, false, git_depth_infinity, bShowIgnores))
\r
439 // remove the 'helper' files of conflicted items from the list.
\r
440 // otherwise they would appear as unversioned files.
\r
441 for (INT_PTR cind = 0; cind < m_ConflictFileList.GetCount(); ++cind)
\r
443 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
445 if (m_arStatusArray[i]->GetPath().IsEquivalentTo(m_ConflictFileList[cind]))
\r
447 delete m_arStatusArray[i];
\r
448 m_arStatusArray.erase(m_arStatusArray.begin()+i);
\r
454 } while(!BuildStatistics() && (refetchcounter < 2) && (*m_pbCanceled==false));
\r
456 if (bShowUserProps)
\r
457 FetchUserProperties();
\r
459 m_ColumnManager.UpdateUserPropList (m_arStatusArray);
\r
464 SetCursorPos(pt.x, pt.y);
\r
471 // Fetch all local properties for all elements in the status array
\r
473 void CGitStatusListCtrl::FetchUserProperties()
\r
476 GitPool globalPool;
\r
478 for (size_t i = 0, count = m_arStatusArray.size(); i < count; ++i)
\r
480 // local / temp pool to hold parameters and props for a single item
\r
482 GitPool localPool ((apr_pool_t*)globalPool);
\r
484 // open working copy for this path
\r
486 const char* path = m_arStatusArray[i]->path.GetGitApiPath (localPool);
\r
488 Git_wc_adm_access_t *adm_access = NULL;
\r
489 Git_error_t * error = Git_wc_adm_probe_open3 ( &adm_access
\r
492 , FALSE // no write lock
\r
493 , 0 // lock just the directory/file itself
\r
499 // get the props and add them to the status info
\r
501 apr_hash_t* props = NULL;
\r
502 Git_error_t * error = Git_wc_prop_list ( &props
\r
508 for ( apr_hash_index_t *index
\r
509 = apr_hash_first (localPool, props)
\r
511 ; index = apr_hash_next (index))
\r
513 // extract next entry from hash
\r
515 const char* key = NULL;
\r
517 const char** val = NULL;
\r
519 apr_hash_this ( index
\r
520 , reinterpret_cast<const void**>(&key)
\r
522 , reinterpret_cast<void**>(&val));
\r
524 // decode / dispatch it
\r
526 CString name = CUnicodeUtils::GetUnicode (key);
\r
527 CString value = CUnicodeUtils::GetUnicode (*val);
\r
529 // store in property container (truncate it after ~100 chars)
\r
531 m_arStatusArray[i]->present_props[name]
\r
532 = value.Left (GitSLC_MAXUSERPROPLENGTH);
\r
535 error = Git_wc_adm_close2 (adm_access, localPool);
\r
537 Git_error_clear (error);
\r
544 // Work on a single item from the list of paths which is provided to us
\r
546 bool CGitStatusListCtrl::FetchStatusForSingleTarget(
\r
549 const CTGitPath& target,
\r
550 bool bFetchStatusFromRepository,
\r
551 CStringA& strCurrentRepositoryUUID,
\r
552 CTGitPathList& arExtPaths,
\r
559 config.GetDefaultIgnores();
\r
561 CTGitPath workingTarget(target);
\r
563 git_wc_status2_t * s;
\r
565 s = status.GetFirstFileStatus(workingTarget, GitPath, bFetchStatusFromRepository, depth, bShowIgnores);
\r
567 m_HeadRev = SVNRev(status.headrev);
\r
570 Git_wc_status_kind wcFileStatus = GitStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
572 // This one fixes a problem with externals:
\r
573 // If a strLine is a file, Git:externals and its parent directory
\r
574 // will also be returned by GetXXXFileStatus. Hence, we skip all
\r
575 // status info until we find the one matching workingTarget.
\r
576 if (!workingTarget.IsDirectory())
\r
578 if (!workingTarget.IsEquivalentTo(GitPath))
\r
582 s = status.GetNextFileStatus(GitPath);
\r
583 if(workingTarget.IsEquivalentTo(GitPath))
\r
590 m_sLastError = status.GetLastErrorMsg();
\r
593 // Now, set working target to be the base folder of this item
\r
594 workingTarget = workingTarget.GetDirectory();
\r
597 bool bEntryFromDifferentRepo = false;
\r
598 // Is this a versioned item with an associated repos UUID?
\r
599 if ((s->entry)&&(s->entry->uuid))
\r
601 // Have we seen a repos UUID yet?
\r
602 if (strCurrentRepositoryUUID.IsEmpty())
\r
604 // This is the first repos UUID we've seen - record it
\r
605 strCurrentRepositoryUUID = s->entry->uuid;
\r
606 m_sUUID = strCurrentRepositoryUUID;
\r
610 if (strCurrentRepositoryUUID.Compare(s->entry->uuid)!=0)
\r
612 // This item comes from a different repository than our main one
\r
613 m_bHasExternalsFromDifferentRepos = TRUE;
\r
614 bEntryFromDifferentRepo = true;
\r
615 if (s->entry->kind == Git_node_dir)
\r
616 arExtPaths.AddPath(workingTarget);
\r
620 else if (strCurrentRepositoryUUID.IsEmpty() && (s->text_status == Git_wc_status_added))
\r
622 // An added entry doesn't have an UUID assigned to it yet.
\r
623 // So we fetch the status of the parent directory instead and
\r
624 // check if that one has an UUID assigned to it.
\r
625 Git_wc_status2_t * sparent;
\r
626 CTGitPath path = workingTarget;
\r
629 CTGitPath GitParentPath;
\r
630 GitStatus tempstatus;
\r
631 sparent = tempstatus.GetFirstFileStatus(path.GetContainingDirectory(), GitParentPath, false, Git_depth_empty, false);
\r
632 path = GitParentPath;
\r
633 } while ( (sparent) && (sparent->entry) && (!sparent->entry->uuid) && (sparent->text_status==Git_wc_status_added) );
\r
634 if (sparent && sparent->entry && sparent->entry->uuid)
\r
636 strCurrentRepositoryUUID = sparent->entry->uuid;
\r
637 m_sUUID = strCurrentRepositoryUUID;
\r
641 if ((wcFileStatus == Git_wc_status_unversioned)&& GitPath.IsDirectory())
\r
643 // check if the unversioned folder is maybe versioned. This
\r
644 // could happen with nested layouts
\r
645 Git_wc_status_kind st = GitStatus::GetAllStatus(workingTarget);
\r
646 if ((st != Git_wc_status_unversioned)&&(st != Git_wc_status_none))
\r
648 return true; // ignore nested layouts
\r
651 if (status.IsExternal(GitPath))
\r
653 m_bHasExternals = TRUE;
\r
656 AddNewFileEntry(s, GitPath, workingTarget, true, m_bHasExternals, bEntryFromDifferentRepo);
\r
658 if (((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none)||((wcFileStatus == Git_wc_status_ignored)&&(m_bShowIgnores))) && GitPath.IsDirectory())
\r
660 // we have an unversioned folder -> get all files in it recursively!
\r
661 AddUnversionedFolder(GitPath, workingTarget.GetContainingDirectory(), &config);
\r
664 // for folders, get all statuses inside it too
\r
665 if(workingTarget.IsDirectory())
\r
667 ReadRemainingItemsStatus(status, workingTarget, strCurrentRepositoryUUID, arExtPaths, &config, bAllDirect);
\r
673 m_sLastError = status.GetLastErrorMsg();
\r
680 const CGitStatusListCtrl::FileEntry*
\r
681 CGitStatusListCtrl::AddNewFileEntry(
\r
682 const git_wc_status2_t* pGitStatus, // The return from the Git GetStatus functions
\r
683 const CTGitPath& path, // The path of the item we're adding
\r
684 const CTGitPath& basePath, // The base directory for this status build
\r
685 bool bDirectItem, // Was this item the first found by GetFirstFileStatus or by a subsequent GetNextFileStatus call
\r
686 bool bInExternal, // Are we in an 'external' folder
\r
687 bool bEntryfromDifferentRepo // if the entry is from a different repository
\r
690 FileEntry * entry = new FileEntry();
\r
693 entry->path = path;
\r
694 entry->basepath = basePath;
\r
695 entry->status = GitStatus::GetMoreImportant(pGitStatus->text_status, pGitStatus->prop_status);
\r
696 entry->textstatus = pGitStatus->text_status;
\r
697 entry->propstatus = pGitStatus->prop_status;
\r
698 // entry->remotestatus = GitStatus::GetMoreImportant(pGitStatus->repos_text_status, pGitStatus->repos_prop_status);
\r
699 // entry->remotetextstatus = pGitStatus->repos_text_status;
\r
700 // entry->remotepropstatus = pGitStatus->repos_prop_status;
\r
701 entry->inexternal = bInExternal;
\r
702 entry->differentrepo = bEntryfromDifferentRepo;
\r
703 entry->direct = bDirectItem;
\r
704 // entry->copied = !!pGitStatus->copied;
\r
705 // entry->switched = !!pGitStatus->switched;
\r
707 entry->last_commit_date = pGitStatus->ood_last_cmt_date;
\r
708 if ((entry->last_commit_date == NULL)&&(pGitStatus->entry))
\r
709 entry->last_commit_date = pGitStatus->entry->cmt_date;
\r
710 entry->remoterev = pGitStatus->ood_last_cmt_rev;
\r
711 if (pGitStatus->entry)
\r
712 entry->last_commit_rev = pGitStatus->entry->cmt_rev;
\r
713 if (pGitStatus->ood_last_cmt_author)
\r
714 entry->last_commit_author = CUnicodeUtils::GetUnicode(pGitStatus->ood_last_cmt_author);
\r
715 if ((entry->last_commit_author.IsEmpty())&&(pGitStatus->entry)&&(pGitStatus->entry->cmt_author))
\r
716 entry->last_commit_author = CUnicodeUtils::GetUnicode(pGitStatus->entry->cmt_author);
\r
718 if (pGitStatus->entry)
\r
719 entry->isConflicted = (pGitStatus->entry->conflict_wrk && PathFileExists(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_wrk))) ? true : false;
\r
721 if ((entry->status == Git_wc_status_conflicted)||(entry->isConflicted))
\r
723 entry->isConflicted = true;
\r
724 if (pGitStatus->entry)
\r
727 if (pGitStatus->entry->conflict_wrk)
\r
729 cpath = path.GetDirectory();
\r
730 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_wrk));
\r
731 m_ConflictFileList.AddPath(cpath);
\r
733 if (pGitStatus->entry->conflict_old)
\r
735 cpath = path.GetDirectory();
\r
736 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_old));
\r
737 m_ConflictFileList.AddPath(cpath);
\r
739 if (pGitStatus->entry->conflict_new)
\r
741 cpath = path.GetDirectory();
\r
742 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_new));
\r
743 m_ConflictFileList.AddPath(cpath);
\r
745 if (pGitStatus->entry->prejfile)
\r
747 cpath = path.GetDirectory();
\r
748 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->prejfile));
\r
749 m_ConflictFileList.AddPath(cpath);
\r
754 if (pGitStatus->entry)
\r
756 entry->isfolder = (pGitStatus->entry->kind == Git_node_dir);
\r
757 entry->Revision = pGitStatus->entry->revision;
\r
758 entry->keeplocal = !!pGitStatus->entry->keep_local;
\r
759 entry->working_size = pGitStatus->entry->working_size;
\r
760 entry->depth = pGitStatus->entry->depth;
\r
762 if (pGitStatus->entry->url)
\r
764 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(pGitStatus->entry->url));
\r
766 if (pGitStatus->entry->copyfrom_url)
\r
768 entry->copyfrom_url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(pGitStatus->entry->copyfrom_url));
\r
769 entry->copyfrom_rev = pGitStatus->entry->copyfrom_rev;
\r
772 entry->copyfrom_rev = 0;
\r
776 if (m_sURL.IsEmpty())
\r
777 m_sURL = entry->url;
\r
779 m_sURL.LoadString(IDS_STATUSLIST_MULTIPLETARGETS);
\r
780 m_StatusUrlList.AddPath(CTGitPath(entry->url));
\r
782 if (pGitStatus->entry->lock_owner)
\r
783 entry->lock_owner = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_owner);
\r
784 if (pGitStatus->entry->lock_token)
\r
786 entry->lock_token = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_token);
\r
787 m_bHasLocks = true;
\r
789 if (pGitStatus->entry->lock_comment)
\r
790 entry->lock_comment = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_comment);
\r
792 if (pGitStatus->entry->present_props)
\r
794 entry->present_props = pGitStatus->entry->present_props;
\r
797 if (pGitStatus->entry->changelist)
\r
799 entry->changelist = CUnicodeUtils::GetUnicode(pGitStatus->entry->changelist);
\r
800 m_changelists[entry->changelist] = -1;
\r
801 m_bHasChangeLists = true;
\r
803 entry->needslock = (pGitStatus->entry->present_props && (strstr(pGitStatus->entry->present_props, "Git:needs-lock")!=NULL) );
\r
807 if (pGitStatus->ood_kind == Git_node_none)
\r
808 entry->isfolder = path.IsDirectory();
\r
810 entry->isfolder = (pGitStatus->ood_kind == Git_node_dir);
\r
812 if (pGitStatus->repos_lock)
\r
814 if (pGitStatus->repos_lock->owner)
\r
815 entry->lock_remoteowner = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->owner);
\r
816 if (pGitStatus->repos_lock->token)
\r
817 entry->lock_remotetoken = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->token);
\r
818 if (pGitStatus->repos_lock->comment)
\r
819 entry->lock_comment = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->comment);
\r
822 // Pass ownership of the entry to the array
\r
823 m_arStatusArray.push_back(entry);
\r
829 void CGitStatusListCtrl::AddUnversionedFolder(const CTGitPath& folderName,
\r
830 const CTGitPath& basePath,
\r
831 GitConfig * config)
\r
834 if (!m_bUnversionedRecurse)
\r
836 CSimpleFileFind filefinder(folderName.GetWinPathString());
\r
838 CTGitPath filename;
\r
839 m_bHasUnversionedItems = TRUE;
\r
840 while (filefinder.FindNextFileNoDots())
\r
842 filename.SetFromWin(filefinder.GetFilePath(), filefinder.IsDirectory());
\r
844 bool bMatchIgnore = !!config->MatchIgnorePattern(filename.GetFileOrDirectoryName());
\r
845 bMatchIgnore = bMatchIgnore || config->MatchIgnorePattern(filename.GetGitPathString());
\r
846 if (((bMatchIgnore)&&(m_bShowIgnores))||(!bMatchIgnore))
\r
848 FileEntry * entry = new FileEntry();
\r
849 entry->path = filename;
\r
850 entry->basepath = basePath;
\r
851 entry->inunversionedfolder = true;
\r
852 entry->isfolder = filefinder.IsDirectory();
\r
854 m_arStatusArray.push_back(entry);
\r
855 if (entry->isfolder)
\r
857 if (!g_GitAdminDir.HasAdminDir(entry->path.GetWinPathString(), true))
\r
858 AddUnversionedFolder(entry->path, basePath, config);
\r
866 void CGitStatusListCtrl::ReadRemainingItemsStatus(GitStatus& status, const CTGitPath& basePath,
\r
867 CStringA& strCurrentRepositoryUUID,
\r
868 CTGitPathList& arExtPaths, GitConfig * config, bool bAllDirect)
\r
871 git_wc_status2_t * s;
\r
873 CTGitPath lastexternalpath;
\r
875 while ((s = status.GetNextFileStatus(GitPath)) != NULL)
\r
877 Git_wc_status_kind wcFileStatus = GitStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
878 if ((wcFileStatus == Git_wc_status_unversioned) && (GitPath.IsDirectory()))
\r
880 // check if the unversioned folder is maybe versioned. This
\r
881 // could happen with nested layouts
\r
882 Git_wc_status_kind st = GitStatus::GetAllStatus(GitPath);
\r
883 if ((st != Git_wc_status_unversioned)&&(st != Git_wc_status_none))
\r
885 FileEntry * entry = new FileEntry();
\r
886 entry->path = GitPath;
\r
887 entry->basepath = basePath;
\r
888 entry->inunversionedfolder = true;
\r
889 entry->isfolder = true;
\r
890 entry->isNested = true;
\r
891 m_arStatusArray.push_back(entry);
\r
895 bool bDirectoryIsExternal = false;
\r
896 bool bEntryfromDifferentRepo = false;
\r
899 if (s->entry->uuid)
\r
901 if (strCurrentRepositoryUUID.IsEmpty())
\r
902 strCurrentRepositoryUUID = s->entry->uuid;
\r
905 if (strCurrentRepositoryUUID.Compare(s->entry->uuid)!=0)
\r
907 bEntryfromDifferentRepo = true;
\r
908 if (GitStatus::IsImportant(wcFileStatus))
\r
909 m_bHasExternalsFromDifferentRepos = TRUE;
\r
910 if (s->entry->kind == Git_node_dir)
\r
912 if ((lastexternalpath.IsEmpty())||(!lastexternalpath.IsAncestorOf(GitPath)))
\r
914 arExtPaths.AddPath(GitPath);
\r
915 lastexternalpath = GitPath;
\r
923 // we don't have an UUID - maybe an added file/folder
\r
924 if (!strCurrentRepositoryUUID.IsEmpty())
\r
926 if ((!lastexternalpath.IsEmpty())&&
\r
927 (lastexternalpath.IsAncestorOf(GitPath)))
\r
929 bEntryfromDifferentRepo = true;
\r
930 m_bHasExternalsFromDifferentRepos = TRUE;
\r
937 // if unversioned items lie around in external
\r
938 // directories from different repos, we have to mark them
\r
940 if (!strCurrentRepositoryUUID.IsEmpty())
\r
942 if ((!lastexternalpath.IsEmpty())&&
\r
943 (lastexternalpath.IsAncestorOf(GitPath)))
\r
945 bEntryfromDifferentRepo = true;
\r
949 if (status.IsExternal(GitPath))
\r
951 arExtPaths.AddPath(GitPath);
\r
952 m_bHasExternals = TRUE;
\r
954 if ((!bEntryfromDifferentRepo)&&(status.IsInExternal(GitPath)))
\r
956 // if the externals are inside an unversioned folder (this happens if
\r
957 // the externals are specified with e.g. "ext\folder url" instead of just
\r
958 // "folder url"), then a commit won't succeed.
\r
959 // therefore, we treat those as if the externals come from a different
\r
961 CTGitPath extpath = GitPath;
\r
962 while (basePath.IsAncestorOf(extpath))
\r
964 if (!extpath.HasAdminDir())
\r
966 bEntryfromDifferentRepo = true;
\r
969 extpath = extpath.GetContainingDirectory();
\r
972 // Do we have any external paths?
\r
973 if(arExtPaths.GetCount() > 0)
\r
975 // If do have external paths, we need to check if the current item belongs
\r
977 for (int ix=0; ix<arExtPaths.GetCount(); ix++)
\r
979 if (arExtPaths[ix].IsAncestorOf(GitPath))
\r
981 bDirectoryIsExternal = true;
\r
987 if ((wcFileStatus == Git_wc_status_unversioned)&&(!bDirectoryIsExternal))
\r
988 m_bHasUnversionedItems = TRUE;
\r
990 const FileEntry* entry = AddNewFileEntry(s, GitPath, basePath, bAllDirect, bDirectoryIsExternal, bEntryfromDifferentRepo);
\r
992 bool bMatchIgnore = !!config->MatchIgnorePattern(entry->path.GetFileOrDirectoryName());
\r
993 bMatchIgnore = bMatchIgnore || config->MatchIgnorePattern(entry->path.GetGitPathString());
\r
994 if ((((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none))&&(!bMatchIgnore))||
\r
995 ((wcFileStatus == Git_wc_status_ignored)&&(m_bShowIgnores))||
\r
996 (((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none))&&(bMatchIgnore)&&(m_bShowIgnores)))
\r
998 if (entry->isfolder)
\r
1000 // we have an unversioned folder -> get all files in it recursively!
\r
1001 AddUnversionedFolder(GitPath, basePath, config);
\r
1004 } // while ((s = status.GetNextFileStatus(GitPath)) != NULL)
\r
1008 // Get the show-flags bitmap value which corresponds to a particular Git status
\r
1009 DWORD CGitStatusListCtrl::GetShowFlagsFromGitStatus(git_wc_status_kind status)
\r
1013 case git_wc_status_none:
\r
1014 case git_wc_status_unversioned:
\r
1015 return SVNSLC_SHOWUNVERSIONED;
\r
1016 case git_wc_status_ignored:
\r
1017 if (!m_bShowIgnores)
\r
1018 return SVNSLC_SHOWDIRECTS;
\r
1019 return SVNSLC_SHOWDIRECTS|SVNSLC_SHOWIGNORED;
\r
1020 case git_wc_status_incomplete:
\r
1021 return SVNSLC_SHOWINCOMPLETE;
\r
1022 case git_wc_status_normal:
\r
1023 return SVNSLC_SHOWNORMAL;
\r
1024 case git_wc_status_external:
\r
1025 return SVNSLC_SHOWEXTERNAL;
\r
1026 case git_wc_status_added:
\r
1027 return SVNSLC_SHOWADDED;
\r
1028 case git_wc_status_missing:
\r
1029 return SVNSLC_SHOWMISSING;
\r
1030 case git_wc_status_deleted:
\r
1031 return SVNSLC_SHOWREMOVED;
\r
1032 case git_wc_status_replaced:
\r
1033 return SVNSLC_SHOWREPLACED;
\r
1034 case git_wc_status_modified:
\r
1035 return SVNSLC_SHOWMODIFIED;
\r
1036 case git_wc_status_merged:
\r
1037 return SVNSLC_SHOWMERGED;
\r
1038 case git_wc_status_conflicted:
\r
1039 return SVNSLC_SHOWCONFLICTED;
\r
1040 case git_wc_status_obstructed:
\r
1041 return SVNSLC_SHOWOBSTRUCTED;
\r
1043 // we should NEVER get here!
\r
1050 void CGitStatusListCtrl::Show(DWORD dwShow, DWORD dwCheck /*=0*/, bool bShowFolders /* = true */)
\r
1052 CWinApp * pApp = AfxGetApp();
\r
1054 pApp->DoWaitCursor(1);
\r
1056 Locker lock(m_critSec);
\r
1057 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), GetUserDefaultLangID());
\r
1059 //SetItemCount(listIndex);
\r
1065 for(int i=0;i<this->m_arStatusArray.size();i++)
\r
1067 AddEntry((CTGitPath*)m_arStatusArray[i],langID,i);
\r
1070 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1071 for (int col = 0; col <= maxcol; col++)
\r
1072 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1075 GetStatisticsString();
\r
1077 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1078 HDITEM HeaderItem = {0};
\r
1079 HeaderItem.mask = HDI_FORMAT;
\r
1080 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1082 pHeader->GetItem(i, &HeaderItem);
\r
1083 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1084 pHeader->SetItem(i, &HeaderItem);
\r
1086 if (m_nSortedColumn)
\r
1088 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1089 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1090 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1094 if (nSelectedEntry)
\r
1096 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1097 EnsureVisible(nSelectedEntry, false);
\r
1101 // Restore the item at the top of the list.
\r
1102 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1104 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1112 pApp->DoWaitCursor(-1);
\r
1118 CWinApp * pApp = AfxGetApp();
\r
1120 pApp->DoWaitCursor(1);
\r
1121 m_dwShow = dwShow;
\r
1122 m_bShowFolders = bShowFolders;
\r
1124 int nTopIndex = GetTopIndex();
\r
1125 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
\r
1126 int nSelectedEntry = 0;
\r
1127 if (posSelectedEntry)
\r
1128 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
\r
1134 m_arListArray.clear();
\r
1136 m_arListArray.reserve(m_arStatusArray.size());
\r
1137 SetItemCount (static_cast<int>(m_arStatusArray.size()));
\r
1139 int listIndex = 0;
\r
1140 for (size_t i=0; i < m_arStatusArray.size(); ++i)
\r
1142 FileEntry * entry = m_arStatusArray[i];
\r
1143 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
\r
1145 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
\r
1147 if (entry->IsFolder() && (!bShowFolders))
\r
1148 continue; // don't show folders if they're not wanted.
\r
1151 git_wc_status_kind status = GitStatus::GetMoreImportant(entry->status, entry->remotestatus);
\r
1152 DWORD showFlags = GetShowFlagsFromGitStatus(status);
\r
1153 if (entry->IsLocked())
\r
1154 showFlags |= SVNSLC_SHOWLOCKS;
\r
1155 if (entry->switched)
\r
1156 showFlags |= SVNSLC_SHOWSWITCHED;
\r
1157 if (!entry->changelist.IsEmpty())
\r
1158 showFlags |= SVNSLC_SHOWINCHANGELIST;
\r
1160 bool bAllowCheck = ((entry->changelist.Compare(SVNSLC_IGNORECHANGELIST) != 0)
\r
1161 && (m_bCheckIfGroupsExist || (m_changelists.size()==0 || (m_changelists.size()==1 && m_bHasIgnoreGroup))));
\r
1163 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
\r
1165 if (status != Git_wc_status_ignored || (entry->direct) || (dwShow & GitSLC_SHOWIGNORED))
\r
1167 if ((!entry->IsFolder()) && (status == Git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
\r
1169 if (PathFileExists(entry->GetPath().GetWinPath()))
\r
1171 m_arListArray.push_back(i);
\r
1172 if ((dwCheck & SVNSLC_SHOWREMOVEDANDPRESENT)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1175 entry->checked = true;
\r
1177 AddEntry(entry, langID, listIndex++);
\r
1180 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
\r
1182 m_arListArray.push_back(i);
\r
1183 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1186 entry->checked = true;
\r
1188 AddEntry(entry, langID, listIndex++);
\r
1190 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
\r
1192 m_arListArray.push_back(i);
\r
1193 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1196 entry->checked = true;
\r
1198 AddEntry(entry, langID, listIndex++);
\r
1204 SetItemCount(listIndex);
\r
1206 m_ColumnManager.UpdateRelevance (m_arStatusArray, m_arListArray);
\r
1208 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1209 for (int col = 0; col <= maxcol; col++)
\r
1210 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1213 GetStatisticsString();
\r
1215 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1216 HDITEM HeaderItem = {0};
\r
1217 HeaderItem.mask = HDI_FORMAT;
\r
1218 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1220 pHeader->GetItem(i, &HeaderItem);
\r
1221 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1222 pHeader->SetItem(i, &HeaderItem);
\r
1224 if (m_nSortedColumn)
\r
1226 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1227 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1228 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1231 if (nSelectedEntry)
\r
1233 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1234 EnsureVisible(nSelectedEntry, false);
\r
1238 // Restore the item at the top of the list.
\r
1239 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1241 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1249 pApp->DoWaitCursor(-1);
\r
1251 m_bEmpty = (GetItemCount() == 0);
\r
1257 void CGitStatusListCtrl::Show(DWORD dwShow, const CTGitPathList& checkedList, bool bShowFolders /* = true */)
\r
1262 Locker lock(m_critSec);
\r
1263 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), GetUserDefaultLangID());
\r
1265 CWinApp * pApp = AfxGetApp();
\r
1267 pApp->DoWaitCursor(1);
\r
1268 m_dwShow = dwShow;
\r
1269 m_bShowFolders = bShowFolders;
\r
1271 int nTopIndex = GetTopIndex();
\r
1272 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
\r
1273 int nSelectedEntry = 0;
\r
1274 if (posSelectedEntry)
\r
1275 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
\r
1281 m_arListArray.clear();
\r
1283 m_arListArray.reserve(m_arStatusArray.size());
\r
1284 SetItemCount (static_cast<int>(m_arStatusArray.size()));
\r
1286 int listIndex = 0;
\r
1287 for (size_t i=0; i < m_arStatusArray.size(); ++i)
\r
1289 FileEntry * entry = m_arStatusArray[i];
\r
1290 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
\r
1292 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
\r
1294 if (entry->IsFolder() && (!bShowFolders))
\r
1295 continue; // don't show folders if they're not wanted.
\r
1297 git_wc_status_kind status = SVNStatus::GetMoreImportant(entry->status, entry->remotestatus);
\r
1298 DWORD showFlags = GetShowFlagsFromSVNStatus(status);
\r
1299 if (entry->IsLocked())
\r
1300 showFlags |= SVNSLC_SHOWLOCKS;
\r
1301 if (!entry->changelist.IsEmpty())
\r
1302 showFlags |= SVNSLC_SHOWINCHANGELIST;
\r
1304 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
\r
1305 if (status != git_wc_status_ignored || (entry->direct) || (dwShow & SVNSLC_SHOWIGNORED))
\r
1307 for (int npath = 0; npath < checkedList.GetCount(); ++npath)
\r
1309 if (entry->GetPath().IsEquivalentTo(checkedList[npath]))
\r
1311 entry->checked = true;
\r
1315 if ((!entry->IsFolder()) && (status == git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
\r
1317 if (PathFileExists(entry->GetPath().GetWinPath()))
\r
1319 m_arListArray.push_back(i);
\r
1320 AddEntry(entry, langID, listIndex++);
\r
1323 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
\r
1325 m_arListArray.push_back(i);
\r
1326 AddEntry(entry, langID, listIndex++);
\r
1328 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
\r
1330 m_arListArray.push_back(i);
\r
1331 AddEntry(entry, langID, listIndex++);
\r
1333 else if (entry->switched)
\r
1335 m_arListArray.push_back(i);
\r
1336 AddEntry(entry, langID, listIndex++);
\r
1342 SetItemCount(listIndex);
\r
1344 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1345 for (int col = 0; col <= maxcol; col++)
\r
1346 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1349 GetStatisticsString();
\r
1351 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1352 HDITEM HeaderItem = {0};
\r
1353 HeaderItem.mask = HDI_FORMAT;
\r
1354 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1356 pHeader->GetItem(i, &HeaderItem);
\r
1357 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1358 pHeader->SetItem(i, &HeaderItem);
\r
1360 if (m_nSortedColumn)
\r
1362 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1363 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1364 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1367 if (nSelectedEntry)
\r
1369 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1370 EnsureVisible(nSelectedEntry, false);
\r
1374 // Restore the item at the top of the list.
\r
1375 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1377 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1385 pApp->DoWaitCursor(-1);
\r
1387 m_bEmpty = (GetItemCount() == 0);
\r
1392 int CGitStatusListCtrl::GetColumnIndex(int mask)
\r
1402 void CGitStatusListCtrl::AddEntry(CTGitPath * GitPath, WORD langID, int listIndex)
\r
1404 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
1405 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
1407 CString path = GitPath->GetGitPathString();
\r
1411 int index = listIndex;
\r
1413 CString entryname = GitPath->GetGitPathString();
\r
1415 // if (entry->isfolder)
\r
1416 // icon_idx = m_nIconFolder;
\r
1419 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(*GitPath);
\r
1422 InsertItem(index, entryname, icon_idx);
\r
1424 this->SetItemData(index, (DWORD_PTR)GitPath);
\r
1425 // SVNSLC_COLFILENAME
\r
1426 SetItemText(index, nCol++, GitPath->GetFileOrDirectoryName());
\r
1428 SetItemText(index, nCol++, GitPath->GetFileExtension());
\r
1429 // SVNSLC_COLSTATUS
\r
1430 SetItemText(index, nCol++, GitPath->GetActionName());
\r
1432 SetItemText(index, GetColumnIndex(SVNSLC_COLADD),GitPath->m_StatAdd);
\r
1433 SetItemText(index, GetColumnIndex(SVNSLC_COLDEL),GitPath->m_StatDel);
\r
1436 SetCheck(index, GitPath->m_Checked);
\r
1437 if (GitPath->m_Checked)
\r
1441 if( GitPath->m_Action & CTGitPath::LOGACTIONS_IGNORE)
\r
1442 SetItemGroup(index, 2);
\r
1443 else if( GitPath->m_Action & CTGitPath::LOGACTIONS_UNVER)
\r
1444 SetItemGroup(index,1);
\r
1446 SetItemGroup(index,0);
\r
1452 void CGitStatusListCtrl::AddEntry(FileEntry * entry, WORD langID, int listIndex)
\r
1454 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
1455 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
1457 CString path = entry->GetPath().GetGitPathString();
\r
1458 if ( m_mapFilenameToChecked.size()!=0 && m_mapFilenameToChecked.find(path) != m_mapFilenameToChecked.end() )
\r
1460 // The user manually de-/selected an item. We now restore this status
\r
1461 // when refreshing.
\r
1462 entry->checked = m_mapFilenameToChecked[path];
\r
1467 int index = listIndex;
\r
1469 CString entryname = entry->GetDisplayName();
\r
1471 if (entry->isfolder)
\r
1472 icon_idx = m_nIconFolder;
\r
1475 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(entry->path);
\r
1478 InsertItem(index, entryname, icon_idx);
\r
1479 // SVNSLC_COLFILENAME
\r
1480 SetItemText(index, nCol++, entry->path.GetFileOrDirectoryName());
\r
1482 SetItemText(index, nCol++, entry->path.GetFileExtension());
\r
1483 // SVNSLC_COLSTATUS
\r
1484 if (entry->isNested)
\r
1486 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1487 SetItemText(index, nCol++, sTemp);
\r
1491 GitStatus::GetStatusString(hResourceHandle, entry->status, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1492 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1493 _tcscat_s(buf, 100, _T(" (+)"));
\r
1494 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1495 _tcscat_s(buf, 100, _T(" (s)"));
\r
1497 if ((entry->status == entry->propstatus)&&
\r
1498 (entry->status != git_wc_status_normal)&&
\r
1499 (entry->status != git_wc_status_unversioned)&&
\r
1500 (!GitStatus::IsImportant(entry->textstatus)))
\r
1501 _tcscat_s(buf, 100, ponly);
\r
1503 SetItemText(index, nCol++, buf);
\r
1505 // SVNSLC_COLREMOTESTATUS
\r
1506 if (entry->isNested)
\r
1508 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1509 SetItemText(index, nCol++, sTemp);
\r
1514 SVNStatus::GetStatusString(hResourceHandle, entry->remotestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1515 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1516 _tcscat_s(buf, 100, _T(" (+)"));
\r
1517 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1518 _tcscat_s(buf, 100, _T(" (s)"));
\r
1519 if ((entry->remotestatus == entry->remotepropstatus)&&
\r
1520 (entry->remotestatus != git_wc_status_none)&&
\r
1521 (entry->remotestatus != git_wc_status_normal)&&
\r
1522 (entry->remotestatus != git_wc_status_unversioned)&&
\r
1523 (!SVNStatus::IsImportant(entry->remotetextstatus)))
\r
1524 _tcscat_s(buf, 100, ponly);
\r
1526 SetItemText(index, nCol++, buf);
\r
1528 // SVNSLC_COLTEXTSTATUS
\r
1529 if (entry->isNested)
\r
1531 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1532 SetItemText(index, nCol++, sTemp);
\r
1537 SVNStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1538 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1539 _tcscat_s(buf, 100, _T(" (+)"));
\r
1540 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1541 _tcscat_s(buf, 100, _T(" (s)"));
\r
1543 SetItemText(index, nCol++, buf);
\r
1545 // SVNSLC_COLPROPSTATUS
\r
1546 if (entry->isNested)
\r
1548 SetItemText(index, nCol++, _T(""));
\r
1553 SVNStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1554 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1555 _tcscat_s(buf, 100, _T(" (+)"));
\r
1556 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1557 _tcscat_s(buf, 100, _T(" (s)"));
\r
1559 SetItemText(index, nCol++, buf);
\r
1561 // SVNSLC_COLREMOTETEXT
\r
1562 if (entry->isNested)
\r
1564 SetItemText(index, nCol++, _T(""));
\r
1569 SVNStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1570 SetItemText(index, nCol++, buf);
\r
1573 // SVNSLC_COLREMOTEPROP
\r
1574 if (entry->isNested)
\r
1576 SetItemText(index, nCol++, _T(""));
\r
1580 // SVNStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1581 SetItemText(index, nCol++, buf);
\r
1584 // SetItemText(index, nCol++, entry->url);
\r
1587 if (!m_HeadRev.IsHead())
\r
1589 // we have contacted the repository
\r
1591 // decision-matrix
\r
1592 // wc repository text
\r
1595 // UID1 UID1 owner
\r
1596 // UID1 "" lock has been broken
\r
1597 // UID1 UID2 lock has been stolen
\r
1598 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))
\r
1600 if (entry->lock_owner.IsEmpty())
\r
1601 SetItemText(index, nCol++, entry->lock_remoteowner);
\r
1603 SetItemText(index, nCol++, entry->lock_owner);
\r
1605 else if (entry->lock_remotetoken.IsEmpty())
\r
1608 CString temp(MAKEINTRESOURCE(IDS_STATUSLIST_LOCKBROKEN));
\r
1609 SetItemText(index, nCol++, temp);
\r
1615 temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);
\r
1616 SetItemText(index, nCol++, temp);
\r
1620 SetItemText(index, nCol++, entry->lock_owner);
\r
1621 // SVNSLC_COLLOCKCOMMENT
\r
1622 SetItemText(index, nCol++, entry->lock_comment);
\r
1623 // SVNSLC_COLAUTHOR
\r
1624 SetItemText(index, nCol++, entry->last_commit_author);
\r
1625 // SVNSLC_COLREVISION
\r
1627 temp.Format(_T("%ld"), entry->last_commit_rev);
\r
1628 if (entry->last_commit_rev > 0)
\r
1629 SetItemText(index, nCol++, temp);
\r
1631 SetItemText(index, nCol++, _T(""));
\r
1632 // SVNSLC_COLREMOTEREVISION
\r
1633 temp.Format(_T("%ld"), entry->remoterev);
\r
1634 if (entry->remoterev > 0)
\r
1635 SetItemText(index, nCol++, temp);
\r
1637 SetItemText(index, nCol++, _T(""));
\r
1639 TCHAR datebuf[SVN_DATE_BUFFER];
\r
1640 apr_time_t date = entry->last_commit_date;
\r
1641 SVN::formatDate(datebuf, date, true);
\r
1643 SetItemText(index, nCol++, datebuf);
\r
1645 SetItemText(index, nCol++, _T(""));
\r
1646 // SVNSLC_COLSVNNEEDSLOCK
\r
1647 BOOL bFoundSVNNeedsLock = entry->present_props.IsNeedsLockSet();
\r
1648 CString strSVNNeedsLock = (bFoundSVNNeedsLock) ? _T("*") : _T("");
\r
1649 SetItemText(index, nCol++, strSVNNeedsLock);
\r
1650 // SVNSLC_COLCOPYFROM
\r
1651 if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)
\r
1652 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());
\r
1654 temp = entry->copyfrom_url;
\r
1655 SetItemText(index, nCol++, temp);
\r
1656 // SVNSLC_COLMODIFICATIONDATE
\r
1657 __int64 filetime = entry->GetPath().GetLastWriteTime();
\r
1658 if ( (filetime) && (entry->status!=git_wc_status_deleted) )
\r
1660 FILETIME* f = (FILETIME*)(__int64*)&filetime;
\r
1661 TCHAR datebuf[SVN_DATE_BUFFER];
\r
1662 SVN::formatDate(datebuf,*f,true);
\r
1663 SetItemText(index, nCol++, datebuf);
\r
1667 SetItemText(index, nCol++, _T(""));
\r
1670 // user-defined properties
\r
1671 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
\r
1675 assert (i == nCol++);
\r
1676 assert (m_ColumnManager.IsUserProp (i));
\r
1678 CString name = m_ColumnManager.GetName(i);
\r
1679 if (entry->present_props.HasProperty (name))
\r
1681 const CString& propVal = entry->present_props [name];
\r
1682 if (propVal.IsEmpty())
\r
1683 SetItemText(index, i, m_sNoPropValueText);
\r
1685 SetItemText(index, i, propVal);
\r
1688 SetItemText(index, i, _T(""));
\r
1691 SetCheck(index, entry->checked);
\r
1692 if (entry->checked)
\r
1694 if (m_changelists.find(entry->changelist) != m_changelists.end())
\r
1695 SetItemGroup(index, m_changelists[entry->changelist]);
\r
1697 SetItemGroup(index, 0);
\r
1702 bool CGitStatusListCtrl::SetItemGroup(int item, int groupindex)
\r
1704 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS) == NULL)
\r
1706 if (groupindex < 0)
\r
1709 i.mask = LVIF_GROUPID;
\r
1712 i.iGroupId = groupindex;
\r
1714 return !!SetItem(&i);
\r
1717 void CGitStatusListCtrl::Sort()
\r
1719 Locker lock(m_critSec);
\r
1721 CSorter predicate (&m_ColumnManager, m_nSortedColumn, m_bAscending);
\r
1723 std::sort(m_arStatusArray.begin(), m_arStatusArray.end(), predicate);
\r
1724 SaveColumnWidths();
\r
1725 Show(m_dwShow, 0, m_bShowFolders);
\r
1729 void CGitStatusListCtrl::OnHdnItemclick(NMHDR *pNMHDR, LRESULT *pResult)
\r
1731 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
1736 if (m_nSortedColumn == phdr->iItem)
\r
1737 m_bAscending = !m_bAscending;
\r
1739 m_bAscending = TRUE;
\r
1740 m_nSortedColumn = phdr->iItem;
\r
1741 m_mapFilenameToChecked.clear();
\r
1744 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1745 HDITEM HeaderItem = {0};
\r
1746 HeaderItem.mask = HDI_FORMAT;
\r
1747 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1749 pHeader->GetItem(i, &HeaderItem);
\r
1750 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1751 pHeader->SetItem(i, &HeaderItem);
\r
1753 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1754 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1755 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1757 // the checked state of the list control items must be restored
\r
1759 for (int i=0; i<GetItemCount(); ++i)
\r
1761 CTGitPath * entry = (CTGitPath*)GetItemData(i);
\r
1762 SetCheck(i, entry->m_Checked);
\r
1768 void CGitStatusListCtrl::OnLvnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
\r
1770 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1773 #define ISCHECKED(x) ((x) ? ((((x)&LVIS_STATEIMAGEMASK)>>12)-1) : FALSE)
\r
1774 if ((m_bBlock)&&(m_bBlockUI))
\r
1776 // if we're blocked, prevent changing of the check state
\r
1777 if ((!ISCHECKED(pNMLV->uOldState) && ISCHECKED(pNMLV->uNewState))||
\r
1778 (ISCHECKED(pNMLV->uOldState) && !ISCHECKED(pNMLV->uNewState)))
\r
1783 BOOL CGitStatusListCtrl::OnLvnItemchanged(NMHDR *pNMHDR, LRESULT *pResult)
\r
1785 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1787 if ((pNMLV->uNewState==0)||(pNMLV->uNewState & LVIS_SELECTED)||(pNMLV->uNewState & LVIS_FOCUSED))
\r
1793 bool bSelected = !!(ListView_GetItemState(m_hWnd, pNMLV->iItem, LVIS_SELECTED) & LVIS_SELECTED);
\r
1794 int nListItems = GetItemCount();
\r
1797 // was the item checked?
\r
1799 //CTGitPath *gitpath=(CTGitPath*)GetItemData(pNMLV->iItem);
\r
1800 //gitpath->m_Checked=GetCheck(pNMLV->iItem);
\r
1802 if (GetCheck(pNMLV->iItem))
\r
1804 CheckEntry(pNMLV->iItem, nListItems);
\r
1807 POSITION pos = GetFirstSelectedItemPosition();
\r
1809 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
1811 if (index != pNMLV->iItem)
\r
1812 CheckEntry(index, nListItems);
\r
1818 UncheckEntry(pNMLV->iItem, nListItems);
\r
1821 POSITION pos = GetFirstSelectedItemPosition();
\r
1823 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
1825 if (index != pNMLV->iItem)
\r
1826 UncheckEntry(index, nListItems);
\r
1831 GetStatisticsString();
\r
1838 void CGitStatusListCtrl::OnColumnResized(NMHDR *pNMHDR, LRESULT *pResult)
\r
1840 LPNMHEADER header = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
1841 if ( (header != NULL)
\r
1842 && (header->iItem >= 0)
\r
1843 && (header->iItem < m_ColumnManager.GetColumnCount()))
\r
1845 m_ColumnManager.ColumnResized (header->iItem);
\r
1851 void CGitStatusListCtrl::OnColumnMoved(NMHDR *pNMHDR, LRESULT *pResult)
\r
1853 LPNMHEADER header = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
1855 if ( (header != NULL)
\r
1856 && (header->iItem >= 0)
\r
1857 && (header->iItem < m_ColumnManager.GetColumnCount())
\r
1858 // only allow the reordering if the column was not moved left of the first
\r
1859 // visible item - otherwise the 'invisible' columns are not at the far left
\r
1860 // anymore and we get all kinds of redrawing problems.
\r
1861 && (header->pitem)
\r
1862 && (header->pitem->iOrder > m_ColumnManager.GetInvisibleCount()))
\r
1864 m_ColumnManager.ColumnMoved (header->iItem, header->pitem->iOrder);
\r
1868 Invalidate(FALSE);
\r
1871 void CGitStatusListCtrl::CheckEntry(int index, int nListItems)
\r
1873 Locker lock(m_critSec);
\r
1874 //FileEntry * entry = GetListEntry(index);
\r
1875 CTGitPath *path=(CTGitPath*)GetItemData(index);
\r
1876 ASSERT(path != NULL);
\r
1879 SetCheck(index, TRUE);
\r
1880 //entry = GetListEntry(index);
\r
1881 // if an unversioned item was checked, then we need to check if
\r
1882 // the parent folders are unversioned too. If the parent folders actually
\r
1883 // are unversioned, then check those too.
\r
1885 if (entry->status == git_wc_status_unversioned)
\r
1887 // we need to check the parent folder too
\r
1888 const CTGitPath& folderpath = entry->path;
\r
1889 for (int i=0; i< nListItems; ++i)
\r
1891 FileEntry * testEntry = GetListEntry(i);
\r
1892 ASSERT(testEntry != NULL);
\r
1893 if (testEntry == NULL)
\r
1895 if (!testEntry->checked)
\r
1897 if (testEntry->path.IsAncestorOf(folderpath) && (!testEntry->path.IsEquivalentTo(folderpath)))
\r
1899 SetEntryCheck(testEntry,i,true);
\r
1905 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
1906 if ( (entry->status == git_wc_status_deleted) || (m_bCheckChildrenWithParent) || (bShift) )
\r
1908 // if a deleted folder gets checked, we have to check all
\r
1909 // children of that folder too.
\r
1910 if (entry->path.IsDirectory())
\r
1912 SetCheckOnAllDescendentsOf(entry, true);
\r
1915 // if a deleted file or folder gets checked, we have to
\r
1916 // check all parents of this item too.
\r
1917 for (int i=0; i<nListItems; ++i)
\r
1919 FileEntry * testEntry = GetListEntry(i);
\r
1920 ASSERT(testEntry != NULL);
\r
1921 if (testEntry == NULL)
\r
1923 if (!testEntry->checked)
\r
1925 if (testEntry->path.IsAncestorOf(entry->path) && (!testEntry->path.IsEquivalentTo(entry->path)))
\r
1927 if ((testEntry->status == git_wc_status_deleted)||(m_bCheckChildrenWithParent))
\r
1929 SetEntryCheck(testEntry,i,true);
\r
1931 // now we need to check all children of this parent folder
\r
1932 SetCheckOnAllDescendentsOf(testEntry, true);
\r
1939 if ( !path->m_Checked )
\r
1941 path->m_Checked = TRUE;
\r
1946 void CGitStatusListCtrl::UncheckEntry(int index, int nListItems)
\r
1948 Locker lock(m_critSec);
\r
1949 CTGitPath *path=(CTGitPath*)GetItemData(index);
\r
1950 ASSERT(path != NULL);
\r
1953 SetCheck(index, FALSE);
\r
1954 //entry = GetListEntry(index);
\r
1955 // item was unchecked
\r
1957 if (entry->path.IsDirectory())
\r
1959 // disable all files within an unselected folder, except when unchecking a folder with property changes
\r
1960 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
1961 if ( (entry->status != git_wc_status_modified) || (bShift) )
\r
1963 SetCheckOnAllDescendentsOf(entry, false);
\r
1966 else if (entry->status == git_wc_status_deleted)
\r
1968 // a "deleted" file was unchecked, so uncheck all parent folders
\r
1969 // and all children of those parents
\r
1970 for (int i=0; i<nListItems; i++)
\r
1972 FileEntry * testEntry = GetListEntry(i);
\r
1973 ASSERT(testEntry != NULL);
\r
1974 if (testEntry == NULL)
\r
1976 if (testEntry->checked)
\r
1978 if (testEntry->path.IsAncestorOf(entry->path))
\r
1980 if (testEntry->status == git_wc_status_deleted)
\r
1982 SetEntryCheck(testEntry,i,false);
\r
1985 SetCheckOnAllDescendentsOf(testEntry, false);
\r
1992 if ( path->m_Checked )
\r
1994 path->m_Checked = FALSE;
\r
1999 bool CGitStatusListCtrl::EntryPathCompareNoCase(const FileEntry* pEntry1, const FileEntry* pEntry2)
\r
2001 return pEntry1->path < pEntry2->path;
\r
2004 bool CGitStatusListCtrl::IsEntryVersioned(const FileEntry* pEntry1)
\r
2006 return pEntry1->status != git_wc_status_unversioned;
\r
2009 bool CGitStatusListCtrl::BuildStatistics()
\r
2012 bool bRefetchStatus = false;
\r
2013 FileEntryVector::iterator itFirstUnversionedEntry;
\r
2014 itFirstUnversionedEntry = std::partition(m_arStatusArray.begin(), m_arStatusArray.end(), IsEntryVersioned);
\r
2015 if (m_bUnversionedLast)
\r
2017 // We partition the list of items so that it's arrange with all the versioned items first
\r
2018 // then all the unversioned items afterwards.
\r
2019 // Then we sort the versioned part of this, so that we can do quick look-ups in it
\r
2020 std::sort(m_arStatusArray.begin(), itFirstUnversionedEntry, EntryPathCompareNoCase);
\r
2021 // Also sort the unversioned section, to make the list look nice...
\r
2022 std::sort(itFirstUnversionedEntry, m_arStatusArray.end(), EntryPathCompareNoCase);
\r
2025 // now gather some statistics
\r
2026 m_nUnversioned = 0;
\r
2031 m_nConflicted = 0;
\r
2034 for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2036 const FileEntry * entry = m_arStatusArray[i];
\r
2039 switch (entry->status)
\r
2041 case git_wc_status_normal:
\r
2044 case git_wc_status_added:
\r
2047 case git_wc_status_missing:
\r
2048 case git_wc_status_deleted:
\r
2051 case git_wc_status_replaced:
\r
2052 case git_wc_status_modified:
\r
2053 case git_wc_status_merged:
\r
2056 case git_wc_status_conflicted:
\r
2057 case git_wc_status_obstructed:
\r
2060 case git_wc_status_ignored:
\r
2066 if (GitStatus::IsImportant(entry->remotestatus))
\r
2069 // If an entry is in an unversioned folder, we don't have to do an expensive array search
\r
2070 // to find out if it got case-renamed: an unversioned folder can't have versioned files
\r
2071 // But nested folders are also considered to be in unversioned folders, we have to do the
\r
2072 // check in that case too, otherwise we would miss case-renamed folders - they show up
\r
2073 // as nested folders.
\r
2074 if (((!entry->inunversionedfolder)||(entry->isNested))&&(m_bUnversionedLast))
\r
2076 // check if the unversioned item is just
\r
2077 // a file differing in case but still versioned
\r
2078 FileEntryVector::iterator itMatchingItem;
\r
2079 if(std::binary_search(m_arStatusArray.begin(), itFirstUnversionedEntry, entry, EntryPathCompareNoCase))
\r
2081 // We've confirmed that there *is* a matching file
\r
2082 // Find its exact location
\r
2083 FileEntryVector::iterator itMatchingItem;
\r
2084 itMatchingItem = std::lower_bound(m_arStatusArray.begin(), itFirstUnversionedEntry, entry, EntryPathCompareNoCase);
\r
2086 // adjust the case of the filename
\r
2087 if (MoveFileEx(entry->path.GetWinPath(), (*itMatchingItem)->path.GetWinPath(), MOVEFILE_REPLACE_EXISTING))
\r
2089 // We successfully adjusted the case in the filename. But there is now a file with status 'missing'
\r
2090 // in the array, because that's the status of the file before we adjusted the case.
\r
2091 // We have to refetch the status of that file.
\r
2092 // Since fetching the status of single files/directories is very expensive and there can be
\r
2093 // multiple case-renames here, we just set a flag and refetch the status at the end from scratch.
\r
2094 bRefetchStatus = true;
\r
2096 m_arStatusArray.erase(m_arStatusArray.begin()+i);
\r
2100 // now that we removed an unversioned item from the array, find the first unversioned item in the 'new'
\r
2102 itFirstUnversionedEntry = std::partition(m_arStatusArray.begin(), m_arStatusArray.end(), IsEntryVersioned);
\r
2110 } // switch (entry->status)
\r
2112 } // for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2113 return !bRefetchStatus;
\r
2118 void CGitStatusListCtrl::GetMinMaxRevisions(git_revnum_t& rMin, git_revnum_t& rMax, bool bShownOnly, bool bCheckedOnly)
\r
2121 Locker lock(m_critSec);
\r
2125 if ((bShownOnly)||(bCheckedOnly))
\r
2127 for (int i=0; i<GetItemCount(); ++i)
\r
2129 const FileEntry * entry = GetListEntry(i);
\r
2131 if ((entry)&&(entry->last_commit_rev))
\r
2133 if ((!bCheckedOnly)||(entry->IsChecked()))
\r
2135 if (entry->last_commit_rev >= 0)
\r
2137 rMin = min(rMin, entry->last_commit_rev);
\r
2138 rMax = max(rMax, entry->last_commit_rev);
\r
2146 for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2148 const FileEntry * entry = m_arStatusArray[i];
\r
2149 if ((entry)&&(entry->last_commit_rev))
\r
2151 if (entry->last_commit_rev >= 0)
\r
2153 rMin = min(rMin, entry->last_commit_rev);
\r
2154 rMax = max(rMax, entry->last_commit_rev);
\r
2159 if (rMin == LONG_MAX)
\r
2164 int CGitStatusListCtrl::GetGroupFromPoint(POINT * ppt)
\r
2166 // the point must be relative to the upper left corner of the control
\r
2170 if (!IsGroupViewEnabled())
\r
2178 GetWindowRect(&rc);
\r
2179 while (((flags & LVHT_BELOW) == 0)&&(pt.y < rc.bottom))
\r
2181 nItem = HitTest(pt, &flags);
\r
2182 if ((flags & LVHT_ONITEM)||(flags & LVHT_EX_GROUP_HEADER))
\r
2184 // the first item below the point
\r
2186 // check if the point is too much right (i.e. if the point
\r
2187 // is farther to the right than the width of the item)
\r
2189 GetItemRect(nItem, &r, LVIR_LABEL);
\r
2190 if (ppt->x > r.right)
\r
2194 lv.mask = LVIF_GROUPID;
\r
2197 int groupID = lv.iGroupId;
\r
2198 // now we search upwards and check if the item above this one
\r
2199 // belongs to another group. If it belongs to the same group,
\r
2200 // we're not over a group header
\r
2204 nItem = HitTest(pt, &flags);
\r
2205 if ((flags & LVHT_ONITEM)&&(nItem >= 0))
\r
2207 // the first item below the point
\r
2209 lv.mask = LVIF_GROUPID;
\r
2212 if (lv.iGroupId != groupID)
\r
2227 void CGitStatusListCtrl::OnContextMenuGroup(CWnd * /*pWnd*/, CPoint point)
\r
2229 POINT clientpoint = point;
\r
2230 ScreenToClient(&clientpoint);
\r
2231 if ((IsGroupViewEnabled())&&(GetGroupFromPoint(&clientpoint) >= 0))
\r
2234 if (popup.CreatePopupMenu())
\r
2237 temp.LoadString(IDS_STATUSLIST_CHECKGROUP);
\r
2238 popup.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CHECKGROUP, temp);
\r
2239 temp.LoadString(IDS_STATUSLIST_UNCHECKGROUP);
\r
2240 popup.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_UNCHECKGROUP, temp);
\r
2241 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2242 bool bCheck = false;
\r
2245 case IDSVNLC_CHECKGROUP:
\r
2247 // fall through here
\r
2248 case IDSVNLC_UNCHECKGROUP:
\r
2250 int group = GetGroupFromPoint(&clientpoint);
\r
2251 // go through all items and check/uncheck those assigned to the group
\r
2252 // but block the OnLvnItemChanged handler
\r
2255 for (int i=0; i<GetItemCount(); ++i)
\r
2257 SecureZeroMemory(&lv, sizeof(LVITEM));
\r
2258 lv.mask = LVIF_GROUPID;
\r
2262 if (lv.iGroupId == group)
\r
2264 FileEntry * entry = GetListEntry(i);
\r
2267 bool bOldCheck = !!GetCheck(i);
\r
2268 //SetEntryCheck(entry, i, bCheck);
\r
2269 if (bCheck != bOldCheck)
\r
2280 GetStatisticsString();
\r
2290 void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
\r
2293 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
2295 bool XPorLater = false;
\r
2296 OSVERSIONINFOEX inf;
\r
2297 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
2298 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
2299 GetVersionEx((OSVERSIONINFO *)&inf);
\r
2300 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
2301 if (fullver >= 0x0501)
\r
2303 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
2304 CTGitPath * filepath;
\r
2306 int selIndex = GetSelectionMark();
\r
2307 if ((point.x == -1) && (point.y == -1))
\r
2310 GetItemRect(selIndex, &rect, LVIR_LABEL);
\r
2311 ClientToScreen(&rect);
\r
2312 point = rect.CenterPoint();
\r
2314 if ((GetSelectedCount() == 0)&&(XPorLater)&&(m_bHasCheckboxes))
\r
2316 // nothing selected could mean the context menu is requested for
\r
2318 OnContextMenuGroup(pWnd, point);
\r
2320 else if (selIndex >= 0)
\r
2322 //FileEntry * entry = GetListEntry(selIndex);
\r
2324 filepath = (CTGitPath * )GetItemData(selIndex);
\r
2326 ASSERT(filepath != NULL);
\r
2327 if (filepath == NULL)
\r
2330 //const CTGitPath& filepath = entry->path;
\r
2331 int wcStatus = filepath->m_Action;
\r
2332 // entry is selected, now show the popup menu
\r
2333 Locker lock(m_critSec);
\r
2335 CMenu changelistSubMenu;
\r
2336 CMenu ignoreSubMenu;
\r
2337 if (popup.CreatePopupMenu())
\r
2339 //Add Menu for verion controled file
\r
2340 if (!(wcStatus &CTGitPath::LOGACTIONS_UNVER))
\r
2342 if (m_dwContextMenus & SVNSLC_POPCOMPAREWITHBASE)
\r
2344 popup.AppendMenuIcon(IDSVNLC_COMPARE, IDS_LOG_COMPAREWITHBASE, IDI_DIFF);
\r
2345 popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2347 //Select one items
\r
2348 if (GetSelectedCount() == 1)
\r
2350 bool bEntryAdded = false;
\r
2351 //if (entry->remotestatus <= git_wc_status_normal)
\r
2353 // if (wcStatus > git_wc_status_normal)
\r
2355 // if ((m_dwContextMenus & SVNSLC_POPGNUDIFF)&&(wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing))
\r
2357 popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
\r
2358 bEntryAdded = true;
\r
2363 //else if (wcStatus != git_wc_status_deleted)
\r
2365 // if (m_dwContextMenus & SVNSLC_POPCOMPARE)
\r
2367 // popup.AppendMenuIcon(IDSVNLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
\r
2368 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2369 // bEntryAdded = true;
\r
2371 // if (m_dwContextMenus & SVNSLC_POPGNUDIFF)
\r
2373 // popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
\r
2374 // bEntryAdded = true;
\r
2378 popup.AppendMenu(MF_SEPARATOR);
\r
2380 //else if (GetSelectedCount() > 1)
\r
2382 // if (m_dwContextMenus & SVNSLC_POPCOMMIT)
\r
2384 // popup.AppendMenuIcon(IDSVNLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);
\r
2385 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2390 ///Select Multi item
\r
2391 //if (GetSelectedCount() > 0)
\r
2393 // if ((GetSelectedCount() == 2)&&(m_dwContextMenus & SVNSLC_POPREPAIRMOVE))
\r
2395 // POSITION pos = GetFirstSelectedItemPosition();
\r
2396 // int index = GetNextSelectedItem(pos);
\r
2397 // if (index >= 0)
\r
2399 // FileEntry * entry = GetListEntry(index);
\r
2400 // git_wc_status_kind status1 = git_wc_status_none;
\r
2401 // git_wc_status_kind status2 = git_wc_status_none;
\r
2403 // status1 = entry->status;
\r
2404 // index = GetNextSelectedItem(pos);
\r
2405 // if (index >= 0)
\r
2407 // entry = GetListEntry(index);
\r
2409 // status2 = entry->status;
\r
2410 // if ((status1 == git_wc_status_missing && status2 == git_wc_status_unversioned) ||
\r
2411 // (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned))
\r
2413 // popup.AppendMenuIcon(IDSVNLC_REPAIRMOVE, IDS_STATUSLIST_CONTEXT_REPAIRMOVE);
\r
2418 // if (wcStatus > git_wc_status_normal)
\r
2420 // if (m_dwContextMenus & SVNSLC_POPREVERT)
\r
2422 // // reverting missing folders is not possible
\r
2423 // if (!entry->IsFolder() || (wcStatus != git_wc_status_missing))
\r
2425 // popup.AppendMenuIcon(IDSVNLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
\r
2429 // if (entry->remotestatus > git_wc_status_normal)
\r
2431 // if (m_dwContextMenus & SVNSLC_POPUPDATE)
\r
2433 // popup.AppendMenuIcon(IDSVNLC_UPDATE, IDS_MENUUPDATE, IDI_UPDATE);
\r
2437 if ((GetSelectedCount() == 1)&&(!wcStatus & CTGitPath::LOGACTIONS_UNVER)
\r
2438 &&(!wcStatus & CTGitPath::LOGACTIONS_IGNORE))
\r
2440 if (m_dwContextMenus & SVNSLC_POPSHOWLOG)
\r
2442 popup.AppendMenuIcon(IDSVNLC_LOG, IDS_REPOBROWSE_SHOWLOG, IDI_LOG);
\r
2444 // if (m_dwContextMenus & SVNSLC_POPBLAME)
\r
2446 // popup.AppendMenuIcon(IDSVNLC_BLAME, IDS_MENUBLAME, IDI_BLAME);
\r
2449 // if ((wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing) && (GetSelectedCount() == 1))
\r
2451 if (m_dwContextMenus & SVNSLC_POPOPEN)
\r
2453 popup.AppendMenuIcon(IDSVNLC_OPEN, IDS_REPOBROWSE_OPEN, IDI_OPEN);
\r
2454 popup.AppendMenuIcon(IDSVNLC_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
\r
2456 if (m_dwContextMenus & SVNSLC_POPEXPLORE)
\r
2458 popup.AppendMenuIcon(IDSVNLC_EXPLORE, IDS_STATUSLIST_CONTEXT_EXPLORE, IDI_EXPLORER);
\r
2461 if (GetSelectedCount() > 0)
\r
2463 // if (((wcStatus == git_wc_status_unversioned)||(wcStatus == git_wc_status_ignored))&&(m_dwContextMenus & SVNSLC_POPDELETE))
\r
2465 // popup.AppendMenuIcon(IDSVNLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
\r
2467 // 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
2470 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVEKEEP, IDI_DELETE);
\r
2472 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVE, IDI_DELETE);
\r
2474 if ((wcStatus & CTGitPath::LOGACTIONS_UNVER)/*||(wcStatus == git_wc_status_deleted)*/)
\r
2476 if (m_dwContextMenus & SVNSLC_POPADD)
\r
2478 //if ( entry->IsFolder() )
\r
2480 // popup.AppendMenuIcon(IDSVNLC_ADD_RECURSIVE, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE, IDI_ADD);
\r
2484 popup.AppendMenuIcon(IDSVNLC_ADD, IDS_STATUSLIST_CONTEXT_ADD, IDI_ADD);
\r
2488 //if ( (wcStatus == git_wc_status_unversioned) || (wcStatus == git_wc_status_deleted) )
\r
2490 if (m_dwContextMenus & SVNSLC_POPIGNORE)
\r
2493 CTGitPathList ignorelist;
\r
2494 FillListOfSelectedItemPaths(ignorelist);
\r
2495 //check if all selected entries have the same extension
\r
2496 bool bSameExt = true;
\r
2498 for (int i=0; i<ignorelist.GetCount(); ++i)
\r
2500 if (sExt.IsEmpty() && (i==0))
\r
2501 sExt = ignorelist[i].GetFileExtension();
\r
2502 else if (sExt.CompareNoCase(ignorelist[i].GetFileExtension())!=0)
\r
2507 if (ignoreSubMenu.CreateMenu())
\r
2509 CString ignorepath;
\r
2510 if (ignorelist.GetCount()==1)
\r
2511 ignorepath = ignorelist[0].GetFileOrDirectoryName();
\r
2513 ignorepath.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
\r
2514 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_IGNORE, ignorepath);
\r
2515 ignorepath = _T("*")+sExt;
\r
2516 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_IGNOREMASK, ignorepath);
\r
2518 temp.LoadString(IDS_MENUIGNORE);
\r
2519 popup.InsertMenu((UINT)-1, MF_BYPOSITION | MF_POPUP, (UINT_PTR)ignoreSubMenu.m_hMenu, temp);
\r
2525 if (ignorelist.GetCount()==1)
\r
2527 temp.LoadString(IDS_MENUIGNORE);
\r
2531 temp.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
\r
2533 popup.AppendMenuIcon(IDSVNLC_IGNORE, temp, IDI_IGNORE);
\r
2539 if (((wcStatus == git_wc_status_conflicted)||(entry->isConflicted)))
\r
2541 if ((m_dwContextMenus & SVNSLC_POPCONFLICT)||(m_dwContextMenus & SVNSLC_POPRESOLVE))
\r
2542 popup.AppendMenu(MF_SEPARATOR);
\r
2544 if ((m_dwContextMenus & SVNSLC_POPCONFLICT)&&(entry->textstatus == git_wc_status_conflicted))
\r
2546 popup.AppendMenuIcon(IDSVNLC_EDITCONFLICT, IDS_MENUCONFLICT, IDI_CONFLICT);
\r
2548 if (m_dwContextMenus & SVNSLC_POPRESOLVE)
\r
2550 popup.AppendMenuIcon(IDSVNLC_RESOLVECONFLICT, IDS_STATUSLIST_CONTEXT_RESOLVED, IDI_RESOLVE);
\r
2552 if ((m_dwContextMenus & SVNSLC_POPRESOLVE)&&(entry->textstatus == git_wc_status_conflicted))
\r
2554 popup.AppendMenuIcon(IDSVNLC_RESOLVETHEIRS, IDS_SVNPROGRESS_MENUUSETHEIRS, IDI_RESOLVE);
\r
2555 popup.AppendMenuIcon(IDSVNLC_RESOLVEMINE, IDS_SVNPROGRESS_MENUUSEMINE, IDI_RESOLVE);
\r
2560 if (GetSelectedCount() > 0)
\r
2563 if ((!entry->IsFolder())&&(wcStatus >= git_wc_status_normal)
\r
2564 &&(wcStatus!=git_wc_status_missing)&&(wcStatus!=git_wc_status_deleted)
\r
2565 &&(wcStatus!=git_wc_status_added))
\r
2567 popup.AppendMenu(MF_SEPARATOR);
\r
2568 if ((entry->lock_token.IsEmpty())&&(!entry->IsFolder()))
\r
2570 if (m_dwContextMenus & SVNSLC_POPLOCK)
\r
2572 popup.AppendMenuIcon(IDSVNLC_LOCK, IDS_MENU_LOCK, IDI_LOCK);
\r
2575 if ((!entry->lock_token.IsEmpty())&&(!entry->IsFolder()))
\r
2577 if (m_dwContextMenus & SVNSLC_POPUNLOCK)
\r
2579 popup.AppendMenuIcon(IDSVNLC_UNLOCK, IDS_MENU_UNLOCK, IDI_UNLOCK);
\r
2584 if ((!entry->IsFolder())&&((!entry->lock_token.IsEmpty())||(!entry->lock_remotetoken.IsEmpty())))
\r
2586 if (m_dwContextMenus & SVNSLC_POPUNLOCKFORCE)
\r
2588 popup.AppendMenuIcon(IDSVNLC_UNLOCKFORCE, IDS_MENU_UNLOCKFORCE, IDI_UNLOCK);
\r
2592 if (wcStatus != git_wc_status_missing && wcStatus != git_wc_status_deleted &&wcStatus!=git_wc_status_unversioned)
\r
2594 popup.AppendMenu(MF_SEPARATOR);
\r
2595 popup.AppendMenuIcon(IDSVNLC_PROPERTIES, IDS_STATUSLIST_CONTEXT_PROPERTIES, IDI_PROPERTIES);
\r
2597 popup.AppendMenu(MF_SEPARATOR);
\r
2598 popup.AppendMenuIcon(IDSVNLC_COPY, IDS_STATUSLIST_CONTEXT_COPY, IDI_COPYCLIP);
\r
2599 popup.AppendMenuIcon(IDSVNLC_COPYEXT, IDS_STATUSLIST_CONTEXT_COPYEXT, IDI_COPYCLIP);
\r
2600 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS)&&(XPorLater)
\r
2601 &&(wcStatus != git_wc_status_unversioned)&&(wcStatus != git_wc_status_none))
\r
2603 popup.AppendMenu(MF_SEPARATOR);
\r
2604 // changelist commands
\r
2605 size_t numChangelists = GetNumberOfChangelistsInSelection();
\r
2606 if (numChangelists > 0)
\r
2608 popup.AppendMenuIcon(IDSVNLC_REMOVEFROMCS, IDS_STATUSLIST_CONTEXT_REMOVEFROMCS);
\r
2610 if ((!entry->IsFolder())&&(changelistSubMenu.CreateMenu()))
\r
2613 temp.LoadString(IDS_STATUSLIST_CONTEXT_CREATECS);
\r
2614 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATECS, temp);
\r
2616 if (entry->changelist.Compare(SVNSLC_IGNORECHANGELIST))
\r
2618 changelistSubMenu.AppendMenu(MF_SEPARATOR);
\r
2619 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATEIGNORECS, SVNSLC_IGNORECHANGELIST);
\r
2622 if (m_changelists.size() > 0)
\r
2624 // find the changelist names
\r
2625 bool bNeedSeparator = true;
\r
2626 int cmdID = IDSVNLC_MOVETOCS;
\r
2627 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
2629 if ((entry->changelist.Compare(it->first))&&(it->first.Compare(SVNSLC_IGNORECHANGELIST)))
\r
2631 if (bNeedSeparator)
\r
2633 changelistSubMenu.AppendMenu(MF_SEPARATOR);
\r
2634 bNeedSeparator = false;
\r
2636 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, cmdID, it->first);
\r
2641 temp.LoadString(IDS_STATUSLIST_CONTEXT_MOVETOCS);
\r
2642 popup.AppendMenu(MF_POPUP|MF_STRING, (UINT_PTR)changelistSubMenu.GetSafeHmenu(), temp);
\r
2647 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2650 AfxGetApp()->DoWaitCursor(1);
\r
2651 int iItemCountBeforeMenuCmd = GetItemCount();
\r
2652 bool bForce = false;
\r
2655 case IDSVNLC_OPEN:
\r
2657 int ret = (int)ShellExecute(this->m_hWnd, NULL, filepath->GetWinPath(), NULL, NULL, SW_SHOW);
\r
2658 if (ret <= HINSTANCE_ERROR)
\r
2660 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
2661 cmd += filepath->GetWinPath();
\r
2662 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
2666 case IDSVNLC_OPENWITH:
\r
2668 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
2669 cmd += filepath->GetWinPathString() + _T(" ");
\r
2670 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
2673 case IDSVNLC_EXPLORE:
\r
2675 ShellExecute(this->m_hWnd, _T("explore"), filepath->GetWinPath(), NULL, NULL, SW_SHOW);
\r
2678 case IDSVNLC_COMPARE:
\r
2680 POSITION pos = GetFirstSelectedItemPosition();
\r
2683 int index = GetNextSelectedItem(pos);
\r
2688 case IDSVNLC_GNUDIFF1:
\r
2690 // SVNDiff diff(NULL, this->m_hWnd, true);
\r
2692 // if (entry->remotestatus <= git_wc_status_normal)
\r
2693 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
\r
2695 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
\r
2696 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,GitRev::GetWorkingCopy(),
\r
2697 *filepath,GitRev::GetHead());
\r
2701 { // The add went ok, but we now need to run through the selected items again
\r
2702 // and update their status
\r
2703 POSITION pos = GetFirstSelectedItemPosition();
\r
2705 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
2707 CTGitPath * path=(CTGitPath*)GetItemData(index);
\r
2709 cmd.Format(_T("git.exe add %s"),path->GetGitPathString());
\r
2711 g_Git.Run(cmd,&output);
\r
2712 path->m_Action = CTGitPath::LOGACTIONS_ADDED;
\r
2713 SetEntryCheck(path,index,true);
\r
2714 SetItemGroup(index,0);
\r
2715 this->m_StatusFileList.AddPath(*path);
\r
2716 this->m_UnRevFileList.RemoveItem(*path);
\r
2717 this->m_IgnoreFileList.RemoveItem(*path);
\r
2723 case IDSVNLC_COPY:
\r
2724 CopySelectedEntriesToClipboard(0);
\r
2726 case IDSVNLC_COPYEXT:
\r
2727 CopySelectedEntriesToClipboard((DWORD)-1);
\r
2729 case IDSVNLC_PROPERTIES:
\r
2731 CTSVNPathList targetList;
\r
2732 FillListOfSelectedItemPaths(targetList);
\r
2733 CEditPropertiesDlg dlg;
\r
2734 dlg.SetPathList(targetList);
\r
2736 if (dlg.HasChanged())
\r
2738 // since the user might have changed/removed/added
\r
2739 // properties recursively, we don't really know
\r
2740 // which items have changed their status.
\r
2741 // So tell the parent to do a refresh.
\r
2742 CWnd* pParent = GetParent();
\r
2743 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
2745 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
2750 case IDSVNLC_COMMIT:
\r
2752 CTSVNPathList targetList;
\r
2753 FillListOfSelectedItemPaths(targetList);
\r
2754 CTSVNPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
\r
2755 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
\r
2756 CString commandline = CPathUtils::GetAppDirectory();
\r
2757 commandline += _T("TortoiseProc.exe /command:commit /pathfile:\"");
\r
2758 commandline += tempFile.GetWinPathString();
\r
2759 commandline += _T("\"");
\r
2760 commandline += _T(" /deletepathfile");
\r
2761 CAppUtils::LaunchApplication(commandline, NULL, false);
\r
2764 case IDSVNLC_REVERT:
\r
2766 // If at least one item is not in the status "added"
\r
2767 // we ask for a confirmation
\r
2768 BOOL bConfirm = FALSE;
\r
2769 POSITION pos = GetFirstSelectedItemPosition();
\r
2771 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
2773 FileEntry * fentry = GetListEntry(index);
\r
2774 if (fentry->textstatus != git_wc_status_added)
\r
2782 str.Format(IDS_PROC_WARNREVERT,GetSelectedCount());
\r
2784 if (!bConfirm || CMessageBox::Show(this->m_hWnd, str, _T("TortoiseSVN"), MB_YESNO | MB_ICONQUESTION)==IDYES)
\r
2786 CTSVNPathList targetList;
\r
2787 FillListOfSelectedItemPaths(targetList);
\r
2789 // make sure that the list is reverse sorted, so that
\r
2790 // children are removed before any parents
\r
2791 targetList.SortByPathname(true);
\r
2795 // put all reverted files in the trashbin, except the ones with 'added'
\r
2796 // status because they are not restored by the revert.
\r
2797 CTSVNPathList delList;
\r
2798 POSITION pos = GetFirstSelectedItemPosition();
\r
2800 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
2802 FileEntry * entry = GetListEntry(index);
\r
2803 if (entry->status != git_wc_status_added)
\r
2804 delList.AddPath(entry->GetPath());
\r
2806 if (DWORD(CRegDWORD(_T("Software\\TortoiseSVN\\RevertWithRecycleBin"), TRUE)))
\r
2807 delList.DeleteAllFiles(true);
\r
2809 if (!git.Revert(targetList, CStringArray(), FALSE))
\r
2811 CMessageBox::Show(this->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
2815 // since the entries got reverted we need to remove
\r
2816 // them from the list too, if no remote changes are shown,
\r
2817 // if the unmodified files are not shown
\r
2818 // and if the item is not part of a changelist
\r
2821 while ((pos = GetFirstSelectedItemPosition())!=0)
\r
2824 index = GetNextSelectedItem(pos);
\r
2825 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
\r
2826 if ( fentry->IsFolder() )
\r
2829 CWnd* pParent = GetParent();
\r
2830 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
2832 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
2837 BOOL bAdded = (fentry->textstatus == git_wc_status_added);
\r
2838 fentry->status = git_wc_status_normal;
\r
2839 fentry->propstatus = git_wc_status_normal;
\r
2840 fentry->textstatus = git_wc_status_normal;
\r
2841 fentry->copied = false;
\r
2842 fentry->isConflicted = false;
\r
2843 if ((fentry->GetChangeList().IsEmpty()&&(fentry->remotestatus <= git_wc_status_normal))||(m_dwShow & SVNSLC_SHOWNORMAL))
\r
2847 // reverting added items makes them unversioned, not 'normal'
\r
2848 if (fentry->IsFolder())
\r
2849 fentry->propstatus = git_wc_status_none;
\r
2851 fentry->propstatus = git_wc_status_unversioned;
\r
2852 fentry->status = git_wc_status_unversioned;
\r
2853 fentry->textstatus = git_wc_status_unversioned;
\r
2854 SetItemState(index, 0, LVIS_SELECTED);
\r
2855 SetEntryCheck(fentry, index, false);
\r
2857 else if ((fentry->switched)||(m_dwShow & SVNSLC_SHOWNORMAL))
\r
2859 SetItemState(index, 0, LVIS_SELECTED);
\r
2864 if (GetCheck(index))
\r
2866 RemoveListEntry(index);
\r
2872 SetItemState(index, 0, LVIS_SELECTED);
\r
2876 SaveColumnWidths();
\r
2877 Show(m_dwShow, 0, m_bShowFolders);
\r
2883 case IDSVNLC_COMPARE:
\r
2885 POSITION pos = GetFirstSelectedItemPosition();
\r
2888 int index = GetNextSelectedItem(pos);
\r
2893 case IDSVNLC_COMPAREWC:
\r
2895 POSITION pos = GetFirstSelectedItemPosition();
\r
2898 int index = GetNextSelectedItem(pos);
\r
2899 FileEntry * entry = GetListEntry(index);
\r
2900 ASSERT(entry != NULL);
\r
2901 if (entry == NULL)
\r
2903 SVNDiff diff(NULL, m_hWnd, true);
\r
2904 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
2905 git_revnum_t baseRev = entry->Revision;
\r
2906 diff.DiffFileAgainstBase(
\r
2907 entry->path, baseRev, entry->textstatus, entry->propstatus);
\r
2911 case IDSVNLC_GNUDIFF1:
\r
2913 SVNDiff diff(NULL, this->m_hWnd, true);
\r
2915 if (entry->remotestatus <= git_wc_status_normal)
\r
2916 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
\r
2918 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
\r
2921 case IDSVNLC_UPDATE:
\r
2923 CTSVNPathList targetList;
\r
2924 FillListOfSelectedItemPaths(targetList);
\r
2925 bool bAllExist = true;
\r
2926 for (int i=0; i<targetList.GetCount(); ++i)
\r
2928 if (!targetList[i].Exists())
\r
2930 bAllExist = false;
\r
2936 CSVNProgressDlg dlg;
\r
2937 dlg.SetCommand(CSVNProgressDlg::SVNProgress_Update);
\r
2938 dlg.SetPathList(targetList);
\r
2939 dlg.SetRevision(SVNRev::REV_HEAD);
\r
2944 CString sTempFile = CTempFiles::Instance().GetTempFilePath(false).GetWinPathString();
\r
2945 targetList.WriteToFile(sTempFile, false);
\r
2947 sCmd.Format(_T("\"%s\" /command:update /rev /pathfile:\"%s\" /deletepathfile"),
\r
2948 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), (LPCTSTR)sTempFile);
\r
2950 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
2957 sCmd.Format(_T("\"%s\" /command:log /path:\"%s\""),
\r
2958 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), filepath.GetWinPath());
\r
2960 if (!filepath.IsUrl())
\r
2962 sCmd += _T(" /propspath:\"");
\r
2963 sCmd += filepath.GetWinPathString();
\r
2967 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
2970 case IDSVNLC_BLAME:
\r
2973 sCmd.Format(_T("\"%s\" /command:blame /path:\"%s\""),
\r
2974 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), filepath.GetWinPath());
\r
2976 if (!filepath.IsUrl())
\r
2978 sCmd += _T(" /propspath:\"");
\r
2979 sCmd += filepath.GetWinPathString();
\r
2983 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
2986 case IDSVNLC_OPEN:
\r
2988 int ret = (int)ShellExecute(this->m_hWnd, NULL, filepath.GetWinPath(), NULL, NULL, SW_SHOW);
\r
2989 if (ret <= HINSTANCE_ERROR)
\r
2991 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
2992 cmd += filepath.GetWinPathString();
\r
2993 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
2997 case IDSVNLC_OPENWITH:
\r
2999 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
3000 cmd += filepath.GetWinPathString() + _T(" ");
\r
3001 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
3004 case IDSVNLC_EXPLORE:
\r
3006 ShellExecute(this->m_hWnd, _T("explore"), filepath.GetDirectory().GetWinPath(), NULL, NULL, SW_SHOW);
\r
3009 case IDSVNLC_REMOVE:
\r
3012 CTSVNPathList itemsToRemove;
\r
3013 FillListOfSelectedItemPaths(itemsToRemove);
\r
3015 // We must sort items before removing, so that files are always removed
\r
3016 // *before* their parents
\r
3017 itemsToRemove.SortByPathname(true);
\r
3019 bool bSuccess = false;
\r
3020 if (git.Remove(itemsToRemove, FALSE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))
\r
3026 if ((git.Err->apr_err == SVN_ERR_UNVERSIONED_RESOURCE) ||
\r
3027 (git.Err->apr_err == SVN_ERR_CLIENT_MODIFIED))
\r
3029 CString msg, yes, no, yestoall;
\r
3030 msg.Format(IDS_PROC_REMOVEFORCE, (LPCTSTR)git.GetLastErrorMessage());
\r
3031 yes.LoadString(IDS_MSGBOX_YES);
\r
3032 no.LoadString(IDS_MSGBOX_NO);
\r
3033 yestoall.LoadString(IDS_PROC_YESTOALL);
\r
3034 UINT ret = CMessageBox::Show(m_hWnd, msg, _T("TortoiseSVN"), 2, IDI_ERROR, yes, no, yestoall);
\r
3035 if ((ret == 1)||(ret==3))
\r
3037 if (!git.Remove(itemsToRemove, TRUE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))
\r
3039 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3046 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3050 // The remove went ok, but we now need to run through the selected items again
\r
3051 // and update their status
\r
3052 POSITION pos = GetFirstSelectedItemPosition();
\r
3054 std::vector<int> entriesToRemove;
\r
3055 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3057 FileEntry * e = GetListEntry(index);
\r
3059 ((e->textstatus == git_wc_status_unversioned)||
\r
3060 (e->textstatus == git_wc_status_none)||
\r
3061 (e->textstatus == git_wc_status_ignored)))
\r
3063 if (GetCheck(index))
\r
3066 entriesToRemove.push_back(index);
\r
3070 e->textstatus = git_wc_status_deleted;
\r
3071 e->status = git_wc_status_deleted;
\r
3072 SetEntryCheck(e,index,true);
\r
3075 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)
\r
3077 RemoveListEntry(*it);
\r
3080 SaveColumnWidths();
\r
3081 Show(m_dwShow, 0, m_bShowFolders);
\r
3085 case IDSVNLC_DELETE:
\r
3087 CTSVNPathList pathlist;
\r
3088 FillListOfSelectedItemPaths(pathlist);
\r
3089 pathlist.RemoveChildren();
\r
3091 for (INT_PTR i=0; i<pathlist.GetCount(); ++i)
\r
3093 filelist += pathlist[i].GetWinPathString();
\r
3094 filelist += _T("|");
\r
3096 filelist += _T("|");
\r
3097 int len = filelist.GetLength();
\r
3098 TCHAR * buf = new TCHAR[len+2];
\r
3099 _tcscpy_s(buf, len+2, filelist);
\r
3100 for (int i=0; i<len; ++i)
\r
3101 if (buf[i] == '|')
\r
3103 SHFILEOPSTRUCT fileop;
\r
3104 fileop.hwnd = this->m_hWnd;
\r
3105 fileop.wFunc = FO_DELETE;
\r
3106 fileop.pFrom = buf;
\r
3107 fileop.pTo = NULL;
\r
3108 fileop.fFlags = FOF_NO_CONNECTED_ELEMENTS | ((GetAsyncKeyState(VK_SHIFT) & 0x8000) ? 0 : FOF_ALLOWUNDO);
\r
3109 fileop.lpszProgressTitle = _T("deleting file");
\r
3110 int result = SHFileOperation(&fileop);
\r
3113 if ( (result==0) && (!fileop.fAnyOperationsAborted) )
\r
3116 POSITION pos = NULL;
\r
3117 CTSVNPathList deletedlist; // to store list of deleted folders
\r
3118 while ((pos = GetFirstSelectedItemPosition()) != 0)
\r
3120 int index = GetNextSelectedItem(pos);
\r
3121 if (GetCheck(index))
\r
3124 FileEntry * fentry = GetListEntry(index);
\r
3125 if ((fentry)&&(fentry->isfolder))
\r
3126 deletedlist.AddPath(fentry->path);
\r
3127 RemoveListEntry(index);
\r
3129 // now go through the list of deleted folders
\r
3130 // and remove all their children from the list too!
\r
3131 int nListboxEntries = GetItemCount();
\r
3132 for (int folderindex = 0; folderindex < deletedlist.GetCount(); ++folderindex)
\r
3134 CTSVNPath folderpath = deletedlist[folderindex];
\r
3135 for (int i=0; i<nListboxEntries; ++i)
\r
3137 FileEntry * entry = GetListEntry(i);
\r
3138 if (folderpath.IsAncestorOf(entry->path))
\r
3140 RemoveListEntry(i--);
\r
3141 nListboxEntries--;
\r
3149 case IDSVNLC_IGNOREMASK:
\r
3151 CString name = _T("*")+filepath.GetFileExtension();
\r
3152 CTSVNPathList ignorelist;
\r
3153 FillListOfSelectedItemPaths(ignorelist, true);
\r
3154 std::set<CTSVNPath> parentlist;
\r
3155 for (int i=0; i<ignorelist.GetCount(); ++i)
\r
3157 parentlist.insert(ignorelist[i].GetContainingDirectory());
\r
3159 std::set<CTSVNPath>::iterator it;
\r
3160 std::vector<CString> toremove;
\r
3162 for (it = parentlist.begin(); it != parentlist.end(); ++it)
\r
3164 CTSVNPath parentFolder = (*it).GetDirectory();
\r
3165 SVNProperties props(parentFolder, SVNRev::REV_WC, false);
\r
3167 for (int i=0; i<props.GetCount(); i++)
\r
3169 CString propname(props.GetItemName(i).c_str());
\r
3170 if (propname.CompareNoCase(_T("git:ignore"))==0)
\r
3173 // treat values as normal text even if they're not
\r
3174 value = (char *)props.GetItemValue(i).c_str();
\r
3177 if (value.IsEmpty())
\r
3181 value = value.Trim("\n\r");
\r
3184 value.Remove('\r');
\r
3186 if (!props.Add(_T("git:ignore"), (LPCSTR)value))
\r
3189 temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
\r
3190 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);
\r
3194 CTSVNPath basepath;
\r
3195 int nListboxEntries = GetItemCount();
\r
3196 for (int i=0; i<nListboxEntries; ++i)
\r
3198 FileEntry * entry = GetListEntry(i);
\r
3199 ASSERT(entry != NULL);
\r
3200 if (entry == NULL)
\r
3202 if (basepath.IsEmpty())
\r
3203 basepath = entry->basepath;
\r
3204 // since we ignored files with a mask (e.g. *.exe)
\r
3205 // we have to find find all files in the same
\r
3206 // folder (IsAncestorOf() returns TRUE for _all_ children,
\r
3207 // not just the immediate ones) which match the
\r
3208 // mask and remove them from the list too.
\r
3209 if ((entry->status == git_wc_status_unversioned)&&(parentFolder.IsAncestorOf(entry->path)))
\r
3211 CString f = entry->path.GetSVNPathString();
\r
3212 if (f.Mid(parentFolder.GetSVNPathString().GetLength()).Find('/')<=0)
\r
3214 if (CStringUtils::WildCardMatch(name, f))
\r
3219 toremove.push_back(f);
\r
3224 if (!m_bIgnoreRemoveOnly)
\r
3227 git_wc_status2_t * s;
\r
3228 CTSVNPath gitPath;
\r
3229 s = status.GetFirstFileStatus(parentFolder, gitPath, false, git_depth_empty);
\r
3232 // first check if the folder isn't already present in the list
\r
3233 bool bFound = false;
\r
3234 for (int i=0; i<nListboxEntries; ++i)
\r
3236 FileEntry * entry = GetListEntry(i);
\r
3237 if (entry->path.IsEquivalentTo(gitPath))
\r
3245 FileEntry * entry = new FileEntry();
\r
3246 entry->path = gitPath;
\r
3247 entry->basepath = basepath;
\r
3248 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
3249 entry->textstatus = s->text_status;
\r
3250 entry->propstatus = s->prop_status;
\r
3251 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);
\r
3252 entry->remotetextstatus = s->repos_text_status;
\r
3253 entry->remotepropstatus = s->repos_prop_status;
\r
3254 entry->inunversionedfolder = false;
\r
3255 entry->checked = true;
\r
3256 entry->inexternal = false;
\r
3257 entry->direct = false;
\r
3258 entry->isfolder = true;
\r
3259 entry->last_commit_date = 0;
\r
3260 entry->last_commit_rev = 0;
\r
3261 entry->remoterev = 0;
\r
3264 if (s->entry->url)
\r
3266 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));
\r
3269 if (s->entry && s->entry->present_props)
\r
3271 entry->present_props = s->entry->present_props;
\r
3273 m_arStatusArray.push_back(entry);
\r
3274 m_arListArray.push_back(m_arStatusArray.size()-1);
\r
3275 AddEntry(entry, langID, GetItemCount());
\r
3281 for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)
\r
3283 int nListboxEntries = GetItemCount();
\r
3284 for (int i=0; i<nListboxEntries; ++i)
\r
3286 if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)
\r
3288 RemoveListEntry(i);
\r
3296 case IDSVNLC_IGNORE:
\r
3298 CTSVNPathList ignorelist;
\r
3299 std::vector<CString> toremove;
\r
3300 FillListOfSelectedItemPaths(ignorelist, true);
\r
3302 for (int j=0; j<ignorelist.GetCount(); ++j)
\r
3304 int nListboxEntries = GetItemCount();
\r
3305 for (int i=0; i<nListboxEntries; ++i)
\r
3307 if (GetListEntry(i)->GetPath().IsEquivalentTo(ignorelist[j]))
\r
3313 CString name = CPathUtils::PathPatternEscape(ignorelist[j].GetFileOrDirectoryName());
\r
3314 CTSVNPath parentfolder = ignorelist[j].GetContainingDirectory();
\r
3315 SVNProperties props(parentfolder, SVNRev::REV_WC, false);
\r
3317 for (int i=0; i<props.GetCount(); i++)
\r
3319 CString propname(props.GetItemName(i).c_str());
\r
3320 if (propname.CompareNoCase(_T("git:ignore"))==0)
\r
3323 // treat values as normal text even if they're not
\r
3324 value = (char *)props.GetItemValue(i).c_str();
\r
3327 if (value.IsEmpty())
\r
3331 value = value.Trim("\n\r");
\r
3334 value.Remove('\r');
\r
3336 if (!props.Add(_T("git:ignore"), (LPCSTR)value))
\r
3339 temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
\r
3340 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);
\r
3343 if (GetCheck(selIndex))
\r
3347 // now, if we ignored a folder, remove all its children
\r
3348 if (ignorelist[j].IsDirectory())
\r
3350 for (int i=0; i<(int)m_arListArray.size(); ++i)
\r
3352 FileEntry * entry = GetListEntry(i);
\r
3353 if (entry->status == git_wc_status_unversioned)
\r
3355 if (!ignorelist[j].IsEquivalentTo(entry->GetPath())&&(ignorelist[j].IsAncestorOf(entry->GetPath())))
\r
3357 entry->status = git_wc_status_ignored;
\r
3358 entry->textstatus = git_wc_status_ignored;
\r
3361 toremove.push_back(entry->GetPath().GetSVNPathString());
\r
3367 CTSVNPath basepath = m_arStatusArray[m_arListArray[selIndex]]->basepath;
\r
3369 FileEntry * entry = m_arStatusArray[m_arListArray[selIndex]];
\r
3370 if ( entry->status == git_wc_status_unversioned ) // keep "deleted" items
\r
3371 toremove.push_back(entry->GetPath().GetSVNPathString());
\r
3373 if (!m_bIgnoreRemoveOnly)
\r
3376 git_wc_status2_t * s;
\r
3377 CTSVNPath gitPath;
\r
3378 s = status.GetFirstFileStatus(parentfolder, gitPath, false, git_depth_empty);
\r
3379 // first check if the folder isn't already present in the list
\r
3380 bool bFound = false;
\r
3381 nListboxEntries = GetItemCount();
\r
3382 for (int i=0; i<nListboxEntries; ++i)
\r
3384 FileEntry * entry = GetListEntry(i);
\r
3385 if (entry->path.IsEquivalentTo(gitPath))
\r
3395 FileEntry * entry = new FileEntry();
\r
3396 entry->path = gitPath;
\r
3397 entry->basepath = basepath;
\r
3398 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
3399 entry->textstatus = s->text_status;
\r
3400 entry->propstatus = s->prop_status;
\r
3401 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);
\r
3402 entry->remotetextstatus = s->repos_text_status;
\r
3403 entry->remotepropstatus = s->repos_prop_status;
\r
3404 entry->inunversionedfolder = FALSE;
\r
3405 entry->checked = true;
\r
3406 entry->inexternal = false;
\r
3407 entry->direct = false;
\r
3408 entry->isfolder = true;
\r
3409 entry->last_commit_date = 0;
\r
3410 entry->last_commit_rev = 0;
\r
3411 entry->remoterev = 0;
\r
3414 if (s->entry->url)
\r
3416 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));
\r
3419 if (s->entry && s->entry->present_props)
\r
3421 entry->present_props = s->entry->present_props;
\r
3423 m_arStatusArray.push_back(entry);
\r
3424 m_arListArray.push_back(m_arStatusArray.size()-1);
\r
3425 AddEntry(entry, langID, GetItemCount());
\r
3430 for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)
\r
3432 int nListboxEntries = GetItemCount();
\r
3433 for (int i=0; i<nListboxEntries; ++i)
\r
3435 if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)
\r
3437 RemoveListEntry(i);
\r
3445 case IDSVNLC_EDITCONFLICT:
\r
3446 SVNDiff::StartConflictEditor(filepath);
\r
3448 case IDSVNLC_RESOLVECONFLICT:
\r
3449 case IDSVNLC_RESOLVEMINE:
\r
3450 case IDSVNLC_RESOLVETHEIRS:
\r
3452 git_wc_conflict_choice_t result = git_wc_conflict_choose_merged;
\r
3455 case IDSVNLC_RESOLVETHEIRS:
\r
3456 result = git_wc_conflict_choose_theirs_full;
\r
3458 case IDSVNLC_RESOLVEMINE:
\r
3459 result = git_wc_conflict_choose_mine_full;
\r
3461 case IDSVNLC_RESOLVECONFLICT:
\r
3462 result = git_wc_conflict_choose_merged;
\r
3465 if (CMessageBox::Show(m_hWnd, IDS_PROC_RESOLVE, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO)==IDYES)
\r
3468 POSITION pos = GetFirstSelectedItemPosition();
\r
3472 index = GetNextSelectedItem(pos);
\r
3473 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
\r
3474 if (!git.Resolve(fentry->GetPath(), result, FALSE))
\r
3476 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3480 fentry->status = git_wc_status_modified;
\r
3481 fentry->textstatus = git_wc_status_modified;
\r
3482 fentry->isConflicted = false;
\r
3485 Show(m_dwShow, 0, m_bShowFolders);
\r
3492 CTSVNPathList itemsToAdd;
\r
3493 FillListOfSelectedItemPaths(itemsToAdd);
\r
3495 // We must sort items before adding, so that folders are always added
\r
3496 // *before* any of their children
\r
3497 itemsToAdd.SortByPathname();
\r
3499 ProjectProperties props;
\r
3500 props.ReadPropsPathList(itemsToAdd);
\r
3501 if (git.Add(itemsToAdd, &props, git_depth_empty, TRUE, TRUE, TRUE))
\r
3503 // The add went ok, but we now need to run through the selected items again
\r
3504 // and update their status
\r
3505 POSITION pos = GetFirstSelectedItemPosition();
\r
3507 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3509 FileEntry * e = GetListEntry(index);
\r
3510 e->textstatus = git_wc_status_added;
\r
3511 e->propstatus = git_wc_status_none;
\r
3512 e->status = git_wc_status_added;
\r
3513 SetEntryCheck(e,index,true);
\r
3518 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3520 SaveColumnWidths();
\r
3521 Show(m_dwShow, 0, m_bShowFolders);
\r
3525 case IDSVNLC_ADD_RECURSIVE:
\r
3527 CTSVNPathList itemsToAdd;
\r
3528 FillListOfSelectedItemPaths(itemsToAdd);
\r
3531 dlg.m_pathList = itemsToAdd;
\r
3532 if (dlg.DoModal() == IDOK)
\r
3534 if (dlg.m_pathList.GetCount() == 0)
\r
3536 CSVNProgressDlg progDlg;
\r
3537 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Add);
\r
3538 progDlg.SetPathList(dlg.m_pathList);
\r
3539 ProjectProperties props;
\r
3540 props.ReadPropsPathList(dlg.m_pathList);
\r
3541 progDlg.SetProjectProperties(props);
\r
3542 progDlg.SetItemCount(dlg.m_pathList.GetCount());
\r
3543 progDlg.DoModal();
\r
3546 CWnd* pParent = GetParent();
\r
3547 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3549 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3554 case IDSVNLC_LOCK:
\r
3556 CTSVNPathList itemsToLock;
\r
3557 FillListOfSelectedItemPaths(itemsToLock);
\r
3559 inpDlg.m_sTitle.LoadString(IDS_MENU_LOCK);
\r
3560 CStringUtils::RemoveAccelerators(inpDlg.m_sTitle);
\r
3561 inpDlg.m_sHintText.LoadString(IDS_LOCK_MESSAGEHINT);
\r
3562 inpDlg.m_sCheckText.LoadString(IDS_LOCK_STEALCHECK);
\r
3563 ProjectProperties props;
\r
3564 props.ReadPropsPathList(itemsToLock);
\r
3565 props.nMinLogSize = 0; // the lock message is optional, so no minimum!
\r
3566 inpDlg.m_pProjectProperties = &props;
\r
3567 if (inpDlg.DoModal()==IDOK)
\r
3569 CSVNProgressDlg progDlg;
\r
3570 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Lock);
\r
3571 progDlg.SetOptions(inpDlg.m_iCheck ? ProgOptLockForce : ProgOptNone);
\r
3572 progDlg.SetPathList(itemsToLock);
\r
3573 progDlg.SetCommitMessage(inpDlg.m_sInputText);
\r
3574 progDlg.DoModal();
\r
3576 CWnd* pParent = GetParent();
\r
3577 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3579 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3584 case IDSVNLC_UNLOCKFORCE:
\r
3586 case IDSVNLC_UNLOCK:
\r
3588 CTSVNPathList itemsToUnlock;
\r
3589 FillListOfSelectedItemPaths(itemsToUnlock);
\r
3590 CSVNProgressDlg progDlg;
\r
3591 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Unlock);
\r
3592 progDlg.SetOptions(bForce ? ProgOptLockForce : ProgOptNone);
\r
3593 progDlg.SetPathList(itemsToUnlock);
\r
3594 progDlg.DoModal();
\r
3596 CWnd* pParent = GetParent();
\r
3597 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3599 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3603 case IDSVNLC_REPAIRMOVE:
\r
3605 POSITION pos = GetFirstSelectedItemPosition();
\r
3606 int index = GetNextSelectedItem(pos);
\r
3607 FileEntry * entry1 = NULL;
\r
3608 FileEntry * entry2 = NULL;
\r
3611 entry1 = GetListEntry(index);
\r
3612 git_wc_status_kind status1 = git_wc_status_none;
\r
3613 git_wc_status_kind status2 = git_wc_status_none;
\r
3616 status1 = entry1->status;
\r
3617 index = GetNextSelectedItem(pos);
\r
3620 entry2 = GetListEntry(index);
\r
3623 status2 = entry2->status;
\r
3624 if (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned)
\r
3626 FileEntry * tempentry = entry1;
\r
3628 entry2 = tempentry;
\r
3630 // entry1 was renamed to entry2 but outside of Subversion
\r
3631 // fix this by moving entry2 back to entry1 first,
\r
3632 // then do an git-move from entry1 to entry2
\r
3633 if (MoveFile(entry2->GetPath().GetWinPath(), entry1->GetPath().GetWinPath()))
\r
3636 if (!git.Move(CTSVNPathList(entry1->GetPath()), entry2->GetPath(), TRUE))
\r
3638 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3642 // check the previously unversioned item
\r
3643 entry1->checked = true;
\r
3644 // fixing the move was successful. We have to adjust the new status of the
\r
3646 // Since we don't know if the moved/renamed file had local modifications or not,
\r
3647 // we can't guess the new status. That means we have to refresh...
\r
3648 CWnd* pParent = GetParent();
\r
3649 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3651 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3658 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
\r
3659 FORMAT_MESSAGE_FROM_SYSTEM |
\r
3660 FORMAT_MESSAGE_IGNORE_INSERTS,
\r
3663 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
\r
3664 (LPTSTR) &lpMsgBuf,
\r
3668 MessageBox((LPCTSTR)lpMsgBuf, _T("Error"), MB_OK | MB_ICONINFORMATION );
\r
3669 LocalFree( lpMsgBuf );
\r
3677 case IDSVNLC_REMOVEFROMCS:
\r
3679 CTSVNPathList changelistItems;
\r
3680 FillListOfSelectedItemPaths(changelistItems);
\r
3683 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
\r
3685 // The changelists were removed, but we now need to run through the selected items again
\r
3686 // and update their changelist
\r
3687 POSITION pos = GetFirstSelectedItemPosition();
\r
3689 std::vector<int> entriesToRemove;
\r
3690 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3692 FileEntry * e = GetListEntry(index);
\r
3695 e->changelist.Empty();
\r
3696 if (e->status == git_wc_status_normal)
\r
3698 // remove the entry completely
\r
3699 entriesToRemove.push_back(index);
\r
3702 SetItemGroup(index, 0);
\r
3705 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)
\r
3707 RemoveListEntry(*it);
\r
3709 // TODO: Should we go through all entries here and check if we also could
\r
3710 // remove the changelist from m_changelists ?
\r
3714 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3719 case IDSVNLC_CREATEIGNORECS:
\r
3720 CreateChangeList(SVNSLC_IGNORECHANGELIST);
\r
3722 case IDSVNLC_CREATECS:
\r
3724 CCreateChangelistDlg dlg;
\r
3725 if (dlg.DoModal() == IDOK)
\r
3727 CreateChangeList(dlg.m_sName);
\r
3733 if (cmd < IDSVNLC_MOVETOCS)
\r
3735 CTSVNPathList changelistItems;
\r
3736 FillListOfSelectedItemPaths(changelistItems);
\r
3738 // find the changelist name
\r
3739 CString sChangelist;
\r
3740 int cmdID = IDSVNLC_MOVETOCS;
\r
3742 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
3744 if ((it->first.Compare(SVNSLC_IGNORECHANGELIST))&&(entry->changelist.Compare(it->first)))
\r
3748 sChangelist = it->first;
\r
3753 if (!sChangelist.IsEmpty())
\r
3756 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
\r
3758 // The changelists were moved, but we now need to run through the selected items again
\r
3759 // and update their changelist
\r
3760 POSITION pos = GetFirstSelectedItemPosition();
\r
3762 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3764 FileEntry * e = GetListEntry(index);
\r
3765 e->changelist = sChangelist;
\r
3766 if (!e->IsFolder())
\r
3768 if (m_changelists.find(e->changelist)!=m_changelists.end())
\r
3769 SetItemGroup(index, m_changelists[e->changelist]);
\r
3771 SetItemGroup(index, 0);
\r
3777 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3787 AfxGetApp()->DoWaitCursor(-1);
\r
3788 GetStatisticsString();
\r
3789 int iItemCountAfterMenuCmd = GetItemCount();
\r
3790 //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)
\r
3792 // CWnd* pParent = GetParent();
\r
3793 // if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3795 // pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);
\r
3798 } // if (popup.CreatePopupMenu())
\r
3799 } // if (selIndex >= 0)
\r
3803 void CGitStatusListCtrl::OnContextMenuHeader(CWnd * pWnd, CPoint point)
\r
3805 bool XPorLater = false;
\r
3806 OSVERSIONINFOEX inf;
\r
3807 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
3808 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
3809 GetVersionEx((OSVERSIONINFO *)&inf);
\r
3810 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
3811 if (fullver >= 0x0501)
\r
3814 CHeaderCtrl * pHeaderCtrl = (CHeaderCtrl *)pWnd;
\r
3815 if ((point.x == -1) && (point.y == -1))
\r
3818 pHeaderCtrl->GetItemRect(0, &rect);
\r
3819 ClientToScreen(&rect);
\r
3820 point = rect.CenterPoint();
\r
3822 Locker lock(m_critSec);
\r
3824 if (popup.CreatePopupMenu())
\r
3826 int columnCount = m_ColumnManager.GetColumnCount();
\r
3829 UINT uCheckedFlags = MF_STRING | MF_ENABLED | MF_CHECKED;
\r
3830 UINT uUnCheckedFlags = MF_STRING | MF_ENABLED;
\r
3832 // build control menu
\r
3836 temp.LoadString(IDS_STATUSLIST_SHOWGROUPS);
\r
3837 popup.AppendMenu(IsGroupViewEnabled() ? uCheckedFlags : uUnCheckedFlags, columnCount, temp);
\r
3840 if (m_ColumnManager.AnyUnusedProperties())
\r
3842 temp.LoadString(IDS_STATUSLIST_REMOVEUNUSEDPROPS);
\r
3843 popup.AppendMenu(uUnCheckedFlags, columnCount+1, temp);
\r
3846 temp.LoadString(IDS_STATUSLIST_RESETCOLUMNORDER);
\r
3847 popup.AppendMenu(uUnCheckedFlags, columnCount+2, temp);
\r
3848 popup.AppendMenu(MF_SEPARATOR);
\r
3850 // standard columns
\r
3852 for (int i = 1; i < SVNSLC_NUMCOLUMNS; ++i)
\r
3854 popup.AppendMenu ( m_ColumnManager.IsVisible(i)
\r
3858 , m_ColumnManager.GetName(i));
\r
3861 // user-prop columns:
\r
3862 // find relevant ones and sort 'em
\r
3864 std::map<CString, int> sortedProps;
\r
3865 for (int i = SVNSLC_NUMCOLUMNS; i < columnCount; ++i)
\r
3866 if (m_ColumnManager.IsRelevant(i))
\r
3867 sortedProps[m_ColumnManager.GetName(i)] = i;
\r
3869 if (!sortedProps.empty())
\r
3871 // add 'em to the menu
\r
3873 popup.AppendMenu(MF_SEPARATOR);
\r
3875 typedef std::map<CString, int>::const_iterator CIT;
\r
3876 for ( CIT iter = sortedProps.begin(), end = sortedProps.end()
\r
3880 popup.AppendMenu ( m_ColumnManager.IsVisible(iter->second)
\r
3888 // show menu & let user pick an entry
\r
3890 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
3891 if ((cmd >= 1)&&(cmd < columnCount))
\r
3893 m_ColumnManager.SetVisible (cmd, !m_ColumnManager.IsVisible(cmd));
\r
3895 else if (cmd == columnCount)
\r
3897 EnableGroupView(!IsGroupViewEnabled());
\r
3899 else if (cmd == columnCount+1)
\r
3901 m_ColumnManager.RemoveUnusedProps();
\r
3903 else if (cmd == columnCount+2)
\r
3905 m_ColumnManager.ResetColumns (m_dwDefaultColumns);
\r
3910 void CGitStatusListCtrl::OnContextMenu(CWnd* pWnd, CPoint point)
\r
3915 OnContextMenuList(pWnd, point);
\r
3916 } // if (pWnd == this)
\r
3917 else if (pWnd == GetHeaderCtrl())
\r
3919 OnContextMenuHeader(pWnd, point);
\r
3923 void CGitStatusListCtrl::CreateChangeList(const CString& name)
\r
3926 CTGitPathList changelistItems;
\r
3927 FillListOfSelectedItemPaths(changelistItems);
\r
3929 if (git.AddToChangeList(changelistItems, name, git_depth_empty))
\r
3931 TCHAR groupname[1024];
\r
3932 LVGROUP grp = {0};
\r
3933 grp.cbSize = sizeof(LVGROUP);
\r
3934 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
3935 _tcsncpy_s(groupname, 1024, name, 1023);
\r
3936 grp.pszHeader = groupname;
\r
3937 grp.iGroupId = (int)m_changelists.size();
\r
3938 grp.uAlign = LVGA_HEADER_LEFT;
\r
3939 m_changelists[name] = InsertGroup(-1, &grp);
\r
3941 PrepareGroups(true);
\r
3943 POSITION pos = GetFirstSelectedItemPosition();
\r
3945 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3947 FileEntry * e = GetListEntry(index);
\r
3948 e->changelist = name;
\r
3949 SetEntryCheck(e, index, FALSE);
\r
3952 for (index = 0; index < GetItemCount(); ++index)
\r
3954 FileEntry * e = GetListEntry(index);
\r
3955 if (m_changelists.find(e->changelist)!=m_changelists.end())
\r
3956 SetItemGroup(index, m_changelists[e->changelist]);
\r
3958 SetItemGroup(index, 0);
\r
3963 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("Tortoisegit"), MB_ICONERROR);
\r
3968 void CGitStatusListCtrl::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
\r
3971 Locker lock(m_critSec);
\r
3972 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
3977 if (pNMLV->iItem < 0)
\r
3979 if (!IsGroupViewEnabled())
\r
3982 DWORD ptW = GetMessagePos();
\r
3983 pt.x = GET_X_LPARAM(ptW);
\r
3984 pt.y = GET_Y_LPARAM(ptW);
\r
3985 ScreenToClient(&pt);
\r
3986 int group = GetGroupFromPoint(&pt);
\r
3989 // check/uncheck the whole group depending on the check-state
\r
3990 // of the first item in the group
\r
3992 bool bCheck = false;
\r
3993 bool bFirst = false;
\r
3995 for (int i=0; i<GetItemCount(); ++i)
\r
3997 SecureZeroMemory(&lv, sizeof(LVITEM));
\r
3998 lv.mask = LVIF_GROUPID;
\r
4001 if (lv.iGroupId == group)
\r
4003 FileEntry * entry = GetListEntry(i);
\r
4006 bCheck = !GetCheck(i);
\r
4011 bool bOldCheck = !!GetCheck(i);
\r
4012 SetEntryCheck(entry, i, bCheck);
\r
4013 if (bCheck != bOldCheck)
\r
4023 GetStatisticsString();
\r
4029 // FileEntry * entry = GetListEntry(pNMLV->iItem);
\r
4032 // if (entry->isConflicted)
\r
4034 // gitDiff::StartConflictEditor(entry->GetPath());
\r
4038 StartDiff(pNMLV->iItem);
\r
4044 void CGitStatusListCtrl::StartDiff(int fileindex)
\r
4048 CGitDiff::Diff((CTGitPath*)GetItemData(fileindex),
\r
4049 CString(GIT_REV_ZERO),
\r
4050 GitRev::GetHead());
\r
4053 if (fileindex < 0)
\r
4055 FileEntry * entry = GetListEntry(fileindex);
\r
4056 ASSERT(entry != NULL);
\r
4057 if (entry == NULL)
\r
4059 if (((entry->status == git_wc_status_normal)&&(entry->remotestatus <= git_wc_status_normal))||
\r
4060 (entry->status == git_wc_status_unversioned)||(entry->status == git_wc_status_none))
\r
4062 int ret = (int)ShellExecute(this->m_hWnd, NULL, entry->path.GetWinPath(), NULL, NULL, SW_SHOW);
\r
4063 if (ret <= HINSTANCE_ERROR)
\r
4065 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
4066 cmd += entry->path.GetWinPathString();
\r
4067 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
4072 GitDiff diff(NULL, m_hWnd, true);
\r
4073 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
4075 entry->path, entry->textstatus, entry->propstatus,
\r
4076 entry->remotetextstatus, entry->remotepropstatus);
\r
4080 CString CGitStatusListCtrl::GetStatisticsString()
\r
4083 CString sNormal, sAdded, sDeleted, sModified, sConflicted, sUnversioned;
\r
4084 WORD langID = (WORD)(DWORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
4085 TCHAR buf[MAX_STATUS_STRING_LENGTH];
\r
4086 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_normal, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4088 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_added, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4090 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_deleted, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4092 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_modified, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4094 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_conflicted, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4095 sConflicted = buf;
\r
4096 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_unversioned, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4097 sUnversioned = buf;
\r
4099 sToolTip.Format(_T("%s = %d\n%s = %d\n%s = %d\n%s = %d\n%s = %d\n%s = %d"),
\r
4100 (LPCTSTR)sNormal, m_nNormal,
\r
4101 (LPCTSTR)sUnversioned, m_nUnversioned,
\r
4102 (LPCTSTR)sModified, m_nModified,
\r
4103 (LPCTSTR)sAdded, m_nAdded,
\r
4104 (LPCTSTR)sDeleted, m_nDeleted,
\r
4105 (LPCTSTR)sConflicted, m_nConflicted
\r
4108 sStats.Format(IDS_COMMITDLG_STATISTICSFORMAT, m_nSelected, GetItemCount());
\r
4111 m_pStatLabel->SetWindowText(sStats);
\r
4114 if (m_pSelectButton)
\r
4116 if (m_nSelected == 0)
\r
4117 m_pSelectButton->SetCheck(BST_UNCHECKED);
\r
4118 else if (m_nSelected != GetItemCount())
\r
4119 m_pSelectButton->SetCheck(BST_INDETERMINATE);
\r
4121 m_pSelectButton->SetCheck(BST_CHECKED);
\r
4124 if (m_pConfirmButton)
\r
4126 m_pConfirmButton->EnableWindow(m_nSelected>0);
\r
4134 CTGitPath CGitStatusListCtrl::GetCommonDirectory(bool bStrict)
\r
4138 // not strict means that the selected folder has priority
\r
4139 if (!m_StatusFileList.GetCommonDirectory().IsEmpty())
\r
4140 return m_StatusFileList.GetCommonDirectory();
\r
4143 CTGitPath commonBaseDirectory;
\r
4144 int nListItems = GetItemCount();
\r
4145 for (int i=0; i<nListItems; ++i)
\r
4147 CTGitPath& baseDirectory = *(CTGitPath*)this->GetItemData(i);
\r
4148 if(commonBaseDirectory.IsEmpty())
\r
4150 commonBaseDirectory = baseDirectory;
\r
4154 if (commonBaseDirectory.GetWinPathString().GetLength() > baseDirectory.GetWinPathString().GetLength())
\r
4156 if (baseDirectory.IsAncestorOf(commonBaseDirectory))
\r
4157 commonBaseDirectory = baseDirectory;
\r
4161 return commonBaseDirectory;
\r
4164 CTGitPath CGitStatusListCtrl::GetCommonURL(bool bStrict)
\r
4166 CTGitPath commonBaseURL;
\r
4171 // not strict means that the selected folder has priority
\r
4172 if (!m_StatusUrlList.GetCommonDirectory().IsEmpty())
\r
4173 return m_StatusUrlList.GetCommonDirectory();
\r
4176 int nListItems = GetItemCount();
\r
4177 for (int i=0; i<nListItems; ++i)
\r
4179 const CTGitPath& baseURL = CTGitPath(GetListEntry(i)->GetURL());
\r
4180 if (baseURL.IsEmpty())
\r
4181 continue; // item has no url
\r
4182 if(commonBaseURL.IsEmpty())
\r
4184 commonBaseURL = baseURL;
\r
4188 if (commonBaseURL.GetGitPathString().GetLength() > baseURL.GetGitPathString().GetLength())
\r
4190 if (baseURL.IsAncestorOf(commonBaseURL))
\r
4191 commonBaseURL = baseURL;
\r
4197 return commonBaseURL;
\r
4200 void CGitStatusListCtrl::SelectAll(bool bSelect, bool bIncludeNoCommits)
\r
4202 CWaitCursor waitCursor;
\r
4203 // block here so the LVN_ITEMCHANGED messages
\r
4208 int nListItems = GetItemCount();
\r
4210 m_nSelected = nListItems;
\r
4214 for (int i=0; i<nListItems; ++i)
\r
4216 //FileEntry * entry = GetListEntry(i);
\r
4217 //ASSERT(entry != NULL);
\r
4218 CTGitPath *path = (CTGitPath *) GetItemData(i);
\r
4221 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))
\r
4222 SetEntryCheck(path,i,bSelect);
\r
4225 // unblock before redrawing
\r
4228 GetStatisticsString();
\r
4232 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR *pNMHDR, LRESULT *pResult)
\r
4234 LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast<LPNMLVGETINFOTIP>(pNMHDR);
\r
4239 if (GetListEntry(pGetInfoTip->iItem >= 0))
\r
4240 if (pGetInfoTip->cchTextMax > GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString().GetLength())
\r
4242 if (GetListEntry(pGetInfoTip->iItem)->GetRelativeGitPath().Compare(GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString())!= 0)
\r
4243 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString(), pGetInfoTip->cchTextMax);
\r
4244 else if (GetStringWidth(GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString()) > GetColumnWidth(pGetInfoTip->iItem))
\r
4245 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString(), pGetInfoTip->cchTextMax);
\r
4250 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult)
\r
4252 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
4254 // Take the default processing unless we set this to something else below.
\r
4255 *pResult = CDRF_DODEFAULT;
\r
4257 // First thing - check the draw stage. If it's the control's prepaint
\r
4258 // stage, then tell Windows we want messages for every item.
\r
4260 switch (pLVCD->nmcd.dwDrawStage)
\r
4262 case CDDS_PREPAINT:
\r
4263 *pResult = CDRF_NOTIFYITEMDRAW;
\r
4265 case CDDS_ITEMPREPAINT:
\r
4267 // This is the prepaint stage for an item. Here's where we set the
\r
4268 // item's text color. Our return value will tell Windows to draw the
\r
4269 // item itself, but it will use the new color we set here.
\r
4271 // Tell Windows to paint the control itself.
\r
4272 *pResult = CDRF_DODEFAULT;
\r
4276 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
4278 if (m_arStatusArray.size() > (DWORD_PTR)pLVCD->nmcd.dwItemSpec)
\r
4281 //FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);
\r
4282 CTGitPath *entry=(CTGitPath *)GetItemData((int)pLVCD->nmcd.dwItemSpec);
\r
4283 if (entry == NULL)
\r
4288 // black : unversioned, normal
\r
4290 // blue : modified
\r
4291 // brown : missing, deleted, replaced
\r
4292 // green : merged (or potential merges)
\r
4293 // red : conflicts or sure conflicts
\r
4294 if(entry->m_Action & CTGitPath::LOGACTIONS_CONFLICT)
\r
4296 crText = m_Colors.GetColor(CColors::Conflict);
\r
4298 }else if(entry->m_Action & CTGitPath::LOGACTIONS_MODIFIED)
\r
4300 crText = m_Colors.GetColor(CColors::Modified);
\r
4302 }else if(entry->m_Action & CTGitPath::LOGACTIONS_ADDED)
\r
4304 crText = m_Colors.GetColor(CColors::Added);
\r
4306 else if(entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
\r
4308 crText = m_Colors.GetColor(CColors::DeletedNode);
\r
4310 else if(entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
\r
4312 crText = m_Colors.GetColor(CColors::RenamedNode);
\r
4315 crText = GetSysColor(COLOR_WINDOWTEXT);
\r
4317 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
4318 pLVCD->clrText = crText;
\r
4325 BOOL CGitStatusListCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
\r
4328 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
\r
4331 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
\r
4333 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
\r
4335 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
\r
4340 void CGitStatusListCtrl::RemoveListEntry(int index)
\r
4343 Locker lock(m_critSec);
\r
4344 DeleteItem(index);
\r
4345 delete m_arStatusArray[m_arListArray[index]];
\r
4346 m_arStatusArray.erase(m_arStatusArray.begin()+m_arListArray[index]);
\r
4347 m_arListArray.erase(m_arListArray.begin()+index);
\r
4348 for (int i=index; i< (int)m_arListArray.size(); ++i)
\r
4350 m_arListArray[i]--;
\r
4355 ///< Set a checkbox on an entry in the listbox
\r
4356 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync
\r
4357 void CGitStatusListCtrl::SetEntryCheck(CTGitPath* pEntry, int listboxIndex, bool bCheck)
\r
4359 pEntry->m_Checked = bCheck;
\r
4360 SetCheck(listboxIndex, bCheck);
\r
4364 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry* parentEntry, bool bCheck)
\r
4367 int nListItems = GetItemCount();
\r
4368 for (int j=0; j< nListItems ; ++j)
\r
4370 FileEntry * childEntry = GetListEntry(j);
\r
4371 ASSERT(childEntry != NULL);
\r
4372 if (childEntry == NULL || childEntry == parentEntry)
\r
4374 if (childEntry->checked != bCheck)
\r
4376 if (parentEntry->path.IsAncestorOf(childEntry->path))
\r
4378 SetEntryCheck(childEntry,j,bCheck);
\r
4394 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList& pathList)
\r
4398 int nListItems = GetItemCount();
\r
4399 for (int i=0; i< nListItems; i++)
\r
4401 const FileEntry* entry = GetListEntry(i);
\r
4402 ASSERT(entry != NULL);
\r
4403 if (entry->IsChecked())
\r
4405 pathList.AddPath(entry->path);
\r
4408 pathList.SortByPathname();
\r
4413 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)
\r
4414 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList& pathList, bool bNoIgnored)
\r
4418 POSITION pos = GetFirstSelectedItemPosition();
\r
4420 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
4422 CTGitPath * entry = (CTGitPath*)GetItemData(index);
\r
4423 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))
\r
4425 pathList.AddPath(*entry);
\r
4429 UINT CGitStatusListCtrl::OnGetDlgCode()
\r
4431 // we want to process the return key and not have that one
\r
4432 // routed to the default pushbutton
\r
4433 return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS;
\r
4436 void CGitStatusListCtrl::OnNMReturn(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
4441 POSITION pos = GetFirstSelectedItemPosition();
\r
4444 int index = GetNextSelectedItem(pos);
\r
4449 void CGitStatusListCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
\r
4451 // Since we catch all keystrokes (to have the enter key processed here instead
\r
4452 // of routed to the default pushbutton) we have to make sure that other
\r
4453 // keys like Tab and Esc still do what they're supposed to do
\r
4454 // Tab = change focus to next/previous control
\r
4455 // Esc = quit the dialog
\r
4460 ::PostMessage(GetParent()->GetSafeHwnd(), WM_NEXTDLGCTL, GetKeyState(VK_SHIFT)&0x8000, 0);
\r
4466 ::SendMessage(GetParent()->GetSafeHwnd(), WM_CLOSE, 0, 0);
\r
4471 CListCtrl::OnKeyDown(nChar, nRepCnt, nFlags);
\r
4474 void CGitStatusListCtrl::PreSubclassWindow()
\r
4476 CListCtrl::PreSubclassWindow();
\r
4477 EnableToolTips(TRUE);
\r
4478 m_Theme.SetWindowTheme(GetSafeHwnd(), L"Explorer", NULL);
\r
4481 INT_PTR CGitStatusListCtrl::OnToolHitTest(CPoint point, TOOLINFO* pTI) const
\r
4485 row = CellRectFromPoint(point, &cellrect, &col );
\r
4491 pTI->hwnd = m_hWnd;
\r
4492 pTI->uId = (UINT)((row<<10)+(col&0x3ff)+1);
\r
4493 pTI->lpszText = LPSTR_TEXTCALLBACK;
\r
4495 pTI->rect = cellrect;
\r
4500 int CGitStatusListCtrl::CellRectFromPoint(CPoint& point, RECT *cellrect, int *col) const
\r
4504 // Make sure that the ListView is in LVS_REPORT
\r
4505 if ((GetWindowLong(m_hWnd, GWL_STYLE) & LVS_TYPEMASK) != LVS_REPORT)
\r
4508 // Get the top and bottom row visible
\r
4509 int row = GetTopIndex();
\r
4510 int bottom = row + GetCountPerPage();
\r
4511 if (bottom > GetItemCount())
\r
4512 bottom = GetItemCount();
\r
4514 // Get the number of columns
\r
4515 CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
\r
4516 int nColumnCount = pHeader->GetItemCount();
\r
4518 // Loop through the visible rows
\r
4519 for ( ;row <=bottom;row++)
\r
4521 // Get bounding rect of item and check whether point falls in it.
\r
4523 GetItemRect(row, &rect, LVIR_BOUNDS);
\r
4524 if (rect.PtInRect(point))
\r
4526 // Now find the column
\r
4527 for (colnum = 0; colnum < nColumnCount; colnum++)
\r
4529 int colwidth = GetColumnWidth(colnum);
\r
4530 if (point.x >= rect.left && point.x <= (rect.left + colwidth))
\r
4533 GetClientRect(&rectClient);
\r
4536 rect.right = rect.left + colwidth;
\r
4538 // Make sure that the right extent does not exceed
\r
4539 // the client area
\r
4540 if (rect.right > rectClient.right)
\r
4541 rect.right = rectClient.right;
\r
4545 rect.left += colwidth;
\r
4552 BOOL CGitStatusListCtrl::OnToolTipText(UINT /*id*/, NMHDR *pNMHDR, LRESULT *pResult)
\r
4555 TOOLTIPTEXTW* pTTTW = (TOOLTIPTEXTW*)pNMHDR;
\r
4556 CString strTipText;
\r
4557 UINT_PTR nID = pNMHDR->idFrom;
\r
4562 UINT_PTR row = ((nID-1) >> 10) & 0x3fffff;
\r
4563 UINT_PTR col = (nID-1) & 0x3ff;
\r
4566 return FALSE; // no custom tooltip for the path, we use the infotip there!
\r
4568 // get the internal column from the visible columns
\r
4569 int internalcol = 0;
\r
4570 UINT_PTR currentcol = 0;
\r
4571 for (; (currentcol != col)
\r
4572 && (internalcol < m_ColumnManager.GetColumnCount()-1)
\r
4575 if (m_ColumnManager.IsVisible (internalcol))
\r
4579 AFX_MODULE_THREAD_STATE* pModuleThreadState = AfxGetModuleThreadState();
\r
4580 CToolTipCtrl* pToolTip = pModuleThreadState->m_pToolTip;
\r
4581 pToolTip->SendMessage(TTM_SETMAXTIPWIDTH, 0, 300);
\r
4584 if ((internalcol == 2)||(internalcol == 4))
\r
4586 FileEntry *fentry = GetListEntry(row);
\r
4589 if (fentry->copied)
\r
4592 url.Format(IDS_STATUSLIST_COPYFROM, (LPCTSTR)CPathUtils::PathUnescape(fentry->copyfrom_url), (LONG)fentry->copyfrom_rev);
\r
4593 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);
\r
4596 if (fentry->switched)
\r
4599 url.Format(IDS_STATUSLIST_SWITCHEDTO, (LPCTSTR)CPathUtils::PathUnescape(fentry->url));
\r
4600 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);
\r
4603 if (fentry->keeplocal)
\r
4605 lstrcpyn(pTTTW->szText, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_KEEPLOCAL)), 80);
\r
4614 void CGitStatusListCtrl::OnPaint()
\r
4617 if ((m_bBusy)||(m_bEmpty))
\r
4622 if (m_sBusy.IsEmpty())
\r
4623 str.LoadString(IDS_STATUSLIST_BUSYMSG);
\r
4629 if (m_sEmpty.IsEmpty())
\r
4630 str.LoadString(IDS_STATUSLIST_EMPTYMSG);
\r
4634 COLORREF clrText = ::GetSysColor(COLOR_WINDOWTEXT);
\r
4635 COLORREF clrTextBk;
\r
4636 if (IsWindowEnabled())
\r
4637 clrTextBk = ::GetSysColor(COLOR_WINDOW);
\r
4639 clrTextBk = ::GetSysColor(COLOR_3DFACE);
\r
4642 GetClientRect(&rc);
\r
4644 pHC = GetHeaderCtrl();
\r
4648 pHC->GetItemRect(0, &rcH);
\r
4649 rc.top += rcH.bottom;
\r
4651 CDC* pDC = GetDC();
\r
4653 CMyMemDC memDC(pDC, &rc);
\r
4655 memDC.SetTextColor(clrText);
\r
4656 memDC.SetBkColor(clrTextBk);
\r
4657 memDC.FillSolidRect(rc, clrTextBk);
\r
4659 CGdiObject * oldfont = memDC.SelectStockObject(DEFAULT_GUI_FONT);
\r
4660 memDC.DrawText(str, rc, DT_CENTER | DT_VCENTER |
\r
4661 DT_WORDBREAK | DT_NOPREFIX | DT_NOCLIP);
\r
4662 memDC.SelectObject(oldfont);
\r
4668 // prevent users from extending our hidden (size 0) columns
\r
4669 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR *pNMHDR, LRESULT *pResult)
\r
4671 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
4673 if ((phdr->iItem < 0)||(phdr->iItem >= SVNSLC_NUMCOLUMNS))
\r
4676 if (m_ColumnManager.IsVisible (phdr->iItem))
\r
4683 // prevent any function from extending our hidden (size 0) columns
\r
4684 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
\r
4686 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
4688 if ((phdr->iItem < 0)||(phdr->iItem >= m_ColumnManager.GetColumnCount()))
\r
4694 // visible columns may be modified
\r
4696 if (m_ColumnManager.IsVisible (phdr->iItem))
\r
4702 // columns already marked as "invisible" internally may be (re-)sized to 0
\r
4704 if ( (phdr->pitem != NULL)
\r
4705 && (phdr->pitem->mask == HDI_WIDTH)
\r
4706 && (phdr->pitem->cxy == 0))
\r
4712 if ( (phdr->pitem != NULL)
\r
4713 && (phdr->pitem->mask != HDI_WIDTH))
\r
4722 void CGitStatusListCtrl::OnDestroy()
\r
4724 SaveColumnWidths(true);
\r
4725 CListCtrl::OnDestroy();
\r
4728 void CGitStatusListCtrl::OnBeginDrag(NMHDR* /*pNMHDR*/, LRESULT* pResult)
\r
4731 Locker lock(m_critSec);
\r
4732 CDropFiles dropFiles; // class for creating DROPFILES struct
\r
4735 POSITION pos = GetFirstSelectedItemPosition();
\r
4736 while ( (index = GetNextSelectedItem(pos)) >= 0 )
\r
4738 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
\r
4739 CTGitPath path = fentry->GetPath();
\r
4740 dropFiles.AddFile( path.GetWinPathString() );
\r
4743 if ( dropFiles.GetCount()>0 )
\r
4745 m_bOwnDrag = true;
\r
4746 dropFiles.CreateStructure();
\r
4747 m_bOwnDrag = false;
\r
4753 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry /* = false */)
\r
4755 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
4756 for (int col = 0; col <= maxcol; col++)
\r
4757 if (m_ColumnManager.IsVisible (col))
\r
4758 m_ColumnManager.ColumnResized (col);
\r
4760 if (bSaveToRegistry)
\r
4761 m_ColumnManager.WriteSettings();
\r
4764 bool CGitStatusListCtrl::EnableFileDrop()
\r
4766 m_bFileDropsEnabled = true;
\r
4770 bool CGitStatusListCtrl::HasPath(const CTGitPath& path)
\r
4773 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
4775 FileEntry * entry = m_arStatusArray[i];
\r
4776 if (entry->GetPath().IsEquivalentTo(path))
\r
4783 bool CGitStatusListCtrl::IsPathShown(const CTGitPath& path)
\r
4786 int itemCount = GetItemCount();
\r
4787 for (int i=0; i < itemCount; i++)
\r
4789 FileEntry * entry = GetListEntry(i);
\r
4790 if (entry->GetPath().IsEquivalentTo(path))
\r
4797 BOOL CGitStatusListCtrl::PreTranslateMessage(MSG* pMsg)
\r
4799 if (pMsg->message == WM_KEYDOWN)
\r
4801 switch (pMsg->wParam)
\r
4805 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
\r
4807 // select all entries
\r
4808 for (int i=0; i<GetItemCount(); ++i)
\r
4810 SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
\r
4819 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
\r
4821 // copy all selected paths to the clipboard
\r
4822 if (GetAsyncKeyState(VK_SHIFT)&0x8000)
\r
4823 CopySelectedEntriesToClipboard(SVNSLC_COLSTATUS);
\r
4825 CopySelectedEntriesToClipboard(0);
\r
4833 return CListCtrl::PreTranslateMessage(pMsg);
\r
4836 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols)
\r
4839 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
4840 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
4841 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
4843 CString sClipboard;
\r
4846 if (GetSelectedCount() == 0)
\r
4848 // first add the column titles as the first line
\r
4849 temp.LoadString(IDS_STATUSLIST_COLFILE);
\r
4850 sClipboard = temp;
\r
4852 DWORD selection = 0;
\r
4853 for (int i = 0, count = m_ColumnManager.GetColumnCount(); i < count; ++i)
\r
4854 if ( ((dwCols == -1) && m_ColumnManager.IsVisible (i))
\r
4855 || ((dwCols != 1) && (i < 32) && ((dwCols & (1 << i)) != 0)))
\r
4857 sClipboard += _T("\t") + m_ColumnManager.GetName(i);
\r
4860 selection += 1 << i;
\r
4863 sClipboard += _T("\r\n");
\r
4865 POSITION pos = GetFirstSelectedItemPosition();
\r
4867 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
4869 FileEntry * entry = GetListEntry(index);
\r
4870 sClipboard += entry->GetDisplayName();
\r
4871 if (selection & SVNSLC_COLFILENAME)
\r
4873 sClipboard += _T("\t")+entry->path.GetFileOrDirectoryName();
\r
4875 if (selection & SVNSLC_COLEXT)
\r
4877 sClipboard += _T("\t")+entry->path.GetFileExtension();
\r
4879 if (selection & SVNSLC_COLSTATUS)
\r
4881 if (entry->isNested)
\r
4883 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
4887 GitStatus::GetStatusString(hResourceHandle, entry->status, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4888 if ((entry->copied)&&(_tcslen(buf)>1))
\r
4889 _tcscat_s(buf, 100, _T(" (+)"));
\r
4890 if ((entry->switched)&&(_tcslen(buf)>1))
\r
4891 _tcscat_s(buf, 100, _T(" (s)"));
\r
4892 if ((entry->status == entry->propstatus)&&
\r
4893 (entry->status != git_wc_status_normal)&&
\r
4894 (entry->status != git_wc_status_unversioned)&&
\r
4895 (!GitStatus::IsImportant(entry->textstatus)))
\r
4896 _tcscat_s(buf, 100, ponly);
\r
4899 sClipboard += _T("\t")+temp;
\r
4901 if (selection & SVNSLC_COLTEXTSTATUS)
\r
4903 if (entry->isNested)
\r
4905 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
4909 GitStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4910 if ((entry->copied)&&(_tcslen(buf)>1))
\r
4911 _tcscat_s(buf, 100, _T(" (+)"));
\r
4912 if ((entry->switched)&&(_tcslen(buf)>1))
\r
4913 _tcscat_s(buf, 100, _T(" (s)"));
\r
4916 sClipboard += _T("\t")+temp;
\r
4918 if (selection & SVNSLC_COLREMOTESTATUS)
\r
4920 if (entry->isNested)
\r
4922 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
4926 GitStatus::GetStatusString(hResourceHandle, entry->remotestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4927 if ((entry->copied)&&(_tcslen(buf)>1))
\r
4928 _tcscat_s(buf, 100, _T(" (+)"));
\r
4929 if ((entry->switched)&&(_tcslen(buf)>1))
\r
4930 _tcscat_s(buf, 100, _T(" (s)"));
\r
4931 if ((entry->remotestatus == entry->remotepropstatus)&&
\r
4932 (entry->remotestatus != git_wc_status_none)&&
\r
4933 (entry->remotestatus != git_wc_status_normal)&&
\r
4934 (entry->remotestatus != git_wc_status_unversioned)&&
\r
4935 (!SVNStatus::IsImportant(entry->remotetextstatus)))
\r
4936 _tcscat_s(buf, 100, ponly);
\r
4939 sClipboard += _T("\t")+temp;
\r
4941 if (selection & GitSLC_COLPROPSTATUS)
\r
4943 if (entry->isNested)
\r
4949 GitStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4950 if ((entry->copied)&&(_tcslen(buf)>1))
\r
4951 _tcscat_s(buf, 100, _T(" (+)"));
\r
4952 if ((entry->switched)&&(_tcslen(buf)>1))
\r
4953 _tcscat_s(buf, 100, _T(" (s)"));
\r
4956 sClipboard += _T("\t")+temp;
\r
4958 if (selection & SVNSLC_COLREMOTETEXT)
\r
4960 if (entry->isNested)
\r
4966 GitStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4969 sClipboard += _T("\t")+temp;
\r
4971 if (selection & SVNSLC_COLREMOTEPROP)
\r
4973 // SVNSLC_COLREMOTEPROP
\r
4974 if (entry->isNested)
\r
4980 GitStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4983 sClipboard += _T("\t")+temp;
\r
4985 if (selection & SVNSLC_COLURL)
\r
4986 sClipboard += _T("\t")+entry->url;
\r
4987 if (selection & SVNSLC_COLLOCK)
\r
4989 if (!m_HeadRev.IsHead())
\r
4991 // we have contacted the repository
\r
4993 // decision-matrix
\r
4994 // wc repository text
\r
4997 // UID1 UID1 owner
\r
4998 // UID1 "" lock has been broken
\r
4999 // UID1 UID2 lock has been stolen
\r
5000 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))
\r
5002 if (entry->lock_owner.IsEmpty())
\r
5003 temp = entry->lock_remoteowner;
\r
5005 temp = entry->lock_owner;
\r
5007 else if (entry->lock_remotetoken.IsEmpty())
\r
5010 temp.LoadString(IDS_STATUSLIST_LOCKBROKEN);
\r
5015 temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);
\r
5019 temp = entry->lock_owner;
\r
5020 sClipboard += _T("\t")+temp;
\r
5022 if (selection & SVNSLC_COLLOCKCOMMENT)
\r
5023 sClipboard += _T("\t")+entry->lock_comment;
\r
5024 if (selection & SVNSLC_COLAUTHOR)
\r
5025 sClipboard += _T("\t")+entry->last_commit_author;
\r
5026 if (selection & SVNSLC_COLREVISION)
\r
5028 temp.Format(_T("%ld"), entry->last_commit_rev);
\r
5029 if (entry->last_commit_rev == 0)
\r
5031 sClipboard += _T("\t")+temp;
\r
5033 if (selection & SVNSLC_COLREMOTEREVISION)
\r
5035 temp.Format(_T("%ld"), entry->remoterev);
\r
5036 if (entry->remoterev == 0)
\r
5038 sClipboard += _T("\t")+temp;
\r
5040 if (selection & SVNSLC_COLDATE)
\r
5042 TCHAR datebuf[SVN_DATE_BUFFER];
\r
5043 apr_time_t date = entry->last_commit_date;
\r
5044 SVN::formatDate(datebuf, date, true);
\r
5049 sClipboard += _T("\t")+temp;
\r
5051 if (selection & SVNSLC_COLCOPYFROM)
\r
5053 if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)
\r
5054 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());
\r
5056 temp = entry->copyfrom_url;
\r
5057 sClipboard += _T("\t")+temp;
\r
5060 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
\r
5064 if ((dwCols == -1) && m_ColumnManager.IsVisible (i))
\r
5067 = entry->present_props[m_ColumnManager.GetName(i)];
\r
5068 sClipboard += _T("\t") + value;
\r
5072 sClipboard += _T("\r\n");
\r
5075 return CStringUtils::WriteAsciiStringToClipboard(sClipboard);
\r
5081 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()
\r
5084 std::set<CString> changelists;
\r
5085 POSITION pos = GetFirstSelectedItemPosition();
\r
5087 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
5089 FileEntry * entry = GetListEntry(index);
\r
5090 if (!entry->changelist.IsEmpty())
\r
5091 changelists.insert(entry->changelist);
\r
5093 return changelists.size();
\r
5098 bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
\r
5101 bool bHasGroups=false;
\r
5102 if ( this->m_UnRevFileList.GetCount()>0 ||
\r
5103 this->m_IgnoreFileList.GetCount()>0 || bForce)
\r
5105 bHasGroups = true;
\r
5108 RemoveAllGroups();
\r
5109 EnableGroupView(bHasGroups);
\r
5111 TCHAR groupname[1024];
\r
5112 int groupindex = 0;
\r
5116 LVGROUP grp = {0};
\r
5117 grp.cbSize = sizeof(LVGROUP);
\r
5118 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5119 CString sUnassignedName(_T("Modified File"));
\r
5120 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
\r
5121 grp.pszHeader = groupname;
\r
5122 grp.iGroupId = groupindex;
\r
5123 grp.uAlign = LVGA_HEADER_LEFT;
\r
5124 InsertGroup(groupindex++, &grp);
\r
5126 //if(m_UnRevFileList.GetCount()>0)
\r
5128 _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("No Version Control"), 1023);
\r
5129 grp.pszHeader = groupname;
\r
5130 grp.iGroupId = groupindex;
\r
5131 grp.uAlign = LVGA_HEADER_LEFT;
\r
5132 InsertGroup(groupindex++, &grp);
\r
5135 //if(m_IgnoreFileList.GetCount()>0)
\r
5137 _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("Ignored File"), 1023);
\r
5138 grp.pszHeader = groupname;
\r
5139 grp.iGroupId = groupindex;
\r
5140 grp.uAlign = LVGA_HEADER_LEFT;
\r
5141 InsertGroup(groupindex++, &grp);
\r
5147 m_bHasIgnoreGroup = false;
\r
5149 // now add the items which don't belong to a group
\r
5150 LVGROUP grp = {0};
\r
5151 grp.cbSize = sizeof(LVGROUP);
\r
5152 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5153 CString sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET));
\r
5154 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
\r
5155 grp.pszHeader = groupname;
\r
5156 grp.iGroupId = groupindex;
\r
5157 grp.uAlign = LVGA_HEADER_LEFT;
\r
5158 InsertGroup(groupindex++, &grp);
\r
5160 for (std::map<CString,int>::iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
5162 if (it->first.Compare(SVNSLC_IGNORECHANGELIST)!=0)
\r
5164 LVGROUP grp = {0};
\r
5165 grp.cbSize = sizeof(LVGROUP);
\r
5166 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5167 _tcsncpy_s(groupname, 1024, it->first, 1023);
\r
5168 grp.pszHeader = groupname;
\r
5169 grp.iGroupId = groupindex;
\r
5170 grp.uAlign = LVGA_HEADER_LEFT;
\r
5171 it->second = InsertGroup(groupindex++, &grp);
\r
5174 m_bHasIgnoreGroup = true;
\r
5177 if (m_bHasIgnoreGroup)
\r
5179 // and now add the group 'ignore-on-commit'
\r
5180 std::map<CString,int>::iterator it = m_changelists.find(SVNSLC_IGNORECHANGELIST);
\r
5181 if (it != m_changelists.end())
\r
5183 grp.cbSize = sizeof(LVGROUP);
\r
5184 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5185 _tcsncpy_s(groupname, 1024, SVNSLC_IGNORECHANGELIST, 1023);
\r
5186 grp.pszHeader = groupname;
\r
5187 grp.iGroupId = groupindex;
\r
5188 grp.uAlign = LVGA_HEADER_LEFT;
\r
5189 it->second = InsertGroup(groupindex, &grp);
\r
5193 return bHasGroups;
\r
5196 void CGitStatusListCtrl::NotifyCheck()
\r
5198 CWnd* pParent = GetParent();
\r
5199 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
5201 pParent->SendMessage(SVNSLNM_CHECKCHANGED, m_nSelected);
\r
5205 int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash,CTGitPathList *list)
\r
5208 this->m_bBusy=TRUE;
\r
5209 if(hash == GIT_REV_ZERO)
\r
5215 count = list->GetCount();
\r
5217 for(int i=0;i<count;i++)
\r
5222 cmd=(_T("git.exe diff-index --raw HEAD --numstat -C -M"));
\r
5224 cmd.Format(_T("git.exe diff-index --raw HEAD --numstat -C -M -- \"%s\""),(*list)[i].GetGitPathString());
\r
5226 g_Git.Run(cmd,&cmdout);
\r
5232 this->m_StatusFileList.ParserFromLog(out);
\r
5239 count = list->GetCount();
\r
5241 for(int i=0;i<count;i++)
\r
5246 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M %s"),hash);
\r
5248 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M %s -- \"%s\""),hash,(*list)[i].GetGitPathString());
\r
5250 g_Git.Run(cmd,&cmdout);
\r
5254 this->m_StatusFileList.ParserFromLog(out);
\r
5257 for(int i=0;i<m_StatusFileList.GetCount();i++)
\r
5259 CTGitPath * gitpatch=(CTGitPath*)&m_StatusFileList[i];
\r
5260 gitpatch->m_Checked = TRUE;
\r
5261 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
\r
5263 this->m_bBusy=FALSE;
\r
5267 int CGitStatusListCtrl::UpdateWithGitPathList(CTGitPathList &list)
\r
5269 m_arStatusArray.clear();
\r
5270 for(int i=0;i<list.GetCount();i++)
\r
5272 CTGitPath * gitpatch=(CTGitPath*)&list[i];
\r
5273 gitpatch->m_Checked = TRUE;
\r
5274 m_arStatusArray.push_back((CTGitPath*)&list[i]);
\r
5279 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList *List)
\r
5281 this->m_UnRevFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER,List);
\r
5282 for(int i=0;i<m_UnRevFileList.GetCount();i++)
\r
5284 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
\r
5285 gitpatch->m_Checked = FALSE;
\r
5286 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
\r
5291 int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList *List)
\r
5293 this->m_IgnoreFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER|CTGitPath::LOGACTIONS_IGNORE,List);
\r
5294 for(int i=0;i<m_IgnoreFileList.GetCount();i++)
\r
5296 CTGitPath * gitpatch=(CTGitPath*)&m_IgnoreFileList[i];
\r
5297 gitpatch->m_Checked = FALSE;
\r
5298 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
\r
5302 int CGitStatusListCtrl::UpdateFileList(int mask,bool once,CTGitPathList *List)
\r
5304 if(mask&CGitStatusListCtrl::FILELIST_MODIFY)
\r
5306 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_MODIFY)))
\r
5308 UpdateFileList(git_revnum_t(GIT_REV_ZERO),List);
\r
5309 m_FileLoaded|=CGitStatusListCtrl::FILELIST_MODIFY;
\r
5312 if(mask&CGitStatusListCtrl::FILELIST_UNVER)
\r
5314 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_UNVER)))
\r
5316 UpdateUnRevFileList(List);
\r
5317 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
\r
5322 //////////////////////////////////////////////////////////////////////////
\r
5324 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium, DWORD * /*pdwEffect*/, POINTL pt)
\r
5326 if(pFmtEtc->cfFormat == CF_HDROP && medium.tymed == TYMED_HGLOBAL)
\r
5328 HDROP hDrop = (HDROP)GlobalLock(medium.hGlobal);
\r
5331 TCHAR szFileName[MAX_PATH];
\r
5333 UINT cFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
\r
5335 POINT clientpoint;
\r
5336 clientpoint.x = pt.x;
\r
5337 clientpoint.y = pt.y;
\r
5338 ScreenToClient(m_hTargetWnd, &clientpoint);
\r
5339 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
\r
5341 CTSVNPathList changelistItems;
\r
5342 for(UINT i = 0; i < cFiles; ++i)
\r
5344 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
\r
5345 changelistItems.AddPath(CTSVNPath(szFileName));
\r
5347 // find the changelist name
\r
5348 CString sChangelist;
\r
5349 LONG_PTR nGroup = m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint);
\r
5350 for (std::map<CString, int>::iterator it = m_pSVNStatusListCtrl->m_changelists.begin(); it != m_pSVNStatusListCtrl->m_changelists.end(); ++it)
\r
5351 if (it->second == nGroup)
\r
5352 sChangelist = it->first;
\r
5353 if (!sChangelist.IsEmpty())
\r
5356 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
\r
5358 for (int l=0; l<changelistItems.GetCount(); ++l)
\r
5360 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
\r
5363 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
\r
5366 e->changelist = sChangelist;
\r
5367 if (!e->IsFolder())
\r
5369 if (m_pSVNStatusListCtrl->m_changelists.find(e->changelist)!=m_pSVNStatusListCtrl->m_changelists.end())
\r
5370 m_pSVNStatusListCtrl->SetItemGroup(index, m_pSVNStatusListCtrl->m_changelists[e->changelist]);
\r
5372 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
\r
5378 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5379 if (hParentWnd != NULL)
\r
5380 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
\r
5386 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
5392 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
\r
5394 for (int l=0; l<changelistItems.GetCount(); ++l)
\r
5396 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
\r
5399 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
\r
5402 e->changelist = sChangelist;
\r
5403 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
\r
5408 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5409 if (hParentWnd != NULL)
\r
5410 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
\r
5416 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
5422 for(UINT i = 0; i < cFiles; ++i)
\r
5424 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
\r
5425 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5426 if (hParentWnd != NULL)
\r
5427 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)szFileName);
\r
5431 GlobalUnlock(medium.hGlobal);
\r
5433 return true; //let base free the medium
\r
5435 HRESULT STDMETHODCALLTYPE CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect)
\r
5437 CIDropTarget::DragOver(grfKeyState, pt, pdwEffect);
\r
5438 *pdwEffect = DROPEFFECT_COPY;
\r
5439 if (m_pSVNStatusListCtrl)
\r
5441 POINT clientpoint;
\r
5442 clientpoint.x = pt.x;
\r
5443 clientpoint.y = pt.y;
\r
5444 ScreenToClient(m_hTargetWnd, &clientpoint);
\r
5445 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
\r
5447 *pdwEffect = DROPEFFECT_MOVE;
\r
5449 else if ((!m_pSVNStatusListCtrl->m_bFileDropsEnabled)||(m_pSVNStatusListCtrl->m_bOwnDrag))
\r
5451 *pdwEffect = DROPEFFECT_NONE;
\r
OSDN Git Service
