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
306 int refetchcounter = 0;
\r
309 // force the cursor to change
\r
312 SetCursorPos(pt.x, pt.y);
\r
314 m_mapFilenameToChecked.clear();
\r
315 //m_StatusUrlList.Clear();
\r
316 bool bHasChangelists = (m_changelists.size()>1 || (m_changelists.size()>0 && !m_bHasIgnoreGroup));
\r
317 m_changelists.clear();
\r
318 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
320 FileEntry * entry = m_arStatusArray[i];
\r
321 if ( bHasChangelists && entry->checked)
\r
323 // If change lists are present, remember all checked entries
\r
324 CString path = entry->GetPath().GetGitPathString();
\r
325 m_mapFilenameToChecked[path] = true;
\r
327 if ( (entry->status==git_wc_status_unversioned || entry->status==git_wc_status_missing ) && entry->checked )
\r
329 // The user manually selected an unversioned or missing file. We remember
\r
330 // this so that the selection can be restored when refreshing.
\r
331 CString path = entry->GetPath().GetGitPathString();
\r
332 m_mapFilenameToChecked[path] = true;
\r
334 else if ( entry->status > git_wc_status_normal && !entry->checked )
\r
336 // The user manually deselected a versioned file. We remember
\r
337 // this so that the deselection can be restored when refreshing.
\r
338 CString path = entry->GetPath().GetGitPathString();
\r
339 m_mapFilenameToChecked[path] = false;
\r
343 // use a sorted path list to make sure we fetch the status of
\r
344 // parent items first, *then* the child items (if any)
\r
345 CTGitPathList sortedPathList = pathList;
\r
346 sortedPathList.SortByPathname();
\r
350 m_nTargetCount = 0;
\r
351 m_bHasExternalsFromDifferentRepos = FALSE;
\r
352 m_bHasExternals = FALSE;
\r
353 m_bHasUnversionedItems = FALSE;
\r
354 m_bHasLocks = false;
\r
355 m_bHasChangeLists = false;
\r
356 m_bShowIgnores = bShowIgnores;
\r
357 m_nSortedColumn = 0;
\r
363 // first clear possible status data left from
\r
364 // previous GetStatus() calls
\r
365 ClearStatusArray();
\r
367 m_StatusFileList = sortedPathList;
\r
369 // Since Git_client_status() returns all files, even those in
\r
370 // folders included with Git:externals we need to check if all
\r
371 // files we get here belongs to the same repository.
\r
372 // It is possible to commit changes in an external folder, as long
\r
373 // as the folder belongs to the same repository (but another path),
\r
374 // but it is not possible to commit all files if the externals are
\r
375 // from a different repository.
\r
377 // To check if all files belong to the same repository, we compare the
\r
378 // UUID's - if they're identical then the files belong to the same
\r
379 // repository and can be committed. But if they're different, then
\r
380 // tell the user to commit all changes in the external folders
\r
382 CStringA sUUID; // holds the repo UUID
\r
383 CTGitPathList arExtPaths; // list of Git:external paths
\r
389 m_nTargetCount = sortedPathList.GetCount();
\r
391 GitStatus status(m_pbCanceled);
\r
392 if(m_nTargetCount > 1 && sortedPathList.AreAllPathsFilesInOneDirectory())
\r
394 // This is a special case, where we've been given a list of files
\r
395 // all from one folder
\r
396 // We handle them by setting a status filter, then requesting the Git status of
\r
397 // all the files in the directory, filtering for the ones we're interested in
\r
398 status.SetFilter(sortedPathList);
\r
400 // if all selected entries are files, we don't do a recursive status
\r
401 // fetching. But if only one is a directory, we have to recurse.
\r
402 git_depth_t depth = git_depth_files;
\r
403 // We have set a filter. If all selected items were files or we fetch
\r
404 // the status not recursively, then we have to include
\r
405 // ignored items too - the user has selected them
\r
406 bool bShowIgnoresRight = true;
\r
407 for (int fcindex=0; fcindex<sortedPathList.GetCount(); ++fcindex)
\r
409 if (sortedPathList[fcindex].IsDirectory())
\r
411 depth = git_depth_infinity;
\r
412 bShowIgnoresRight = false;
\r
416 if(!FetchStatusForSingleTarget(config, status, sortedPathList.GetCommonDirectory(), bUpdate, sUUID, arExtPaths, true, depth, bShowIgnoresRight))
\r
423 for(int nTarget = 0; nTarget < m_nTargetCount; nTarget++)
\r
425 // check whether the path we want the status for is already fetched due to status-fetching
\r
426 // of a parent path.
\r
427 // this check is only done for file paths, because folder paths could be included already
\r
428 // but not recursively
\r
429 if (sortedPathList[nTarget].IsDirectory() || GetListEntry(sortedPathList[nTarget]) == NULL)
\r
431 if(!FetchStatusForSingleTarget(config, status, sortedPathList[nTarget], bUpdate, sUUID,
\r
432 arExtPaths, false, git_depth_infinity, bShowIgnores))
\r
440 // remove the 'helper' files of conflicted items from the list.
\r
441 // otherwise they would appear as unversioned files.
\r
442 for (INT_PTR cind = 0; cind < m_ConflictFileList.GetCount(); ++cind)
\r
444 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
446 if (m_arStatusArray[i]->GetPath().IsEquivalentTo(m_ConflictFileList[cind]))
\r
448 delete m_arStatusArray[i];
\r
449 m_arStatusArray.erase(m_arStatusArray.begin()+i);
\r
455 } while(!BuildStatistics() && (refetchcounter < 2) && (*m_pbCanceled==false));
\r
457 if (bShowUserProps)
\r
458 FetchUserProperties();
\r
460 m_ColumnManager.UpdateUserPropList (m_arStatusArray);
\r
465 SetCursorPos(pt.x, pt.y);
\r
473 // Fetch all local properties for all elements in the status array
\r
475 void CGitStatusListCtrl::FetchUserProperties()
\r
478 GitPool globalPool;
\r
480 for (size_t i = 0, count = m_arStatusArray.size(); i < count; ++i)
\r
482 // local / temp pool to hold parameters and props for a single item
\r
484 GitPool localPool ((apr_pool_t*)globalPool);
\r
486 // open working copy for this path
\r
488 const char* path = m_arStatusArray[i]->path.GetGitApiPath (localPool);
\r
490 Git_wc_adm_access_t *adm_access = NULL;
\r
491 Git_error_t * error = Git_wc_adm_probe_open3 ( &adm_access
\r
494 , FALSE // no write lock
\r
495 , 0 // lock just the directory/file itself
\r
501 // get the props and add them to the status info
\r
503 apr_hash_t* props = NULL;
\r
504 Git_error_t * error = Git_wc_prop_list ( &props
\r
510 for ( apr_hash_index_t *index
\r
511 = apr_hash_first (localPool, props)
\r
513 ; index = apr_hash_next (index))
\r
515 // extract next entry from hash
\r
517 const char* key = NULL;
\r
519 const char** val = NULL;
\r
521 apr_hash_this ( index
\r
522 , reinterpret_cast<const void**>(&key)
\r
524 , reinterpret_cast<void**>(&val));
\r
526 // decode / dispatch it
\r
528 CString name = CUnicodeUtils::GetUnicode (key);
\r
529 CString value = CUnicodeUtils::GetUnicode (*val);
\r
531 // store in property container (truncate it after ~100 chars)
\r
533 m_arStatusArray[i]->present_props[name]
\r
534 = value.Left (GitSLC_MAXUSERPROPLENGTH);
\r
537 error = Git_wc_adm_close2 (adm_access, localPool);
\r
539 Git_error_clear (error);
\r
546 // Work on a single item from the list of paths which is provided to us
\r
548 bool CGitStatusListCtrl::FetchStatusForSingleTarget(
\r
551 const CTGitPath& target,
\r
552 bool bFetchStatusFromRepository,
\r
553 CStringA& strCurrentRepositoryUUID,
\r
554 CTGitPathList& arExtPaths,
\r
561 config.GetDefaultIgnores();
\r
563 CTGitPath workingTarget(target);
\r
565 git_wc_status2_t * s;
\r
567 s = status.GetFirstFileStatus(workingTarget, GitPath, bFetchStatusFromRepository, depth, bShowIgnores);
\r
569 m_HeadRev = SVNRev(status.headrev);
\r
572 Git_wc_status_kind wcFileStatus = GitStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
574 // This one fixes a problem with externals:
\r
575 // If a strLine is a file, Git:externals and its parent directory
\r
576 // will also be returned by GetXXXFileStatus. Hence, we skip all
\r
577 // status info until we find the one matching workingTarget.
\r
578 if (!workingTarget.IsDirectory())
\r
580 if (!workingTarget.IsEquivalentTo(GitPath))
\r
584 s = status.GetNextFileStatus(GitPath);
\r
585 if(workingTarget.IsEquivalentTo(GitPath))
\r
592 m_sLastError = status.GetLastErrorMsg();
\r
595 // Now, set working target to be the base folder of this item
\r
596 workingTarget = workingTarget.GetDirectory();
\r
599 bool bEntryFromDifferentRepo = false;
\r
600 // Is this a versioned item with an associated repos UUID?
\r
601 if ((s->entry)&&(s->entry->uuid))
\r
603 // Have we seen a repos UUID yet?
\r
604 if (strCurrentRepositoryUUID.IsEmpty())
\r
606 // This is the first repos UUID we've seen - record it
\r
607 strCurrentRepositoryUUID = s->entry->uuid;
\r
608 m_sUUID = strCurrentRepositoryUUID;
\r
612 if (strCurrentRepositoryUUID.Compare(s->entry->uuid)!=0)
\r
614 // This item comes from a different repository than our main one
\r
615 m_bHasExternalsFromDifferentRepos = TRUE;
\r
616 bEntryFromDifferentRepo = true;
\r
617 if (s->entry->kind == Git_node_dir)
\r
618 arExtPaths.AddPath(workingTarget);
\r
622 else if (strCurrentRepositoryUUID.IsEmpty() && (s->text_status == Git_wc_status_added))
\r
624 // An added entry doesn't have an UUID assigned to it yet.
\r
625 // So we fetch the status of the parent directory instead and
\r
626 // check if that one has an UUID assigned to it.
\r
627 Git_wc_status2_t * sparent;
\r
628 CTGitPath path = workingTarget;
\r
631 CTGitPath GitParentPath;
\r
632 GitStatus tempstatus;
\r
633 sparent = tempstatus.GetFirstFileStatus(path.GetContainingDirectory(), GitParentPath, false, Git_depth_empty, false);
\r
634 path = GitParentPath;
\r
635 } while ( (sparent) && (sparent->entry) && (!sparent->entry->uuid) && (sparent->text_status==Git_wc_status_added) );
\r
636 if (sparent && sparent->entry && sparent->entry->uuid)
\r
638 strCurrentRepositoryUUID = sparent->entry->uuid;
\r
639 m_sUUID = strCurrentRepositoryUUID;
\r
643 if ((wcFileStatus == Git_wc_status_unversioned)&& GitPath.IsDirectory())
\r
645 // check if the unversioned folder is maybe versioned. This
\r
646 // could happen with nested layouts
\r
647 Git_wc_status_kind st = GitStatus::GetAllStatus(workingTarget);
\r
648 if ((st != Git_wc_status_unversioned)&&(st != Git_wc_status_none))
\r
650 return true; // ignore nested layouts
\r
653 if (status.IsExternal(GitPath))
\r
655 m_bHasExternals = TRUE;
\r
658 AddNewFileEntry(s, GitPath, workingTarget, true, m_bHasExternals, bEntryFromDifferentRepo);
\r
660 if (((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none)||((wcFileStatus == Git_wc_status_ignored)&&(m_bShowIgnores))) && GitPath.IsDirectory())
\r
662 // we have an unversioned folder -> get all files in it recursively!
\r
663 AddUnversionedFolder(GitPath, workingTarget.GetContainingDirectory(), &config);
\r
666 // for folders, get all statuses inside it too
\r
667 if(workingTarget.IsDirectory())
\r
669 ReadRemainingItemsStatus(status, workingTarget, strCurrentRepositoryUUID, arExtPaths, &config, bAllDirect);
\r
675 m_sLastError = status.GetLastErrorMsg();
\r
682 const CGitStatusListCtrl::FileEntry*
\r
683 CGitStatusListCtrl::AddNewFileEntry(
\r
684 const git_wc_status2_t* pGitStatus, // The return from the Git GetStatus functions
\r
685 const CTGitPath& path, // The path of the item we're adding
\r
686 const CTGitPath& basePath, // The base directory for this status build
\r
687 bool bDirectItem, // Was this item the first found by GetFirstFileStatus or by a subsequent GetNextFileStatus call
\r
688 bool bInExternal, // Are we in an 'external' folder
\r
689 bool bEntryfromDifferentRepo // if the entry is from a different repository
\r
692 FileEntry * entry = new FileEntry();
\r
695 entry->path = path;
\r
696 entry->basepath = basePath;
\r
697 entry->status = GitStatus::GetMoreImportant(pGitStatus->text_status, pGitStatus->prop_status);
\r
698 entry->textstatus = pGitStatus->text_status;
\r
699 entry->propstatus = pGitStatus->prop_status;
\r
700 // entry->remotestatus = GitStatus::GetMoreImportant(pGitStatus->repos_text_status, pGitStatus->repos_prop_status);
\r
701 // entry->remotetextstatus = pGitStatus->repos_text_status;
\r
702 // entry->remotepropstatus = pGitStatus->repos_prop_status;
\r
703 entry->inexternal = bInExternal;
\r
704 entry->differentrepo = bEntryfromDifferentRepo;
\r
705 entry->direct = bDirectItem;
\r
706 // entry->copied = !!pGitStatus->copied;
\r
707 // entry->switched = !!pGitStatus->switched;
\r
709 entry->last_commit_date = pGitStatus->ood_last_cmt_date;
\r
710 if ((entry->last_commit_date == NULL)&&(pGitStatus->entry))
\r
711 entry->last_commit_date = pGitStatus->entry->cmt_date;
\r
712 entry->remoterev = pGitStatus->ood_last_cmt_rev;
\r
713 if (pGitStatus->entry)
\r
714 entry->last_commit_rev = pGitStatus->entry->cmt_rev;
\r
715 if (pGitStatus->ood_last_cmt_author)
\r
716 entry->last_commit_author = CUnicodeUtils::GetUnicode(pGitStatus->ood_last_cmt_author);
\r
717 if ((entry->last_commit_author.IsEmpty())&&(pGitStatus->entry)&&(pGitStatus->entry->cmt_author))
\r
718 entry->last_commit_author = CUnicodeUtils::GetUnicode(pGitStatus->entry->cmt_author);
\r
720 if (pGitStatus->entry)
\r
721 entry->isConflicted = (pGitStatus->entry->conflict_wrk && PathFileExists(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_wrk))) ? true : false;
\r
723 if ((entry->status == Git_wc_status_conflicted)||(entry->isConflicted))
\r
725 entry->isConflicted = true;
\r
726 if (pGitStatus->entry)
\r
729 if (pGitStatus->entry->conflict_wrk)
\r
731 cpath = path.GetDirectory();
\r
732 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_wrk));
\r
733 m_ConflictFileList.AddPath(cpath);
\r
735 if (pGitStatus->entry->conflict_old)
\r
737 cpath = path.GetDirectory();
\r
738 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_old));
\r
739 m_ConflictFileList.AddPath(cpath);
\r
741 if (pGitStatus->entry->conflict_new)
\r
743 cpath = path.GetDirectory();
\r
744 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_new));
\r
745 m_ConflictFileList.AddPath(cpath);
\r
747 if (pGitStatus->entry->prejfile)
\r
749 cpath = path.GetDirectory();
\r
750 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->prejfile));
\r
751 m_ConflictFileList.AddPath(cpath);
\r
756 if (pGitStatus->entry)
\r
758 entry->isfolder = (pGitStatus->entry->kind == Git_node_dir);
\r
759 entry->Revision = pGitStatus->entry->revision;
\r
760 entry->keeplocal = !!pGitStatus->entry->keep_local;
\r
761 entry->working_size = pGitStatus->entry->working_size;
\r
762 entry->depth = pGitStatus->entry->depth;
\r
764 if (pGitStatus->entry->url)
\r
766 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(pGitStatus->entry->url));
\r
768 if (pGitStatus->entry->copyfrom_url)
\r
770 entry->copyfrom_url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(pGitStatus->entry->copyfrom_url));
\r
771 entry->copyfrom_rev = pGitStatus->entry->copyfrom_rev;
\r
774 entry->copyfrom_rev = 0;
\r
778 if (m_sURL.IsEmpty())
\r
779 m_sURL = entry->url;
\r
781 m_sURL.LoadString(IDS_STATUSLIST_MULTIPLETARGETS);
\r
782 m_StatusUrlList.AddPath(CTGitPath(entry->url));
\r
784 if (pGitStatus->entry->lock_owner)
\r
785 entry->lock_owner = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_owner);
\r
786 if (pGitStatus->entry->lock_token)
\r
788 entry->lock_token = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_token);
\r
789 m_bHasLocks = true;
\r
791 if (pGitStatus->entry->lock_comment)
\r
792 entry->lock_comment = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_comment);
\r
794 if (pGitStatus->entry->present_props)
\r
796 entry->present_props = pGitStatus->entry->present_props;
\r
799 if (pGitStatus->entry->changelist)
\r
801 entry->changelist = CUnicodeUtils::GetUnicode(pGitStatus->entry->changelist);
\r
802 m_changelists[entry->changelist] = -1;
\r
803 m_bHasChangeLists = true;
\r
805 entry->needslock = (pGitStatus->entry->present_props && (strstr(pGitStatus->entry->present_props, "Git:needs-lock")!=NULL) );
\r
809 if (pGitStatus->ood_kind == Git_node_none)
\r
810 entry->isfolder = path.IsDirectory();
\r
812 entry->isfolder = (pGitStatus->ood_kind == Git_node_dir);
\r
814 if (pGitStatus->repos_lock)
\r
816 if (pGitStatus->repos_lock->owner)
\r
817 entry->lock_remoteowner = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->owner);
\r
818 if (pGitStatus->repos_lock->token)
\r
819 entry->lock_remotetoken = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->token);
\r
820 if (pGitStatus->repos_lock->comment)
\r
821 entry->lock_comment = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->comment);
\r
824 // Pass ownership of the entry to the array
\r
825 m_arStatusArray.push_back(entry);
\r
831 void CGitStatusListCtrl::AddUnversionedFolder(const CTGitPath& folderName,
\r
832 const CTGitPath& basePath,
\r
833 GitConfig * config)
\r
836 if (!m_bUnversionedRecurse)
\r
838 CSimpleFileFind filefinder(folderName.GetWinPathString());
\r
840 CTGitPath filename;
\r
841 m_bHasUnversionedItems = TRUE;
\r
842 while (filefinder.FindNextFileNoDots())
\r
844 filename.SetFromWin(filefinder.GetFilePath(), filefinder.IsDirectory());
\r
846 bool bMatchIgnore = !!config->MatchIgnorePattern(filename.GetFileOrDirectoryName());
\r
847 bMatchIgnore = bMatchIgnore || config->MatchIgnorePattern(filename.GetGitPathString());
\r
848 if (((bMatchIgnore)&&(m_bShowIgnores))||(!bMatchIgnore))
\r
850 FileEntry * entry = new FileEntry();
\r
851 entry->path = filename;
\r
852 entry->basepath = basePath;
\r
853 entry->inunversionedfolder = true;
\r
854 entry->isfolder = filefinder.IsDirectory();
\r
856 m_arStatusArray.push_back(entry);
\r
857 if (entry->isfolder)
\r
859 if (!g_GitAdminDir.HasAdminDir(entry->path.GetWinPathString(), true))
\r
860 AddUnversionedFolder(entry->path, basePath, config);
\r
868 void CGitStatusListCtrl::ReadRemainingItemsStatus(GitStatus& status, const CTGitPath& basePath,
\r
869 CStringA& strCurrentRepositoryUUID,
\r
870 CTGitPathList& arExtPaths, GitConfig * config, bool bAllDirect)
\r
873 git_wc_status2_t * s;
\r
875 CTGitPath lastexternalpath;
\r
877 while ((s = status.GetNextFileStatus(GitPath)) != NULL)
\r
879 Git_wc_status_kind wcFileStatus = GitStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
880 if ((wcFileStatus == Git_wc_status_unversioned) && (GitPath.IsDirectory()))
\r
882 // check if the unversioned folder is maybe versioned. This
\r
883 // could happen with nested layouts
\r
884 Git_wc_status_kind st = GitStatus::GetAllStatus(GitPath);
\r
885 if ((st != Git_wc_status_unversioned)&&(st != Git_wc_status_none))
\r
887 FileEntry * entry = new FileEntry();
\r
888 entry->path = GitPath;
\r
889 entry->basepath = basePath;
\r
890 entry->inunversionedfolder = true;
\r
891 entry->isfolder = true;
\r
892 entry->isNested = true;
\r
893 m_arStatusArray.push_back(entry);
\r
897 bool bDirectoryIsExternal = false;
\r
898 bool bEntryfromDifferentRepo = false;
\r
901 if (s->entry->uuid)
\r
903 if (strCurrentRepositoryUUID.IsEmpty())
\r
904 strCurrentRepositoryUUID = s->entry->uuid;
\r
907 if (strCurrentRepositoryUUID.Compare(s->entry->uuid)!=0)
\r
909 bEntryfromDifferentRepo = true;
\r
910 if (GitStatus::IsImportant(wcFileStatus))
\r
911 m_bHasExternalsFromDifferentRepos = TRUE;
\r
912 if (s->entry->kind == Git_node_dir)
\r
914 if ((lastexternalpath.IsEmpty())||(!lastexternalpath.IsAncestorOf(GitPath)))
\r
916 arExtPaths.AddPath(GitPath);
\r
917 lastexternalpath = GitPath;
\r
925 // we don't have an UUID - maybe an added file/folder
\r
926 if (!strCurrentRepositoryUUID.IsEmpty())
\r
928 if ((!lastexternalpath.IsEmpty())&&
\r
929 (lastexternalpath.IsAncestorOf(GitPath)))
\r
931 bEntryfromDifferentRepo = true;
\r
932 m_bHasExternalsFromDifferentRepos = TRUE;
\r
939 // if unversioned items lie around in external
\r
940 // directories from different repos, we have to mark them
\r
942 if (!strCurrentRepositoryUUID.IsEmpty())
\r
944 if ((!lastexternalpath.IsEmpty())&&
\r
945 (lastexternalpath.IsAncestorOf(GitPath)))
\r
947 bEntryfromDifferentRepo = true;
\r
951 if (status.IsExternal(GitPath))
\r
953 arExtPaths.AddPath(GitPath);
\r
954 m_bHasExternals = TRUE;
\r
956 if ((!bEntryfromDifferentRepo)&&(status.IsInExternal(GitPath)))
\r
958 // if the externals are inside an unversioned folder (this happens if
\r
959 // the externals are specified with e.g. "ext\folder url" instead of just
\r
960 // "folder url"), then a commit won't succeed.
\r
961 // therefore, we treat those as if the externals come from a different
\r
963 CTGitPath extpath = GitPath;
\r
964 while (basePath.IsAncestorOf(extpath))
\r
966 if (!extpath.HasAdminDir())
\r
968 bEntryfromDifferentRepo = true;
\r
971 extpath = extpath.GetContainingDirectory();
\r
974 // Do we have any external paths?
\r
975 if(arExtPaths.GetCount() > 0)
\r
977 // If do have external paths, we need to check if the current item belongs
\r
979 for (int ix=0; ix<arExtPaths.GetCount(); ix++)
\r
981 if (arExtPaths[ix].IsAncestorOf(GitPath))
\r
983 bDirectoryIsExternal = true;
\r
989 if ((wcFileStatus == Git_wc_status_unversioned)&&(!bDirectoryIsExternal))
\r
990 m_bHasUnversionedItems = TRUE;
\r
992 const FileEntry* entry = AddNewFileEntry(s, GitPath, basePath, bAllDirect, bDirectoryIsExternal, bEntryfromDifferentRepo);
\r
994 bool bMatchIgnore = !!config->MatchIgnorePattern(entry->path.GetFileOrDirectoryName());
\r
995 bMatchIgnore = bMatchIgnore || config->MatchIgnorePattern(entry->path.GetGitPathString());
\r
996 if ((((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none))&&(!bMatchIgnore))||
\r
997 ((wcFileStatus == Git_wc_status_ignored)&&(m_bShowIgnores))||
\r
998 (((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none))&&(bMatchIgnore)&&(m_bShowIgnores)))
\r
1000 if (entry->isfolder)
\r
1002 // we have an unversioned folder -> get all files in it recursively!
\r
1003 AddUnversionedFolder(GitPath, basePath, config);
\r
1006 } // while ((s = status.GetNextFileStatus(GitPath)) != NULL)
\r
1010 // Get the show-flags bitmap value which corresponds to a particular Git status
\r
1011 DWORD CGitStatusListCtrl::GetShowFlagsFromGitStatus(git_wc_status_kind status)
\r
1015 case git_wc_status_none:
\r
1016 case git_wc_status_unversioned:
\r
1017 return SVNSLC_SHOWUNVERSIONED;
\r
1018 case git_wc_status_ignored:
\r
1019 if (!m_bShowIgnores)
\r
1020 return SVNSLC_SHOWDIRECTS;
\r
1021 return SVNSLC_SHOWDIRECTS|SVNSLC_SHOWIGNORED;
\r
1022 case git_wc_status_incomplete:
\r
1023 return SVNSLC_SHOWINCOMPLETE;
\r
1024 case git_wc_status_normal:
\r
1025 return SVNSLC_SHOWNORMAL;
\r
1026 case git_wc_status_external:
\r
1027 return SVNSLC_SHOWEXTERNAL;
\r
1028 case git_wc_status_added:
\r
1029 return SVNSLC_SHOWADDED;
\r
1030 case git_wc_status_missing:
\r
1031 return SVNSLC_SHOWMISSING;
\r
1032 case git_wc_status_deleted:
\r
1033 return SVNSLC_SHOWREMOVED;
\r
1034 case git_wc_status_replaced:
\r
1035 return SVNSLC_SHOWREPLACED;
\r
1036 case git_wc_status_modified:
\r
1037 return SVNSLC_SHOWMODIFIED;
\r
1038 case git_wc_status_merged:
\r
1039 return SVNSLC_SHOWMERGED;
\r
1040 case git_wc_status_conflicted:
\r
1041 return SVNSLC_SHOWCONFLICTED;
\r
1042 case git_wc_status_obstructed:
\r
1043 return SVNSLC_SHOWOBSTRUCTED;
\r
1045 // we should NEVER get here!
\r
1052 void CGitStatusListCtrl::Show(DWORD dwShow, DWORD dwCheck /*=0*/, bool bShowFolders /* = true */,BOOL UpdateStatusList)
\r
1054 CWinApp * pApp = AfxGetApp();
\r
1056 pApp->DoWaitCursor(1);
\r
1058 Locker lock(m_critSec);
\r
1059 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
1061 //SetItemCount(listIndex);
\r
1067 if(UpdateStatusList)
\r
1069 m_arStatusArray.clear();
\r
1070 for(int i=0;i<this->m_StatusFileList.GetCount();i++)
\r
1072 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
\r
1075 for(int i=0;i<this->m_UnRevFileList.GetCount();i++)
\r
1077 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
\r
1080 for(int i=0;i<this->m_IgnoreFileList.GetCount();i++)
\r
1082 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
\r
1085 for(int i=0;i<this->m_arStatusArray.size();i++)
\r
1087 if(((CTGitPath*)m_arStatusArray[i])->m_Action & dwShow)
\r
1088 AddEntry((CTGitPath*)m_arStatusArray[i],langID,i);
\r
1091 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1092 for (int col = 0; col <= maxcol; col++)
\r
1093 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1096 GetStatisticsString();
\r
1098 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1099 HDITEM HeaderItem = {0};
\r
1100 HeaderItem.mask = HDI_FORMAT;
\r
1101 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1103 pHeader->GetItem(i, &HeaderItem);
\r
1104 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1105 pHeader->SetItem(i, &HeaderItem);
\r
1107 if (m_nSortedColumn)
\r
1109 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1110 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1111 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1115 if (nSelectedEntry)
\r
1117 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1118 EnsureVisible(nSelectedEntry, false);
\r
1122 // Restore the item at the top of the list.
\r
1123 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1125 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1133 pApp->DoWaitCursor(-1);
\r
1137 m_dwShow = dwShow;
\r
1141 CWinApp * pApp = AfxGetApp();
\r
1143 pApp->DoWaitCursor(1);
\r
1145 m_bShowFolders = bShowFolders;
\r
1147 int nTopIndex = GetTopIndex();
\r
1148 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
\r
1149 int nSelectedEntry = 0;
\r
1150 if (posSelectedEntry)
\r
1151 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
\r
1157 m_arListArray.clear();
\r
1159 m_arListArray.reserve(m_arStatusArray.size());
\r
1160 SetItemCount (static_cast<int>(m_arStatusArray.size()));
\r
1162 int listIndex = 0;
\r
1163 for (size_t i=0; i < m_arStatusArray.size(); ++i)
\r
1165 FileEntry * entry = m_arStatusArray[i];
\r
1166 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
\r
1168 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
\r
1170 if (entry->IsFolder() && (!bShowFolders))
\r
1171 continue; // don't show folders if they're not wanted.
\r
1174 git_wc_status_kind status = GitStatus::GetMoreImportant(entry->status, entry->remotestatus);
\r
1175 DWORD showFlags = GetShowFlagsFromGitStatus(status);
\r
1176 if (entry->IsLocked())
\r
1177 showFlags |= SVNSLC_SHOWLOCKS;
\r
1178 if (entry->switched)
\r
1179 showFlags |= SVNSLC_SHOWSWITCHED;
\r
1180 if (!entry->changelist.IsEmpty())
\r
1181 showFlags |= SVNSLC_SHOWINCHANGELIST;
\r
1183 bool bAllowCheck = ((entry->changelist.Compare(SVNSLC_IGNORECHANGELIST) != 0)
\r
1184 && (m_bCheckIfGroupsExist || (m_changelists.size()==0 || (m_changelists.size()==1 && m_bHasIgnoreGroup))));
\r
1186 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
\r
1188 if (status != Git_wc_status_ignored || (entry->direct) || (dwShow & GitSLC_SHOWIGNORED))
\r
1190 if ((!entry->IsFolder()) && (status == Git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
\r
1192 if (PathFileExists(entry->GetPath().GetWinPath()))
\r
1194 m_arListArray.push_back(i);
\r
1195 if ((dwCheck & SVNSLC_SHOWREMOVEDANDPRESENT)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1198 entry->checked = true;
\r
1200 AddEntry(entry, langID, listIndex++);
\r
1203 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
\r
1205 m_arListArray.push_back(i);
\r
1206 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1209 entry->checked = true;
\r
1211 AddEntry(entry, langID, listIndex++);
\r
1213 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
\r
1215 m_arListArray.push_back(i);
\r
1216 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1219 entry->checked = true;
\r
1221 AddEntry(entry, langID, listIndex++);
\r
1227 SetItemCount(listIndex);
\r
1229 m_ColumnManager.UpdateRelevance (m_arStatusArray, m_arListArray);
\r
1231 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1232 for (int col = 0; col <= maxcol; col++)
\r
1233 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1236 GetStatisticsString();
\r
1238 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1239 HDITEM HeaderItem = {0};
\r
1240 HeaderItem.mask = HDI_FORMAT;
\r
1241 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1243 pHeader->GetItem(i, &HeaderItem);
\r
1244 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1245 pHeader->SetItem(i, &HeaderItem);
\r
1247 if (m_nSortedColumn)
\r
1249 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1250 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1251 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1254 if (nSelectedEntry)
\r
1256 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1257 EnsureVisible(nSelectedEntry, false);
\r
1261 // Restore the item at the top of the list.
\r
1262 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1264 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1272 pApp->DoWaitCursor(-1);
\r
1274 m_bEmpty = (GetItemCount() == 0);
\r
1280 void CGitStatusListCtrl::Show(DWORD dwShow, const CTGitPathList& checkedList, bool bShowFolders /* = true */)
\r
1285 Locker lock(m_critSec);
\r
1286 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
1288 CWinApp * pApp = AfxGetApp();
\r
1290 pApp->DoWaitCursor(1);
\r
1291 m_dwShow = dwShow;
\r
1292 m_bShowFolders = bShowFolders;
\r
1294 int nTopIndex = GetTopIndex();
\r
1295 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
\r
1296 int nSelectedEntry = 0;
\r
1297 if (posSelectedEntry)
\r
1298 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
\r
1304 m_arListArray.clear();
\r
1306 m_arListArray.reserve(m_arStatusArray.size());
\r
1307 SetItemCount (static_cast<int>(m_arStatusArray.size()));
\r
1309 int listIndex = 0;
\r
1310 for (size_t i=0; i < m_arStatusArray.size(); ++i)
\r
1312 FileEntry * entry = m_arStatusArray[i];
\r
1313 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
\r
1315 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
\r
1317 if (entry->IsFolder() && (!bShowFolders))
\r
1318 continue; // don't show folders if they're not wanted.
\r
1320 git_wc_status_kind status = SVNStatus::GetMoreImportant(entry->status, entry->remotestatus);
\r
1321 DWORD showFlags = GetShowFlagsFromSVNStatus(status);
\r
1322 if (entry->IsLocked())
\r
1323 showFlags |= SVNSLC_SHOWLOCKS;
\r
1324 if (!entry->changelist.IsEmpty())
\r
1325 showFlags |= SVNSLC_SHOWINCHANGELIST;
\r
1327 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
\r
1328 if (status != git_wc_status_ignored || (entry->direct) || (dwShow & SVNSLC_SHOWIGNORED))
\r
1330 for (int npath = 0; npath < checkedList.GetCount(); ++npath)
\r
1332 if (entry->GetPath().IsEquivalentTo(checkedList[npath]))
\r
1334 entry->checked = true;
\r
1338 if ((!entry->IsFolder()) && (status == git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
\r
1340 if (PathFileExists(entry->GetPath().GetWinPath()))
\r
1342 m_arListArray.push_back(i);
\r
1343 AddEntry(entry, langID, listIndex++);
\r
1346 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
\r
1348 m_arListArray.push_back(i);
\r
1349 AddEntry(entry, langID, listIndex++);
\r
1351 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
\r
1353 m_arListArray.push_back(i);
\r
1354 AddEntry(entry, langID, listIndex++);
\r
1356 else if (entry->switched)
\r
1358 m_arListArray.push_back(i);
\r
1359 AddEntry(entry, langID, listIndex++);
\r
1365 SetItemCount(listIndex);
\r
1367 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1368 for (int col = 0; col <= maxcol; col++)
\r
1369 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1372 GetStatisticsString();
\r
1374 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1375 HDITEM HeaderItem = {0};
\r
1376 HeaderItem.mask = HDI_FORMAT;
\r
1377 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1379 pHeader->GetItem(i, &HeaderItem);
\r
1380 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1381 pHeader->SetItem(i, &HeaderItem);
\r
1383 if (m_nSortedColumn)
\r
1385 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1386 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1387 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1390 if (nSelectedEntry)
\r
1392 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1393 EnsureVisible(nSelectedEntry, false);
\r
1397 // Restore the item at the top of the list.
\r
1398 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1400 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1408 pApp->DoWaitCursor(-1);
\r
1410 m_bEmpty = (GetItemCount() == 0);
\r
1415 int CGitStatusListCtrl::GetColumnIndex(int mask)
\r
1425 void CGitStatusListCtrl::AddEntry(CTGitPath * GitPath, WORD langID, int listIndex)
\r
1427 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
1428 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
1430 CString path = GitPath->GetGitPathString();
\r
1434 int index = listIndex;
\r
1436 CString entryname = GitPath->GetGitPathString();
\r
1438 // if (entry->isfolder)
\r
1439 // icon_idx = m_nIconFolder;
\r
1442 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(*GitPath);
\r
1446 rename.Format(_T("(from %s)"),GitPath->GetGitOldPathString());
\r
1447 if(GitPath->m_Action & CTGitPath::LOGACTIONS_REPLACED)
\r
1448 entryname+=rename;
\r
1450 InsertItem(index, entryname, icon_idx);
\r
1452 this->SetItemData(index, (DWORD_PTR)GitPath);
\r
1453 // SVNSLC_COLFILENAME
\r
1454 SetItemText(index, nCol++, GitPath->GetFileOrDirectoryName());
\r
1456 SetItemText(index, nCol++, GitPath->GetFileExtension());
\r
1457 // SVNSLC_COLSTATUS
\r
1458 SetItemText(index, nCol++, GitPath->GetActionName());
\r
1460 SetItemText(index, GetColumnIndex(SVNSLC_COLADD),GitPath->m_StatAdd);
\r
1461 SetItemText(index, GetColumnIndex(SVNSLC_COLDEL),GitPath->m_StatDel);
\r
1464 SetCheck(index, GitPath->m_Checked);
\r
1465 if (GitPath->m_Checked)
\r
1469 if( GitPath->m_Action & CTGitPath::LOGACTIONS_IGNORE)
\r
1470 SetItemGroup(index, 2);
\r
1471 else if( GitPath->m_Action & CTGitPath::LOGACTIONS_UNVER)
\r
1472 SetItemGroup(index,1);
\r
1474 SetItemGroup(index,0);
\r
1480 void CGitStatusListCtrl::AddEntry(FileEntry * entry, WORD langID, int listIndex)
\r
1482 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
1483 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
1485 CString path = entry->GetPath().GetGitPathString();
\r
1486 if ( m_mapFilenameToChecked.size()!=0 && m_mapFilenameToChecked.find(path) != m_mapFilenameToChecked.end() )
\r
1488 // The user manually de-/selected an item. We now restore this status
\r
1489 // when refreshing.
\r
1490 entry->checked = m_mapFilenameToChecked[path];
\r
1495 int index = listIndex;
\r
1497 CString entryname = entry->GetDisplayName();
\r
1499 if (entry->isfolder)
\r
1500 icon_idx = m_nIconFolder;
\r
1503 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(entry->path);
\r
1506 InsertItem(index, entryname, icon_idx);
\r
1507 // SVNSLC_COLFILENAME
\r
1508 SetItemText(index, nCol++, entry->path.GetFileOrDirectoryName());
\r
1510 SetItemText(index, nCol++, entry->path.GetFileExtension());
\r
1511 // SVNSLC_COLSTATUS
\r
1512 if (entry->isNested)
\r
1514 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1515 SetItemText(index, nCol++, sTemp);
\r
1519 GitStatus::GetStatusString(hResourceHandle, entry->status, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1520 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1521 _tcscat_s(buf, 100, _T(" (+)"));
\r
1522 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1523 _tcscat_s(buf, 100, _T(" (s)"));
\r
1525 if ((entry->status == entry->propstatus)&&
\r
1526 (entry->status != git_wc_status_normal)&&
\r
1527 (entry->status != git_wc_status_unversioned)&&
\r
1528 (!GitStatus::IsImportant(entry->textstatus)))
\r
1529 _tcscat_s(buf, 100, ponly);
\r
1531 SetItemText(index, nCol++, buf);
\r
1533 // SVNSLC_COLREMOTESTATUS
\r
1534 if (entry->isNested)
\r
1536 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1537 SetItemText(index, nCol++, sTemp);
\r
1542 SVNStatus::GetStatusString(hResourceHandle, entry->remotestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1543 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1544 _tcscat_s(buf, 100, _T(" (+)"));
\r
1545 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1546 _tcscat_s(buf, 100, _T(" (s)"));
\r
1547 if ((entry->remotestatus == entry->remotepropstatus)&&
\r
1548 (entry->remotestatus != git_wc_status_none)&&
\r
1549 (entry->remotestatus != git_wc_status_normal)&&
\r
1550 (entry->remotestatus != git_wc_status_unversioned)&&
\r
1551 (!SVNStatus::IsImportant(entry->remotetextstatus)))
\r
1552 _tcscat_s(buf, 100, ponly);
\r
1554 SetItemText(index, nCol++, buf);
\r
1556 // SVNSLC_COLTEXTSTATUS
\r
1557 if (entry->isNested)
\r
1559 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1560 SetItemText(index, nCol++, sTemp);
\r
1565 SVNStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1566 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1567 _tcscat_s(buf, 100, _T(" (+)"));
\r
1568 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1569 _tcscat_s(buf, 100, _T(" (s)"));
\r
1571 SetItemText(index, nCol++, buf);
\r
1573 // SVNSLC_COLPROPSTATUS
\r
1574 if (entry->isNested)
\r
1576 SetItemText(index, nCol++, _T(""));
\r
1581 SVNStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1582 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1583 _tcscat_s(buf, 100, _T(" (+)"));
\r
1584 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1585 _tcscat_s(buf, 100, _T(" (s)"));
\r
1587 SetItemText(index, nCol++, buf);
\r
1589 // SVNSLC_COLREMOTETEXT
\r
1590 if (entry->isNested)
\r
1592 SetItemText(index, nCol++, _T(""));
\r
1597 SVNStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1598 SetItemText(index, nCol++, buf);
\r
1601 // SVNSLC_COLREMOTEPROP
\r
1602 if (entry->isNested)
\r
1604 SetItemText(index, nCol++, _T(""));
\r
1608 // SVNStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1609 SetItemText(index, nCol++, buf);
\r
1612 // SetItemText(index, nCol++, entry->url);
\r
1615 if (!m_HeadRev.IsHead())
\r
1617 // we have contacted the repository
\r
1619 // decision-matrix
\r
1620 // wc repository text
\r
1623 // UID1 UID1 owner
\r
1624 // UID1 "" lock has been broken
\r
1625 // UID1 UID2 lock has been stolen
\r
1626 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))
\r
1628 if (entry->lock_owner.IsEmpty())
\r
1629 SetItemText(index, nCol++, entry->lock_remoteowner);
\r
1631 SetItemText(index, nCol++, entry->lock_owner);
\r
1633 else if (entry->lock_remotetoken.IsEmpty())
\r
1636 CString temp(MAKEINTRESOURCE(IDS_STATUSLIST_LOCKBROKEN));
\r
1637 SetItemText(index, nCol++, temp);
\r
1643 temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);
\r
1644 SetItemText(index, nCol++, temp);
\r
1648 SetItemText(index, nCol++, entry->lock_owner);
\r
1649 // SVNSLC_COLLOCKCOMMENT
\r
1650 SetItemText(index, nCol++, entry->lock_comment);
\r
1651 // SVNSLC_COLAUTHOR
\r
1652 SetItemText(index, nCol++, entry->last_commit_author);
\r
1653 // SVNSLC_COLREVISION
\r
1655 temp.Format(_T("%ld"), entry->last_commit_rev);
\r
1656 if (entry->last_commit_rev > 0)
\r
1657 SetItemText(index, nCol++, temp);
\r
1659 SetItemText(index, nCol++, _T(""));
\r
1660 // SVNSLC_COLREMOTEREVISION
\r
1661 temp.Format(_T("%ld"), entry->remoterev);
\r
1662 if (entry->remoterev > 0)
\r
1663 SetItemText(index, nCol++, temp);
\r
1665 SetItemText(index, nCol++, _T(""));
\r
1667 TCHAR datebuf[SVN_DATE_BUFFER];
\r
1668 apr_time_t date = entry->last_commit_date;
\r
1669 SVN::formatDate(datebuf, date, true);
\r
1671 SetItemText(index, nCol++, datebuf);
\r
1673 SetItemText(index, nCol++, _T(""));
\r
1674 // SVNSLC_COLSVNNEEDSLOCK
\r
1675 BOOL bFoundSVNNeedsLock = entry->present_props.IsNeedsLockSet();
\r
1676 CString strSVNNeedsLock = (bFoundSVNNeedsLock) ? _T("*") : _T("");
\r
1677 SetItemText(index, nCol++, strSVNNeedsLock);
\r
1678 // SVNSLC_COLCOPYFROM
\r
1679 if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)
\r
1680 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());
\r
1682 temp = entry->copyfrom_url;
\r
1683 SetItemText(index, nCol++, temp);
\r
1684 // SVNSLC_COLMODIFICATIONDATE
\r
1685 __int64 filetime = entry->GetPath().GetLastWriteTime();
\r
1686 if ( (filetime) && (entry->status!=git_wc_status_deleted) )
\r
1688 FILETIME* f = (FILETIME*)(__int64*)&filetime;
\r
1689 TCHAR datebuf[SVN_DATE_BUFFER];
\r
1690 SVN::formatDate(datebuf,*f,true);
\r
1691 SetItemText(index, nCol++, datebuf);
\r
1695 SetItemText(index, nCol++, _T(""));
\r
1698 // user-defined properties
\r
1699 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
\r
1703 assert (i == nCol++);
\r
1704 assert (m_ColumnManager.IsUserProp (i));
\r
1706 CString name = m_ColumnManager.GetName(i);
\r
1707 if (entry->present_props.HasProperty (name))
\r
1709 const CString& propVal = entry->present_props [name];
\r
1710 if (propVal.IsEmpty())
\r
1711 SetItemText(index, i, m_sNoPropValueText);
\r
1713 SetItemText(index, i, propVal);
\r
1716 SetItemText(index, i, _T(""));
\r
1719 SetCheck(index, entry->checked);
\r
1720 if (entry->checked)
\r
1722 if (m_changelists.find(entry->changelist) != m_changelists.end())
\r
1723 SetItemGroup(index, m_changelists[entry->changelist]);
\r
1725 SetItemGroup(index, 0);
\r
1730 bool CGitStatusListCtrl::SetItemGroup(int item, int groupindex)
\r
1732 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS) == NULL)
\r
1734 if (groupindex < 0)
\r
1737 i.mask = LVIF_GROUPID;
\r
1740 i.iGroupId = groupindex;
\r
1742 return !!SetItem(&i);
\r
1745 void CGitStatusListCtrl::Sort()
\r
1747 Locker lock(m_critSec);
\r
1749 CSorter predicate (&m_ColumnManager, m_nSortedColumn, m_bAscending);
\r
1751 std::sort(m_arStatusArray.begin(), m_arStatusArray.end(), predicate);
\r
1752 SaveColumnWidths();
\r
1753 Show(m_dwShow, 0, m_bShowFolders);
\r
1757 void CGitStatusListCtrl::OnHdnItemclick(NMHDR *pNMHDR, LRESULT *pResult)
\r
1759 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
1764 if (m_nSortedColumn == phdr->iItem)
\r
1765 m_bAscending = !m_bAscending;
\r
1767 m_bAscending = TRUE;
\r
1768 m_nSortedColumn = phdr->iItem;
\r
1769 m_mapFilenameToChecked.clear();
\r
1772 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1773 HDITEM HeaderItem = {0};
\r
1774 HeaderItem.mask = HDI_FORMAT;
\r
1775 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1777 pHeader->GetItem(i, &HeaderItem);
\r
1778 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1779 pHeader->SetItem(i, &HeaderItem);
\r
1781 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1782 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1783 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1785 // the checked state of the list control items must be restored
\r
1787 for (int i=0; i<GetItemCount(); ++i)
\r
1789 CTGitPath * entry = (CTGitPath*)GetItemData(i);
\r
1792 SetCheck(i, entry->m_Checked);
\r
1798 void CGitStatusListCtrl::OnLvnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
\r
1800 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1803 #define ISCHECKED(x) ((x) ? ((((x)&LVIS_STATEIMAGEMASK)>>12)-1) : FALSE)
\r
1804 if ((m_bBlock)&&(m_bBlockUI))
\r
1806 // if we're blocked, prevent changing of the check state
\r
1807 if ((!ISCHECKED(pNMLV->uOldState) && ISCHECKED(pNMLV->uNewState))||
\r
1808 (ISCHECKED(pNMLV->uOldState) && !ISCHECKED(pNMLV->uNewState)))
\r
1813 BOOL CGitStatusListCtrl::OnLvnItemchanged(NMHDR *pNMHDR, LRESULT *pResult)
\r
1815 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1817 if ((pNMLV->uNewState==0)||(pNMLV->uNewState & LVIS_SELECTED)||(pNMLV->uNewState & LVIS_FOCUSED))
\r
1823 bool bSelected = !!(ListView_GetItemState(m_hWnd, pNMLV->iItem, LVIS_SELECTED) & LVIS_SELECTED);
\r
1824 int nListItems = GetItemCount();
\r
1827 // was the item checked?
\r
1829 //CTGitPath *gitpath=(CTGitPath*)GetItemData(pNMLV->iItem);
\r
1830 //gitpath->m_Checked=GetCheck(pNMLV->iItem);
\r
1832 if (GetCheck(pNMLV->iItem))
\r
1834 CheckEntry(pNMLV->iItem, nListItems);
\r
1837 POSITION pos = GetFirstSelectedItemPosition();
\r
1839 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
1841 if (index != pNMLV->iItem)
\r
1842 CheckEntry(index, nListItems);
\r
1848 UncheckEntry(pNMLV->iItem, nListItems);
\r
1851 POSITION pos = GetFirstSelectedItemPosition();
\r
1853 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
1855 if (index != pNMLV->iItem)
\r
1856 UncheckEntry(index, nListItems);
\r
1861 GetStatisticsString();
\r
1868 void CGitStatusListCtrl::OnColumnResized(NMHDR *pNMHDR, LRESULT *pResult)
\r
1870 LPNMHEADER header = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
1871 if ( (header != NULL)
\r
1872 && (header->iItem >= 0)
\r
1873 && (header->iItem < m_ColumnManager.GetColumnCount()))
\r
1875 m_ColumnManager.ColumnResized (header->iItem);
\r
1881 void CGitStatusListCtrl::OnColumnMoved(NMHDR *pNMHDR, LRESULT *pResult)
\r
1883 LPNMHEADER header = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
1885 if ( (header != NULL)
\r
1886 && (header->iItem >= 0)
\r
1887 && (header->iItem < m_ColumnManager.GetColumnCount())
\r
1888 // only allow the reordering if the column was not moved left of the first
\r
1889 // visible item - otherwise the 'invisible' columns are not at the far left
\r
1890 // anymore and we get all kinds of redrawing problems.
\r
1891 && (header->pitem)
\r
1892 && (header->pitem->iOrder > m_ColumnManager.GetInvisibleCount()))
\r
1894 m_ColumnManager.ColumnMoved (header->iItem, header->pitem->iOrder);
\r
1898 Invalidate(FALSE);
\r
1901 void CGitStatusListCtrl::CheckEntry(int index, int nListItems)
\r
1903 Locker lock(m_critSec);
\r
1904 //FileEntry * entry = GetListEntry(index);
\r
1905 CTGitPath *path=(CTGitPath*)GetItemData(index);
\r
1906 ASSERT(path != NULL);
\r
1909 SetCheck(index, TRUE);
\r
1910 //entry = GetListEntry(index);
\r
1911 // if an unversioned item was checked, then we need to check if
\r
1912 // the parent folders are unversioned too. If the parent folders actually
\r
1913 // are unversioned, then check those too.
\r
1915 if (entry->status == git_wc_status_unversioned)
\r
1917 // we need to check the parent folder too
\r
1918 const CTGitPath& folderpath = entry->path;
\r
1919 for (int i=0; i< nListItems; ++i)
\r
1921 FileEntry * testEntry = GetListEntry(i);
\r
1922 ASSERT(testEntry != NULL);
\r
1923 if (testEntry == NULL)
\r
1925 if (!testEntry->checked)
\r
1927 if (testEntry->path.IsAncestorOf(folderpath) && (!testEntry->path.IsEquivalentTo(folderpath)))
\r
1929 SetEntryCheck(testEntry,i,true);
\r
1935 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
1936 if ( (entry->status == git_wc_status_deleted) || (m_bCheckChildrenWithParent) || (bShift) )
\r
1938 // if a deleted folder gets checked, we have to check all
\r
1939 // children of that folder too.
\r
1940 if (entry->path.IsDirectory())
\r
1942 SetCheckOnAllDescendentsOf(entry, true);
\r
1945 // if a deleted file or folder gets checked, we have to
\r
1946 // check all parents of this item too.
\r
1947 for (int i=0; i<nListItems; ++i)
\r
1949 FileEntry * testEntry = GetListEntry(i);
\r
1950 ASSERT(testEntry != NULL);
\r
1951 if (testEntry == NULL)
\r
1953 if (!testEntry->checked)
\r
1955 if (testEntry->path.IsAncestorOf(entry->path) && (!testEntry->path.IsEquivalentTo(entry->path)))
\r
1957 if ((testEntry->status == git_wc_status_deleted)||(m_bCheckChildrenWithParent))
\r
1959 SetEntryCheck(testEntry,i,true);
\r
1961 // now we need to check all children of this parent folder
\r
1962 SetCheckOnAllDescendentsOf(testEntry, true);
\r
1969 if ( !path->m_Checked )
\r
1971 path->m_Checked = TRUE;
\r
1976 void CGitStatusListCtrl::UncheckEntry(int index, int nListItems)
\r
1978 Locker lock(m_critSec);
\r
1979 CTGitPath *path=(CTGitPath*)GetItemData(index);
\r
1980 ASSERT(path != NULL);
\r
1983 SetCheck(index, FALSE);
\r
1984 //entry = GetListEntry(index);
\r
1985 // item was unchecked
\r
1987 if (entry->path.IsDirectory())
\r
1989 // disable all files within an unselected folder, except when unchecking a folder with property changes
\r
1990 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
1991 if ( (entry->status != git_wc_status_modified) || (bShift) )
\r
1993 SetCheckOnAllDescendentsOf(entry, false);
\r
1996 else if (entry->status == git_wc_status_deleted)
\r
1998 // a "deleted" file was unchecked, so uncheck all parent folders
\r
1999 // and all children of those parents
\r
2000 for (int i=0; i<nListItems; i++)
\r
2002 FileEntry * testEntry = GetListEntry(i);
\r
2003 ASSERT(testEntry != NULL);
\r
2004 if (testEntry == NULL)
\r
2006 if (testEntry->checked)
\r
2008 if (testEntry->path.IsAncestorOf(entry->path))
\r
2010 if (testEntry->status == git_wc_status_deleted)
\r
2012 SetEntryCheck(testEntry,i,false);
\r
2015 SetCheckOnAllDescendentsOf(testEntry, false);
\r
2022 if ( path->m_Checked )
\r
2024 path->m_Checked = FALSE;
\r
2029 bool CGitStatusListCtrl::EntryPathCompareNoCase(const FileEntry* pEntry1, const FileEntry* pEntry2)
\r
2031 return pEntry1->path < pEntry2->path;
\r
2034 bool CGitStatusListCtrl::IsEntryVersioned(const FileEntry* pEntry1)
\r
2036 return pEntry1->status != git_wc_status_unversioned;
\r
2039 bool CGitStatusListCtrl::BuildStatistics()
\r
2042 bool bRefetchStatus = false;
\r
2044 // now gather some statistics
\r
2045 m_nUnversioned = 0;
\r
2050 m_nConflicted = 0;
\r
2054 for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2056 int status=((CTGitPath*)m_arStatusArray[i])->m_Action;
\r
2058 if(status&CTGitPath::LOGACTIONS_ADDED)
\r
2061 if(status&CTGitPath::LOGACTIONS_DELETED)
\r
2064 if(status&(CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_MODIFIED))
\r
2067 if(status&CTGitPath::LOGACTIONS_CONFLICT)
\r
2070 if(status&(CTGitPath::LOGACTIONS_IGNORE|CTGitPath::LOGACTIONS_UNVER))
\r
2075 // } // switch (entry->status)
\r
2076 // } // if (entry)
\r
2077 } // for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2078 return !bRefetchStatus;
\r
2083 void CGitStatusListCtrl::GetMinMaxRevisions(git_revnum_t& rMin, git_revnum_t& rMax, bool bShownOnly, bool bCheckedOnly)
\r
2086 Locker lock(m_critSec);
\r
2090 if ((bShownOnly)||(bCheckedOnly))
\r
2092 for (int i=0; i<GetItemCount(); ++i)
\r
2094 const FileEntry * entry = GetListEntry(i);
\r
2096 if ((entry)&&(entry->last_commit_rev))
\r
2098 if ((!bCheckedOnly)||(entry->IsChecked()))
\r
2100 if (entry->last_commit_rev >= 0)
\r
2102 rMin = min(rMin, entry->last_commit_rev);
\r
2103 rMax = max(rMax, entry->last_commit_rev);
\r
2111 for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2113 const FileEntry * entry = m_arStatusArray[i];
\r
2114 if ((entry)&&(entry->last_commit_rev))
\r
2116 if (entry->last_commit_rev >= 0)
\r
2118 rMin = min(rMin, entry->last_commit_rev);
\r
2119 rMax = max(rMax, entry->last_commit_rev);
\r
2124 if (rMin == LONG_MAX)
\r
2129 int CGitStatusListCtrl::GetGroupFromPoint(POINT * ppt)
\r
2131 // the point must be relative to the upper left corner of the control
\r
2135 if (!IsGroupViewEnabled())
\r
2143 GetWindowRect(&rc);
\r
2144 while (((flags & LVHT_BELOW) == 0)&&(pt.y < rc.bottom))
\r
2146 nItem = HitTest(pt, &flags);
\r
2147 if ((flags & LVHT_ONITEM)||(flags & LVHT_EX_GROUP_HEADER))
\r
2149 // the first item below the point
\r
2151 // check if the point is too much right (i.e. if the point
\r
2152 // is farther to the right than the width of the item)
\r
2154 GetItemRect(nItem, &r, LVIR_LABEL);
\r
2155 if (ppt->x > r.right)
\r
2159 lv.mask = LVIF_GROUPID;
\r
2162 int groupID = lv.iGroupId;
\r
2163 // now we search upwards and check if the item above this one
\r
2164 // belongs to another group. If it belongs to the same group,
\r
2165 // we're not over a group header
\r
2169 nItem = HitTest(pt, &flags);
\r
2170 if ((flags & LVHT_ONITEM)&&(nItem >= 0))
\r
2172 // the first item below the point
\r
2174 lv.mask = LVIF_GROUPID;
\r
2177 if (lv.iGroupId != groupID)
\r
2192 void CGitStatusListCtrl::OnContextMenuGroup(CWnd * /*pWnd*/, CPoint point)
\r
2194 POINT clientpoint = point;
\r
2195 ScreenToClient(&clientpoint);
\r
2196 if ((IsGroupViewEnabled())&&(GetGroupFromPoint(&clientpoint) >= 0))
\r
2199 if (popup.CreatePopupMenu())
\r
2202 temp.LoadString(IDS_STATUSLIST_CHECKGROUP);
\r
2203 popup.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CHECKGROUP, temp);
\r
2204 temp.LoadString(IDS_STATUSLIST_UNCHECKGROUP);
\r
2205 popup.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_UNCHECKGROUP, temp);
\r
2206 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2207 bool bCheck = false;
\r
2210 case IDSVNLC_CHECKGROUP:
\r
2212 // fall through here
\r
2213 case IDSVNLC_UNCHECKGROUP:
\r
2215 int group = GetGroupFromPoint(&clientpoint);
\r
2216 // go through all items and check/uncheck those assigned to the group
\r
2217 // but block the OnLvnItemChanged handler
\r
2220 for (int i=0; i<GetItemCount(); ++i)
\r
2222 SecureZeroMemory(&lv, sizeof(LVITEM));
\r
2223 lv.mask = LVIF_GROUPID;
\r
2227 if (lv.iGroupId == group)
\r
2229 FileEntry * entry = GetListEntry(i);
\r
2232 bool bOldCheck = !!GetCheck(i);
\r
2233 //SetEntryCheck(entry, i, bCheck);
\r
2234 if (bCheck != bOldCheck)
\r
2245 GetStatisticsString();
\r
2255 void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
\r
2258 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
2260 bool XPorLater = false;
\r
2261 OSVERSIONINFOEX inf;
\r
2262 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
2263 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
2264 GetVersionEx((OSVERSIONINFO *)&inf);
\r
2265 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
2266 if (fullver >= 0x0501)
\r
2268 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
2269 CTGitPath * filepath;
\r
2271 int selIndex = GetSelectionMark();
\r
2272 if ((point.x == -1) && (point.y == -1))
\r
2275 GetItemRect(selIndex, &rect, LVIR_LABEL);
\r
2276 ClientToScreen(&rect);
\r
2277 point = rect.CenterPoint();
\r
2279 if ((GetSelectedCount() == 0)&&(XPorLater)&&(m_bHasCheckboxes))
\r
2281 // nothing selected could mean the context menu is requested for
\r
2283 OnContextMenuGroup(pWnd, point);
\r
2285 else if (selIndex >= 0)
\r
2287 //FileEntry * entry = GetListEntry(selIndex);
\r
2289 filepath = (CTGitPath * )GetItemData(selIndex);
\r
2291 ASSERT(filepath != NULL);
\r
2292 if (filepath == NULL)
\r
2295 //const CTGitPath& filepath = entry->path;
\r
2296 int wcStatus = filepath->m_Action;
\r
2297 // entry is selected, now show the popup menu
\r
2298 Locker lock(m_critSec);
\r
2300 CMenu changelistSubMenu;
\r
2301 CMenu ignoreSubMenu;
\r
2302 if (popup.CreatePopupMenu())
\r
2304 //Add Menu for verion controled file
\r
2305 if (!(wcStatus &CTGitPath::LOGACTIONS_UNVER))
\r
2307 if (m_dwContextMenus & SVNSLC_POPCOMPAREWITHBASE)
\r
2309 popup.AppendMenuIcon(IDSVNLC_COMPARE, IDS_LOG_COMPAREWITHBASE, IDI_DIFF);
\r
2310 popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2312 //Select one items
\r
2313 if (GetSelectedCount() == 1)
\r
2315 bool bEntryAdded = false;
\r
2316 //if (entry->remotestatus <= git_wc_status_normal)
\r
2318 // if (wcStatus > git_wc_status_normal)
\r
2320 // if ((m_dwContextMenus & SVNSLC_POPGNUDIFF)&&(wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing))
\r
2322 if(!g_Git.IsInitRepos())
\r
2323 popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
\r
2325 bEntryAdded = true;
\r
2330 //else if (wcStatus != git_wc_status_deleted)
\r
2332 // if (m_dwContextMenus & SVNSLC_POPCOMPARE)
\r
2334 // popup.AppendMenuIcon(IDSVNLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
\r
2335 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2336 // bEntryAdded = true;
\r
2338 // if (m_dwContextMenus & SVNSLC_POPGNUDIFF)
\r
2340 // popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
\r
2341 // bEntryAdded = true;
\r
2345 popup.AppendMenu(MF_SEPARATOR);
\r
2347 //else if (GetSelectedCount() > 1)
\r
2349 // if (m_dwContextMenus & SVNSLC_POPCOMMIT)
\r
2351 // popup.AppendMenuIcon(IDSVNLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);
\r
2352 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2357 ///Select Multi item
\r
2358 //if (GetSelectedCount() > 0)
\r
2360 // if ((GetSelectedCount() == 2)&&(m_dwContextMenus & SVNSLC_POPREPAIRMOVE))
\r
2362 // POSITION pos = GetFirstSelectedItemPosition();
\r
2363 // int index = GetNextSelectedItem(pos);
\r
2364 // if (index >= 0)
\r
2366 // FileEntry * entry = GetListEntry(index);
\r
2367 // git_wc_status_kind status1 = git_wc_status_none;
\r
2368 // git_wc_status_kind status2 = git_wc_status_none;
\r
2370 // status1 = entry->status;
\r
2371 // index = GetNextSelectedItem(pos);
\r
2372 // if (index >= 0)
\r
2374 // entry = GetListEntry(index);
\r
2376 // status2 = entry->status;
\r
2377 // if ((status1 == git_wc_status_missing && status2 == git_wc_status_unversioned) ||
\r
2378 // (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned))
\r
2380 // popup.AppendMenuIcon(IDSVNLC_REPAIRMOVE, IDS_STATUSLIST_CONTEXT_REPAIRMOVE);
\r
2385 // if (wcStatus > git_wc_status_normal)
\r
2387 // if (m_dwContextMenus & SVNSLC_POPREVERT)
\r
2389 // // reverting missing folders is not possible
\r
2390 // if (!entry->IsFolder() || (wcStatus != git_wc_status_missing))
\r
2392 // popup.AppendMenuIcon(IDSVNLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
\r
2396 // if (entry->remotestatus > git_wc_status_normal)
\r
2398 // if (m_dwContextMenus & SVNSLC_POPUPDATE)
\r
2400 // popup.AppendMenuIcon(IDSVNLC_UPDATE, IDS_MENUUPDATE, IDI_UPDATE);
\r
2404 if ((GetSelectedCount() == 1)&&(!wcStatus & CTGitPath::LOGACTIONS_UNVER)
\r
2405 &&(!wcStatus & CTGitPath::LOGACTIONS_IGNORE))
\r
2407 if (m_dwContextMenus & SVNSLC_POPSHOWLOG)
\r
2409 popup.AppendMenuIcon(IDSVNLC_LOG, IDS_REPOBROWSE_SHOWLOG, IDI_LOG);
\r
2411 // if (m_dwContextMenus & SVNSLC_POPBLAME)
\r
2413 // popup.AppendMenuIcon(IDSVNLC_BLAME, IDS_MENUBLAME, IDI_BLAME);
\r
2416 // if ((wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing) && (GetSelectedCount() == 1))
\r
2418 if (m_dwContextMenus & SVNSLC_POPOPEN)
\r
2420 popup.AppendMenuIcon(IDSVNLC_OPEN, IDS_REPOBROWSE_OPEN, IDI_OPEN);
\r
2421 popup.AppendMenuIcon(IDSVNLC_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
\r
2423 if (m_dwContextMenus & SVNSLC_POPEXPLORE)
\r
2425 popup.AppendMenuIcon(IDSVNLC_EXPLORE, IDS_STATUSLIST_CONTEXT_EXPLORE, IDI_EXPLORER);
\r
2428 if (GetSelectedCount() > 0)
\r
2430 // if (((wcStatus == git_wc_status_unversioned)||(wcStatus == git_wc_status_ignored))&&(m_dwContextMenus & SVNSLC_POPDELETE))
\r
2432 // popup.AppendMenuIcon(IDSVNLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
\r
2434 // 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
2437 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVEKEEP, IDI_DELETE);
\r
2439 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVE, IDI_DELETE);
\r
2441 if ((wcStatus & CTGitPath::LOGACTIONS_UNVER)/*||(wcStatus == git_wc_status_deleted)*/)
\r
2443 if (m_dwContextMenus & SVNSLC_POPADD)
\r
2445 //if ( entry->IsFolder() )
\r
2447 // popup.AppendMenuIcon(IDSVNLC_ADD_RECURSIVE, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE, IDI_ADD);
\r
2451 popup.AppendMenuIcon(IDSVNLC_ADD, IDS_STATUSLIST_CONTEXT_ADD, IDI_ADD);
\r
2455 //if ( (wcStatus == git_wc_status_unversioned) || (wcStatus == git_wc_status_deleted) )
\r
2457 if (m_dwContextMenus & SVNSLC_POPIGNORE)
\r
2460 CTGitPathList ignorelist;
\r
2461 FillListOfSelectedItemPaths(ignorelist);
\r
2462 //check if all selected entries have the same extension
\r
2463 bool bSameExt = true;
\r
2465 for (int i=0; i<ignorelist.GetCount(); ++i)
\r
2467 if (sExt.IsEmpty() && (i==0))
\r
2468 sExt = ignorelist[i].GetFileExtension();
\r
2469 else if (sExt.CompareNoCase(ignorelist[i].GetFileExtension())!=0)
\r
2474 if (ignoreSubMenu.CreateMenu())
\r
2476 CString ignorepath;
\r
2477 if (ignorelist.GetCount()==1)
\r
2478 ignorepath = ignorelist[0].GetFileOrDirectoryName();
\r
2480 ignorepath.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
\r
2481 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_IGNORE, ignorepath);
\r
2482 ignorepath = _T("*")+sExt;
\r
2483 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_IGNOREMASK, ignorepath);
\r
2485 temp.LoadString(IDS_MENUIGNORE);
\r
2486 popup.InsertMenu((UINT)-1, MF_BYPOSITION | MF_POPUP, (UINT_PTR)ignoreSubMenu.m_hMenu, temp);
\r
2492 if (ignorelist.GetCount()==1)
\r
2494 temp.LoadString(IDS_MENUIGNORE);
\r
2498 temp.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
\r
2500 popup.AppendMenuIcon(IDSVNLC_IGNORE, temp, IDI_IGNORE);
\r
2506 if (((wcStatus == git_wc_status_conflicted)||(entry->isConflicted)))
\r
2508 if ((m_dwContextMenus & SVNSLC_POPCONFLICT)||(m_dwContextMenus & SVNSLC_POPRESOLVE))
\r
2509 popup.AppendMenu(MF_SEPARATOR);
\r
2511 if ((m_dwContextMenus & SVNSLC_POPCONFLICT)&&(entry->textstatus == git_wc_status_conflicted))
\r
2513 popup.AppendMenuIcon(IDSVNLC_EDITCONFLICT, IDS_MENUCONFLICT, IDI_CONFLICT);
\r
2515 if (m_dwContextMenus & SVNSLC_POPRESOLVE)
\r
2517 popup.AppendMenuIcon(IDSVNLC_RESOLVECONFLICT, IDS_STATUSLIST_CONTEXT_RESOLVED, IDI_RESOLVE);
\r
2519 if ((m_dwContextMenus & SVNSLC_POPRESOLVE)&&(entry->textstatus == git_wc_status_conflicted))
\r
2521 popup.AppendMenuIcon(IDSVNLC_RESOLVETHEIRS, IDS_SVNPROGRESS_MENUUSETHEIRS, IDI_RESOLVE);
\r
2522 popup.AppendMenuIcon(IDSVNLC_RESOLVEMINE, IDS_SVNPROGRESS_MENUUSEMINE, IDI_RESOLVE);
\r
2527 if (GetSelectedCount() > 0)
\r
2530 if ((!entry->IsFolder())&&(wcStatus >= git_wc_status_normal)
\r
2531 &&(wcStatus!=git_wc_status_missing)&&(wcStatus!=git_wc_status_deleted)
\r
2532 &&(wcStatus!=git_wc_status_added))
\r
2534 popup.AppendMenu(MF_SEPARATOR);
\r
2535 if ((entry->lock_token.IsEmpty())&&(!entry->IsFolder()))
\r
2537 if (m_dwContextMenus & SVNSLC_POPLOCK)
\r
2539 popup.AppendMenuIcon(IDSVNLC_LOCK, IDS_MENU_LOCK, IDI_LOCK);
\r
2542 if ((!entry->lock_token.IsEmpty())&&(!entry->IsFolder()))
\r
2544 if (m_dwContextMenus & SVNSLC_POPUNLOCK)
\r
2546 popup.AppendMenuIcon(IDSVNLC_UNLOCK, IDS_MENU_UNLOCK, IDI_UNLOCK);
\r
2551 if ((!entry->IsFolder())&&((!entry->lock_token.IsEmpty())||(!entry->lock_remotetoken.IsEmpty())))
\r
2553 if (m_dwContextMenus & SVNSLC_POPUNLOCKFORCE)
\r
2555 popup.AppendMenuIcon(IDSVNLC_UNLOCKFORCE, IDS_MENU_UNLOCKFORCE, IDI_UNLOCK);
\r
2559 if (wcStatus != git_wc_status_missing && wcStatus != git_wc_status_deleted &&wcStatus!=git_wc_status_unversioned)
\r
2561 popup.AppendMenu(MF_SEPARATOR);
\r
2562 popup.AppendMenuIcon(IDSVNLC_PROPERTIES, IDS_STATUSLIST_CONTEXT_PROPERTIES, IDI_PROPERTIES);
\r
2564 popup.AppendMenu(MF_SEPARATOR);
\r
2565 popup.AppendMenuIcon(IDSVNLC_COPY, IDS_STATUSLIST_CONTEXT_COPY, IDI_COPYCLIP);
\r
2566 popup.AppendMenuIcon(IDSVNLC_COPYEXT, IDS_STATUSLIST_CONTEXT_COPYEXT, IDI_COPYCLIP);
\r
2567 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS)&&(XPorLater)
\r
2568 &&(wcStatus != git_wc_status_unversioned)&&(wcStatus != git_wc_status_none))
\r
2570 popup.AppendMenu(MF_SEPARATOR);
\r
2571 // changelist commands
\r
2572 size_t numChangelists = GetNumberOfChangelistsInSelection();
\r
2573 if (numChangelists > 0)
\r
2575 popup.AppendMenuIcon(IDSVNLC_REMOVEFROMCS, IDS_STATUSLIST_CONTEXT_REMOVEFROMCS);
\r
2577 if ((!entry->IsFolder())&&(changelistSubMenu.CreateMenu()))
\r
2580 temp.LoadString(IDS_STATUSLIST_CONTEXT_CREATECS);
\r
2581 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATECS, temp);
\r
2583 if (entry->changelist.Compare(SVNSLC_IGNORECHANGELIST))
\r
2585 changelistSubMenu.AppendMenu(MF_SEPARATOR);
\r
2586 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATEIGNORECS, SVNSLC_IGNORECHANGELIST);
\r
2589 if (m_changelists.size() > 0)
\r
2591 // find the changelist names
\r
2592 bool bNeedSeparator = true;
\r
2593 int cmdID = IDSVNLC_MOVETOCS;
\r
2594 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
2596 if ((entry->changelist.Compare(it->first))&&(it->first.Compare(SVNSLC_IGNORECHANGELIST)))
\r
2598 if (bNeedSeparator)
\r
2600 changelistSubMenu.AppendMenu(MF_SEPARATOR);
\r
2601 bNeedSeparator = false;
\r
2603 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, cmdID, it->first);
\r
2608 temp.LoadString(IDS_STATUSLIST_CONTEXT_MOVETOCS);
\r
2609 popup.AppendMenu(MF_POPUP|MF_STRING, (UINT_PTR)changelistSubMenu.GetSafeHmenu(), temp);
\r
2614 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2617 AfxGetApp()->DoWaitCursor(1);
\r
2618 int iItemCountBeforeMenuCmd = GetItemCount();
\r
2619 bool bForce = false;
\r
2622 case IDSVNLC_OPEN:
\r
2625 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
\r
2627 file= filepath->GetWinPath();
\r
2631 GetTempPath(temppath);
\r
2632 file.Format(_T("%s%s_%s%s"),
\r
2634 filepath->GetBaseFilename(),
\r
2635 m_CurrentVersion.Left(6),
\r
2636 filepath->GetFileExtension());
\r
2639 int ret = (int)ShellExecute(this->m_hWnd, NULL,file, NULL, NULL, SW_SHOW);
\r
2640 if (ret <= HINSTANCE_ERROR)
\r
2642 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
2644 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
2648 case IDSVNLC_OPENWITH:
\r
2651 if(m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
\r
2653 file= filepath->GetWinPath();
\r
2657 GetTempPath(temppath);
\r
2658 file.Format(_T("%s%s_%s%s"),
\r
2660 filepath->GetBaseFilename(),
\r
2661 m_CurrentVersion.Left(6),
\r
2662 filepath->GetFileExtension());
\r
2666 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
2667 cmd += file + _T(" ");
\r
2668 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
2671 case IDSVNLC_EXPLORE:
\r
2673 ShellExecute(this->m_hWnd, _T("explore"), filepath->GetWinPath(), NULL, NULL, SW_SHOW);
\r
2676 case IDSVNLC_COMPARE:
\r
2678 POSITION pos = GetFirstSelectedItemPosition();
\r
2681 int index = GetNextSelectedItem(pos);
\r
2686 case IDSVNLC_GNUDIFF1:
\r
2688 // SVNDiff diff(NULL, this->m_hWnd, true);
\r
2690 // if (entry->remotestatus <= git_wc_status_normal)
\r
2691 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
\r
2693 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
\r
2694 if(m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
\r
2695 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,GitRev::GetWorkingCopy(),
\r
2696 *filepath,GitRev::GetHead());
\r
2698 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,m_CurrentVersion,
\r
2699 *filepath,m_CurrentVersion+_T("~1"));
\r
2703 { // The add went ok, but we now need to run through the selected items again
\r
2704 // and update their status
\r
2705 POSITION pos = GetFirstSelectedItemPosition();
\r
2707 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
2709 CTGitPath * path=(CTGitPath*)GetItemData(index);
\r
2714 cmd.Format(_T("git.exe add %s"),path->GetGitPathString());
\r
2716 if(!g_Git.Run(cmd,&output))
\r
2718 path->m_Action = CTGitPath::LOGACTIONS_ADDED;
\r
2719 SetEntryCheck(path,index,true);
\r
2720 SetItemGroup(index,0);
\r
2721 this->m_StatusFileList.AddPath(*path);
\r
2722 this->m_UnRevFileList.RemoveItem(*path);
\r
2723 this->m_IgnoreFileList.RemoveItem(*path);
\r
2724 Show(this->m_dwShow,0,true,true);
\r
2731 case IDSVNLC_COPY:
\r
2732 CopySelectedEntriesToClipboard(0);
\r
2734 case IDSVNLC_COPYEXT:
\r
2735 CopySelectedEntriesToClipboard((DWORD)-1);
\r
2737 case IDSVNLC_PROPERTIES:
\r
2739 CTSVNPathList targetList;
\r
2740 FillListOfSelectedItemPaths(targetList);
\r
2741 CEditPropertiesDlg dlg;
\r
2742 dlg.SetPathList(targetList);
\r
2744 if (dlg.HasChanged())
\r
2746 // since the user might have changed/removed/added
\r
2747 // properties recursively, we don't really know
\r
2748 // which items have changed their status.
\r
2749 // So tell the parent to do a refresh.
\r
2750 CWnd* pParent = GetParent();
\r
2751 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
2753 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
2758 case IDSVNLC_COMMIT:
\r
2760 CTSVNPathList targetList;
\r
2761 FillListOfSelectedItemPaths(targetList);
\r
2762 CTSVNPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
\r
2763 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
\r
2764 CString commandline = CPathUtils::GetAppDirectory();
\r
2765 commandline += _T("TortoiseProc.exe /command:commit /pathfile:\"");
\r
2766 commandline += tempFile.GetWinPathString();
\r
2767 commandline += _T("\"");
\r
2768 commandline += _T(" /deletepathfile");
\r
2769 CAppUtils::LaunchApplication(commandline, NULL, false);
\r
2772 case IDSVNLC_REVERT:
\r
2774 // If at least one item is not in the status "added"
\r
2775 // we ask for a confirmation
\r
2776 BOOL bConfirm = FALSE;
\r
2777 POSITION pos = GetFirstSelectedItemPosition();
\r
2779 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
2781 FileEntry * fentry = GetListEntry(index);
\r
2782 if (fentry->textstatus != git_wc_status_added)
\r
2790 str.Format(IDS_PROC_WARNREVERT,GetSelectedCount());
\r
2792 if (!bConfirm || CMessageBox::Show(this->m_hWnd, str, _T("TortoiseSVN"), MB_YESNO | MB_ICONQUESTION)==IDYES)
\r
2794 CTSVNPathList targetList;
\r
2795 FillListOfSelectedItemPaths(targetList);
\r
2797 // make sure that the list is reverse sorted, so that
\r
2798 // children are removed before any parents
\r
2799 targetList.SortByPathname(true);
\r
2803 // put all reverted files in the trashbin, except the ones with 'added'
\r
2804 // status because they are not restored by the revert.
\r
2805 CTSVNPathList delList;
\r
2806 POSITION pos = GetFirstSelectedItemPosition();
\r
2808 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
2810 FileEntry * entry = GetListEntry(index);
\r
2811 if (entry->status != git_wc_status_added)
\r
2812 delList.AddPath(entry->GetPath());
\r
2814 if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))
\r
2815 delList.DeleteAllFiles(true);
\r
2817 if (!git.Revert(targetList, CStringArray(), FALSE))
\r
2819 CMessageBox::Show(this->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
2823 // since the entries got reverted we need to remove
\r
2824 // them from the list too, if no remote changes are shown,
\r
2825 // if the unmodified files are not shown
\r
2826 // and if the item is not part of a changelist
\r
2829 while ((pos = GetFirstSelectedItemPosition())!=0)
\r
2832 index = GetNextSelectedItem(pos);
\r
2833 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
\r
2834 if ( fentry->IsFolder() )
\r
2837 CWnd* pParent = GetParent();
\r
2838 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
2840 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
2845 BOOL bAdded = (fentry->textstatus == git_wc_status_added);
\r
2846 fentry->status = git_wc_status_normal;
\r
2847 fentry->propstatus = git_wc_status_normal;
\r
2848 fentry->textstatus = git_wc_status_normal;
\r
2849 fentry->copied = false;
\r
2850 fentry->isConflicted = false;
\r
2851 if ((fentry->GetChangeList().IsEmpty()&&(fentry->remotestatus <= git_wc_status_normal))||(m_dwShow & SVNSLC_SHOWNORMAL))
\r
2855 // reverting added items makes them unversioned, not 'normal'
\r
2856 if (fentry->IsFolder())
\r
2857 fentry->propstatus = git_wc_status_none;
\r
2859 fentry->propstatus = git_wc_status_unversioned;
\r
2860 fentry->status = git_wc_status_unversioned;
\r
2861 fentry->textstatus = git_wc_status_unversioned;
\r
2862 SetItemState(index, 0, LVIS_SELECTED);
\r
2863 SetEntryCheck(fentry, index, false);
\r
2865 else if ((fentry->switched)||(m_dwShow & SVNSLC_SHOWNORMAL))
\r
2867 SetItemState(index, 0, LVIS_SELECTED);
\r
2872 if (GetCheck(index))
\r
2874 RemoveListEntry(index);
\r
2880 SetItemState(index, 0, LVIS_SELECTED);
\r
2884 SaveColumnWidths();
\r
2885 Show(m_dwShow, 0, m_bShowFolders);
\r
2891 case IDSVNLC_COMPARE:
\r
2893 POSITION pos = GetFirstSelectedItemPosition();
\r
2896 int index = GetNextSelectedItem(pos);
\r
2901 case IDSVNLC_COMPAREWC:
\r
2903 POSITION pos = GetFirstSelectedItemPosition();
\r
2906 int index = GetNextSelectedItem(pos);
\r
2907 FileEntry * entry = GetListEntry(index);
\r
2908 ASSERT(entry != NULL);
\r
2909 if (entry == NULL)
\r
2911 SVNDiff diff(NULL, m_hWnd, true);
\r
2912 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
2913 git_revnum_t baseRev = entry->Revision;
\r
2914 diff.DiffFileAgainstBase(
\r
2915 entry->path, baseRev, entry->textstatus, entry->propstatus);
\r
2919 case IDSVNLC_GNUDIFF1:
\r
2921 SVNDiff diff(NULL, this->m_hWnd, true);
\r
2923 if (entry->remotestatus <= git_wc_status_normal)
\r
2924 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
\r
2926 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
\r
2929 case IDSVNLC_UPDATE:
\r
2931 CTSVNPathList targetList;
\r
2932 FillListOfSelectedItemPaths(targetList);
\r
2933 bool bAllExist = true;
\r
2934 for (int i=0; i<targetList.GetCount(); ++i)
\r
2936 if (!targetList[i].Exists())
\r
2938 bAllExist = false;
\r
2944 CSVNProgressDlg dlg;
\r
2945 dlg.SetCommand(CSVNProgressDlg::SVNProgress_Update);
\r
2946 dlg.SetPathList(targetList);
\r
2947 dlg.SetRevision(SVNRev::REV_HEAD);
\r
2952 CString sTempFile = CTempFiles::Instance().GetTempFilePath(false).GetWinPathString();
\r
2953 targetList.WriteToFile(sTempFile, false);
\r
2955 sCmd.Format(_T("\"%s\" /command:update /rev /pathfile:\"%s\" /deletepathfile"),
\r
2956 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), (LPCTSTR)sTempFile);
\r
2958 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
2965 sCmd.Format(_T("\"%s\" /command:log /path:\"%s\""),
\r
2966 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), filepath.GetWinPath());
\r
2968 if (!filepath.IsUrl())
\r
2970 sCmd += _T(" /propspath:\"");
\r
2971 sCmd += filepath.GetWinPathString();
\r
2975 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
2978 case IDSVNLC_BLAME:
\r
2981 sCmd.Format(_T("\"%s\" /command:blame /path:\"%s\""),
\r
2982 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), filepath.GetWinPath());
\r
2984 if (!filepath.IsUrl())
\r
2986 sCmd += _T(" /propspath:\"");
\r
2987 sCmd += filepath.GetWinPathString();
\r
2991 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
2994 case IDSVNLC_OPEN:
\r
2996 int ret = (int)ShellExecute(this->m_hWnd, NULL, filepath.GetWinPath(), NULL, NULL, SW_SHOW);
\r
2997 if (ret <= HINSTANCE_ERROR)
\r
2999 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
3000 cmd += filepath.GetWinPathString();
\r
3001 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
3005 case IDSVNLC_OPENWITH:
\r
3007 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
3008 cmd += filepath.GetWinPathString() + _T(" ");
\r
3009 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
3012 case IDSVNLC_EXPLORE:
\r
3014 ShellExecute(this->m_hWnd, _T("explore"), filepath.GetDirectory().GetWinPath(), NULL, NULL, SW_SHOW);
\r
3017 case IDSVNLC_REMOVE:
\r
3020 CTSVNPathList itemsToRemove;
\r
3021 FillListOfSelectedItemPaths(itemsToRemove);
\r
3023 // We must sort items before removing, so that files are always removed
\r
3024 // *before* their parents
\r
3025 itemsToRemove.SortByPathname(true);
\r
3027 bool bSuccess = false;
\r
3028 if (git.Remove(itemsToRemove, FALSE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))
\r
3034 if ((git.Err->apr_err == SVN_ERR_UNVERSIONED_RESOURCE) ||
\r
3035 (git.Err->apr_err == SVN_ERR_CLIENT_MODIFIED))
\r
3037 CString msg, yes, no, yestoall;
\r
3038 msg.Format(IDS_PROC_REMOVEFORCE, (LPCTSTR)git.GetLastErrorMessage());
\r
3039 yes.LoadString(IDS_MSGBOX_YES);
\r
3040 no.LoadString(IDS_MSGBOX_NO);
\r
3041 yestoall.LoadString(IDS_PROC_YESTOALL);
\r
3042 UINT ret = CMessageBox::Show(m_hWnd, msg, _T("TortoiseSVN"), 2, IDI_ERROR, yes, no, yestoall);
\r
3043 if ((ret == 1)||(ret==3))
\r
3045 if (!git.Remove(itemsToRemove, TRUE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))
\r
3047 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3054 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3058 // The remove went ok, but we now need to run through the selected items again
\r
3059 // and update their status
\r
3060 POSITION pos = GetFirstSelectedItemPosition();
\r
3062 std::vector<int> entriesToRemove;
\r
3063 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3065 FileEntry * e = GetListEntry(index);
\r
3067 ((e->textstatus == git_wc_status_unversioned)||
\r
3068 (e->textstatus == git_wc_status_none)||
\r
3069 (e->textstatus == git_wc_status_ignored)))
\r
3071 if (GetCheck(index))
\r
3074 entriesToRemove.push_back(index);
\r
3078 e->textstatus = git_wc_status_deleted;
\r
3079 e->status = git_wc_status_deleted;
\r
3080 SetEntryCheck(e,index,true);
\r
3083 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)
\r
3085 RemoveListEntry(*it);
\r
3088 SaveColumnWidths();
\r
3089 Show(m_dwShow, 0, m_bShowFolders);
\r
3093 case IDSVNLC_DELETE:
\r
3095 CTSVNPathList pathlist;
\r
3096 FillListOfSelectedItemPaths(pathlist);
\r
3097 pathlist.RemoveChildren();
\r
3099 for (INT_PTR i=0; i<pathlist.GetCount(); ++i)
\r
3101 filelist += pathlist[i].GetWinPathString();
\r
3102 filelist += _T("|");
\r
3104 filelist += _T("|");
\r
3105 int len = filelist.GetLength();
\r
3106 TCHAR * buf = new TCHAR[len+2];
\r
3107 _tcscpy_s(buf, len+2, filelist);
\r
3108 for (int i=0; i<len; ++i)
\r
3109 if (buf[i] == '|')
\r
3111 SHFILEOPSTRUCT fileop;
\r
3112 fileop.hwnd = this->m_hWnd;
\r
3113 fileop.wFunc = FO_DELETE;
\r
3114 fileop.pFrom = buf;
\r
3115 fileop.pTo = NULL;
\r
3116 fileop.fFlags = FOF_NO_CONNECTED_ELEMENTS | ((GetAsyncKeyState(VK_SHIFT) & 0x8000) ? 0 : FOF_ALLOWUNDO);
\r
3117 fileop.lpszProgressTitle = _T("deleting file");
\r
3118 int result = SHFileOperation(&fileop);
\r
3121 if ( (result==0) && (!fileop.fAnyOperationsAborted) )
\r
3124 POSITION pos = NULL;
\r
3125 CTSVNPathList deletedlist; // to store list of deleted folders
\r
3126 while ((pos = GetFirstSelectedItemPosition()) != 0)
\r
3128 int index = GetNextSelectedItem(pos);
\r
3129 if (GetCheck(index))
\r
3132 FileEntry * fentry = GetListEntry(index);
\r
3133 if ((fentry)&&(fentry->isfolder))
\r
3134 deletedlist.AddPath(fentry->path);
\r
3135 RemoveListEntry(index);
\r
3137 // now go through the list of deleted folders
\r
3138 // and remove all their children from the list too!
\r
3139 int nListboxEntries = GetItemCount();
\r
3140 for (int folderindex = 0; folderindex < deletedlist.GetCount(); ++folderindex)
\r
3142 CTSVNPath folderpath = deletedlist[folderindex];
\r
3143 for (int i=0; i<nListboxEntries; ++i)
\r
3145 FileEntry * entry = GetListEntry(i);
\r
3146 if (folderpath.IsAncestorOf(entry->path))
\r
3148 RemoveListEntry(i--);
\r
3149 nListboxEntries--;
\r
3157 case IDSVNLC_IGNOREMASK:
\r
3159 CString name = _T("*")+filepath.GetFileExtension();
\r
3160 CTSVNPathList ignorelist;
\r
3161 FillListOfSelectedItemPaths(ignorelist, true);
\r
3162 std::set<CTSVNPath> parentlist;
\r
3163 for (int i=0; i<ignorelist.GetCount(); ++i)
\r
3165 parentlist.insert(ignorelist[i].GetContainingDirectory());
\r
3167 std::set<CTSVNPath>::iterator it;
\r
3168 std::vector<CString> toremove;
\r
3170 for (it = parentlist.begin(); it != parentlist.end(); ++it)
\r
3172 CTSVNPath parentFolder = (*it).GetDirectory();
\r
3173 SVNProperties props(parentFolder, SVNRev::REV_WC, false);
\r
3175 for (int i=0; i<props.GetCount(); i++)
\r
3177 CString propname(props.GetItemName(i).c_str());
\r
3178 if (propname.CompareNoCase(_T("git:ignore"))==0)
\r
3181 // treat values as normal text even if they're not
\r
3182 value = (char *)props.GetItemValue(i).c_str();
\r
3185 if (value.IsEmpty())
\r
3189 value = value.Trim("\n\r");
\r
3192 value.Remove('\r');
\r
3194 if (!props.Add(_T("git:ignore"), (LPCSTR)value))
\r
3197 temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
\r
3198 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);
\r
3202 CTSVNPath basepath;
\r
3203 int nListboxEntries = GetItemCount();
\r
3204 for (int i=0; i<nListboxEntries; ++i)
\r
3206 FileEntry * entry = GetListEntry(i);
\r
3207 ASSERT(entry != NULL);
\r
3208 if (entry == NULL)
\r
3210 if (basepath.IsEmpty())
\r
3211 basepath = entry->basepath;
\r
3212 // since we ignored files with a mask (e.g. *.exe)
\r
3213 // we have to find find all files in the same
\r
3214 // folder (IsAncestorOf() returns TRUE for _all_ children,
\r
3215 // not just the immediate ones) which match the
\r
3216 // mask and remove them from the list too.
\r
3217 if ((entry->status == git_wc_status_unversioned)&&(parentFolder.IsAncestorOf(entry->path)))
\r
3219 CString f = entry->path.GetSVNPathString();
\r
3220 if (f.Mid(parentFolder.GetSVNPathString().GetLength()).Find('/')<=0)
\r
3222 if (CStringUtils::WildCardMatch(name, f))
\r
3227 toremove.push_back(f);
\r
3232 if (!m_bIgnoreRemoveOnly)
\r
3235 git_wc_status2_t * s;
\r
3236 CTSVNPath gitPath;
\r
3237 s = status.GetFirstFileStatus(parentFolder, gitPath, false, git_depth_empty);
\r
3240 // first check if the folder isn't already present in the list
\r
3241 bool bFound = false;
\r
3242 for (int i=0; i<nListboxEntries; ++i)
\r
3244 FileEntry * entry = GetListEntry(i);
\r
3245 if (entry->path.IsEquivalentTo(gitPath))
\r
3253 FileEntry * entry = new FileEntry();
\r
3254 entry->path = gitPath;
\r
3255 entry->basepath = basepath;
\r
3256 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
3257 entry->textstatus = s->text_status;
\r
3258 entry->propstatus = s->prop_status;
\r
3259 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);
\r
3260 entry->remotetextstatus = s->repos_text_status;
\r
3261 entry->remotepropstatus = s->repos_prop_status;
\r
3262 entry->inunversionedfolder = false;
\r
3263 entry->checked = true;
\r
3264 entry->inexternal = false;
\r
3265 entry->direct = false;
\r
3266 entry->isfolder = true;
\r
3267 entry->last_commit_date = 0;
\r
3268 entry->last_commit_rev = 0;
\r
3269 entry->remoterev = 0;
\r
3272 if (s->entry->url)
\r
3274 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));
\r
3277 if (s->entry && s->entry->present_props)
\r
3279 entry->present_props = s->entry->present_props;
\r
3281 m_arStatusArray.push_back(entry);
\r
3282 m_arListArray.push_back(m_arStatusArray.size()-1);
\r
3283 AddEntry(entry, langID, GetItemCount());
\r
3289 for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)
\r
3291 int nListboxEntries = GetItemCount();
\r
3292 for (int i=0; i<nListboxEntries; ++i)
\r
3294 if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)
\r
3296 RemoveListEntry(i);
\r
3304 case IDSVNLC_IGNORE:
\r
3306 CTSVNPathList ignorelist;
\r
3307 std::vector<CString> toremove;
\r
3308 FillListOfSelectedItemPaths(ignorelist, true);
\r
3310 for (int j=0; j<ignorelist.GetCount(); ++j)
\r
3312 int nListboxEntries = GetItemCount();
\r
3313 for (int i=0; i<nListboxEntries; ++i)
\r
3315 if (GetListEntry(i)->GetPath().IsEquivalentTo(ignorelist[j]))
\r
3321 CString name = CPathUtils::PathPatternEscape(ignorelist[j].GetFileOrDirectoryName());
\r
3322 CTSVNPath parentfolder = ignorelist[j].GetContainingDirectory();
\r
3323 SVNProperties props(parentfolder, SVNRev::REV_WC, false);
\r
3325 for (int i=0; i<props.GetCount(); i++)
\r
3327 CString propname(props.GetItemName(i).c_str());
\r
3328 if (propname.CompareNoCase(_T("git:ignore"))==0)
\r
3331 // treat values as normal text even if they're not
\r
3332 value = (char *)props.GetItemValue(i).c_str();
\r
3335 if (value.IsEmpty())
\r
3339 value = value.Trim("\n\r");
\r
3342 value.Remove('\r');
\r
3344 if (!props.Add(_T("git:ignore"), (LPCSTR)value))
\r
3347 temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
\r
3348 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);
\r
3351 if (GetCheck(selIndex))
\r
3355 // now, if we ignored a folder, remove all its children
\r
3356 if (ignorelist[j].IsDirectory())
\r
3358 for (int i=0; i<(int)m_arListArray.size(); ++i)
\r
3360 FileEntry * entry = GetListEntry(i);
\r
3361 if (entry->status == git_wc_status_unversioned)
\r
3363 if (!ignorelist[j].IsEquivalentTo(entry->GetPath())&&(ignorelist[j].IsAncestorOf(entry->GetPath())))
\r
3365 entry->status = git_wc_status_ignored;
\r
3366 entry->textstatus = git_wc_status_ignored;
\r
3369 toremove.push_back(entry->GetPath().GetSVNPathString());
\r
3375 CTSVNPath basepath = m_arStatusArray[m_arListArray[selIndex]]->basepath;
\r
3377 FileEntry * entry = m_arStatusArray[m_arListArray[selIndex]];
\r
3378 if ( entry->status == git_wc_status_unversioned ) // keep "deleted" items
\r
3379 toremove.push_back(entry->GetPath().GetSVNPathString());
\r
3381 if (!m_bIgnoreRemoveOnly)
\r
3384 git_wc_status2_t * s;
\r
3385 CTSVNPath gitPath;
\r
3386 s = status.GetFirstFileStatus(parentfolder, gitPath, false, git_depth_empty);
\r
3387 // first check if the folder isn't already present in the list
\r
3388 bool bFound = false;
\r
3389 nListboxEntries = GetItemCount();
\r
3390 for (int i=0; i<nListboxEntries; ++i)
\r
3392 FileEntry * entry = GetListEntry(i);
\r
3393 if (entry->path.IsEquivalentTo(gitPath))
\r
3403 FileEntry * entry = new FileEntry();
\r
3404 entry->path = gitPath;
\r
3405 entry->basepath = basepath;
\r
3406 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
3407 entry->textstatus = s->text_status;
\r
3408 entry->propstatus = s->prop_status;
\r
3409 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);
\r
3410 entry->remotetextstatus = s->repos_text_status;
\r
3411 entry->remotepropstatus = s->repos_prop_status;
\r
3412 entry->inunversionedfolder = FALSE;
\r
3413 entry->checked = true;
\r
3414 entry->inexternal = false;
\r
3415 entry->direct = false;
\r
3416 entry->isfolder = true;
\r
3417 entry->last_commit_date = 0;
\r
3418 entry->last_commit_rev = 0;
\r
3419 entry->remoterev = 0;
\r
3422 if (s->entry->url)
\r
3424 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));
\r
3427 if (s->entry && s->entry->present_props)
\r
3429 entry->present_props = s->entry->present_props;
\r
3431 m_arStatusArray.push_back(entry);
\r
3432 m_arListArray.push_back(m_arStatusArray.size()-1);
\r
3433 AddEntry(entry, langID, GetItemCount());
\r
3438 for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)
\r
3440 int nListboxEntries = GetItemCount();
\r
3441 for (int i=0; i<nListboxEntries; ++i)
\r
3443 if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)
\r
3445 RemoveListEntry(i);
\r
3453 case IDSVNLC_EDITCONFLICT:
\r
3454 SVNDiff::StartConflictEditor(filepath);
\r
3456 case IDSVNLC_RESOLVECONFLICT:
\r
3457 case IDSVNLC_RESOLVEMINE:
\r
3458 case IDSVNLC_RESOLVETHEIRS:
\r
3460 git_wc_conflict_choice_t result = git_wc_conflict_choose_merged;
\r
3463 case IDSVNLC_RESOLVETHEIRS:
\r
3464 result = git_wc_conflict_choose_theirs_full;
\r
3466 case IDSVNLC_RESOLVEMINE:
\r
3467 result = git_wc_conflict_choose_mine_full;
\r
3469 case IDSVNLC_RESOLVECONFLICT:
\r
3470 result = git_wc_conflict_choose_merged;
\r
3473 if (CMessageBox::Show(m_hWnd, IDS_PROC_RESOLVE, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO)==IDYES)
\r
3476 POSITION pos = GetFirstSelectedItemPosition();
\r
3480 index = GetNextSelectedItem(pos);
\r
3481 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
\r
3482 if (!git.Resolve(fentry->GetPath(), result, FALSE))
\r
3484 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3488 fentry->status = git_wc_status_modified;
\r
3489 fentry->textstatus = git_wc_status_modified;
\r
3490 fentry->isConflicted = false;
\r
3493 Show(m_dwShow, 0, m_bShowFolders);
\r
3500 CTSVNPathList itemsToAdd;
\r
3501 FillListOfSelectedItemPaths(itemsToAdd);
\r
3503 // We must sort items before adding, so that folders are always added
\r
3504 // *before* any of their children
\r
3505 itemsToAdd.SortByPathname();
\r
3507 ProjectProperties props;
\r
3508 props.ReadPropsPathList(itemsToAdd);
\r
3509 if (git.Add(itemsToAdd, &props, git_depth_empty, TRUE, TRUE, TRUE))
\r
3511 // The add went ok, but we now need to run through the selected items again
\r
3512 // and update their status
\r
3513 POSITION pos = GetFirstSelectedItemPosition();
\r
3515 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3517 FileEntry * e = GetListEntry(index);
\r
3518 e->textstatus = git_wc_status_added;
\r
3519 e->propstatus = git_wc_status_none;
\r
3520 e->status = git_wc_status_added;
\r
3521 SetEntryCheck(e,index,true);
\r
3526 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3528 SaveColumnWidths();
\r
3529 Show(m_dwShow, 0, m_bShowFolders);
\r
3533 case IDSVNLC_ADD_RECURSIVE:
\r
3535 CTSVNPathList itemsToAdd;
\r
3536 FillListOfSelectedItemPaths(itemsToAdd);
\r
3539 dlg.m_pathList = itemsToAdd;
\r
3540 if (dlg.DoModal() == IDOK)
\r
3542 if (dlg.m_pathList.GetCount() == 0)
\r
3544 CSVNProgressDlg progDlg;
\r
3545 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Add);
\r
3546 progDlg.SetPathList(dlg.m_pathList);
\r
3547 ProjectProperties props;
\r
3548 props.ReadPropsPathList(dlg.m_pathList);
\r
3549 progDlg.SetProjectProperties(props);
\r
3550 progDlg.SetItemCount(dlg.m_pathList.GetCount());
\r
3551 progDlg.DoModal();
\r
3554 CWnd* pParent = GetParent();
\r
3555 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3557 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3562 case IDSVNLC_LOCK:
\r
3564 CTSVNPathList itemsToLock;
\r
3565 FillListOfSelectedItemPaths(itemsToLock);
\r
3567 inpDlg.m_sTitle.LoadString(IDS_MENU_LOCK);
\r
3568 CStringUtils::RemoveAccelerators(inpDlg.m_sTitle);
\r
3569 inpDlg.m_sHintText.LoadString(IDS_LOCK_MESSAGEHINT);
\r
3570 inpDlg.m_sCheckText.LoadString(IDS_LOCK_STEALCHECK);
\r
3571 ProjectProperties props;
\r
3572 props.ReadPropsPathList(itemsToLock);
\r
3573 props.nMinLogSize = 0; // the lock message is optional, so no minimum!
\r
3574 inpDlg.m_pProjectProperties = &props;
\r
3575 if (inpDlg.DoModal()==IDOK)
\r
3577 CSVNProgressDlg progDlg;
\r
3578 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Lock);
\r
3579 progDlg.SetOptions(inpDlg.m_iCheck ? ProgOptLockForce : ProgOptNone);
\r
3580 progDlg.SetPathList(itemsToLock);
\r
3581 progDlg.SetCommitMessage(inpDlg.m_sInputText);
\r
3582 progDlg.DoModal();
\r
3584 CWnd* pParent = GetParent();
\r
3585 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3587 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3592 case IDSVNLC_UNLOCKFORCE:
\r
3594 case IDSVNLC_UNLOCK:
\r
3596 CTSVNPathList itemsToUnlock;
\r
3597 FillListOfSelectedItemPaths(itemsToUnlock);
\r
3598 CSVNProgressDlg progDlg;
\r
3599 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Unlock);
\r
3600 progDlg.SetOptions(bForce ? ProgOptLockForce : ProgOptNone);
\r
3601 progDlg.SetPathList(itemsToUnlock);
\r
3602 progDlg.DoModal();
\r
3604 CWnd* pParent = GetParent();
\r
3605 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3607 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3611 case IDSVNLC_REPAIRMOVE:
\r
3613 POSITION pos = GetFirstSelectedItemPosition();
\r
3614 int index = GetNextSelectedItem(pos);
\r
3615 FileEntry * entry1 = NULL;
\r
3616 FileEntry * entry2 = NULL;
\r
3619 entry1 = GetListEntry(index);
\r
3620 git_wc_status_kind status1 = git_wc_status_none;
\r
3621 git_wc_status_kind status2 = git_wc_status_none;
\r
3624 status1 = entry1->status;
\r
3625 index = GetNextSelectedItem(pos);
\r
3628 entry2 = GetListEntry(index);
\r
3631 status2 = entry2->status;
\r
3632 if (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned)
\r
3634 FileEntry * tempentry = entry1;
\r
3636 entry2 = tempentry;
\r
3638 // entry1 was renamed to entry2 but outside of Subversion
\r
3639 // fix this by moving entry2 back to entry1 first,
\r
3640 // then do an git-move from entry1 to entry2
\r
3641 if (MoveFile(entry2->GetPath().GetWinPath(), entry1->GetPath().GetWinPath()))
\r
3644 if (!git.Move(CTSVNPathList(entry1->GetPath()), entry2->GetPath(), TRUE))
\r
3646 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3650 // check the previously unversioned item
\r
3651 entry1->checked = true;
\r
3652 // fixing the move was successful. We have to adjust the new status of the
\r
3654 // Since we don't know if the moved/renamed file had local modifications or not,
\r
3655 // we can't guess the new status. That means we have to refresh...
\r
3656 CWnd* pParent = GetParent();
\r
3657 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3659 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3666 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
\r
3667 FORMAT_MESSAGE_FROM_SYSTEM |
\r
3668 FORMAT_MESSAGE_IGNORE_INSERTS,
\r
3671 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
\r
3672 (LPTSTR) &lpMsgBuf,
\r
3676 MessageBox((LPCTSTR)lpMsgBuf, _T("Error"), MB_OK | MB_ICONINFORMATION );
\r
3677 LocalFree( lpMsgBuf );
\r
3685 case IDSVNLC_REMOVEFROMCS:
\r
3687 CTSVNPathList changelistItems;
\r
3688 FillListOfSelectedItemPaths(changelistItems);
\r
3691 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
\r
3693 // The changelists were removed, but we now need to run through the selected items again
\r
3694 // and update their changelist
\r
3695 POSITION pos = GetFirstSelectedItemPosition();
\r
3697 std::vector<int> entriesToRemove;
\r
3698 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3700 FileEntry * e = GetListEntry(index);
\r
3703 e->changelist.Empty();
\r
3704 if (e->status == git_wc_status_normal)
\r
3706 // remove the entry completely
\r
3707 entriesToRemove.push_back(index);
\r
3710 SetItemGroup(index, 0);
\r
3713 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)
\r
3715 RemoveListEntry(*it);
\r
3717 // TODO: Should we go through all entries here and check if we also could
\r
3718 // remove the changelist from m_changelists ?
\r
3722 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3727 case IDSVNLC_CREATEIGNORECS:
\r
3728 CreateChangeList(SVNSLC_IGNORECHANGELIST);
\r
3730 case IDSVNLC_CREATECS:
\r
3732 CCreateChangelistDlg dlg;
\r
3733 if (dlg.DoModal() == IDOK)
\r
3735 CreateChangeList(dlg.m_sName);
\r
3741 if (cmd < IDSVNLC_MOVETOCS)
\r
3743 CTSVNPathList changelistItems;
\r
3744 FillListOfSelectedItemPaths(changelistItems);
\r
3746 // find the changelist name
\r
3747 CString sChangelist;
\r
3748 int cmdID = IDSVNLC_MOVETOCS;
\r
3750 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
3752 if ((it->first.Compare(SVNSLC_IGNORECHANGELIST))&&(entry->changelist.Compare(it->first)))
\r
3756 sChangelist = it->first;
\r
3761 if (!sChangelist.IsEmpty())
\r
3764 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
\r
3766 // The changelists were moved, but we now need to run through the selected items again
\r
3767 // and update their changelist
\r
3768 POSITION pos = GetFirstSelectedItemPosition();
\r
3770 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3772 FileEntry * e = GetListEntry(index);
\r
3773 e->changelist = sChangelist;
\r
3774 if (!e->IsFolder())
\r
3776 if (m_changelists.find(e->changelist)!=m_changelists.end())
\r
3777 SetItemGroup(index, m_changelists[e->changelist]);
\r
3779 SetItemGroup(index, 0);
\r
3785 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3795 AfxGetApp()->DoWaitCursor(-1);
\r
3796 GetStatisticsString();
\r
3797 int iItemCountAfterMenuCmd = GetItemCount();
\r
3798 //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)
\r
3800 // CWnd* pParent = GetParent();
\r
3801 // if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3803 // pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);
\r
3806 } // if (popup.CreatePopupMenu())
\r
3807 } // if (selIndex >= 0)
\r
3811 void CGitStatusListCtrl::OnContextMenuHeader(CWnd * pWnd, CPoint point)
\r
3813 bool XPorLater = false;
\r
3814 OSVERSIONINFOEX inf;
\r
3815 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
3816 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
3817 GetVersionEx((OSVERSIONINFO *)&inf);
\r
3818 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
3819 if (fullver >= 0x0501)
\r
3822 CHeaderCtrl * pHeaderCtrl = (CHeaderCtrl *)pWnd;
\r
3823 if ((point.x == -1) && (point.y == -1))
\r
3826 pHeaderCtrl->GetItemRect(0, &rect);
\r
3827 ClientToScreen(&rect);
\r
3828 point = rect.CenterPoint();
\r
3830 Locker lock(m_critSec);
\r
3832 if (popup.CreatePopupMenu())
\r
3834 int columnCount = m_ColumnManager.GetColumnCount();
\r
3837 UINT uCheckedFlags = MF_STRING | MF_ENABLED | MF_CHECKED;
\r
3838 UINT uUnCheckedFlags = MF_STRING | MF_ENABLED;
\r
3840 // build control menu
\r
3844 temp.LoadString(IDS_STATUSLIST_SHOWGROUPS);
\r
3845 popup.AppendMenu(IsGroupViewEnabled() ? uCheckedFlags : uUnCheckedFlags, columnCount, temp);
\r
3848 if (m_ColumnManager.AnyUnusedProperties())
\r
3850 temp.LoadString(IDS_STATUSLIST_REMOVEUNUSEDPROPS);
\r
3851 popup.AppendMenu(uUnCheckedFlags, columnCount+1, temp);
\r
3854 temp.LoadString(IDS_STATUSLIST_RESETCOLUMNORDER);
\r
3855 popup.AppendMenu(uUnCheckedFlags, columnCount+2, temp);
\r
3856 popup.AppendMenu(MF_SEPARATOR);
\r
3858 // standard columns
\r
3860 for (int i = 1; i < SVNSLC_NUMCOLUMNS; ++i)
\r
3862 popup.AppendMenu ( m_ColumnManager.IsVisible(i)
\r
3866 , m_ColumnManager.GetName(i));
\r
3869 // user-prop columns:
\r
3870 // find relevant ones and sort 'em
\r
3872 std::map<CString, int> sortedProps;
\r
3873 for (int i = SVNSLC_NUMCOLUMNS; i < columnCount; ++i)
\r
3874 if (m_ColumnManager.IsRelevant(i))
\r
3875 sortedProps[m_ColumnManager.GetName(i)] = i;
\r
3877 if (!sortedProps.empty())
\r
3879 // add 'em to the menu
\r
3881 popup.AppendMenu(MF_SEPARATOR);
\r
3883 typedef std::map<CString, int>::const_iterator CIT;
\r
3884 for ( CIT iter = sortedProps.begin(), end = sortedProps.end()
\r
3888 popup.AppendMenu ( m_ColumnManager.IsVisible(iter->second)
\r
3896 // show menu & let user pick an entry
\r
3898 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
3899 if ((cmd >= 1)&&(cmd < columnCount))
\r
3901 m_ColumnManager.SetVisible (cmd, !m_ColumnManager.IsVisible(cmd));
\r
3903 else if (cmd == columnCount)
\r
3905 EnableGroupView(!IsGroupViewEnabled());
\r
3907 else if (cmd == columnCount+1)
\r
3909 m_ColumnManager.RemoveUnusedProps();
\r
3911 else if (cmd == columnCount+2)
\r
3913 m_ColumnManager.ResetColumns (m_dwDefaultColumns);
\r
3918 void CGitStatusListCtrl::OnContextMenu(CWnd* pWnd, CPoint point)
\r
3923 OnContextMenuList(pWnd, point);
\r
3924 } // if (pWnd == this)
\r
3925 else if (pWnd == GetHeaderCtrl())
\r
3927 OnContextMenuHeader(pWnd, point);
\r
3931 void CGitStatusListCtrl::CreateChangeList(const CString& name)
\r
3934 CTGitPathList changelistItems;
\r
3935 FillListOfSelectedItemPaths(changelistItems);
\r
3937 if (git.AddToChangeList(changelistItems, name, git_depth_empty))
\r
3939 TCHAR groupname[1024];
\r
3940 LVGROUP grp = {0};
\r
3941 grp.cbSize = sizeof(LVGROUP);
\r
3942 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
3943 _tcsncpy_s(groupname, 1024, name, 1023);
\r
3944 grp.pszHeader = groupname;
\r
3945 grp.iGroupId = (int)m_changelists.size();
\r
3946 grp.uAlign = LVGA_HEADER_LEFT;
\r
3947 m_changelists[name] = InsertGroup(-1, &grp);
\r
3949 PrepareGroups(true);
\r
3951 POSITION pos = GetFirstSelectedItemPosition();
\r
3953 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3955 FileEntry * e = GetListEntry(index);
\r
3956 e->changelist = name;
\r
3957 SetEntryCheck(e, index, FALSE);
\r
3960 for (index = 0; index < GetItemCount(); ++index)
\r
3962 FileEntry * e = GetListEntry(index);
\r
3963 if (m_changelists.find(e->changelist)!=m_changelists.end())
\r
3964 SetItemGroup(index, m_changelists[e->changelist]);
\r
3966 SetItemGroup(index, 0);
\r
3971 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("Tortoisegit"), MB_ICONERROR);
\r
3976 void CGitStatusListCtrl::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
\r
3979 Locker lock(m_critSec);
\r
3980 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
3985 if (pNMLV->iItem < 0)
\r
3987 if (!IsGroupViewEnabled())
\r
3990 DWORD ptW = GetMessagePos();
\r
3991 pt.x = GET_X_LPARAM(ptW);
\r
3992 pt.y = GET_Y_LPARAM(ptW);
\r
3993 ScreenToClient(&pt);
\r
3994 int group = GetGroupFromPoint(&pt);
\r
3997 // check/uncheck the whole group depending on the check-state
\r
3998 // of the first item in the group
\r
4000 bool bCheck = false;
\r
4001 bool bFirst = false;
\r
4003 for (int i=0; i<GetItemCount(); ++i)
\r
4005 SecureZeroMemory(&lv, sizeof(LVITEM));
\r
4006 lv.mask = LVIF_GROUPID;
\r
4009 if (lv.iGroupId == group)
\r
4011 FileEntry * entry = GetListEntry(i);
\r
4014 bCheck = !GetCheck(i);
\r
4019 bool bOldCheck = !!GetCheck(i);
\r
4020 SetEntryCheck(entry, i, bCheck);
\r
4021 if (bCheck != bOldCheck)
\r
4031 GetStatisticsString();
\r
4037 // FileEntry * entry = GetListEntry(pNMLV->iItem);
\r
4040 // if (entry->isConflicted)
\r
4042 // gitDiff::StartConflictEditor(entry->GetPath());
\r
4046 StartDiff(pNMLV->iItem);
\r
4052 void CGitStatusListCtrl::StartDiff(int fileindex)
\r
4057 CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);
\r
4059 if(file1.m_Action & CTGitPath::LOGACTIONS_REPLACED)
\r
4061 file2.SetFromGit(file1.GetGitOldPathString());
\r
4067 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
\r
4069 if(!g_Git.IsInitRepos())
\r
4070 CGitDiff::Diff(&file1,&file2,
\r
4071 CString(GIT_REV_ZERO),
\r
4072 GitRev::GetHead());
\r
4074 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
\r
4075 CString(GIT_REV_ZERO));
\r
4078 CGitDiff::Diff(&file1,&file2,
\r
4080 m_CurrentVersion+_T("~1"));
\r
4083 if (fileindex < 0)
\r
4085 FileEntry * entry = GetListEntry(fileindex);
\r
4086 ASSERT(entry != NULL);
\r
4087 if (entry == NULL)
\r
4089 if (((entry->status == git_wc_status_normal)&&(entry->remotestatus <= git_wc_status_normal))||
\r
4090 (entry->status == git_wc_status_unversioned)||(entry->status == git_wc_status_none))
\r
4092 int ret = (int)ShellExecute(this->m_hWnd, NULL, entry->path.GetWinPath(), NULL, NULL, SW_SHOW);
\r
4093 if (ret <= HINSTANCE_ERROR)
\r
4095 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
4096 cmd += entry->path.GetWinPathString();
\r
4097 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
4102 GitDiff diff(NULL, m_hWnd, true);
\r
4103 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
4105 entry->path, entry->textstatus, entry->propstatus,
\r
4106 entry->remotetextstatus, entry->remotepropstatus);
\r
4110 CString CGitStatusListCtrl::GetStatisticsString()
\r
4113 CString sNormal, sAdded, sDeleted, sModified, sConflicted, sUnversioned;
\r
4114 WORD langID = (WORD)(DWORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
4115 TCHAR buf[MAX_STATUS_STRING_LENGTH];
\r
4116 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_normal, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4118 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_added, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4120 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_deleted, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4122 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_modified, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4124 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_conflicted, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4125 sConflicted = buf;
\r
4126 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_unversioned, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4127 sUnversioned = buf;
\r
4129 sToolTip.Format(_T("%s = %d\n%s = %d\n%s = %d\n%s = %d\n%s = %d\n%s = %d"),
\r
4130 (LPCTSTR)sNormal, m_nNormal,
\r
4131 (LPCTSTR)sUnversioned, m_nUnversioned,
\r
4132 (LPCTSTR)sModified, m_nModified,
\r
4133 (LPCTSTR)sAdded, m_nAdded,
\r
4134 (LPCTSTR)sDeleted, m_nDeleted,
\r
4135 (LPCTSTR)sConflicted, m_nConflicted
\r
4138 sStats.Format(IDS_COMMITDLG_STATISTICSFORMAT, m_nSelected, GetItemCount());
\r
4141 m_pStatLabel->SetWindowText(sStats);
\r
4144 if (m_pSelectButton)
\r
4146 if (m_nSelected == 0)
\r
4147 m_pSelectButton->SetCheck(BST_UNCHECKED);
\r
4148 else if (m_nSelected != GetItemCount())
\r
4149 m_pSelectButton->SetCheck(BST_INDETERMINATE);
\r
4151 m_pSelectButton->SetCheck(BST_CHECKED);
\r
4154 if (m_pConfirmButton)
\r
4156 m_pConfirmButton->EnableWindow(m_nSelected>0);
\r
4164 CString CGitStatusListCtrl::GetCommonDirectory(bool bStrict)
\r
4168 // not strict means that the selected folder has priority
\r
4169 if (!m_StatusFileList.GetCommonDirectory().IsEmpty())
\r
4170 return m_StatusFileList.GetCommonDirectory().GetWinPath();
\r
4173 CTGitPath commonBaseDirectory;
\r
4174 int nListItems = GetItemCount();
\r
4175 for (int i=0; i<nListItems; ++i)
\r
4177 CTGitPath baseDirectory,*p= (CTGitPath*)this->GetItemData(i);
\r
4181 baseDirectory = p->GetDirectory();
\r
4183 if(commonBaseDirectory.IsEmpty())
\r
4185 commonBaseDirectory = baseDirectory;
\r
4189 if (commonBaseDirectory.GetWinPathString().GetLength() > baseDirectory.GetWinPathString().GetLength())
\r
4191 if (baseDirectory.IsAncestorOf(commonBaseDirectory))
\r
4192 commonBaseDirectory = baseDirectory;
\r
4196 return g_Git.m_CurrentDir+CString(_T("\\"))+commonBaseDirectory.GetWinPath();
\r
4199 CTGitPath CGitStatusListCtrl::GetCommonURL(bool bStrict)
\r
4201 CTGitPath commonBaseURL;
\r
4206 // not strict means that the selected folder has priority
\r
4207 if (!m_StatusUrlList.GetCommonDirectory().IsEmpty())
\r
4208 return m_StatusUrlList.GetCommonDirectory();
\r
4211 int nListItems = GetItemCount();
\r
4212 for (int i=0; i<nListItems; ++i)
\r
4214 const CTGitPath& baseURL = CTGitPath(GetListEntry(i)->GetURL());
\r
4215 if (baseURL.IsEmpty())
\r
4216 continue; // item has no url
\r
4217 if(commonBaseURL.IsEmpty())
\r
4219 commonBaseURL = baseURL;
\r
4223 if (commonBaseURL.GetGitPathString().GetLength() > baseURL.GetGitPathString().GetLength())
\r
4225 if (baseURL.IsAncestorOf(commonBaseURL))
\r
4226 commonBaseURL = baseURL;
\r
4232 return commonBaseURL;
\r
4235 void CGitStatusListCtrl::SelectAll(bool bSelect, bool bIncludeNoCommits)
\r
4237 CWaitCursor waitCursor;
\r
4238 // block here so the LVN_ITEMCHANGED messages
\r
4243 int nListItems = GetItemCount();
\r
4245 m_nSelected = nListItems;
\r
4249 for (int i=0; i<nListItems; ++i)
\r
4251 //FileEntry * entry = GetListEntry(i);
\r
4252 //ASSERT(entry != NULL);
\r
4253 CTGitPath *path = (CTGitPath *) GetItemData(i);
\r
4256 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))
\r
4257 SetEntryCheck(path,i,bSelect);
\r
4260 // unblock before redrawing
\r
4263 GetStatisticsString();
\r
4267 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR *pNMHDR, LRESULT *pResult)
\r
4269 LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast<LPNMLVGETINFOTIP>(pNMHDR);
\r
4274 if (GetListEntry(pGetInfoTip->iItem >= 0))
\r
4275 if (pGetInfoTip->cchTextMax > GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString().GetLength())
\r
4277 if (GetListEntry(pGetInfoTip->iItem)->GetRelativeGitPath().Compare(GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString())!= 0)
\r
4278 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString(), pGetInfoTip->cchTextMax);
\r
4279 else if (GetStringWidth(GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString()) > GetColumnWidth(pGetInfoTip->iItem))
\r
4280 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString(), pGetInfoTip->cchTextMax);
\r
4285 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult)
\r
4287 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
4289 // Take the default processing unless we set this to something else below.
\r
4290 *pResult = CDRF_DODEFAULT;
\r
4292 // First thing - check the draw stage. If it's the control's prepaint
\r
4293 // stage, then tell Windows we want messages for every item.
\r
4295 switch (pLVCD->nmcd.dwDrawStage)
\r
4297 case CDDS_PREPAINT:
\r
4298 *pResult = CDRF_NOTIFYITEMDRAW;
\r
4300 case CDDS_ITEMPREPAINT:
\r
4302 // This is the prepaint stage for an item. Here's where we set the
\r
4303 // item's text color. Our return value will tell Windows to draw the
\r
4304 // item itself, but it will use the new color we set here.
\r
4306 // Tell Windows to paint the control itself.
\r
4307 *pResult = CDRF_DODEFAULT;
\r
4311 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
4313 if (m_arStatusArray.size() > (DWORD_PTR)pLVCD->nmcd.dwItemSpec)
\r
4316 //FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);
\r
4317 CTGitPath *entry=(CTGitPath *)GetItemData((int)pLVCD->nmcd.dwItemSpec);
\r
4318 if (entry == NULL)
\r
4323 // black : unversioned, normal
\r
4325 // blue : modified
\r
4326 // brown : missing, deleted, replaced
\r
4327 // green : merged (or potential merges)
\r
4328 // red : conflicts or sure conflicts
\r
4329 if(entry->m_Action & CTGitPath::LOGACTIONS_CONFLICT)
\r
4331 crText = m_Colors.GetColor(CColors::Conflict);
\r
4333 }else if(entry->m_Action & CTGitPath::LOGACTIONS_MODIFIED)
\r
4335 crText = m_Colors.GetColor(CColors::Modified);
\r
4337 }else if(entry->m_Action & CTGitPath::LOGACTIONS_ADDED)
\r
4339 crText = m_Colors.GetColor(CColors::Added);
\r
4341 else if(entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
\r
4343 crText = m_Colors.GetColor(CColors::DeletedNode);
\r
4345 else if(entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
\r
4347 crText = m_Colors.GetColor(CColors::RenamedNode);
\r
4350 crText = GetSysColor(COLOR_WINDOWTEXT);
\r
4352 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
4353 pLVCD->clrText = crText;
\r
4360 BOOL CGitStatusListCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
\r
4363 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
\r
4366 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
\r
4368 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
\r
4370 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
\r
4375 void CGitStatusListCtrl::RemoveListEntry(int index)
\r
4378 Locker lock(m_critSec);
\r
4379 DeleteItem(index);
\r
4380 delete m_arStatusArray[m_arListArray[index]];
\r
4381 m_arStatusArray.erase(m_arStatusArray.begin()+m_arListArray[index]);
\r
4382 m_arListArray.erase(m_arListArray.begin()+index);
\r
4383 for (int i=index; i< (int)m_arListArray.size(); ++i)
\r
4385 m_arListArray[i]--;
\r
4390 ///< Set a checkbox on an entry in the listbox
\r
4391 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync
\r
4392 void CGitStatusListCtrl::SetEntryCheck(CTGitPath* pEntry, int listboxIndex, bool bCheck)
\r
4394 pEntry->m_Checked = bCheck;
\r
4395 SetCheck(listboxIndex, bCheck);
\r
4399 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry* parentEntry, bool bCheck)
\r
4402 int nListItems = GetItemCount();
\r
4403 for (int j=0; j< nListItems ; ++j)
\r
4405 FileEntry * childEntry = GetListEntry(j);
\r
4406 ASSERT(childEntry != NULL);
\r
4407 if (childEntry == NULL || childEntry == parentEntry)
\r
4409 if (childEntry->checked != bCheck)
\r
4411 if (parentEntry->path.IsAncestorOf(childEntry->path))
\r
4413 SetEntryCheck(childEntry,j,bCheck);
\r
4429 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList& pathList)
\r
4433 int nListItems = GetItemCount();
\r
4434 for (int i=0; i< nListItems; i++)
\r
4436 const FileEntry* entry = GetListEntry(i);
\r
4437 ASSERT(entry != NULL);
\r
4438 if (entry->IsChecked())
\r
4440 pathList.AddPath(entry->path);
\r
4443 pathList.SortByPathname();
\r
4448 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)
\r
4449 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList& pathList, bool bNoIgnored)
\r
4453 POSITION pos = GetFirstSelectedItemPosition();
\r
4455 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
4457 CTGitPath * entry = (CTGitPath*)GetItemData(index);
\r
4458 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))
\r
4460 pathList.AddPath(*entry);
\r
4464 UINT CGitStatusListCtrl::OnGetDlgCode()
\r
4466 // we want to process the return key and not have that one
\r
4467 // routed to the default pushbutton
\r
4468 return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS;
\r
4471 void CGitStatusListCtrl::OnNMReturn(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
4476 POSITION pos = GetFirstSelectedItemPosition();
\r
4479 int index = GetNextSelectedItem(pos);
\r
4484 void CGitStatusListCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
\r
4486 // Since we catch all keystrokes (to have the enter key processed here instead
\r
4487 // of routed to the default pushbutton) we have to make sure that other
\r
4488 // keys like Tab and Esc still do what they're supposed to do
\r
4489 // Tab = change focus to next/previous control
\r
4490 // Esc = quit the dialog
\r
4495 ::PostMessage(GetParent()->GetSafeHwnd(), WM_NEXTDLGCTL, GetKeyState(VK_SHIFT)&0x8000, 0);
\r
4501 ::SendMessage(GetParent()->GetSafeHwnd(), WM_CLOSE, 0, 0);
\r
4506 CListCtrl::OnKeyDown(nChar, nRepCnt, nFlags);
\r
4509 void CGitStatusListCtrl::PreSubclassWindow()
\r
4511 CListCtrl::PreSubclassWindow();
\r
4512 EnableToolTips(TRUE);
\r
4513 m_Theme.SetWindowTheme(GetSafeHwnd(), L"Explorer", NULL);
\r
4516 INT_PTR CGitStatusListCtrl::OnToolHitTest(CPoint point, TOOLINFO* pTI) const
\r
4520 row = CellRectFromPoint(point, &cellrect, &col );
\r
4526 pTI->hwnd = m_hWnd;
\r
4527 pTI->uId = (UINT)((row<<10)+(col&0x3ff)+1);
\r
4528 pTI->lpszText = LPSTR_TEXTCALLBACK;
\r
4530 pTI->rect = cellrect;
\r
4535 int CGitStatusListCtrl::CellRectFromPoint(CPoint& point, RECT *cellrect, int *col) const
\r
4539 // Make sure that the ListView is in LVS_REPORT
\r
4540 if ((GetWindowLong(m_hWnd, GWL_STYLE) & LVS_TYPEMASK) != LVS_REPORT)
\r
4543 // Get the top and bottom row visible
\r
4544 int row = GetTopIndex();
\r
4545 int bottom = row + GetCountPerPage();
\r
4546 if (bottom > GetItemCount())
\r
4547 bottom = GetItemCount();
\r
4549 // Get the number of columns
\r
4550 CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
\r
4551 int nColumnCount = pHeader->GetItemCount();
\r
4553 // Loop through the visible rows
\r
4554 for ( ;row <=bottom;row++)
\r
4556 // Get bounding rect of item and check whether point falls in it.
\r
4558 GetItemRect(row, &rect, LVIR_BOUNDS);
\r
4559 if (rect.PtInRect(point))
\r
4561 // Now find the column
\r
4562 for (colnum = 0; colnum < nColumnCount; colnum++)
\r
4564 int colwidth = GetColumnWidth(colnum);
\r
4565 if (point.x >= rect.left && point.x <= (rect.left + colwidth))
\r
4568 GetClientRect(&rectClient);
\r
4571 rect.right = rect.left + colwidth;
\r
4573 // Make sure that the right extent does not exceed
\r
4574 // the client area
\r
4575 if (rect.right > rectClient.right)
\r
4576 rect.right = rectClient.right;
\r
4580 rect.left += colwidth;
\r
4587 BOOL CGitStatusListCtrl::OnToolTipText(UINT /*id*/, NMHDR *pNMHDR, LRESULT *pResult)
\r
4590 TOOLTIPTEXTW* pTTTW = (TOOLTIPTEXTW*)pNMHDR;
\r
4591 CString strTipText;
\r
4592 UINT_PTR nID = pNMHDR->idFrom;
\r
4597 UINT_PTR row = ((nID-1) >> 10) & 0x3fffff;
\r
4598 UINT_PTR col = (nID-1) & 0x3ff;
\r
4601 return FALSE; // no custom tooltip for the path, we use the infotip there!
\r
4603 // get the internal column from the visible columns
\r
4604 int internalcol = 0;
\r
4605 UINT_PTR currentcol = 0;
\r
4606 for (; (currentcol != col)
\r
4607 && (internalcol < m_ColumnManager.GetColumnCount()-1)
\r
4610 if (m_ColumnManager.IsVisible (internalcol))
\r
4614 AFX_MODULE_THREAD_STATE* pModuleThreadState = AfxGetModuleThreadState();
\r
4615 CToolTipCtrl* pToolTip = pModuleThreadState->m_pToolTip;
\r
4616 pToolTip->SendMessage(TTM_SETMAXTIPWIDTH, 0, 300);
\r
4619 if ((internalcol == 2)||(internalcol == 4))
\r
4621 FileEntry *fentry = GetListEntry(row);
\r
4624 if (fentry->copied)
\r
4627 url.Format(IDS_STATUSLIST_COPYFROM, (LPCTSTR)CPathUtils::PathUnescape(fentry->copyfrom_url), (LONG)fentry->copyfrom_rev);
\r
4628 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);
\r
4631 if (fentry->switched)
\r
4634 url.Format(IDS_STATUSLIST_SWITCHEDTO, (LPCTSTR)CPathUtils::PathUnescape(fentry->url));
\r
4635 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);
\r
4638 if (fentry->keeplocal)
\r
4640 lstrcpyn(pTTTW->szText, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_KEEPLOCAL)), 80);
\r
4649 void CGitStatusListCtrl::OnPaint()
\r
4652 if ((m_bBusy)||(m_bEmpty))
\r
4657 if (m_sBusy.IsEmpty())
\r
4658 str.LoadString(IDS_STATUSLIST_BUSYMSG);
\r
4664 if (m_sEmpty.IsEmpty())
\r
4665 str.LoadString(IDS_STATUSLIST_EMPTYMSG);
\r
4669 COLORREF clrText = ::GetSysColor(COLOR_WINDOWTEXT);
\r
4670 COLORREF clrTextBk;
\r
4671 if (IsWindowEnabled())
\r
4672 clrTextBk = ::GetSysColor(COLOR_WINDOW);
\r
4674 clrTextBk = ::GetSysColor(COLOR_3DFACE);
\r
4677 GetClientRect(&rc);
\r
4679 pHC = GetHeaderCtrl();
\r
4683 pHC->GetItemRect(0, &rcH);
\r
4684 rc.top += rcH.bottom;
\r
4686 CDC* pDC = GetDC();
\r
4688 CMyMemDC memDC(pDC, &rc);
\r
4690 memDC.SetTextColor(clrText);
\r
4691 memDC.SetBkColor(clrTextBk);
\r
4692 memDC.FillSolidRect(rc, clrTextBk);
\r
4694 CGdiObject * oldfont = memDC.SelectStockObject(DEFAULT_GUI_FONT);
\r
4695 memDC.DrawText(str, rc, DT_CENTER | DT_VCENTER |
\r
4696 DT_WORDBREAK | DT_NOPREFIX | DT_NOCLIP);
\r
4697 memDC.SelectObject(oldfont);
\r
4703 // prevent users from extending our hidden (size 0) columns
\r
4704 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR *pNMHDR, LRESULT *pResult)
\r
4706 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
4708 if ((phdr->iItem < 0)||(phdr->iItem >= SVNSLC_NUMCOLUMNS))
\r
4711 if (m_ColumnManager.IsVisible (phdr->iItem))
\r
4718 // prevent any function from extending our hidden (size 0) columns
\r
4719 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
\r
4721 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
4723 if ((phdr->iItem < 0)||(phdr->iItem >= m_ColumnManager.GetColumnCount()))
\r
4729 // visible columns may be modified
\r
4731 if (m_ColumnManager.IsVisible (phdr->iItem))
\r
4737 // columns already marked as "invisible" internally may be (re-)sized to 0
\r
4739 if ( (phdr->pitem != NULL)
\r
4740 && (phdr->pitem->mask == HDI_WIDTH)
\r
4741 && (phdr->pitem->cxy == 0))
\r
4747 if ( (phdr->pitem != NULL)
\r
4748 && (phdr->pitem->mask != HDI_WIDTH))
\r
4757 void CGitStatusListCtrl::OnDestroy()
\r
4759 SaveColumnWidths(true);
\r
4760 CListCtrl::OnDestroy();
\r
4763 void CGitStatusListCtrl::OnBeginDrag(NMHDR* /*pNMHDR*/, LRESULT* pResult)
\r
4766 Locker lock(m_critSec);
\r
4767 CDropFiles dropFiles; // class for creating DROPFILES struct
\r
4770 POSITION pos = GetFirstSelectedItemPosition();
\r
4771 while ( (index = GetNextSelectedItem(pos)) >= 0 )
\r
4773 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
\r
4774 CTGitPath path = fentry->GetPath();
\r
4775 dropFiles.AddFile( path.GetWinPathString() );
\r
4778 if ( dropFiles.GetCount()>0 )
\r
4780 m_bOwnDrag = true;
\r
4781 dropFiles.CreateStructure();
\r
4782 m_bOwnDrag = false;
\r
4788 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry /* = false */)
\r
4790 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
4791 for (int col = 0; col <= maxcol; col++)
\r
4792 if (m_ColumnManager.IsVisible (col))
\r
4793 m_ColumnManager.ColumnResized (col);
\r
4795 if (bSaveToRegistry)
\r
4796 m_ColumnManager.WriteSettings();
\r
4799 bool CGitStatusListCtrl::EnableFileDrop()
\r
4801 m_bFileDropsEnabled = true;
\r
4805 bool CGitStatusListCtrl::HasPath(const CTGitPath& path)
\r
4808 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
4810 FileEntry * entry = m_arStatusArray[i];
\r
4811 if (entry->GetPath().IsEquivalentTo(path))
\r
4818 bool CGitStatusListCtrl::IsPathShown(const CTGitPath& path)
\r
4821 int itemCount = GetItemCount();
\r
4822 for (int i=0; i < itemCount; i++)
\r
4824 FileEntry * entry = GetListEntry(i);
\r
4825 if (entry->GetPath().IsEquivalentTo(path))
\r
4832 BOOL CGitStatusListCtrl::PreTranslateMessage(MSG* pMsg)
\r
4834 if (pMsg->message == WM_KEYDOWN)
\r
4836 switch (pMsg->wParam)
\r
4840 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
\r
4842 // select all entries
\r
4843 for (int i=0; i<GetItemCount(); ++i)
\r
4845 SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
\r
4854 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
\r
4856 // copy all selected paths to the clipboard
\r
4857 if (GetAsyncKeyState(VK_SHIFT)&0x8000)
\r
4858 CopySelectedEntriesToClipboard(SVNSLC_COLSTATUS);
\r
4860 CopySelectedEntriesToClipboard(0);
\r
4868 return CListCtrl::PreTranslateMessage(pMsg);
\r
4871 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols)
\r
4874 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
4875 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
4876 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
4878 CString sClipboard;
\r
4881 if (GetSelectedCount() == 0)
\r
4883 // first add the column titles as the first line
\r
4884 temp.LoadString(IDS_STATUSLIST_COLFILE);
\r
4885 sClipboard = temp;
\r
4887 DWORD selection = 0;
\r
4888 for (int i = 0, count = m_ColumnManager.GetColumnCount(); i < count; ++i)
\r
4889 if ( ((dwCols == -1) && m_ColumnManager.IsVisible (i))
\r
4890 || ((dwCols != 1) && (i < 32) && ((dwCols & (1 << i)) != 0)))
\r
4892 sClipboard += _T("\t") + m_ColumnManager.GetName(i);
\r
4895 selection += 1 << i;
\r
4898 sClipboard += _T("\r\n");
\r
4900 POSITION pos = GetFirstSelectedItemPosition();
\r
4902 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
4904 FileEntry * entry = GetListEntry(index);
\r
4905 sClipboard += entry->GetDisplayName();
\r
4906 if (selection & SVNSLC_COLFILENAME)
\r
4908 sClipboard += _T("\t")+entry->path.GetFileOrDirectoryName();
\r
4910 if (selection & SVNSLC_COLEXT)
\r
4912 sClipboard += _T("\t")+entry->path.GetFileExtension();
\r
4914 if (selection & SVNSLC_COLSTATUS)
\r
4916 if (entry->isNested)
\r
4918 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
4922 GitStatus::GetStatusString(hResourceHandle, entry->status, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4923 if ((entry->copied)&&(_tcslen(buf)>1))
\r
4924 _tcscat_s(buf, 100, _T(" (+)"));
\r
4925 if ((entry->switched)&&(_tcslen(buf)>1))
\r
4926 _tcscat_s(buf, 100, _T(" (s)"));
\r
4927 if ((entry->status == entry->propstatus)&&
\r
4928 (entry->status != git_wc_status_normal)&&
\r
4929 (entry->status != git_wc_status_unversioned)&&
\r
4930 (!GitStatus::IsImportant(entry->textstatus)))
\r
4931 _tcscat_s(buf, 100, ponly);
\r
4934 sClipboard += _T("\t")+temp;
\r
4936 if (selection & SVNSLC_COLTEXTSTATUS)
\r
4938 if (entry->isNested)
\r
4940 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
4944 GitStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4945 if ((entry->copied)&&(_tcslen(buf)>1))
\r
4946 _tcscat_s(buf, 100, _T(" (+)"));
\r
4947 if ((entry->switched)&&(_tcslen(buf)>1))
\r
4948 _tcscat_s(buf, 100, _T(" (s)"));
\r
4951 sClipboard += _T("\t")+temp;
\r
4953 if (selection & SVNSLC_COLREMOTESTATUS)
\r
4955 if (entry->isNested)
\r
4957 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
4961 GitStatus::GetStatusString(hResourceHandle, entry->remotestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4962 if ((entry->copied)&&(_tcslen(buf)>1))
\r
4963 _tcscat_s(buf, 100, _T(" (+)"));
\r
4964 if ((entry->switched)&&(_tcslen(buf)>1))
\r
4965 _tcscat_s(buf, 100, _T(" (s)"));
\r
4966 if ((entry->remotestatus == entry->remotepropstatus)&&
\r
4967 (entry->remotestatus != git_wc_status_none)&&
\r
4968 (entry->remotestatus != git_wc_status_normal)&&
\r
4969 (entry->remotestatus != git_wc_status_unversioned)&&
\r
4970 (!SVNStatus::IsImportant(entry->remotetextstatus)))
\r
4971 _tcscat_s(buf, 100, ponly);
\r
4974 sClipboard += _T("\t")+temp;
\r
4976 if (selection & GitSLC_COLPROPSTATUS)
\r
4978 if (entry->isNested)
\r
4984 GitStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
4985 if ((entry->copied)&&(_tcslen(buf)>1))
\r
4986 _tcscat_s(buf, 100, _T(" (+)"));
\r
4987 if ((entry->switched)&&(_tcslen(buf)>1))
\r
4988 _tcscat_s(buf, 100, _T(" (s)"));
\r
4991 sClipboard += _T("\t")+temp;
\r
4993 if (selection & SVNSLC_COLREMOTETEXT)
\r
4995 if (entry->isNested)
\r
5001 GitStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
5004 sClipboard += _T("\t")+temp;
\r
5006 if (selection & SVNSLC_COLREMOTEPROP)
\r
5008 // SVNSLC_COLREMOTEPROP
\r
5009 if (entry->isNested)
\r
5015 GitStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
5018 sClipboard += _T("\t")+temp;
\r
5020 if (selection & SVNSLC_COLURL)
\r
5021 sClipboard += _T("\t")+entry->url;
\r
5022 if (selection & SVNSLC_COLLOCK)
\r
5024 if (!m_HeadRev.IsHead())
\r
5026 // we have contacted the repository
\r
5028 // decision-matrix
\r
5029 // wc repository text
\r
5032 // UID1 UID1 owner
\r
5033 // UID1 "" lock has been broken
\r
5034 // UID1 UID2 lock has been stolen
\r
5035 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))
\r
5037 if (entry->lock_owner.IsEmpty())
\r
5038 temp = entry->lock_remoteowner;
\r
5040 temp = entry->lock_owner;
\r
5042 else if (entry->lock_remotetoken.IsEmpty())
\r
5045 temp.LoadString(IDS_STATUSLIST_LOCKBROKEN);
\r
5050 temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);
\r
5054 temp = entry->lock_owner;
\r
5055 sClipboard += _T("\t")+temp;
\r
5057 if (selection & SVNSLC_COLLOCKCOMMENT)
\r
5058 sClipboard += _T("\t")+entry->lock_comment;
\r
5059 if (selection & SVNSLC_COLAUTHOR)
\r
5060 sClipboard += _T("\t")+entry->last_commit_author;
\r
5061 if (selection & SVNSLC_COLREVISION)
\r
5063 temp.Format(_T("%ld"), entry->last_commit_rev);
\r
5064 if (entry->last_commit_rev == 0)
\r
5066 sClipboard += _T("\t")+temp;
\r
5068 if (selection & SVNSLC_COLREMOTEREVISION)
\r
5070 temp.Format(_T("%ld"), entry->remoterev);
\r
5071 if (entry->remoterev == 0)
\r
5073 sClipboard += _T("\t")+temp;
\r
5075 if (selection & SVNSLC_COLDATE)
\r
5077 TCHAR datebuf[SVN_DATE_BUFFER];
\r
5078 apr_time_t date = entry->last_commit_date;
\r
5079 SVN::formatDate(datebuf, date, true);
\r
5084 sClipboard += _T("\t")+temp;
\r
5086 if (selection & SVNSLC_COLCOPYFROM)
\r
5088 if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)
\r
5089 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());
\r
5091 temp = entry->copyfrom_url;
\r
5092 sClipboard += _T("\t")+temp;
\r
5095 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
\r
5099 if ((dwCols == -1) && m_ColumnManager.IsVisible (i))
\r
5102 = entry->present_props[m_ColumnManager.GetName(i)];
\r
5103 sClipboard += _T("\t") + value;
\r
5107 sClipboard += _T("\r\n");
\r
5110 return CStringUtils::WriteAsciiStringToClipboard(sClipboard);
\r
5116 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()
\r
5119 std::set<CString> changelists;
\r
5120 POSITION pos = GetFirstSelectedItemPosition();
\r
5122 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
5124 FileEntry * entry = GetListEntry(index);
\r
5125 if (!entry->changelist.IsEmpty())
\r
5126 changelists.insert(entry->changelist);
\r
5128 return changelists.size();
\r
5133 bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
\r
5136 bool bHasGroups=false;
\r
5137 if ( this->m_UnRevFileList.GetCount()>0 ||
\r
5138 this->m_IgnoreFileList.GetCount()>0 || bForce)
\r
5140 bHasGroups = true;
\r
5143 RemoveAllGroups();
\r
5144 EnableGroupView(bHasGroups);
\r
5146 TCHAR groupname[1024];
\r
5147 int groupindex = 0;
\r
5151 LVGROUP grp = {0};
\r
5152 grp.cbSize = sizeof(LVGROUP);
\r
5153 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5154 CString sUnassignedName(_T("Modified File"));
\r
5155 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
\r
5156 grp.pszHeader = groupname;
\r
5157 grp.iGroupId = groupindex;
\r
5158 grp.uAlign = LVGA_HEADER_LEFT;
\r
5159 InsertGroup(groupindex++, &grp);
\r
5161 //if(m_UnRevFileList.GetCount()>0)
\r
5163 _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("No Version Control"), 1023);
\r
5164 grp.pszHeader = groupname;
\r
5165 grp.iGroupId = groupindex;
\r
5166 grp.uAlign = LVGA_HEADER_LEFT;
\r
5167 InsertGroup(groupindex++, &grp);
\r
5170 //if(m_IgnoreFileList.GetCount()>0)
\r
5172 _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("Ignored File"), 1023);
\r
5173 grp.pszHeader = groupname;
\r
5174 grp.iGroupId = groupindex;
\r
5175 grp.uAlign = LVGA_HEADER_LEFT;
\r
5176 InsertGroup(groupindex++, &grp);
\r
5182 m_bHasIgnoreGroup = false;
\r
5184 // now add the items which don't belong to a group
\r
5185 LVGROUP grp = {0};
\r
5186 grp.cbSize = sizeof(LVGROUP);
\r
5187 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5188 CString sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET));
\r
5189 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
\r
5190 grp.pszHeader = groupname;
\r
5191 grp.iGroupId = groupindex;
\r
5192 grp.uAlign = LVGA_HEADER_LEFT;
\r
5193 InsertGroup(groupindex++, &grp);
\r
5195 for (std::map<CString,int>::iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
5197 if (it->first.Compare(SVNSLC_IGNORECHANGELIST)!=0)
\r
5199 LVGROUP grp = {0};
\r
5200 grp.cbSize = sizeof(LVGROUP);
\r
5201 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5202 _tcsncpy_s(groupname, 1024, it->first, 1023);
\r
5203 grp.pszHeader = groupname;
\r
5204 grp.iGroupId = groupindex;
\r
5205 grp.uAlign = LVGA_HEADER_LEFT;
\r
5206 it->second = InsertGroup(groupindex++, &grp);
\r
5209 m_bHasIgnoreGroup = true;
\r
5212 if (m_bHasIgnoreGroup)
\r
5214 // and now add the group 'ignore-on-commit'
\r
5215 std::map<CString,int>::iterator it = m_changelists.find(SVNSLC_IGNORECHANGELIST);
\r
5216 if (it != m_changelists.end())
\r
5218 grp.cbSize = sizeof(LVGROUP);
\r
5219 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5220 _tcsncpy_s(groupname, 1024, SVNSLC_IGNORECHANGELIST, 1023);
\r
5221 grp.pszHeader = groupname;
\r
5222 grp.iGroupId = groupindex;
\r
5223 grp.uAlign = LVGA_HEADER_LEFT;
\r
5224 it->second = InsertGroup(groupindex, &grp);
\r
5228 return bHasGroups;
\r
5231 void CGitStatusListCtrl::NotifyCheck()
\r
5233 CWnd* pParent = GetParent();
\r
5234 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
5236 pParent->SendMessage(SVNSLNM_CHECKCHANGED, m_nSelected);
\r
5240 int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash,CTGitPathList *list)
\r
5243 this->m_bBusy=TRUE;
\r
5244 m_CurrentVersion=hash;
\r
5246 if(hash == GIT_REV_ZERO)
\r
5252 count = list->GetCount();
\r
5254 for(int i=0;i<count;i++)
\r
5259 cmd=(_T("git.exe diff-index --raw HEAD --numstat -C -M"));
\r
5261 cmd.Format(_T("git.exe diff-index --raw HEAD --numstat -C -M -- \"%s\""),(*list)[i].GetGitPathString());
\r
5263 if(g_Git.Run(cmd,&cmdout))
\r
5266 if(g_Git.Run(_T("git.exe rev-parse --revs-only HEAD"),&cmdout))
\r
5268 CMessageBox::Show(NULL,cmdout,_T("TortoiseGit"),MB_OK);
\r
5271 if(cmdout.IsEmpty())
\r
5272 break; //this is initial repositoyr, there are no any history
\r
5274 CMessageBox::Show(NULL,cmdout,_T("TortoiseGit"),MB_OK);
\r
5283 this->m_StatusFileList.ParserFromLog(out);
\r
5290 count = list->GetCount();
\r
5292 for(int i=0;i<count;i++)
\r
5297 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M %s"),hash);
\r
5299 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M %s -- \"%s\""),hash,(*list)[i].GetGitPathString());
\r
5301 g_Git.Run(cmd,&cmdout);
\r
5305 this->m_StatusFileList.ParserFromLog(out);
\r
5308 for(int i=0;i<m_StatusFileList.GetCount();i++)
\r
5310 CTGitPath * gitpatch=(CTGitPath*)&m_StatusFileList[i];
\r
5311 gitpatch->m_Checked = TRUE;
\r
5312 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
\r
5314 this->m_bBusy=FALSE;
\r
5318 int CGitStatusListCtrl::UpdateWithGitPathList(CTGitPathList &list)
\r
5320 m_arStatusArray.clear();
\r
5321 for(int i=0;i<list.GetCount();i++)
\r
5323 CTGitPath * gitpatch=(CTGitPath*)&list[i];
\r
5324 gitpatch->m_Checked = TRUE;
\r
5325 m_arStatusArray.push_back((CTGitPath*)&list[i]);
\r
5330 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList *List)
\r
5332 this->m_UnRevFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER,List);
\r
5333 for(int i=0;i<m_UnRevFileList.GetCount();i++)
\r
5335 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
\r
5336 gitpatch->m_Checked = FALSE;
\r
5337 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
\r
5342 int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList *List)
\r
5344 this->m_IgnoreFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER|CTGitPath::LOGACTIONS_IGNORE,List);
\r
5345 for(int i=0;i<m_IgnoreFileList.GetCount();i++)
\r
5347 CTGitPath * gitpatch=(CTGitPath*)&m_IgnoreFileList[i];
\r
5348 gitpatch->m_Checked = FALSE;
\r
5349 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
\r
5353 int CGitStatusListCtrl::UpdateFileList(int mask,bool once,CTGitPathList *List)
\r
5355 if(mask&CGitStatusListCtrl::FILELIST_MODIFY)
\r
5357 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_MODIFY)))
\r
5359 UpdateFileList(git_revnum_t(GIT_REV_ZERO),List);
\r
5360 m_FileLoaded|=CGitStatusListCtrl::FILELIST_MODIFY;
\r
5363 if(mask&CGitStatusListCtrl::FILELIST_UNVER)
\r
5365 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_UNVER)))
\r
5367 UpdateUnRevFileList(List);
\r
5368 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
\r
5373 //////////////////////////////////////////////////////////////////////////
\r
5375 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium, DWORD * /*pdwEffect*/, POINTL pt)
\r
5377 if(pFmtEtc->cfFormat == CF_HDROP && medium.tymed == TYMED_HGLOBAL)
\r
5379 HDROP hDrop = (HDROP)GlobalLock(medium.hGlobal);
\r
5382 TCHAR szFileName[MAX_PATH];
\r
5384 UINT cFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
\r
5386 POINT clientpoint;
\r
5387 clientpoint.x = pt.x;
\r
5388 clientpoint.y = pt.y;
\r
5389 ScreenToClient(m_hTargetWnd, &clientpoint);
\r
5390 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
\r
5392 CTSVNPathList changelistItems;
\r
5393 for(UINT i = 0; i < cFiles; ++i)
\r
5395 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
\r
5396 changelistItems.AddPath(CTSVNPath(szFileName));
\r
5398 // find the changelist name
\r
5399 CString sChangelist;
\r
5400 LONG_PTR nGroup = m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint);
\r
5401 for (std::map<CString, int>::iterator it = m_pSVNStatusListCtrl->m_changelists.begin(); it != m_pSVNStatusListCtrl->m_changelists.end(); ++it)
\r
5402 if (it->second == nGroup)
\r
5403 sChangelist = it->first;
\r
5404 if (!sChangelist.IsEmpty())
\r
5407 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
\r
5409 for (int l=0; l<changelistItems.GetCount(); ++l)
\r
5411 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
\r
5414 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
\r
5417 e->changelist = sChangelist;
\r
5418 if (!e->IsFolder())
\r
5420 if (m_pSVNStatusListCtrl->m_changelists.find(e->changelist)!=m_pSVNStatusListCtrl->m_changelists.end())
\r
5421 m_pSVNStatusListCtrl->SetItemGroup(index, m_pSVNStatusListCtrl->m_changelists[e->changelist]);
\r
5423 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
\r
5429 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5430 if (hParentWnd != NULL)
\r
5431 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
\r
5437 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
5443 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
\r
5445 for (int l=0; l<changelistItems.GetCount(); ++l)
\r
5447 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
\r
5450 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
\r
5453 e->changelist = sChangelist;
\r
5454 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
\r
5459 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5460 if (hParentWnd != NULL)
\r
5461 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
\r
5467 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
5473 for(UINT i = 0; i < cFiles; ++i)
\r
5475 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
\r
5476 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5477 if (hParentWnd != NULL)
\r
5478 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)szFileName);
\r
5482 GlobalUnlock(medium.hGlobal);
\r
5484 return true; //let base free the medium
\r
5486 HRESULT STDMETHODCALLTYPE CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect)
\r
5488 CIDropTarget::DragOver(grfKeyState, pt, pdwEffect);
\r
5489 *pdwEffect = DROPEFFECT_COPY;
\r
5490 if (m_pSVNStatusListCtrl)
\r
5492 POINT clientpoint;
\r
5493 clientpoint.x = pt.x;
\r
5494 clientpoint.y = pt.y;
\r
5495 ScreenToClient(m_hTargetWnd, &clientpoint);
\r
5496 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
\r
5498 *pdwEffect = DROPEFFECT_MOVE;
\r
5500 else if ((!m_pSVNStatusListCtrl->m_bFileDropsEnabled)||(m_pSVNStatusListCtrl->m_bOwnDrag))
\r
5502 *pdwEffect = DROPEFFECT_NONE;
\r