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 */,BOOL UpdateStatusList)
\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 if(UpdateStatusList)
\r
1067 m_arStatusArray.clear();
\r
1068 for(int i=0;i<this->m_StatusFileList.GetCount();i++)
\r
1070 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
\r
1073 for(int i=0;i<this->m_UnRevFileList.GetCount();i++)
\r
1075 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
\r
1078 for(int i=0;i<this->m_IgnoreFileList.GetCount();i++)
\r
1080 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
\r
1083 for(int i=0;i<this->m_arStatusArray.size();i++)
\r
1085 if(((CTGitPath*)m_arStatusArray[i])->m_Action & dwShow)
\r
1086 AddEntry((CTGitPath*)m_arStatusArray[i],langID,i);
\r
1089 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1090 for (int col = 0; col <= maxcol; col++)
\r
1091 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1094 GetStatisticsString();
\r
1096 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1097 HDITEM HeaderItem = {0};
\r
1098 HeaderItem.mask = HDI_FORMAT;
\r
1099 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1101 pHeader->GetItem(i, &HeaderItem);
\r
1102 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1103 pHeader->SetItem(i, &HeaderItem);
\r
1105 if (m_nSortedColumn)
\r
1107 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1108 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1109 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1113 if (nSelectedEntry)
\r
1115 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1116 EnsureVisible(nSelectedEntry, false);
\r
1120 // Restore the item at the top of the list.
\r
1121 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1123 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1131 pApp->DoWaitCursor(-1);
\r
1135 m_dwShow = dwShow;
\r
1139 CWinApp * pApp = AfxGetApp();
\r
1141 pApp->DoWaitCursor(1);
\r
1143 m_bShowFolders = bShowFolders;
\r
1145 int nTopIndex = GetTopIndex();
\r
1146 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
\r
1147 int nSelectedEntry = 0;
\r
1148 if (posSelectedEntry)
\r
1149 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
\r
1155 m_arListArray.clear();
\r
1157 m_arListArray.reserve(m_arStatusArray.size());
\r
1158 SetItemCount (static_cast<int>(m_arStatusArray.size()));
\r
1160 int listIndex = 0;
\r
1161 for (size_t i=0; i < m_arStatusArray.size(); ++i)
\r
1163 FileEntry * entry = m_arStatusArray[i];
\r
1164 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
\r
1166 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
\r
1168 if (entry->IsFolder() && (!bShowFolders))
\r
1169 continue; // don't show folders if they're not wanted.
\r
1172 git_wc_status_kind status = GitStatus::GetMoreImportant(entry->status, entry->remotestatus);
\r
1173 DWORD showFlags = GetShowFlagsFromGitStatus(status);
\r
1174 if (entry->IsLocked())
\r
1175 showFlags |= SVNSLC_SHOWLOCKS;
\r
1176 if (entry->switched)
\r
1177 showFlags |= SVNSLC_SHOWSWITCHED;
\r
1178 if (!entry->changelist.IsEmpty())
\r
1179 showFlags |= SVNSLC_SHOWINCHANGELIST;
\r
1181 bool bAllowCheck = ((entry->changelist.Compare(SVNSLC_IGNORECHANGELIST) != 0)
\r
1182 && (m_bCheckIfGroupsExist || (m_changelists.size()==0 || (m_changelists.size()==1 && m_bHasIgnoreGroup))));
\r
1184 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
\r
1186 if (status != Git_wc_status_ignored || (entry->direct) || (dwShow & GitSLC_SHOWIGNORED))
\r
1188 if ((!entry->IsFolder()) && (status == Git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
\r
1190 if (PathFileExists(entry->GetPath().GetWinPath()))
\r
1192 m_arListArray.push_back(i);
\r
1193 if ((dwCheck & SVNSLC_SHOWREMOVEDANDPRESENT)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1196 entry->checked = true;
\r
1198 AddEntry(entry, langID, listIndex++);
\r
1201 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
\r
1203 m_arListArray.push_back(i);
\r
1204 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1207 entry->checked = true;
\r
1209 AddEntry(entry, langID, listIndex++);
\r
1211 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
\r
1213 m_arListArray.push_back(i);
\r
1214 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1217 entry->checked = true;
\r
1219 AddEntry(entry, langID, listIndex++);
\r
1225 SetItemCount(listIndex);
\r
1227 m_ColumnManager.UpdateRelevance (m_arStatusArray, m_arListArray);
\r
1229 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1230 for (int col = 0; col <= maxcol; col++)
\r
1231 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1234 GetStatisticsString();
\r
1236 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1237 HDITEM HeaderItem = {0};
\r
1238 HeaderItem.mask = HDI_FORMAT;
\r
1239 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1241 pHeader->GetItem(i, &HeaderItem);
\r
1242 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1243 pHeader->SetItem(i, &HeaderItem);
\r
1245 if (m_nSortedColumn)
\r
1247 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1248 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1249 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1252 if (nSelectedEntry)
\r
1254 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1255 EnsureVisible(nSelectedEntry, false);
\r
1259 // Restore the item at the top of the list.
\r
1260 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1262 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1270 pApp->DoWaitCursor(-1);
\r
1272 m_bEmpty = (GetItemCount() == 0);
\r
1278 void CGitStatusListCtrl::Show(DWORD dwShow, const CTGitPathList& checkedList, bool bShowFolders /* = true */)
\r
1283 Locker lock(m_critSec);
\r
1284 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), GetUserDefaultLangID());
\r
1286 CWinApp * pApp = AfxGetApp();
\r
1288 pApp->DoWaitCursor(1);
\r
1289 m_dwShow = dwShow;
\r
1290 m_bShowFolders = bShowFolders;
\r
1292 int nTopIndex = GetTopIndex();
\r
1293 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
\r
1294 int nSelectedEntry = 0;
\r
1295 if (posSelectedEntry)
\r
1296 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
\r
1302 m_arListArray.clear();
\r
1304 m_arListArray.reserve(m_arStatusArray.size());
\r
1305 SetItemCount (static_cast<int>(m_arStatusArray.size()));
\r
1307 int listIndex = 0;
\r
1308 for (size_t i=0; i < m_arStatusArray.size(); ++i)
\r
1310 FileEntry * entry = m_arStatusArray[i];
\r
1311 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
\r
1313 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
\r
1315 if (entry->IsFolder() && (!bShowFolders))
\r
1316 continue; // don't show folders if they're not wanted.
\r
1318 git_wc_status_kind status = SVNStatus::GetMoreImportant(entry->status, entry->remotestatus);
\r
1319 DWORD showFlags = GetShowFlagsFromSVNStatus(status);
\r
1320 if (entry->IsLocked())
\r
1321 showFlags |= SVNSLC_SHOWLOCKS;
\r
1322 if (!entry->changelist.IsEmpty())
\r
1323 showFlags |= SVNSLC_SHOWINCHANGELIST;
\r
1325 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
\r
1326 if (status != git_wc_status_ignored || (entry->direct) || (dwShow & SVNSLC_SHOWIGNORED))
\r
1328 for (int npath = 0; npath < checkedList.GetCount(); ++npath)
\r
1330 if (entry->GetPath().IsEquivalentTo(checkedList[npath]))
\r
1332 entry->checked = true;
\r
1336 if ((!entry->IsFolder()) && (status == git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
\r
1338 if (PathFileExists(entry->GetPath().GetWinPath()))
\r
1340 m_arListArray.push_back(i);
\r
1341 AddEntry(entry, langID, listIndex++);
\r
1344 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
\r
1346 m_arListArray.push_back(i);
\r
1347 AddEntry(entry, langID, listIndex++);
\r
1349 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
\r
1351 m_arListArray.push_back(i);
\r
1352 AddEntry(entry, langID, listIndex++);
\r
1354 else if (entry->switched)
\r
1356 m_arListArray.push_back(i);
\r
1357 AddEntry(entry, langID, listIndex++);
\r
1363 SetItemCount(listIndex);
\r
1365 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1366 for (int col = 0; col <= maxcol; col++)
\r
1367 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1370 GetStatisticsString();
\r
1372 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1373 HDITEM HeaderItem = {0};
\r
1374 HeaderItem.mask = HDI_FORMAT;
\r
1375 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1377 pHeader->GetItem(i, &HeaderItem);
\r
1378 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1379 pHeader->SetItem(i, &HeaderItem);
\r
1381 if (m_nSortedColumn)
\r
1383 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1384 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1385 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1388 if (nSelectedEntry)
\r
1390 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1391 EnsureVisible(nSelectedEntry, false);
\r
1395 // Restore the item at the top of the list.
\r
1396 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1398 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1406 pApp->DoWaitCursor(-1);
\r
1408 m_bEmpty = (GetItemCount() == 0);
\r
1413 int CGitStatusListCtrl::GetColumnIndex(int mask)
\r
1423 void CGitStatusListCtrl::AddEntry(CTGitPath * GitPath, WORD langID, int listIndex)
\r
1425 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
1426 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
1428 CString path = GitPath->GetGitPathString();
\r
1432 int index = listIndex;
\r
1434 CString entryname = GitPath->GetGitPathString();
\r
1436 // if (entry->isfolder)
\r
1437 // icon_idx = m_nIconFolder;
\r
1440 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(*GitPath);
\r
1443 InsertItem(index, entryname, icon_idx);
\r
1445 this->SetItemData(index, (DWORD_PTR)GitPath);
\r
1446 // SVNSLC_COLFILENAME
\r
1447 SetItemText(index, nCol++, GitPath->GetFileOrDirectoryName());
\r
1449 SetItemText(index, nCol++, GitPath->GetFileExtension());
\r
1450 // SVNSLC_COLSTATUS
\r
1451 SetItemText(index, nCol++, GitPath->GetActionName());
\r
1453 SetItemText(index, GetColumnIndex(SVNSLC_COLADD),GitPath->m_StatAdd);
\r
1454 SetItemText(index, GetColumnIndex(SVNSLC_COLDEL),GitPath->m_StatDel);
\r
1457 SetCheck(index, GitPath->m_Checked);
\r
1458 if (GitPath->m_Checked)
\r
1462 if( GitPath->m_Action & CTGitPath::LOGACTIONS_IGNORE)
\r
1463 SetItemGroup(index, 2);
\r
1464 else if( GitPath->m_Action & CTGitPath::LOGACTIONS_UNVER)
\r
1465 SetItemGroup(index,1);
\r
1467 SetItemGroup(index,0);
\r
1473 void CGitStatusListCtrl::AddEntry(FileEntry * entry, WORD langID, int listIndex)
\r
1475 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
1476 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
1478 CString path = entry->GetPath().GetGitPathString();
\r
1479 if ( m_mapFilenameToChecked.size()!=0 && m_mapFilenameToChecked.find(path) != m_mapFilenameToChecked.end() )
\r
1481 // The user manually de-/selected an item. We now restore this status
\r
1482 // when refreshing.
\r
1483 entry->checked = m_mapFilenameToChecked[path];
\r
1488 int index = listIndex;
\r
1490 CString entryname = entry->GetDisplayName();
\r
1492 if (entry->isfolder)
\r
1493 icon_idx = m_nIconFolder;
\r
1496 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(entry->path);
\r
1499 InsertItem(index, entryname, icon_idx);
\r
1500 // SVNSLC_COLFILENAME
\r
1501 SetItemText(index, nCol++, entry->path.GetFileOrDirectoryName());
\r
1503 SetItemText(index, nCol++, entry->path.GetFileExtension());
\r
1504 // SVNSLC_COLSTATUS
\r
1505 if (entry->isNested)
\r
1507 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1508 SetItemText(index, nCol++, sTemp);
\r
1512 GitStatus::GetStatusString(hResourceHandle, entry->status, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1513 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1514 _tcscat_s(buf, 100, _T(" (+)"));
\r
1515 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1516 _tcscat_s(buf, 100, _T(" (s)"));
\r
1518 if ((entry->status == entry->propstatus)&&
\r
1519 (entry->status != git_wc_status_normal)&&
\r
1520 (entry->status != git_wc_status_unversioned)&&
\r
1521 (!GitStatus::IsImportant(entry->textstatus)))
\r
1522 _tcscat_s(buf, 100, ponly);
\r
1524 SetItemText(index, nCol++, buf);
\r
1526 // SVNSLC_COLREMOTESTATUS
\r
1527 if (entry->isNested)
\r
1529 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1530 SetItemText(index, nCol++, sTemp);
\r
1535 SVNStatus::GetStatusString(hResourceHandle, entry->remotestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1536 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1537 _tcscat_s(buf, 100, _T(" (+)"));
\r
1538 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1539 _tcscat_s(buf, 100, _T(" (s)"));
\r
1540 if ((entry->remotestatus == entry->remotepropstatus)&&
\r
1541 (entry->remotestatus != git_wc_status_none)&&
\r
1542 (entry->remotestatus != git_wc_status_normal)&&
\r
1543 (entry->remotestatus != git_wc_status_unversioned)&&
\r
1544 (!SVNStatus::IsImportant(entry->remotetextstatus)))
\r
1545 _tcscat_s(buf, 100, ponly);
\r
1547 SetItemText(index, nCol++, buf);
\r
1549 // SVNSLC_COLTEXTSTATUS
\r
1550 if (entry->isNested)
\r
1552 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1553 SetItemText(index, nCol++, sTemp);
\r
1558 SVNStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1559 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1560 _tcscat_s(buf, 100, _T(" (+)"));
\r
1561 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1562 _tcscat_s(buf, 100, _T(" (s)"));
\r
1564 SetItemText(index, nCol++, buf);
\r
1566 // SVNSLC_COLPROPSTATUS
\r
1567 if (entry->isNested)
\r
1569 SetItemText(index, nCol++, _T(""));
\r
1574 SVNStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1575 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1576 _tcscat_s(buf, 100, _T(" (+)"));
\r
1577 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1578 _tcscat_s(buf, 100, _T(" (s)"));
\r
1580 SetItemText(index, nCol++, buf);
\r
1582 // SVNSLC_COLREMOTETEXT
\r
1583 if (entry->isNested)
\r
1585 SetItemText(index, nCol++, _T(""));
\r
1590 SVNStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1591 SetItemText(index, nCol++, buf);
\r
1594 // SVNSLC_COLREMOTEPROP
\r
1595 if (entry->isNested)
\r
1597 SetItemText(index, nCol++, _T(""));
\r
1601 // SVNStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1602 SetItemText(index, nCol++, buf);
\r
1605 // SetItemText(index, nCol++, entry->url);
\r
1608 if (!m_HeadRev.IsHead())
\r
1610 // we have contacted the repository
\r
1612 // decision-matrix
\r
1613 // wc repository text
\r
1616 // UID1 UID1 owner
\r
1617 // UID1 "" lock has been broken
\r
1618 // UID1 UID2 lock has been stolen
\r
1619 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))
\r
1621 if (entry->lock_owner.IsEmpty())
\r
1622 SetItemText(index, nCol++, entry->lock_remoteowner);
\r
1624 SetItemText(index, nCol++, entry->lock_owner);
\r
1626 else if (entry->lock_remotetoken.IsEmpty())
\r
1629 CString temp(MAKEINTRESOURCE(IDS_STATUSLIST_LOCKBROKEN));
\r
1630 SetItemText(index, nCol++, temp);
\r
1636 temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);
\r
1637 SetItemText(index, nCol++, temp);
\r
1641 SetItemText(index, nCol++, entry->lock_owner);
\r
1642 // SVNSLC_COLLOCKCOMMENT
\r
1643 SetItemText(index, nCol++, entry->lock_comment);
\r
1644 // SVNSLC_COLAUTHOR
\r
1645 SetItemText(index, nCol++, entry->last_commit_author);
\r
1646 // SVNSLC_COLREVISION
\r
1648 temp.Format(_T("%ld"), entry->last_commit_rev);
\r
1649 if (entry->last_commit_rev > 0)
\r
1650 SetItemText(index, nCol++, temp);
\r
1652 SetItemText(index, nCol++, _T(""));
\r
1653 // SVNSLC_COLREMOTEREVISION
\r
1654 temp.Format(_T("%ld"), entry->remoterev);
\r
1655 if (entry->remoterev > 0)
\r
1656 SetItemText(index, nCol++, temp);
\r
1658 SetItemText(index, nCol++, _T(""));
\r
1660 TCHAR datebuf[SVN_DATE_BUFFER];
\r
1661 apr_time_t date = entry->last_commit_date;
\r
1662 SVN::formatDate(datebuf, date, true);
\r
1664 SetItemText(index, nCol++, datebuf);
\r
1666 SetItemText(index, nCol++, _T(""));
\r
1667 // SVNSLC_COLSVNNEEDSLOCK
\r
1668 BOOL bFoundSVNNeedsLock = entry->present_props.IsNeedsLockSet();
\r
1669 CString strSVNNeedsLock = (bFoundSVNNeedsLock) ? _T("*") : _T("");
\r
1670 SetItemText(index, nCol++, strSVNNeedsLock);
\r
1671 // SVNSLC_COLCOPYFROM
\r
1672 if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)
\r
1673 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());
\r
1675 temp = entry->copyfrom_url;
\r
1676 SetItemText(index, nCol++, temp);
\r
1677 // SVNSLC_COLMODIFICATIONDATE
\r
1678 __int64 filetime = entry->GetPath().GetLastWriteTime();
\r
1679 if ( (filetime) && (entry->status!=git_wc_status_deleted) )
\r
1681 FILETIME* f = (FILETIME*)(__int64*)&filetime;
\r
1682 TCHAR datebuf[SVN_DATE_BUFFER];
\r
1683 SVN::formatDate(datebuf,*f,true);
\r
1684 SetItemText(index, nCol++, datebuf);
\r
1688 SetItemText(index, nCol++, _T(""));
\r
1691 // user-defined properties
\r
1692 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
\r
1696 assert (i == nCol++);
\r
1697 assert (m_ColumnManager.IsUserProp (i));
\r
1699 CString name = m_ColumnManager.GetName(i);
\r
1700 if (entry->present_props.HasProperty (name))
\r
1702 const CString& propVal = entry->present_props [name];
\r
1703 if (propVal.IsEmpty())
\r
1704 SetItemText(index, i, m_sNoPropValueText);
\r
1706 SetItemText(index, i, propVal);
\r
1709 SetItemText(index, i, _T(""));
\r
1712 SetCheck(index, entry->checked);
\r
1713 if (entry->checked)
\r
1715 if (m_changelists.find(entry->changelist) != m_changelists.end())
\r
1716 SetItemGroup(index, m_changelists[entry->changelist]);
\r
1718 SetItemGroup(index, 0);
\r
1723 bool CGitStatusListCtrl::SetItemGroup(int item, int groupindex)
\r
1725 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS) == NULL)
\r
1727 if (groupindex < 0)
\r
1730 i.mask = LVIF_GROUPID;
\r
1733 i.iGroupId = groupindex;
\r
1735 return !!SetItem(&i);
\r
1738 void CGitStatusListCtrl::Sort()
\r
1740 Locker lock(m_critSec);
\r
1742 CSorter predicate (&m_ColumnManager, m_nSortedColumn, m_bAscending);
\r
1744 std::sort(m_arStatusArray.begin(), m_arStatusArray.end(), predicate);
\r
1745 SaveColumnWidths();
\r
1746 Show(m_dwShow, 0, m_bShowFolders);
\r
1750 void CGitStatusListCtrl::OnHdnItemclick(NMHDR *pNMHDR, LRESULT *pResult)
\r
1752 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
1757 if (m_nSortedColumn == phdr->iItem)
\r
1758 m_bAscending = !m_bAscending;
\r
1760 m_bAscending = TRUE;
\r
1761 m_nSortedColumn = phdr->iItem;
\r
1762 m_mapFilenameToChecked.clear();
\r
1765 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1766 HDITEM HeaderItem = {0};
\r
1767 HeaderItem.mask = HDI_FORMAT;
\r
1768 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1770 pHeader->GetItem(i, &HeaderItem);
\r
1771 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1772 pHeader->SetItem(i, &HeaderItem);
\r
1774 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1775 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1776 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1778 // the checked state of the list control items must be restored
\r
1780 for (int i=0; i<GetItemCount(); ++i)
\r
1782 CTGitPath * entry = (CTGitPath*)GetItemData(i);
\r
1783 SetCheck(i, entry->m_Checked);
\r
1789 void CGitStatusListCtrl::OnLvnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
\r
1791 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1794 #define ISCHECKED(x) ((x) ? ((((x)&LVIS_STATEIMAGEMASK)>>12)-1) : FALSE)
\r
1795 if ((m_bBlock)&&(m_bBlockUI))
\r
1797 // if we're blocked, prevent changing of the check state
\r
1798 if ((!ISCHECKED(pNMLV->uOldState) && ISCHECKED(pNMLV->uNewState))||
\r
1799 (ISCHECKED(pNMLV->uOldState) && !ISCHECKED(pNMLV->uNewState)))
\r
1804 BOOL CGitStatusListCtrl::OnLvnItemchanged(NMHDR *pNMHDR, LRESULT *pResult)
\r
1806 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1808 if ((pNMLV->uNewState==0)||(pNMLV->uNewState & LVIS_SELECTED)||(pNMLV->uNewState & LVIS_FOCUSED))
\r
1814 bool bSelected = !!(ListView_GetItemState(m_hWnd, pNMLV->iItem, LVIS_SELECTED) & LVIS_SELECTED);
\r
1815 int nListItems = GetItemCount();
\r
1818 // was the item checked?
\r
1820 //CTGitPath *gitpath=(CTGitPath*)GetItemData(pNMLV->iItem);
\r
1821 //gitpath->m_Checked=GetCheck(pNMLV->iItem);
\r
1823 if (GetCheck(pNMLV->iItem))
\r
1825 CheckEntry(pNMLV->iItem, nListItems);
\r
1828 POSITION pos = GetFirstSelectedItemPosition();
\r
1830 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
1832 if (index != pNMLV->iItem)
\r
1833 CheckEntry(index, nListItems);
\r
1839 UncheckEntry(pNMLV->iItem, nListItems);
\r
1842 POSITION pos = GetFirstSelectedItemPosition();
\r
1844 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
1846 if (index != pNMLV->iItem)
\r
1847 UncheckEntry(index, nListItems);
\r
1852 GetStatisticsString();
\r
1859 void CGitStatusListCtrl::OnColumnResized(NMHDR *pNMHDR, LRESULT *pResult)
\r
1861 LPNMHEADER header = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
1862 if ( (header != NULL)
\r
1863 && (header->iItem >= 0)
\r
1864 && (header->iItem < m_ColumnManager.GetColumnCount()))
\r
1866 m_ColumnManager.ColumnResized (header->iItem);
\r
1872 void CGitStatusListCtrl::OnColumnMoved(NMHDR *pNMHDR, LRESULT *pResult)
\r
1874 LPNMHEADER header = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
1876 if ( (header != NULL)
\r
1877 && (header->iItem >= 0)
\r
1878 && (header->iItem < m_ColumnManager.GetColumnCount())
\r
1879 // only allow the reordering if the column was not moved left of the first
\r
1880 // visible item - otherwise the 'invisible' columns are not at the far left
\r
1881 // anymore and we get all kinds of redrawing problems.
\r
1882 && (header->pitem)
\r
1883 && (header->pitem->iOrder > m_ColumnManager.GetInvisibleCount()))
\r
1885 m_ColumnManager.ColumnMoved (header->iItem, header->pitem->iOrder);
\r
1889 Invalidate(FALSE);
\r
1892 void CGitStatusListCtrl::CheckEntry(int index, int nListItems)
\r
1894 Locker lock(m_critSec);
\r
1895 //FileEntry * entry = GetListEntry(index);
\r
1896 CTGitPath *path=(CTGitPath*)GetItemData(index);
\r
1897 ASSERT(path != NULL);
\r
1900 SetCheck(index, TRUE);
\r
1901 //entry = GetListEntry(index);
\r
1902 // if an unversioned item was checked, then we need to check if
\r
1903 // the parent folders are unversioned too. If the parent folders actually
\r
1904 // are unversioned, then check those too.
\r
1906 if (entry->status == git_wc_status_unversioned)
\r
1908 // we need to check the parent folder too
\r
1909 const CTGitPath& folderpath = entry->path;
\r
1910 for (int i=0; i< nListItems; ++i)
\r
1912 FileEntry * testEntry = GetListEntry(i);
\r
1913 ASSERT(testEntry != NULL);
\r
1914 if (testEntry == NULL)
\r
1916 if (!testEntry->checked)
\r
1918 if (testEntry->path.IsAncestorOf(folderpath) && (!testEntry->path.IsEquivalentTo(folderpath)))
\r
1920 SetEntryCheck(testEntry,i,true);
\r
1926 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
1927 if ( (entry->status == git_wc_status_deleted) || (m_bCheckChildrenWithParent) || (bShift) )
\r
1929 // if a deleted folder gets checked, we have to check all
\r
1930 // children of that folder too.
\r
1931 if (entry->path.IsDirectory())
\r
1933 SetCheckOnAllDescendentsOf(entry, true);
\r
1936 // if a deleted file or folder gets checked, we have to
\r
1937 // check all parents of this item too.
\r
1938 for (int i=0; i<nListItems; ++i)
\r
1940 FileEntry * testEntry = GetListEntry(i);
\r
1941 ASSERT(testEntry != NULL);
\r
1942 if (testEntry == NULL)
\r
1944 if (!testEntry->checked)
\r
1946 if (testEntry->path.IsAncestorOf(entry->path) && (!testEntry->path.IsEquivalentTo(entry->path)))
\r
1948 if ((testEntry->status == git_wc_status_deleted)||(m_bCheckChildrenWithParent))
\r
1950 SetEntryCheck(testEntry,i,true);
\r
1952 // now we need to check all children of this parent folder
\r
1953 SetCheckOnAllDescendentsOf(testEntry, true);
\r
1960 if ( !path->m_Checked )
\r
1962 path->m_Checked = TRUE;
\r
1967 void CGitStatusListCtrl::UncheckEntry(int index, int nListItems)
\r
1969 Locker lock(m_critSec);
\r
1970 CTGitPath *path=(CTGitPath*)GetItemData(index);
\r
1971 ASSERT(path != NULL);
\r
1974 SetCheck(index, FALSE);
\r
1975 //entry = GetListEntry(index);
\r
1976 // item was unchecked
\r
1978 if (entry->path.IsDirectory())
\r
1980 // disable all files within an unselected folder, except when unchecking a folder with property changes
\r
1981 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
1982 if ( (entry->status != git_wc_status_modified) || (bShift) )
\r
1984 SetCheckOnAllDescendentsOf(entry, false);
\r
1987 else if (entry->status == git_wc_status_deleted)
\r
1989 // a "deleted" file was unchecked, so uncheck all parent folders
\r
1990 // and all children of those parents
\r
1991 for (int i=0; i<nListItems; i++)
\r
1993 FileEntry * testEntry = GetListEntry(i);
\r
1994 ASSERT(testEntry != NULL);
\r
1995 if (testEntry == NULL)
\r
1997 if (testEntry->checked)
\r
1999 if (testEntry->path.IsAncestorOf(entry->path))
\r
2001 if (testEntry->status == git_wc_status_deleted)
\r
2003 SetEntryCheck(testEntry,i,false);
\r
2006 SetCheckOnAllDescendentsOf(testEntry, false);
\r
2013 if ( path->m_Checked )
\r
2015 path->m_Checked = FALSE;
\r
2020 bool CGitStatusListCtrl::EntryPathCompareNoCase(const FileEntry* pEntry1, const FileEntry* pEntry2)
\r
2022 return pEntry1->path < pEntry2->path;
\r
2025 bool CGitStatusListCtrl::IsEntryVersioned(const FileEntry* pEntry1)
\r
2027 return pEntry1->status != git_wc_status_unversioned;
\r
2030 bool CGitStatusListCtrl::BuildStatistics()
\r
2033 bool bRefetchStatus = false;
\r
2034 FileEntryVector::iterator itFirstUnversionedEntry;
\r
2035 itFirstUnversionedEntry = std::partition(m_arStatusArray.begin(), m_arStatusArray.end(), IsEntryVersioned);
\r
2036 if (m_bUnversionedLast)
\r
2038 // We partition the list of items so that it's arrange with all the versioned items first
\r
2039 // then all the unversioned items afterwards.
\r
2040 // Then we sort the versioned part of this, so that we can do quick look-ups in it
\r
2041 std::sort(m_arStatusArray.begin(), itFirstUnversionedEntry, EntryPathCompareNoCase);
\r
2042 // Also sort the unversioned section, to make the list look nice...
\r
2043 std::sort(itFirstUnversionedEntry, m_arStatusArray.end(), EntryPathCompareNoCase);
\r
2046 // now gather some statistics
\r
2047 m_nUnversioned = 0;
\r
2052 m_nConflicted = 0;
\r
2055 for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2057 const FileEntry * entry = m_arStatusArray[i];
\r
2060 switch (entry->status)
\r
2062 case git_wc_status_normal:
\r
2065 case git_wc_status_added:
\r
2068 case git_wc_status_missing:
\r
2069 case git_wc_status_deleted:
\r
2072 case git_wc_status_replaced:
\r
2073 case git_wc_status_modified:
\r
2074 case git_wc_status_merged:
\r
2077 case git_wc_status_conflicted:
\r
2078 case git_wc_status_obstructed:
\r
2081 case git_wc_status_ignored:
\r
2087 if (GitStatus::IsImportant(entry->remotestatus))
\r
2090 // If an entry is in an unversioned folder, we don't have to do an expensive array search
\r
2091 // to find out if it got case-renamed: an unversioned folder can't have versioned files
\r
2092 // But nested folders are also considered to be in unversioned folders, we have to do the
\r
2093 // check in that case too, otherwise we would miss case-renamed folders - they show up
\r
2094 // as nested folders.
\r
2095 if (((!entry->inunversionedfolder)||(entry->isNested))&&(m_bUnversionedLast))
\r
2097 // check if the unversioned item is just
\r
2098 // a file differing in case but still versioned
\r
2099 FileEntryVector::iterator itMatchingItem;
\r
2100 if(std::binary_search(m_arStatusArray.begin(), itFirstUnversionedEntry, entry, EntryPathCompareNoCase))
\r
2102 // We've confirmed that there *is* a matching file
\r
2103 // Find its exact location
\r
2104 FileEntryVector::iterator itMatchingItem;
\r
2105 itMatchingItem = std::lower_bound(m_arStatusArray.begin(), itFirstUnversionedEntry, entry, EntryPathCompareNoCase);
\r
2107 // adjust the case of the filename
\r
2108 if (MoveFileEx(entry->path.GetWinPath(), (*itMatchingItem)->path.GetWinPath(), MOVEFILE_REPLACE_EXISTING))
\r
2110 // We successfully adjusted the case in the filename. But there is now a file with status 'missing'
\r
2111 // in the array, because that's the status of the file before we adjusted the case.
\r
2112 // We have to refetch the status of that file.
\r
2113 // Since fetching the status of single files/directories is very expensive and there can be
\r
2114 // multiple case-renames here, we just set a flag and refetch the status at the end from scratch.
\r
2115 bRefetchStatus = true;
\r
2117 m_arStatusArray.erase(m_arStatusArray.begin()+i);
\r
2121 // now that we removed an unversioned item from the array, find the first unversioned item in the 'new'
\r
2123 itFirstUnversionedEntry = std::partition(m_arStatusArray.begin(), m_arStatusArray.end(), IsEntryVersioned);
\r
2131 } // switch (entry->status)
\r
2133 } // for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2134 return !bRefetchStatus;
\r
2139 void CGitStatusListCtrl::GetMinMaxRevisions(git_revnum_t& rMin, git_revnum_t& rMax, bool bShownOnly, bool bCheckedOnly)
\r
2142 Locker lock(m_critSec);
\r
2146 if ((bShownOnly)||(bCheckedOnly))
\r
2148 for (int i=0; i<GetItemCount(); ++i)
\r
2150 const FileEntry * entry = GetListEntry(i);
\r
2152 if ((entry)&&(entry->last_commit_rev))
\r
2154 if ((!bCheckedOnly)||(entry->IsChecked()))
\r
2156 if (entry->last_commit_rev >= 0)
\r
2158 rMin = min(rMin, entry->last_commit_rev);
\r
2159 rMax = max(rMax, entry->last_commit_rev);
\r
2167 for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2169 const FileEntry * entry = m_arStatusArray[i];
\r
2170 if ((entry)&&(entry->last_commit_rev))
\r
2172 if (entry->last_commit_rev >= 0)
\r
2174 rMin = min(rMin, entry->last_commit_rev);
\r
2175 rMax = max(rMax, entry->last_commit_rev);
\r
2180 if (rMin == LONG_MAX)
\r
2185 int CGitStatusListCtrl::GetGroupFromPoint(POINT * ppt)
\r
2187 // the point must be relative to the upper left corner of the control
\r
2191 if (!IsGroupViewEnabled())
\r
2199 GetWindowRect(&rc);
\r
2200 while (((flags & LVHT_BELOW) == 0)&&(pt.y < rc.bottom))
\r
2202 nItem = HitTest(pt, &flags);
\r
2203 if ((flags & LVHT_ONITEM)||(flags & LVHT_EX_GROUP_HEADER))
\r
2205 // the first item below the point
\r
2207 // check if the point is too much right (i.e. if the point
\r
2208 // is farther to the right than the width of the item)
\r
2210 GetItemRect(nItem, &r, LVIR_LABEL);
\r
2211 if (ppt->x > r.right)
\r
2215 lv.mask = LVIF_GROUPID;
\r
2218 int groupID = lv.iGroupId;
\r
2219 // now we search upwards and check if the item above this one
\r
2220 // belongs to another group. If it belongs to the same group,
\r
2221 // we're not over a group header
\r
2225 nItem = HitTest(pt, &flags);
\r
2226 if ((flags & LVHT_ONITEM)&&(nItem >= 0))
\r
2228 // the first item below the point
\r
2230 lv.mask = LVIF_GROUPID;
\r
2233 if (lv.iGroupId != groupID)
\r
2248 void CGitStatusListCtrl::OnContextMenuGroup(CWnd * /*pWnd*/, CPoint point)
\r
2250 POINT clientpoint = point;
\r
2251 ScreenToClient(&clientpoint);
\r
2252 if ((IsGroupViewEnabled())&&(GetGroupFromPoint(&clientpoint) >= 0))
\r
2255 if (popup.CreatePopupMenu())
\r
2258 temp.LoadString(IDS_STATUSLIST_CHECKGROUP);
\r
2259 popup.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CHECKGROUP, temp);
\r
2260 temp.LoadString(IDS_STATUSLIST_UNCHECKGROUP);
\r
2261 popup.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_UNCHECKGROUP, temp);
\r
2262 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2263 bool bCheck = false;
\r
2266 case IDSVNLC_CHECKGROUP:
\r
2268 // fall through here
\r
2269 case IDSVNLC_UNCHECKGROUP:
\r
2271 int group = GetGroupFromPoint(&clientpoint);
\r
2272 // go through all items and check/uncheck those assigned to the group
\r
2273 // but block the OnLvnItemChanged handler
\r
2276 for (int i=0; i<GetItemCount(); ++i)
\r
2278 SecureZeroMemory(&lv, sizeof(LVITEM));
\r
2279 lv.mask = LVIF_GROUPID;
\r
2283 if (lv.iGroupId == group)
\r
2285 FileEntry * entry = GetListEntry(i);
\r
2288 bool bOldCheck = !!GetCheck(i);
\r
2289 //SetEntryCheck(entry, i, bCheck);
\r
2290 if (bCheck != bOldCheck)
\r
2301 GetStatisticsString();
\r
2311 void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
\r
2314 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
2316 bool XPorLater = false;
\r
2317 OSVERSIONINFOEX inf;
\r
2318 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
2319 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
2320 GetVersionEx((OSVERSIONINFO *)&inf);
\r
2321 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
2322 if (fullver >= 0x0501)
\r
2324 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
2325 CTGitPath * filepath;
\r
2327 int selIndex = GetSelectionMark();
\r
2328 if ((point.x == -1) && (point.y == -1))
\r
2331 GetItemRect(selIndex, &rect, LVIR_LABEL);
\r
2332 ClientToScreen(&rect);
\r
2333 point = rect.CenterPoint();
\r
2335 if ((GetSelectedCount() == 0)&&(XPorLater)&&(m_bHasCheckboxes))
\r
2337 // nothing selected could mean the context menu is requested for
\r
2339 OnContextMenuGroup(pWnd, point);
\r
2341 else if (selIndex >= 0)
\r
2343 //FileEntry * entry = GetListEntry(selIndex);
\r
2345 filepath = (CTGitPath * )GetItemData(selIndex);
\r
2347 ASSERT(filepath != NULL);
\r
2348 if (filepath == NULL)
\r
2351 //const CTGitPath& filepath = entry->path;
\r
2352 int wcStatus = filepath->m_Action;
\r
2353 // entry is selected, now show the popup menu
\r
2354 Locker lock(m_critSec);
\r
2356 CMenu changelistSubMenu;
\r
2357 CMenu ignoreSubMenu;
\r
2358 if (popup.CreatePopupMenu())
\r
2360 //Add Menu for verion controled file
\r
2361 if (!(wcStatus &CTGitPath::LOGACTIONS_UNVER))
\r
2363 if (m_dwContextMenus & SVNSLC_POPCOMPAREWITHBASE)
\r
2365 popup.AppendMenuIcon(IDSVNLC_COMPARE, IDS_LOG_COMPAREWITHBASE, IDI_DIFF);
\r
2366 popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2368 //Select one items
\r
2369 if (GetSelectedCount() == 1)
\r
2371 bool bEntryAdded = false;
\r
2372 //if (entry->remotestatus <= git_wc_status_normal)
\r
2374 // if (wcStatus > git_wc_status_normal)
\r
2376 // if ((m_dwContextMenus & SVNSLC_POPGNUDIFF)&&(wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing))
\r
2378 if(!g_Git.IsInitRepos())
\r
2379 popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
\r
2381 bEntryAdded = true;
\r
2386 //else if (wcStatus != git_wc_status_deleted)
\r
2388 // if (m_dwContextMenus & SVNSLC_POPCOMPARE)
\r
2390 // popup.AppendMenuIcon(IDSVNLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
\r
2391 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2392 // bEntryAdded = true;
\r
2394 // if (m_dwContextMenus & SVNSLC_POPGNUDIFF)
\r
2396 // popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
\r
2397 // bEntryAdded = true;
\r
2401 popup.AppendMenu(MF_SEPARATOR);
\r
2403 //else if (GetSelectedCount() > 1)
\r
2405 // if (m_dwContextMenus & SVNSLC_POPCOMMIT)
\r
2407 // popup.AppendMenuIcon(IDSVNLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);
\r
2408 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2413 ///Select Multi item
\r
2414 //if (GetSelectedCount() > 0)
\r
2416 // if ((GetSelectedCount() == 2)&&(m_dwContextMenus & SVNSLC_POPREPAIRMOVE))
\r
2418 // POSITION pos = GetFirstSelectedItemPosition();
\r
2419 // int index = GetNextSelectedItem(pos);
\r
2420 // if (index >= 0)
\r
2422 // FileEntry * entry = GetListEntry(index);
\r
2423 // git_wc_status_kind status1 = git_wc_status_none;
\r
2424 // git_wc_status_kind status2 = git_wc_status_none;
\r
2426 // status1 = entry->status;
\r
2427 // index = GetNextSelectedItem(pos);
\r
2428 // if (index >= 0)
\r
2430 // entry = GetListEntry(index);
\r
2432 // status2 = entry->status;
\r
2433 // if ((status1 == git_wc_status_missing && status2 == git_wc_status_unversioned) ||
\r
2434 // (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned))
\r
2436 // popup.AppendMenuIcon(IDSVNLC_REPAIRMOVE, IDS_STATUSLIST_CONTEXT_REPAIRMOVE);
\r
2441 // if (wcStatus > git_wc_status_normal)
\r
2443 // if (m_dwContextMenus & SVNSLC_POPREVERT)
\r
2445 // // reverting missing folders is not possible
\r
2446 // if (!entry->IsFolder() || (wcStatus != git_wc_status_missing))
\r
2448 // popup.AppendMenuIcon(IDSVNLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
\r
2452 // if (entry->remotestatus > git_wc_status_normal)
\r
2454 // if (m_dwContextMenus & SVNSLC_POPUPDATE)
\r
2456 // popup.AppendMenuIcon(IDSVNLC_UPDATE, IDS_MENUUPDATE, IDI_UPDATE);
\r
2460 if ((GetSelectedCount() == 1)&&(!wcStatus & CTGitPath::LOGACTIONS_UNVER)
\r
2461 &&(!wcStatus & CTGitPath::LOGACTIONS_IGNORE))
\r
2463 if (m_dwContextMenus & SVNSLC_POPSHOWLOG)
\r
2465 popup.AppendMenuIcon(IDSVNLC_LOG, IDS_REPOBROWSE_SHOWLOG, IDI_LOG);
\r
2467 // if (m_dwContextMenus & SVNSLC_POPBLAME)
\r
2469 // popup.AppendMenuIcon(IDSVNLC_BLAME, IDS_MENUBLAME, IDI_BLAME);
\r
2472 // if ((wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing) && (GetSelectedCount() == 1))
\r
2474 if (m_dwContextMenus & SVNSLC_POPOPEN)
\r
2476 popup.AppendMenuIcon(IDSVNLC_OPEN, IDS_REPOBROWSE_OPEN, IDI_OPEN);
\r
2477 popup.AppendMenuIcon(IDSVNLC_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
\r
2479 if (m_dwContextMenus & SVNSLC_POPEXPLORE)
\r
2481 popup.AppendMenuIcon(IDSVNLC_EXPLORE, IDS_STATUSLIST_CONTEXT_EXPLORE, IDI_EXPLORER);
\r
2484 if (GetSelectedCount() > 0)
\r
2486 // if (((wcStatus == git_wc_status_unversioned)||(wcStatus == git_wc_status_ignored))&&(m_dwContextMenus & SVNSLC_POPDELETE))
\r
2488 // popup.AppendMenuIcon(IDSVNLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
\r
2490 // 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
2493 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVEKEEP, IDI_DELETE);
\r
2495 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVE, IDI_DELETE);
\r
2497 if ((wcStatus & CTGitPath::LOGACTIONS_UNVER)/*||(wcStatus == git_wc_status_deleted)*/)
\r
2499 if (m_dwContextMenus & SVNSLC_POPADD)
\r
2501 //if ( entry->IsFolder() )
\r
2503 // popup.AppendMenuIcon(IDSVNLC_ADD_RECURSIVE, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE, IDI_ADD);
\r
2507 popup.AppendMenuIcon(IDSVNLC_ADD, IDS_STATUSLIST_CONTEXT_ADD, IDI_ADD);
\r
2511 //if ( (wcStatus == git_wc_status_unversioned) || (wcStatus == git_wc_status_deleted) )
\r
2513 if (m_dwContextMenus & SVNSLC_POPIGNORE)
\r
2516 CTGitPathList ignorelist;
\r
2517 FillListOfSelectedItemPaths(ignorelist);
\r
2518 //check if all selected entries have the same extension
\r
2519 bool bSameExt = true;
\r
2521 for (int i=0; i<ignorelist.GetCount(); ++i)
\r
2523 if (sExt.IsEmpty() && (i==0))
\r
2524 sExt = ignorelist[i].GetFileExtension();
\r
2525 else if (sExt.CompareNoCase(ignorelist[i].GetFileExtension())!=0)
\r
2530 if (ignoreSubMenu.CreateMenu())
\r
2532 CString ignorepath;
\r
2533 if (ignorelist.GetCount()==1)
\r
2534 ignorepath = ignorelist[0].GetFileOrDirectoryName();
\r
2536 ignorepath.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
\r
2537 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_IGNORE, ignorepath);
\r
2538 ignorepath = _T("*")+sExt;
\r
2539 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_IGNOREMASK, ignorepath);
\r
2541 temp.LoadString(IDS_MENUIGNORE);
\r
2542 popup.InsertMenu((UINT)-1, MF_BYPOSITION | MF_POPUP, (UINT_PTR)ignoreSubMenu.m_hMenu, temp);
\r
2548 if (ignorelist.GetCount()==1)
\r
2550 temp.LoadString(IDS_MENUIGNORE);
\r
2554 temp.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
\r
2556 popup.AppendMenuIcon(IDSVNLC_IGNORE, temp, IDI_IGNORE);
\r
2562 if (((wcStatus == git_wc_status_conflicted)||(entry->isConflicted)))
\r
2564 if ((m_dwContextMenus & SVNSLC_POPCONFLICT)||(m_dwContextMenus & SVNSLC_POPRESOLVE))
\r
2565 popup.AppendMenu(MF_SEPARATOR);
\r
2567 if ((m_dwContextMenus & SVNSLC_POPCONFLICT)&&(entry->textstatus == git_wc_status_conflicted))
\r
2569 popup.AppendMenuIcon(IDSVNLC_EDITCONFLICT, IDS_MENUCONFLICT, IDI_CONFLICT);
\r
2571 if (m_dwContextMenus & SVNSLC_POPRESOLVE)
\r
2573 popup.AppendMenuIcon(IDSVNLC_RESOLVECONFLICT, IDS_STATUSLIST_CONTEXT_RESOLVED, IDI_RESOLVE);
\r
2575 if ((m_dwContextMenus & SVNSLC_POPRESOLVE)&&(entry->textstatus == git_wc_status_conflicted))
\r
2577 popup.AppendMenuIcon(IDSVNLC_RESOLVETHEIRS, IDS_SVNPROGRESS_MENUUSETHEIRS, IDI_RESOLVE);
\r
2578 popup.AppendMenuIcon(IDSVNLC_RESOLVEMINE, IDS_SVNPROGRESS_MENUUSEMINE, IDI_RESOLVE);
\r
2583 if (GetSelectedCount() > 0)
\r
2586 if ((!entry->IsFolder())&&(wcStatus >= git_wc_status_normal)
\r
2587 &&(wcStatus!=git_wc_status_missing)&&(wcStatus!=git_wc_status_deleted)
\r
2588 &&(wcStatus!=git_wc_status_added))
\r
2590 popup.AppendMenu(MF_SEPARATOR);
\r
2591 if ((entry->lock_token.IsEmpty())&&(!entry->IsFolder()))
\r
2593 if (m_dwContextMenus & SVNSLC_POPLOCK)
\r
2595 popup.AppendMenuIcon(IDSVNLC_LOCK, IDS_MENU_LOCK, IDI_LOCK);
\r
2598 if ((!entry->lock_token.IsEmpty())&&(!entry->IsFolder()))
\r
2600 if (m_dwContextMenus & SVNSLC_POPUNLOCK)
\r
2602 popup.AppendMenuIcon(IDSVNLC_UNLOCK, IDS_MENU_UNLOCK, IDI_UNLOCK);
\r
2607 if ((!entry->IsFolder())&&((!entry->lock_token.IsEmpty())||(!entry->lock_remotetoken.IsEmpty())))
\r
2609 if (m_dwContextMenus & SVNSLC_POPUNLOCKFORCE)
\r
2611 popup.AppendMenuIcon(IDSVNLC_UNLOCKFORCE, IDS_MENU_UNLOCKFORCE, IDI_UNLOCK);
\r
2615 if (wcStatus != git_wc_status_missing && wcStatus != git_wc_status_deleted &&wcStatus!=git_wc_status_unversioned)
\r
2617 popup.AppendMenu(MF_SEPARATOR);
\r
2618 popup.AppendMenuIcon(IDSVNLC_PROPERTIES, IDS_STATUSLIST_CONTEXT_PROPERTIES, IDI_PROPERTIES);
\r
2620 popup.AppendMenu(MF_SEPARATOR);
\r
2621 popup.AppendMenuIcon(IDSVNLC_COPY, IDS_STATUSLIST_CONTEXT_COPY, IDI_COPYCLIP);
\r
2622 popup.AppendMenuIcon(IDSVNLC_COPYEXT, IDS_STATUSLIST_CONTEXT_COPYEXT, IDI_COPYCLIP);
\r
2623 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS)&&(XPorLater)
\r
2624 &&(wcStatus != git_wc_status_unversioned)&&(wcStatus != git_wc_status_none))
\r
2626 popup.AppendMenu(MF_SEPARATOR);
\r
2627 // changelist commands
\r
2628 size_t numChangelists = GetNumberOfChangelistsInSelection();
\r
2629 if (numChangelists > 0)
\r
2631 popup.AppendMenuIcon(IDSVNLC_REMOVEFROMCS, IDS_STATUSLIST_CONTEXT_REMOVEFROMCS);
\r
2633 if ((!entry->IsFolder())&&(changelistSubMenu.CreateMenu()))
\r
2636 temp.LoadString(IDS_STATUSLIST_CONTEXT_CREATECS);
\r
2637 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATECS, temp);
\r
2639 if (entry->changelist.Compare(SVNSLC_IGNORECHANGELIST))
\r
2641 changelistSubMenu.AppendMenu(MF_SEPARATOR);
\r
2642 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATEIGNORECS, SVNSLC_IGNORECHANGELIST);
\r
2645 if (m_changelists.size() > 0)
\r
2647 // find the changelist names
\r
2648 bool bNeedSeparator = true;
\r
2649 int cmdID = IDSVNLC_MOVETOCS;
\r
2650 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
2652 if ((entry->changelist.Compare(it->first))&&(it->first.Compare(SVNSLC_IGNORECHANGELIST)))
\r
2654 if (bNeedSeparator)
\r
2656 changelistSubMenu.AppendMenu(MF_SEPARATOR);
\r
2657 bNeedSeparator = false;
\r
2659 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, cmdID, it->first);
\r
2664 temp.LoadString(IDS_STATUSLIST_CONTEXT_MOVETOCS);
\r
2665 popup.AppendMenu(MF_POPUP|MF_STRING, (UINT_PTR)changelistSubMenu.GetSafeHmenu(), temp);
\r
2670 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2673 AfxGetApp()->DoWaitCursor(1);
\r
2674 int iItemCountBeforeMenuCmd = GetItemCount();
\r
2675 bool bForce = false;
\r
2678 case IDSVNLC_OPEN:
\r
2681 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
\r
2683 file= filepath->GetWinPath();
\r
2687 GetTempPath(temppath);
\r
2688 file.Format(_T("%s%s_%s%s"),
\r
2690 filepath->GetBaseFilename(),
\r
2691 m_CurrentVersion.Left(6),
\r
2692 filepath->GetFileExtension());
\r
2695 int ret = (int)ShellExecute(this->m_hWnd, NULL,file, NULL, NULL, SW_SHOW);
\r
2696 if (ret <= HINSTANCE_ERROR)
\r
2698 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
2700 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
2704 case IDSVNLC_OPENWITH:
\r
2707 if(m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
\r
2709 file= filepath->GetWinPath();
\r
2713 GetTempPath(temppath);
\r
2714 file.Format(_T("%s%s_%s%s"),
\r
2716 filepath->GetBaseFilename(),
\r
2717 m_CurrentVersion.Left(6),
\r
2718 filepath->GetFileExtension());
\r
2722 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
2723 cmd += file + _T(" ");
\r
2724 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
2727 case IDSVNLC_EXPLORE:
\r
2729 ShellExecute(this->m_hWnd, _T("explore"), filepath->GetWinPath(), NULL, NULL, SW_SHOW);
\r
2732 case IDSVNLC_COMPARE:
\r
2734 POSITION pos = GetFirstSelectedItemPosition();
\r
2737 int index = GetNextSelectedItem(pos);
\r
2742 case IDSVNLC_GNUDIFF1:
\r
2744 // SVNDiff diff(NULL, this->m_hWnd, true);
\r
2746 // if (entry->remotestatus <= git_wc_status_normal)
\r
2747 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
\r
2749 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
\r
2750 if(m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
\r
2751 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,GitRev::GetWorkingCopy(),
\r
2752 *filepath,GitRev::GetHead());
\r
2754 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,m_CurrentVersion,
\r
2755 *filepath,m_CurrentVersion+_T("~1"));
\r
2759 { // The add went ok, but we now need to run through the selected items again
\r
2760 // and update their status
\r
2761 POSITION pos = GetFirstSelectedItemPosition();
\r
2763 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
2765 CTGitPath * path=(CTGitPath*)GetItemData(index);
\r
2767 cmd.Format(_T("git.exe add %s"),path->GetGitPathString());
\r
2769 if(!g_Git.Run(cmd,&output))
\r
2771 path->m_Action = CTGitPath::LOGACTIONS_ADDED;
\r
2772 SetEntryCheck(path,index,true);
\r
2773 SetItemGroup(index,0);
\r
2774 this->m_StatusFileList.AddPath(*path);
\r
2775 this->m_UnRevFileList.RemoveItem(*path);
\r
2776 this->m_IgnoreFileList.RemoveItem(*path);
\r
2777 Show(this->m_dwShow,0,true,true);
\r
2784 case IDSVNLC_COPY:
\r
2785 CopySelectedEntriesToClipboard(0);
\r
2787 case IDSVNLC_COPYEXT:
\r
2788 CopySelectedEntriesToClipboard((DWORD)-1);
\r
2790 case IDSVNLC_PROPERTIES:
\r
2792 CTSVNPathList targetList;
\r
2793 FillListOfSelectedItemPaths(targetList);
\r
2794 CEditPropertiesDlg dlg;
\r
2795 dlg.SetPathList(targetList);
\r
2797 if (dlg.HasChanged())
\r
2799 // since the user might have changed/removed/added
\r
2800 // properties recursively, we don't really know
\r
2801 // which items have changed their status.
\r
2802 // So tell the parent to do a refresh.
\r
2803 CWnd* pParent = GetParent();
\r
2804 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
2806 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
2811 case IDSVNLC_COMMIT:
\r
2813 CTSVNPathList targetList;
\r
2814 FillListOfSelectedItemPaths(targetList);
\r
2815 CTSVNPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
\r
2816 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
\r
2817 CString commandline = CPathUtils::GetAppDirectory();
\r
2818 commandline += _T("TortoiseProc.exe /command:commit /pathfile:\"");
\r
2819 commandline += tempFile.GetWinPathString();
\r
2820 commandline += _T("\"");
\r
2821 commandline += _T(" /deletepathfile");
\r
2822 CAppUtils::LaunchApplication(commandline, NULL, false);
\r
2825 case IDSVNLC_REVERT:
\r
2827 // If at least one item is not in the status "added"
\r
2828 // we ask for a confirmation
\r
2829 BOOL bConfirm = FALSE;
\r
2830 POSITION pos = GetFirstSelectedItemPosition();
\r
2832 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
2834 FileEntry * fentry = GetListEntry(index);
\r
2835 if (fentry->textstatus != git_wc_status_added)
\r
2843 str.Format(IDS_PROC_WARNREVERT,GetSelectedCount());
\r
2845 if (!bConfirm || CMessageBox::Show(this->m_hWnd, str, _T("TortoiseSVN"), MB_YESNO | MB_ICONQUESTION)==IDYES)
\r
2847 CTSVNPathList targetList;
\r
2848 FillListOfSelectedItemPaths(targetList);
\r
2850 // make sure that the list is reverse sorted, so that
\r
2851 // children are removed before any parents
\r
2852 targetList.SortByPathname(true);
\r
2856 // put all reverted files in the trashbin, except the ones with 'added'
\r
2857 // status because they are not restored by the revert.
\r
2858 CTSVNPathList delList;
\r
2859 POSITION pos = GetFirstSelectedItemPosition();
\r
2861 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
2863 FileEntry * entry = GetListEntry(index);
\r
2864 if (entry->status != git_wc_status_added)
\r
2865 delList.AddPath(entry->GetPath());
\r
2867 if (DWORD(CRegDWORD(_T("Software\\TortoiseSVN\\RevertWithRecycleBin"), TRUE)))
\r
2868 delList.DeleteAllFiles(true);
\r
2870 if (!git.Revert(targetList, CStringArray(), FALSE))
\r
2872 CMessageBox::Show(this->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
2876 // since the entries got reverted we need to remove
\r
2877 // them from the list too, if no remote changes are shown,
\r
2878 // if the unmodified files are not shown
\r
2879 // and if the item is not part of a changelist
\r
2882 while ((pos = GetFirstSelectedItemPosition())!=0)
\r
2885 index = GetNextSelectedItem(pos);
\r
2886 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
\r
2887 if ( fentry->IsFolder() )
\r
2890 CWnd* pParent = GetParent();
\r
2891 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
2893 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
2898 BOOL bAdded = (fentry->textstatus == git_wc_status_added);
\r
2899 fentry->status = git_wc_status_normal;
\r
2900 fentry->propstatus = git_wc_status_normal;
\r
2901 fentry->textstatus = git_wc_status_normal;
\r
2902 fentry->copied = false;
\r
2903 fentry->isConflicted = false;
\r
2904 if ((fentry->GetChangeList().IsEmpty()&&(fentry->remotestatus <= git_wc_status_normal))||(m_dwShow & SVNSLC_SHOWNORMAL))
\r
2908 // reverting added items makes them unversioned, not 'normal'
\r
2909 if (fentry->IsFolder())
\r
2910 fentry->propstatus = git_wc_status_none;
\r
2912 fentry->propstatus = git_wc_status_unversioned;
\r
2913 fentry->status = git_wc_status_unversioned;
\r
2914 fentry->textstatus = git_wc_status_unversioned;
\r
2915 SetItemState(index, 0, LVIS_SELECTED);
\r
2916 SetEntryCheck(fentry, index, false);
\r
2918 else if ((fentry->switched)||(m_dwShow & SVNSLC_SHOWNORMAL))
\r
2920 SetItemState(index, 0, LVIS_SELECTED);
\r
2925 if (GetCheck(index))
\r
2927 RemoveListEntry(index);
\r
2933 SetItemState(index, 0, LVIS_SELECTED);
\r
2937 SaveColumnWidths();
\r
2938 Show(m_dwShow, 0, m_bShowFolders);
\r
2944 case IDSVNLC_COMPARE:
\r
2946 POSITION pos = GetFirstSelectedItemPosition();
\r
2949 int index = GetNextSelectedItem(pos);
\r
2954 case IDSVNLC_COMPAREWC:
\r
2956 POSITION pos = GetFirstSelectedItemPosition();
\r
2959 int index = GetNextSelectedItem(pos);
\r
2960 FileEntry * entry = GetListEntry(index);
\r
2961 ASSERT(entry != NULL);
\r
2962 if (entry == NULL)
\r
2964 SVNDiff diff(NULL, m_hWnd, true);
\r
2965 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
2966 git_revnum_t baseRev = entry->Revision;
\r
2967 diff.DiffFileAgainstBase(
\r
2968 entry->path, baseRev, entry->textstatus, entry->propstatus);
\r
2972 case IDSVNLC_GNUDIFF1:
\r
2974 SVNDiff diff(NULL, this->m_hWnd, true);
\r
2976 if (entry->remotestatus <= git_wc_status_normal)
\r
2977 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
\r
2979 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
\r
2982 case IDSVNLC_UPDATE:
\r
2984 CTSVNPathList targetList;
\r
2985 FillListOfSelectedItemPaths(targetList);
\r
2986 bool bAllExist = true;
\r
2987 for (int i=0; i<targetList.GetCount(); ++i)
\r
2989 if (!targetList[i].Exists())
\r
2991 bAllExist = false;
\r
2997 CSVNProgressDlg dlg;
\r
2998 dlg.SetCommand(CSVNProgressDlg::SVNProgress_Update);
\r
2999 dlg.SetPathList(targetList);
\r
3000 dlg.SetRevision(SVNRev::REV_HEAD);
\r
3005 CString sTempFile = CTempFiles::Instance().GetTempFilePath(false).GetWinPathString();
\r
3006 targetList.WriteToFile(sTempFile, false);
\r
3008 sCmd.Format(_T("\"%s\" /command:update /rev /pathfile:\"%s\" /deletepathfile"),
\r
3009 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), (LPCTSTR)sTempFile);
\r
3011 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
3018 sCmd.Format(_T("\"%s\" /command:log /path:\"%s\""),
\r
3019 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), filepath.GetWinPath());
\r
3021 if (!filepath.IsUrl())
\r
3023 sCmd += _T(" /propspath:\"");
\r
3024 sCmd += filepath.GetWinPathString();
\r
3028 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
3031 case IDSVNLC_BLAME:
\r
3034 sCmd.Format(_T("\"%s\" /command:blame /path:\"%s\""),
\r
3035 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), filepath.GetWinPath());
\r
3037 if (!filepath.IsUrl())
\r
3039 sCmd += _T(" /propspath:\"");
\r
3040 sCmd += filepath.GetWinPathString();
\r
3044 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
3047 case IDSVNLC_OPEN:
\r
3049 int ret = (int)ShellExecute(this->m_hWnd, NULL, filepath.GetWinPath(), NULL, NULL, SW_SHOW);
\r
3050 if (ret <= HINSTANCE_ERROR)
\r
3052 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
3053 cmd += filepath.GetWinPathString();
\r
3054 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
3058 case IDSVNLC_OPENWITH:
\r
3060 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
3061 cmd += filepath.GetWinPathString() + _T(" ");
\r
3062 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
3065 case IDSVNLC_EXPLORE:
\r
3067 ShellExecute(this->m_hWnd, _T("explore"), filepath.GetDirectory().GetWinPath(), NULL, NULL, SW_SHOW);
\r
3070 case IDSVNLC_REMOVE:
\r
3073 CTSVNPathList itemsToRemove;
\r
3074 FillListOfSelectedItemPaths(itemsToRemove);
\r
3076 // We must sort items before removing, so that files are always removed
\r
3077 // *before* their parents
\r
3078 itemsToRemove.SortByPathname(true);
\r
3080 bool bSuccess = false;
\r
3081 if (git.Remove(itemsToRemove, FALSE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))
\r
3087 if ((git.Err->apr_err == SVN_ERR_UNVERSIONED_RESOURCE) ||
\r
3088 (git.Err->apr_err == SVN_ERR_CLIENT_MODIFIED))
\r
3090 CString msg, yes, no, yestoall;
\r
3091 msg.Format(IDS_PROC_REMOVEFORCE, (LPCTSTR)git.GetLastErrorMessage());
\r
3092 yes.LoadString(IDS_MSGBOX_YES);
\r
3093 no.LoadString(IDS_MSGBOX_NO);
\r
3094 yestoall.LoadString(IDS_PROC_YESTOALL);
\r
3095 UINT ret = CMessageBox::Show(m_hWnd, msg, _T("TortoiseSVN"), 2, IDI_ERROR, yes, no, yestoall);
\r
3096 if ((ret == 1)||(ret==3))
\r
3098 if (!git.Remove(itemsToRemove, TRUE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))
\r
3100 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3107 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3111 // The remove went ok, but we now need to run through the selected items again
\r
3112 // and update their status
\r
3113 POSITION pos = GetFirstSelectedItemPosition();
\r
3115 std::vector<int> entriesToRemove;
\r
3116 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3118 FileEntry * e = GetListEntry(index);
\r
3120 ((e->textstatus == git_wc_status_unversioned)||
\r
3121 (e->textstatus == git_wc_status_none)||
\r
3122 (e->textstatus == git_wc_status_ignored)))
\r
3124 if (GetCheck(index))
\r
3127 entriesToRemove.push_back(index);
\r
3131 e->textstatus = git_wc_status_deleted;
\r
3132 e->status = git_wc_status_deleted;
\r
3133 SetEntryCheck(e,index,true);
\r
3136 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)
\r
3138 RemoveListEntry(*it);
\r
3141 SaveColumnWidths();
\r
3142 Show(m_dwShow, 0, m_bShowFolders);
\r
3146 case IDSVNLC_DELETE:
\r
3148 CTSVNPathList pathlist;
\r
3149 FillListOfSelectedItemPaths(pathlist);
\r
3150 pathlist.RemoveChildren();
\r
3152 for (INT_PTR i=0; i<pathlist.GetCount(); ++i)
\r
3154 filelist += pathlist[i].GetWinPathString();
\r
3155 filelist += _T("|");
\r
3157 filelist += _T("|");
\r
3158 int len = filelist.GetLength();
\r
3159 TCHAR * buf = new TCHAR[len+2];
\r
3160 _tcscpy_s(buf, len+2, filelist);
\r
3161 for (int i=0; i<len; ++i)
\r
3162 if (buf[i] == '|')
\r
3164 SHFILEOPSTRUCT fileop;
\r
3165 fileop.hwnd = this->m_hWnd;
\r
3166 fileop.wFunc = FO_DELETE;
\r
3167 fileop.pFrom = buf;
\r
3168 fileop.pTo = NULL;
\r
3169 fileop.fFlags = FOF_NO_CONNECTED_ELEMENTS | ((GetAsyncKeyState(VK_SHIFT) & 0x8000) ? 0 : FOF_ALLOWUNDO);
\r
3170 fileop.lpszProgressTitle = _T("deleting file");
\r
3171 int result = SHFileOperation(&fileop);
\r
3174 if ( (result==0) && (!fileop.fAnyOperationsAborted) )
\r
3177 POSITION pos = NULL;
\r
3178 CTSVNPathList deletedlist; // to store list of deleted folders
\r
3179 while ((pos = GetFirstSelectedItemPosition()) != 0)
\r
3181 int index = GetNextSelectedItem(pos);
\r
3182 if (GetCheck(index))
\r
3185 FileEntry * fentry = GetListEntry(index);
\r
3186 if ((fentry)&&(fentry->isfolder))
\r
3187 deletedlist.AddPath(fentry->path);
\r
3188 RemoveListEntry(index);
\r
3190 // now go through the list of deleted folders
\r
3191 // and remove all their children from the list too!
\r
3192 int nListboxEntries = GetItemCount();
\r
3193 for (int folderindex = 0; folderindex < deletedlist.GetCount(); ++folderindex)
\r
3195 CTSVNPath folderpath = deletedlist[folderindex];
\r
3196 for (int i=0; i<nListboxEntries; ++i)
\r
3198 FileEntry * entry = GetListEntry(i);
\r
3199 if (folderpath.IsAncestorOf(entry->path))
\r
3201 RemoveListEntry(i--);
\r
3202 nListboxEntries--;
\r
3210 case IDSVNLC_IGNOREMASK:
\r
3212 CString name = _T("*")+filepath.GetFileExtension();
\r
3213 CTSVNPathList ignorelist;
\r
3214 FillListOfSelectedItemPaths(ignorelist, true);
\r
3215 std::set<CTSVNPath> parentlist;
\r
3216 for (int i=0; i<ignorelist.GetCount(); ++i)
\r
3218 parentlist.insert(ignorelist[i].GetContainingDirectory());
\r
3220 std::set<CTSVNPath>::iterator it;
\r
3221 std::vector<CString> toremove;
\r
3223 for (it = parentlist.begin(); it != parentlist.end(); ++it)
\r
3225 CTSVNPath parentFolder = (*it).GetDirectory();
\r
3226 SVNProperties props(parentFolder, SVNRev::REV_WC, false);
\r
3228 for (int i=0; i<props.GetCount(); i++)
\r
3230 CString propname(props.GetItemName(i).c_str());
\r
3231 if (propname.CompareNoCase(_T("git:ignore"))==0)
\r
3234 // treat values as normal text even if they're not
\r
3235 value = (char *)props.GetItemValue(i).c_str();
\r
3238 if (value.IsEmpty())
\r
3242 value = value.Trim("\n\r");
\r
3245 value.Remove('\r');
\r
3247 if (!props.Add(_T("git:ignore"), (LPCSTR)value))
\r
3250 temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
\r
3251 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);
\r
3255 CTSVNPath basepath;
\r
3256 int nListboxEntries = GetItemCount();
\r
3257 for (int i=0; i<nListboxEntries; ++i)
\r
3259 FileEntry * entry = GetListEntry(i);
\r
3260 ASSERT(entry != NULL);
\r
3261 if (entry == NULL)
\r
3263 if (basepath.IsEmpty())
\r
3264 basepath = entry->basepath;
\r
3265 // since we ignored files with a mask (e.g. *.exe)
\r
3266 // we have to find find all files in the same
\r
3267 // folder (IsAncestorOf() returns TRUE for _all_ children,
\r
3268 // not just the immediate ones) which match the
\r
3269 // mask and remove them from the list too.
\r
3270 if ((entry->status == git_wc_status_unversioned)&&(parentFolder.IsAncestorOf(entry->path)))
\r
3272 CString f = entry->path.GetSVNPathString();
\r
3273 if (f.Mid(parentFolder.GetSVNPathString().GetLength()).Find('/')<=0)
\r
3275 if (CStringUtils::WildCardMatch(name, f))
\r
3280 toremove.push_back(f);
\r
3285 if (!m_bIgnoreRemoveOnly)
\r
3288 git_wc_status2_t * s;
\r
3289 CTSVNPath gitPath;
\r
3290 s = status.GetFirstFileStatus(parentFolder, gitPath, false, git_depth_empty);
\r
3293 // first check if the folder isn't already present in the list
\r
3294 bool bFound = false;
\r
3295 for (int i=0; i<nListboxEntries; ++i)
\r
3297 FileEntry * entry = GetListEntry(i);
\r
3298 if (entry->path.IsEquivalentTo(gitPath))
\r
3306 FileEntry * entry = new FileEntry();
\r
3307 entry->path = gitPath;
\r
3308 entry->basepath = basepath;
\r
3309 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
3310 entry->textstatus = s->text_status;
\r
3311 entry->propstatus = s->prop_status;
\r
3312 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);
\r
3313 entry->remotetextstatus = s->repos_text_status;
\r
3314 entry->remotepropstatus = s->repos_prop_status;
\r
3315 entry->inunversionedfolder = false;
\r
3316 entry->checked = true;
\r
3317 entry->inexternal = false;
\r
3318 entry->direct = false;
\r
3319 entry->isfolder = true;
\r
3320 entry->last_commit_date = 0;
\r
3321 entry->last_commit_rev = 0;
\r
3322 entry->remoterev = 0;
\r
3325 if (s->entry->url)
\r
3327 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));
\r
3330 if (s->entry && s->entry->present_props)
\r
3332 entry->present_props = s->entry->present_props;
\r
3334 m_arStatusArray.push_back(entry);
\r
3335 m_arListArray.push_back(m_arStatusArray.size()-1);
\r
3336 AddEntry(entry, langID, GetItemCount());
\r
3342 for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)
\r
3344 int nListboxEntries = GetItemCount();
\r
3345 for (int i=0; i<nListboxEntries; ++i)
\r
3347 if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)
\r
3349 RemoveListEntry(i);
\r
3357 case IDSVNLC_IGNORE:
\r
3359 CTSVNPathList ignorelist;
\r
3360 std::vector<CString> toremove;
\r
3361 FillListOfSelectedItemPaths(ignorelist, true);
\r
3363 for (int j=0; j<ignorelist.GetCount(); ++j)
\r
3365 int nListboxEntries = GetItemCount();
\r
3366 for (int i=0; i<nListboxEntries; ++i)
\r
3368 if (GetListEntry(i)->GetPath().IsEquivalentTo(ignorelist[j]))
\r
3374 CString name = CPathUtils::PathPatternEscape(ignorelist[j].GetFileOrDirectoryName());
\r
3375 CTSVNPath parentfolder = ignorelist[j].GetContainingDirectory();
\r
3376 SVNProperties props(parentfolder, SVNRev::REV_WC, false);
\r
3378 for (int i=0; i<props.GetCount(); i++)
\r
3380 CString propname(props.GetItemName(i).c_str());
\r
3381 if (propname.CompareNoCase(_T("git:ignore"))==0)
\r
3384 // treat values as normal text even if they're not
\r
3385 value = (char *)props.GetItemValue(i).c_str();
\r
3388 if (value.IsEmpty())
\r
3392 value = value.Trim("\n\r");
\r
3395 value.Remove('\r');
\r
3397 if (!props.Add(_T("git:ignore"), (LPCSTR)value))
\r
3400 temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
\r
3401 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);
\r
3404 if (GetCheck(selIndex))
\r
3408 // now, if we ignored a folder, remove all its children
\r
3409 if (ignorelist[j].IsDirectory())
\r
3411 for (int i=0; i<(int)m_arListArray.size(); ++i)
\r
3413 FileEntry * entry = GetListEntry(i);
\r
3414 if (entry->status == git_wc_status_unversioned)
\r
3416 if (!ignorelist[j].IsEquivalentTo(entry->GetPath())&&(ignorelist[j].IsAncestorOf(entry->GetPath())))
\r
3418 entry->status = git_wc_status_ignored;
\r
3419 entry->textstatus = git_wc_status_ignored;
\r
3422 toremove.push_back(entry->GetPath().GetSVNPathString());
\r
3428 CTSVNPath basepath = m_arStatusArray[m_arListArray[selIndex]]->basepath;
\r
3430 FileEntry * entry = m_arStatusArray[m_arListArray[selIndex]];
\r
3431 if ( entry->status == git_wc_status_unversioned ) // keep "deleted" items
\r
3432 toremove.push_back(entry->GetPath().GetSVNPathString());
\r
3434 if (!m_bIgnoreRemoveOnly)
\r
3437 git_wc_status2_t * s;
\r
3438 CTSVNPath gitPath;
\r
3439 s = status.GetFirstFileStatus(parentfolder, gitPath, false, git_depth_empty);
\r
3440 // first check if the folder isn't already present in the list
\r
3441 bool bFound = false;
\r
3442 nListboxEntries = GetItemCount();
\r
3443 for (int i=0; i<nListboxEntries; ++i)
\r
3445 FileEntry * entry = GetListEntry(i);
\r
3446 if (entry->path.IsEquivalentTo(gitPath))
\r
3456 FileEntry * entry = new FileEntry();
\r
3457 entry->path = gitPath;
\r
3458 entry->basepath = basepath;
\r
3459 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
3460 entry->textstatus = s->text_status;
\r
3461 entry->propstatus = s->prop_status;
\r
3462 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);
\r
3463 entry->remotetextstatus = s->repos_text_status;
\r
3464 entry->remotepropstatus = s->repos_prop_status;
\r
3465 entry->inunversionedfolder = FALSE;
\r
3466 entry->checked = true;
\r
3467 entry->inexternal = false;
\r
3468 entry->direct = false;
\r
3469 entry->isfolder = true;
\r
3470 entry->last_commit_date = 0;
\r
3471 entry->last_commit_rev = 0;
\r
3472 entry->remoterev = 0;
\r
3475 if (s->entry->url)
\r
3477 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));
\r
3480 if (s->entry && s->entry->present_props)
\r
3482 entry->present_props = s->entry->present_props;
\r
3484 m_arStatusArray.push_back(entry);
\r
3485 m_arListArray.push_back(m_arStatusArray.size()-1);
\r
3486 AddEntry(entry, langID, GetItemCount());
\r
3491 for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)
\r
3493 int nListboxEntries = GetItemCount();
\r
3494 for (int i=0; i<nListboxEntries; ++i)
\r
3496 if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)
\r
3498 RemoveListEntry(i);
\r
3506 case IDSVNLC_EDITCONFLICT:
\r
3507 SVNDiff::StartConflictEditor(filepath);
\r
3509 case IDSVNLC_RESOLVECONFLICT:
\r
3510 case IDSVNLC_RESOLVEMINE:
\r
3511 case IDSVNLC_RESOLVETHEIRS:
\r
3513 git_wc_conflict_choice_t result = git_wc_conflict_choose_merged;
\r
3516 case IDSVNLC_RESOLVETHEIRS:
\r
3517 result = git_wc_conflict_choose_theirs_full;
\r
3519 case IDSVNLC_RESOLVEMINE:
\r
3520 result = git_wc_conflict_choose_mine_full;
\r
3522 case IDSVNLC_RESOLVECONFLICT:
\r
3523 result = git_wc_conflict_choose_merged;
\r
3526 if (CMessageBox::Show(m_hWnd, IDS_PROC_RESOLVE, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO)==IDYES)
\r
3529 POSITION pos = GetFirstSelectedItemPosition();
\r
3533 index = GetNextSelectedItem(pos);
\r
3534 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
\r
3535 if (!git.Resolve(fentry->GetPath(), result, FALSE))
\r
3537 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3541 fentry->status = git_wc_status_modified;
\r
3542 fentry->textstatus = git_wc_status_modified;
\r
3543 fentry->isConflicted = false;
\r
3546 Show(m_dwShow, 0, m_bShowFolders);
\r
3553 CTSVNPathList itemsToAdd;
\r
3554 FillListOfSelectedItemPaths(itemsToAdd);
\r
3556 // We must sort items before adding, so that folders are always added
\r
3557 // *before* any of their children
\r
3558 itemsToAdd.SortByPathname();
\r
3560 ProjectProperties props;
\r
3561 props.ReadPropsPathList(itemsToAdd);
\r
3562 if (git.Add(itemsToAdd, &props, git_depth_empty, TRUE, TRUE, TRUE))
\r
3564 // The add went ok, but we now need to run through the selected items again
\r
3565 // and update their status
\r
3566 POSITION pos = GetFirstSelectedItemPosition();
\r
3568 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3570 FileEntry * e = GetListEntry(index);
\r
3571 e->textstatus = git_wc_status_added;
\r
3572 e->propstatus = git_wc_status_none;
\r
3573 e->status = git_wc_status_added;
\r
3574 SetEntryCheck(e,index,true);
\r
3579 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3581 SaveColumnWidths();
\r
3582 Show(m_dwShow, 0, m_bShowFolders);
\r
3586 case IDSVNLC_ADD_RECURSIVE:
\r
3588 CTSVNPathList itemsToAdd;
\r
3589 FillListOfSelectedItemPaths(itemsToAdd);
\r
3592 dlg.m_pathList = itemsToAdd;
\r
3593 if (dlg.DoModal() == IDOK)
\r
3595 if (dlg.m_pathList.GetCount() == 0)
\r
3597 CSVNProgressDlg progDlg;
\r
3598 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Add);
\r
3599 progDlg.SetPathList(dlg.m_pathList);
\r
3600 ProjectProperties props;
\r
3601 props.ReadPropsPathList(dlg.m_pathList);
\r
3602 progDlg.SetProjectProperties(props);
\r
3603 progDlg.SetItemCount(dlg.m_pathList.GetCount());
\r
3604 progDlg.DoModal();
\r
3607 CWnd* pParent = GetParent();
\r
3608 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3610 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3615 case IDSVNLC_LOCK:
\r
3617 CTSVNPathList itemsToLock;
\r
3618 FillListOfSelectedItemPaths(itemsToLock);
\r
3620 inpDlg.m_sTitle.LoadString(IDS_MENU_LOCK);
\r
3621 CStringUtils::RemoveAccelerators(inpDlg.m_sTitle);
\r
3622 inpDlg.m_sHintText.LoadString(IDS_LOCK_MESSAGEHINT);
\r
3623 inpDlg.m_sCheckText.LoadString(IDS_LOCK_STEALCHECK);
\r
3624 ProjectProperties props;
\r
3625 props.ReadPropsPathList(itemsToLock);
\r
3626 props.nMinLogSize = 0; // the lock message is optional, so no minimum!
\r
3627 inpDlg.m_pProjectProperties = &props;
\r
3628 if (inpDlg.DoModal()==IDOK)
\r
3630 CSVNProgressDlg progDlg;
\r
3631 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Lock);
\r
3632 progDlg.SetOptions(inpDlg.m_iCheck ? ProgOptLockForce : ProgOptNone);
\r
3633 progDlg.SetPathList(itemsToLock);
\r
3634 progDlg.SetCommitMessage(inpDlg.m_sInputText);
\r
3635 progDlg.DoModal();
\r
3637 CWnd* pParent = GetParent();
\r
3638 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3640 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3645 case IDSVNLC_UNLOCKFORCE:
\r
3647 case IDSVNLC_UNLOCK:
\r
3649 CTSVNPathList itemsToUnlock;
\r
3650 FillListOfSelectedItemPaths(itemsToUnlock);
\r
3651 CSVNProgressDlg progDlg;
\r
3652 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Unlock);
\r
3653 progDlg.SetOptions(bForce ? ProgOptLockForce : ProgOptNone);
\r
3654 progDlg.SetPathList(itemsToUnlock);
\r
3655 progDlg.DoModal();
\r
3657 CWnd* pParent = GetParent();
\r
3658 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3660 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3664 case IDSVNLC_REPAIRMOVE:
\r
3666 POSITION pos = GetFirstSelectedItemPosition();
\r
3667 int index = GetNextSelectedItem(pos);
\r
3668 FileEntry * entry1 = NULL;
\r
3669 FileEntry * entry2 = NULL;
\r
3672 entry1 = GetListEntry(index);
\r
3673 git_wc_status_kind status1 = git_wc_status_none;
\r
3674 git_wc_status_kind status2 = git_wc_status_none;
\r
3677 status1 = entry1->status;
\r
3678 index = GetNextSelectedItem(pos);
\r
3681 entry2 = GetListEntry(index);
\r
3684 status2 = entry2->status;
\r
3685 if (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned)
\r
3687 FileEntry * tempentry = entry1;
\r
3689 entry2 = tempentry;
\r
3691 // entry1 was renamed to entry2 but outside of Subversion
\r
3692 // fix this by moving entry2 back to entry1 first,
\r
3693 // then do an git-move from entry1 to entry2
\r
3694 if (MoveFile(entry2->GetPath().GetWinPath(), entry1->GetPath().GetWinPath()))
\r
3697 if (!git.Move(CTSVNPathList(entry1->GetPath()), entry2->GetPath(), TRUE))
\r
3699 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3703 // check the previously unversioned item
\r
3704 entry1->checked = true;
\r
3705 // fixing the move was successful. We have to adjust the new status of the
\r
3707 // Since we don't know if the moved/renamed file had local modifications or not,
\r
3708 // we can't guess the new status. That means we have to refresh...
\r
3709 CWnd* pParent = GetParent();
\r
3710 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3712 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3719 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
\r
3720 FORMAT_MESSAGE_FROM_SYSTEM |
\r
3721 FORMAT_MESSAGE_IGNORE_INSERTS,
\r
3724 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
\r
3725 (LPTSTR) &lpMsgBuf,
\r
3729 MessageBox((LPCTSTR)lpMsgBuf, _T("Error"), MB_OK | MB_ICONINFORMATION );
\r
3730 LocalFree( lpMsgBuf );
\r
3738 case IDSVNLC_REMOVEFROMCS:
\r
3740 CTSVNPathList changelistItems;
\r
3741 FillListOfSelectedItemPaths(changelistItems);
\r
3744 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
\r
3746 // The changelists were removed, but we now need to run through the selected items again
\r
3747 // and update their changelist
\r
3748 POSITION pos = GetFirstSelectedItemPosition();
\r
3750 std::vector<int> entriesToRemove;
\r
3751 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3753 FileEntry * e = GetListEntry(index);
\r
3756 e->changelist.Empty();
\r
3757 if (e->status == git_wc_status_normal)
\r
3759 // remove the entry completely
\r
3760 entriesToRemove.push_back(index);
\r
3763 SetItemGroup(index, 0);
\r
3766 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)
\r
3768 RemoveListEntry(*it);
\r
3770 // TODO: Should we go through all entries here and check if we also could
\r
3771 // remove the changelist from m_changelists ?
\r
3775 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3780 case IDSVNLC_CREATEIGNORECS:
\r
3781 CreateChangeList(SVNSLC_IGNORECHANGELIST);
\r
3783 case IDSVNLC_CREATECS:
\r
3785 CCreateChangelistDlg dlg;
\r
3786 if (dlg.DoModal() == IDOK)
\r
3788 CreateChangeList(dlg.m_sName);
\r
3794 if (cmd < IDSVNLC_MOVETOCS)
\r
3796 CTSVNPathList changelistItems;
\r
3797 FillListOfSelectedItemPaths(changelistItems);
\r
3799 // find the changelist name
\r
3800 CString sChangelist;
\r
3801 int cmdID = IDSVNLC_MOVETOCS;
\r
3803 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
3805 if ((it->first.Compare(SVNSLC_IGNORECHANGELIST))&&(entry->changelist.Compare(it->first)))
\r
3809 sChangelist = it->first;
\r
3814 if (!sChangelist.IsEmpty())
\r
3817 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
\r
3819 // The changelists were moved, but we now need to run through the selected items again
\r
3820 // and update their changelist
\r
3821 POSITION pos = GetFirstSelectedItemPosition();
\r
3823 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3825 FileEntry * e = GetListEntry(index);
\r
3826 e->changelist = sChangelist;
\r
3827 if (!e->IsFolder())
\r
3829 if (m_changelists.find(e->changelist)!=m_changelists.end())
\r
3830 SetItemGroup(index, m_changelists[e->changelist]);
\r
3832 SetItemGroup(index, 0);
\r
3838 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3848 AfxGetApp()->DoWaitCursor(-1);
\r
3849 GetStatisticsString();
\r
3850 int iItemCountAfterMenuCmd = GetItemCount();
\r
3851 //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)
\r
3853 // CWnd* pParent = GetParent();
\r
3854 // if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3856 // pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);
\r
3859 } // if (popup.CreatePopupMenu())
\r
3860 } // if (selIndex >= 0)
\r
3864 void CGitStatusListCtrl::OnContextMenuHeader(CWnd * pWnd, CPoint point)
\r
3866 bool XPorLater = false;
\r
3867 OSVERSIONINFOEX inf;
\r
3868 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
3869 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
3870 GetVersionEx((OSVERSIONINFO *)&inf);
\r
3871 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
3872 if (fullver >= 0x0501)
\r
3875 CHeaderCtrl * pHeaderCtrl = (CHeaderCtrl *)pWnd;
\r
3876 if ((point.x == -1) && (point.y == -1))
\r
3879 pHeaderCtrl->GetItemRect(0, &rect);
\r
3880 ClientToScreen(&rect);
\r
3881 point = rect.CenterPoint();
\r
3883 Locker lock(m_critSec);
\r
3885 if (popup.CreatePopupMenu())
\r
3887 int columnCount = m_ColumnManager.GetColumnCount();
\r
3890 UINT uCheckedFlags = MF_STRING | MF_ENABLED | MF_CHECKED;
\r
3891 UINT uUnCheckedFlags = MF_STRING | MF_ENABLED;
\r
3893 // build control menu
\r
3897 temp.LoadString(IDS_STATUSLIST_SHOWGROUPS);
\r
3898 popup.AppendMenu(IsGroupViewEnabled() ? uCheckedFlags : uUnCheckedFlags, columnCount, temp);
\r
3901 if (m_ColumnManager.AnyUnusedProperties())
\r
3903 temp.LoadString(IDS_STATUSLIST_REMOVEUNUSEDPROPS);
\r
3904 popup.AppendMenu(uUnCheckedFlags, columnCount+1, temp);
\r
3907 temp.LoadString(IDS_STATUSLIST_RESETCOLUMNORDER);
\r
3908 popup.AppendMenu(uUnCheckedFlags, columnCount+2, temp);
\r
3909 popup.AppendMenu(MF_SEPARATOR);
\r
3911 // standard columns
\r
3913 for (int i = 1; i < SVNSLC_NUMCOLUMNS; ++i)
\r
3915 popup.AppendMenu ( m_ColumnManager.IsVisible(i)
\r
3919 , m_ColumnManager.GetName(i));
\r
3922 // user-prop columns:
\r
3923 // find relevant ones and sort 'em
\r
3925 std::map<CString, int> sortedProps;
\r
3926 for (int i = SVNSLC_NUMCOLUMNS; i < columnCount; ++i)
\r
3927 if (m_ColumnManager.IsRelevant(i))
\r
3928 sortedProps[m_ColumnManager.GetName(i)] = i;
\r
3930 if (!sortedProps.empty())
\r
3932 // add 'em to the menu
\r
3934 popup.AppendMenu(MF_SEPARATOR);
\r
3936 typedef std::map<CString, int>::const_iterator CIT;
\r
3937 for ( CIT iter = sortedProps.begin(), end = sortedProps.end()
\r
3941 popup.AppendMenu ( m_ColumnManager.IsVisible(iter->second)
\r
3949 // show menu & let user pick an entry
\r
3951 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
3952 if ((cmd >= 1)&&(cmd < columnCount))
\r
3954 m_ColumnManager.SetVisible (cmd, !m_ColumnManager.IsVisible(cmd));
\r
3956 else if (cmd == columnCount)
\r
3958 EnableGroupView(!IsGroupViewEnabled());
\r
3960 else if (cmd == columnCount+1)
\r
3962 m_ColumnManager.RemoveUnusedProps();
\r
3964 else if (cmd == columnCount+2)
\r
3966 m_ColumnManager.ResetColumns (m_dwDefaultColumns);
\r
3971 void CGitStatusListCtrl::OnContextMenu(CWnd* pWnd, CPoint point)
\r
3976 OnContextMenuList(pWnd, point);
\r
3977 } // if (pWnd == this)
\r
3978 else if (pWnd == GetHeaderCtrl())
\r
3980 OnContextMenuHeader(pWnd, point);
\r
3984 void CGitStatusListCtrl::CreateChangeList(const CString& name)
\r
3987 CTGitPathList changelistItems;
\r
3988 FillListOfSelectedItemPaths(changelistItems);
\r
3990 if (git.AddToChangeList(changelistItems, name, git_depth_empty))
\r
3992 TCHAR groupname[1024];
\r
3993 LVGROUP grp = {0};
\r
3994 grp.cbSize = sizeof(LVGROUP);
\r
3995 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
3996 _tcsncpy_s(groupname, 1024, name, 1023);
\r
3997 grp.pszHeader = groupname;
\r
3998 grp.iGroupId = (int)m_changelists.size();
\r
3999 grp.uAlign = LVGA_HEADER_LEFT;
\r
4000 m_changelists[name] = InsertGroup(-1, &grp);
\r
4002 PrepareGroups(true);
\r
4004 POSITION pos = GetFirstSelectedItemPosition();
\r
4006 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
4008 FileEntry * e = GetListEntry(index);
\r
4009 e->changelist = name;
\r
4010 SetEntryCheck(e, index, FALSE);
\r
4013 for (index = 0; index < GetItemCount(); ++index)
\r
4015 FileEntry * e = GetListEntry(index);
\r
4016 if (m_changelists.find(e->changelist)!=m_changelists.end())
\r
4017 SetItemGroup(index, m_changelists[e->changelist]);
\r
4019 SetItemGroup(index, 0);
\r
4024 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("Tortoisegit"), MB_ICONERROR);
\r
4029 void CGitStatusListCtrl::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
\r
4032 Locker lock(m_critSec);
\r
4033 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
4038 if (pNMLV->iItem < 0)
\r
4040 if (!IsGroupViewEnabled())
\r
4043 DWORD ptW = GetMessagePos();
\r
4044 pt.x = GET_X_LPARAM(ptW);
\r
4045 pt.y = GET_Y_LPARAM(ptW);
\r
4046 ScreenToClient(&pt);
\r
4047 int group = GetGroupFromPoint(&pt);
\r
4050 // check/uncheck the whole group depending on the check-state
\r
4051 // of the first item in the group
\r
4053 bool bCheck = false;
\r
4054 bool bFirst = false;
\r
4056 for (int i=0; i<GetItemCount(); ++i)
\r
4058 SecureZeroMemory(&lv, sizeof(LVITEM));
\r
4059 lv.mask = LVIF_GROUPID;
\r
4062 if (lv.iGroupId == group)
\r
4064 FileEntry * entry = GetListEntry(i);
\r
4067 bCheck = !GetCheck(i);
\r
4072 bool bOldCheck = !!GetCheck(i);
\r
4073 SetEntryCheck(entry, i, bCheck);
\r
4074 if (bCheck != bOldCheck)
\r
4084 GetStatisticsString();
\r
4090 // FileEntry * entry = GetListEntry(pNMLV->iItem);
\r
4093 // if (entry->isConflicted)
\r
4095 // gitDiff::StartConflictEditor(entry->GetPath());
\r
4099 StartDiff(pNMLV->iItem);
\r
4105 void CGitStatusListCtrl::StartDiff(int fileindex)
\r
4109 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
\r
4111 if(!g_Git.IsInitRepos())
\r
4112 CGitDiff::Diff((CTGitPath*)GetItemData(fileindex),
\r
4113 CString(GIT_REV_ZERO),
\r
4114 GitRev::GetHead());
\r
4116 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
\r
4117 CString(GIT_REV_ZERO));
\r
4120 CGitDiff::Diff((CTGitPath*)GetItemData(fileindex),
\r
4122 m_CurrentVersion+_T("~1"));
\r
4125 if (fileindex < 0)
\r
4127 FileEntry * entry = GetListEntry(fileindex);
\r
4128 ASSERT(entry != NULL);
\r
4129 if (entry == NULL)
\r
4131 if (((entry->status == git_wc_status_normal)&&(entry->remotestatus <= git_wc_status_normal))||
\r
4132 (entry->status == git_wc_status_unversioned)||(entry->status == git_wc_status_none))
\r
4134 int ret = (int)ShellExecute(this->m_hWnd, NULL, entry->path.GetWinPath(), NULL, NULL, SW_SHOW);
\r
4135 if (ret <= HINSTANCE_ERROR)
\r
4137 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
4138 cmd += entry->path.GetWinPathString();
\r
4139 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
4144 GitDiff diff(NULL, m_hWnd, true);
\r
4145 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
4147 entry->path, entry->textstatus, entry->propstatus,
\r
4148 entry->remotetextstatus, entry->remotepropstatus);
\r
4152 CString CGitStatusListCtrl::GetStatisticsString()
\r
4155 CString sNormal, sAdded, sDeleted, sModified, sConflicted, sUnversioned;
\r
4156 WORD langID = (WORD)(DWORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
4157 TCHAR buf[MAX_STATUS_STRING_LENGTH];
\r
4158 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_normal, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4160 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_added, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4162 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_deleted, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4164 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_modified, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4166 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_conflicted, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4167 sConflicted = buf;
\r
4168 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_unversioned, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4169 sUnversioned = buf;
\r
4171 sToolTip.Format(_T("%s = %d\n%s = %d\n%s = %d\n%s = %d\n%s = %d\n%s = %d"),
\r
4172 (LPCTSTR)sNormal, m_nNormal,
\r
4173 (LPCTSTR)sUnversioned, m_nUnversioned,
\r
4174 (LPCTSTR)sModified, m_nModified,
\r
4175 (LPCTSTR)sAdded, m_nAdded,
\r
4176 (LPCTSTR)sDeleted, m_nDeleted,
\r
4177 (LPCTSTR)sConflicted, m_nConflicted
\r
4180 sStats.Format(IDS_COMMITDLG_STATISTICSFORMAT, m_nSelected, GetItemCount());
\r
4183 m_pStatLabel->SetWindowText(sStats);
\r
4186 if (m_pSelectButton)
\r
4188 if (m_nSelected == 0)
\r
4189 m_pSelectButton->SetCheck(BST_UNCHECKED);
\r
4190 else if (m_nSelected != GetItemCount())
\r
4191 m_pSelectButton->SetCheck(BST_INDETERMINATE);
\r
4193 m_pSelectButton->SetCheck(BST_CHECKED);
\r
4196 if (m_pConfirmButton)
\r
4198 m_pConfirmButton->EnableWindow(m_nSelected>0);
\r
4206 CTGitPath CGitStatusListCtrl::GetCommonDirectory(bool bStrict)
\r
4210 // not strict means that the selected folder has priority
\r
4211 if (!m_StatusFileList.GetCommonDirectory().IsEmpty())
\r
4212 return m_StatusFileList.GetCommonDirectory();
\r
4215 CTGitPath commonBaseDirectory;
\r
4216 int nListItems = GetItemCount();
\r
4217 for (int i=0; i<nListItems; ++i)
\r
4219 CTGitPath& baseDirectory = *(CTGitPath*)this->GetItemData(i);
\r
4220 if(commonBaseDirectory.IsEmpty())
\r
4222 commonBaseDirectory = baseDirectory;
\r
4226 if (commonBaseDirectory.GetWinPathString().GetLength() > baseDirectory.GetWinPathString().GetLength())
\r
4228 if (baseDirectory.IsAncestorOf(commonBaseDirectory))
\r
4229 commonBaseDirectory = baseDirectory;
\r
4233 return commonBaseDirectory;
\r
4236 CTGitPath CGitStatusListCtrl::GetCommonURL(bool bStrict)
\r
4238 CTGitPath commonBaseURL;
\r
4243 // not strict means that the selected folder has priority
\r
4244 if (!m_StatusUrlList.GetCommonDirectory().IsEmpty())
\r
4245 return m_StatusUrlList.GetCommonDirectory();
\r
4248 int nListItems = GetItemCount();
\r
4249 for (int i=0; i<nListItems; ++i)
\r
4251 const CTGitPath& baseURL = CTGitPath(GetListEntry(i)->GetURL());
\r
4252 if (baseURL.IsEmpty())
\r
4253 continue; // item has no url
\r
4254 if(commonBaseURL.IsEmpty())
\r
4256 commonBaseURL = baseURL;
\r
4260 if (commonBaseURL.GetGitPathString().GetLength() > baseURL.GetGitPathString().GetLength())
\r
4262 if (baseURL.IsAncestorOf(commonBaseURL))
\r
4263 commonBaseURL = baseURL;
\r
4269 return commonBaseURL;
\r
4272 void CGitStatusListCtrl::SelectAll(bool bSelect, bool bIncludeNoCommits)
\r
4274 CWaitCursor waitCursor;
\r
4275 // block here so the LVN_ITEMCHANGED messages
\r
4280 int nListItems = GetItemCount();
\r
4282 m_nSelected = nListItems;
\r
4286 for (int i=0; i<nListItems; ++i)
\r
4288 //FileEntry * entry = GetListEntry(i);
\r
4289 //ASSERT(entry != NULL);
\r
4290 CTGitPath *path = (CTGitPath *) GetItemData(i);
\r
4293 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))
\r
4294 SetEntryCheck(path,i,bSelect);
\r
4297 // unblock before redrawing
\r
4300 GetStatisticsString();
\r
4304 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR *pNMHDR, LRESULT *pResult)
\r
4306 LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast<LPNMLVGETINFOTIP>(pNMHDR);
\r
4311 if (GetListEntry(pGetInfoTip->iItem >= 0))
\r
4312 if (pGetInfoTip->cchTextMax > GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString().GetLength())
\r
4314 if (GetListEntry(pGetInfoTip->iItem)->GetRelativeGitPath().Compare(GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString())!= 0)
\r
4315 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString(), pGetInfoTip->cchTextMax);
\r
4316 else if (GetStringWidth(GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString()) > GetColumnWidth(pGetInfoTip->iItem))
\r
4317 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString(), pGetInfoTip->cchTextMax);
\r
4322 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult)
\r
4324 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
4326 // Take the default processing unless we set this to something else below.
\r
4327 *pResult = CDRF_DODEFAULT;
\r
4329 // First thing - check the draw stage. If it's the control's prepaint
\r
4330 // stage, then tell Windows we want messages for every item.
\r
4332 switch (pLVCD->nmcd.dwDrawStage)
\r
4334 case CDDS_PREPAINT:
\r
4335 *pResult = CDRF_NOTIFYITEMDRAW;
\r
4337 case CDDS_ITEMPREPAINT:
\r
4339 // This is the prepaint stage for an item. Here's where we set the
\r
4340 // item's text color. Our return value will tell Windows to draw the
\r
4341 // item itself, but it will use the new color we set here.
\r
4343 // Tell Windows to paint the control itself.
\r
4344 *pResult = CDRF_DODEFAULT;
\r
4348 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
4350 if (m_arStatusArray.size() > (DWORD_PTR)pLVCD->nmcd.dwItemSpec)
\r
4353 //FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);
\r
4354 CTGitPath *entry=(CTGitPath *)GetItemData((int)pLVCD->nmcd.dwItemSpec);
\r
4355 if (entry == NULL)
\r
4360 // black : unversioned, normal
\r
4362 // blue : modified
\r
4363 // brown : missing, deleted, replaced
\r
4364 // green : merged (or potential merges)
\r
4365 // red : conflicts or sure conflicts
\r
4366 if(entry->m_Action & CTGitPath::LOGACTIONS_CONFLICT)
\r
4368 crText = m_Colors.GetColor(CColors::Conflict);
\r
4370 }else if(entry->m_Action & CTGitPath::LOGACTIONS_MODIFIED)
\r
4372 crText = m_Colors.GetColor(CColors::Modified);
\r
4374 }else if(entry->m_Action & CTGitPath::LOGACTIONS_ADDED)
\r
4376 crText = m_Colors.GetColor(CColors::Added);
\r
4378 else if(entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
\r
4380 crText = m_Colors.GetColor(CColors::DeletedNode);
\r
4382 else if(entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
\r
4384 crText = m_Colors.GetColor(CColors::RenamedNode);
\r
4387 crText = GetSysColor(COLOR_WINDOWTEXT);
\r
4389 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
4390 pLVCD->clrText = crText;
\r
4397 BOOL CGitStatusListCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
\r
4400 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
\r
4403 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
\r
4405 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
\r
4407 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
\r
4412 void CGitStatusListCtrl::RemoveListEntry(int index)
\r
4415 Locker lock(m_critSec);
\r
4416 DeleteItem(index);
\r
4417 delete m_arStatusArray[m_arListArray[index]];
\r
4418 m_arStatusArray.erase(m_arStatusArray.begin()+m_arListArray[index]);
\r
4419 m_arListArray.erase(m_arListArray.begin()+index);
\r
4420 for (int i=index; i< (int)m_arListArray.size(); ++i)
\r
4422 m_arListArray[i]--;
\r
4427 ///< Set a checkbox on an entry in the listbox
\r
4428 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync
\r
4429 void CGitStatusListCtrl::SetEntryCheck(CTGitPath* pEntry, int listboxIndex, bool bCheck)
\r
4431 pEntry->m_Checked = bCheck;
\r
4432 SetCheck(listboxIndex, bCheck);
\r
4436 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry* parentEntry, bool bCheck)
\r
4439 int nListItems = GetItemCount();
\r
4440 for (int j=0; j< nListItems ; ++j)
\r
4442 FileEntry * childEntry = GetListEntry(j);
\r
4443 ASSERT(childEntry != NULL);
\r
4444 if (childEntry == NULL || childEntry == parentEntry)
\r
4446 if (childEntry->checked != bCheck)
\r
4448 if (parentEntry->path.IsAncestorOf(childEntry->path))
\r
4450 SetEntryCheck(childEntry,j,bCheck);
\r
4466 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList& pathList)
\r
4470 int nListItems = GetItemCount();
\r
4471 for (int i=0; i< nListItems; i++)
\r
4473 const FileEntry* entry = GetListEntry(i);
\r
4474 ASSERT(entry != NULL);
\r
4475 if (entry->IsChecked())
\r
4477 pathList.AddPath(entry->path);
\r
4480 pathList.SortByPathname();
\r
4485 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)
\r
4486 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList& pathList, bool bNoIgnored)
\r
4490 POSITION pos = GetFirstSelectedItemPosition();
\r
4492 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
4494 CTGitPath * entry = (CTGitPath*)GetItemData(index);
\r
4495 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))
\r
4497 pathList.AddPath(*entry);
\r
4501 UINT CGitStatusListCtrl::OnGetDlgCode()
\r
4503 // we want to process the return key and not have that one
\r
4504 // routed to the default pushbutton
\r
4505 return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS;
\r
4508 void CGitStatusListCtrl::OnNMReturn(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
4513 POSITION pos = GetFirstSelectedItemPosition();
\r
4516 int index = GetNextSelectedItem(pos);
\r
4521 void CGitStatusListCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
\r
4523 // Since we catch all keystrokes (to have the enter key processed here instead
\r
4524 // of routed to the default pushbutton) we have to make sure that other
\r
4525 // keys like Tab and Esc still do what they're supposed to do
\r
4526 // Tab = change focus to next/previous control
\r
4527 // Esc = quit the dialog
\r
4532 ::PostMessage(GetParent()->GetSafeHwnd(), WM_NEXTDLGCTL, GetKeyState(VK_SHIFT)&0x8000, 0);
\r
4538 ::SendMessage(GetParent()->GetSafeHwnd(), WM_CLOSE, 0, 0);
\r
4543 CListCtrl::OnKeyDown(nChar, nRepCnt, nFlags);
\r
4546 void CGitStatusListCtrl::PreSubclassWindow()
\r
4548 CListCtrl::PreSubclassWindow();
\r
4549 EnableToolTips(TRUE);
\r
4550 m_Theme.SetWindowTheme(GetSafeHwnd(), L"Explorer", NULL);
\r
4553 INT_PTR CGitStatusListCtrl::OnToolHitTest(CPoint point, TOOLINFO* pTI) const
\r
4557 row = CellRectFromPoint(point, &cellrect, &col );
\r
4563 pTI->hwnd = m_hWnd;
\r
4564 pTI->uId = (UINT)((row<<10)+(col&0x3ff)+1);
\r
4565 pTI->lpszText = LPSTR_TEXTCALLBACK;
\r
4567 pTI->rect = cellrect;
\r
4572 int CGitStatusListCtrl::CellRectFromPoint(CPoint& point, RECT *cellrect, int *col) const
\r
4576 // Make sure that the ListView is in LVS_REPORT
\r
4577 if ((GetWindowLong(m_hWnd, GWL_STYLE) & LVS_TYPEMASK) != LVS_REPORT)
\r
4580 // Get the top and bottom row visible
\r
4581 int row = GetTopIndex();
\r
4582 int bottom = row + GetCountPerPage();
\r
4583 if (bottom > GetItemCount())
\r
4584 bottom = GetItemCount();
\r
4586 // Get the number of columns
\r
4587 CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
\r
4588 int nColumnCount = pHeader->GetItemCount();
\r
4590 // Loop through the visible rows
\r
4591 for ( ;row <=bottom;row++)
\r
4593 // Get bounding rect of item and check whether point falls in it.
\r
4595 GetItemRect(row, &rect, LVIR_BOUNDS);
\r
4596 if (rect.PtInRect(point))
\r
4598 // Now find the column
\r
4599 for (colnum = 0; colnum < nColumnCount; colnum++)
\r
4601 int colwidth = GetColumnWidth(colnum);
\r
4602 if (point.x >= rect.left && point.x <= (rect.left + colwidth))
\r
4605 GetClientRect(&rectClient);
\r
4608 rect.right = rect.left + colwidth;
\r
4610 // Make sure that the right extent does not exceed
\r
4611 // the client area
\r
4612 if (rect.right > rectClient.right)
\r
4613 rect.right = rectClient.right;
\r
4617 rect.left += colwidth;
\r
4624 BOOL CGitStatusListCtrl::OnToolTipText(UINT /*id*/, NMHDR *pNMHDR, LRESULT *pResult)
\r
4627 TOOLTIPTEXTW* pTTTW = (TOOLTIPTEXTW*)pNMHDR;
\r
4628 CString strTipText;
\r
4629 UINT_PTR nID = pNMHDR->idFrom;
\r
4634 UINT_PTR row = ((nID-1) >> 10) & 0x3fffff;
\r
4635 UINT_PTR col = (nID-1) & 0x3ff;
\r
4638 return FALSE; // no custom tooltip for the path, we use the infotip there!
\r
4640 // get the internal column from the visible columns
\r
4641 int internalcol = 0;
\r
4642 UINT_PTR currentcol = 0;
\r
4643 for (; (currentcol != col)
\r
4644 && (internalcol < m_ColumnManager.GetColumnCount()-1)
\r
4647 if (m_ColumnManager.IsVisible (internalcol))
\r
4651 AFX_MODULE_THREAD_STATE* pModuleThreadState = AfxGetModuleThreadState();
\r
4652 CToolTipCtrl* pToolTip = pModuleThreadState->m_pToolTip;
\r
4653 pToolTip->SendMessage(TTM_SETMAXTIPWIDTH, 0, 300);
\r
4656 if ((internalcol == 2)||(internalcol == 4))
\r
4658 FileEntry *fentry = GetListEntry(row);
\r
4661 if (fentry->copied)
\r
4664 url.Format(IDS_STATUSLIST_COPYFROM, (LPCTSTR)CPathUtils::PathUnescape(fentry->copyfrom_url), (LONG)fentry->copyfrom_rev);
\r
4665 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);
\r
4668 if (fentry->switched)
\r
4671 url.Format(IDS_STATUSLIST_SWITCHEDTO, (LPCTSTR)CPathUtils::PathUnescape(fentry->url));
\r
4672 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);
\r
4675 if (fentry->keeplocal)
\r
4677 lstrcpyn(pTTTW->szText, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_KEEPLOCAL)), 80);
\r
4686 void CGitStatusListCtrl::OnPaint()
\r
4689 if ((m_bBusy)||(m_bEmpty))
\r
4694 if (m_sBusy.IsEmpty())
\r
4695 str.LoadString(IDS_STATUSLIST_BUSYMSG);
\r
4701 if (m_sEmpty.IsEmpty())
\r
4702 str.LoadString(IDS_STATUSLIST_EMPTYMSG);
\r
4706 COLORREF clrText = ::GetSysColor(COLOR_WINDOWTEXT);
\r
4707 COLORREF clrTextBk;
\r
4708 if (IsWindowEnabled())
\r
4709 clrTextBk = ::GetSysColor(COLOR_WINDOW);
\r
4711 clrTextBk = ::GetSysColor(COLOR_3DFACE);
\r
4714 GetClientRect(&rc);
\r
4716 pHC = GetHeaderCtrl();
\r
4720 pHC->GetItemRect(0, &rcH);
\r
4721 rc.top += rcH.bottom;
\r
4723 CDC* pDC = GetDC();
\r
4725 CMyMemDC memDC(pDC, &rc);
\r
4727 memDC.SetTextColor(clrText);
\r
4728 memDC.SetBkColor(clrTextBk);
\r
4729 memDC.FillSolidRect(rc, clrTextBk);
\r
4731 CGdiObject * oldfont = memDC.SelectStockObject(DEFAULT_GUI_FONT);
\r
4732 memDC.DrawText(str, rc, DT_CENTER | DT_VCENTER |
\r
4733 DT_WORDBREAK | DT_NOPREFIX | DT_NOCLIP);
\r
4734 memDC.SelectObject(oldfont);
\r
4740 // prevent users from extending our hidden (size 0) columns
\r
4741 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR *pNMHDR, LRESULT *pResult)
\r
4743 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
4745 if ((phdr->iItem < 0)||(phdr->iItem >= SVNSLC_NUMCOLUMNS))
\r
4748 if (m_ColumnManager.IsVisible (phdr->iItem))
\r
4755 // prevent any function from extending our hidden (size 0) columns
\r
4756 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
\r
4758 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
4760 if ((phdr->iItem < 0)||(phdr->iItem >= m_ColumnManager.GetColumnCount()))
\r
4766 // visible columns may be modified
\r
4768 if (m_ColumnManager.IsVisible (phdr->iItem))
\r
4774 // columns already marked as "invisible" internally may be (re-)sized to 0
\r
4776 if ( (phdr->pitem != NULL)
\r
4777 && (phdr->pitem->mask == HDI_WIDTH)
\r
4778 && (phdr->pitem->cxy == 0))
\r
4784 if ( (phdr->pitem != NULL)
\r
4785 && (phdr->pitem->mask != HDI_WIDTH))
\r
4794 void CGitStatusListCtrl::OnDestroy()
\r
4796 SaveColumnWidths(true);
\r
4797 CListCtrl::OnDestroy();
\r
4800 void CGitStatusListCtrl::OnBeginDrag(NMHDR* /*pNMHDR*/, LRESULT* pResult)
\r
4803 Locker lock(m_critSec);
\r
4804 CDropFiles dropFiles; // class for creating DROPFILES struct
\r
4807 POSITION pos = GetFirstSelectedItemPosition();
\r
4808 while ( (index = GetNextSelectedItem(pos)) >= 0 )
\r
4810 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
\r
4811 CTGitPath path = fentry->GetPath();
\r
4812 dropFiles.AddFile( path.GetWinPathString() );
\r
4815 if ( dropFiles.GetCount()>0 )
\r
4817 m_bOwnDrag = true;
\r
4818 dropFiles.CreateStructure();
\r
4819 m_bOwnDrag = false;
\r
4825 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry /* = false */)
\r
4827 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
4828 for (int col = 0; col <= maxcol; col++)
\r
4829 if (m_ColumnManager.IsVisible (col))
\r
4830 m_ColumnManager.ColumnResized (col);
\r
4832 if (bSaveToRegistry)
\r
4833 m_ColumnManager.WriteSettings();
\r
4836 bool CGitStatusListCtrl::EnableFileDrop()
\r
4838 m_bFileDropsEnabled = true;
\r
4842 bool CGitStatusListCtrl::HasPath(const CTGitPath& path)
\r
4845 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
4847 FileEntry * entry = m_arStatusArray[i];
\r
4848 if (entry->GetPath().IsEquivalentTo(path))
\r
4855 bool CGitStatusListCtrl::IsPathShown(const CTGitPath& path)
\r
4858 int itemCount = GetItemCount();
\r
4859 for (int i=0; i < itemCount; i++)
\r
4861 FileEntry * entry = GetListEntry(i);
\r
4862 if (entry->GetPath().IsEquivalentTo(path))
\r
4869 BOOL CGitStatusListCtrl::PreTranslateMessage(MSG* pMsg)
\r
4871 if (pMsg->message == WM_KEYDOWN)
\r
4873 switch (pMsg->wParam)
\r
4877 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
\r
4879 // select all entries
\r
4880 for (int i=0; i<GetItemCount(); ++i)
\r
4882 SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
\r
4891 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
\r
4893 // copy all selected paths to the clipboard
\r
4894 if (GetAsyncKeyState(VK_SHIFT)&0x8000)
\r
4895 CopySelectedEntriesToClipboard(SVNSLC_COLSTATUS);
\r
4897 CopySelectedEntriesToClipboard(0);
\r
4905 return CListCtrl::PreTranslateMessage(pMsg);
\r
4908 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols)
\r
4911 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
4912 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
4913 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
4915 CString sClipboard;
\r
4918 if (GetSelectedCount() == 0)
\r
4920 // first add the column titles as the first line
\r
4921 temp.LoadString(IDS_STATUSLIST_COLFILE);
\r
4922 sClipboard = temp;
\r
4924 DWORD selection = 0;
\r
4925 for (int i = 0, count = m_ColumnManager.GetColumnCount(); i < count; ++i)
\r
4926 if ( ((dwCols == -1) && m_ColumnManager.IsVisible (i))
\r
4927 || ((dwCols != 1) && (i < 32) && ((dwCols & (1 << i)) != 0)))
\r
4929 sClipboard += _T("\t") + m_ColumnManager.GetName(i);
\r
4932 selection += 1 << i;
\r
4935 sClipboard += _T("\r\n");
\r
4937 POSITION pos = GetFirstSelectedItemPosition();
\r
4939 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
4941 FileEntry * entry = GetListEntry(index);
\r
4942 sClipboard += entry->GetDisplayName();
\r
4943 if (selection & SVNSLC_COLFILENAME)
\r
4945 sClipboard += _T("\t")+entry->path.GetFileOrDirectoryName();
\r
4947 if (selection & SVNSLC_COLEXT)
\r
4949 sClipboard += _T("\t")+entry->path.GetFileExtension();
\r
4951 if (selection & SVNSLC_COLSTATUS)
\r
4953 if (entry->isNested)
\r
4955 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
4959 GitStatus::GetStatusString(hResourceHandle, entry->status, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4960 if ((entry->copied)&&(_tcslen(buf)>1))
\r
4961 _tcscat_s(buf, 100, _T(" (+)"));
\r
4962 if ((entry->switched)&&(_tcslen(buf)>1))
\r
4963 _tcscat_s(buf, 100, _T(" (s)"));
\r
4964 if ((entry->status == entry->propstatus)&&
\r
4965 (entry->status != git_wc_status_normal)&&
\r
4966 (entry->status != git_wc_status_unversioned)&&
\r
4967 (!GitStatus::IsImportant(entry->textstatus)))
\r
4968 _tcscat_s(buf, 100, ponly);
\r
4971 sClipboard += _T("\t")+temp;
\r
4973 if (selection & SVNSLC_COLTEXTSTATUS)
\r
4975 if (entry->isNested)
\r
4977 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
4981 GitStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4982 if ((entry->copied)&&(_tcslen(buf)>1))
\r
4983 _tcscat_s(buf, 100, _T(" (+)"));
\r
4984 if ((entry->switched)&&(_tcslen(buf)>1))
\r
4985 _tcscat_s(buf, 100, _T(" (s)"));
\r
4988 sClipboard += _T("\t")+temp;
\r
4990 if (selection & SVNSLC_COLREMOTESTATUS)
\r
4992 if (entry->isNested)
\r
4994 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
4998 GitStatus::GetStatusString(hResourceHandle, entry->remotestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4999 if ((entry->copied)&&(_tcslen(buf)>1))
\r
5000 _tcscat_s(buf, 100, _T(" (+)"));
\r
5001 if ((entry->switched)&&(_tcslen(buf)>1))
\r
5002 _tcscat_s(buf, 100, _T(" (s)"));
\r
5003 if ((entry->remotestatus == entry->remotepropstatus)&&
\r
5004 (entry->remotestatus != git_wc_status_none)&&
\r
5005 (entry->remotestatus != git_wc_status_normal)&&
\r
5006 (entry->remotestatus != git_wc_status_unversioned)&&
\r
5007 (!SVNStatus::IsImportant(entry->remotetextstatus)))
\r
5008 _tcscat_s(buf, 100, ponly);
\r
5011 sClipboard += _T("\t")+temp;
\r
5013 if (selection & GitSLC_COLPROPSTATUS)
\r
5015 if (entry->isNested)
\r
5021 GitStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
5022 if ((entry->copied)&&(_tcslen(buf)>1))
\r
5023 _tcscat_s(buf, 100, _T(" (+)"));
\r
5024 if ((entry->switched)&&(_tcslen(buf)>1))
\r
5025 _tcscat_s(buf, 100, _T(" (s)"));
\r
5028 sClipboard += _T("\t")+temp;
\r
5030 if (selection & SVNSLC_COLREMOTETEXT)
\r
5032 if (entry->isNested)
\r
5038 GitStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
5041 sClipboard += _T("\t")+temp;
\r
5043 if (selection & SVNSLC_COLREMOTEPROP)
\r
5045 // SVNSLC_COLREMOTEPROP
\r
5046 if (entry->isNested)
\r
5052 GitStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
5055 sClipboard += _T("\t")+temp;
\r
5057 if (selection & SVNSLC_COLURL)
\r
5058 sClipboard += _T("\t")+entry->url;
\r
5059 if (selection & SVNSLC_COLLOCK)
\r
5061 if (!m_HeadRev.IsHead())
\r
5063 // we have contacted the repository
\r
5065 // decision-matrix
\r
5066 // wc repository text
\r
5069 // UID1 UID1 owner
\r
5070 // UID1 "" lock has been broken
\r
5071 // UID1 UID2 lock has been stolen
\r
5072 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))
\r
5074 if (entry->lock_owner.IsEmpty())
\r
5075 temp = entry->lock_remoteowner;
\r
5077 temp = entry->lock_owner;
\r
5079 else if (entry->lock_remotetoken.IsEmpty())
\r
5082 temp.LoadString(IDS_STATUSLIST_LOCKBROKEN);
\r
5087 temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);
\r
5091 temp = entry->lock_owner;
\r
5092 sClipboard += _T("\t")+temp;
\r
5094 if (selection & SVNSLC_COLLOCKCOMMENT)
\r
5095 sClipboard += _T("\t")+entry->lock_comment;
\r
5096 if (selection & SVNSLC_COLAUTHOR)
\r
5097 sClipboard += _T("\t")+entry->last_commit_author;
\r
5098 if (selection & SVNSLC_COLREVISION)
\r
5100 temp.Format(_T("%ld"), entry->last_commit_rev);
\r
5101 if (entry->last_commit_rev == 0)
\r
5103 sClipboard += _T("\t")+temp;
\r
5105 if (selection & SVNSLC_COLREMOTEREVISION)
\r
5107 temp.Format(_T("%ld"), entry->remoterev);
\r
5108 if (entry->remoterev == 0)
\r
5110 sClipboard += _T("\t")+temp;
\r
5112 if (selection & SVNSLC_COLDATE)
\r
5114 TCHAR datebuf[SVN_DATE_BUFFER];
\r
5115 apr_time_t date = entry->last_commit_date;
\r
5116 SVN::formatDate(datebuf, date, true);
\r
5121 sClipboard += _T("\t")+temp;
\r
5123 if (selection & SVNSLC_COLCOPYFROM)
\r
5125 if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)
\r
5126 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());
\r
5128 temp = entry->copyfrom_url;
\r
5129 sClipboard += _T("\t")+temp;
\r
5132 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
\r
5136 if ((dwCols == -1) && m_ColumnManager.IsVisible (i))
\r
5139 = entry->present_props[m_ColumnManager.GetName(i)];
\r
5140 sClipboard += _T("\t") + value;
\r
5144 sClipboard += _T("\r\n");
\r
5147 return CStringUtils::WriteAsciiStringToClipboard(sClipboard);
\r
5153 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()
\r
5156 std::set<CString> changelists;
\r
5157 POSITION pos = GetFirstSelectedItemPosition();
\r
5159 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
5161 FileEntry * entry = GetListEntry(index);
\r
5162 if (!entry->changelist.IsEmpty())
\r
5163 changelists.insert(entry->changelist);
\r
5165 return changelists.size();
\r
5170 bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
\r
5173 bool bHasGroups=false;
\r
5174 if ( this->m_UnRevFileList.GetCount()>0 ||
\r
5175 this->m_IgnoreFileList.GetCount()>0 || bForce)
\r
5177 bHasGroups = true;
\r
5180 RemoveAllGroups();
\r
5181 EnableGroupView(bHasGroups);
\r
5183 TCHAR groupname[1024];
\r
5184 int groupindex = 0;
\r
5188 LVGROUP grp = {0};
\r
5189 grp.cbSize = sizeof(LVGROUP);
\r
5190 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5191 CString sUnassignedName(_T("Modified File"));
\r
5192 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
\r
5193 grp.pszHeader = groupname;
\r
5194 grp.iGroupId = groupindex;
\r
5195 grp.uAlign = LVGA_HEADER_LEFT;
\r
5196 InsertGroup(groupindex++, &grp);
\r
5198 //if(m_UnRevFileList.GetCount()>0)
\r
5200 _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("No Version Control"), 1023);
\r
5201 grp.pszHeader = groupname;
\r
5202 grp.iGroupId = groupindex;
\r
5203 grp.uAlign = LVGA_HEADER_LEFT;
\r
5204 InsertGroup(groupindex++, &grp);
\r
5207 //if(m_IgnoreFileList.GetCount()>0)
\r
5209 _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("Ignored File"), 1023);
\r
5210 grp.pszHeader = groupname;
\r
5211 grp.iGroupId = groupindex;
\r
5212 grp.uAlign = LVGA_HEADER_LEFT;
\r
5213 InsertGroup(groupindex++, &grp);
\r
5219 m_bHasIgnoreGroup = false;
\r
5221 // now add the items which don't belong to a group
\r
5222 LVGROUP grp = {0};
\r
5223 grp.cbSize = sizeof(LVGROUP);
\r
5224 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5225 CString sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET));
\r
5226 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
\r
5227 grp.pszHeader = groupname;
\r
5228 grp.iGroupId = groupindex;
\r
5229 grp.uAlign = LVGA_HEADER_LEFT;
\r
5230 InsertGroup(groupindex++, &grp);
\r
5232 for (std::map<CString,int>::iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
5234 if (it->first.Compare(SVNSLC_IGNORECHANGELIST)!=0)
\r
5236 LVGROUP grp = {0};
\r
5237 grp.cbSize = sizeof(LVGROUP);
\r
5238 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5239 _tcsncpy_s(groupname, 1024, it->first, 1023);
\r
5240 grp.pszHeader = groupname;
\r
5241 grp.iGroupId = groupindex;
\r
5242 grp.uAlign = LVGA_HEADER_LEFT;
\r
5243 it->second = InsertGroup(groupindex++, &grp);
\r
5246 m_bHasIgnoreGroup = true;
\r
5249 if (m_bHasIgnoreGroup)
\r
5251 // and now add the group 'ignore-on-commit'
\r
5252 std::map<CString,int>::iterator it = m_changelists.find(SVNSLC_IGNORECHANGELIST);
\r
5253 if (it != m_changelists.end())
\r
5255 grp.cbSize = sizeof(LVGROUP);
\r
5256 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5257 _tcsncpy_s(groupname, 1024, SVNSLC_IGNORECHANGELIST, 1023);
\r
5258 grp.pszHeader = groupname;
\r
5259 grp.iGroupId = groupindex;
\r
5260 grp.uAlign = LVGA_HEADER_LEFT;
\r
5261 it->second = InsertGroup(groupindex, &grp);
\r
5265 return bHasGroups;
\r
5268 void CGitStatusListCtrl::NotifyCheck()
\r
5270 CWnd* pParent = GetParent();
\r
5271 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
5273 pParent->SendMessage(SVNSLNM_CHECKCHANGED, m_nSelected);
\r
5277 int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash,CTGitPathList *list)
\r
5280 this->m_bBusy=TRUE;
\r
5281 m_CurrentVersion=hash;
\r
5283 if(hash == GIT_REV_ZERO)
\r
5289 count = list->GetCount();
\r
5291 for(int i=0;i<count;i++)
\r
5296 cmd=(_T("git.exe diff-index --raw HEAD --numstat -C -M"));
\r
5298 cmd.Format(_T("git.exe diff-index --raw HEAD --numstat -C -M -- \"%s\""),(*list)[i].GetGitPathString());
\r
5300 if(g_Git.Run(cmd,&cmdout))
\r
5303 if(g_Git.Run(_T("git.exe rev-parse --revs-only HEAD"),&cmdout))
\r
5305 CMessageBox::Show(NULL,cmdout,_T("TortoiseGit"),MB_OK);
\r
5308 if(cmdout.IsEmpty())
\r
5309 break; //this is initial repositoyr, there are no any history
\r
5311 CMessageBox::Show(NULL,cmdout,_T("TortoiseGit"),MB_OK);
\r
5320 this->m_StatusFileList.ParserFromLog(out);
\r
5327 count = list->GetCount();
\r
5329 for(int i=0;i<count;i++)
\r
5334 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M %s"),hash);
\r
5336 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M %s -- \"%s\""),hash,(*list)[i].GetGitPathString());
\r
5338 g_Git.Run(cmd,&cmdout);
\r
5342 this->m_StatusFileList.ParserFromLog(out);
\r
5345 for(int i=0;i<m_StatusFileList.GetCount();i++)
\r
5347 CTGitPath * gitpatch=(CTGitPath*)&m_StatusFileList[i];
\r
5348 gitpatch->m_Checked = TRUE;
\r
5349 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
\r
5351 this->m_bBusy=FALSE;
\r
5355 int CGitStatusListCtrl::UpdateWithGitPathList(CTGitPathList &list)
\r
5357 m_arStatusArray.clear();
\r
5358 for(int i=0;i<list.GetCount();i++)
\r
5360 CTGitPath * gitpatch=(CTGitPath*)&list[i];
\r
5361 gitpatch->m_Checked = TRUE;
\r
5362 m_arStatusArray.push_back((CTGitPath*)&list[i]);
\r
5367 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList *List)
\r
5369 this->m_UnRevFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER,List);
\r
5370 for(int i=0;i<m_UnRevFileList.GetCount();i++)
\r
5372 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
\r
5373 gitpatch->m_Checked = FALSE;
\r
5374 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
\r
5379 int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList *List)
\r
5381 this->m_IgnoreFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER|CTGitPath::LOGACTIONS_IGNORE,List);
\r
5382 for(int i=0;i<m_IgnoreFileList.GetCount();i++)
\r
5384 CTGitPath * gitpatch=(CTGitPath*)&m_IgnoreFileList[i];
\r
5385 gitpatch->m_Checked = FALSE;
\r
5386 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
\r
5390 int CGitStatusListCtrl::UpdateFileList(int mask,bool once,CTGitPathList *List)
\r
5392 if(mask&CGitStatusListCtrl::FILELIST_MODIFY)
\r
5394 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_MODIFY)))
\r
5396 UpdateFileList(git_revnum_t(GIT_REV_ZERO),List);
\r
5397 m_FileLoaded|=CGitStatusListCtrl::FILELIST_MODIFY;
\r
5400 if(mask&CGitStatusListCtrl::FILELIST_UNVER)
\r
5402 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_UNVER)))
\r
5404 UpdateUnRevFileList(List);
\r
5405 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
\r
5410 //////////////////////////////////////////////////////////////////////////
\r
5412 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium, DWORD * /*pdwEffect*/, POINTL pt)
\r
5414 if(pFmtEtc->cfFormat == CF_HDROP && medium.tymed == TYMED_HGLOBAL)
\r
5416 HDROP hDrop = (HDROP)GlobalLock(medium.hGlobal);
\r
5419 TCHAR szFileName[MAX_PATH];
\r
5421 UINT cFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
\r
5423 POINT clientpoint;
\r
5424 clientpoint.x = pt.x;
\r
5425 clientpoint.y = pt.y;
\r
5426 ScreenToClient(m_hTargetWnd, &clientpoint);
\r
5427 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
\r
5429 CTSVNPathList changelistItems;
\r
5430 for(UINT i = 0; i < cFiles; ++i)
\r
5432 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
\r
5433 changelistItems.AddPath(CTSVNPath(szFileName));
\r
5435 // find the changelist name
\r
5436 CString sChangelist;
\r
5437 LONG_PTR nGroup = m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint);
\r
5438 for (std::map<CString, int>::iterator it = m_pSVNStatusListCtrl->m_changelists.begin(); it != m_pSVNStatusListCtrl->m_changelists.end(); ++it)
\r
5439 if (it->second == nGroup)
\r
5440 sChangelist = it->first;
\r
5441 if (!sChangelist.IsEmpty())
\r
5444 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
\r
5446 for (int l=0; l<changelistItems.GetCount(); ++l)
\r
5448 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
\r
5451 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
\r
5454 e->changelist = sChangelist;
\r
5455 if (!e->IsFolder())
\r
5457 if (m_pSVNStatusListCtrl->m_changelists.find(e->changelist)!=m_pSVNStatusListCtrl->m_changelists.end())
\r
5458 m_pSVNStatusListCtrl->SetItemGroup(index, m_pSVNStatusListCtrl->m_changelists[e->changelist]);
\r
5460 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
\r
5466 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5467 if (hParentWnd != NULL)
\r
5468 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
\r
5474 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
5480 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
\r
5482 for (int l=0; l<changelistItems.GetCount(); ++l)
\r
5484 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
\r
5487 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
\r
5490 e->changelist = sChangelist;
\r
5491 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
\r
5496 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5497 if (hParentWnd != NULL)
\r
5498 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
\r
5504 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
5510 for(UINT i = 0; i < cFiles; ++i)
\r
5512 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
\r
5513 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5514 if (hParentWnd != NULL)
\r
5515 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)szFileName);
\r
5519 GlobalUnlock(medium.hGlobal);
\r
5521 return true; //let base free the medium
\r
5523 HRESULT STDMETHODCALLTYPE CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect)
\r
5525 CIDropTarget::DragOver(grfKeyState, pt, pdwEffect);
\r
5526 *pdwEffect = DROPEFFECT_COPY;
\r
5527 if (m_pSVNStatusListCtrl)
\r
5529 POINT clientpoint;
\r
5530 clientpoint.x = pt.x;
\r
5531 clientpoint.y = pt.y;
\r
5532 ScreenToClient(m_hTargetWnd, &clientpoint);
\r
5533 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
\r
5535 *pdwEffect = DROPEFFECT_MOVE;
\r
5537 else if ((!m_pSVNStatusListCtrl->m_bFileDropsEnabled)||(m_pSVNStatusListCtrl->m_bOwnDrag))
\r
5539 *pdwEffect = DROPEFFECT_NONE;
\r
OSDN Git Service
