3 // TortoiseSVN - a Windows shell extension for easy version control
\r
5 // Copyright (C) 2003-2008 - TortoiseSVN
\r
7 // This program is free software; you can redistribute it and/or
\r
8 // modify it under the terms of the GNU General Public License
\r
9 // as published by the Free Software Foundation; either version 2
\r
10 // of the License, or (at your option) any later version.
\r
12 // This program is distributed in the hope that it will be useful,
\r
13 // but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
14 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
\r
15 // GNU General Public License for more details.
\r
17 // You should have received a copy of the GNU General Public License
\r
18 // along with this program; if not, write to the Free Software Foundation,
\r
19 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\r
23 #include "GitStatusListCtrl.h"
\r
24 #include "resource.h"
\r
25 #include "..\\TortoiseShell\resource.h"
\r
26 #include "MessageBox.h"
\r
27 #include "MyMemDC.h"
\r
28 #include "UnicodeUtils.h"
\r
29 #include "AppUtils.h"
\r
30 #include "PathUtils.h"
\r
31 #include "TempFile.h"
\r
32 #include "StringUtils.h"
\r
33 #include "DirFileEnum.h"
\r
34 #include "GitConfig.h"
\r
35 //#include "SVNProperties.h"
\r
37 #include "GitDiff.h"
\r
38 //#include "LogDlg.h"
\r
39 //#include "SVNProgressDlg.h"
\r
40 #include "SysImageList.h"
\r
41 //#include "Svnstatuslistctrl.h"
\r
42 #include "TGitPath.h"
\r
43 #include "Registry.h"
\r
44 #include "GitStatus.h"
\r
45 //#include "SVNHelpers.h"
\r
46 #include "InputDlg.h"
\r
47 #include "ShellUpdater.h"
\r
48 #include "GitAdminDir.h"
\r
49 //#include "DropFiles.h"
\r
50 #include "IconMenu.h"
\r
51 //#include "AddDlg.h"
\r
52 //#include "EditPropertiesDlg.h"
\r
53 //#include "CreateChangelistDlg.h"
\r
54 #include "XPTheme.h"
\r
55 #include "CommonResource.h"
\r
57 const UINT CGitStatusListCtrl::SVNSLNM_ITEMCOUNTCHANGED
\r
58 = ::RegisterWindowMessage(_T("GITSLNM_ITEMCOUNTCHANGED"));
\r
59 const UINT CGitStatusListCtrl::SVNSLNM_NEEDSREFRESH
\r
60 = ::RegisterWindowMessage(_T("GITSLNM_NEEDSREFRESH"));
\r
61 const UINT CGitStatusListCtrl::SVNSLNM_ADDFILE
\r
62 = ::RegisterWindowMessage(_T("GITSLNM_ADDFILE"));
\r
63 const UINT CGitStatusListCtrl::SVNSLNM_CHECKCHANGED
\r
64 = ::RegisterWindowMessage(_T("GITSLNM_CHECKCHANGED"));
\r
66 #define IDSVNLC_REVERT 1
\r
67 #define IDSVNLC_COMPARE 2
\r
68 #define IDSVNLC_OPEN 3
\r
69 #define IDSVNLC_DELETE 4
\r
70 #define IDSVNLC_IGNORE 5
\r
71 #define IDSVNLC_GNUDIFF1 6
\r
72 #define IDSVNLC_UPDATE 7
\r
73 #define IDSVNLC_LOG 8
\r
74 #define IDSVNLC_EDITCONFLICT 9
\r
75 #define IDSVNLC_IGNOREMASK 10
\r
76 #define IDSVNLC_ADD 11
\r
77 #define IDSVNLC_RESOLVECONFLICT 12
\r
78 #define IDSVNLC_LOCK 13
\r
79 #define IDSVNLC_LOCKFORCE 14
\r
80 #define IDSVNLC_UNLOCK 15
\r
81 #define IDSVNLC_UNLOCKFORCE 16
\r
82 #define IDSVNLC_OPENWITH 17
\r
83 #define IDSVNLC_EXPLORE 18
\r
84 #define IDSVNLC_RESOLVETHEIRS 19
\r
85 #define IDSVNLC_RESOLVEMINE 20
\r
86 #define IDSVNLC_REMOVE 21
\r
87 #define IDSVNLC_COMMIT 22
\r
88 #define IDSVNLC_PROPERTIES 23
\r
89 #define IDSVNLC_COPY 24
\r
90 #define IDSVNLC_COPYEXT 25
\r
91 #define IDSVNLC_REPAIRMOVE 26
\r
92 #define IDSVNLC_REMOVEFROMCS 27
\r
93 #define IDSVNLC_CREATECS 28
\r
94 #define IDSVNLC_CREATEIGNORECS 29
\r
95 #define IDSVNLC_CHECKGROUP 30
\r
96 #define IDSVNLC_UNCHECKGROUP 31
\r
97 #define IDSVNLC_ADD_RECURSIVE 32
\r
98 #define IDSVNLC_COMPAREWC 33
\r
99 #define IDSVNLC_BLAME 34
\r
100 // the IDSVNLC_MOVETOCS *must* be the last index, because it contains a dynamic submenu where
\r
101 // the submenu items get command ID's sequent to this number
\r
102 #define IDSVNLC_MOVETOCS 35
\r
105 BEGIN_MESSAGE_MAP(CGitStatusListCtrl, CListCtrl)
\r
106 ON_NOTIFY(HDN_ITEMCLICKA, 0, OnHdnItemclick)
\r
107 ON_NOTIFY(HDN_ITEMCLICKW, 0, OnHdnItemclick)
\r
108 ON_NOTIFY(HDN_ENDTRACK, 0, OnColumnResized)
\r
109 ON_NOTIFY(HDN_ENDDRAG, 0, OnColumnMoved)
\r
110 ON_NOTIFY_REFLECT_EX(LVN_ITEMCHANGED, OnLvnItemchanged)
\r
111 ON_WM_CONTEXTMENU()
\r
112 ON_NOTIFY_REFLECT(NM_DBLCLK, OnNMDblclk)
\r
113 ON_NOTIFY_REFLECT(LVN_GETINFOTIP, OnLvnGetInfoTip)
\r
114 ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, OnNMCustomdraw)
\r
117 ON_NOTIFY_REFLECT(NM_RETURN, OnNMReturn)
\r
119 ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTW, 0, 0xFFFF, OnToolTipText)
\r
120 ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTA, 0, 0xFFFF, OnToolTipText)
\r
122 ON_NOTIFY(HDN_BEGINTRACKA, 0, &CGitStatusListCtrl::OnHdnBegintrack)
\r
123 ON_NOTIFY(HDN_BEGINTRACKW, 0, &CGitStatusListCtrl::OnHdnBegintrack)
\r
124 ON_NOTIFY(HDN_ITEMCHANGINGA, 0, &CGitStatusListCtrl::OnHdnItemchanging)
\r
125 ON_NOTIFY(HDN_ITEMCHANGINGW, 0, &CGitStatusListCtrl::OnHdnItemchanging)
\r
127 ON_NOTIFY_REFLECT(LVN_BEGINDRAG, OnBeginDrag)
\r
128 ON_NOTIFY_REFLECT(LVN_ITEMCHANGING, &CGitStatusListCtrl::OnLvnItemchanging)
\r
133 CGitStatusListCtrl::CGitStatusListCtrl() : CListCtrl()
\r
134 //, m_HeadRev(GitRev::REV_HEAD)
\r
135 , m_pbCanceled(NULL)
\r
136 , m_pStatLabel(NULL)
\r
137 , m_pSelectButton(NULL)
\r
138 , m_pConfirmButton(NULL)
\r
141 , m_bUnversionedRecurse(true)
\r
142 , m_bShowIgnores(false)
\r
143 , m_pDropTarget(NULL)
\r
144 , m_bIgnoreRemoveOnly(false)
\r
145 , m_bCheckChildrenWithParent(false)
\r
146 , m_bUnversionedLast(true)
\r
147 , m_bHasChangeLists(false)
\r
148 , m_bHasLocks(false)
\r
150 , m_bBlockUI(false)
\r
151 , m_bHasCheckboxes(false)
\r
152 , m_bCheckIfGroupsExist(true)
\r
153 , m_bFileDropsEnabled(false)
\r
154 , m_bOwnDrag(false)
\r
155 , m_dwDefaultColumns(0)
\r
156 , m_ColumnManager(this)
\r
157 , m_bAscending(false)
\r
158 , m_nSortedColumn(-1)
\r
159 , m_sNoPropValueText(MAKEINTRESOURCE(IDS_STATUSLIST_NOPROPVALUE))
\r
165 CGitStatusListCtrl::~CGitStatusListCtrl()
\r
167 // if (m_pDropTarget)
\r
168 // delete m_pDropTarget;
\r
169 ClearStatusArray();
\r
172 void CGitStatusListCtrl::ClearStatusArray()
\r
175 Locker lock(m_critSec);
\r
176 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
178 delete m_arStatusArray[i];
\r
180 m_arStatusArray.clear();
\r
184 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetListEntry(UINT_PTR index)
\r
187 if (index >= (UINT_PTR)m_arListArray.size())
\r
189 if (m_arListArray[index] >= m_arStatusArray.size())
\r
191 return m_arStatusArray[m_arListArray[index]];
\r
197 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetVisibleListEntry(const CTGitPath& path)
\r
199 int itemCount = GetItemCount();
\r
200 for (int i=0; i < itemCount; i++)
\r
202 FileEntry * entry = GetListEntry(i);
\r
203 if (entry->GetPath().IsEquivalentTo(path))
\r
210 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetListEntry(const CTGitPath& path)
\r
213 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
215 FileEntry * entry = m_arStatusArray[i];
\r
216 if (entry->GetPath().IsEquivalentTo(path))
\r
225 int CGitStatusListCtrl::GetIndex(const CTGitPath& path)
\r
227 int itemCount = GetItemCount();
\r
228 for (int i=0; i < itemCount; i++)
\r
230 FileEntry * entry = GetListEntry(i);
\r
231 if (entry->GetPath().IsEquivalentTo(path))
\r
238 void CGitStatusListCtrl::Init(DWORD dwColumns, const CString& sColumnInfoContainer, DWORD dwContextMenus /* = GitSLC_POPALL */, bool bHasCheckboxes /* = true */)
\r
240 Locker lock(m_critSec);
\r
242 m_dwDefaultColumns = dwColumns | 1;
\r
243 m_dwContextMenus = dwContextMenus;
\r
244 m_bHasCheckboxes = bHasCheckboxes;
\r
246 // set the extended style of the listcontrol
\r
247 // 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
248 CRegDWORD regFullRowSelect(_T("Software\\TortoiseGit\\FullRowSelect"), TRUE);
\r
249 DWORD exStyle = LVS_EX_HEADERDRAGDROP | LVS_EX_DOUBLEBUFFER | LVS_EX_INFOTIP | LVS_EX_SUBITEMIMAGES;
\r
250 if (DWORD(regFullRowSelect))
\r
251 exStyle |= LVS_EX_FULLROWSELECT;
\r
252 exStyle |= (bHasCheckboxes ? LVS_EX_CHECKBOXES : 0);
\r
254 SetExtendedStyle(exStyle);
\r
257 theme.SetWindowTheme(m_hWnd, L"Explorer", NULL);
\r
259 m_nIconFolder = SYS_IMAGE_LIST().GetDirIconIndex();
\r
260 SetImageList(&SYS_IMAGE_LIST(), LVSIL_SMALL);
\r
262 m_ColumnManager.ReadSettings (m_dwDefaultColumns, sColumnInfoContainer);
\r
264 // enable file drops
\r
266 if (m_pDropTarget == NULL)
\r
268 m_pDropTarget = new CGitStatusListCtrlDropTarget(this);
\r
269 RegisterDragDrop(m_hWnd,m_pDropTarget);
\r
270 // create the supported formats:
\r
271 FORMATETC ftetc={0};
\r
272 ftetc.dwAspect = DVASPECT_CONTENT;
\r
274 ftetc.tymed = TYMED_HGLOBAL;
\r
275 ftetc.cfFormat=CF_HDROP;
\r
276 m_pDropTarget->AddSuportedFormat(ftetc);
\r
282 m_bUnversionedRecurse = !!((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\UnversionedRecurse"), TRUE));
\r
285 bool CGitStatusListCtrl::SetBackgroundImage(UINT nID)
\r
287 return CAppUtils::SetListCtrlBackgroundImage(GetSafeHwnd(), nID);
\r
290 BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList& pathList
\r
291 , bool bUpdate /* = FALSE */
\r
292 , bool bShowIgnores /* = false */
\r
294 , bool bShowUserProps /* = false */)
\r
296 Locker lock(m_critSec);
\r
297 int mask= CGitStatusListCtrl::FILELIST_MODIFY;
\r
299 mask|= CGitStatusListCtrl::FILELIST_IGNORE;
\r
301 mask|= CGitStatusListCtrl::FILELIST_UNVER;
\r
302 this->UpdateFileList(mask,bUpdate,(CTGitPathList*)&pathList);
\r
307 int refetchcounter = 0;
\r
310 // force the cursor to change
\r
313 SetCursorPos(pt.x, pt.y);
\r
315 m_mapFilenameToChecked.clear();
\r
316 //m_StatusUrlList.Clear();
\r
317 bool bHasChangelists = (m_changelists.size()>1 || (m_changelists.size()>0 && !m_bHasIgnoreGroup));
\r
318 m_changelists.clear();
\r
319 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
321 FileEntry * entry = m_arStatusArray[i];
\r
322 if ( bHasChangelists && entry->checked)
\r
324 // If change lists are present, remember all checked entries
\r
325 CString path = entry->GetPath().GetGitPathString();
\r
326 m_mapFilenameToChecked[path] = true;
\r
328 if ( (entry->status==git_wc_status_unversioned || entry->status==git_wc_status_missing ) && entry->checked )
\r
330 // The user manually selected an unversioned or missing file. We remember
\r
331 // this so that the selection can be restored when refreshing.
\r
332 CString path = entry->GetPath().GetGitPathString();
\r
333 m_mapFilenameToChecked[path] = true;
\r
335 else if ( entry->status > git_wc_status_normal && !entry->checked )
\r
337 // The user manually deselected a versioned file. We remember
\r
338 // this so that the deselection can be restored when refreshing.
\r
339 CString path = entry->GetPath().GetGitPathString();
\r
340 m_mapFilenameToChecked[path] = false;
\r
344 // use a sorted path list to make sure we fetch the status of
\r
345 // parent items first, *then* the child items (if any)
\r
346 CTGitPathList sortedPathList = pathList;
\r
347 sortedPathList.SortByPathname();
\r
351 m_nTargetCount = 0;
\r
352 m_bHasExternalsFromDifferentRepos = FALSE;
\r
353 m_bHasExternals = FALSE;
\r
354 m_bHasUnversionedItems = FALSE;
\r
355 m_bHasLocks = false;
\r
356 m_bHasChangeLists = false;
\r
357 m_bShowIgnores = bShowIgnores;
\r
358 m_nSortedColumn = 0;
\r
364 // first clear possible status data left from
\r
365 // previous GetStatus() calls
\r
366 ClearStatusArray();
\r
368 m_StatusFileList = sortedPathList;
\r
370 // Since Git_client_status() returns all files, even those in
\r
371 // folders included with Git:externals we need to check if all
\r
372 // files we get here belongs to the same repository.
\r
373 // It is possible to commit changes in an external folder, as long
\r
374 // as the folder belongs to the same repository (but another path),
\r
375 // but it is not possible to commit all files if the externals are
\r
376 // from a different repository.
\r
378 // To check if all files belong to the same repository, we compare the
\r
379 // UUID's - if they're identical then the files belong to the same
\r
380 // repository and can be committed. But if they're different, then
\r
381 // tell the user to commit all changes in the external folders
\r
383 CStringA sUUID; // holds the repo UUID
\r
384 CTGitPathList arExtPaths; // list of Git:external paths
\r
390 m_nTargetCount = sortedPathList.GetCount();
\r
392 GitStatus status(m_pbCanceled);
\r
393 if(m_nTargetCount > 1 && sortedPathList.AreAllPathsFilesInOneDirectory())
\r
395 // This is a special case, where we've been given a list of files
\r
396 // all from one folder
\r
397 // We handle them by setting a status filter, then requesting the Git status of
\r
398 // all the files in the directory, filtering for the ones we're interested in
\r
399 status.SetFilter(sortedPathList);
\r
401 // if all selected entries are files, we don't do a recursive status
\r
402 // fetching. But if only one is a directory, we have to recurse.
\r
403 git_depth_t depth = git_depth_files;
\r
404 // We have set a filter. If all selected items were files or we fetch
\r
405 // the status not recursively, then we have to include
\r
406 // ignored items too - the user has selected them
\r
407 bool bShowIgnoresRight = true;
\r
408 for (int fcindex=0; fcindex<sortedPathList.GetCount(); ++fcindex)
\r
410 if (sortedPathList[fcindex].IsDirectory())
\r
412 depth = git_depth_infinity;
\r
413 bShowIgnoresRight = false;
\r
417 if(!FetchStatusForSingleTarget(config, status, sortedPathList.GetCommonDirectory(), bUpdate, sUUID, arExtPaths, true, depth, bShowIgnoresRight))
\r
424 for(int nTarget = 0; nTarget < m_nTargetCount; nTarget++)
\r
426 // check whether the path we want the status for is already fetched due to status-fetching
\r
427 // of a parent path.
\r
428 // this check is only done for file paths, because folder paths could be included already
\r
429 // but not recursively
\r
430 if (sortedPathList[nTarget].IsDirectory() || GetListEntry(sortedPathList[nTarget]) == NULL)
\r
432 if(!FetchStatusForSingleTarget(config, status, sortedPathList[nTarget], bUpdate, sUUID,
\r
433 arExtPaths, false, git_depth_infinity, bShowIgnores))
\r
441 // remove the 'helper' files of conflicted items from the list.
\r
442 // otherwise they would appear as unversioned files.
\r
443 for (INT_PTR cind = 0; cind < m_ConflictFileList.GetCount(); ++cind)
\r
445 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
447 if (m_arStatusArray[i]->GetPath().IsEquivalentTo(m_ConflictFileList[cind]))
\r
449 delete m_arStatusArray[i];
\r
450 m_arStatusArray.erase(m_arStatusArray.begin()+i);
\r
456 } while(!BuildStatistics() && (refetchcounter < 2) && (*m_pbCanceled==false));
\r
458 if (bShowUserProps)
\r
459 FetchUserProperties();
\r
461 m_ColumnManager.UpdateUserPropList (m_arStatusArray);
\r
466 SetCursorPos(pt.x, pt.y);
\r
474 // Fetch all local properties for all elements in the status array
\r
476 void CGitStatusListCtrl::FetchUserProperties()
\r
479 GitPool globalPool;
\r
481 for (size_t i = 0, count = m_arStatusArray.size(); i < count; ++i)
\r
483 // local / temp pool to hold parameters and props for a single item
\r
485 GitPool localPool ((apr_pool_t*)globalPool);
\r
487 // open working copy for this path
\r
489 const char* path = m_arStatusArray[i]->path.GetGitApiPath (localPool);
\r
491 Git_wc_adm_access_t *adm_access = NULL;
\r
492 Git_error_t * error = Git_wc_adm_probe_open3 ( &adm_access
\r
495 , FALSE // no write lock
\r
496 , 0 // lock just the directory/file itself
\r
502 // get the props and add them to the status info
\r
504 apr_hash_t* props = NULL;
\r
505 Git_error_t * error = Git_wc_prop_list ( &props
\r
511 for ( apr_hash_index_t *index
\r
512 = apr_hash_first (localPool, props)
\r
514 ; index = apr_hash_next (index))
\r
516 // extract next entry from hash
\r
518 const char* key = NULL;
\r
520 const char** val = NULL;
\r
522 apr_hash_this ( index
\r
523 , reinterpret_cast<const void**>(&key)
\r
525 , reinterpret_cast<void**>(&val));
\r
527 // decode / dispatch it
\r
529 CString name = CUnicodeUtils::GetUnicode (key);
\r
530 CString value = CUnicodeUtils::GetUnicode (*val);
\r
532 // store in property container (truncate it after ~100 chars)
\r
534 m_arStatusArray[i]->present_props[name]
\r
535 = value.Left (GitSLC_MAXUSERPROPLENGTH);
\r
538 error = Git_wc_adm_close2 (adm_access, localPool);
\r
540 Git_error_clear (error);
\r
547 // Work on a single item from the list of paths which is provided to us
\r
549 bool CGitStatusListCtrl::FetchStatusForSingleTarget(
\r
552 const CTGitPath& target,
\r
553 bool bFetchStatusFromRepository,
\r
554 CStringA& strCurrentRepositoryUUID,
\r
555 CTGitPathList& arExtPaths,
\r
562 config.GetDefaultIgnores();
\r
564 CTGitPath workingTarget(target);
\r
566 git_wc_status2_t * s;
\r
568 s = status.GetFirstFileStatus(workingTarget, GitPath, bFetchStatusFromRepository, depth, bShowIgnores);
\r
570 m_HeadRev = SVNRev(status.headrev);
\r
573 Git_wc_status_kind wcFileStatus = GitStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
575 // This one fixes a problem with externals:
\r
576 // If a strLine is a file, Git:externals and its parent directory
\r
577 // will also be returned by GetXXXFileStatus. Hence, we skip all
\r
578 // status info until we find the one matching workingTarget.
\r
579 if (!workingTarget.IsDirectory())
\r
581 if (!workingTarget.IsEquivalentTo(GitPath))
\r
585 s = status.GetNextFileStatus(GitPath);
\r
586 if(workingTarget.IsEquivalentTo(GitPath))
\r
593 m_sLastError = status.GetLastErrorMsg();
\r
596 // Now, set working target to be the base folder of this item
\r
597 workingTarget = workingTarget.GetDirectory();
\r
600 bool bEntryFromDifferentRepo = false;
\r
601 // Is this a versioned item with an associated repos UUID?
\r
602 if ((s->entry)&&(s->entry->uuid))
\r
604 // Have we seen a repos UUID yet?
\r
605 if (strCurrentRepositoryUUID.IsEmpty())
\r
607 // This is the first repos UUID we've seen - record it
\r
608 strCurrentRepositoryUUID = s->entry->uuid;
\r
609 m_sUUID = strCurrentRepositoryUUID;
\r
613 if (strCurrentRepositoryUUID.Compare(s->entry->uuid)!=0)
\r
615 // This item comes from a different repository than our main one
\r
616 m_bHasExternalsFromDifferentRepos = TRUE;
\r
617 bEntryFromDifferentRepo = true;
\r
618 if (s->entry->kind == Git_node_dir)
\r
619 arExtPaths.AddPath(workingTarget);
\r
623 else if (strCurrentRepositoryUUID.IsEmpty() && (s->text_status == Git_wc_status_added))
\r
625 // An added entry doesn't have an UUID assigned to it yet.
\r
626 // So we fetch the status of the parent directory instead and
\r
627 // check if that one has an UUID assigned to it.
\r
628 Git_wc_status2_t * sparent;
\r
629 CTGitPath path = workingTarget;
\r
632 CTGitPath GitParentPath;
\r
633 GitStatus tempstatus;
\r
634 sparent = tempstatus.GetFirstFileStatus(path.GetContainingDirectory(), GitParentPath, false, Git_depth_empty, false);
\r
635 path = GitParentPath;
\r
636 } while ( (sparent) && (sparent->entry) && (!sparent->entry->uuid) && (sparent->text_status==Git_wc_status_added) );
\r
637 if (sparent && sparent->entry && sparent->entry->uuid)
\r
639 strCurrentRepositoryUUID = sparent->entry->uuid;
\r
640 m_sUUID = strCurrentRepositoryUUID;
\r
644 if ((wcFileStatus == Git_wc_status_unversioned)&& GitPath.IsDirectory())
\r
646 // check if the unversioned folder is maybe versioned. This
\r
647 // could happen with nested layouts
\r
648 Git_wc_status_kind st = GitStatus::GetAllStatus(workingTarget);
\r
649 if ((st != Git_wc_status_unversioned)&&(st != Git_wc_status_none))
\r
651 return true; // ignore nested layouts
\r
654 if (status.IsExternal(GitPath))
\r
656 m_bHasExternals = TRUE;
\r
659 AddNewFileEntry(s, GitPath, workingTarget, true, m_bHasExternals, bEntryFromDifferentRepo);
\r
661 if (((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none)||((wcFileStatus == Git_wc_status_ignored)&&(m_bShowIgnores))) && GitPath.IsDirectory())
\r
663 // we have an unversioned folder -> get all files in it recursively!
\r
664 AddUnversionedFolder(GitPath, workingTarget.GetContainingDirectory(), &config);
\r
667 // for folders, get all statuses inside it too
\r
668 if(workingTarget.IsDirectory())
\r
670 ReadRemainingItemsStatus(status, workingTarget, strCurrentRepositoryUUID, arExtPaths, &config, bAllDirect);
\r
676 m_sLastError = status.GetLastErrorMsg();
\r
683 const CGitStatusListCtrl::FileEntry*
\r
684 CGitStatusListCtrl::AddNewFileEntry(
\r
685 const git_wc_status2_t* pGitStatus, // The return from the Git GetStatus functions
\r
686 const CTGitPath& path, // The path of the item we're adding
\r
687 const CTGitPath& basePath, // The base directory for this status build
\r
688 bool bDirectItem, // Was this item the first found by GetFirstFileStatus or by a subsequent GetNextFileStatus call
\r
689 bool bInExternal, // Are we in an 'external' folder
\r
690 bool bEntryfromDifferentRepo // if the entry is from a different repository
\r
693 FileEntry * entry = new FileEntry();
\r
696 entry->path = path;
\r
697 entry->basepath = basePath;
\r
698 entry->status = GitStatus::GetMoreImportant(pGitStatus->text_status, pGitStatus->prop_status);
\r
699 entry->textstatus = pGitStatus->text_status;
\r
700 entry->propstatus = pGitStatus->prop_status;
\r
701 // entry->remotestatus = GitStatus::GetMoreImportant(pGitStatus->repos_text_status, pGitStatus->repos_prop_status);
\r
702 // entry->remotetextstatus = pGitStatus->repos_text_status;
\r
703 // entry->remotepropstatus = pGitStatus->repos_prop_status;
\r
704 entry->inexternal = bInExternal;
\r
705 entry->differentrepo = bEntryfromDifferentRepo;
\r
706 entry->direct = bDirectItem;
\r
707 // entry->copied = !!pGitStatus->copied;
\r
708 // entry->switched = !!pGitStatus->switched;
\r
710 entry->last_commit_date = pGitStatus->ood_last_cmt_date;
\r
711 if ((entry->last_commit_date == NULL)&&(pGitStatus->entry))
\r
712 entry->last_commit_date = pGitStatus->entry->cmt_date;
\r
713 entry->remoterev = pGitStatus->ood_last_cmt_rev;
\r
714 if (pGitStatus->entry)
\r
715 entry->last_commit_rev = pGitStatus->entry->cmt_rev;
\r
716 if (pGitStatus->ood_last_cmt_author)
\r
717 entry->last_commit_author = CUnicodeUtils::GetUnicode(pGitStatus->ood_last_cmt_author);
\r
718 if ((entry->last_commit_author.IsEmpty())&&(pGitStatus->entry)&&(pGitStatus->entry->cmt_author))
\r
719 entry->last_commit_author = CUnicodeUtils::GetUnicode(pGitStatus->entry->cmt_author);
\r
721 if (pGitStatus->entry)
\r
722 entry->isConflicted = (pGitStatus->entry->conflict_wrk && PathFileExists(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_wrk))) ? true : false;
\r
724 if ((entry->status == Git_wc_status_conflicted)||(entry->isConflicted))
\r
726 entry->isConflicted = true;
\r
727 if (pGitStatus->entry)
\r
730 if (pGitStatus->entry->conflict_wrk)
\r
732 cpath = path.GetDirectory();
\r
733 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_wrk));
\r
734 m_ConflictFileList.AddPath(cpath);
\r
736 if (pGitStatus->entry->conflict_old)
\r
738 cpath = path.GetDirectory();
\r
739 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_old));
\r
740 m_ConflictFileList.AddPath(cpath);
\r
742 if (pGitStatus->entry->conflict_new)
\r
744 cpath = path.GetDirectory();
\r
745 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_new));
\r
746 m_ConflictFileList.AddPath(cpath);
\r
748 if (pGitStatus->entry->prejfile)
\r
750 cpath = path.GetDirectory();
\r
751 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->prejfile));
\r
752 m_ConflictFileList.AddPath(cpath);
\r
757 if (pGitStatus->entry)
\r
759 entry->isfolder = (pGitStatus->entry->kind == Git_node_dir);
\r
760 entry->Revision = pGitStatus->entry->revision;
\r
761 entry->keeplocal = !!pGitStatus->entry->keep_local;
\r
762 entry->working_size = pGitStatus->entry->working_size;
\r
763 entry->depth = pGitStatus->entry->depth;
\r
765 if (pGitStatus->entry->url)
\r
767 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(pGitStatus->entry->url));
\r
769 if (pGitStatus->entry->copyfrom_url)
\r
771 entry->copyfrom_url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(pGitStatus->entry->copyfrom_url));
\r
772 entry->copyfrom_rev = pGitStatus->entry->copyfrom_rev;
\r
775 entry->copyfrom_rev = 0;
\r
779 if (m_sURL.IsEmpty())
\r
780 m_sURL = entry->url;
\r
782 m_sURL.LoadString(IDS_STATUSLIST_MULTIPLETARGETS);
\r
783 m_StatusUrlList.AddPath(CTGitPath(entry->url));
\r
785 if (pGitStatus->entry->lock_owner)
\r
786 entry->lock_owner = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_owner);
\r
787 if (pGitStatus->entry->lock_token)
\r
789 entry->lock_token = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_token);
\r
790 m_bHasLocks = true;
\r
792 if (pGitStatus->entry->lock_comment)
\r
793 entry->lock_comment = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_comment);
\r
795 if (pGitStatus->entry->present_props)
\r
797 entry->present_props = pGitStatus->entry->present_props;
\r
800 if (pGitStatus->entry->changelist)
\r
802 entry->changelist = CUnicodeUtils::GetUnicode(pGitStatus->entry->changelist);
\r
803 m_changelists[entry->changelist] = -1;
\r
804 m_bHasChangeLists = true;
\r
806 entry->needslock = (pGitStatus->entry->present_props && (strstr(pGitStatus->entry->present_props, "Git:needs-lock")!=NULL) );
\r
810 if (pGitStatus->ood_kind == Git_node_none)
\r
811 entry->isfolder = path.IsDirectory();
\r
813 entry->isfolder = (pGitStatus->ood_kind == Git_node_dir);
\r
815 if (pGitStatus->repos_lock)
\r
817 if (pGitStatus->repos_lock->owner)
\r
818 entry->lock_remoteowner = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->owner);
\r
819 if (pGitStatus->repos_lock->token)
\r
820 entry->lock_remotetoken = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->token);
\r
821 if (pGitStatus->repos_lock->comment)
\r
822 entry->lock_comment = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->comment);
\r
825 // Pass ownership of the entry to the array
\r
826 m_arStatusArray.push_back(entry);
\r
832 void CGitStatusListCtrl::AddUnversionedFolder(const CTGitPath& folderName,
\r
833 const CTGitPath& basePath,
\r
834 GitConfig * config)
\r
837 if (!m_bUnversionedRecurse)
\r
839 CSimpleFileFind filefinder(folderName.GetWinPathString());
\r
841 CTGitPath filename;
\r
842 m_bHasUnversionedItems = TRUE;
\r
843 while (filefinder.FindNextFileNoDots())
\r
845 filename.SetFromWin(filefinder.GetFilePath(), filefinder.IsDirectory());
\r
847 bool bMatchIgnore = !!config->MatchIgnorePattern(filename.GetFileOrDirectoryName());
\r
848 bMatchIgnore = bMatchIgnore || config->MatchIgnorePattern(filename.GetGitPathString());
\r
849 if (((bMatchIgnore)&&(m_bShowIgnores))||(!bMatchIgnore))
\r
851 FileEntry * entry = new FileEntry();
\r
852 entry->path = filename;
\r
853 entry->basepath = basePath;
\r
854 entry->inunversionedfolder = true;
\r
855 entry->isfolder = filefinder.IsDirectory();
\r
857 m_arStatusArray.push_back(entry);
\r
858 if (entry->isfolder)
\r
860 if (!g_GitAdminDir.HasAdminDir(entry->path.GetWinPathString(), true))
\r
861 AddUnversionedFolder(entry->path, basePath, config);
\r
869 void CGitStatusListCtrl::ReadRemainingItemsStatus(GitStatus& status, const CTGitPath& basePath,
\r
870 CStringA& strCurrentRepositoryUUID,
\r
871 CTGitPathList& arExtPaths, GitConfig * config, bool bAllDirect)
\r
874 git_wc_status2_t * s;
\r
876 CTGitPath lastexternalpath;
\r
878 while ((s = status.GetNextFileStatus(GitPath)) != NULL)
\r
880 Git_wc_status_kind wcFileStatus = GitStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
881 if ((wcFileStatus == Git_wc_status_unversioned) && (GitPath.IsDirectory()))
\r
883 // check if the unversioned folder is maybe versioned. This
\r
884 // could happen with nested layouts
\r
885 Git_wc_status_kind st = GitStatus::GetAllStatus(GitPath);
\r
886 if ((st != Git_wc_status_unversioned)&&(st != Git_wc_status_none))
\r
888 FileEntry * entry = new FileEntry();
\r
889 entry->path = GitPath;
\r
890 entry->basepath = basePath;
\r
891 entry->inunversionedfolder = true;
\r
892 entry->isfolder = true;
\r
893 entry->isNested = true;
\r
894 m_arStatusArray.push_back(entry);
\r
898 bool bDirectoryIsExternal = false;
\r
899 bool bEntryfromDifferentRepo = false;
\r
902 if (s->entry->uuid)
\r
904 if (strCurrentRepositoryUUID.IsEmpty())
\r
905 strCurrentRepositoryUUID = s->entry->uuid;
\r
908 if (strCurrentRepositoryUUID.Compare(s->entry->uuid)!=0)
\r
910 bEntryfromDifferentRepo = true;
\r
911 if (GitStatus::IsImportant(wcFileStatus))
\r
912 m_bHasExternalsFromDifferentRepos = TRUE;
\r
913 if (s->entry->kind == Git_node_dir)
\r
915 if ((lastexternalpath.IsEmpty())||(!lastexternalpath.IsAncestorOf(GitPath)))
\r
917 arExtPaths.AddPath(GitPath);
\r
918 lastexternalpath = GitPath;
\r
926 // we don't have an UUID - maybe an added file/folder
\r
927 if (!strCurrentRepositoryUUID.IsEmpty())
\r
929 if ((!lastexternalpath.IsEmpty())&&
\r
930 (lastexternalpath.IsAncestorOf(GitPath)))
\r
932 bEntryfromDifferentRepo = true;
\r
933 m_bHasExternalsFromDifferentRepos = TRUE;
\r
940 // if unversioned items lie around in external
\r
941 // directories from different repos, we have to mark them
\r
943 if (!strCurrentRepositoryUUID.IsEmpty())
\r
945 if ((!lastexternalpath.IsEmpty())&&
\r
946 (lastexternalpath.IsAncestorOf(GitPath)))
\r
948 bEntryfromDifferentRepo = true;
\r
952 if (status.IsExternal(GitPath))
\r
954 arExtPaths.AddPath(GitPath);
\r
955 m_bHasExternals = TRUE;
\r
957 if ((!bEntryfromDifferentRepo)&&(status.IsInExternal(GitPath)))
\r
959 // if the externals are inside an unversioned folder (this happens if
\r
960 // the externals are specified with e.g. "ext\folder url" instead of just
\r
961 // "folder url"), then a commit won't succeed.
\r
962 // therefore, we treat those as if the externals come from a different
\r
964 CTGitPath extpath = GitPath;
\r
965 while (basePath.IsAncestorOf(extpath))
\r
967 if (!extpath.HasAdminDir())
\r
969 bEntryfromDifferentRepo = true;
\r
972 extpath = extpath.GetContainingDirectory();
\r
975 // Do we have any external paths?
\r
976 if(arExtPaths.GetCount() > 0)
\r
978 // If do have external paths, we need to check if the current item belongs
\r
980 for (int ix=0; ix<arExtPaths.GetCount(); ix++)
\r
982 if (arExtPaths[ix].IsAncestorOf(GitPath))
\r
984 bDirectoryIsExternal = true;
\r
990 if ((wcFileStatus == Git_wc_status_unversioned)&&(!bDirectoryIsExternal))
\r
991 m_bHasUnversionedItems = TRUE;
\r
993 const FileEntry* entry = AddNewFileEntry(s, GitPath, basePath, bAllDirect, bDirectoryIsExternal, bEntryfromDifferentRepo);
\r
995 bool bMatchIgnore = !!config->MatchIgnorePattern(entry->path.GetFileOrDirectoryName());
\r
996 bMatchIgnore = bMatchIgnore || config->MatchIgnorePattern(entry->path.GetGitPathString());
\r
997 if ((((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none))&&(!bMatchIgnore))||
\r
998 ((wcFileStatus == Git_wc_status_ignored)&&(m_bShowIgnores))||
\r
999 (((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none))&&(bMatchIgnore)&&(m_bShowIgnores)))
\r
1001 if (entry->isfolder)
\r
1003 // we have an unversioned folder -> get all files in it recursively!
\r
1004 AddUnversionedFolder(GitPath, basePath, config);
\r
1007 } // while ((s = status.GetNextFileStatus(GitPath)) != NULL)
\r
1011 // Get the show-flags bitmap value which corresponds to a particular Git status
\r
1012 DWORD CGitStatusListCtrl::GetShowFlagsFromGitStatus(git_wc_status_kind status)
\r
1016 case git_wc_status_none:
\r
1017 case git_wc_status_unversioned:
\r
1018 return SVNSLC_SHOWUNVERSIONED;
\r
1019 case git_wc_status_ignored:
\r
1020 if (!m_bShowIgnores)
\r
1021 return SVNSLC_SHOWDIRECTS;
\r
1022 return SVNSLC_SHOWDIRECTS|SVNSLC_SHOWIGNORED;
\r
1023 case git_wc_status_incomplete:
\r
1024 return SVNSLC_SHOWINCOMPLETE;
\r
1025 case git_wc_status_normal:
\r
1026 return SVNSLC_SHOWNORMAL;
\r
1027 case git_wc_status_external:
\r
1028 return SVNSLC_SHOWEXTERNAL;
\r
1029 case git_wc_status_added:
\r
1030 return SVNSLC_SHOWADDED;
\r
1031 case git_wc_status_missing:
\r
1032 return SVNSLC_SHOWMISSING;
\r
1033 case git_wc_status_deleted:
\r
1034 return SVNSLC_SHOWREMOVED;
\r
1035 case git_wc_status_replaced:
\r
1036 return SVNSLC_SHOWREPLACED;
\r
1037 case git_wc_status_modified:
\r
1038 return SVNSLC_SHOWMODIFIED;
\r
1039 case git_wc_status_merged:
\r
1040 return SVNSLC_SHOWMERGED;
\r
1041 case git_wc_status_conflicted:
\r
1042 return SVNSLC_SHOWCONFLICTED;
\r
1043 case git_wc_status_obstructed:
\r
1044 return SVNSLC_SHOWOBSTRUCTED;
\r
1046 // we should NEVER get here!
\r
1053 void CGitStatusListCtrl::Show(DWORD dwShow, DWORD dwCheck /*=0*/, bool bShowFolders /* = true */,BOOL UpdateStatusList)
\r
1055 CWinApp * pApp = AfxGetApp();
\r
1057 pApp->DoWaitCursor(1);
\r
1059 Locker lock(m_critSec);
\r
1060 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
1062 //SetItemCount(listIndex);
\r
1068 if(UpdateStatusList)
\r
1070 m_arStatusArray.clear();
\r
1071 for(int i=0;i<this->m_StatusFileList.GetCount();i++)
\r
1073 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
\r
1076 for(int i=0;i<this->m_UnRevFileList.GetCount();i++)
\r
1078 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
\r
1081 for(int i=0;i<this->m_IgnoreFileList.GetCount();i++)
\r
1083 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
\r
1086 for(int i=0;i<this->m_arStatusArray.size();i++)
\r
1088 if(((CTGitPath*)m_arStatusArray[i])->m_Action & dwShow)
\r
1089 AddEntry((CTGitPath*)m_arStatusArray[i],langID,i);
\r
1092 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1093 for (int col = 0; col <= maxcol; col++)
\r
1094 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1097 GetStatisticsString();
\r
1099 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1100 HDITEM HeaderItem = {0};
\r
1101 HeaderItem.mask = HDI_FORMAT;
\r
1102 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1104 pHeader->GetItem(i, &HeaderItem);
\r
1105 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1106 pHeader->SetItem(i, &HeaderItem);
\r
1108 if (m_nSortedColumn)
\r
1110 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1111 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1112 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1116 if (nSelectedEntry)
\r
1118 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1119 EnsureVisible(nSelectedEntry, false);
\r
1123 // Restore the item at the top of the list.
\r
1124 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1126 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1134 pApp->DoWaitCursor(-1);
\r
1138 m_dwShow = dwShow;
\r
1142 CWinApp * pApp = AfxGetApp();
\r
1144 pApp->DoWaitCursor(1);
\r
1146 m_bShowFolders = bShowFolders;
\r
1148 int nTopIndex = GetTopIndex();
\r
1149 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
\r
1150 int nSelectedEntry = 0;
\r
1151 if (posSelectedEntry)
\r
1152 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
\r
1158 m_arListArray.clear();
\r
1160 m_arListArray.reserve(m_arStatusArray.size());
\r
1161 SetItemCount (static_cast<int>(m_arStatusArray.size()));
\r
1163 int listIndex = 0;
\r
1164 for (size_t i=0; i < m_arStatusArray.size(); ++i)
\r
1166 FileEntry * entry = m_arStatusArray[i];
\r
1167 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
\r
1169 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
\r
1171 if (entry->IsFolder() && (!bShowFolders))
\r
1172 continue; // don't show folders if they're not wanted.
\r
1175 git_wc_status_kind status = GitStatus::GetMoreImportant(entry->status, entry->remotestatus);
\r
1176 DWORD showFlags = GetShowFlagsFromGitStatus(status);
\r
1177 if (entry->IsLocked())
\r
1178 showFlags |= SVNSLC_SHOWLOCKS;
\r
1179 if (entry->switched)
\r
1180 showFlags |= SVNSLC_SHOWSWITCHED;
\r
1181 if (!entry->changelist.IsEmpty())
\r
1182 showFlags |= SVNSLC_SHOWINCHANGELIST;
\r
1184 bool bAllowCheck = ((entry->changelist.Compare(SVNSLC_IGNORECHANGELIST) != 0)
\r
1185 && (m_bCheckIfGroupsExist || (m_changelists.size()==0 || (m_changelists.size()==1 && m_bHasIgnoreGroup))));
\r
1187 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
\r
1189 if (status != Git_wc_status_ignored || (entry->direct) || (dwShow & GitSLC_SHOWIGNORED))
\r
1191 if ((!entry->IsFolder()) && (status == Git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
\r
1193 if (PathFileExists(entry->GetPath().GetWinPath()))
\r
1195 m_arListArray.push_back(i);
\r
1196 if ((dwCheck & SVNSLC_SHOWREMOVEDANDPRESENT)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1199 entry->checked = true;
\r
1201 AddEntry(entry, langID, listIndex++);
\r
1204 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
\r
1206 m_arListArray.push_back(i);
\r
1207 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1210 entry->checked = true;
\r
1212 AddEntry(entry, langID, listIndex++);
\r
1214 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
\r
1216 m_arListArray.push_back(i);
\r
1217 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1220 entry->checked = true;
\r
1222 AddEntry(entry, langID, listIndex++);
\r
1228 SetItemCount(listIndex);
\r
1230 m_ColumnManager.UpdateRelevance (m_arStatusArray, m_arListArray);
\r
1232 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1233 for (int col = 0; col <= maxcol; col++)
\r
1234 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1237 GetStatisticsString();
\r
1239 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1240 HDITEM HeaderItem = {0};
\r
1241 HeaderItem.mask = HDI_FORMAT;
\r
1242 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1244 pHeader->GetItem(i, &HeaderItem);
\r
1245 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1246 pHeader->SetItem(i, &HeaderItem);
\r
1248 if (m_nSortedColumn)
\r
1250 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1251 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1252 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1255 if (nSelectedEntry)
\r
1257 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1258 EnsureVisible(nSelectedEntry, false);
\r
1262 // Restore the item at the top of the list.
\r
1263 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1265 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1273 pApp->DoWaitCursor(-1);
\r
1275 m_bEmpty = (GetItemCount() == 0);
\r
1281 void CGitStatusListCtrl::Show(DWORD dwShow, const CTGitPathList& checkedList, bool bShowFolders /* = true */)
\r
1286 Locker lock(m_critSec);
\r
1287 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
1289 CWinApp * pApp = AfxGetApp();
\r
1291 pApp->DoWaitCursor(1);
\r
1292 m_dwShow = dwShow;
\r
1293 m_bShowFolders = bShowFolders;
\r
1295 int nTopIndex = GetTopIndex();
\r
1296 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
\r
1297 int nSelectedEntry = 0;
\r
1298 if (posSelectedEntry)
\r
1299 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
\r
1305 m_arListArray.clear();
\r
1307 m_arListArray.reserve(m_arStatusArray.size());
\r
1308 SetItemCount (static_cast<int>(m_arStatusArray.size()));
\r
1310 int listIndex = 0;
\r
1311 for (size_t i=0; i < m_arStatusArray.size(); ++i)
\r
1313 FileEntry * entry = m_arStatusArray[i];
\r
1314 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
\r
1316 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
\r
1318 if (entry->IsFolder() && (!bShowFolders))
\r
1319 continue; // don't show folders if they're not wanted.
\r
1321 git_wc_status_kind status = SVNStatus::GetMoreImportant(entry->status, entry->remotestatus);
\r
1322 DWORD showFlags = GetShowFlagsFromSVNStatus(status);
\r
1323 if (entry->IsLocked())
\r
1324 showFlags |= SVNSLC_SHOWLOCKS;
\r
1325 if (!entry->changelist.IsEmpty())
\r
1326 showFlags |= SVNSLC_SHOWINCHANGELIST;
\r
1328 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
\r
1329 if (status != git_wc_status_ignored || (entry->direct) || (dwShow & SVNSLC_SHOWIGNORED))
\r
1331 for (int npath = 0; npath < checkedList.GetCount(); ++npath)
\r
1333 if (entry->GetPath().IsEquivalentTo(checkedList[npath]))
\r
1335 entry->checked = true;
\r
1339 if ((!entry->IsFolder()) && (status == git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
\r
1341 if (PathFileExists(entry->GetPath().GetWinPath()))
\r
1343 m_arListArray.push_back(i);
\r
1344 AddEntry(entry, langID, listIndex++);
\r
1347 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
\r
1349 m_arListArray.push_back(i);
\r
1350 AddEntry(entry, langID, listIndex++);
\r
1352 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
\r
1354 m_arListArray.push_back(i);
\r
1355 AddEntry(entry, langID, listIndex++);
\r
1357 else if (entry->switched)
\r
1359 m_arListArray.push_back(i);
\r
1360 AddEntry(entry, langID, listIndex++);
\r
1366 SetItemCount(listIndex);
\r
1368 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1369 for (int col = 0; col <= maxcol; col++)
\r
1370 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1373 GetStatisticsString();
\r
1375 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1376 HDITEM HeaderItem = {0};
\r
1377 HeaderItem.mask = HDI_FORMAT;
\r
1378 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1380 pHeader->GetItem(i, &HeaderItem);
\r
1381 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1382 pHeader->SetItem(i, &HeaderItem);
\r
1384 if (m_nSortedColumn)
\r
1386 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1387 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1388 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1391 if (nSelectedEntry)
\r
1393 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1394 EnsureVisible(nSelectedEntry, false);
\r
1398 // Restore the item at the top of the list.
\r
1399 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1401 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1409 pApp->DoWaitCursor(-1);
\r
1411 m_bEmpty = (GetItemCount() == 0);
\r
1416 int CGitStatusListCtrl::GetColumnIndex(int mask)
\r
1426 void CGitStatusListCtrl::AddEntry(CTGitPath * GitPath, WORD langID, int listIndex)
\r
1428 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
1429 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
1431 CString path = GitPath->GetGitPathString();
\r
1435 int index = listIndex;
\r
1437 CString entryname = GitPath->GetGitPathString();
\r
1439 // if (entry->isfolder)
\r
1440 // icon_idx = m_nIconFolder;
\r
1443 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(*GitPath);
\r
1447 rename.Format(_T("(from %s)"),GitPath->GetGitOldPathString());
\r
1448 if(GitPath->m_Action & CTGitPath::LOGACTIONS_REPLACED)
\r
1449 entryname+=rename;
\r
1451 InsertItem(index, entryname, icon_idx);
\r
1453 this->SetItemData(index, (DWORD_PTR)GitPath);
\r
1454 // SVNSLC_COLFILENAME
\r
1455 SetItemText(index, nCol++, GitPath->GetFileOrDirectoryName());
\r
1457 SetItemText(index, nCol++, GitPath->GetFileExtension());
\r
1458 // SVNSLC_COLSTATUS
\r
1459 SetItemText(index, nCol++, GitPath->GetActionName());
\r
1461 SetItemText(index, GetColumnIndex(SVNSLC_COLADD),GitPath->m_StatAdd);
\r
1462 SetItemText(index, GetColumnIndex(SVNSLC_COLDEL),GitPath->m_StatDel);
\r
1465 SetCheck(index, GitPath->m_Checked);
\r
1466 if (GitPath->m_Checked)
\r
1470 if( GitPath->m_Action & CTGitPath::LOGACTIONS_IGNORE)
\r
1471 SetItemGroup(index, 2);
\r
1472 else if( GitPath->m_Action & CTGitPath::LOGACTIONS_UNVER)
\r
1473 SetItemGroup(index,1);
\r
1475 SetItemGroup(index,0);
\r
1481 void CGitStatusListCtrl::AddEntry(FileEntry * entry, WORD langID, int listIndex)
\r
1483 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
1484 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
1486 CString path = entry->GetPath().GetGitPathString();
\r
1487 if ( m_mapFilenameToChecked.size()!=0 && m_mapFilenameToChecked.find(path) != m_mapFilenameToChecked.end() )
\r
1489 // The user manually de-/selected an item. We now restore this status
\r
1490 // when refreshing.
\r
1491 entry->checked = m_mapFilenameToChecked[path];
\r
1496 int index = listIndex;
\r
1498 CString entryname = entry->GetDisplayName();
\r
1500 if (entry->isfolder)
\r
1501 icon_idx = m_nIconFolder;
\r
1504 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(entry->path);
\r
1507 InsertItem(index, entryname, icon_idx);
\r
1508 // SVNSLC_COLFILENAME
\r
1509 SetItemText(index, nCol++, entry->path.GetFileOrDirectoryName());
\r
1511 SetItemText(index, nCol++, entry->path.GetFileExtension());
\r
1512 // SVNSLC_COLSTATUS
\r
1513 if (entry->isNested)
\r
1515 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1516 SetItemText(index, nCol++, sTemp);
\r
1520 GitStatus::GetStatusString(hResourceHandle, entry->status, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1521 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1522 _tcscat_s(buf, 100, _T(" (+)"));
\r
1523 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1524 _tcscat_s(buf, 100, _T(" (s)"));
\r
1526 if ((entry->status == entry->propstatus)&&
\r
1527 (entry->status != git_wc_status_normal)&&
\r
1528 (entry->status != git_wc_status_unversioned)&&
\r
1529 (!GitStatus::IsImportant(entry->textstatus)))
\r
1530 _tcscat_s(buf, 100, ponly);
\r
1532 SetItemText(index, nCol++, buf);
\r
1534 // SVNSLC_COLREMOTESTATUS
\r
1535 if (entry->isNested)
\r
1537 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1538 SetItemText(index, nCol++, sTemp);
\r
1543 SVNStatus::GetStatusString(hResourceHandle, entry->remotestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1544 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1545 _tcscat_s(buf, 100, _T(" (+)"));
\r
1546 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1547 _tcscat_s(buf, 100, _T(" (s)"));
\r
1548 if ((entry->remotestatus == entry->remotepropstatus)&&
\r
1549 (entry->remotestatus != git_wc_status_none)&&
\r
1550 (entry->remotestatus != git_wc_status_normal)&&
\r
1551 (entry->remotestatus != git_wc_status_unversioned)&&
\r
1552 (!SVNStatus::IsImportant(entry->remotetextstatus)))
\r
1553 _tcscat_s(buf, 100, ponly);
\r
1555 SetItemText(index, nCol++, buf);
\r
1557 // SVNSLC_COLTEXTSTATUS
\r
1558 if (entry->isNested)
\r
1560 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1561 SetItemText(index, nCol++, sTemp);
\r
1566 SVNStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1567 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1568 _tcscat_s(buf, 100, _T(" (+)"));
\r
1569 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1570 _tcscat_s(buf, 100, _T(" (s)"));
\r
1572 SetItemText(index, nCol++, buf);
\r
1574 // SVNSLC_COLPROPSTATUS
\r
1575 if (entry->isNested)
\r
1577 SetItemText(index, nCol++, _T(""));
\r
1582 SVNStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1583 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1584 _tcscat_s(buf, 100, _T(" (+)"));
\r
1585 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1586 _tcscat_s(buf, 100, _T(" (s)"));
\r
1588 SetItemText(index, nCol++, buf);
\r
1590 // SVNSLC_COLREMOTETEXT
\r
1591 if (entry->isNested)
\r
1593 SetItemText(index, nCol++, _T(""));
\r
1598 SVNStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1599 SetItemText(index, nCol++, buf);
\r
1602 // SVNSLC_COLREMOTEPROP
\r
1603 if (entry->isNested)
\r
1605 SetItemText(index, nCol++, _T(""));
\r
1609 // SVNStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1610 SetItemText(index, nCol++, buf);
\r
1613 // SetItemText(index, nCol++, entry->url);
\r
1616 if (!m_HeadRev.IsHead())
\r
1618 // we have contacted the repository
\r
1620 // decision-matrix
\r
1621 // wc repository text
\r
1624 // UID1 UID1 owner
\r
1625 // UID1 "" lock has been broken
\r
1626 // UID1 UID2 lock has been stolen
\r
1627 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))
\r
1629 if (entry->lock_owner.IsEmpty())
\r
1630 SetItemText(index, nCol++, entry->lock_remoteowner);
\r
1632 SetItemText(index, nCol++, entry->lock_owner);
\r
1634 else if (entry->lock_remotetoken.IsEmpty())
\r
1637 CString temp(MAKEINTRESOURCE(IDS_STATUSLIST_LOCKBROKEN));
\r
1638 SetItemText(index, nCol++, temp);
\r
1644 temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);
\r
1645 SetItemText(index, nCol++, temp);
\r
1649 SetItemText(index, nCol++, entry->lock_owner);
\r
1650 // SVNSLC_COLLOCKCOMMENT
\r
1651 SetItemText(index, nCol++, entry->lock_comment);
\r
1652 // SVNSLC_COLAUTHOR
\r
1653 SetItemText(index, nCol++, entry->last_commit_author);
\r
1654 // SVNSLC_COLREVISION
\r
1656 temp.Format(_T("%ld"), entry->last_commit_rev);
\r
1657 if (entry->last_commit_rev > 0)
\r
1658 SetItemText(index, nCol++, temp);
\r
1660 SetItemText(index, nCol++, _T(""));
\r
1661 // SVNSLC_COLREMOTEREVISION
\r
1662 temp.Format(_T("%ld"), entry->remoterev);
\r
1663 if (entry->remoterev > 0)
\r
1664 SetItemText(index, nCol++, temp);
\r
1666 SetItemText(index, nCol++, _T(""));
\r
1668 TCHAR datebuf[SVN_DATE_BUFFER];
\r
1669 apr_time_t date = entry->last_commit_date;
\r
1670 SVN::formatDate(datebuf, date, true);
\r
1672 SetItemText(index, nCol++, datebuf);
\r
1674 SetItemText(index, nCol++, _T(""));
\r
1675 // SVNSLC_COLSVNNEEDSLOCK
\r
1676 BOOL bFoundSVNNeedsLock = entry->present_props.IsNeedsLockSet();
\r
1677 CString strSVNNeedsLock = (bFoundSVNNeedsLock) ? _T("*") : _T("");
\r
1678 SetItemText(index, nCol++, strSVNNeedsLock);
\r
1679 // SVNSLC_COLCOPYFROM
\r
1680 if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)
\r
1681 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());
\r
1683 temp = entry->copyfrom_url;
\r
1684 SetItemText(index, nCol++, temp);
\r
1685 // SVNSLC_COLMODIFICATIONDATE
\r
1686 __int64 filetime = entry->GetPath().GetLastWriteTime();
\r
1687 if ( (filetime) && (entry->status!=git_wc_status_deleted) )
\r
1689 FILETIME* f = (FILETIME*)(__int64*)&filetime;
\r
1690 TCHAR datebuf[SVN_DATE_BUFFER];
\r
1691 SVN::formatDate(datebuf,*f,true);
\r
1692 SetItemText(index, nCol++, datebuf);
\r
1696 SetItemText(index, nCol++, _T(""));
\r
1699 // user-defined properties
\r
1700 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
\r
1704 assert (i == nCol++);
\r
1705 assert (m_ColumnManager.IsUserProp (i));
\r
1707 CString name = m_ColumnManager.GetName(i);
\r
1708 if (entry->present_props.HasProperty (name))
\r
1710 const CString& propVal = entry->present_props [name];
\r
1711 if (propVal.IsEmpty())
\r
1712 SetItemText(index, i, m_sNoPropValueText);
\r
1714 SetItemText(index, i, propVal);
\r
1717 SetItemText(index, i, _T(""));
\r
1720 SetCheck(index, entry->checked);
\r
1721 if (entry->checked)
\r
1723 if (m_changelists.find(entry->changelist) != m_changelists.end())
\r
1724 SetItemGroup(index, m_changelists[entry->changelist]);
\r
1726 SetItemGroup(index, 0);
\r
1731 bool CGitStatusListCtrl::SetItemGroup(int item, int groupindex)
\r
1733 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS) == NULL)
\r
1735 if (groupindex < 0)
\r
1738 i.mask = LVIF_GROUPID;
\r
1741 i.iGroupId = groupindex;
\r
1743 return !!SetItem(&i);
\r
1746 void CGitStatusListCtrl::Sort()
\r
1748 Locker lock(m_critSec);
\r
1750 CSorter predicate (&m_ColumnManager, m_nSortedColumn, m_bAscending);
\r
1752 std::sort(m_arStatusArray.begin(), m_arStatusArray.end(), predicate);
\r
1753 SaveColumnWidths();
\r
1754 Show(m_dwShow, 0, m_bShowFolders);
\r
1758 void CGitStatusListCtrl::OnHdnItemclick(NMHDR *pNMHDR, LRESULT *pResult)
\r
1760 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
1765 if (m_nSortedColumn == phdr->iItem)
\r
1766 m_bAscending = !m_bAscending;
\r
1768 m_bAscending = TRUE;
\r
1769 m_nSortedColumn = phdr->iItem;
\r
1770 m_mapFilenameToChecked.clear();
\r
1773 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1774 HDITEM HeaderItem = {0};
\r
1775 HeaderItem.mask = HDI_FORMAT;
\r
1776 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1778 pHeader->GetItem(i, &HeaderItem);
\r
1779 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1780 pHeader->SetItem(i, &HeaderItem);
\r
1782 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1783 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1784 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1786 // the checked state of the list control items must be restored
\r
1788 for (int i=0; i<GetItemCount(); ++i)
\r
1790 CTGitPath * entry = (CTGitPath*)GetItemData(i);
\r
1793 SetCheck(i, entry->m_Checked);
\r
1799 void CGitStatusListCtrl::OnLvnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
\r
1801 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1804 #define ISCHECKED(x) ((x) ? ((((x)&LVIS_STATEIMAGEMASK)>>12)-1) : FALSE)
\r
1805 if ((m_bBlock)&&(m_bBlockUI))
\r
1807 // if we're blocked, prevent changing of the check state
\r
1808 if ((!ISCHECKED(pNMLV->uOldState) && ISCHECKED(pNMLV->uNewState))||
\r
1809 (ISCHECKED(pNMLV->uOldState) && !ISCHECKED(pNMLV->uNewState)))
\r
1814 BOOL CGitStatusListCtrl::OnLvnItemchanged(NMHDR *pNMHDR, LRESULT *pResult)
\r
1816 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1818 if ((pNMLV->uNewState==0)||(pNMLV->uNewState & LVIS_SELECTED)||(pNMLV->uNewState & LVIS_FOCUSED))
\r
1824 bool bSelected = !!(ListView_GetItemState(m_hWnd, pNMLV->iItem, LVIS_SELECTED) & LVIS_SELECTED);
\r
1825 int nListItems = GetItemCount();
\r
1828 // was the item checked?
\r
1830 //CTGitPath *gitpath=(CTGitPath*)GetItemData(pNMLV->iItem);
\r
1831 //gitpath->m_Checked=GetCheck(pNMLV->iItem);
\r
1833 if (GetCheck(pNMLV->iItem))
\r
1835 CheckEntry(pNMLV->iItem, nListItems);
\r
1838 POSITION pos = GetFirstSelectedItemPosition();
\r
1840 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
1842 if (index != pNMLV->iItem)
\r
1843 CheckEntry(index, nListItems);
\r
1849 UncheckEntry(pNMLV->iItem, nListItems);
\r
1852 POSITION pos = GetFirstSelectedItemPosition();
\r
1854 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
1856 if (index != pNMLV->iItem)
\r
1857 UncheckEntry(index, nListItems);
\r
1862 GetStatisticsString();
\r
1869 void CGitStatusListCtrl::OnColumnResized(NMHDR *pNMHDR, LRESULT *pResult)
\r
1871 LPNMHEADER header = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
1872 if ( (header != NULL)
\r
1873 && (header->iItem >= 0)
\r
1874 && (header->iItem < m_ColumnManager.GetColumnCount()))
\r
1876 m_ColumnManager.ColumnResized (header->iItem);
\r
1882 void CGitStatusListCtrl::OnColumnMoved(NMHDR *pNMHDR, LRESULT *pResult)
\r
1884 LPNMHEADER header = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
1886 if ( (header != NULL)
\r
1887 && (header->iItem >= 0)
\r
1888 && (header->iItem < m_ColumnManager.GetColumnCount())
\r
1889 // only allow the reordering if the column was not moved left of the first
\r
1890 // visible item - otherwise the 'invisible' columns are not at the far left
\r
1891 // anymore and we get all kinds of redrawing problems.
\r
1892 && (header->pitem)
\r
1893 && (header->pitem->iOrder > m_ColumnManager.GetInvisibleCount()))
\r
1895 m_ColumnManager.ColumnMoved (header->iItem, header->pitem->iOrder);
\r
1899 Invalidate(FALSE);
\r
1902 void CGitStatusListCtrl::CheckEntry(int index, int nListItems)
\r
1904 Locker lock(m_critSec);
\r
1905 //FileEntry * entry = GetListEntry(index);
\r
1906 CTGitPath *path=(CTGitPath*)GetItemData(index);
\r
1907 ASSERT(path != NULL);
\r
1910 SetCheck(index, TRUE);
\r
1911 //entry = GetListEntry(index);
\r
1912 // if an unversioned item was checked, then we need to check if
\r
1913 // the parent folders are unversioned too. If the parent folders actually
\r
1914 // are unversioned, then check those too.
\r
1916 if (entry->status == git_wc_status_unversioned)
\r
1918 // we need to check the parent folder too
\r
1919 const CTGitPath& folderpath = entry->path;
\r
1920 for (int i=0; i< nListItems; ++i)
\r
1922 FileEntry * testEntry = GetListEntry(i);
\r
1923 ASSERT(testEntry != NULL);
\r
1924 if (testEntry == NULL)
\r
1926 if (!testEntry->checked)
\r
1928 if (testEntry->path.IsAncestorOf(folderpath) && (!testEntry->path.IsEquivalentTo(folderpath)))
\r
1930 SetEntryCheck(testEntry,i,true);
\r
1936 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
1937 if ( (entry->status == git_wc_status_deleted) || (m_bCheckChildrenWithParent) || (bShift) )
\r
1939 // if a deleted folder gets checked, we have to check all
\r
1940 // children of that folder too.
\r
1941 if (entry->path.IsDirectory())
\r
1943 SetCheckOnAllDescendentsOf(entry, true);
\r
1946 // if a deleted file or folder gets checked, we have to
\r
1947 // check all parents of this item too.
\r
1948 for (int i=0; i<nListItems; ++i)
\r
1950 FileEntry * testEntry = GetListEntry(i);
\r
1951 ASSERT(testEntry != NULL);
\r
1952 if (testEntry == NULL)
\r
1954 if (!testEntry->checked)
\r
1956 if (testEntry->path.IsAncestorOf(entry->path) && (!testEntry->path.IsEquivalentTo(entry->path)))
\r
1958 if ((testEntry->status == git_wc_status_deleted)||(m_bCheckChildrenWithParent))
\r
1960 SetEntryCheck(testEntry,i,true);
\r
1962 // now we need to check all children of this parent folder
\r
1963 SetCheckOnAllDescendentsOf(testEntry, true);
\r
1970 if ( !path->m_Checked )
\r
1972 path->m_Checked = TRUE;
\r
1977 void CGitStatusListCtrl::UncheckEntry(int index, int nListItems)
\r
1979 Locker lock(m_critSec);
\r
1980 CTGitPath *path=(CTGitPath*)GetItemData(index);
\r
1981 ASSERT(path != NULL);
\r
1984 SetCheck(index, FALSE);
\r
1985 //entry = GetListEntry(index);
\r
1986 // item was unchecked
\r
1988 if (entry->path.IsDirectory())
\r
1990 // disable all files within an unselected folder, except when unchecking a folder with property changes
\r
1991 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
1992 if ( (entry->status != git_wc_status_modified) || (bShift) )
\r
1994 SetCheckOnAllDescendentsOf(entry, false);
\r
1997 else if (entry->status == git_wc_status_deleted)
\r
1999 // a "deleted" file was unchecked, so uncheck all parent folders
\r
2000 // and all children of those parents
\r
2001 for (int i=0; i<nListItems; i++)
\r
2003 FileEntry * testEntry = GetListEntry(i);
\r
2004 ASSERT(testEntry != NULL);
\r
2005 if (testEntry == NULL)
\r
2007 if (testEntry->checked)
\r
2009 if (testEntry->path.IsAncestorOf(entry->path))
\r
2011 if (testEntry->status == git_wc_status_deleted)
\r
2013 SetEntryCheck(testEntry,i,false);
\r
2016 SetCheckOnAllDescendentsOf(testEntry, false);
\r
2023 if ( path->m_Checked )
\r
2025 path->m_Checked = FALSE;
\r
2030 bool CGitStatusListCtrl::EntryPathCompareNoCase(const FileEntry* pEntry1, const FileEntry* pEntry2)
\r
2032 return pEntry1->path < pEntry2->path;
\r
2035 bool CGitStatusListCtrl::IsEntryVersioned(const FileEntry* pEntry1)
\r
2037 return pEntry1->status != git_wc_status_unversioned;
\r
2040 bool CGitStatusListCtrl::BuildStatistics()
\r
2043 bool bRefetchStatus = false;
\r
2045 // now gather some statistics
\r
2046 m_nUnversioned = 0;
\r
2051 m_nConflicted = 0;
\r
2055 for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2057 int status=((CTGitPath*)m_arStatusArray[i])->m_Action;
\r
2059 if(status&CTGitPath::LOGACTIONS_ADDED)
\r
2062 if(status&CTGitPath::LOGACTIONS_DELETED)
\r
2065 if(status&(CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_MODIFIED))
\r
2068 if(status&CTGitPath::LOGACTIONS_CONFLICT)
\r
2071 if(status&(CTGitPath::LOGACTIONS_IGNORE|CTGitPath::LOGACTIONS_UNVER))
\r
2076 // } // switch (entry->status)
\r
2077 // } // if (entry)
\r
2078 } // for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2079 return !bRefetchStatus;
\r
2084 void CGitStatusListCtrl::GetMinMaxRevisions(git_revnum_t& rMin, git_revnum_t& rMax, bool bShownOnly, bool bCheckedOnly)
\r
2087 Locker lock(m_critSec);
\r
2091 if ((bShownOnly)||(bCheckedOnly))
\r
2093 for (int i=0; i<GetItemCount(); ++i)
\r
2095 const FileEntry * entry = GetListEntry(i);
\r
2097 if ((entry)&&(entry->last_commit_rev))
\r
2099 if ((!bCheckedOnly)||(entry->IsChecked()))
\r
2101 if (entry->last_commit_rev >= 0)
\r
2103 rMin = min(rMin, entry->last_commit_rev);
\r
2104 rMax = max(rMax, entry->last_commit_rev);
\r
2112 for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2114 const FileEntry * entry = m_arStatusArray[i];
\r
2115 if ((entry)&&(entry->last_commit_rev))
\r
2117 if (entry->last_commit_rev >= 0)
\r
2119 rMin = min(rMin, entry->last_commit_rev);
\r
2120 rMax = max(rMax, entry->last_commit_rev);
\r
2125 if (rMin == LONG_MAX)
\r
2130 int CGitStatusListCtrl::GetGroupFromPoint(POINT * ppt)
\r
2132 // the point must be relative to the upper left corner of the control
\r
2136 if (!IsGroupViewEnabled())
\r
2144 GetWindowRect(&rc);
\r
2145 while (((flags & LVHT_BELOW) == 0)&&(pt.y < rc.bottom))
\r
2147 nItem = HitTest(pt, &flags);
\r
2148 if ((flags & LVHT_ONITEM)||(flags & LVHT_EX_GROUP_HEADER))
\r
2150 // the first item below the point
\r
2152 // check if the point is too much right (i.e. if the point
\r
2153 // is farther to the right than the width of the item)
\r
2155 GetItemRect(nItem, &r, LVIR_LABEL);
\r
2156 if (ppt->x > r.right)
\r
2160 lv.mask = LVIF_GROUPID;
\r
2163 int groupID = lv.iGroupId;
\r
2164 // now we search upwards and check if the item above this one
\r
2165 // belongs to another group. If it belongs to the same group,
\r
2166 // we're not over a group header
\r
2170 nItem = HitTest(pt, &flags);
\r
2171 if ((flags & LVHT_ONITEM)&&(nItem >= 0))
\r
2173 // the first item below the point
\r
2175 lv.mask = LVIF_GROUPID;
\r
2178 if (lv.iGroupId != groupID)
\r
2193 void CGitStatusListCtrl::OnContextMenuGroup(CWnd * /*pWnd*/, CPoint point)
\r
2195 POINT clientpoint = point;
\r
2196 ScreenToClient(&clientpoint);
\r
2197 if ((IsGroupViewEnabled())&&(GetGroupFromPoint(&clientpoint) >= 0))
\r
2200 if (popup.CreatePopupMenu())
\r
2203 temp.LoadString(IDS_STATUSLIST_CHECKGROUP);
\r
2204 popup.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CHECKGROUP, temp);
\r
2205 temp.LoadString(IDS_STATUSLIST_UNCHECKGROUP);
\r
2206 popup.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_UNCHECKGROUP, temp);
\r
2207 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2208 bool bCheck = false;
\r
2211 case IDSVNLC_CHECKGROUP:
\r
2213 // fall through here
\r
2214 case IDSVNLC_UNCHECKGROUP:
\r
2216 int group = GetGroupFromPoint(&clientpoint);
\r
2217 // go through all items and check/uncheck those assigned to the group
\r
2218 // but block the OnLvnItemChanged handler
\r
2221 for (int i=0; i<GetItemCount(); ++i)
\r
2223 SecureZeroMemory(&lv, sizeof(LVITEM));
\r
2224 lv.mask = LVIF_GROUPID;
\r
2228 if (lv.iGroupId == group)
\r
2230 FileEntry * entry = GetListEntry(i);
\r
2233 bool bOldCheck = !!GetCheck(i);
\r
2234 //SetEntryCheck(entry, i, bCheck);
\r
2235 if (bCheck != bOldCheck)
\r
2246 GetStatisticsString();
\r
2256 void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
\r
2259 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
2261 bool XPorLater = false;
\r
2262 OSVERSIONINFOEX inf;
\r
2263 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
2264 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
2265 GetVersionEx((OSVERSIONINFO *)&inf);
\r
2266 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
2267 if (fullver >= 0x0501)
\r
2269 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
2270 CTGitPath * filepath;
\r
2272 int selIndex = GetSelectionMark();
\r
2273 if ((point.x == -1) && (point.y == -1))
\r
2276 GetItemRect(selIndex, &rect, LVIR_LABEL);
\r
2277 ClientToScreen(&rect);
\r
2278 point = rect.CenterPoint();
\r
2280 if ((GetSelectedCount() == 0)&&(XPorLater)&&(m_bHasCheckboxes))
\r
2282 // nothing selected could mean the context menu is requested for
\r
2284 OnContextMenuGroup(pWnd, point);
\r
2286 else if (selIndex >= 0)
\r
2288 //FileEntry * entry = GetListEntry(selIndex);
\r
2290 filepath = (CTGitPath * )GetItemData(selIndex);
\r
2292 ASSERT(filepath != NULL);
\r
2293 if (filepath == NULL)
\r
2296 //const CTGitPath& filepath = entry->path;
\r
2297 int wcStatus = filepath->m_Action;
\r
2298 // entry is selected, now show the popup menu
\r
2299 Locker lock(m_critSec);
\r
2301 CMenu changelistSubMenu;
\r
2302 CMenu ignoreSubMenu;
\r
2303 if (popup.CreatePopupMenu())
\r
2305 //Add Menu for verion controled file
\r
2306 if (!(wcStatus &CTGitPath::LOGACTIONS_UNVER))
\r
2308 if (m_dwContextMenus & SVNSLC_POPCOMPAREWITHBASE)
\r
2310 popup.AppendMenuIcon(IDSVNLC_COMPARE, IDS_LOG_COMPAREWITHBASE, IDI_DIFF);
\r
2311 popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2313 //Select one items
\r
2314 if (GetSelectedCount() == 1)
\r
2316 bool bEntryAdded = false;
\r
2317 //if (entry->remotestatus <= git_wc_status_normal)
\r
2319 // if (wcStatus > git_wc_status_normal)
\r
2321 // if ((m_dwContextMenus & SVNSLC_POPGNUDIFF)&&(wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing))
\r
2323 if(!g_Git.IsInitRepos())
\r
2324 popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
\r
2326 bEntryAdded = true;
\r
2331 //else if (wcStatus != git_wc_status_deleted)
\r
2333 // if (m_dwContextMenus & SVNSLC_POPCOMPARE)
\r
2335 // popup.AppendMenuIcon(IDSVNLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
\r
2336 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2337 // bEntryAdded = true;
\r
2339 // if (m_dwContextMenus & SVNSLC_POPGNUDIFF)
\r
2341 // popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
\r
2342 // bEntryAdded = true;
\r
2346 popup.AppendMenu(MF_SEPARATOR);
\r
2348 //else if (GetSelectedCount() > 1)
\r
2350 // if (m_dwContextMenus & SVNSLC_POPCOMMIT)
\r
2352 // popup.AppendMenuIcon(IDSVNLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);
\r
2353 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2358 ///Select Multi item
\r
2359 //if (GetSelectedCount() > 0)
\r
2361 // if ((GetSelectedCount() == 2)&&(m_dwContextMenus & SVNSLC_POPREPAIRMOVE))
\r
2363 // POSITION pos = GetFirstSelectedItemPosition();
\r
2364 // int index = GetNextSelectedItem(pos);
\r
2365 // if (index >= 0)
\r
2367 // FileEntry * entry = GetListEntry(index);
\r
2368 // git_wc_status_kind status1 = git_wc_status_none;
\r
2369 // git_wc_status_kind status2 = git_wc_status_none;
\r
2371 // status1 = entry->status;
\r
2372 // index = GetNextSelectedItem(pos);
\r
2373 // if (index >= 0)
\r
2375 // entry = GetListEntry(index);
\r
2377 // status2 = entry->status;
\r
2378 // if ((status1 == git_wc_status_missing && status2 == git_wc_status_unversioned) ||
\r
2379 // (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned))
\r
2381 // popup.AppendMenuIcon(IDSVNLC_REPAIRMOVE, IDS_STATUSLIST_CONTEXT_REPAIRMOVE);
\r
2386 // if (wcStatus > git_wc_status_normal)
\r
2388 // if (m_dwContextMenus & SVNSLC_POPREVERT)
\r
2390 // // reverting missing folders is not possible
\r
2391 // if (!entry->IsFolder() || (wcStatus != git_wc_status_missing))
\r
2393 // popup.AppendMenuIcon(IDSVNLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
\r
2397 // if (entry->remotestatus > git_wc_status_normal)
\r
2399 // if (m_dwContextMenus & SVNSLC_POPUPDATE)
\r
2401 // popup.AppendMenuIcon(IDSVNLC_UPDATE, IDS_MENUUPDATE, IDI_UPDATE);
\r
2405 if ((GetSelectedCount() == 1)&&(!wcStatus & CTGitPath::LOGACTIONS_UNVER)
\r
2406 &&(!wcStatus & CTGitPath::LOGACTIONS_IGNORE))
\r
2408 if (m_dwContextMenus & SVNSLC_POPSHOWLOG)
\r
2410 popup.AppendMenuIcon(IDSVNLC_LOG, IDS_REPOBROWSE_SHOWLOG, IDI_LOG);
\r
2412 // if (m_dwContextMenus & SVNSLC_POPBLAME)
\r
2414 // popup.AppendMenuIcon(IDSVNLC_BLAME, IDS_MENUBLAME, IDI_BLAME);
\r
2417 // if ((wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing) && (GetSelectedCount() == 1))
\r
2419 if (m_dwContextMenus & SVNSLC_POPOPEN)
\r
2421 popup.AppendMenuIcon(IDSVNLC_OPEN, IDS_REPOBROWSE_OPEN, IDI_OPEN);
\r
2422 popup.AppendMenuIcon(IDSVNLC_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
\r
2424 if (m_dwContextMenus & SVNSLC_POPEXPLORE)
\r
2426 popup.AppendMenuIcon(IDSVNLC_EXPLORE, IDS_STATUSLIST_CONTEXT_EXPLORE, IDI_EXPLORER);
\r
2429 if (GetSelectedCount() > 0)
\r
2431 // if (((wcStatus == git_wc_status_unversioned)||(wcStatus == git_wc_status_ignored))&&(m_dwContextMenus & SVNSLC_POPDELETE))
\r
2433 // popup.AppendMenuIcon(IDSVNLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
\r
2435 // 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
2438 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVEKEEP, IDI_DELETE);
\r
2440 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVE, IDI_DELETE);
\r
2442 if ((wcStatus & CTGitPath::LOGACTIONS_UNVER)/*||(wcStatus == git_wc_status_deleted)*/)
\r
2444 if (m_dwContextMenus & SVNSLC_POPADD)
\r
2446 //if ( entry->IsFolder() )
\r
2448 // popup.AppendMenuIcon(IDSVNLC_ADD_RECURSIVE, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE, IDI_ADD);
\r
2452 popup.AppendMenuIcon(IDSVNLC_ADD, IDS_STATUSLIST_CONTEXT_ADD, IDI_ADD);
\r
2456 //if ( (wcStatus == git_wc_status_unversioned) || (wcStatus == git_wc_status_deleted) )
\r
2458 if (m_dwContextMenus & SVNSLC_POPIGNORE)
\r
2461 CTGitPathList ignorelist;
\r
2462 FillListOfSelectedItemPaths(ignorelist);
\r
2463 //check if all selected entries have the same extension
\r
2464 bool bSameExt = true;
\r
2466 for (int i=0; i<ignorelist.GetCount(); ++i)
\r
2468 if (sExt.IsEmpty() && (i==0))
\r
2469 sExt = ignorelist[i].GetFileExtension();
\r
2470 else if (sExt.CompareNoCase(ignorelist[i].GetFileExtension())!=0)
\r
2475 if (ignoreSubMenu.CreateMenu())
\r
2477 CString ignorepath;
\r
2478 if (ignorelist.GetCount()==1)
\r
2479 ignorepath = ignorelist[0].GetFileOrDirectoryName();
\r
2481 ignorepath.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
\r
2482 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_IGNORE, ignorepath);
\r
2483 ignorepath = _T("*")+sExt;
\r
2484 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_IGNOREMASK, ignorepath);
\r
2486 temp.LoadString(IDS_MENUIGNORE);
\r
2487 popup.InsertMenu((UINT)-1, MF_BYPOSITION | MF_POPUP, (UINT_PTR)ignoreSubMenu.m_hMenu, temp);
\r
2493 if (ignorelist.GetCount()==1)
\r
2495 temp.LoadString(IDS_MENUIGNORE);
\r
2499 temp.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
\r
2501 popup.AppendMenuIcon(IDSVNLC_IGNORE, temp, IDI_IGNORE);
\r
2507 if (((wcStatus == git_wc_status_conflicted)||(entry->isConflicted)))
\r
2509 if ((m_dwContextMenus & SVNSLC_POPCONFLICT)||(m_dwContextMenus & SVNSLC_POPRESOLVE))
\r
2510 popup.AppendMenu(MF_SEPARATOR);
\r
2512 if ((m_dwContextMenus & SVNSLC_POPCONFLICT)&&(entry->textstatus == git_wc_status_conflicted))
\r
2514 popup.AppendMenuIcon(IDSVNLC_EDITCONFLICT, IDS_MENUCONFLICT, IDI_CONFLICT);
\r
2516 if (m_dwContextMenus & SVNSLC_POPRESOLVE)
\r
2518 popup.AppendMenuIcon(IDSVNLC_RESOLVECONFLICT, IDS_STATUSLIST_CONTEXT_RESOLVED, IDI_RESOLVE);
\r
2520 if ((m_dwContextMenus & SVNSLC_POPRESOLVE)&&(entry->textstatus == git_wc_status_conflicted))
\r
2522 popup.AppendMenuIcon(IDSVNLC_RESOLVETHEIRS, IDS_SVNPROGRESS_MENUUSETHEIRS, IDI_RESOLVE);
\r
2523 popup.AppendMenuIcon(IDSVNLC_RESOLVEMINE, IDS_SVNPROGRESS_MENUUSEMINE, IDI_RESOLVE);
\r
2528 if (GetSelectedCount() > 0)
\r
2531 if ((!entry->IsFolder())&&(wcStatus >= git_wc_status_normal)
\r
2532 &&(wcStatus!=git_wc_status_missing)&&(wcStatus!=git_wc_status_deleted)
\r
2533 &&(wcStatus!=git_wc_status_added))
\r
2535 popup.AppendMenu(MF_SEPARATOR);
\r
2536 if ((entry->lock_token.IsEmpty())&&(!entry->IsFolder()))
\r
2538 if (m_dwContextMenus & SVNSLC_POPLOCK)
\r
2540 popup.AppendMenuIcon(IDSVNLC_LOCK, IDS_MENU_LOCK, IDI_LOCK);
\r
2543 if ((!entry->lock_token.IsEmpty())&&(!entry->IsFolder()))
\r
2545 if (m_dwContextMenus & SVNSLC_POPUNLOCK)
\r
2547 popup.AppendMenuIcon(IDSVNLC_UNLOCK, IDS_MENU_UNLOCK, IDI_UNLOCK);
\r
2552 if ((!entry->IsFolder())&&((!entry->lock_token.IsEmpty())||(!entry->lock_remotetoken.IsEmpty())))
\r
2554 if (m_dwContextMenus & SVNSLC_POPUNLOCKFORCE)
\r
2556 popup.AppendMenuIcon(IDSVNLC_UNLOCKFORCE, IDS_MENU_UNLOCKFORCE, IDI_UNLOCK);
\r
2560 if (wcStatus != git_wc_status_missing && wcStatus != git_wc_status_deleted &&wcStatus!=git_wc_status_unversioned)
\r
2562 popup.AppendMenu(MF_SEPARATOR);
\r
2563 popup.AppendMenuIcon(IDSVNLC_PROPERTIES, IDS_STATUSLIST_CONTEXT_PROPERTIES, IDI_PROPERTIES);
\r
2565 popup.AppendMenu(MF_SEPARATOR);
\r
2566 popup.AppendMenuIcon(IDSVNLC_COPY, IDS_STATUSLIST_CONTEXT_COPY, IDI_COPYCLIP);
\r
2567 popup.AppendMenuIcon(IDSVNLC_COPYEXT, IDS_STATUSLIST_CONTEXT_COPYEXT, IDI_COPYCLIP);
\r
2568 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS)&&(XPorLater)
\r
2569 &&(wcStatus != git_wc_status_unversioned)&&(wcStatus != git_wc_status_none))
\r
2571 popup.AppendMenu(MF_SEPARATOR);
\r
2572 // changelist commands
\r
2573 size_t numChangelists = GetNumberOfChangelistsInSelection();
\r
2574 if (numChangelists > 0)
\r
2576 popup.AppendMenuIcon(IDSVNLC_REMOVEFROMCS, IDS_STATUSLIST_CONTEXT_REMOVEFROMCS);
\r
2578 if ((!entry->IsFolder())&&(changelistSubMenu.CreateMenu()))
\r
2581 temp.LoadString(IDS_STATUSLIST_CONTEXT_CREATECS);
\r
2582 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATECS, temp);
\r
2584 if (entry->changelist.Compare(SVNSLC_IGNORECHANGELIST))
\r
2586 changelistSubMenu.AppendMenu(MF_SEPARATOR);
\r
2587 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATEIGNORECS, SVNSLC_IGNORECHANGELIST);
\r
2590 if (m_changelists.size() > 0)
\r
2592 // find the changelist names
\r
2593 bool bNeedSeparator = true;
\r
2594 int cmdID = IDSVNLC_MOVETOCS;
\r
2595 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
2597 if ((entry->changelist.Compare(it->first))&&(it->first.Compare(SVNSLC_IGNORECHANGELIST)))
\r
2599 if (bNeedSeparator)
\r
2601 changelistSubMenu.AppendMenu(MF_SEPARATOR);
\r
2602 bNeedSeparator = false;
\r
2604 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, cmdID, it->first);
\r
2609 temp.LoadString(IDS_STATUSLIST_CONTEXT_MOVETOCS);
\r
2610 popup.AppendMenu(MF_POPUP|MF_STRING, (UINT_PTR)changelistSubMenu.GetSafeHmenu(), temp);
\r
2615 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2618 AfxGetApp()->DoWaitCursor(1);
\r
2619 int iItemCountBeforeMenuCmd = GetItemCount();
\r
2620 bool bForce = false;
\r
2623 case IDSVNLC_OPEN:
\r
2626 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
\r
2628 file= filepath->GetWinPath();
\r
2632 GetTempPath(temppath);
\r
2633 file.Format(_T("%s%s_%s%s"),
\r
2635 filepath->GetBaseFilename(),
\r
2636 m_CurrentVersion.Left(6),
\r
2637 filepath->GetFileExtension());
\r
2640 int ret = (int)ShellExecute(this->m_hWnd, NULL,file, NULL, NULL, SW_SHOW);
\r
2641 if (ret <= HINSTANCE_ERROR)
\r
2643 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
2645 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
2649 case IDSVNLC_OPENWITH:
\r
2652 if(m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
\r
2654 file= filepath->GetWinPath();
\r
2658 GetTempPath(temppath);
\r
2659 file.Format(_T("%s%s_%s%s"),
\r
2661 filepath->GetBaseFilename(),
\r
2662 m_CurrentVersion.Left(6),
\r
2663 filepath->GetFileExtension());
\r
2667 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
2668 cmd += file + _T(" ");
\r
2669 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
2672 case IDSVNLC_EXPLORE:
\r
2674 ShellExecute(this->m_hWnd, _T("explore"), filepath->GetWinPath(), NULL, NULL, SW_SHOW);
\r
2677 case IDSVNLC_COMPARE:
\r
2679 POSITION pos = GetFirstSelectedItemPosition();
\r
2682 int index = GetNextSelectedItem(pos);
\r
2687 case IDSVNLC_GNUDIFF1:
\r
2689 // SVNDiff diff(NULL, this->m_hWnd, true);
\r
2691 // if (entry->remotestatus <= git_wc_status_normal)
\r
2692 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
\r
2694 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
\r
2695 if(m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
\r
2696 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,GitRev::GetWorkingCopy(),
\r
2697 *filepath,GitRev::GetHead());
\r
2699 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,m_CurrentVersion,
\r
2700 *filepath,m_CurrentVersion+_T("~1"));
\r
2704 { // The add went ok, but we now need to run through the selected items again
\r
2705 // and update their status
\r
2706 POSITION pos = GetFirstSelectedItemPosition();
\r
2708 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
2710 CTGitPath * path=(CTGitPath*)GetItemData(index);
\r
2715 cmd.Format(_T("git.exe add %s"),path->GetGitPathString());
\r
2717 if(!g_Git.Run(cmd,&output,CP_OEMCP))
\r
2719 path->m_Action = CTGitPath::LOGACTIONS_ADDED;
\r
2720 SetEntryCheck(path,index,true);
\r
2721 SetItemGroup(index,0);
\r
2722 this->m_StatusFileList.AddPath(*path);
\r
2723 this->m_UnRevFileList.RemoveItem(*path);
\r
2724 this->m_IgnoreFileList.RemoveItem(*path);
\r
2725 Show(this->m_dwShow,0,true,true);
\r
2732 case IDSVNLC_COPY:
\r
2733 CopySelectedEntriesToClipboard(0);
\r
2735 case IDSVNLC_COPYEXT:
\r
2736 CopySelectedEntriesToClipboard((DWORD)-1);
\r
2738 case IDSVNLC_PROPERTIES:
\r
2740 CTSVNPathList targetList;
\r
2741 FillListOfSelectedItemPaths(targetList);
\r
2742 CEditPropertiesDlg dlg;
\r
2743 dlg.SetPathList(targetList);
\r
2745 if (dlg.HasChanged())
\r
2747 // since the user might have changed/removed/added
\r
2748 // properties recursively, we don't really know
\r
2749 // which items have changed their status.
\r
2750 // So tell the parent to do a refresh.
\r
2751 CWnd* pParent = GetParent();
\r
2752 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
2754 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
2759 case IDSVNLC_COMMIT:
\r
2761 CTSVNPathList targetList;
\r
2762 FillListOfSelectedItemPaths(targetList);
\r
2763 CTSVNPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
\r
2764 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
\r
2765 CString commandline = CPathUtils::GetAppDirectory();
\r
2766 commandline += _T("TortoiseProc.exe /command:commit /pathfile:\"");
\r
2767 commandline += tempFile.GetWinPathString();
\r
2768 commandline += _T("\"");
\r
2769 commandline += _T(" /deletepathfile");
\r
2770 CAppUtils::LaunchApplication(commandline, NULL, false);
\r
2773 case IDSVNLC_REVERT:
\r
2775 // If at least one item is not in the status "added"
\r
2776 // we ask for a confirmation
\r
2777 BOOL bConfirm = FALSE;
\r
2778 POSITION pos = GetFirstSelectedItemPosition();
\r
2780 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
2782 FileEntry * fentry = GetListEntry(index);
\r
2783 if (fentry->textstatus != git_wc_status_added)
\r
2791 str.Format(IDS_PROC_WARNREVERT,GetSelectedCount());
\r
2793 if (!bConfirm || CMessageBox::Show(this->m_hWnd, str, _T("TortoiseSVN"), MB_YESNO | MB_ICONQUESTION)==IDYES)
\r
2795 CTSVNPathList targetList;
\r
2796 FillListOfSelectedItemPaths(targetList);
\r
2798 // make sure that the list is reverse sorted, so that
\r
2799 // children are removed before any parents
\r
2800 targetList.SortByPathname(true);
\r
2804 // put all reverted files in the trashbin, except the ones with 'added'
\r
2805 // status because they are not restored by the revert.
\r
2806 CTSVNPathList delList;
\r
2807 POSITION pos = GetFirstSelectedItemPosition();
\r
2809 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
2811 FileEntry * entry = GetListEntry(index);
\r
2812 if (entry->status != git_wc_status_added)
\r
2813 delList.AddPath(entry->GetPath());
\r
2815 if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))
\r
2816 delList.DeleteAllFiles(true);
\r
2818 if (!git.Revert(targetList, CStringArray(), FALSE))
\r
2820 CMessageBox::Show(this->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
2824 // since the entries got reverted we need to remove
\r
2825 // them from the list too, if no remote changes are shown,
\r
2826 // if the unmodified files are not shown
\r
2827 // and if the item is not part of a changelist
\r
2830 while ((pos = GetFirstSelectedItemPosition())!=0)
\r
2833 index = GetNextSelectedItem(pos);
\r
2834 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
\r
2835 if ( fentry->IsFolder() )
\r
2838 CWnd* pParent = GetParent();
\r
2839 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
2841 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
2846 BOOL bAdded = (fentry->textstatus == git_wc_status_added);
\r
2847 fentry->status = git_wc_status_normal;
\r
2848 fentry->propstatus = git_wc_status_normal;
\r
2849 fentry->textstatus = git_wc_status_normal;
\r
2850 fentry->copied = false;
\r
2851 fentry->isConflicted = false;
\r
2852 if ((fentry->GetChangeList().IsEmpty()&&(fentry->remotestatus <= git_wc_status_normal))||(m_dwShow & SVNSLC_SHOWNORMAL))
\r
2856 // reverting added items makes them unversioned, not 'normal'
\r
2857 if (fentry->IsFolder())
\r
2858 fentry->propstatus = git_wc_status_none;
\r
2860 fentry->propstatus = git_wc_status_unversioned;
\r
2861 fentry->status = git_wc_status_unversioned;
\r
2862 fentry->textstatus = git_wc_status_unversioned;
\r
2863 SetItemState(index, 0, LVIS_SELECTED);
\r
2864 SetEntryCheck(fentry, index, false);
\r
2866 else if ((fentry->switched)||(m_dwShow & SVNSLC_SHOWNORMAL))
\r
2868 SetItemState(index, 0, LVIS_SELECTED);
\r
2873 if (GetCheck(index))
\r
2875 RemoveListEntry(index);
\r
2881 SetItemState(index, 0, LVIS_SELECTED);
\r
2885 SaveColumnWidths();
\r
2886 Show(m_dwShow, 0, m_bShowFolders);
\r
2892 case IDSVNLC_COMPARE:
\r
2894 POSITION pos = GetFirstSelectedItemPosition();
\r
2897 int index = GetNextSelectedItem(pos);
\r
2902 case IDSVNLC_COMPAREWC:
\r
2904 POSITION pos = GetFirstSelectedItemPosition();
\r
2907 int index = GetNextSelectedItem(pos);
\r
2908 FileEntry * entry = GetListEntry(index);
\r
2909 ASSERT(entry != NULL);
\r
2910 if (entry == NULL)
\r
2912 SVNDiff diff(NULL, m_hWnd, true);
\r
2913 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
2914 git_revnum_t baseRev = entry->Revision;
\r
2915 diff.DiffFileAgainstBase(
\r
2916 entry->path, baseRev, entry->textstatus, entry->propstatus);
\r
2920 case IDSVNLC_GNUDIFF1:
\r
2922 SVNDiff diff(NULL, this->m_hWnd, true);
\r
2924 if (entry->remotestatus <= git_wc_status_normal)
\r
2925 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
\r
2927 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
\r
2930 case IDSVNLC_UPDATE:
\r
2932 CTSVNPathList targetList;
\r
2933 FillListOfSelectedItemPaths(targetList);
\r
2934 bool bAllExist = true;
\r
2935 for (int i=0; i<targetList.GetCount(); ++i)
\r
2937 if (!targetList[i].Exists())
\r
2939 bAllExist = false;
\r
2945 CSVNProgressDlg dlg;
\r
2946 dlg.SetCommand(CSVNProgressDlg::SVNProgress_Update);
\r
2947 dlg.SetPathList(targetList);
\r
2948 dlg.SetRevision(SVNRev::REV_HEAD);
\r
2953 CString sTempFile = CTempFiles::Instance().GetTempFilePath(false).GetWinPathString();
\r
2954 targetList.WriteToFile(sTempFile, false);
\r
2956 sCmd.Format(_T("\"%s\" /command:update /rev /pathfile:\"%s\" /deletepathfile"),
\r
2957 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), (LPCTSTR)sTempFile);
\r
2959 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
2966 sCmd.Format(_T("\"%s\" /command:log /path:\"%s\""),
\r
2967 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), filepath.GetWinPath());
\r
2969 if (!filepath.IsUrl())
\r
2971 sCmd += _T(" /propspath:\"");
\r
2972 sCmd += filepath.GetWinPathString();
\r
2976 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
2979 case IDSVNLC_BLAME:
\r
2982 sCmd.Format(_T("\"%s\" /command:blame /path:\"%s\""),
\r
2983 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), filepath.GetWinPath());
\r
2985 if (!filepath.IsUrl())
\r
2987 sCmd += _T(" /propspath:\"");
\r
2988 sCmd += filepath.GetWinPathString();
\r
2992 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
2995 case IDSVNLC_OPEN:
\r
2997 int ret = (int)ShellExecute(this->m_hWnd, NULL, filepath.GetWinPath(), NULL, NULL, SW_SHOW);
\r
2998 if (ret <= HINSTANCE_ERROR)
\r
3000 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
3001 cmd += filepath.GetWinPathString();
\r
3002 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
3006 case IDSVNLC_OPENWITH:
\r
3008 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
3009 cmd += filepath.GetWinPathString() + _T(" ");
\r
3010 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
3013 case IDSVNLC_EXPLORE:
\r
3015 ShellExecute(this->m_hWnd, _T("explore"), filepath.GetDirectory().GetWinPath(), NULL, NULL, SW_SHOW);
\r
3018 case IDSVNLC_REMOVE:
\r
3021 CTSVNPathList itemsToRemove;
\r
3022 FillListOfSelectedItemPaths(itemsToRemove);
\r
3024 // We must sort items before removing, so that files are always removed
\r
3025 // *before* their parents
\r
3026 itemsToRemove.SortByPathname(true);
\r
3028 bool bSuccess = false;
\r
3029 if (git.Remove(itemsToRemove, FALSE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))
\r
3035 if ((git.Err->apr_err == SVN_ERR_UNVERSIONED_RESOURCE) ||
\r
3036 (git.Err->apr_err == SVN_ERR_CLIENT_MODIFIED))
\r
3038 CString msg, yes, no, yestoall;
\r
3039 msg.Format(IDS_PROC_REMOVEFORCE, (LPCTSTR)git.GetLastErrorMessage());
\r
3040 yes.LoadString(IDS_MSGBOX_YES);
\r
3041 no.LoadString(IDS_MSGBOX_NO);
\r
3042 yestoall.LoadString(IDS_PROC_YESTOALL);
\r
3043 UINT ret = CMessageBox::Show(m_hWnd, msg, _T("TortoiseSVN"), 2, IDI_ERROR, yes, no, yestoall);
\r
3044 if ((ret == 1)||(ret==3))
\r
3046 if (!git.Remove(itemsToRemove, TRUE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))
\r
3048 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3055 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3059 // The remove went ok, but we now need to run through the selected items again
\r
3060 // and update their status
\r
3061 POSITION pos = GetFirstSelectedItemPosition();
\r
3063 std::vector<int> entriesToRemove;
\r
3064 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3066 FileEntry * e = GetListEntry(index);
\r
3068 ((e->textstatus == git_wc_status_unversioned)||
\r
3069 (e->textstatus == git_wc_status_none)||
\r
3070 (e->textstatus == git_wc_status_ignored)))
\r
3072 if (GetCheck(index))
\r
3075 entriesToRemove.push_back(index);
\r
3079 e->textstatus = git_wc_status_deleted;
\r
3080 e->status = git_wc_status_deleted;
\r
3081 SetEntryCheck(e,index,true);
\r
3084 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)
\r
3086 RemoveListEntry(*it);
\r
3089 SaveColumnWidths();
\r
3090 Show(m_dwShow, 0, m_bShowFolders);
\r
3094 case IDSVNLC_DELETE:
\r
3096 CTSVNPathList pathlist;
\r
3097 FillListOfSelectedItemPaths(pathlist);
\r
3098 pathlist.RemoveChildren();
\r
3100 for (INT_PTR i=0; i<pathlist.GetCount(); ++i)
\r
3102 filelist += pathlist[i].GetWinPathString();
\r
3103 filelist += _T("|");
\r
3105 filelist += _T("|");
\r
3106 int len = filelist.GetLength();
\r
3107 TCHAR * buf = new TCHAR[len+2];
\r
3108 _tcscpy_s(buf, len+2, filelist);
\r
3109 for (int i=0; i<len; ++i)
\r
3110 if (buf[i] == '|')
\r
3112 SHFILEOPSTRUCT fileop;
\r
3113 fileop.hwnd = this->m_hWnd;
\r
3114 fileop.wFunc = FO_DELETE;
\r
3115 fileop.pFrom = buf;
\r
3116 fileop.pTo = NULL;
\r
3117 fileop.fFlags = FOF_NO_CONNECTED_ELEMENTS | ((GetAsyncKeyState(VK_SHIFT) & 0x8000) ? 0 : FOF_ALLOWUNDO);
\r
3118 fileop.lpszProgressTitle = _T("deleting file");
\r
3119 int result = SHFileOperation(&fileop);
\r
3122 if ( (result==0) && (!fileop.fAnyOperationsAborted) )
\r
3125 POSITION pos = NULL;
\r
3126 CTSVNPathList deletedlist; // to store list of deleted folders
\r
3127 while ((pos = GetFirstSelectedItemPosition()) != 0)
\r
3129 int index = GetNextSelectedItem(pos);
\r
3130 if (GetCheck(index))
\r
3133 FileEntry * fentry = GetListEntry(index);
\r
3134 if ((fentry)&&(fentry->isfolder))
\r
3135 deletedlist.AddPath(fentry->path);
\r
3136 RemoveListEntry(index);
\r
3138 // now go through the list of deleted folders
\r
3139 // and remove all their children from the list too!
\r
3140 int nListboxEntries = GetItemCount();
\r
3141 for (int folderindex = 0; folderindex < deletedlist.GetCount(); ++folderindex)
\r
3143 CTSVNPath folderpath = deletedlist[folderindex];
\r
3144 for (int i=0; i<nListboxEntries; ++i)
\r
3146 FileEntry * entry = GetListEntry(i);
\r
3147 if (folderpath.IsAncestorOf(entry->path))
\r
3149 RemoveListEntry(i--);
\r
3150 nListboxEntries--;
\r
3158 case IDSVNLC_IGNOREMASK:
\r
3160 CString name = _T("*")+filepath.GetFileExtension();
\r
3161 CTSVNPathList ignorelist;
\r
3162 FillListOfSelectedItemPaths(ignorelist, true);
\r
3163 std::set<CTSVNPath> parentlist;
\r
3164 for (int i=0; i<ignorelist.GetCount(); ++i)
\r
3166 parentlist.insert(ignorelist[i].GetContainingDirectory());
\r
3168 std::set<CTSVNPath>::iterator it;
\r
3169 std::vector<CString> toremove;
\r
3171 for (it = parentlist.begin(); it != parentlist.end(); ++it)
\r
3173 CTSVNPath parentFolder = (*it).GetDirectory();
\r
3174 SVNProperties props(parentFolder, SVNRev::REV_WC, false);
\r
3176 for (int i=0; i<props.GetCount(); i++)
\r
3178 CString propname(props.GetItemName(i).c_str());
\r
3179 if (propname.CompareNoCase(_T("git:ignore"))==0)
\r
3182 // treat values as normal text even if they're not
\r
3183 value = (char *)props.GetItemValue(i).c_str();
\r
3186 if (value.IsEmpty())
\r
3190 value = value.Trim("\n\r");
\r
3193 value.Remove('\r');
\r
3195 if (!props.Add(_T("git:ignore"), (LPCSTR)value))
\r
3198 temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
\r
3199 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);
\r
3203 CTSVNPath basepath;
\r
3204 int nListboxEntries = GetItemCount();
\r
3205 for (int i=0; i<nListboxEntries; ++i)
\r
3207 FileEntry * entry = GetListEntry(i);
\r
3208 ASSERT(entry != NULL);
\r
3209 if (entry == NULL)
\r
3211 if (basepath.IsEmpty())
\r
3212 basepath = entry->basepath;
\r
3213 // since we ignored files with a mask (e.g. *.exe)
\r
3214 // we have to find find all files in the same
\r
3215 // folder (IsAncestorOf() returns TRUE for _all_ children,
\r
3216 // not just the immediate ones) which match the
\r
3217 // mask and remove them from the list too.
\r
3218 if ((entry->status == git_wc_status_unversioned)&&(parentFolder.IsAncestorOf(entry->path)))
\r
3220 CString f = entry->path.GetSVNPathString();
\r
3221 if (f.Mid(parentFolder.GetSVNPathString().GetLength()).Find('/')<=0)
\r
3223 if (CStringUtils::WildCardMatch(name, f))
\r
3228 toremove.push_back(f);
\r
3233 if (!m_bIgnoreRemoveOnly)
\r
3236 git_wc_status2_t * s;
\r
3237 CTSVNPath gitPath;
\r
3238 s = status.GetFirstFileStatus(parentFolder, gitPath, false, git_depth_empty);
\r
3241 // first check if the folder isn't already present in the list
\r
3242 bool bFound = false;
\r
3243 for (int i=0; i<nListboxEntries; ++i)
\r
3245 FileEntry * entry = GetListEntry(i);
\r
3246 if (entry->path.IsEquivalentTo(gitPath))
\r
3254 FileEntry * entry = new FileEntry();
\r
3255 entry->path = gitPath;
\r
3256 entry->basepath = basepath;
\r
3257 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
3258 entry->textstatus = s->text_status;
\r
3259 entry->propstatus = s->prop_status;
\r
3260 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);
\r
3261 entry->remotetextstatus = s->repos_text_status;
\r
3262 entry->remotepropstatus = s->repos_prop_status;
\r
3263 entry->inunversionedfolder = false;
\r
3264 entry->checked = true;
\r
3265 entry->inexternal = false;
\r
3266 entry->direct = false;
\r
3267 entry->isfolder = true;
\r
3268 entry->last_commit_date = 0;
\r
3269 entry->last_commit_rev = 0;
\r
3270 entry->remoterev = 0;
\r
3273 if (s->entry->url)
\r
3275 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));
\r
3278 if (s->entry && s->entry->present_props)
\r
3280 entry->present_props = s->entry->present_props;
\r
3282 m_arStatusArray.push_back(entry);
\r
3283 m_arListArray.push_back(m_arStatusArray.size()-1);
\r
3284 AddEntry(entry, langID, GetItemCount());
\r
3290 for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)
\r
3292 int nListboxEntries = GetItemCount();
\r
3293 for (int i=0; i<nListboxEntries; ++i)
\r
3295 if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)
\r
3297 RemoveListEntry(i);
\r
3305 case IDSVNLC_IGNORE:
\r
3307 CTSVNPathList ignorelist;
\r
3308 std::vector<CString> toremove;
\r
3309 FillListOfSelectedItemPaths(ignorelist, true);
\r
3311 for (int j=0; j<ignorelist.GetCount(); ++j)
\r
3313 int nListboxEntries = GetItemCount();
\r
3314 for (int i=0; i<nListboxEntries; ++i)
\r
3316 if (GetListEntry(i)->GetPath().IsEquivalentTo(ignorelist[j]))
\r
3322 CString name = CPathUtils::PathPatternEscape(ignorelist[j].GetFileOrDirectoryName());
\r
3323 CTSVNPath parentfolder = ignorelist[j].GetContainingDirectory();
\r
3324 SVNProperties props(parentfolder, SVNRev::REV_WC, false);
\r
3326 for (int i=0; i<props.GetCount(); i++)
\r
3328 CString propname(props.GetItemName(i).c_str());
\r
3329 if (propname.CompareNoCase(_T("git:ignore"))==0)
\r
3332 // treat values as normal text even if they're not
\r
3333 value = (char *)props.GetItemValue(i).c_str();
\r
3336 if (value.IsEmpty())
\r
3340 value = value.Trim("\n\r");
\r
3343 value.Remove('\r');
\r
3345 if (!props.Add(_T("git:ignore"), (LPCSTR)value))
\r
3348 temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
\r
3349 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);
\r
3352 if (GetCheck(selIndex))
\r
3356 // now, if we ignored a folder, remove all its children
\r
3357 if (ignorelist[j].IsDirectory())
\r
3359 for (int i=0; i<(int)m_arListArray.size(); ++i)
\r
3361 FileEntry * entry = GetListEntry(i);
\r
3362 if (entry->status == git_wc_status_unversioned)
\r
3364 if (!ignorelist[j].IsEquivalentTo(entry->GetPath())&&(ignorelist[j].IsAncestorOf(entry->GetPath())))
\r
3366 entry->status = git_wc_status_ignored;
\r
3367 entry->textstatus = git_wc_status_ignored;
\r
3370 toremove.push_back(entry->GetPath().GetSVNPathString());
\r
3376 CTSVNPath basepath = m_arStatusArray[m_arListArray[selIndex]]->basepath;
\r
3378 FileEntry * entry = m_arStatusArray[m_arListArray[selIndex]];
\r
3379 if ( entry->status == git_wc_status_unversioned ) // keep "deleted" items
\r
3380 toremove.push_back(entry->GetPath().GetSVNPathString());
\r
3382 if (!m_bIgnoreRemoveOnly)
\r
3385 git_wc_status2_t * s;
\r
3386 CTSVNPath gitPath;
\r
3387 s = status.GetFirstFileStatus(parentfolder, gitPath, false, git_depth_empty);
\r
3388 // first check if the folder isn't already present in the list
\r
3389 bool bFound = false;
\r
3390 nListboxEntries = GetItemCount();
\r
3391 for (int i=0; i<nListboxEntries; ++i)
\r
3393 FileEntry * entry = GetListEntry(i);
\r
3394 if (entry->path.IsEquivalentTo(gitPath))
\r
3404 FileEntry * entry = new FileEntry();
\r
3405 entry->path = gitPath;
\r
3406 entry->basepath = basepath;
\r
3407 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
3408 entry->textstatus = s->text_status;
\r
3409 entry->propstatus = s->prop_status;
\r
3410 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);
\r
3411 entry->remotetextstatus = s->repos_text_status;
\r
3412 entry->remotepropstatus = s->repos_prop_status;
\r
3413 entry->inunversionedfolder = FALSE;
\r
3414 entry->checked = true;
\r
3415 entry->inexternal = false;
\r
3416 entry->direct = false;
\r
3417 entry->isfolder = true;
\r
3418 entry->last_commit_date = 0;
\r
3419 entry->last_commit_rev = 0;
\r
3420 entry->remoterev = 0;
\r
3423 if (s->entry->url)
\r
3425 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));
\r
3428 if (s->entry && s->entry->present_props)
\r
3430 entry->present_props = s->entry->present_props;
\r
3432 m_arStatusArray.push_back(entry);
\r
3433 m_arListArray.push_back(m_arStatusArray.size()-1);
\r
3434 AddEntry(entry, langID, GetItemCount());
\r
3439 for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)
\r
3441 int nListboxEntries = GetItemCount();
\r
3442 for (int i=0; i<nListboxEntries; ++i)
\r
3444 if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)
\r
3446 RemoveListEntry(i);
\r
3454 case IDSVNLC_EDITCONFLICT:
\r
3455 SVNDiff::StartConflictEditor(filepath);
\r
3457 case IDSVNLC_RESOLVECONFLICT:
\r
3458 case IDSVNLC_RESOLVEMINE:
\r
3459 case IDSVNLC_RESOLVETHEIRS:
\r
3461 git_wc_conflict_choice_t result = git_wc_conflict_choose_merged;
\r
3464 case IDSVNLC_RESOLVETHEIRS:
\r
3465 result = git_wc_conflict_choose_theirs_full;
\r
3467 case IDSVNLC_RESOLVEMINE:
\r
3468 result = git_wc_conflict_choose_mine_full;
\r
3470 case IDSVNLC_RESOLVECONFLICT:
\r
3471 result = git_wc_conflict_choose_merged;
\r
3474 if (CMessageBox::Show(m_hWnd, IDS_PROC_RESOLVE, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO)==IDYES)
\r
3477 POSITION pos = GetFirstSelectedItemPosition();
\r
3481 index = GetNextSelectedItem(pos);
\r
3482 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
\r
3483 if (!git.Resolve(fentry->GetPath(), result, FALSE))
\r
3485 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3489 fentry->status = git_wc_status_modified;
\r
3490 fentry->textstatus = git_wc_status_modified;
\r
3491 fentry->isConflicted = false;
\r
3494 Show(m_dwShow, 0, m_bShowFolders);
\r
3501 CTSVNPathList itemsToAdd;
\r
3502 FillListOfSelectedItemPaths(itemsToAdd);
\r
3504 // We must sort items before adding, so that folders are always added
\r
3505 // *before* any of their children
\r
3506 itemsToAdd.SortByPathname();
\r
3508 ProjectProperties props;
\r
3509 props.ReadPropsPathList(itemsToAdd);
\r
3510 if (git.Add(itemsToAdd, &props, git_depth_empty, TRUE, TRUE, TRUE))
\r
3512 // The add went ok, but we now need to run through the selected items again
\r
3513 // and update their status
\r
3514 POSITION pos = GetFirstSelectedItemPosition();
\r
3516 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3518 FileEntry * e = GetListEntry(index);
\r
3519 e->textstatus = git_wc_status_added;
\r
3520 e->propstatus = git_wc_status_none;
\r
3521 e->status = git_wc_status_added;
\r
3522 SetEntryCheck(e,index,true);
\r
3527 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3529 SaveColumnWidths();
\r
3530 Show(m_dwShow, 0, m_bShowFolders);
\r
3534 case IDSVNLC_ADD_RECURSIVE:
\r
3536 CTSVNPathList itemsToAdd;
\r
3537 FillListOfSelectedItemPaths(itemsToAdd);
\r
3540 dlg.m_pathList = itemsToAdd;
\r
3541 if (dlg.DoModal() == IDOK)
\r
3543 if (dlg.m_pathList.GetCount() == 0)
\r
3545 CSVNProgressDlg progDlg;
\r
3546 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Add);
\r
3547 progDlg.SetPathList(dlg.m_pathList);
\r
3548 ProjectProperties props;
\r
3549 props.ReadPropsPathList(dlg.m_pathList);
\r
3550 progDlg.SetProjectProperties(props);
\r
3551 progDlg.SetItemCount(dlg.m_pathList.GetCount());
\r
3552 progDlg.DoModal();
\r
3555 CWnd* pParent = GetParent();
\r
3556 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3558 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3563 case IDSVNLC_LOCK:
\r
3565 CTSVNPathList itemsToLock;
\r
3566 FillListOfSelectedItemPaths(itemsToLock);
\r
3568 inpDlg.m_sTitle.LoadString(IDS_MENU_LOCK);
\r
3569 CStringUtils::RemoveAccelerators(inpDlg.m_sTitle);
\r
3570 inpDlg.m_sHintText.LoadString(IDS_LOCK_MESSAGEHINT);
\r
3571 inpDlg.m_sCheckText.LoadString(IDS_LOCK_STEALCHECK);
\r
3572 ProjectProperties props;
\r
3573 props.ReadPropsPathList(itemsToLock);
\r
3574 props.nMinLogSize = 0; // the lock message is optional, so no minimum!
\r
3575 inpDlg.m_pProjectProperties = &props;
\r
3576 if (inpDlg.DoModal()==IDOK)
\r
3578 CSVNProgressDlg progDlg;
\r
3579 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Lock);
\r
3580 progDlg.SetOptions(inpDlg.m_iCheck ? ProgOptLockForce : ProgOptNone);
\r
3581 progDlg.SetPathList(itemsToLock);
\r
3582 progDlg.SetCommitMessage(inpDlg.m_sInputText);
\r
3583 progDlg.DoModal();
\r
3585 CWnd* pParent = GetParent();
\r
3586 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3588 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3593 case IDSVNLC_UNLOCKFORCE:
\r
3595 case IDSVNLC_UNLOCK:
\r
3597 CTSVNPathList itemsToUnlock;
\r
3598 FillListOfSelectedItemPaths(itemsToUnlock);
\r
3599 CSVNProgressDlg progDlg;
\r
3600 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Unlock);
\r
3601 progDlg.SetOptions(bForce ? ProgOptLockForce : ProgOptNone);
\r
3602 progDlg.SetPathList(itemsToUnlock);
\r
3603 progDlg.DoModal();
\r
3605 CWnd* pParent = GetParent();
\r
3606 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3608 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3612 case IDSVNLC_REPAIRMOVE:
\r
3614 POSITION pos = GetFirstSelectedItemPosition();
\r
3615 int index = GetNextSelectedItem(pos);
\r
3616 FileEntry * entry1 = NULL;
\r
3617 FileEntry * entry2 = NULL;
\r
3620 entry1 = GetListEntry(index);
\r
3621 git_wc_status_kind status1 = git_wc_status_none;
\r
3622 git_wc_status_kind status2 = git_wc_status_none;
\r
3625 status1 = entry1->status;
\r
3626 index = GetNextSelectedItem(pos);
\r
3629 entry2 = GetListEntry(index);
\r
3632 status2 = entry2->status;
\r
3633 if (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned)
\r
3635 FileEntry * tempentry = entry1;
\r
3637 entry2 = tempentry;
\r
3639 // entry1 was renamed to entry2 but outside of Subversion
\r
3640 // fix this by moving entry2 back to entry1 first,
\r
3641 // then do an git-move from entry1 to entry2
\r
3642 if (MoveFile(entry2->GetPath().GetWinPath(), entry1->GetPath().GetWinPath()))
\r
3645 if (!git.Move(CTSVNPathList(entry1->GetPath()), entry2->GetPath(), TRUE))
\r
3647 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3651 // check the previously unversioned item
\r
3652 entry1->checked = true;
\r
3653 // fixing the move was successful. We have to adjust the new status of the
\r
3655 // Since we don't know if the moved/renamed file had local modifications or not,
\r
3656 // we can't guess the new status. That means we have to refresh...
\r
3657 CWnd* pParent = GetParent();
\r
3658 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3660 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3667 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
\r
3668 FORMAT_MESSAGE_FROM_SYSTEM |
\r
3669 FORMAT_MESSAGE_IGNORE_INSERTS,
\r
3672 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
\r
3673 (LPTSTR) &lpMsgBuf,
\r
3677 MessageBox((LPCTSTR)lpMsgBuf, _T("Error"), MB_OK | MB_ICONINFORMATION );
\r
3678 LocalFree( lpMsgBuf );
\r
3686 case IDSVNLC_REMOVEFROMCS:
\r
3688 CTSVNPathList changelistItems;
\r
3689 FillListOfSelectedItemPaths(changelistItems);
\r
3692 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
\r
3694 // The changelists were removed, but we now need to run through the selected items again
\r
3695 // and update their changelist
\r
3696 POSITION pos = GetFirstSelectedItemPosition();
\r
3698 std::vector<int> entriesToRemove;
\r
3699 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3701 FileEntry * e = GetListEntry(index);
\r
3704 e->changelist.Empty();
\r
3705 if (e->status == git_wc_status_normal)
\r
3707 // remove the entry completely
\r
3708 entriesToRemove.push_back(index);
\r
3711 SetItemGroup(index, 0);
\r
3714 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)
\r
3716 RemoveListEntry(*it);
\r
3718 // TODO: Should we go through all entries here and check if we also could
\r
3719 // remove the changelist from m_changelists ?
\r
3723 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3728 case IDSVNLC_CREATEIGNORECS:
\r
3729 CreateChangeList(SVNSLC_IGNORECHANGELIST);
\r
3731 case IDSVNLC_CREATECS:
\r
3733 CCreateChangelistDlg dlg;
\r
3734 if (dlg.DoModal() == IDOK)
\r
3736 CreateChangeList(dlg.m_sName);
\r
3742 if (cmd < IDSVNLC_MOVETOCS)
\r
3744 CTSVNPathList changelistItems;
\r
3745 FillListOfSelectedItemPaths(changelistItems);
\r
3747 // find the changelist name
\r
3748 CString sChangelist;
\r
3749 int cmdID = IDSVNLC_MOVETOCS;
\r
3751 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
3753 if ((it->first.Compare(SVNSLC_IGNORECHANGELIST))&&(entry->changelist.Compare(it->first)))
\r
3757 sChangelist = it->first;
\r
3762 if (!sChangelist.IsEmpty())
\r
3765 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
\r
3767 // The changelists were moved, but we now need to run through the selected items again
\r
3768 // and update their changelist
\r
3769 POSITION pos = GetFirstSelectedItemPosition();
\r
3771 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3773 FileEntry * e = GetListEntry(index);
\r
3774 e->changelist = sChangelist;
\r
3775 if (!e->IsFolder())
\r
3777 if (m_changelists.find(e->changelist)!=m_changelists.end())
\r
3778 SetItemGroup(index, m_changelists[e->changelist]);
\r
3780 SetItemGroup(index, 0);
\r
3786 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3796 AfxGetApp()->DoWaitCursor(-1);
\r
3797 GetStatisticsString();
\r
3798 int iItemCountAfterMenuCmd = GetItemCount();
\r
3799 //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)
\r
3801 // CWnd* pParent = GetParent();
\r
3802 // if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3804 // pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);
\r
3807 } // if (popup.CreatePopupMenu())
\r
3808 } // if (selIndex >= 0)
\r
3812 void CGitStatusListCtrl::OnContextMenuHeader(CWnd * pWnd, CPoint point)
\r
3814 bool XPorLater = false;
\r
3815 OSVERSIONINFOEX inf;
\r
3816 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
3817 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
3818 GetVersionEx((OSVERSIONINFO *)&inf);
\r
3819 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
3820 if (fullver >= 0x0501)
\r
3823 CHeaderCtrl * pHeaderCtrl = (CHeaderCtrl *)pWnd;
\r
3824 if ((point.x == -1) && (point.y == -1))
\r
3827 pHeaderCtrl->GetItemRect(0, &rect);
\r
3828 ClientToScreen(&rect);
\r
3829 point = rect.CenterPoint();
\r
3831 Locker lock(m_critSec);
\r
3833 if (popup.CreatePopupMenu())
\r
3835 int columnCount = m_ColumnManager.GetColumnCount();
\r
3838 UINT uCheckedFlags = MF_STRING | MF_ENABLED | MF_CHECKED;
\r
3839 UINT uUnCheckedFlags = MF_STRING | MF_ENABLED;
\r
3841 // build control menu
\r
3845 temp.LoadString(IDS_STATUSLIST_SHOWGROUPS);
\r
3846 popup.AppendMenu(IsGroupViewEnabled() ? uCheckedFlags : uUnCheckedFlags, columnCount, temp);
\r
3849 if (m_ColumnManager.AnyUnusedProperties())
\r
3851 temp.LoadString(IDS_STATUSLIST_REMOVEUNUSEDPROPS);
\r
3852 popup.AppendMenu(uUnCheckedFlags, columnCount+1, temp);
\r
3855 temp.LoadString(IDS_STATUSLIST_RESETCOLUMNORDER);
\r
3856 popup.AppendMenu(uUnCheckedFlags, columnCount+2, temp);
\r
3857 popup.AppendMenu(MF_SEPARATOR);
\r
3859 // standard columns
\r
3861 for (int i = 1; i < SVNSLC_NUMCOLUMNS; ++i)
\r
3863 popup.AppendMenu ( m_ColumnManager.IsVisible(i)
\r
3867 , m_ColumnManager.GetName(i));
\r
3870 // user-prop columns:
\r
3871 // find relevant ones and sort 'em
\r
3873 std::map<CString, int> sortedProps;
\r
3874 for (int i = SVNSLC_NUMCOLUMNS; i < columnCount; ++i)
\r
3875 if (m_ColumnManager.IsRelevant(i))
\r
3876 sortedProps[m_ColumnManager.GetName(i)] = i;
\r
3878 if (!sortedProps.empty())
\r
3880 // add 'em to the menu
\r
3882 popup.AppendMenu(MF_SEPARATOR);
\r
3884 typedef std::map<CString, int>::const_iterator CIT;
\r
3885 for ( CIT iter = sortedProps.begin(), end = sortedProps.end()
\r
3889 popup.AppendMenu ( m_ColumnManager.IsVisible(iter->second)
\r
3897 // show menu & let user pick an entry
\r
3899 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
3900 if ((cmd >= 1)&&(cmd < columnCount))
\r
3902 m_ColumnManager.SetVisible (cmd, !m_ColumnManager.IsVisible(cmd));
\r
3904 else if (cmd == columnCount)
\r
3906 EnableGroupView(!IsGroupViewEnabled());
\r
3908 else if (cmd == columnCount+1)
\r
3910 m_ColumnManager.RemoveUnusedProps();
\r
3912 else if (cmd == columnCount+2)
\r
3914 m_ColumnManager.ResetColumns (m_dwDefaultColumns);
\r
3919 void CGitStatusListCtrl::OnContextMenu(CWnd* pWnd, CPoint point)
\r
3924 OnContextMenuList(pWnd, point);
\r
3925 } // if (pWnd == this)
\r
3926 else if (pWnd == GetHeaderCtrl())
\r
3928 OnContextMenuHeader(pWnd, point);
\r
3932 void CGitStatusListCtrl::CreateChangeList(const CString& name)
\r
3935 CTGitPathList changelistItems;
\r
3936 FillListOfSelectedItemPaths(changelistItems);
\r
3938 if (git.AddToChangeList(changelistItems, name, git_depth_empty))
\r
3940 TCHAR groupname[1024];
\r
3941 LVGROUP grp = {0};
\r
3942 grp.cbSize = sizeof(LVGROUP);
\r
3943 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
3944 _tcsncpy_s(groupname, 1024, name, 1023);
\r
3945 grp.pszHeader = groupname;
\r
3946 grp.iGroupId = (int)m_changelists.size();
\r
3947 grp.uAlign = LVGA_HEADER_LEFT;
\r
3948 m_changelists[name] = InsertGroup(-1, &grp);
\r
3950 PrepareGroups(true);
\r
3952 POSITION pos = GetFirstSelectedItemPosition();
\r
3954 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3956 FileEntry * e = GetListEntry(index);
\r
3957 e->changelist = name;
\r
3958 SetEntryCheck(e, index, FALSE);
\r
3961 for (index = 0; index < GetItemCount(); ++index)
\r
3963 FileEntry * e = GetListEntry(index);
\r
3964 if (m_changelists.find(e->changelist)!=m_changelists.end())
\r
3965 SetItemGroup(index, m_changelists[e->changelist]);
\r
3967 SetItemGroup(index, 0);
\r
3972 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("Tortoisegit"), MB_ICONERROR);
\r
3977 void CGitStatusListCtrl::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
\r
3980 Locker lock(m_critSec);
\r
3981 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
3986 if (pNMLV->iItem < 0)
\r
3988 if (!IsGroupViewEnabled())
\r
3991 DWORD ptW = GetMessagePos();
\r
3992 pt.x = GET_X_LPARAM(ptW);
\r
3993 pt.y = GET_Y_LPARAM(ptW);
\r
3994 ScreenToClient(&pt);
\r
3995 int group = GetGroupFromPoint(&pt);
\r
3998 // check/uncheck the whole group depending on the check-state
\r
3999 // of the first item in the group
\r
4001 bool bCheck = false;
\r
4002 bool bFirst = false;
\r
4004 for (int i=0; i<GetItemCount(); ++i)
\r
4006 SecureZeroMemory(&lv, sizeof(LVITEM));
\r
4007 lv.mask = LVIF_GROUPID;
\r
4010 if (lv.iGroupId == group)
\r
4012 FileEntry * entry = GetListEntry(i);
\r
4015 bCheck = !GetCheck(i);
\r
4020 bool bOldCheck = !!GetCheck(i);
\r
4021 SetEntryCheck(entry, i, bCheck);
\r
4022 if (bCheck != bOldCheck)
\r
4032 GetStatisticsString();
\r
4038 // FileEntry * entry = GetListEntry(pNMLV->iItem);
\r
4041 // if (entry->isConflicted)
\r
4043 // gitDiff::StartConflictEditor(entry->GetPath());
\r
4047 StartDiff(pNMLV->iItem);
\r
4053 void CGitStatusListCtrl::StartDiff(int fileindex)
\r
4058 CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);
\r
4060 if(file1.m_Action & CTGitPath::LOGACTIONS_REPLACED)
\r
4062 file2.SetFromGit(file1.GetGitOldPathString());
\r
4068 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
\r
4070 if(!g_Git.IsInitRepos())
\r
4071 CGitDiff::Diff(&file1,&file2,
\r
4072 CString(GIT_REV_ZERO),
\r
4073 GitRev::GetHead());
\r
4075 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
\r
4076 CString(GIT_REV_ZERO));
\r
4079 CGitDiff::Diff(&file1,&file2,
\r
4081 m_CurrentVersion+_T("~1"));
\r
4084 if (fileindex < 0)
\r
4086 FileEntry * entry = GetListEntry(fileindex);
\r
4087 ASSERT(entry != NULL);
\r
4088 if (entry == NULL)
\r
4090 if (((entry->status == git_wc_status_normal)&&(entry->remotestatus <= git_wc_status_normal))||
\r
4091 (entry->status == git_wc_status_unversioned)||(entry->status == git_wc_status_none))
\r
4093 int ret = (int)ShellExecute(this->m_hWnd, NULL, entry->path.GetWinPath(), NULL, NULL, SW_SHOW);
\r
4094 if (ret <= HINSTANCE_ERROR)
\r
4096 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
4097 cmd += entry->path.GetWinPathString();
\r
4098 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
4103 GitDiff diff(NULL, m_hWnd, true);
\r
4104 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
4106 entry->path, entry->textstatus, entry->propstatus,
\r
4107 entry->remotetextstatus, entry->remotepropstatus);
\r
4111 CString CGitStatusListCtrl::GetStatisticsString()
\r
4114 CString sNormal, sAdded, sDeleted, sModified, sConflicted, sUnversioned;
\r
4115 WORD langID = (WORD)(DWORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
4116 TCHAR buf[MAX_STATUS_STRING_LENGTH];
\r
4117 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_normal, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4119 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_added, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4121 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_deleted, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4123 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_modified, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4125 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_conflicted, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4126 sConflicted = buf;
\r
4127 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_unversioned, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4128 sUnversioned = buf;
\r
4130 sToolTip.Format(_T("%s = %d\n%s = %d\n%s = %d\n%s = %d\n%s = %d\n%s = %d"),
\r
4131 (LPCTSTR)sNormal, m_nNormal,
\r
4132 (LPCTSTR)sUnversioned, m_nUnversioned,
\r
4133 (LPCTSTR)sModified, m_nModified,
\r
4134 (LPCTSTR)sAdded, m_nAdded,
\r
4135 (LPCTSTR)sDeleted, m_nDeleted,
\r
4136 (LPCTSTR)sConflicted, m_nConflicted
\r
4139 sStats.Format(IDS_COMMITDLG_STATISTICSFORMAT, m_nSelected, GetItemCount());
\r
4142 m_pStatLabel->SetWindowText(sStats);
\r
4145 if (m_pSelectButton)
\r
4147 if (m_nSelected == 0)
\r
4148 m_pSelectButton->SetCheck(BST_UNCHECKED);
\r
4149 else if (m_nSelected != GetItemCount())
\r
4150 m_pSelectButton->SetCheck(BST_INDETERMINATE);
\r
4152 m_pSelectButton->SetCheck(BST_CHECKED);
\r
4155 if (m_pConfirmButton)
\r
4157 m_pConfirmButton->EnableWindow(m_nSelected>0);
\r
4165 CString CGitStatusListCtrl::GetCommonDirectory(bool bStrict)
\r
4169 // not strict means that the selected folder has priority
\r
4170 if (!m_StatusFileList.GetCommonDirectory().IsEmpty())
\r
4171 return m_StatusFileList.GetCommonDirectory().GetWinPath();
\r
4174 CTGitPath commonBaseDirectory;
\r
4175 int nListItems = GetItemCount();
\r
4176 for (int i=0; i<nListItems; ++i)
\r
4178 CTGitPath baseDirectory,*p= (CTGitPath*)this->GetItemData(i);
\r
4182 baseDirectory = p->GetDirectory();
\r
4184 if(commonBaseDirectory.IsEmpty())
\r
4186 commonBaseDirectory = baseDirectory;
\r
4190 if (commonBaseDirectory.GetWinPathString().GetLength() > baseDirectory.GetWinPathString().GetLength())
\r
4192 if (baseDirectory.IsAncestorOf(commonBaseDirectory))
\r
4193 commonBaseDirectory = baseDirectory;
\r
4197 return g_Git.m_CurrentDir+CString(_T("\\"))+commonBaseDirectory.GetWinPath();
\r
4200 CTGitPath CGitStatusListCtrl::GetCommonURL(bool bStrict)
\r
4202 CTGitPath commonBaseURL;
\r
4207 // not strict means that the selected folder has priority
\r
4208 if (!m_StatusUrlList.GetCommonDirectory().IsEmpty())
\r
4209 return m_StatusUrlList.GetCommonDirectory();
\r
4212 int nListItems = GetItemCount();
\r
4213 for (int i=0; i<nListItems; ++i)
\r
4215 const CTGitPath& baseURL = CTGitPath(GetListEntry(i)->GetURL());
\r
4216 if (baseURL.IsEmpty())
\r
4217 continue; // item has no url
\r
4218 if(commonBaseURL.IsEmpty())
\r
4220 commonBaseURL = baseURL;
\r
4224 if (commonBaseURL.GetGitPathString().GetLength() > baseURL.GetGitPathString().GetLength())
\r
4226 if (baseURL.IsAncestorOf(commonBaseURL))
\r
4227 commonBaseURL = baseURL;
\r
4233 return commonBaseURL;
\r
4236 void CGitStatusListCtrl::SelectAll(bool bSelect, bool bIncludeNoCommits)
\r
4238 CWaitCursor waitCursor;
\r
4239 // block here so the LVN_ITEMCHANGED messages
\r
4244 int nListItems = GetItemCount();
\r
4246 m_nSelected = nListItems;
\r
4250 for (int i=0; i<nListItems; ++i)
\r
4252 //FileEntry * entry = GetListEntry(i);
\r
4253 //ASSERT(entry != NULL);
\r
4254 CTGitPath *path = (CTGitPath *) GetItemData(i);
\r
4257 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))
\r
4258 SetEntryCheck(path,i,bSelect);
\r
4261 // unblock before redrawing
\r
4264 GetStatisticsString();
\r
4268 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR *pNMHDR, LRESULT *pResult)
\r
4270 LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast<LPNMLVGETINFOTIP>(pNMHDR);
\r
4275 if (GetListEntry(pGetInfoTip->iItem >= 0))
\r
4276 if (pGetInfoTip->cchTextMax > GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString().GetLength())
\r
4278 if (GetListEntry(pGetInfoTip->iItem)->GetRelativeGitPath().Compare(GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString())!= 0)
\r
4279 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString(), pGetInfoTip->cchTextMax);
\r
4280 else if (GetStringWidth(GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString()) > GetColumnWidth(pGetInfoTip->iItem))
\r
4281 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString(), pGetInfoTip->cchTextMax);
\r
4286 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult)
\r
4288 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
4290 // Take the default processing unless we set this to something else below.
\r
4291 *pResult = CDRF_DODEFAULT;
\r
4293 // First thing - check the draw stage. If it's the control's prepaint
\r
4294 // stage, then tell Windows we want messages for every item.
\r
4296 switch (pLVCD->nmcd.dwDrawStage)
\r
4298 case CDDS_PREPAINT:
\r
4299 *pResult = CDRF_NOTIFYITEMDRAW;
\r
4301 case CDDS_ITEMPREPAINT:
\r
4303 // This is the prepaint stage for an item. Here's where we set the
\r
4304 // item's text color. Our return value will tell Windows to draw the
\r
4305 // item itself, but it will use the new color we set here.
\r
4307 // Tell Windows to paint the control itself.
\r
4308 *pResult = CDRF_DODEFAULT;
\r
4312 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
4314 if (m_arStatusArray.size() > (DWORD_PTR)pLVCD->nmcd.dwItemSpec)
\r
4317 //FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);
\r
4318 CTGitPath *entry=(CTGitPath *)GetItemData((int)pLVCD->nmcd.dwItemSpec);
\r
4319 if (entry == NULL)
\r
4324 // black : unversioned, normal
\r
4326 // blue : modified
\r
4327 // brown : missing, deleted, replaced
\r
4328 // green : merged (or potential merges)
\r
4329 // red : conflicts or sure conflicts
\r
4330 if(entry->m_Action & CTGitPath::LOGACTIONS_CONFLICT)
\r
4332 crText = m_Colors.GetColor(CColors::Conflict);
\r
4334 }else if(entry->m_Action & CTGitPath::LOGACTIONS_MODIFIED)
\r
4336 crText = m_Colors.GetColor(CColors::Modified);
\r
4338 }else if(entry->m_Action & CTGitPath::LOGACTIONS_ADDED)
\r
4340 crText = m_Colors.GetColor(CColors::Added);
\r
4342 else if(entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
\r
4344 crText = m_Colors.GetColor(CColors::DeletedNode);
\r
4346 else if(entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
\r
4348 crText = m_Colors.GetColor(CColors::RenamedNode);
\r
4351 crText = GetSysColor(COLOR_WINDOWTEXT);
\r
4353 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
4354 pLVCD->clrText = crText;
\r
4361 BOOL CGitStatusListCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
\r
4364 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
\r
4367 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
\r
4369 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
\r
4371 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
\r
4376 void CGitStatusListCtrl::RemoveListEntry(int index)
\r
4379 Locker lock(m_critSec);
\r
4380 DeleteItem(index);
\r
4381 delete m_arStatusArray[m_arListArray[index]];
\r
4382 m_arStatusArray.erase(m_arStatusArray.begin()+m_arListArray[index]);
\r
4383 m_arListArray.erase(m_arListArray.begin()+index);
\r
4384 for (int i=index; i< (int)m_arListArray.size(); ++i)
\r
4386 m_arListArray[i]--;
\r
4391 ///< Set a checkbox on an entry in the listbox
\r
4392 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync
\r
4393 void CGitStatusListCtrl::SetEntryCheck(CTGitPath* pEntry, int listboxIndex, bool bCheck)
\r
4395 pEntry->m_Checked = bCheck;
\r
4396 SetCheck(listboxIndex, bCheck);
\r
4400 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry* parentEntry, bool bCheck)
\r
4403 int nListItems = GetItemCount();
\r
4404 for (int j=0; j< nListItems ; ++j)
\r
4406 FileEntry * childEntry = GetListEntry(j);
\r
4407 ASSERT(childEntry != NULL);
\r
4408 if (childEntry == NULL || childEntry == parentEntry)
\r
4410 if (childEntry->checked != bCheck)
\r
4412 if (parentEntry->path.IsAncestorOf(childEntry->path))
\r
4414 SetEntryCheck(childEntry,j,bCheck);
\r
4430 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList& pathList)
\r
4434 int nListItems = GetItemCount();
\r
4435 for (int i=0; i< nListItems; i++)
\r
4437 const FileEntry* entry = GetListEntry(i);
\r
4438 ASSERT(entry != NULL);
\r
4439 if (entry->IsChecked())
\r
4441 pathList.AddPath(entry->path);
\r
4444 pathList.SortByPathname();
\r
4449 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)
\r
4450 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList& pathList, bool bNoIgnored)
\r
4454 POSITION pos = GetFirstSelectedItemPosition();
\r
4456 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
4458 CTGitPath * entry = (CTGitPath*)GetItemData(index);
\r
4459 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))
\r
4461 pathList.AddPath(*entry);
\r
4465 UINT CGitStatusListCtrl::OnGetDlgCode()
\r
4467 // we want to process the return key and not have that one
\r
4468 // routed to the default pushbutton
\r
4469 return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS;
\r
4472 void CGitStatusListCtrl::OnNMReturn(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
4477 POSITION pos = GetFirstSelectedItemPosition();
\r
4480 int index = GetNextSelectedItem(pos);
\r
4485 void CGitStatusListCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
\r
4487 // Since we catch all keystrokes (to have the enter key processed here instead
\r
4488 // of routed to the default pushbutton) we have to make sure that other
\r
4489 // keys like Tab and Esc still do what they're supposed to do
\r
4490 // Tab = change focus to next/previous control
\r
4491 // Esc = quit the dialog
\r
4496 ::PostMessage(GetParent()->GetSafeHwnd(), WM_NEXTDLGCTL, GetKeyState(VK_SHIFT)&0x8000, 0);
\r
4502 ::SendMessage(GetParent()->GetSafeHwnd(), WM_CLOSE, 0, 0);
\r
4507 CListCtrl::OnKeyDown(nChar, nRepCnt, nFlags);
\r
4510 void CGitStatusListCtrl::PreSubclassWindow()
\r
4512 CListCtrl::PreSubclassWindow();
\r
4513 EnableToolTips(TRUE);
\r
4514 m_Theme.SetWindowTheme(GetSafeHwnd(), L"Explorer", NULL);
\r
4517 INT_PTR CGitStatusListCtrl::OnToolHitTest(CPoint point, TOOLINFO* pTI) const
\r
4521 row = CellRectFromPoint(point, &cellrect, &col );
\r
4527 pTI->hwnd = m_hWnd;
\r
4528 pTI->uId = (UINT)((row<<10)+(col&0x3ff)+1);
\r
4529 pTI->lpszText = LPSTR_TEXTCALLBACK;
\r
4531 pTI->rect = cellrect;
\r
4536 int CGitStatusListCtrl::CellRectFromPoint(CPoint& point, RECT *cellrect, int *col) const
\r
4540 // Make sure that the ListView is in LVS_REPORT
\r
4541 if ((GetWindowLong(m_hWnd, GWL_STYLE) & LVS_TYPEMASK) != LVS_REPORT)
\r
4544 // Get the top and bottom row visible
\r
4545 int row = GetTopIndex();
\r
4546 int bottom = row + GetCountPerPage();
\r
4547 if (bottom > GetItemCount())
\r
4548 bottom = GetItemCount();
\r
4550 // Get the number of columns
\r
4551 CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
\r
4552 int nColumnCount = pHeader->GetItemCount();
\r
4554 // Loop through the visible rows
\r
4555 for ( ;row <=bottom;row++)
\r
4557 // Get bounding rect of item and check whether point falls in it.
\r
4559 GetItemRect(row, &rect, LVIR_BOUNDS);
\r
4560 if (rect.PtInRect(point))
\r
4562 // Now find the column
\r
4563 for (colnum = 0; colnum < nColumnCount; colnum++)
\r
4565 int colwidth = GetColumnWidth(colnum);
\r
4566 if (point.x >= rect.left && point.x <= (rect.left + colwidth))
\r
4569 GetClientRect(&rectClient);
\r
4572 rect.right = rect.left + colwidth;
\r
4574 // Make sure that the right extent does not exceed
\r
4575 // the client area
\r
4576 if (rect.right > rectClient.right)
\r
4577 rect.right = rectClient.right;
\r
4581 rect.left += colwidth;
\r
4588 BOOL CGitStatusListCtrl::OnToolTipText(UINT /*id*/, NMHDR *pNMHDR, LRESULT *pResult)
\r
4591 TOOLTIPTEXTW* pTTTW = (TOOLTIPTEXTW*)pNMHDR;
\r
4592 CString strTipText;
\r
4593 UINT_PTR nID = pNMHDR->idFrom;
\r
4598 UINT_PTR row = ((nID-1) >> 10) & 0x3fffff;
\r
4599 UINT_PTR col = (nID-1) & 0x3ff;
\r
4602 return FALSE; // no custom tooltip for the path, we use the infotip there!
\r
4604 // get the internal column from the visible columns
\r
4605 int internalcol = 0;
\r
4606 UINT_PTR currentcol = 0;
\r
4607 for (; (currentcol != col)
\r
4608 && (internalcol < m_ColumnManager.GetColumnCount()-1)
\r
4611 if (m_ColumnManager.IsVisible (internalcol))
\r
4615 AFX_MODULE_THREAD_STATE* pModuleThreadState = AfxGetModuleThreadState();
\r
4616 CToolTipCtrl* pToolTip = pModuleThreadState->m_pToolTip;
\r
4617 pToolTip->SendMessage(TTM_SETMAXTIPWIDTH, 0, 300);
\r
4620 if ((internalcol == 2)||(internalcol == 4))
\r
4622 FileEntry *fentry = GetListEntry(row);
\r
4625 if (fentry->copied)
\r
4628 url.Format(IDS_STATUSLIST_COPYFROM, (LPCTSTR)CPathUtils::PathUnescape(fentry->copyfrom_url), (LONG)fentry->copyfrom_rev);
\r
4629 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);
\r
4632 if (fentry->switched)
\r
4635 url.Format(IDS_STATUSLIST_SWITCHEDTO, (LPCTSTR)CPathUtils::PathUnescape(fentry->url));
\r
4636 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);
\r
4639 if (fentry->keeplocal)
\r
4641 lstrcpyn(pTTTW->szText, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_KEEPLOCAL)), 80);
\r
4650 void CGitStatusListCtrl::OnPaint()
\r
4653 if ((m_bBusy)||(m_bEmpty))
\r
4658 if (m_sBusy.IsEmpty())
\r
4659 str.LoadString(IDS_STATUSLIST_BUSYMSG);
\r
4665 if (m_sEmpty.IsEmpty())
\r
4666 str.LoadString(IDS_STATUSLIST_EMPTYMSG);
\r
4670 COLORREF clrText = ::GetSysColor(COLOR_WINDOWTEXT);
\r
4671 COLORREF clrTextBk;
\r
4672 if (IsWindowEnabled())
\r
4673 clrTextBk = ::GetSysColor(COLOR_WINDOW);
\r
4675 clrTextBk = ::GetSysColor(COLOR_3DFACE);
\r
4678 GetClientRect(&rc);
\r
4680 pHC = GetHeaderCtrl();
\r
4684 pHC->GetItemRect(0, &rcH);
\r
4685 rc.top += rcH.bottom;
\r
4687 CDC* pDC = GetDC();
\r
4689 CMyMemDC memDC(pDC, &rc);
\r
4691 memDC.SetTextColor(clrText);
\r
4692 memDC.SetBkColor(clrTextBk);
\r
4693 memDC.FillSolidRect(rc, clrTextBk);
\r
4695 CGdiObject * oldfont = memDC.SelectStockObject(DEFAULT_GUI_FONT);
\r
4696 memDC.DrawText(str, rc, DT_CENTER | DT_VCENTER |
\r
4697 DT_WORDBREAK | DT_NOPREFIX | DT_NOCLIP);
\r
4698 memDC.SelectObject(oldfont);
\r
4704 // prevent users from extending our hidden (size 0) columns
\r
4705 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR *pNMHDR, LRESULT *pResult)
\r
4707 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
4709 if ((phdr->iItem < 0)||(phdr->iItem >= SVNSLC_NUMCOLUMNS))
\r
4712 if (m_ColumnManager.IsVisible (phdr->iItem))
\r
4719 // prevent any function from extending our hidden (size 0) columns
\r
4720 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
\r
4722 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
4724 if ((phdr->iItem < 0)||(phdr->iItem >= m_ColumnManager.GetColumnCount()))
\r
4730 // visible columns may be modified
\r
4732 if (m_ColumnManager.IsVisible (phdr->iItem))
\r
4738 // columns already marked as "invisible" internally may be (re-)sized to 0
\r
4740 if ( (phdr->pitem != NULL)
\r
4741 && (phdr->pitem->mask == HDI_WIDTH)
\r
4742 && (phdr->pitem->cxy == 0))
\r
4748 if ( (phdr->pitem != NULL)
\r
4749 && (phdr->pitem->mask != HDI_WIDTH))
\r
4758 void CGitStatusListCtrl::OnDestroy()
\r
4760 SaveColumnWidths(true);
\r
4761 CListCtrl::OnDestroy();
\r
4764 void CGitStatusListCtrl::OnBeginDrag(NMHDR* /*pNMHDR*/, LRESULT* pResult)
\r
4767 Locker lock(m_critSec);
\r
4768 CDropFiles dropFiles; // class for creating DROPFILES struct
\r
4771 POSITION pos = GetFirstSelectedItemPosition();
\r
4772 while ( (index = GetNextSelectedItem(pos)) >= 0 )
\r
4774 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
\r
4775 CTGitPath path = fentry->GetPath();
\r
4776 dropFiles.AddFile( path.GetWinPathString() );
\r
4779 if ( dropFiles.GetCount()>0 )
\r
4781 m_bOwnDrag = true;
\r
4782 dropFiles.CreateStructure();
\r
4783 m_bOwnDrag = false;
\r
4789 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry /* = false */)
\r
4791 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
4792 for (int col = 0; col <= maxcol; col++)
\r
4793 if (m_ColumnManager.IsVisible (col))
\r
4794 m_ColumnManager.ColumnResized (col);
\r
4796 if (bSaveToRegistry)
\r
4797 m_ColumnManager.WriteSettings();
\r
4800 bool CGitStatusListCtrl::EnableFileDrop()
\r
4802 m_bFileDropsEnabled = true;
\r
4806 bool CGitStatusListCtrl::HasPath(const CTGitPath& path)
\r
4809 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
4811 FileEntry * entry = m_arStatusArray[i];
\r
4812 if (entry->GetPath().IsEquivalentTo(path))
\r
4819 bool CGitStatusListCtrl::IsPathShown(const CTGitPath& path)
\r
4822 int itemCount = GetItemCount();
\r
4823 for (int i=0; i < itemCount; i++)
\r
4825 FileEntry * entry = GetListEntry(i);
\r
4826 if (entry->GetPath().IsEquivalentTo(path))
\r
4833 BOOL CGitStatusListCtrl::PreTranslateMessage(MSG* pMsg)
\r
4835 if (pMsg->message == WM_KEYDOWN)
\r
4837 switch (pMsg->wParam)
\r
4841 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
\r
4843 // select all entries
\r
4844 for (int i=0; i<GetItemCount(); ++i)
\r
4846 SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
\r
4855 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
\r
4857 // copy all selected paths to the clipboard
\r
4858 if (GetAsyncKeyState(VK_SHIFT)&0x8000)
\r
4859 CopySelectedEntriesToClipboard(SVNSLC_COLSTATUS);
\r
4861 CopySelectedEntriesToClipboard(0);
\r
4869 return CListCtrl::PreTranslateMessage(pMsg);
\r
4872 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols)
\r
4875 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
4876 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
4877 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
4879 CString sClipboard;
\r
4882 if (GetSelectedCount() == 0)
\r
4884 // first add the column titles as the first line
\r
4885 temp.LoadString(IDS_STATUSLIST_COLFILE);
\r
4886 sClipboard = temp;
\r
4888 DWORD selection = 0;
\r
4889 for (int i = 0, count = m_ColumnManager.GetColumnCount(); i < count; ++i)
\r
4890 if ( ((dwCols == -1) && m_ColumnManager.IsVisible (i))
\r
4891 || ((dwCols != 1) && (i < 32) && ((dwCols & (1 << i)) != 0)))
\r
4893 sClipboard += _T("\t") + m_ColumnManager.GetName(i);
\r
4896 selection += 1 << i;
\r
4899 sClipboard += _T("\r\n");
\r
4901 POSITION pos = GetFirstSelectedItemPosition();
\r
4903 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
4905 FileEntry * entry = GetListEntry(index);
\r
4906 sClipboard += entry->GetDisplayName();
\r
4907 if (selection & SVNSLC_COLFILENAME)
\r
4909 sClipboard += _T("\t")+entry->path.GetFileOrDirectoryName();
\r
4911 if (selection & SVNSLC_COLEXT)
\r
4913 sClipboard += _T("\t")+entry->path.GetFileExtension();
\r
4915 if (selection & SVNSLC_COLSTATUS)
\r
4917 if (entry->isNested)
\r
4919 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
4923 GitStatus::GetStatusString(hResourceHandle, entry->status, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4924 if ((entry->copied)&&(_tcslen(buf)>1))
\r
4925 _tcscat_s(buf, 100, _T(" (+)"));
\r
4926 if ((entry->switched)&&(_tcslen(buf)>1))
\r
4927 _tcscat_s(buf, 100, _T(" (s)"));
\r
4928 if ((entry->status == entry->propstatus)&&
\r
4929 (entry->status != git_wc_status_normal)&&
\r
4930 (entry->status != git_wc_status_unversioned)&&
\r
4931 (!GitStatus::IsImportant(entry->textstatus)))
\r
4932 _tcscat_s(buf, 100, ponly);
\r
4935 sClipboard += _T("\t")+temp;
\r
4937 if (selection & SVNSLC_COLTEXTSTATUS)
\r
4939 if (entry->isNested)
\r
4941 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
4945 GitStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4946 if ((entry->copied)&&(_tcslen(buf)>1))
\r
4947 _tcscat_s(buf, 100, _T(" (+)"));
\r
4948 if ((entry->switched)&&(_tcslen(buf)>1))
\r
4949 _tcscat_s(buf, 100, _T(" (s)"));
\r
4952 sClipboard += _T("\t")+temp;
\r
4954 if (selection & SVNSLC_COLREMOTESTATUS)
\r
4956 if (entry->isNested)
\r
4958 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
4962 GitStatus::GetStatusString(hResourceHandle, entry->remotestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4963 if ((entry->copied)&&(_tcslen(buf)>1))
\r
4964 _tcscat_s(buf, 100, _T(" (+)"));
\r
4965 if ((entry->switched)&&(_tcslen(buf)>1))
\r
4966 _tcscat_s(buf, 100, _T(" (s)"));
\r
4967 if ((entry->remotestatus == entry->remotepropstatus)&&
\r
4968 (entry->remotestatus != git_wc_status_none)&&
\r
4969 (entry->remotestatus != git_wc_status_normal)&&
\r
4970 (entry->remotestatus != git_wc_status_unversioned)&&
\r
4971 (!SVNStatus::IsImportant(entry->remotetextstatus)))
\r
4972 _tcscat_s(buf, 100, ponly);
\r
4975 sClipboard += _T("\t")+temp;
\r
4977 if (selection & GitSLC_COLPROPSTATUS)
\r
4979 if (entry->isNested)
\r
4985 GitStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4986 if ((entry->copied)&&(_tcslen(buf)>1))
\r
4987 _tcscat_s(buf, 100, _T(" (+)"));
\r
4988 if ((entry->switched)&&(_tcslen(buf)>1))
\r
4989 _tcscat_s(buf, 100, _T(" (s)"));
\r
4992 sClipboard += _T("\t")+temp;
\r
4994 if (selection & SVNSLC_COLREMOTETEXT)
\r
4996 if (entry->isNested)
\r
5002 GitStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
5005 sClipboard += _T("\t")+temp;
\r
5007 if (selection & SVNSLC_COLREMOTEPROP)
\r
5009 // SVNSLC_COLREMOTEPROP
\r
5010 if (entry->isNested)
\r
5016 GitStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
5019 sClipboard += _T("\t")+temp;
\r
5021 if (selection & SVNSLC_COLURL)
\r
5022 sClipboard += _T("\t")+entry->url;
\r
5023 if (selection & SVNSLC_COLLOCK)
\r
5025 if (!m_HeadRev.IsHead())
\r
5027 // we have contacted the repository
\r
5029 // decision-matrix
\r
5030 // wc repository text
\r
5033 // UID1 UID1 owner
\r
5034 // UID1 "" lock has been broken
\r
5035 // UID1 UID2 lock has been stolen
\r
5036 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))
\r
5038 if (entry->lock_owner.IsEmpty())
\r
5039 temp = entry->lock_remoteowner;
\r
5041 temp = entry->lock_owner;
\r
5043 else if (entry->lock_remotetoken.IsEmpty())
\r
5046 temp.LoadString(IDS_STATUSLIST_LOCKBROKEN);
\r
5051 temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);
\r
5055 temp = entry->lock_owner;
\r
5056 sClipboard += _T("\t")+temp;
\r
5058 if (selection & SVNSLC_COLLOCKCOMMENT)
\r
5059 sClipboard += _T("\t")+entry->lock_comment;
\r
5060 if (selection & SVNSLC_COLAUTHOR)
\r
5061 sClipboard += _T("\t")+entry->last_commit_author;
\r
5062 if (selection & SVNSLC_COLREVISION)
\r
5064 temp.Format(_T("%ld"), entry->last_commit_rev);
\r
5065 if (entry->last_commit_rev == 0)
\r
5067 sClipboard += _T("\t")+temp;
\r
5069 if (selection & SVNSLC_COLREMOTEREVISION)
\r
5071 temp.Format(_T("%ld"), entry->remoterev);
\r
5072 if (entry->remoterev == 0)
\r
5074 sClipboard += _T("\t")+temp;
\r
5076 if (selection & SVNSLC_COLDATE)
\r
5078 TCHAR datebuf[SVN_DATE_BUFFER];
\r
5079 apr_time_t date = entry->last_commit_date;
\r
5080 SVN::formatDate(datebuf, date, true);
\r
5085 sClipboard += _T("\t")+temp;
\r
5087 if (selection & SVNSLC_COLCOPYFROM)
\r
5089 if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)
\r
5090 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());
\r
5092 temp = entry->copyfrom_url;
\r
5093 sClipboard += _T("\t")+temp;
\r
5096 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
\r
5100 if ((dwCols == -1) && m_ColumnManager.IsVisible (i))
\r
5103 = entry->present_props[m_ColumnManager.GetName(i)];
\r
5104 sClipboard += _T("\t") + value;
\r
5108 sClipboard += _T("\r\n");
\r
5111 return CStringUtils::WriteAsciiStringToClipboard(sClipboard);
\r
5117 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()
\r
5120 std::set<CString> changelists;
\r
5121 POSITION pos = GetFirstSelectedItemPosition();
\r
5123 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
5125 FileEntry * entry = GetListEntry(index);
\r
5126 if (!entry->changelist.IsEmpty())
\r
5127 changelists.insert(entry->changelist);
\r
5129 return changelists.size();
\r
5134 bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
\r
5137 bool bHasGroups=false;
\r
5138 if ( this->m_UnRevFileList.GetCount()>0 ||
\r
5139 this->m_IgnoreFileList.GetCount()>0 || bForce)
\r
5141 bHasGroups = true;
\r
5144 RemoveAllGroups();
\r
5145 EnableGroupView(bHasGroups);
\r
5147 TCHAR groupname[1024];
\r
5148 int groupindex = 0;
\r
5152 LVGROUP grp = {0};
\r
5153 grp.cbSize = sizeof(LVGROUP);
\r
5154 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5155 CString sUnassignedName(_T("Modified File"));
\r
5156 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
\r
5157 grp.pszHeader = groupname;
\r
5158 grp.iGroupId = groupindex;
\r
5159 grp.uAlign = LVGA_HEADER_LEFT;
\r
5160 InsertGroup(groupindex++, &grp);
\r
5162 //if(m_UnRevFileList.GetCount()>0)
\r
5164 _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("No Version Control"), 1023);
\r
5165 grp.pszHeader = groupname;
\r
5166 grp.iGroupId = groupindex;
\r
5167 grp.uAlign = LVGA_HEADER_LEFT;
\r
5168 InsertGroup(groupindex++, &grp);
\r
5171 //if(m_IgnoreFileList.GetCount()>0)
\r
5173 _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("Ignored File"), 1023);
\r
5174 grp.pszHeader = groupname;
\r
5175 grp.iGroupId = groupindex;
\r
5176 grp.uAlign = LVGA_HEADER_LEFT;
\r
5177 InsertGroup(groupindex++, &grp);
\r
5183 m_bHasIgnoreGroup = false;
\r
5185 // now add the items which don't belong to a group
\r
5186 LVGROUP grp = {0};
\r
5187 grp.cbSize = sizeof(LVGROUP);
\r
5188 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5189 CString sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET));
\r
5190 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
\r
5191 grp.pszHeader = groupname;
\r
5192 grp.iGroupId = groupindex;
\r
5193 grp.uAlign = LVGA_HEADER_LEFT;
\r
5194 InsertGroup(groupindex++, &grp);
\r
5196 for (std::map<CString,int>::iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
5198 if (it->first.Compare(SVNSLC_IGNORECHANGELIST)!=0)
\r
5200 LVGROUP grp = {0};
\r
5201 grp.cbSize = sizeof(LVGROUP);
\r
5202 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5203 _tcsncpy_s(groupname, 1024, it->first, 1023);
\r
5204 grp.pszHeader = groupname;
\r
5205 grp.iGroupId = groupindex;
\r
5206 grp.uAlign = LVGA_HEADER_LEFT;
\r
5207 it->second = InsertGroup(groupindex++, &grp);
\r
5210 m_bHasIgnoreGroup = true;
\r
5213 if (m_bHasIgnoreGroup)
\r
5215 // and now add the group 'ignore-on-commit'
\r
5216 std::map<CString,int>::iterator it = m_changelists.find(SVNSLC_IGNORECHANGELIST);
\r
5217 if (it != m_changelists.end())
\r
5219 grp.cbSize = sizeof(LVGROUP);
\r
5220 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5221 _tcsncpy_s(groupname, 1024, SVNSLC_IGNORECHANGELIST, 1023);
\r
5222 grp.pszHeader = groupname;
\r
5223 grp.iGroupId = groupindex;
\r
5224 grp.uAlign = LVGA_HEADER_LEFT;
\r
5225 it->second = InsertGroup(groupindex, &grp);
\r
5229 return bHasGroups;
\r
5232 void CGitStatusListCtrl::NotifyCheck()
\r
5234 CWnd* pParent = GetParent();
\r
5235 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
5237 pParent->SendMessage(SVNSLNM_CHECKCHANGED, m_nSelected);
\r
5241 int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash,CTGitPathList *list)
\r
5244 this->m_bBusy=TRUE;
\r
5245 m_CurrentVersion=hash;
\r
5247 if(hash == GIT_REV_ZERO)
\r
5253 count = list->GetCount();
\r
5255 for(int i=0;i<count;i++)
\r
5257 BYTE_VECTOR cmdout;
\r
5261 cmd=(_T("git.exe diff-index --raw HEAD --numstat -C -M -z"));
\r
5263 cmd.Format(_T("git.exe diff-index --raw HEAD --numstat -C -M -z -- \"%s\""),(*list)[i].GetGitPathString());
\r
5265 if(g_Git.Run(cmd,&cmdout))
\r
5269 if(g_Git.Run(_T("git.exe rev-parse --revs-only HEAD"),&strout,CP_UTF8))
\r
5271 CMessageBox::Show(NULL,strout,_T("TortoiseGit"),MB_OK);
\r
5274 if(strout.IsEmpty())
\r
5275 break; //this is initial repositoyr, there are no any history
\r
5277 CMessageBox::Show(NULL,strout,_T("TortoiseGit"),MB_OK);
\r
5283 cmd=(_T("git.exe diff-index --cached --raw HEAD --numstat -C -M -z"));
\r
5285 cmd.Format(_T("git.exe diff-index --cached --raw HEAD --numstat -C -M -z -- \"%s\""),(*list)[i].GetGitPathString());
\r
5287 g_Git.Run(cmd,&cmdout);
\r
5289 out.append(cmdout,0);
\r
5293 this->m_StatusFileList.ParserFromLog(out);
\r
5300 count = list->GetCount();
\r
5302 for(int i=0;i<count;i++)
\r
5304 BYTE_VECTOR cmdout;
\r
5307 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M -z %s"),hash);
\r
5309 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M %s -z -- \"%s\""),hash,(*list)[i].GetGitPathString());
\r
5311 g_Git.Run(cmd,&cmdout);
\r
5313 out.append(cmdout);
\r
5315 this->m_StatusFileList.ParserFromLog(out);
\r
5318 for(int i=0;i<m_StatusFileList.GetCount();i++)
\r
5320 CTGitPath * gitpatch=(CTGitPath*)&m_StatusFileList[i];
\r
5321 gitpatch->m_Checked = TRUE;
\r
5322 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
\r
5324 this->m_bBusy=FALSE;
\r
5328 int CGitStatusListCtrl::UpdateWithGitPathList(CTGitPathList &list)
\r
5330 m_arStatusArray.clear();
\r
5331 for(int i=0;i<list.GetCount();i++)
\r
5333 CTGitPath * gitpatch=(CTGitPath*)&list[i];
\r
5334 gitpatch->m_Checked = TRUE;
\r
5335 m_arStatusArray.push_back((CTGitPath*)&list[i]);
\r
5340 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList *List)
\r
5342 this->m_UnRevFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER,List);
\r
5343 for(int i=0;i<m_UnRevFileList.GetCount();i++)
\r
5345 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
\r
5346 gitpatch->m_Checked = FALSE;
\r
5347 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
\r
5352 int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList *List)
\r
5354 this->m_IgnoreFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER|CTGitPath::LOGACTIONS_IGNORE,List);
\r
5355 for(int i=0;i<m_IgnoreFileList.GetCount();i++)
\r
5357 CTGitPath * gitpatch=(CTGitPath*)&m_IgnoreFileList[i];
\r
5358 gitpatch->m_Checked = FALSE;
\r
5359 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
\r
5363 int CGitStatusListCtrl::UpdateFileList(int mask,bool once,CTGitPathList *List)
\r
5365 if(mask&CGitStatusListCtrl::FILELIST_MODIFY)
\r
5367 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_MODIFY)))
\r
5369 UpdateFileList(git_revnum_t(GIT_REV_ZERO),List);
\r
5370 m_FileLoaded|=CGitStatusListCtrl::FILELIST_MODIFY;
\r
5373 if(mask&CGitStatusListCtrl::FILELIST_UNVER)
\r
5375 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_UNVER)))
\r
5377 UpdateUnRevFileList(List);
\r
5378 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
\r
5383 //////////////////////////////////////////////////////////////////////////
\r
5385 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium, DWORD * /*pdwEffect*/, POINTL pt)
\r
5387 if(pFmtEtc->cfFormat == CF_HDROP && medium.tymed == TYMED_HGLOBAL)
\r
5389 HDROP hDrop = (HDROP)GlobalLock(medium.hGlobal);
\r
5392 TCHAR szFileName[MAX_PATH];
\r
5394 UINT cFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
\r
5396 POINT clientpoint;
\r
5397 clientpoint.x = pt.x;
\r
5398 clientpoint.y = pt.y;
\r
5399 ScreenToClient(m_hTargetWnd, &clientpoint);
\r
5400 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
\r
5402 CTSVNPathList changelistItems;
\r
5403 for(UINT i = 0; i < cFiles; ++i)
\r
5405 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
\r
5406 changelistItems.AddPath(CTSVNPath(szFileName));
\r
5408 // find the changelist name
\r
5409 CString sChangelist;
\r
5410 LONG_PTR nGroup = m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint);
\r
5411 for (std::map<CString, int>::iterator it = m_pSVNStatusListCtrl->m_changelists.begin(); it != m_pSVNStatusListCtrl->m_changelists.end(); ++it)
\r
5412 if (it->second == nGroup)
\r
5413 sChangelist = it->first;
\r
5414 if (!sChangelist.IsEmpty())
\r
5417 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
\r
5419 for (int l=0; l<changelistItems.GetCount(); ++l)
\r
5421 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
\r
5424 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
\r
5427 e->changelist = sChangelist;
\r
5428 if (!e->IsFolder())
\r
5430 if (m_pSVNStatusListCtrl->m_changelists.find(e->changelist)!=m_pSVNStatusListCtrl->m_changelists.end())
\r
5431 m_pSVNStatusListCtrl->SetItemGroup(index, m_pSVNStatusListCtrl->m_changelists[e->changelist]);
\r
5433 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
\r
5439 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5440 if (hParentWnd != NULL)
\r
5441 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
\r
5447 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
5453 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
\r
5455 for (int l=0; l<changelistItems.GetCount(); ++l)
\r
5457 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
\r
5460 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
\r
5463 e->changelist = sChangelist;
\r
5464 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
\r
5469 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5470 if (hParentWnd != NULL)
\r
5471 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
\r
5477 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
5483 for(UINT i = 0; i < cFiles; ++i)
\r
5485 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
\r
5486 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5487 if (hParentWnd != NULL)
\r
5488 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)szFileName);
\r
5492 GlobalUnlock(medium.hGlobal);
\r
5494 return true; //let base free the medium
\r
5496 HRESULT STDMETHODCALLTYPE CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect)
\r
5498 CIDropTarget::DragOver(grfKeyState, pt, pdwEffect);
\r
5499 *pdwEffect = DROPEFFECT_COPY;
\r
5500 if (m_pSVNStatusListCtrl)
\r
5502 POINT clientpoint;
\r
5503 clientpoint.x = pt.x;
\r
5504 clientpoint.y = pt.y;
\r
5505 ScreenToClient(m_hTargetWnd, &clientpoint);
\r
5506 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
\r
5508 *pdwEffect = DROPEFFECT_MOVE;
\r
5510 else if ((!m_pSVNStatusListCtrl->m_bFileDropsEnabled)||(m_pSVNStatusListCtrl->m_bOwnDrag))
\r
5512 *pdwEffect = DROPEFFECT_NONE;
\r
OSDN Git Service
