3 // TortoiseSVN - a Windows shell extension for easy version control
\r
5 // Copyright (C) 2003-2008 - TortoiseSVN
\r
7 // This program is free software; you can redistribute it and/or
\r
8 // modify it under the terms of the GNU General Public License
\r
9 // as published by the Free Software Foundation; either version 2
\r
10 // of the License, or (at your option) any later version.
\r
12 // This program is distributed in the hope that it will be useful,
\r
13 // but WITHOUT ANY WARRANTY; without even the implied warranty of
\r
14 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
\r
15 // GNU General Public License for more details.
\r
17 // You should have received a copy of the GNU General Public License
\r
18 // along with this program; if not, write to the Free Software Foundation,
\r
19 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
\r
23 #include "GitStatusListCtrl.h"
\r
24 #include "resource.h"
\r
25 #include "..\\TortoiseShell\resource.h"
\r
26 #include "MessageBox.h"
\r
27 #include "MyMemDC.h"
\r
28 #include "UnicodeUtils.h"
\r
29 #include "AppUtils.h"
\r
30 #include "PathUtils.h"
\r
31 #include "TempFile.h"
\r
32 #include "StringUtils.h"
\r
33 #include "DirFileEnum.h"
\r
34 #include "GitConfig.h"
\r
35 //#include "SVNProperties.h"
\r
37 #include "GitDiff.h"
\r
38 //#include "LogDlg.h"
\r
39 //#include "SVNProgressDlg.h"
\r
40 #include "SysImageList.h"
\r
41 //#include "Svnstatuslistctrl.h"
\r
42 #include "TGitPath.h"
\r
43 #include "Registry.h"
\r
44 #include "GitStatus.h"
\r
45 //#include "SVNHelpers.h"
\r
46 #include "InputDlg.h"
\r
47 #include "ShellUpdater.h"
\r
48 #include "GitAdminDir.h"
\r
49 //#include "DropFiles.h"
\r
50 #include "IconMenu.h"
\r
51 //#include "AddDlg.h"
\r
52 //#include "EditPropertiesDlg.h"
\r
53 //#include "CreateChangelistDlg.h"
\r
54 #include "XPTheme.h"
\r
56 const UINT CGitStatusListCtrl::SVNSLNM_ITEMCOUNTCHANGED
\r
57 = ::RegisterWindowMessage(_T("GITSLNM_ITEMCOUNTCHANGED"));
\r
58 const UINT CGitStatusListCtrl::SVNSLNM_NEEDSREFRESH
\r
59 = ::RegisterWindowMessage(_T("GITSLNM_NEEDSREFRESH"));
\r
60 const UINT CGitStatusListCtrl::SVNSLNM_ADDFILE
\r
61 = ::RegisterWindowMessage(_T("GITSLNM_ADDFILE"));
\r
62 const UINT CGitStatusListCtrl::SVNSLNM_CHECKCHANGED
\r
63 = ::RegisterWindowMessage(_T("GITSLNM_CHECKCHANGED"));
\r
65 #define IDSVNLC_REVERT 1
\r
66 #define IDSVNLC_COMPARE 2
\r
67 #define IDSVNLC_OPEN 3
\r
68 #define IDSVNLC_DELETE 4
\r
69 #define IDSVNLC_IGNORE 5
\r
70 #define IDSVNLC_GNUDIFF1 6
\r
71 #define IDSVNLC_UPDATE 7
\r
72 #define IDSVNLC_LOG 8
\r
73 #define IDSVNLC_EDITCONFLICT 9
\r
74 #define IDSVNLC_IGNOREMASK 10
\r
75 #define IDSVNLC_ADD 11
\r
76 #define IDSVNLC_RESOLVECONFLICT 12
\r
77 #define IDSVNLC_LOCK 13
\r
78 #define IDSVNLC_LOCKFORCE 14
\r
79 #define IDSVNLC_UNLOCK 15
\r
80 #define IDSVNLC_UNLOCKFORCE 16
\r
81 #define IDSVNLC_OPENWITH 17
\r
82 #define IDSVNLC_EXPLORE 18
\r
83 #define IDSVNLC_RESOLVETHEIRS 19
\r
84 #define IDSVNLC_RESOLVEMINE 20
\r
85 #define IDSVNLC_REMOVE 21
\r
86 #define IDSVNLC_COMMIT 22
\r
87 #define IDSVNLC_PROPERTIES 23
\r
88 #define IDSVNLC_COPY 24
\r
89 #define IDSVNLC_COPYEXT 25
\r
90 #define IDSVNLC_REPAIRMOVE 26
\r
91 #define IDSVNLC_REMOVEFROMCS 27
\r
92 #define IDSVNLC_CREATECS 28
\r
93 #define IDSVNLC_CREATEIGNORECS 29
\r
94 #define IDSVNLC_CHECKGROUP 30
\r
95 #define IDSVNLC_UNCHECKGROUP 31
\r
96 #define IDSVNLC_ADD_RECURSIVE 32
\r
97 #define IDSVNLC_COMPAREWC 33
\r
98 #define IDSVNLC_BLAME 34
\r
99 // the IDSVNLC_MOVETOCS *must* be the last index, because it contains a dynamic submenu where
\r
100 // the submenu items get command ID's sequent to this number
\r
101 #define IDSVNLC_MOVETOCS 35
\r
104 BEGIN_MESSAGE_MAP(CGitStatusListCtrl, CListCtrl)
\r
105 ON_NOTIFY(HDN_ITEMCLICKA, 0, OnHdnItemclick)
\r
106 ON_NOTIFY(HDN_ITEMCLICKW, 0, OnHdnItemclick)
\r
107 ON_NOTIFY(HDN_ENDTRACK, 0, OnColumnResized)
\r
108 ON_NOTIFY(HDN_ENDDRAG, 0, OnColumnMoved)
\r
109 ON_NOTIFY_REFLECT_EX(LVN_ITEMCHANGED, OnLvnItemchanged)
\r
110 ON_WM_CONTEXTMENU()
\r
111 ON_NOTIFY_REFLECT(NM_DBLCLK, OnNMDblclk)
\r
112 ON_NOTIFY_REFLECT(LVN_GETINFOTIP, OnLvnGetInfoTip)
\r
113 ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, OnNMCustomdraw)
\r
116 ON_NOTIFY_REFLECT(NM_RETURN, OnNMReturn)
\r
118 ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTW, 0, 0xFFFF, OnToolTipText)
\r
119 ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTA, 0, 0xFFFF, OnToolTipText)
\r
121 ON_NOTIFY(HDN_BEGINTRACKA, 0, &CGitStatusListCtrl::OnHdnBegintrack)
\r
122 ON_NOTIFY(HDN_BEGINTRACKW, 0, &CGitStatusListCtrl::OnHdnBegintrack)
\r
123 ON_NOTIFY(HDN_ITEMCHANGINGA, 0, &CGitStatusListCtrl::OnHdnItemchanging)
\r
124 ON_NOTIFY(HDN_ITEMCHANGINGW, 0, &CGitStatusListCtrl::OnHdnItemchanging)
\r
126 ON_NOTIFY_REFLECT(LVN_BEGINDRAG, OnBeginDrag)
\r
127 ON_NOTIFY_REFLECT(LVN_ITEMCHANGING, &CGitStatusListCtrl::OnLvnItemchanging)
\r
132 CGitStatusListCtrl::CGitStatusListCtrl() : CListCtrl()
\r
133 //, m_HeadRev(GitRev::REV_HEAD)
\r
134 , m_pbCanceled(NULL)
\r
135 , m_pStatLabel(NULL)
\r
136 , m_pSelectButton(NULL)
\r
137 , m_pConfirmButton(NULL)
\r
140 , m_bUnversionedRecurse(true)
\r
141 , m_bShowIgnores(false)
\r
142 , m_pDropTarget(NULL)
\r
143 , m_bIgnoreRemoveOnly(false)
\r
144 , m_bCheckChildrenWithParent(false)
\r
145 , m_bUnversionedLast(true)
\r
146 , m_bHasChangeLists(false)
\r
147 , m_bHasLocks(false)
\r
149 , m_bBlockUI(false)
\r
150 , m_bHasCheckboxes(false)
\r
151 , m_bCheckIfGroupsExist(true)
\r
152 , m_bFileDropsEnabled(false)
\r
153 , m_bOwnDrag(false)
\r
154 , m_dwDefaultColumns(0)
\r
155 , m_ColumnManager(this)
\r
156 , m_bAscending(false)
\r
157 , m_nSortedColumn(-1)
\r
158 , m_sNoPropValueText(MAKEINTRESOURCE(IDS_STATUSLIST_NOPROPVALUE))
\r
164 CGitStatusListCtrl::~CGitStatusListCtrl()
\r
167 delete m_pDropTarget;
\r
168 ClearStatusArray();
\r
171 void CGitStatusListCtrl::ClearStatusArray()
\r
174 Locker lock(m_critSec);
\r
175 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
177 delete m_arStatusArray[i];
\r
179 m_arStatusArray.clear();
\r
183 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetListEntry(UINT_PTR index)
\r
186 if (index >= (UINT_PTR)m_arListArray.size())
\r
188 if (m_arListArray[index] >= m_arStatusArray.size())
\r
190 return m_arStatusArray[m_arListArray[index]];
\r
195 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetVisibleListEntry(const CTGitPath& path)
\r
197 int itemCount = GetItemCount();
\r
198 for (int i=0; i < itemCount; i++)
\r
200 FileEntry * entry = GetListEntry(i);
\r
201 if (entry->GetPath().IsEquivalentTo(path))
\r
207 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetListEntry(const CTGitPath& path)
\r
210 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
212 FileEntry * entry = m_arStatusArray[i];
\r
213 if (entry->GetPath().IsEquivalentTo(path))
\r
220 int CGitStatusListCtrl::GetIndex(const CTGitPath& path)
\r
222 int itemCount = GetItemCount();
\r
223 for (int i=0; i < itemCount; i++)
\r
225 FileEntry * entry = GetListEntry(i);
\r
226 if (entry->GetPath().IsEquivalentTo(path))
\r
232 void CGitStatusListCtrl::Init(DWORD dwColumns, const CString& sColumnInfoContainer, DWORD dwContextMenus /* = GitSLC_POPALL */, bool bHasCheckboxes /* = true */)
\r
234 Locker lock(m_critSec);
\r
236 m_dwDefaultColumns = dwColumns | 1;
\r
237 m_dwContextMenus = dwContextMenus;
\r
238 m_bHasCheckboxes = bHasCheckboxes;
\r
240 // set the extended style of the listcontrol
\r
241 // 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
242 CRegDWORD regFullRowSelect(_T("Software\\TortoiseGit\\FullRowSelect"), TRUE);
\r
243 DWORD exStyle = LVS_EX_HEADERDRAGDROP | LVS_EX_DOUBLEBUFFER | LVS_EX_INFOTIP | LVS_EX_SUBITEMIMAGES;
\r
244 if (DWORD(regFullRowSelect))
\r
245 exStyle |= LVS_EX_FULLROWSELECT;
\r
246 exStyle |= (bHasCheckboxes ? LVS_EX_CHECKBOXES : 0);
\r
248 SetExtendedStyle(exStyle);
\r
251 theme.SetWindowTheme(m_hWnd, L"Explorer", NULL);
\r
253 m_nIconFolder = SYS_IMAGE_LIST().GetDirIconIndex();
\r
254 SetImageList(&SYS_IMAGE_LIST(), LVSIL_SMALL);
\r
256 m_ColumnManager.ReadSettings (m_dwDefaultColumns, sColumnInfoContainer);
\r
258 // enable file drops
\r
260 if (m_pDropTarget == NULL)
\r
262 m_pDropTarget = new CGitStatusListCtrlDropTarget(this);
\r
263 RegisterDragDrop(m_hWnd,m_pDropTarget);
\r
264 // create the supported formats:
\r
265 FORMATETC ftetc={0};
\r
266 ftetc.dwAspect = DVASPECT_CONTENT;
\r
268 ftetc.tymed = TYMED_HGLOBAL;
\r
269 ftetc.cfFormat=CF_HDROP;
\r
270 m_pDropTarget->AddSuportedFormat(ftetc);
\r
276 m_bUnversionedRecurse = !!((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\UnversionedRecurse"), TRUE));
\r
279 bool CGitStatusListCtrl::SetBackgroundImage(UINT nID)
\r
281 return CAppUtils::SetListCtrlBackgroundImage(GetSafeHwnd(), nID);
\r
284 BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList& pathList
\r
285 , bool bUpdate /* = FALSE */
\r
286 , bool bShowIgnores /* = false */
\r
288 , bool bShowUserProps /* = false */)
\r
290 Locker lock(m_critSec);
\r
291 int mask= CGitStatusListCtrl::FILELIST_MODIFY;
\r
293 mask|= CGitStatusListCtrl::FILELIST_IGNORE;
\r
295 mask|= CGitStatusListCtrl::FILELIST_UNVER;
\r
296 this->UpdateFileList(mask,bUpdate,(CTGitPathList*)&pathList);
\r
300 int refetchcounter = 0;
\r
303 // force the cursor to change
\r
306 SetCursorPos(pt.x, pt.y);
\r
308 m_mapFilenameToChecked.clear();
\r
309 //m_StatusUrlList.Clear();
\r
310 bool bHasChangelists = (m_changelists.size()>1 || (m_changelists.size()>0 && !m_bHasIgnoreGroup));
\r
311 m_changelists.clear();
\r
312 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
314 FileEntry * entry = m_arStatusArray[i];
\r
315 if ( bHasChangelists && entry->checked)
\r
317 // If change lists are present, remember all checked entries
\r
318 CString path = entry->GetPath().GetGitPathString();
\r
319 m_mapFilenameToChecked[path] = true;
\r
321 if ( (entry->status==git_wc_status_unversioned || entry->status==git_wc_status_missing ) && entry->checked )
\r
323 // The user manually selected an unversioned or missing file. We remember
\r
324 // this so that the selection can be restored when refreshing.
\r
325 CString path = entry->GetPath().GetGitPathString();
\r
326 m_mapFilenameToChecked[path] = true;
\r
328 else if ( entry->status > git_wc_status_normal && !entry->checked )
\r
330 // The user manually deselected a versioned file. We remember
\r
331 // this so that the deselection can be restored when refreshing.
\r
332 CString path = entry->GetPath().GetGitPathString();
\r
333 m_mapFilenameToChecked[path] = false;
\r
337 // use a sorted path list to make sure we fetch the status of
\r
338 // parent items first, *then* the child items (if any)
\r
339 CTGitPathList sortedPathList = pathList;
\r
340 sortedPathList.SortByPathname();
\r
344 m_nTargetCount = 0;
\r
345 m_bHasExternalsFromDifferentRepos = FALSE;
\r
346 m_bHasExternals = FALSE;
\r
347 m_bHasUnversionedItems = FALSE;
\r
348 m_bHasLocks = false;
\r
349 m_bHasChangeLists = false;
\r
350 m_bShowIgnores = bShowIgnores;
\r
351 m_nSortedColumn = 0;
\r
357 // first clear possible status data left from
\r
358 // previous GetStatus() calls
\r
359 ClearStatusArray();
\r
361 m_StatusFileList = sortedPathList;
\r
363 // Since Git_client_status() returns all files, even those in
\r
364 // folders included with Git:externals we need to check if all
\r
365 // files we get here belongs to the same repository.
\r
366 // It is possible to commit changes in an external folder, as long
\r
367 // as the folder belongs to the same repository (but another path),
\r
368 // but it is not possible to commit all files if the externals are
\r
369 // from a different repository.
\r
371 // To check if all files belong to the same repository, we compare the
\r
372 // UUID's - if they're identical then the files belong to the same
\r
373 // repository and can be committed. But if they're different, then
\r
374 // tell the user to commit all changes in the external folders
\r
376 CStringA sUUID; // holds the repo UUID
\r
377 CTGitPathList arExtPaths; // list of Git:external paths
\r
383 m_nTargetCount = sortedPathList.GetCount();
\r
385 GitStatus status(m_pbCanceled);
\r
386 if(m_nTargetCount > 1 && sortedPathList.AreAllPathsFilesInOneDirectory())
\r
388 // This is a special case, where we've been given a list of files
\r
389 // all from one folder
\r
390 // We handle them by setting a status filter, then requesting the Git status of
\r
391 // all the files in the directory, filtering for the ones we're interested in
\r
392 status.SetFilter(sortedPathList);
\r
394 // if all selected entries are files, we don't do a recursive status
\r
395 // fetching. But if only one is a directory, we have to recurse.
\r
396 git_depth_t depth = git_depth_files;
\r
397 // We have set a filter. If all selected items were files or we fetch
\r
398 // the status not recursively, then we have to include
\r
399 // ignored items too - the user has selected them
\r
400 bool bShowIgnoresRight = true;
\r
401 for (int fcindex=0; fcindex<sortedPathList.GetCount(); ++fcindex)
\r
403 if (sortedPathList[fcindex].IsDirectory())
\r
405 depth = git_depth_infinity;
\r
406 bShowIgnoresRight = false;
\r
410 if(!FetchStatusForSingleTarget(config, status, sortedPathList.GetCommonDirectory(), bUpdate, sUUID, arExtPaths, true, depth, bShowIgnoresRight))
\r
417 for(int nTarget = 0; nTarget < m_nTargetCount; nTarget++)
\r
419 // check whether the path we want the status for is already fetched due to status-fetching
\r
420 // of a parent path.
\r
421 // this check is only done for file paths, because folder paths could be included already
\r
422 // but not recursively
\r
423 if (sortedPathList[nTarget].IsDirectory() || GetListEntry(sortedPathList[nTarget]) == NULL)
\r
425 if(!FetchStatusForSingleTarget(config, status, sortedPathList[nTarget], bUpdate, sUUID,
\r
426 arExtPaths, false, git_depth_infinity, bShowIgnores))
\r
434 // remove the 'helper' files of conflicted items from the list.
\r
435 // otherwise they would appear as unversioned files.
\r
436 for (INT_PTR cind = 0; cind < m_ConflictFileList.GetCount(); ++cind)
\r
438 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
440 if (m_arStatusArray[i]->GetPath().IsEquivalentTo(m_ConflictFileList[cind]))
\r
442 delete m_arStatusArray[i];
\r
443 m_arStatusArray.erase(m_arStatusArray.begin()+i);
\r
449 } while(!BuildStatistics() && (refetchcounter < 2) && (*m_pbCanceled==false));
\r
451 if (bShowUserProps)
\r
452 FetchUserProperties();
\r
454 m_ColumnManager.UpdateUserPropList (m_arStatusArray);
\r
459 SetCursorPos(pt.x, pt.y);
\r
466 // Fetch all local properties for all elements in the status array
\r
468 void CGitStatusListCtrl::FetchUserProperties()
\r
471 GitPool globalPool;
\r
473 for (size_t i = 0, count = m_arStatusArray.size(); i < count; ++i)
\r
475 // local / temp pool to hold parameters and props for a single item
\r
477 GitPool localPool ((apr_pool_t*)globalPool);
\r
479 // open working copy for this path
\r
481 const char* path = m_arStatusArray[i]->path.GetGitApiPath (localPool);
\r
483 Git_wc_adm_access_t *adm_access = NULL;
\r
484 Git_error_t * error = Git_wc_adm_probe_open3 ( &adm_access
\r
487 , FALSE // no write lock
\r
488 , 0 // lock just the directory/file itself
\r
494 // get the props and add them to the status info
\r
496 apr_hash_t* props = NULL;
\r
497 Git_error_t * error = Git_wc_prop_list ( &props
\r
503 for ( apr_hash_index_t *index
\r
504 = apr_hash_first (localPool, props)
\r
506 ; index = apr_hash_next (index))
\r
508 // extract next entry from hash
\r
510 const char* key = NULL;
\r
512 const char** val = NULL;
\r
514 apr_hash_this ( index
\r
515 , reinterpret_cast<const void**>(&key)
\r
517 , reinterpret_cast<void**>(&val));
\r
519 // decode / dispatch it
\r
521 CString name = CUnicodeUtils::GetUnicode (key);
\r
522 CString value = CUnicodeUtils::GetUnicode (*val);
\r
524 // store in property container (truncate it after ~100 chars)
\r
526 m_arStatusArray[i]->present_props[name]
\r
527 = value.Left (GitSLC_MAXUSERPROPLENGTH);
\r
530 error = Git_wc_adm_close2 (adm_access, localPool);
\r
532 Git_error_clear (error);
\r
539 // Work on a single item from the list of paths which is provided to us
\r
541 bool CGitStatusListCtrl::FetchStatusForSingleTarget(
\r
544 const CTGitPath& target,
\r
545 bool bFetchStatusFromRepository,
\r
546 CStringA& strCurrentRepositoryUUID,
\r
547 CTGitPathList& arExtPaths,
\r
554 config.GetDefaultIgnores();
\r
556 CTGitPath workingTarget(target);
\r
558 git_wc_status2_t * s;
\r
560 s = status.GetFirstFileStatus(workingTarget, GitPath, bFetchStatusFromRepository, depth, bShowIgnores);
\r
562 m_HeadRev = SVNRev(status.headrev);
\r
565 Git_wc_status_kind wcFileStatus = GitStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
567 // This one fixes a problem with externals:
\r
568 // If a strLine is a file, Git:externals and its parent directory
\r
569 // will also be returned by GetXXXFileStatus. Hence, we skip all
\r
570 // status info until we find the one matching workingTarget.
\r
571 if (!workingTarget.IsDirectory())
\r
573 if (!workingTarget.IsEquivalentTo(GitPath))
\r
577 s = status.GetNextFileStatus(GitPath);
\r
578 if(workingTarget.IsEquivalentTo(GitPath))
\r
585 m_sLastError = status.GetLastErrorMsg();
\r
588 // Now, set working target to be the base folder of this item
\r
589 workingTarget = workingTarget.GetDirectory();
\r
592 bool bEntryFromDifferentRepo = false;
\r
593 // Is this a versioned item with an associated repos UUID?
\r
594 if ((s->entry)&&(s->entry->uuid))
\r
596 // Have we seen a repos UUID yet?
\r
597 if (strCurrentRepositoryUUID.IsEmpty())
\r
599 // This is the first repos UUID we've seen - record it
\r
600 strCurrentRepositoryUUID = s->entry->uuid;
\r
601 m_sUUID = strCurrentRepositoryUUID;
\r
605 if (strCurrentRepositoryUUID.Compare(s->entry->uuid)!=0)
\r
607 // This item comes from a different repository than our main one
\r
608 m_bHasExternalsFromDifferentRepos = TRUE;
\r
609 bEntryFromDifferentRepo = true;
\r
610 if (s->entry->kind == Git_node_dir)
\r
611 arExtPaths.AddPath(workingTarget);
\r
615 else if (strCurrentRepositoryUUID.IsEmpty() && (s->text_status == Git_wc_status_added))
\r
617 // An added entry doesn't have an UUID assigned to it yet.
\r
618 // So we fetch the status of the parent directory instead and
\r
619 // check if that one has an UUID assigned to it.
\r
620 Git_wc_status2_t * sparent;
\r
621 CTGitPath path = workingTarget;
\r
624 CTGitPath GitParentPath;
\r
625 GitStatus tempstatus;
\r
626 sparent = tempstatus.GetFirstFileStatus(path.GetContainingDirectory(), GitParentPath, false, Git_depth_empty, false);
\r
627 path = GitParentPath;
\r
628 } while ( (sparent) && (sparent->entry) && (!sparent->entry->uuid) && (sparent->text_status==Git_wc_status_added) );
\r
629 if (sparent && sparent->entry && sparent->entry->uuid)
\r
631 strCurrentRepositoryUUID = sparent->entry->uuid;
\r
632 m_sUUID = strCurrentRepositoryUUID;
\r
636 if ((wcFileStatus == Git_wc_status_unversioned)&& GitPath.IsDirectory())
\r
638 // check if the unversioned folder is maybe versioned. This
\r
639 // could happen with nested layouts
\r
640 Git_wc_status_kind st = GitStatus::GetAllStatus(workingTarget);
\r
641 if ((st != Git_wc_status_unversioned)&&(st != Git_wc_status_none))
\r
643 return true; // ignore nested layouts
\r
646 if (status.IsExternal(GitPath))
\r
648 m_bHasExternals = TRUE;
\r
651 AddNewFileEntry(s, GitPath, workingTarget, true, m_bHasExternals, bEntryFromDifferentRepo);
\r
653 if (((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none)||((wcFileStatus == Git_wc_status_ignored)&&(m_bShowIgnores))) && GitPath.IsDirectory())
\r
655 // we have an unversioned folder -> get all files in it recursively!
\r
656 AddUnversionedFolder(GitPath, workingTarget.GetContainingDirectory(), &config);
\r
659 // for folders, get all statuses inside it too
\r
660 if(workingTarget.IsDirectory())
\r
662 ReadRemainingItemsStatus(status, workingTarget, strCurrentRepositoryUUID, arExtPaths, &config, bAllDirect);
\r
668 m_sLastError = status.GetLastErrorMsg();
\r
675 const CGitStatusListCtrl::FileEntry*
\r
676 CGitStatusListCtrl::AddNewFileEntry(
\r
677 const git_wc_status2_t* pGitStatus, // The return from the Git GetStatus functions
\r
678 const CTGitPath& path, // The path of the item we're adding
\r
679 const CTGitPath& basePath, // The base directory for this status build
\r
680 bool bDirectItem, // Was this item the first found by GetFirstFileStatus or by a subsequent GetNextFileStatus call
\r
681 bool bInExternal, // Are we in an 'external' folder
\r
682 bool bEntryfromDifferentRepo // if the entry is from a different repository
\r
685 FileEntry * entry = new FileEntry();
\r
688 entry->path = path;
\r
689 entry->basepath = basePath;
\r
690 entry->status = GitStatus::GetMoreImportant(pGitStatus->text_status, pGitStatus->prop_status);
\r
691 entry->textstatus = pGitStatus->text_status;
\r
692 entry->propstatus = pGitStatus->prop_status;
\r
693 // entry->remotestatus = GitStatus::GetMoreImportant(pGitStatus->repos_text_status, pGitStatus->repos_prop_status);
\r
694 // entry->remotetextstatus = pGitStatus->repos_text_status;
\r
695 // entry->remotepropstatus = pGitStatus->repos_prop_status;
\r
696 entry->inexternal = bInExternal;
\r
697 entry->differentrepo = bEntryfromDifferentRepo;
\r
698 entry->direct = bDirectItem;
\r
699 // entry->copied = !!pGitStatus->copied;
\r
700 // entry->switched = !!pGitStatus->switched;
\r
702 entry->last_commit_date = pGitStatus->ood_last_cmt_date;
\r
703 if ((entry->last_commit_date == NULL)&&(pGitStatus->entry))
\r
704 entry->last_commit_date = pGitStatus->entry->cmt_date;
\r
705 entry->remoterev = pGitStatus->ood_last_cmt_rev;
\r
706 if (pGitStatus->entry)
\r
707 entry->last_commit_rev = pGitStatus->entry->cmt_rev;
\r
708 if (pGitStatus->ood_last_cmt_author)
\r
709 entry->last_commit_author = CUnicodeUtils::GetUnicode(pGitStatus->ood_last_cmt_author);
\r
710 if ((entry->last_commit_author.IsEmpty())&&(pGitStatus->entry)&&(pGitStatus->entry->cmt_author))
\r
711 entry->last_commit_author = CUnicodeUtils::GetUnicode(pGitStatus->entry->cmt_author);
\r
713 if (pGitStatus->entry)
\r
714 entry->isConflicted = (pGitStatus->entry->conflict_wrk && PathFileExists(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_wrk))) ? true : false;
\r
716 if ((entry->status == Git_wc_status_conflicted)||(entry->isConflicted))
\r
718 entry->isConflicted = true;
\r
719 if (pGitStatus->entry)
\r
722 if (pGitStatus->entry->conflict_wrk)
\r
724 cpath = path.GetDirectory();
\r
725 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_wrk));
\r
726 m_ConflictFileList.AddPath(cpath);
\r
728 if (pGitStatus->entry->conflict_old)
\r
730 cpath = path.GetDirectory();
\r
731 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_old));
\r
732 m_ConflictFileList.AddPath(cpath);
\r
734 if (pGitStatus->entry->conflict_new)
\r
736 cpath = path.GetDirectory();
\r
737 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->conflict_new));
\r
738 m_ConflictFileList.AddPath(cpath);
\r
740 if (pGitStatus->entry->prejfile)
\r
742 cpath = path.GetDirectory();
\r
743 cpath.AppendPathString(CUnicodeUtils::GetUnicode(pGitStatus->entry->prejfile));
\r
744 m_ConflictFileList.AddPath(cpath);
\r
749 if (pGitStatus->entry)
\r
751 entry->isfolder = (pGitStatus->entry->kind == Git_node_dir);
\r
752 entry->Revision = pGitStatus->entry->revision;
\r
753 entry->keeplocal = !!pGitStatus->entry->keep_local;
\r
754 entry->working_size = pGitStatus->entry->working_size;
\r
755 entry->depth = pGitStatus->entry->depth;
\r
757 if (pGitStatus->entry->url)
\r
759 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(pGitStatus->entry->url));
\r
761 if (pGitStatus->entry->copyfrom_url)
\r
763 entry->copyfrom_url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(pGitStatus->entry->copyfrom_url));
\r
764 entry->copyfrom_rev = pGitStatus->entry->copyfrom_rev;
\r
767 entry->copyfrom_rev = 0;
\r
771 if (m_sURL.IsEmpty())
\r
772 m_sURL = entry->url;
\r
774 m_sURL.LoadString(IDS_STATUSLIST_MULTIPLETARGETS);
\r
775 m_StatusUrlList.AddPath(CTGitPath(entry->url));
\r
777 if (pGitStatus->entry->lock_owner)
\r
778 entry->lock_owner = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_owner);
\r
779 if (pGitStatus->entry->lock_token)
\r
781 entry->lock_token = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_token);
\r
782 m_bHasLocks = true;
\r
784 if (pGitStatus->entry->lock_comment)
\r
785 entry->lock_comment = CUnicodeUtils::GetUnicode(pGitStatus->entry->lock_comment);
\r
787 if (pGitStatus->entry->present_props)
\r
789 entry->present_props = pGitStatus->entry->present_props;
\r
792 if (pGitStatus->entry->changelist)
\r
794 entry->changelist = CUnicodeUtils::GetUnicode(pGitStatus->entry->changelist);
\r
795 m_changelists[entry->changelist] = -1;
\r
796 m_bHasChangeLists = true;
\r
798 entry->needslock = (pGitStatus->entry->present_props && (strstr(pGitStatus->entry->present_props, "Git:needs-lock")!=NULL) );
\r
802 if (pGitStatus->ood_kind == Git_node_none)
\r
803 entry->isfolder = path.IsDirectory();
\r
805 entry->isfolder = (pGitStatus->ood_kind == Git_node_dir);
\r
807 if (pGitStatus->repos_lock)
\r
809 if (pGitStatus->repos_lock->owner)
\r
810 entry->lock_remoteowner = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->owner);
\r
811 if (pGitStatus->repos_lock->token)
\r
812 entry->lock_remotetoken = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->token);
\r
813 if (pGitStatus->repos_lock->comment)
\r
814 entry->lock_comment = CUnicodeUtils::GetUnicode(pGitStatus->repos_lock->comment);
\r
817 // Pass ownership of the entry to the array
\r
818 m_arStatusArray.push_back(entry);
\r
823 void CGitStatusListCtrl::AddUnversionedFolder(const CTGitPath& folderName,
\r
824 const CTGitPath& basePath,
\r
825 GitConfig * config)
\r
828 if (!m_bUnversionedRecurse)
\r
830 CSimpleFileFind filefinder(folderName.GetWinPathString());
\r
832 CTGitPath filename;
\r
833 m_bHasUnversionedItems = TRUE;
\r
834 while (filefinder.FindNextFileNoDots())
\r
836 filename.SetFromWin(filefinder.GetFilePath(), filefinder.IsDirectory());
\r
838 bool bMatchIgnore = !!config->MatchIgnorePattern(filename.GetFileOrDirectoryName());
\r
839 bMatchIgnore = bMatchIgnore || config->MatchIgnorePattern(filename.GetGitPathString());
\r
840 if (((bMatchIgnore)&&(m_bShowIgnores))||(!bMatchIgnore))
\r
842 FileEntry * entry = new FileEntry();
\r
843 entry->path = filename;
\r
844 entry->basepath = basePath;
\r
845 entry->inunversionedfolder = true;
\r
846 entry->isfolder = filefinder.IsDirectory();
\r
848 m_arStatusArray.push_back(entry);
\r
849 if (entry->isfolder)
\r
851 if (!g_GitAdminDir.HasAdminDir(entry->path.GetWinPathString(), true))
\r
852 AddUnversionedFolder(entry->path, basePath, config);
\r
860 void CGitStatusListCtrl::ReadRemainingItemsStatus(GitStatus& status, const CTGitPath& basePath,
\r
861 CStringA& strCurrentRepositoryUUID,
\r
862 CTGitPathList& arExtPaths, GitConfig * config, bool bAllDirect)
\r
865 git_wc_status2_t * s;
\r
867 CTGitPath lastexternalpath;
\r
869 while ((s = status.GetNextFileStatus(GitPath)) != NULL)
\r
871 Git_wc_status_kind wcFileStatus = GitStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
872 if ((wcFileStatus == Git_wc_status_unversioned) && (GitPath.IsDirectory()))
\r
874 // check if the unversioned folder is maybe versioned. This
\r
875 // could happen with nested layouts
\r
876 Git_wc_status_kind st = GitStatus::GetAllStatus(GitPath);
\r
877 if ((st != Git_wc_status_unversioned)&&(st != Git_wc_status_none))
\r
879 FileEntry * entry = new FileEntry();
\r
880 entry->path = GitPath;
\r
881 entry->basepath = basePath;
\r
882 entry->inunversionedfolder = true;
\r
883 entry->isfolder = true;
\r
884 entry->isNested = true;
\r
885 m_arStatusArray.push_back(entry);
\r
889 bool bDirectoryIsExternal = false;
\r
890 bool bEntryfromDifferentRepo = false;
\r
893 if (s->entry->uuid)
\r
895 if (strCurrentRepositoryUUID.IsEmpty())
\r
896 strCurrentRepositoryUUID = s->entry->uuid;
\r
899 if (strCurrentRepositoryUUID.Compare(s->entry->uuid)!=0)
\r
901 bEntryfromDifferentRepo = true;
\r
902 if (GitStatus::IsImportant(wcFileStatus))
\r
903 m_bHasExternalsFromDifferentRepos = TRUE;
\r
904 if (s->entry->kind == Git_node_dir)
\r
906 if ((lastexternalpath.IsEmpty())||(!lastexternalpath.IsAncestorOf(GitPath)))
\r
908 arExtPaths.AddPath(GitPath);
\r
909 lastexternalpath = GitPath;
\r
917 // we don't have an UUID - maybe an added file/folder
\r
918 if (!strCurrentRepositoryUUID.IsEmpty())
\r
920 if ((!lastexternalpath.IsEmpty())&&
\r
921 (lastexternalpath.IsAncestorOf(GitPath)))
\r
923 bEntryfromDifferentRepo = true;
\r
924 m_bHasExternalsFromDifferentRepos = TRUE;
\r
931 // if unversioned items lie around in external
\r
932 // directories from different repos, we have to mark them
\r
934 if (!strCurrentRepositoryUUID.IsEmpty())
\r
936 if ((!lastexternalpath.IsEmpty())&&
\r
937 (lastexternalpath.IsAncestorOf(GitPath)))
\r
939 bEntryfromDifferentRepo = true;
\r
943 if (status.IsExternal(GitPath))
\r
945 arExtPaths.AddPath(GitPath);
\r
946 m_bHasExternals = TRUE;
\r
948 if ((!bEntryfromDifferentRepo)&&(status.IsInExternal(GitPath)))
\r
950 // if the externals are inside an unversioned folder (this happens if
\r
951 // the externals are specified with e.g. "ext\folder url" instead of just
\r
952 // "folder url"), then a commit won't succeed.
\r
953 // therefore, we treat those as if the externals come from a different
\r
955 CTGitPath extpath = GitPath;
\r
956 while (basePath.IsAncestorOf(extpath))
\r
958 if (!extpath.HasAdminDir())
\r
960 bEntryfromDifferentRepo = true;
\r
963 extpath = extpath.GetContainingDirectory();
\r
966 // Do we have any external paths?
\r
967 if(arExtPaths.GetCount() > 0)
\r
969 // If do have external paths, we need to check if the current item belongs
\r
971 for (int ix=0; ix<arExtPaths.GetCount(); ix++)
\r
973 if (arExtPaths[ix].IsAncestorOf(GitPath))
\r
975 bDirectoryIsExternal = true;
\r
981 if ((wcFileStatus == Git_wc_status_unversioned)&&(!bDirectoryIsExternal))
\r
982 m_bHasUnversionedItems = TRUE;
\r
984 const FileEntry* entry = AddNewFileEntry(s, GitPath, basePath, bAllDirect, bDirectoryIsExternal, bEntryfromDifferentRepo);
\r
986 bool bMatchIgnore = !!config->MatchIgnorePattern(entry->path.GetFileOrDirectoryName());
\r
987 bMatchIgnore = bMatchIgnore || config->MatchIgnorePattern(entry->path.GetGitPathString());
\r
988 if ((((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none))&&(!bMatchIgnore))||
\r
989 ((wcFileStatus == Git_wc_status_ignored)&&(m_bShowIgnores))||
\r
990 (((wcFileStatus == Git_wc_status_unversioned)||(wcFileStatus == Git_wc_status_none))&&(bMatchIgnore)&&(m_bShowIgnores)))
\r
992 if (entry->isfolder)
\r
994 // we have an unversioned folder -> get all files in it recursively!
\r
995 AddUnversionedFolder(GitPath, basePath, config);
\r
998 } // while ((s = status.GetNextFileStatus(GitPath)) != NULL)
\r
1002 // Get the show-flags bitmap value which corresponds to a particular Git status
\r
1003 DWORD CGitStatusListCtrl::GetShowFlagsFromGitStatus(git_wc_status_kind status)
\r
1007 case git_wc_status_none:
\r
1008 case git_wc_status_unversioned:
\r
1009 return SVNSLC_SHOWUNVERSIONED;
\r
1010 case git_wc_status_ignored:
\r
1011 if (!m_bShowIgnores)
\r
1012 return SVNSLC_SHOWDIRECTS;
\r
1013 return SVNSLC_SHOWDIRECTS|SVNSLC_SHOWIGNORED;
\r
1014 case git_wc_status_incomplete:
\r
1015 return SVNSLC_SHOWINCOMPLETE;
\r
1016 case git_wc_status_normal:
\r
1017 return SVNSLC_SHOWNORMAL;
\r
1018 case git_wc_status_external:
\r
1019 return SVNSLC_SHOWEXTERNAL;
\r
1020 case git_wc_status_added:
\r
1021 return SVNSLC_SHOWADDED;
\r
1022 case git_wc_status_missing:
\r
1023 return SVNSLC_SHOWMISSING;
\r
1024 case git_wc_status_deleted:
\r
1025 return SVNSLC_SHOWREMOVED;
\r
1026 case git_wc_status_replaced:
\r
1027 return SVNSLC_SHOWREPLACED;
\r
1028 case git_wc_status_modified:
\r
1029 return SVNSLC_SHOWMODIFIED;
\r
1030 case git_wc_status_merged:
\r
1031 return SVNSLC_SHOWMERGED;
\r
1032 case git_wc_status_conflicted:
\r
1033 return SVNSLC_SHOWCONFLICTED;
\r
1034 case git_wc_status_obstructed:
\r
1035 return SVNSLC_SHOWOBSTRUCTED;
\r
1037 // we should NEVER get here!
\r
1044 void CGitStatusListCtrl::Show(DWORD dwShow, DWORD dwCheck /*=0*/, bool bShowFolders /* = true */)
\r
1046 CWinApp * pApp = AfxGetApp();
\r
1048 pApp->DoWaitCursor(1);
\r
1050 Locker lock(m_critSec);
\r
1051 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), GetUserDefaultLangID());
\r
1053 //SetItemCount(listIndex);
\r
1059 for(int i=0;i<this->m_arStatusArray.size();i++)
\r
1061 AddEntry((CTGitPath*)m_arStatusArray[i],langID,i);
\r
1064 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1065 for (int col = 0; col <= maxcol; col++)
\r
1066 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1069 GetStatisticsString();
\r
1071 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1072 HDITEM HeaderItem = {0};
\r
1073 HeaderItem.mask = HDI_FORMAT;
\r
1074 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1076 pHeader->GetItem(i, &HeaderItem);
\r
1077 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1078 pHeader->SetItem(i, &HeaderItem);
\r
1080 if (m_nSortedColumn)
\r
1082 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1083 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1084 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1088 if (nSelectedEntry)
\r
1090 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1091 EnsureVisible(nSelectedEntry, false);
\r
1095 // Restore the item at the top of the list.
\r
1096 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1098 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1106 pApp->DoWaitCursor(-1);
\r
1112 CWinApp * pApp = AfxGetApp();
\r
1114 pApp->DoWaitCursor(1);
\r
1115 m_dwShow = dwShow;
\r
1116 m_bShowFolders = bShowFolders;
\r
1118 int nTopIndex = GetTopIndex();
\r
1119 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
\r
1120 int nSelectedEntry = 0;
\r
1121 if (posSelectedEntry)
\r
1122 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
\r
1128 m_arListArray.clear();
\r
1130 m_arListArray.reserve(m_arStatusArray.size());
\r
1131 SetItemCount (static_cast<int>(m_arStatusArray.size()));
\r
1133 int listIndex = 0;
\r
1134 for (size_t i=0; i < m_arStatusArray.size(); ++i)
\r
1136 FileEntry * entry = m_arStatusArray[i];
\r
1137 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
\r
1139 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
\r
1141 if (entry->IsFolder() && (!bShowFolders))
\r
1142 continue; // don't show folders if they're not wanted.
\r
1145 git_wc_status_kind status = GitStatus::GetMoreImportant(entry->status, entry->remotestatus);
\r
1146 DWORD showFlags = GetShowFlagsFromGitStatus(status);
\r
1147 if (entry->IsLocked())
\r
1148 showFlags |= SVNSLC_SHOWLOCKS;
\r
1149 if (entry->switched)
\r
1150 showFlags |= SVNSLC_SHOWSWITCHED;
\r
1151 if (!entry->changelist.IsEmpty())
\r
1152 showFlags |= SVNSLC_SHOWINCHANGELIST;
\r
1154 bool bAllowCheck = ((entry->changelist.Compare(SVNSLC_IGNORECHANGELIST) != 0)
\r
1155 && (m_bCheckIfGroupsExist || (m_changelists.size()==0 || (m_changelists.size()==1 && m_bHasIgnoreGroup))));
\r
1157 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
\r
1159 if (status != Git_wc_status_ignored || (entry->direct) || (dwShow & GitSLC_SHOWIGNORED))
\r
1161 if ((!entry->IsFolder()) && (status == Git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
\r
1163 if (PathFileExists(entry->GetPath().GetWinPath()))
\r
1165 m_arListArray.push_back(i);
\r
1166 if ((dwCheck & SVNSLC_SHOWREMOVEDANDPRESENT)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1169 entry->checked = true;
\r
1171 AddEntry(entry, langID, listIndex++);
\r
1174 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
\r
1176 m_arListArray.push_back(i);
\r
1177 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1180 entry->checked = true;
\r
1182 AddEntry(entry, langID, listIndex++);
\r
1184 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
\r
1186 m_arListArray.push_back(i);
\r
1187 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
\r
1190 entry->checked = true;
\r
1192 AddEntry(entry, langID, listIndex++);
\r
1198 SetItemCount(listIndex);
\r
1200 m_ColumnManager.UpdateRelevance (m_arStatusArray, m_arListArray);
\r
1202 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1203 for (int col = 0; col <= maxcol; col++)
\r
1204 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1207 GetStatisticsString();
\r
1209 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1210 HDITEM HeaderItem = {0};
\r
1211 HeaderItem.mask = HDI_FORMAT;
\r
1212 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1214 pHeader->GetItem(i, &HeaderItem);
\r
1215 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1216 pHeader->SetItem(i, &HeaderItem);
\r
1218 if (m_nSortedColumn)
\r
1220 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1221 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1222 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1225 if (nSelectedEntry)
\r
1227 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1228 EnsureVisible(nSelectedEntry, false);
\r
1232 // Restore the item at the top of the list.
\r
1233 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1235 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1243 pApp->DoWaitCursor(-1);
\r
1245 m_bEmpty = (GetItemCount() == 0);
\r
1251 void CGitStatusListCtrl::Show(DWORD dwShow, const CTGitPathList& checkedList, bool bShowFolders /* = true */)
\r
1256 Locker lock(m_critSec);
\r
1257 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseSVN\\LanguageID"), GetUserDefaultLangID());
\r
1259 CWinApp * pApp = AfxGetApp();
\r
1261 pApp->DoWaitCursor(1);
\r
1262 m_dwShow = dwShow;
\r
1263 m_bShowFolders = bShowFolders;
\r
1265 int nTopIndex = GetTopIndex();
\r
1266 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
\r
1267 int nSelectedEntry = 0;
\r
1268 if (posSelectedEntry)
\r
1269 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
\r
1275 m_arListArray.clear();
\r
1277 m_arListArray.reserve(m_arStatusArray.size());
\r
1278 SetItemCount (static_cast<int>(m_arStatusArray.size()));
\r
1280 int listIndex = 0;
\r
1281 for (size_t i=0; i < m_arStatusArray.size(); ++i)
\r
1283 FileEntry * entry = m_arStatusArray[i];
\r
1284 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
\r
1286 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
\r
1288 if (entry->IsFolder() && (!bShowFolders))
\r
1289 continue; // don't show folders if they're not wanted.
\r
1291 git_wc_status_kind status = SVNStatus::GetMoreImportant(entry->status, entry->remotestatus);
\r
1292 DWORD showFlags = GetShowFlagsFromSVNStatus(status);
\r
1293 if (entry->IsLocked())
\r
1294 showFlags |= SVNSLC_SHOWLOCKS;
\r
1295 if (!entry->changelist.IsEmpty())
\r
1296 showFlags |= SVNSLC_SHOWINCHANGELIST;
\r
1298 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
\r
1299 if (status != git_wc_status_ignored || (entry->direct) || (dwShow & SVNSLC_SHOWIGNORED))
\r
1301 for (int npath = 0; npath < checkedList.GetCount(); ++npath)
\r
1303 if (entry->GetPath().IsEquivalentTo(checkedList[npath]))
\r
1305 entry->checked = true;
\r
1309 if ((!entry->IsFolder()) && (status == git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
\r
1311 if (PathFileExists(entry->GetPath().GetWinPath()))
\r
1313 m_arListArray.push_back(i);
\r
1314 AddEntry(entry, langID, listIndex++);
\r
1317 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
\r
1319 m_arListArray.push_back(i);
\r
1320 AddEntry(entry, langID, listIndex++);
\r
1322 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
\r
1324 m_arListArray.push_back(i);
\r
1325 AddEntry(entry, langID, listIndex++);
\r
1327 else if (entry->switched)
\r
1329 m_arListArray.push_back(i);
\r
1330 AddEntry(entry, langID, listIndex++);
\r
1336 SetItemCount(listIndex);
\r
1338 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
1339 for (int col = 0; col <= maxcol; col++)
\r
1340 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
\r
1343 GetStatisticsString();
\r
1345 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1346 HDITEM HeaderItem = {0};
\r
1347 HeaderItem.mask = HDI_FORMAT;
\r
1348 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1350 pHeader->GetItem(i, &HeaderItem);
\r
1351 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1352 pHeader->SetItem(i, &HeaderItem);
\r
1354 if (m_nSortedColumn)
\r
1356 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1357 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1358 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1361 if (nSelectedEntry)
\r
1363 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
\r
1364 EnsureVisible(nSelectedEntry, false);
\r
1368 // Restore the item at the top of the list.
\r
1369 for (int i=0;GetTopIndex() != nTopIndex;i++)
\r
1371 if ( !EnsureVisible(nTopIndex+i,false) )
\r
1379 pApp->DoWaitCursor(-1);
\r
1381 m_bEmpty = (GetItemCount() == 0);
\r
1386 void CGitStatusListCtrl::AddEntry(CTGitPath * GitPath, WORD langID, int listIndex)
\r
1388 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
1389 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
1391 CString path = GitPath->GetGitPathString();
\r
1395 int index = listIndex;
\r
1397 CString entryname = GitPath->GetGitPathString();
\r
1399 // if (entry->isfolder)
\r
1400 // icon_idx = m_nIconFolder;
\r
1403 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(*GitPath);
\r
1406 InsertItem(index, entryname, icon_idx);
\r
1408 this->SetItemData(index, (DWORD_PTR)GitPath);
\r
1409 // SVNSLC_COLFILENAME
\r
1410 SetItemText(index, nCol++, GitPath->GetFileOrDirectoryName());
\r
1412 SetItemText(index, nCol++, GitPath->GetFileExtension());
\r
1413 // SVNSLC_COLSTATUS
\r
1414 // if (entry->isNested)
\r
1416 // CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1417 // SetItemText(index, nCol++, sTemp);
\r
1421 SetItemText(index, nCol++, GitPath->GetActionName());
\r
1423 // SVNSLC_COLREMOTESTATUS
\r
1424 // if (entry->isNested)
\r
1426 // CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1427 // SetItemText(index, nCol++, sTemp);
\r
1431 //SetItemText(index, nCol++, buf);
\r
1433 // SVNSLC_COLTEXTSTATUS
\r
1434 // if (entry->isNested)
\r
1436 // CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1437 // SetItemText(index, nCol++, sTemp);
\r
1442 SVNStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1443 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1444 _tcscat_s(buf, 100, _T(" (+)"));
\r
1445 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1446 _tcscat_s(buf, 100, _T(" (s)"));
\r
1448 // SetItemText(index, nCol++, buf);
\r
1450 // SVNSLC_COLPROPSTATUS
\r
1451 // if (entry->isNested)
\r
1453 // SetItemText(index, nCol++, _T(""));
\r
1458 SVNStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1459 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1460 _tcscat_s(buf, 100, _T(" (+)"));
\r
1461 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1462 _tcscat_s(buf, 100, _T(" (s)"));
\r
1464 // SetItemText(index, nCol++, buf);
\r
1466 // SVNSLC_COLREMOTETEXT
\r
1467 // if (entry->isNested)
\r
1469 // SetItemText(index, nCol++, _T(""));
\r
1474 SVNStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1475 SetItemText(index, nCol++, buf);
\r
1478 // SVNSLC_COLREMOTEPROP
\r
1479 // if (entry->isNested)
\r
1481 // SetItemText(index, nCol++, _T(""));
\r
1485 // SVNStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1486 // SetItemText(index, nCol++, buf);
\r
1489 // SetItemText(index, nCol++, entry->url);
\r
1492 if (!m_HeadRev.IsHead())
\r
1494 // we have contacted the repository
\r
1496 // decision-matrix
\r
1497 // wc repository text
\r
1500 // UID1 UID1 owner
\r
1501 // UID1 "" lock has been broken
\r
1502 // UID1 UID2 lock has been stolen
\r
1503 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))
\r
1505 if (entry->lock_owner.IsEmpty())
\r
1506 SetItemText(index, nCol++, entry->lock_remoteowner);
\r
1508 SetItemText(index, nCol++, entry->lock_owner);
\r
1510 else if (entry->lock_remotetoken.IsEmpty())
\r
1513 CString temp(MAKEINTRESOURCE(IDS_STATUSLIST_LOCKBROKEN));
\r
1514 SetItemText(index, nCol++, temp);
\r
1520 temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);
\r
1521 SetItemText(index, nCol++, temp);
\r
1525 SetItemText(index, nCol++, entry->lock_owner);
\r
1526 // SVNSLC_COLLOCKCOMMENT
\r
1527 SetItemText(index, nCol++, entry->lock_comment);
\r
1528 // SVNSLC_COLAUTHOR
\r
1529 SetItemText(index, nCol++, entry->last_commit_author);
\r
1530 // SVNSLC_COLREVISION
\r
1532 temp.Format(_T("%ld"), entry->last_commit_rev);
\r
1533 if (entry->last_commit_rev > 0)
\r
1534 SetItemText(index, nCol++, temp);
\r
1536 SetItemText(index, nCol++, _T(""));
\r
1537 // SVNSLC_COLREMOTEREVISION
\r
1538 temp.Format(_T("%ld"), entry->remoterev);
\r
1539 if (entry->remoterev > 0)
\r
1540 SetItemText(index, nCol++, temp);
\r
1542 SetItemText(index, nCol++, _T(""));
\r
1544 TCHAR datebuf[SVN_DATE_BUFFER];
\r
1545 apr_time_t date = entry->last_commit_date;
\r
1546 SVN::formatDate(datebuf, date, true);
\r
1548 SetItemText(index, nCol++, datebuf);
\r
1550 SetItemText(index, nCol++, _T(""));
\r
1551 // SVNSLC_COLSVNNEEDSLOCK
\r
1552 BOOL bFoundSVNNeedsLock = entry->present_props.IsNeedsLockSet();
\r
1553 CString strSVNNeedsLock = (bFoundSVNNeedsLock) ? _T("*") : _T("");
\r
1554 SetItemText(index, nCol++, strSVNNeedsLock);
\r
1555 // SVNSLC_COLCOPYFROM
\r
1556 if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)
\r
1557 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());
\r
1559 temp = entry->copyfrom_url;
\r
1560 SetItemText(index, nCol++, temp);
\r
1561 // SVNSLC_COLMODIFICATIONDATE
\r
1562 __int64 filetime = entry->GetPath().GetLastWriteTime();
\r
1563 if ( (filetime) && (entry->status!=git_wc_status_deleted) )
\r
1565 FILETIME* f = (FILETIME*)(__int64*)&filetime;
\r
1566 TCHAR datebuf[SVN_DATE_BUFFER];
\r
1567 SVN::formatDate(datebuf,*f,true);
\r
1568 SetItemText(index, nCol++, datebuf);
\r
1572 SetItemText(index, nCol++, _T(""));
\r
1575 // user-defined properties
\r
1576 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
\r
1580 assert (i == nCol++);
\r
1581 assert (m_ColumnManager.IsUserProp (i));
\r
1583 CString name = m_ColumnManager.GetName(i);
\r
1584 if (entry->present_props.HasProperty (name))
\r
1586 const CString& propVal = entry->present_props [name];
\r
1587 if (propVal.IsEmpty())
\r
1588 SetItemText(index, i, m_sNoPropValueText);
\r
1590 SetItemText(index, i, propVal);
\r
1593 SetItemText(index, i, _T(""));
\r
1596 SetCheck(index, GitPath->m_Checked);
\r
1597 if (GitPath->m_Checked)
\r
1601 // if (m_changelists.find(entry->changelist) != m_changelists.end())
\r
1602 // SetItemGroup(index, m_changelists[entry->changelist]);
\r
1604 if( GitPath->m_Action & CTGitPath::LOGACTIONS_IGNORE)
\r
1605 SetItemGroup(index, 2);
\r
1606 else if( GitPath->m_Action & CTGitPath::LOGACTIONS_UNVER)
\r
1607 SetItemGroup(index,1);
\r
1609 SetItemGroup(index,0);
\r
1615 void CGitStatusListCtrl::AddEntry(FileEntry * entry, WORD langID, int listIndex)
\r
1617 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
1618 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
1620 CString path = entry->GetPath().GetGitPathString();
\r
1621 if ( m_mapFilenameToChecked.size()!=0 && m_mapFilenameToChecked.find(path) != m_mapFilenameToChecked.end() )
\r
1623 // The user manually de-/selected an item. We now restore this status
\r
1624 // when refreshing.
\r
1625 entry->checked = m_mapFilenameToChecked[path];
\r
1630 int index = listIndex;
\r
1632 CString entryname = entry->GetDisplayName();
\r
1634 if (entry->isfolder)
\r
1635 icon_idx = m_nIconFolder;
\r
1638 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(entry->path);
\r
1641 InsertItem(index, entryname, icon_idx);
\r
1642 // SVNSLC_COLFILENAME
\r
1643 SetItemText(index, nCol++, entry->path.GetFileOrDirectoryName());
\r
1645 SetItemText(index, nCol++, entry->path.GetFileExtension());
\r
1646 // SVNSLC_COLSTATUS
\r
1647 if (entry->isNested)
\r
1649 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1650 SetItemText(index, nCol++, sTemp);
\r
1654 GitStatus::GetStatusString(hResourceHandle, entry->status, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1655 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1656 _tcscat_s(buf, 100, _T(" (+)"));
\r
1657 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1658 _tcscat_s(buf, 100, _T(" (s)"));
\r
1660 if ((entry->status == entry->propstatus)&&
\r
1661 (entry->status != git_wc_status_normal)&&
\r
1662 (entry->status != git_wc_status_unversioned)&&
\r
1663 (!GitStatus::IsImportant(entry->textstatus)))
\r
1664 _tcscat_s(buf, 100, ponly);
\r
1666 SetItemText(index, nCol++, buf);
\r
1668 // SVNSLC_COLREMOTESTATUS
\r
1669 if (entry->isNested)
\r
1671 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1672 SetItemText(index, nCol++, sTemp);
\r
1677 SVNStatus::GetStatusString(hResourceHandle, entry->remotestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1678 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1679 _tcscat_s(buf, 100, _T(" (+)"));
\r
1680 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1681 _tcscat_s(buf, 100, _T(" (s)"));
\r
1682 if ((entry->remotestatus == entry->remotepropstatus)&&
\r
1683 (entry->remotestatus != git_wc_status_none)&&
\r
1684 (entry->remotestatus != git_wc_status_normal)&&
\r
1685 (entry->remotestatus != git_wc_status_unversioned)&&
\r
1686 (!SVNStatus::IsImportant(entry->remotetextstatus)))
\r
1687 _tcscat_s(buf, 100, ponly);
\r
1689 SetItemText(index, nCol++, buf);
\r
1691 // SVNSLC_COLTEXTSTATUS
\r
1692 if (entry->isNested)
\r
1694 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
\r
1695 SetItemText(index, nCol++, sTemp);
\r
1700 SVNStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1701 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1702 _tcscat_s(buf, 100, _T(" (+)"));
\r
1703 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1704 _tcscat_s(buf, 100, _T(" (s)"));
\r
1706 SetItemText(index, nCol++, buf);
\r
1708 // SVNSLC_COLPROPSTATUS
\r
1709 if (entry->isNested)
\r
1711 SetItemText(index, nCol++, _T(""));
\r
1716 SVNStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1717 if ((entry->copied)&&(_tcslen(buf)>1))
\r
1718 _tcscat_s(buf, 100, _T(" (+)"));
\r
1719 if ((entry->switched)&&(_tcslen(buf)>1))
\r
1720 _tcscat_s(buf, 100, _T(" (s)"));
\r
1722 SetItemText(index, nCol++, buf);
\r
1724 // SVNSLC_COLREMOTETEXT
\r
1725 if (entry->isNested)
\r
1727 SetItemText(index, nCol++, _T(""));
\r
1732 SVNStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1733 SetItemText(index, nCol++, buf);
\r
1736 // SVNSLC_COLREMOTEPROP
\r
1737 if (entry->isNested)
\r
1739 SetItemText(index, nCol++, _T(""));
\r
1743 // SVNStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
1744 SetItemText(index, nCol++, buf);
\r
1747 // SetItemText(index, nCol++, entry->url);
\r
1750 if (!m_HeadRev.IsHead())
\r
1752 // we have contacted the repository
\r
1754 // decision-matrix
\r
1755 // wc repository text
\r
1758 // UID1 UID1 owner
\r
1759 // UID1 "" lock has been broken
\r
1760 // UID1 UID2 lock has been stolen
\r
1761 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))
\r
1763 if (entry->lock_owner.IsEmpty())
\r
1764 SetItemText(index, nCol++, entry->lock_remoteowner);
\r
1766 SetItemText(index, nCol++, entry->lock_owner);
\r
1768 else if (entry->lock_remotetoken.IsEmpty())
\r
1771 CString temp(MAKEINTRESOURCE(IDS_STATUSLIST_LOCKBROKEN));
\r
1772 SetItemText(index, nCol++, temp);
\r
1778 temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);
\r
1779 SetItemText(index, nCol++, temp);
\r
1783 SetItemText(index, nCol++, entry->lock_owner);
\r
1784 // SVNSLC_COLLOCKCOMMENT
\r
1785 SetItemText(index, nCol++, entry->lock_comment);
\r
1786 // SVNSLC_COLAUTHOR
\r
1787 SetItemText(index, nCol++, entry->last_commit_author);
\r
1788 // SVNSLC_COLREVISION
\r
1790 temp.Format(_T("%ld"), entry->last_commit_rev);
\r
1791 if (entry->last_commit_rev > 0)
\r
1792 SetItemText(index, nCol++, temp);
\r
1794 SetItemText(index, nCol++, _T(""));
\r
1795 // SVNSLC_COLREMOTEREVISION
\r
1796 temp.Format(_T("%ld"), entry->remoterev);
\r
1797 if (entry->remoterev > 0)
\r
1798 SetItemText(index, nCol++, temp);
\r
1800 SetItemText(index, nCol++, _T(""));
\r
1802 TCHAR datebuf[SVN_DATE_BUFFER];
\r
1803 apr_time_t date = entry->last_commit_date;
\r
1804 SVN::formatDate(datebuf, date, true);
\r
1806 SetItemText(index, nCol++, datebuf);
\r
1808 SetItemText(index, nCol++, _T(""));
\r
1809 // SVNSLC_COLSVNNEEDSLOCK
\r
1810 BOOL bFoundSVNNeedsLock = entry->present_props.IsNeedsLockSet();
\r
1811 CString strSVNNeedsLock = (bFoundSVNNeedsLock) ? _T("*") : _T("");
\r
1812 SetItemText(index, nCol++, strSVNNeedsLock);
\r
1813 // SVNSLC_COLCOPYFROM
\r
1814 if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)
\r
1815 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());
\r
1817 temp = entry->copyfrom_url;
\r
1818 SetItemText(index, nCol++, temp);
\r
1819 // SVNSLC_COLMODIFICATIONDATE
\r
1820 __int64 filetime = entry->GetPath().GetLastWriteTime();
\r
1821 if ( (filetime) && (entry->status!=git_wc_status_deleted) )
\r
1823 FILETIME* f = (FILETIME*)(__int64*)&filetime;
\r
1824 TCHAR datebuf[SVN_DATE_BUFFER];
\r
1825 SVN::formatDate(datebuf,*f,true);
\r
1826 SetItemText(index, nCol++, datebuf);
\r
1830 SetItemText(index, nCol++, _T(""));
\r
1833 // user-defined properties
\r
1834 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
\r
1838 assert (i == nCol++);
\r
1839 assert (m_ColumnManager.IsUserProp (i));
\r
1841 CString name = m_ColumnManager.GetName(i);
\r
1842 if (entry->present_props.HasProperty (name))
\r
1844 const CString& propVal = entry->present_props [name];
\r
1845 if (propVal.IsEmpty())
\r
1846 SetItemText(index, i, m_sNoPropValueText);
\r
1848 SetItemText(index, i, propVal);
\r
1851 SetItemText(index, i, _T(""));
\r
1854 SetCheck(index, entry->checked);
\r
1855 if (entry->checked)
\r
1857 if (m_changelists.find(entry->changelist) != m_changelists.end())
\r
1858 SetItemGroup(index, m_changelists[entry->changelist]);
\r
1860 SetItemGroup(index, 0);
\r
1865 bool CGitStatusListCtrl::SetItemGroup(int item, int groupindex)
\r
1867 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS) == NULL)
\r
1869 if (groupindex < 0)
\r
1872 i.mask = LVIF_GROUPID;
\r
1875 i.iGroupId = groupindex;
\r
1877 return !!SetItem(&i);
\r
1880 void CGitStatusListCtrl::Sort()
\r
1882 Locker lock(m_critSec);
\r
1884 CSorter predicate (&m_ColumnManager, m_nSortedColumn, m_bAscending);
\r
1886 std::sort(m_arStatusArray.begin(), m_arStatusArray.end(), predicate);
\r
1887 SaveColumnWidths();
\r
1888 Show(m_dwShow, 0, m_bShowFolders);
\r
1892 void CGitStatusListCtrl::OnHdnItemclick(NMHDR *pNMHDR, LRESULT *pResult)
\r
1894 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
1899 if (m_nSortedColumn == phdr->iItem)
\r
1900 m_bAscending = !m_bAscending;
\r
1902 m_bAscending = TRUE;
\r
1903 m_nSortedColumn = phdr->iItem;
\r
1904 m_mapFilenameToChecked.clear();
\r
1907 CHeaderCtrl * pHeader = GetHeaderCtrl();
\r
1908 HDITEM HeaderItem = {0};
\r
1909 HeaderItem.mask = HDI_FORMAT;
\r
1910 for (int i=0; i<pHeader->GetItemCount(); ++i)
\r
1912 pHeader->GetItem(i, &HeaderItem);
\r
1913 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
\r
1914 pHeader->SetItem(i, &HeaderItem);
\r
1916 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
\r
1917 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
\r
1918 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
\r
1920 // the checked state of the list control items must be restored
\r
1922 for (int i=0; i<GetItemCount(); ++i)
\r
1924 CTGitPath * entry = (CTGitPath*)GetItemData(i);
\r
1925 SetCheck(i, entry->m_Checked);
\r
1931 void CGitStatusListCtrl::OnLvnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
\r
1933 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1936 #define ISCHECKED(x) ((x) ? ((((x)&LVIS_STATEIMAGEMASK)>>12)-1) : FALSE)
\r
1937 if ((m_bBlock)&&(m_bBlockUI))
\r
1939 // if we're blocked, prevent changing of the check state
\r
1940 if ((!ISCHECKED(pNMLV->uOldState) && ISCHECKED(pNMLV->uNewState))||
\r
1941 (ISCHECKED(pNMLV->uOldState) && !ISCHECKED(pNMLV->uNewState)))
\r
1946 BOOL CGitStatusListCtrl::OnLvnItemchanged(NMHDR *pNMHDR, LRESULT *pResult)
\r
1948 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
1950 if ((pNMLV->uNewState==0)||(pNMLV->uNewState & LVIS_SELECTED)||(pNMLV->uNewState & LVIS_FOCUSED))
\r
1956 bool bSelected = !!(ListView_GetItemState(m_hWnd, pNMLV->iItem, LVIS_SELECTED) & LVIS_SELECTED);
\r
1957 int nListItems = GetItemCount();
\r
1960 // was the item checked?
\r
1962 //CTGitPath *gitpath=(CTGitPath*)GetItemData(pNMLV->iItem);
\r
1963 //gitpath->m_Checked=GetCheck(pNMLV->iItem);
\r
1965 if (GetCheck(pNMLV->iItem))
\r
1967 CheckEntry(pNMLV->iItem, nListItems);
\r
1970 POSITION pos = GetFirstSelectedItemPosition();
\r
1972 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
1974 if (index != pNMLV->iItem)
\r
1975 CheckEntry(index, nListItems);
\r
1981 UncheckEntry(pNMLV->iItem, nListItems);
\r
1984 POSITION pos = GetFirstSelectedItemPosition();
\r
1986 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
1988 if (index != pNMLV->iItem)
\r
1989 UncheckEntry(index, nListItems);
\r
1994 GetStatisticsString();
\r
2001 void CGitStatusListCtrl::OnColumnResized(NMHDR *pNMHDR, LRESULT *pResult)
\r
2003 LPNMHEADER header = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
2004 if ( (header != NULL)
\r
2005 && (header->iItem >= 0)
\r
2006 && (header->iItem < m_ColumnManager.GetColumnCount()))
\r
2008 m_ColumnManager.ColumnResized (header->iItem);
\r
2014 void CGitStatusListCtrl::OnColumnMoved(NMHDR *pNMHDR, LRESULT *pResult)
\r
2016 LPNMHEADER header = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
2018 if ( (header != NULL)
\r
2019 && (header->iItem >= 0)
\r
2020 && (header->iItem < m_ColumnManager.GetColumnCount())
\r
2021 // only allow the reordering if the column was not moved left of the first
\r
2022 // visible item - otherwise the 'invisible' columns are not at the far left
\r
2023 // anymore and we get all kinds of redrawing problems.
\r
2024 && (header->pitem)
\r
2025 && (header->pitem->iOrder > m_ColumnManager.GetInvisibleCount()))
\r
2027 m_ColumnManager.ColumnMoved (header->iItem, header->pitem->iOrder);
\r
2031 Invalidate(FALSE);
\r
2034 void CGitStatusListCtrl::CheckEntry(int index, int nListItems)
\r
2036 Locker lock(m_critSec);
\r
2037 //FileEntry * entry = GetListEntry(index);
\r
2038 CTGitPath *path=(CTGitPath*)GetItemData(index);
\r
2039 ASSERT(path != NULL);
\r
2042 SetCheck(index, TRUE);
\r
2043 //entry = GetListEntry(index);
\r
2044 // if an unversioned item was checked, then we need to check if
\r
2045 // the parent folders are unversioned too. If the parent folders actually
\r
2046 // are unversioned, then check those too.
\r
2048 if (entry->status == git_wc_status_unversioned)
\r
2050 // we need to check the parent folder too
\r
2051 const CTGitPath& folderpath = entry->path;
\r
2052 for (int i=0; i< nListItems; ++i)
\r
2054 FileEntry * testEntry = GetListEntry(i);
\r
2055 ASSERT(testEntry != NULL);
\r
2056 if (testEntry == NULL)
\r
2058 if (!testEntry->checked)
\r
2060 if (testEntry->path.IsAncestorOf(folderpath) && (!testEntry->path.IsEquivalentTo(folderpath)))
\r
2062 SetEntryCheck(testEntry,i,true);
\r
2068 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
2069 if ( (entry->status == git_wc_status_deleted) || (m_bCheckChildrenWithParent) || (bShift) )
\r
2071 // if a deleted folder gets checked, we have to check all
\r
2072 // children of that folder too.
\r
2073 if (entry->path.IsDirectory())
\r
2075 SetCheckOnAllDescendentsOf(entry, true);
\r
2078 // if a deleted file or folder gets checked, we have to
\r
2079 // check all parents of this item too.
\r
2080 for (int i=0; i<nListItems; ++i)
\r
2082 FileEntry * testEntry = GetListEntry(i);
\r
2083 ASSERT(testEntry != NULL);
\r
2084 if (testEntry == NULL)
\r
2086 if (!testEntry->checked)
\r
2088 if (testEntry->path.IsAncestorOf(entry->path) && (!testEntry->path.IsEquivalentTo(entry->path)))
\r
2090 if ((testEntry->status == git_wc_status_deleted)||(m_bCheckChildrenWithParent))
\r
2092 SetEntryCheck(testEntry,i,true);
\r
2094 // now we need to check all children of this parent folder
\r
2095 SetCheckOnAllDescendentsOf(testEntry, true);
\r
2102 if ( !path->m_Checked )
\r
2104 path->m_Checked = TRUE;
\r
2109 void CGitStatusListCtrl::UncheckEntry(int index, int nListItems)
\r
2111 Locker lock(m_critSec);
\r
2112 CTGitPath *path=(CTGitPath*)GetItemData(index);
\r
2113 ASSERT(path != NULL);
\r
2116 SetCheck(index, FALSE);
\r
2117 //entry = GetListEntry(index);
\r
2118 // item was unchecked
\r
2120 if (entry->path.IsDirectory())
\r
2122 // disable all files within an unselected folder, except when unchecking a folder with property changes
\r
2123 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
2124 if ( (entry->status != git_wc_status_modified) || (bShift) )
\r
2126 SetCheckOnAllDescendentsOf(entry, false);
\r
2129 else if (entry->status == git_wc_status_deleted)
\r
2131 // a "deleted" file was unchecked, so uncheck all parent folders
\r
2132 // and all children of those parents
\r
2133 for (int i=0; i<nListItems; i++)
\r
2135 FileEntry * testEntry = GetListEntry(i);
\r
2136 ASSERT(testEntry != NULL);
\r
2137 if (testEntry == NULL)
\r
2139 if (testEntry->checked)
\r
2141 if (testEntry->path.IsAncestorOf(entry->path))
\r
2143 if (testEntry->status == git_wc_status_deleted)
\r
2145 SetEntryCheck(testEntry,i,false);
\r
2148 SetCheckOnAllDescendentsOf(testEntry, false);
\r
2155 if ( path->m_Checked )
\r
2157 path->m_Checked = FALSE;
\r
2162 bool CGitStatusListCtrl::EntryPathCompareNoCase(const FileEntry* pEntry1, const FileEntry* pEntry2)
\r
2164 return pEntry1->path < pEntry2->path;
\r
2167 bool CGitStatusListCtrl::IsEntryVersioned(const FileEntry* pEntry1)
\r
2169 return pEntry1->status != git_wc_status_unversioned;
\r
2172 bool CGitStatusListCtrl::BuildStatistics()
\r
2175 bool bRefetchStatus = false;
\r
2176 FileEntryVector::iterator itFirstUnversionedEntry;
\r
2177 itFirstUnversionedEntry = std::partition(m_arStatusArray.begin(), m_arStatusArray.end(), IsEntryVersioned);
\r
2178 if (m_bUnversionedLast)
\r
2180 // We partition the list of items so that it's arrange with all the versioned items first
\r
2181 // then all the unversioned items afterwards.
\r
2182 // Then we sort the versioned part of this, so that we can do quick look-ups in it
\r
2183 std::sort(m_arStatusArray.begin(), itFirstUnversionedEntry, EntryPathCompareNoCase);
\r
2184 // Also sort the unversioned section, to make the list look nice...
\r
2185 std::sort(itFirstUnversionedEntry, m_arStatusArray.end(), EntryPathCompareNoCase);
\r
2188 // now gather some statistics
\r
2189 m_nUnversioned = 0;
\r
2194 m_nConflicted = 0;
\r
2197 for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2199 const FileEntry * entry = m_arStatusArray[i];
\r
2202 switch (entry->status)
\r
2204 case git_wc_status_normal:
\r
2207 case git_wc_status_added:
\r
2210 case git_wc_status_missing:
\r
2211 case git_wc_status_deleted:
\r
2214 case git_wc_status_replaced:
\r
2215 case git_wc_status_modified:
\r
2216 case git_wc_status_merged:
\r
2219 case git_wc_status_conflicted:
\r
2220 case git_wc_status_obstructed:
\r
2223 case git_wc_status_ignored:
\r
2229 if (GitStatus::IsImportant(entry->remotestatus))
\r
2232 // If an entry is in an unversioned folder, we don't have to do an expensive array search
\r
2233 // to find out if it got case-renamed: an unversioned folder can't have versioned files
\r
2234 // But nested folders are also considered to be in unversioned folders, we have to do the
\r
2235 // check in that case too, otherwise we would miss case-renamed folders - they show up
\r
2236 // as nested folders.
\r
2237 if (((!entry->inunversionedfolder)||(entry->isNested))&&(m_bUnversionedLast))
\r
2239 // check if the unversioned item is just
\r
2240 // a file differing in case but still versioned
\r
2241 FileEntryVector::iterator itMatchingItem;
\r
2242 if(std::binary_search(m_arStatusArray.begin(), itFirstUnversionedEntry, entry, EntryPathCompareNoCase))
\r
2244 // We've confirmed that there *is* a matching file
\r
2245 // Find its exact location
\r
2246 FileEntryVector::iterator itMatchingItem;
\r
2247 itMatchingItem = std::lower_bound(m_arStatusArray.begin(), itFirstUnversionedEntry, entry, EntryPathCompareNoCase);
\r
2249 // adjust the case of the filename
\r
2250 if (MoveFileEx(entry->path.GetWinPath(), (*itMatchingItem)->path.GetWinPath(), MOVEFILE_REPLACE_EXISTING))
\r
2252 // We successfully adjusted the case in the filename. But there is now a file with status 'missing'
\r
2253 // in the array, because that's the status of the file before we adjusted the case.
\r
2254 // We have to refetch the status of that file.
\r
2255 // Since fetching the status of single files/directories is very expensive and there can be
\r
2256 // multiple case-renames here, we just set a flag and refetch the status at the end from scratch.
\r
2257 bRefetchStatus = true;
\r
2259 m_arStatusArray.erase(m_arStatusArray.begin()+i);
\r
2263 // now that we removed an unversioned item from the array, find the first unversioned item in the 'new'
\r
2265 itFirstUnversionedEntry = std::partition(m_arStatusArray.begin(), m_arStatusArray.end(), IsEntryVersioned);
\r
2273 } // switch (entry->status)
\r
2275 } // for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2276 return !bRefetchStatus;
\r
2281 void CGitStatusListCtrl::GetMinMaxRevisions(git_revnum_t& rMin, git_revnum_t& rMax, bool bShownOnly, bool bCheckedOnly)
\r
2284 Locker lock(m_critSec);
\r
2288 if ((bShownOnly)||(bCheckedOnly))
\r
2290 for (int i=0; i<GetItemCount(); ++i)
\r
2292 const FileEntry * entry = GetListEntry(i);
\r
2294 if ((entry)&&(entry->last_commit_rev))
\r
2296 if ((!bCheckedOnly)||(entry->IsChecked()))
\r
2298 if (entry->last_commit_rev >= 0)
\r
2300 rMin = min(rMin, entry->last_commit_rev);
\r
2301 rMax = max(rMax, entry->last_commit_rev);
\r
2309 for (int i=0; i < (int)m_arStatusArray.size(); ++i)
\r
2311 const FileEntry * entry = m_arStatusArray[i];
\r
2312 if ((entry)&&(entry->last_commit_rev))
\r
2314 if (entry->last_commit_rev >= 0)
\r
2316 rMin = min(rMin, entry->last_commit_rev);
\r
2317 rMax = max(rMax, entry->last_commit_rev);
\r
2322 if (rMin == LONG_MAX)
\r
2327 int CGitStatusListCtrl::GetGroupFromPoint(POINT * ppt)
\r
2329 // the point must be relative to the upper left corner of the control
\r
2333 if (!IsGroupViewEnabled())
\r
2341 GetWindowRect(&rc);
\r
2342 while (((flags & LVHT_BELOW) == 0)&&(pt.y < rc.bottom))
\r
2344 nItem = HitTest(pt, &flags);
\r
2345 if ((flags & LVHT_ONITEM)||(flags & LVHT_EX_GROUP_HEADER))
\r
2347 // the first item below the point
\r
2349 // check if the point is too much right (i.e. if the point
\r
2350 // is farther to the right than the width of the item)
\r
2352 GetItemRect(nItem, &r, LVIR_LABEL);
\r
2353 if (ppt->x > r.right)
\r
2357 lv.mask = LVIF_GROUPID;
\r
2360 int groupID = lv.iGroupId;
\r
2361 // now we search upwards and check if the item above this one
\r
2362 // belongs to another group. If it belongs to the same group,
\r
2363 // we're not over a group header
\r
2367 nItem = HitTest(pt, &flags);
\r
2368 if ((flags & LVHT_ONITEM)&&(nItem >= 0))
\r
2370 // the first item below the point
\r
2372 lv.mask = LVIF_GROUPID;
\r
2375 if (lv.iGroupId != groupID)
\r
2390 void CGitStatusListCtrl::OnContextMenuGroup(CWnd * /*pWnd*/, CPoint point)
\r
2392 POINT clientpoint = point;
\r
2393 ScreenToClient(&clientpoint);
\r
2394 if ((IsGroupViewEnabled())&&(GetGroupFromPoint(&clientpoint) >= 0))
\r
2397 if (popup.CreatePopupMenu())
\r
2400 temp.LoadString(IDS_STATUSLIST_CHECKGROUP);
\r
2401 popup.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CHECKGROUP, temp);
\r
2402 temp.LoadString(IDS_STATUSLIST_UNCHECKGROUP);
\r
2403 popup.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_UNCHECKGROUP, temp);
\r
2404 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2405 bool bCheck = false;
\r
2408 case IDSVNLC_CHECKGROUP:
\r
2410 // fall through here
\r
2411 case IDSVNLC_UNCHECKGROUP:
\r
2413 int group = GetGroupFromPoint(&clientpoint);
\r
2414 // go through all items and check/uncheck those assigned to the group
\r
2415 // but block the OnLvnItemChanged handler
\r
2418 for (int i=0; i<GetItemCount(); ++i)
\r
2420 SecureZeroMemory(&lv, sizeof(LVITEM));
\r
2421 lv.mask = LVIF_GROUPID;
\r
2424 if (lv.iGroupId == group)
\r
2426 FileEntry * entry = GetListEntry(i);
\r
2429 bool bOldCheck = !!GetCheck(i);
\r
2430 //SetEntryCheck(entry, i, bCheck);
\r
2431 if (bCheck != bOldCheck)
\r
2441 GetStatisticsString();
\r
2451 void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
\r
2454 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
2456 bool XPorLater = false;
\r
2457 OSVERSIONINFOEX inf;
\r
2458 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
2459 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
2460 GetVersionEx((OSVERSIONINFO *)&inf);
\r
2461 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
2462 if (fullver >= 0x0501)
\r
2464 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
\r
2465 CTGitPath * filepath;
\r
2467 int selIndex = GetSelectionMark();
\r
2468 if ((point.x == -1) && (point.y == -1))
\r
2471 GetItemRect(selIndex, &rect, LVIR_LABEL);
\r
2472 ClientToScreen(&rect);
\r
2473 point = rect.CenterPoint();
\r
2475 if ((GetSelectedCount() == 0)&&(XPorLater)&&(m_bHasCheckboxes))
\r
2477 // nothing selected could mean the context menu is requested for
\r
2479 OnContextMenuGroup(pWnd, point);
\r
2481 else if (selIndex >= 0)
\r
2483 //FileEntry * entry = GetListEntry(selIndex);
\r
2485 filepath = (CTGitPath * )GetItemData(selIndex);
\r
2487 ASSERT(filepath != NULL);
\r
2488 if (filepath == NULL)
\r
2491 //const CTGitPath& filepath = entry->path;
\r
2492 int wcStatus = filepath->m_Action;
\r
2493 // entry is selected, now show the popup menu
\r
2494 Locker lock(m_critSec);
\r
2496 CMenu changelistSubMenu;
\r
2497 CMenu ignoreSubMenu;
\r
2498 if (popup.CreatePopupMenu())
\r
2500 //Add Menu for verion controled file
\r
2501 if (!(wcStatus &CTGitPath::LOGACTIONS_UNVER))
\r
2503 if (m_dwContextMenus & SVNSLC_POPCOMPAREWITHBASE)
\r
2505 popup.AppendMenuIcon(IDSVNLC_COMPARE, IDS_LOG_COMPAREWITHBASE, IDI_DIFF);
\r
2506 popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2508 //Select one items
\r
2509 if (GetSelectedCount() == 1)
\r
2511 bool bEntryAdded = false;
\r
2512 //if (entry->remotestatus <= git_wc_status_normal)
\r
2514 // if (wcStatus > git_wc_status_normal)
\r
2516 // if ((m_dwContextMenus & SVNSLC_POPGNUDIFF)&&(wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing))
\r
2518 popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
\r
2519 bEntryAdded = true;
\r
2524 //else if (wcStatus != git_wc_status_deleted)
\r
2526 // if (m_dwContextMenus & SVNSLC_POPCOMPARE)
\r
2528 // popup.AppendMenuIcon(IDSVNLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
\r
2529 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2530 // bEntryAdded = true;
\r
2532 // if (m_dwContextMenus & SVNSLC_POPGNUDIFF)
\r
2534 // popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
\r
2535 // bEntryAdded = true;
\r
2539 popup.AppendMenu(MF_SEPARATOR);
\r
2541 //else if (GetSelectedCount() > 1)
\r
2543 // if (m_dwContextMenus & SVNSLC_POPCOMMIT)
\r
2545 // popup.AppendMenuIcon(IDSVNLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);
\r
2546 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
\r
2551 ///Select Multi item
\r
2552 //if (GetSelectedCount() > 0)
\r
2554 // if ((GetSelectedCount() == 2)&&(m_dwContextMenus & SVNSLC_POPREPAIRMOVE))
\r
2556 // POSITION pos = GetFirstSelectedItemPosition();
\r
2557 // int index = GetNextSelectedItem(pos);
\r
2558 // if (index >= 0)
\r
2560 // FileEntry * entry = GetListEntry(index);
\r
2561 // git_wc_status_kind status1 = git_wc_status_none;
\r
2562 // git_wc_status_kind status2 = git_wc_status_none;
\r
2564 // status1 = entry->status;
\r
2565 // index = GetNextSelectedItem(pos);
\r
2566 // if (index >= 0)
\r
2568 // entry = GetListEntry(index);
\r
2570 // status2 = entry->status;
\r
2571 // if ((status1 == git_wc_status_missing && status2 == git_wc_status_unversioned) ||
\r
2572 // (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned))
\r
2574 // popup.AppendMenuIcon(IDSVNLC_REPAIRMOVE, IDS_STATUSLIST_CONTEXT_REPAIRMOVE);
\r
2579 // if (wcStatus > git_wc_status_normal)
\r
2581 // if (m_dwContextMenus & SVNSLC_POPREVERT)
\r
2583 // // reverting missing folders is not possible
\r
2584 // if (!entry->IsFolder() || (wcStatus != git_wc_status_missing))
\r
2586 // popup.AppendMenuIcon(IDSVNLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
\r
2590 // if (entry->remotestatus > git_wc_status_normal)
\r
2592 // if (m_dwContextMenus & SVNSLC_POPUPDATE)
\r
2594 // popup.AppendMenuIcon(IDSVNLC_UPDATE, IDS_MENUUPDATE, IDI_UPDATE);
\r
2598 if ((GetSelectedCount() == 1)&&(!wcStatus & CTGitPath::LOGACTIONS_UNVER)
\r
2599 &&(!wcStatus & CTGitPath::LOGACTIONS_IGNORE))
\r
2601 if (m_dwContextMenus & SVNSLC_POPSHOWLOG)
\r
2603 popup.AppendMenuIcon(IDSVNLC_LOG, IDS_REPOBROWSE_SHOWLOG, IDI_LOG);
\r
2605 // if (m_dwContextMenus & SVNSLC_POPBLAME)
\r
2607 // popup.AppendMenuIcon(IDSVNLC_BLAME, IDS_MENUBLAME, IDI_BLAME);
\r
2610 // if ((wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing) && (GetSelectedCount() == 1))
\r
2612 if (m_dwContextMenus & SVNSLC_POPOPEN)
\r
2614 popup.AppendMenuIcon(IDSVNLC_OPEN, IDS_REPOBROWSE_OPEN, IDI_OPEN);
\r
2615 popup.AppendMenuIcon(IDSVNLC_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
\r
2617 if (m_dwContextMenus & SVNSLC_POPEXPLORE)
\r
2619 popup.AppendMenuIcon(IDSVNLC_EXPLORE, IDS_STATUSLIST_CONTEXT_EXPLORE, IDI_EXPLORER);
\r
2622 if (GetSelectedCount() > 0)
\r
2624 // if (((wcStatus == git_wc_status_unversioned)||(wcStatus == git_wc_status_ignored))&&(m_dwContextMenus & SVNSLC_POPDELETE))
\r
2626 // popup.AppendMenuIcon(IDSVNLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
\r
2628 // 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
2631 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVEKEEP, IDI_DELETE);
\r
2633 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVE, IDI_DELETE);
\r
2635 if ((wcStatus & CTGitPath::LOGACTIONS_UNVER)/*||(wcStatus == git_wc_status_deleted)*/)
\r
2637 if (m_dwContextMenus & SVNSLC_POPADD)
\r
2639 //if ( entry->IsFolder() )
\r
2641 // popup.AppendMenuIcon(IDSVNLC_ADD_RECURSIVE, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE, IDI_ADD);
\r
2645 popup.AppendMenuIcon(IDSVNLC_ADD, IDS_STATUSLIST_CONTEXT_ADD, IDI_ADD);
\r
2649 //if ( (wcStatus == git_wc_status_unversioned) || (wcStatus == git_wc_status_deleted) )
\r
2651 if (m_dwContextMenus & SVNSLC_POPIGNORE)
\r
2654 CTGitPathList ignorelist;
\r
2655 FillListOfSelectedItemPaths(ignorelist);
\r
2656 //check if all selected entries have the same extension
\r
2657 bool bSameExt = true;
\r
2659 for (int i=0; i<ignorelist.GetCount(); ++i)
\r
2661 if (sExt.IsEmpty() && (i==0))
\r
2662 sExt = ignorelist[i].GetFileExtension();
\r
2663 else if (sExt.CompareNoCase(ignorelist[i].GetFileExtension())!=0)
\r
2668 if (ignoreSubMenu.CreateMenu())
\r
2670 CString ignorepath;
\r
2671 if (ignorelist.GetCount()==1)
\r
2672 ignorepath = ignorelist[0].GetFileOrDirectoryName();
\r
2674 ignorepath.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
\r
2675 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_IGNORE, ignorepath);
\r
2676 ignorepath = _T("*")+sExt;
\r
2677 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_IGNOREMASK, ignorepath);
\r
2679 temp.LoadString(IDS_MENUIGNORE);
\r
2680 popup.InsertMenu((UINT)-1, MF_BYPOSITION | MF_POPUP, (UINT_PTR)ignoreSubMenu.m_hMenu, temp);
\r
2686 if (ignorelist.GetCount()==1)
\r
2688 temp.LoadString(IDS_MENUIGNORE);
\r
2692 temp.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
\r
2694 popup.AppendMenuIcon(IDSVNLC_IGNORE, temp, IDI_IGNORE);
\r
2700 if (((wcStatus == git_wc_status_conflicted)||(entry->isConflicted)))
\r
2702 if ((m_dwContextMenus & SVNSLC_POPCONFLICT)||(m_dwContextMenus & SVNSLC_POPRESOLVE))
\r
2703 popup.AppendMenu(MF_SEPARATOR);
\r
2705 if ((m_dwContextMenus & SVNSLC_POPCONFLICT)&&(entry->textstatus == git_wc_status_conflicted))
\r
2707 popup.AppendMenuIcon(IDSVNLC_EDITCONFLICT, IDS_MENUCONFLICT, IDI_CONFLICT);
\r
2709 if (m_dwContextMenus & SVNSLC_POPRESOLVE)
\r
2711 popup.AppendMenuIcon(IDSVNLC_RESOLVECONFLICT, IDS_STATUSLIST_CONTEXT_RESOLVED, IDI_RESOLVE);
\r
2713 if ((m_dwContextMenus & SVNSLC_POPRESOLVE)&&(entry->textstatus == git_wc_status_conflicted))
\r
2715 popup.AppendMenuIcon(IDSVNLC_RESOLVETHEIRS, IDS_SVNPROGRESS_MENUUSETHEIRS, IDI_RESOLVE);
\r
2716 popup.AppendMenuIcon(IDSVNLC_RESOLVEMINE, IDS_SVNPROGRESS_MENUUSEMINE, IDI_RESOLVE);
\r
2721 if (GetSelectedCount() > 0)
\r
2724 if ((!entry->IsFolder())&&(wcStatus >= git_wc_status_normal)
\r
2725 &&(wcStatus!=git_wc_status_missing)&&(wcStatus!=git_wc_status_deleted)
\r
2726 &&(wcStatus!=git_wc_status_added))
\r
2728 popup.AppendMenu(MF_SEPARATOR);
\r
2729 if ((entry->lock_token.IsEmpty())&&(!entry->IsFolder()))
\r
2731 if (m_dwContextMenus & SVNSLC_POPLOCK)
\r
2733 popup.AppendMenuIcon(IDSVNLC_LOCK, IDS_MENU_LOCK, IDI_LOCK);
\r
2736 if ((!entry->lock_token.IsEmpty())&&(!entry->IsFolder()))
\r
2738 if (m_dwContextMenus & SVNSLC_POPUNLOCK)
\r
2740 popup.AppendMenuIcon(IDSVNLC_UNLOCK, IDS_MENU_UNLOCK, IDI_UNLOCK);
\r
2745 if ((!entry->IsFolder())&&((!entry->lock_token.IsEmpty())||(!entry->lock_remotetoken.IsEmpty())))
\r
2747 if (m_dwContextMenus & SVNSLC_POPUNLOCKFORCE)
\r
2749 popup.AppendMenuIcon(IDSVNLC_UNLOCKFORCE, IDS_MENU_UNLOCKFORCE, IDI_UNLOCK);
\r
2753 if (wcStatus != git_wc_status_missing && wcStatus != git_wc_status_deleted &&wcStatus!=git_wc_status_unversioned)
\r
2755 popup.AppendMenu(MF_SEPARATOR);
\r
2756 popup.AppendMenuIcon(IDSVNLC_PROPERTIES, IDS_STATUSLIST_CONTEXT_PROPERTIES, IDI_PROPERTIES);
\r
2758 popup.AppendMenu(MF_SEPARATOR);
\r
2759 popup.AppendMenuIcon(IDSVNLC_COPY, IDS_STATUSLIST_CONTEXT_COPY, IDI_COPYCLIP);
\r
2760 popup.AppendMenuIcon(IDSVNLC_COPYEXT, IDS_STATUSLIST_CONTEXT_COPYEXT, IDI_COPYCLIP);
\r
2761 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS)&&(XPorLater)
\r
2762 &&(wcStatus != git_wc_status_unversioned)&&(wcStatus != git_wc_status_none))
\r
2764 popup.AppendMenu(MF_SEPARATOR);
\r
2765 // changelist commands
\r
2766 size_t numChangelists = GetNumberOfChangelistsInSelection();
\r
2767 if (numChangelists > 0)
\r
2769 popup.AppendMenuIcon(IDSVNLC_REMOVEFROMCS, IDS_STATUSLIST_CONTEXT_REMOVEFROMCS);
\r
2771 if ((!entry->IsFolder())&&(changelistSubMenu.CreateMenu()))
\r
2774 temp.LoadString(IDS_STATUSLIST_CONTEXT_CREATECS);
\r
2775 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATECS, temp);
\r
2777 if (entry->changelist.Compare(SVNSLC_IGNORECHANGELIST))
\r
2779 changelistSubMenu.AppendMenu(MF_SEPARATOR);
\r
2780 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATEIGNORECS, SVNSLC_IGNORECHANGELIST);
\r
2783 if (m_changelists.size() > 0)
\r
2785 // find the changelist names
\r
2786 bool bNeedSeparator = true;
\r
2787 int cmdID = IDSVNLC_MOVETOCS;
\r
2788 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
2790 if ((entry->changelist.Compare(it->first))&&(it->first.Compare(SVNSLC_IGNORECHANGELIST)))
\r
2792 if (bNeedSeparator)
\r
2794 changelistSubMenu.AppendMenu(MF_SEPARATOR);
\r
2795 bNeedSeparator = false;
\r
2797 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, cmdID, it->first);
\r
2802 temp.LoadString(IDS_STATUSLIST_CONTEXT_MOVETOCS);
\r
2803 popup.AppendMenu(MF_POPUP|MF_STRING, (UINT_PTR)changelistSubMenu.GetSafeHmenu(), temp);
\r
2808 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
2811 AfxGetApp()->DoWaitCursor(1);
\r
2812 int iItemCountBeforeMenuCmd = GetItemCount();
\r
2813 bool bForce = false;
\r
2816 case IDSVNLC_OPEN:
\r
2818 int ret = (int)ShellExecute(this->m_hWnd, NULL, filepath->GetWinPath(), NULL, NULL, SW_SHOW);
\r
2819 if (ret <= HINSTANCE_ERROR)
\r
2821 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
2822 cmd += filepath->GetWinPath();
\r
2823 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
2827 case IDSVNLC_OPENWITH:
\r
2829 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
2830 cmd += filepath->GetWinPathString() + _T(" ");
\r
2831 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
2834 case IDSVNLC_EXPLORE:
\r
2836 ShellExecute(this->m_hWnd, _T("explore"), filepath->GetWinPath(), NULL, NULL, SW_SHOW);
\r
2839 case IDSVNLC_COMPARE:
\r
2841 POSITION pos = GetFirstSelectedItemPosition();
\r
2844 int index = GetNextSelectedItem(pos);
\r
2849 case IDSVNLC_GNUDIFF1:
\r
2851 // SVNDiff diff(NULL, this->m_hWnd, true);
\r
2853 // if (entry->remotestatus <= git_wc_status_normal)
\r
2854 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
\r
2856 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
\r
2857 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,GitRev::GetWorkingCopy(),
\r
2858 *filepath,GitRev::GetHead());
\r
2862 { // The add went ok, but we now need to run through the selected items again
\r
2863 // and update their status
\r
2864 POSITION pos = GetFirstSelectedItemPosition();
\r
2866 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
2868 CTGitPath * path=(CTGitPath*)GetItemData(index);
\r
2870 cmd.Format(_T("git.cmd add %s"),path->GetGitPathString());
\r
2872 g_Git.Run(cmd,&output);
\r
2873 path->m_Action = CTGitPath::LOGACTIONS_ADDED;
\r
2874 SetEntryCheck(path,index,true);
\r
2875 SetItemGroup(index,0);
\r
2876 this->m_StatusFileList.AddPath(*path);
\r
2877 this->m_UnRevFileList.RemoveItem(*path);
\r
2878 this->m_IgnoreFileList.RemoveItem(*path);
\r
2884 case IDSVNLC_COPY:
\r
2885 CopySelectedEntriesToClipboard(0);
\r
2887 case IDSVNLC_COPYEXT:
\r
2888 CopySelectedEntriesToClipboard((DWORD)-1);
\r
2890 case IDSVNLC_PROPERTIES:
\r
2892 CTSVNPathList targetList;
\r
2893 FillListOfSelectedItemPaths(targetList);
\r
2894 CEditPropertiesDlg dlg;
\r
2895 dlg.SetPathList(targetList);
\r
2897 if (dlg.HasChanged())
\r
2899 // since the user might have changed/removed/added
\r
2900 // properties recursively, we don't really know
\r
2901 // which items have changed their status.
\r
2902 // So tell the parent to do a refresh.
\r
2903 CWnd* pParent = GetParent();
\r
2904 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
2906 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
2911 case IDSVNLC_COMMIT:
\r
2913 CTSVNPathList targetList;
\r
2914 FillListOfSelectedItemPaths(targetList);
\r
2915 CTSVNPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
\r
2916 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
\r
2917 CString commandline = CPathUtils::GetAppDirectory();
\r
2918 commandline += _T("TortoiseProc.exe /command:commit /pathfile:\"");
\r
2919 commandline += tempFile.GetWinPathString();
\r
2920 commandline += _T("\"");
\r
2921 commandline += _T(" /deletepathfile");
\r
2922 CAppUtils::LaunchApplication(commandline, NULL, false);
\r
2925 case IDSVNLC_REVERT:
\r
2927 // If at least one item is not in the status "added"
\r
2928 // we ask for a confirmation
\r
2929 BOOL bConfirm = FALSE;
\r
2930 POSITION pos = GetFirstSelectedItemPosition();
\r
2932 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
2934 FileEntry * fentry = GetListEntry(index);
\r
2935 if (fentry->textstatus != git_wc_status_added)
\r
2943 str.Format(IDS_PROC_WARNREVERT,GetSelectedCount());
\r
2945 if (!bConfirm || CMessageBox::Show(this->m_hWnd, str, _T("TortoiseSVN"), MB_YESNO | MB_ICONQUESTION)==IDYES)
\r
2947 CTSVNPathList targetList;
\r
2948 FillListOfSelectedItemPaths(targetList);
\r
2950 // make sure that the list is reverse sorted, so that
\r
2951 // children are removed before any parents
\r
2952 targetList.SortByPathname(true);
\r
2956 // put all reverted files in the trashbin, except the ones with 'added'
\r
2957 // status because they are not restored by the revert.
\r
2958 CTSVNPathList delList;
\r
2959 POSITION pos = GetFirstSelectedItemPosition();
\r
2961 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
2963 FileEntry * entry = GetListEntry(index);
\r
2964 if (entry->status != git_wc_status_added)
\r
2965 delList.AddPath(entry->GetPath());
\r
2967 if (DWORD(CRegDWORD(_T("Software\\TortoiseSVN\\RevertWithRecycleBin"), TRUE)))
\r
2968 delList.DeleteAllFiles(true);
\r
2970 if (!git.Revert(targetList, CStringArray(), FALSE))
\r
2972 CMessageBox::Show(this->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
2976 // since the entries got reverted we need to remove
\r
2977 // them from the list too, if no remote changes are shown,
\r
2978 // if the unmodified files are not shown
\r
2979 // and if the item is not part of a changelist
\r
2982 while ((pos = GetFirstSelectedItemPosition())!=0)
\r
2985 index = GetNextSelectedItem(pos);
\r
2986 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
\r
2987 if ( fentry->IsFolder() )
\r
2990 CWnd* pParent = GetParent();
\r
2991 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
2993 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
2998 BOOL bAdded = (fentry->textstatus == git_wc_status_added);
\r
2999 fentry->status = git_wc_status_normal;
\r
3000 fentry->propstatus = git_wc_status_normal;
\r
3001 fentry->textstatus = git_wc_status_normal;
\r
3002 fentry->copied = false;
\r
3003 fentry->isConflicted = false;
\r
3004 if ((fentry->GetChangeList().IsEmpty()&&(fentry->remotestatus <= git_wc_status_normal))||(m_dwShow & SVNSLC_SHOWNORMAL))
\r
3008 // reverting added items makes them unversioned, not 'normal'
\r
3009 if (fentry->IsFolder())
\r
3010 fentry->propstatus = git_wc_status_none;
\r
3012 fentry->propstatus = git_wc_status_unversioned;
\r
3013 fentry->status = git_wc_status_unversioned;
\r
3014 fentry->textstatus = git_wc_status_unversioned;
\r
3015 SetItemState(index, 0, LVIS_SELECTED);
\r
3016 SetEntryCheck(fentry, index, false);
\r
3018 else if ((fentry->switched)||(m_dwShow & SVNSLC_SHOWNORMAL))
\r
3020 SetItemState(index, 0, LVIS_SELECTED);
\r
3025 if (GetCheck(index))
\r
3027 RemoveListEntry(index);
\r
3033 SetItemState(index, 0, LVIS_SELECTED);
\r
3037 SaveColumnWidths();
\r
3038 Show(m_dwShow, 0, m_bShowFolders);
\r
3044 case IDSVNLC_COMPARE:
\r
3046 POSITION pos = GetFirstSelectedItemPosition();
\r
3049 int index = GetNextSelectedItem(pos);
\r
3054 case IDSVNLC_COMPAREWC:
\r
3056 POSITION pos = GetFirstSelectedItemPosition();
\r
3059 int index = GetNextSelectedItem(pos);
\r
3060 FileEntry * entry = GetListEntry(index);
\r
3061 ASSERT(entry != NULL);
\r
3062 if (entry == NULL)
\r
3064 SVNDiff diff(NULL, m_hWnd, true);
\r
3065 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
3066 git_revnum_t baseRev = entry->Revision;
\r
3067 diff.DiffFileAgainstBase(
\r
3068 entry->path, baseRev, entry->textstatus, entry->propstatus);
\r
3072 case IDSVNLC_GNUDIFF1:
\r
3074 SVNDiff diff(NULL, this->m_hWnd, true);
\r
3076 if (entry->remotestatus <= git_wc_status_normal)
\r
3077 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
\r
3079 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
\r
3082 case IDSVNLC_UPDATE:
\r
3084 CTSVNPathList targetList;
\r
3085 FillListOfSelectedItemPaths(targetList);
\r
3086 bool bAllExist = true;
\r
3087 for (int i=0; i<targetList.GetCount(); ++i)
\r
3089 if (!targetList[i].Exists())
\r
3091 bAllExist = false;
\r
3097 CSVNProgressDlg dlg;
\r
3098 dlg.SetCommand(CSVNProgressDlg::SVNProgress_Update);
\r
3099 dlg.SetPathList(targetList);
\r
3100 dlg.SetRevision(SVNRev::REV_HEAD);
\r
3105 CString sTempFile = CTempFiles::Instance().GetTempFilePath(false).GetWinPathString();
\r
3106 targetList.WriteToFile(sTempFile, false);
\r
3108 sCmd.Format(_T("\"%s\" /command:update /rev /pathfile:\"%s\" /deletepathfile"),
\r
3109 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), (LPCTSTR)sTempFile);
\r
3111 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
3118 sCmd.Format(_T("\"%s\" /command:log /path:\"%s\""),
\r
3119 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), filepath.GetWinPath());
\r
3121 if (!filepath.IsUrl())
\r
3123 sCmd += _T(" /propspath:\"");
\r
3124 sCmd += filepath.GetWinPathString();
\r
3128 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
3131 case IDSVNLC_BLAME:
\r
3134 sCmd.Format(_T("\"%s\" /command:blame /path:\"%s\""),
\r
3135 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), filepath.GetWinPath());
\r
3137 if (!filepath.IsUrl())
\r
3139 sCmd += _T(" /propspath:\"");
\r
3140 sCmd += filepath.GetWinPathString();
\r
3144 CAppUtils::LaunchApplication(sCmd, NULL, false);
\r
3147 case IDSVNLC_OPEN:
\r
3149 int ret = (int)ShellExecute(this->m_hWnd, NULL, filepath.GetWinPath(), NULL, NULL, SW_SHOW);
\r
3150 if (ret <= HINSTANCE_ERROR)
\r
3152 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
3153 cmd += filepath.GetWinPathString();
\r
3154 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
3158 case IDSVNLC_OPENWITH:
\r
3160 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
3161 cmd += filepath.GetWinPathString() + _T(" ");
\r
3162 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
3165 case IDSVNLC_EXPLORE:
\r
3167 ShellExecute(this->m_hWnd, _T("explore"), filepath.GetDirectory().GetWinPath(), NULL, NULL, SW_SHOW);
\r
3170 case IDSVNLC_REMOVE:
\r
3173 CTSVNPathList itemsToRemove;
\r
3174 FillListOfSelectedItemPaths(itemsToRemove);
\r
3176 // We must sort items before removing, so that files are always removed
\r
3177 // *before* their parents
\r
3178 itemsToRemove.SortByPathname(true);
\r
3180 bool bSuccess = false;
\r
3181 if (git.Remove(itemsToRemove, FALSE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))
\r
3187 if ((git.Err->apr_err == SVN_ERR_UNVERSIONED_RESOURCE) ||
\r
3188 (git.Err->apr_err == SVN_ERR_CLIENT_MODIFIED))
\r
3190 CString msg, yes, no, yestoall;
\r
3191 msg.Format(IDS_PROC_REMOVEFORCE, (LPCTSTR)git.GetLastErrorMessage());
\r
3192 yes.LoadString(IDS_MSGBOX_YES);
\r
3193 no.LoadString(IDS_MSGBOX_NO);
\r
3194 yestoall.LoadString(IDS_PROC_YESTOALL);
\r
3195 UINT ret = CMessageBox::Show(m_hWnd, msg, _T("TortoiseSVN"), 2, IDI_ERROR, yes, no, yestoall);
\r
3196 if ((ret == 1)||(ret==3))
\r
3198 if (!git.Remove(itemsToRemove, TRUE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))
\r
3200 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3207 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3211 // The remove went ok, but we now need to run through the selected items again
\r
3212 // and update their status
\r
3213 POSITION pos = GetFirstSelectedItemPosition();
\r
3215 std::vector<int> entriesToRemove;
\r
3216 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3218 FileEntry * e = GetListEntry(index);
\r
3220 ((e->textstatus == git_wc_status_unversioned)||
\r
3221 (e->textstatus == git_wc_status_none)||
\r
3222 (e->textstatus == git_wc_status_ignored)))
\r
3224 if (GetCheck(index))
\r
3227 entriesToRemove.push_back(index);
\r
3231 e->textstatus = git_wc_status_deleted;
\r
3232 e->status = git_wc_status_deleted;
\r
3233 SetEntryCheck(e,index,true);
\r
3236 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)
\r
3238 RemoveListEntry(*it);
\r
3241 SaveColumnWidths();
\r
3242 Show(m_dwShow, 0, m_bShowFolders);
\r
3246 case IDSVNLC_DELETE:
\r
3248 CTSVNPathList pathlist;
\r
3249 FillListOfSelectedItemPaths(pathlist);
\r
3250 pathlist.RemoveChildren();
\r
3252 for (INT_PTR i=0; i<pathlist.GetCount(); ++i)
\r
3254 filelist += pathlist[i].GetWinPathString();
\r
3255 filelist += _T("|");
\r
3257 filelist += _T("|");
\r
3258 int len = filelist.GetLength();
\r
3259 TCHAR * buf = new TCHAR[len+2];
\r
3260 _tcscpy_s(buf, len+2, filelist);
\r
3261 for (int i=0; i<len; ++i)
\r
3262 if (buf[i] == '|')
\r
3264 SHFILEOPSTRUCT fileop;
\r
3265 fileop.hwnd = this->m_hWnd;
\r
3266 fileop.wFunc = FO_DELETE;
\r
3267 fileop.pFrom = buf;
\r
3268 fileop.pTo = NULL;
\r
3269 fileop.fFlags = FOF_NO_CONNECTED_ELEMENTS | ((GetAsyncKeyState(VK_SHIFT) & 0x8000) ? 0 : FOF_ALLOWUNDO);
\r
3270 fileop.lpszProgressTitle = _T("deleting file");
\r
3271 int result = SHFileOperation(&fileop);
\r
3274 if ( (result==0) && (!fileop.fAnyOperationsAborted) )
\r
3277 POSITION pos = NULL;
\r
3278 CTSVNPathList deletedlist; // to store list of deleted folders
\r
3279 while ((pos = GetFirstSelectedItemPosition()) != 0)
\r
3281 int index = GetNextSelectedItem(pos);
\r
3282 if (GetCheck(index))
\r
3285 FileEntry * fentry = GetListEntry(index);
\r
3286 if ((fentry)&&(fentry->isfolder))
\r
3287 deletedlist.AddPath(fentry->path);
\r
3288 RemoveListEntry(index);
\r
3290 // now go through the list of deleted folders
\r
3291 // and remove all their children from the list too!
\r
3292 int nListboxEntries = GetItemCount();
\r
3293 for (int folderindex = 0; folderindex < deletedlist.GetCount(); ++folderindex)
\r
3295 CTSVNPath folderpath = deletedlist[folderindex];
\r
3296 for (int i=0; i<nListboxEntries; ++i)
\r
3298 FileEntry * entry = GetListEntry(i);
\r
3299 if (folderpath.IsAncestorOf(entry->path))
\r
3301 RemoveListEntry(i--);
\r
3302 nListboxEntries--;
\r
3310 case IDSVNLC_IGNOREMASK:
\r
3312 CString name = _T("*")+filepath.GetFileExtension();
\r
3313 CTSVNPathList ignorelist;
\r
3314 FillListOfSelectedItemPaths(ignorelist, true);
\r
3315 std::set<CTSVNPath> parentlist;
\r
3316 for (int i=0; i<ignorelist.GetCount(); ++i)
\r
3318 parentlist.insert(ignorelist[i].GetContainingDirectory());
\r
3320 std::set<CTSVNPath>::iterator it;
\r
3321 std::vector<CString> toremove;
\r
3323 for (it = parentlist.begin(); it != parentlist.end(); ++it)
\r
3325 CTSVNPath parentFolder = (*it).GetDirectory();
\r
3326 SVNProperties props(parentFolder, SVNRev::REV_WC, false);
\r
3328 for (int i=0; i<props.GetCount(); i++)
\r
3330 CString propname(props.GetItemName(i).c_str());
\r
3331 if (propname.CompareNoCase(_T("git:ignore"))==0)
\r
3334 // treat values as normal text even if they're not
\r
3335 value = (char *)props.GetItemValue(i).c_str();
\r
3338 if (value.IsEmpty())
\r
3342 value = value.Trim("\n\r");
\r
3345 value.Remove('\r');
\r
3347 if (!props.Add(_T("git:ignore"), (LPCSTR)value))
\r
3350 temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
\r
3351 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);
\r
3355 CTSVNPath basepath;
\r
3356 int nListboxEntries = GetItemCount();
\r
3357 for (int i=0; i<nListboxEntries; ++i)
\r
3359 FileEntry * entry = GetListEntry(i);
\r
3360 ASSERT(entry != NULL);
\r
3361 if (entry == NULL)
\r
3363 if (basepath.IsEmpty())
\r
3364 basepath = entry->basepath;
\r
3365 // since we ignored files with a mask (e.g. *.exe)
\r
3366 // we have to find find all files in the same
\r
3367 // folder (IsAncestorOf() returns TRUE for _all_ children,
\r
3368 // not just the immediate ones) which match the
\r
3369 // mask and remove them from the list too.
\r
3370 if ((entry->status == git_wc_status_unversioned)&&(parentFolder.IsAncestorOf(entry->path)))
\r
3372 CString f = entry->path.GetSVNPathString();
\r
3373 if (f.Mid(parentFolder.GetSVNPathString().GetLength()).Find('/')<=0)
\r
3375 if (CStringUtils::WildCardMatch(name, f))
\r
3380 toremove.push_back(f);
\r
3385 if (!m_bIgnoreRemoveOnly)
\r
3388 git_wc_status2_t * s;
\r
3389 CTSVNPath gitPath;
\r
3390 s = status.GetFirstFileStatus(parentFolder, gitPath, false, git_depth_empty);
\r
3393 // first check if the folder isn't already present in the list
\r
3394 bool bFound = false;
\r
3395 for (int i=0; i<nListboxEntries; ++i)
\r
3397 FileEntry * entry = GetListEntry(i);
\r
3398 if (entry->path.IsEquivalentTo(gitPath))
\r
3406 FileEntry * entry = new FileEntry();
\r
3407 entry->path = gitPath;
\r
3408 entry->basepath = basepath;
\r
3409 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
3410 entry->textstatus = s->text_status;
\r
3411 entry->propstatus = s->prop_status;
\r
3412 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);
\r
3413 entry->remotetextstatus = s->repos_text_status;
\r
3414 entry->remotepropstatus = s->repos_prop_status;
\r
3415 entry->inunversionedfolder = false;
\r
3416 entry->checked = true;
\r
3417 entry->inexternal = false;
\r
3418 entry->direct = false;
\r
3419 entry->isfolder = true;
\r
3420 entry->last_commit_date = 0;
\r
3421 entry->last_commit_rev = 0;
\r
3422 entry->remoterev = 0;
\r
3425 if (s->entry->url)
\r
3427 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));
\r
3430 if (s->entry && s->entry->present_props)
\r
3432 entry->present_props = s->entry->present_props;
\r
3434 m_arStatusArray.push_back(entry);
\r
3435 m_arListArray.push_back(m_arStatusArray.size()-1);
\r
3436 AddEntry(entry, langID, GetItemCount());
\r
3442 for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)
\r
3444 int nListboxEntries = GetItemCount();
\r
3445 for (int i=0; i<nListboxEntries; ++i)
\r
3447 if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)
\r
3449 RemoveListEntry(i);
\r
3457 case IDSVNLC_IGNORE:
\r
3459 CTSVNPathList ignorelist;
\r
3460 std::vector<CString> toremove;
\r
3461 FillListOfSelectedItemPaths(ignorelist, true);
\r
3463 for (int j=0; j<ignorelist.GetCount(); ++j)
\r
3465 int nListboxEntries = GetItemCount();
\r
3466 for (int i=0; i<nListboxEntries; ++i)
\r
3468 if (GetListEntry(i)->GetPath().IsEquivalentTo(ignorelist[j]))
\r
3474 CString name = CPathUtils::PathPatternEscape(ignorelist[j].GetFileOrDirectoryName());
\r
3475 CTSVNPath parentfolder = ignorelist[j].GetContainingDirectory();
\r
3476 SVNProperties props(parentfolder, SVNRev::REV_WC, false);
\r
3478 for (int i=0; i<props.GetCount(); i++)
\r
3480 CString propname(props.GetItemName(i).c_str());
\r
3481 if (propname.CompareNoCase(_T("git:ignore"))==0)
\r
3484 // treat values as normal text even if they're not
\r
3485 value = (char *)props.GetItemValue(i).c_str();
\r
3488 if (value.IsEmpty())
\r
3492 value = value.Trim("\n\r");
\r
3495 value.Remove('\r');
\r
3497 if (!props.Add(_T("git:ignore"), (LPCSTR)value))
\r
3500 temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
\r
3501 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseSVN"), MB_ICONERROR);
\r
3504 if (GetCheck(selIndex))
\r
3508 // now, if we ignored a folder, remove all its children
\r
3509 if (ignorelist[j].IsDirectory())
\r
3511 for (int i=0; i<(int)m_arListArray.size(); ++i)
\r
3513 FileEntry * entry = GetListEntry(i);
\r
3514 if (entry->status == git_wc_status_unversioned)
\r
3516 if (!ignorelist[j].IsEquivalentTo(entry->GetPath())&&(ignorelist[j].IsAncestorOf(entry->GetPath())))
\r
3518 entry->status = git_wc_status_ignored;
\r
3519 entry->textstatus = git_wc_status_ignored;
\r
3522 toremove.push_back(entry->GetPath().GetSVNPathString());
\r
3528 CTSVNPath basepath = m_arStatusArray[m_arListArray[selIndex]]->basepath;
\r
3530 FileEntry * entry = m_arStatusArray[m_arListArray[selIndex]];
\r
3531 if ( entry->status == git_wc_status_unversioned ) // keep "deleted" items
\r
3532 toremove.push_back(entry->GetPath().GetSVNPathString());
\r
3534 if (!m_bIgnoreRemoveOnly)
\r
3537 git_wc_status2_t * s;
\r
3538 CTSVNPath gitPath;
\r
3539 s = status.GetFirstFileStatus(parentfolder, gitPath, false, git_depth_empty);
\r
3540 // first check if the folder isn't already present in the list
\r
3541 bool bFound = false;
\r
3542 nListboxEntries = GetItemCount();
\r
3543 for (int i=0; i<nListboxEntries; ++i)
\r
3545 FileEntry * entry = GetListEntry(i);
\r
3546 if (entry->path.IsEquivalentTo(gitPath))
\r
3556 FileEntry * entry = new FileEntry();
\r
3557 entry->path = gitPath;
\r
3558 entry->basepath = basepath;
\r
3559 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);
\r
3560 entry->textstatus = s->text_status;
\r
3561 entry->propstatus = s->prop_status;
\r
3562 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);
\r
3563 entry->remotetextstatus = s->repos_text_status;
\r
3564 entry->remotepropstatus = s->repos_prop_status;
\r
3565 entry->inunversionedfolder = FALSE;
\r
3566 entry->checked = true;
\r
3567 entry->inexternal = false;
\r
3568 entry->direct = false;
\r
3569 entry->isfolder = true;
\r
3570 entry->last_commit_date = 0;
\r
3571 entry->last_commit_rev = 0;
\r
3572 entry->remoterev = 0;
\r
3575 if (s->entry->url)
\r
3577 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));
\r
3580 if (s->entry && s->entry->present_props)
\r
3582 entry->present_props = s->entry->present_props;
\r
3584 m_arStatusArray.push_back(entry);
\r
3585 m_arListArray.push_back(m_arStatusArray.size()-1);
\r
3586 AddEntry(entry, langID, GetItemCount());
\r
3591 for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)
\r
3593 int nListboxEntries = GetItemCount();
\r
3594 for (int i=0; i<nListboxEntries; ++i)
\r
3596 if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)
\r
3598 RemoveListEntry(i);
\r
3606 case IDSVNLC_EDITCONFLICT:
\r
3607 SVNDiff::StartConflictEditor(filepath);
\r
3609 case IDSVNLC_RESOLVECONFLICT:
\r
3610 case IDSVNLC_RESOLVEMINE:
\r
3611 case IDSVNLC_RESOLVETHEIRS:
\r
3613 git_wc_conflict_choice_t result = git_wc_conflict_choose_merged;
\r
3616 case IDSVNLC_RESOLVETHEIRS:
\r
3617 result = git_wc_conflict_choose_theirs_full;
\r
3619 case IDSVNLC_RESOLVEMINE:
\r
3620 result = git_wc_conflict_choose_mine_full;
\r
3622 case IDSVNLC_RESOLVECONFLICT:
\r
3623 result = git_wc_conflict_choose_merged;
\r
3626 if (CMessageBox::Show(m_hWnd, IDS_PROC_RESOLVE, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO)==IDYES)
\r
3629 POSITION pos = GetFirstSelectedItemPosition();
\r
3633 index = GetNextSelectedItem(pos);
\r
3634 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
\r
3635 if (!git.Resolve(fentry->GetPath(), result, FALSE))
\r
3637 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3641 fentry->status = git_wc_status_modified;
\r
3642 fentry->textstatus = git_wc_status_modified;
\r
3643 fentry->isConflicted = false;
\r
3646 Show(m_dwShow, 0, m_bShowFolders);
\r
3653 CTSVNPathList itemsToAdd;
\r
3654 FillListOfSelectedItemPaths(itemsToAdd);
\r
3656 // We must sort items before adding, so that folders are always added
\r
3657 // *before* any of their children
\r
3658 itemsToAdd.SortByPathname();
\r
3660 ProjectProperties props;
\r
3661 props.ReadPropsPathList(itemsToAdd);
\r
3662 if (git.Add(itemsToAdd, &props, git_depth_empty, TRUE, TRUE, TRUE))
\r
3664 // The add went ok, but we now need to run through the selected items again
\r
3665 // and update their status
\r
3666 POSITION pos = GetFirstSelectedItemPosition();
\r
3668 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3670 FileEntry * e = GetListEntry(index);
\r
3671 e->textstatus = git_wc_status_added;
\r
3672 e->propstatus = git_wc_status_none;
\r
3673 e->status = git_wc_status_added;
\r
3674 SetEntryCheck(e,index,true);
\r
3679 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3681 SaveColumnWidths();
\r
3682 Show(m_dwShow, 0, m_bShowFolders);
\r
3686 case IDSVNLC_ADD_RECURSIVE:
\r
3688 CTSVNPathList itemsToAdd;
\r
3689 FillListOfSelectedItemPaths(itemsToAdd);
\r
3692 dlg.m_pathList = itemsToAdd;
\r
3693 if (dlg.DoModal() == IDOK)
\r
3695 if (dlg.m_pathList.GetCount() == 0)
\r
3697 CSVNProgressDlg progDlg;
\r
3698 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Add);
\r
3699 progDlg.SetPathList(dlg.m_pathList);
\r
3700 ProjectProperties props;
\r
3701 props.ReadPropsPathList(dlg.m_pathList);
\r
3702 progDlg.SetProjectProperties(props);
\r
3703 progDlg.SetItemCount(dlg.m_pathList.GetCount());
\r
3704 progDlg.DoModal();
\r
3707 CWnd* pParent = GetParent();
\r
3708 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3710 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3715 case IDSVNLC_LOCK:
\r
3717 CTSVNPathList itemsToLock;
\r
3718 FillListOfSelectedItemPaths(itemsToLock);
\r
3720 inpDlg.m_sTitle.LoadString(IDS_MENU_LOCK);
\r
3721 CStringUtils::RemoveAccelerators(inpDlg.m_sTitle);
\r
3722 inpDlg.m_sHintText.LoadString(IDS_LOCK_MESSAGEHINT);
\r
3723 inpDlg.m_sCheckText.LoadString(IDS_LOCK_STEALCHECK);
\r
3724 ProjectProperties props;
\r
3725 props.ReadPropsPathList(itemsToLock);
\r
3726 props.nMinLogSize = 0; // the lock message is optional, so no minimum!
\r
3727 inpDlg.m_pProjectProperties = &props;
\r
3728 if (inpDlg.DoModal()==IDOK)
\r
3730 CSVNProgressDlg progDlg;
\r
3731 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Lock);
\r
3732 progDlg.SetOptions(inpDlg.m_iCheck ? ProgOptLockForce : ProgOptNone);
\r
3733 progDlg.SetPathList(itemsToLock);
\r
3734 progDlg.SetCommitMessage(inpDlg.m_sInputText);
\r
3735 progDlg.DoModal();
\r
3737 CWnd* pParent = GetParent();
\r
3738 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3740 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3745 case IDSVNLC_UNLOCKFORCE:
\r
3747 case IDSVNLC_UNLOCK:
\r
3749 CTSVNPathList itemsToUnlock;
\r
3750 FillListOfSelectedItemPaths(itemsToUnlock);
\r
3751 CSVNProgressDlg progDlg;
\r
3752 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Unlock);
\r
3753 progDlg.SetOptions(bForce ? ProgOptLockForce : ProgOptNone);
\r
3754 progDlg.SetPathList(itemsToUnlock);
\r
3755 progDlg.DoModal();
\r
3757 CWnd* pParent = GetParent();
\r
3758 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3760 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3764 case IDSVNLC_REPAIRMOVE:
\r
3766 POSITION pos = GetFirstSelectedItemPosition();
\r
3767 int index = GetNextSelectedItem(pos);
\r
3768 FileEntry * entry1 = NULL;
\r
3769 FileEntry * entry2 = NULL;
\r
3772 entry1 = GetListEntry(index);
\r
3773 git_wc_status_kind status1 = git_wc_status_none;
\r
3774 git_wc_status_kind status2 = git_wc_status_none;
\r
3777 status1 = entry1->status;
\r
3778 index = GetNextSelectedItem(pos);
\r
3781 entry2 = GetListEntry(index);
\r
3784 status2 = entry2->status;
\r
3785 if (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned)
\r
3787 FileEntry * tempentry = entry1;
\r
3789 entry2 = tempentry;
\r
3791 // entry1 was renamed to entry2 but outside of Subversion
\r
3792 // fix this by moving entry2 back to entry1 first,
\r
3793 // then do an git-move from entry1 to entry2
\r
3794 if (MoveFile(entry2->GetPath().GetWinPath(), entry1->GetPath().GetWinPath()))
\r
3797 if (!git.Move(CTSVNPathList(entry1->GetPath()), entry2->GetPath(), TRUE))
\r
3799 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3803 // check the previously unversioned item
\r
3804 entry1->checked = true;
\r
3805 // fixing the move was successful. We have to adjust the new status of the
\r
3807 // Since we don't know if the moved/renamed file had local modifications or not,
\r
3808 // we can't guess the new status. That means we have to refresh...
\r
3809 CWnd* pParent = GetParent();
\r
3810 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3812 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
\r
3819 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
\r
3820 FORMAT_MESSAGE_FROM_SYSTEM |
\r
3821 FORMAT_MESSAGE_IGNORE_INSERTS,
\r
3824 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
\r
3825 (LPTSTR) &lpMsgBuf,
\r
3829 MessageBox((LPCTSTR)lpMsgBuf, _T("Error"), MB_OK | MB_ICONINFORMATION );
\r
3830 LocalFree( lpMsgBuf );
\r
3838 case IDSVNLC_REMOVEFROMCS:
\r
3840 CTSVNPathList changelistItems;
\r
3841 FillListOfSelectedItemPaths(changelistItems);
\r
3844 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
\r
3846 // The changelists were removed, but we now need to run through the selected items again
\r
3847 // and update their changelist
\r
3848 POSITION pos = GetFirstSelectedItemPosition();
\r
3850 std::vector<int> entriesToRemove;
\r
3851 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3853 FileEntry * e = GetListEntry(index);
\r
3856 e->changelist.Empty();
\r
3857 if (e->status == git_wc_status_normal)
\r
3859 // remove the entry completely
\r
3860 entriesToRemove.push_back(index);
\r
3863 SetItemGroup(index, 0);
\r
3866 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)
\r
3868 RemoveListEntry(*it);
\r
3870 // TODO: Should we go through all entries here and check if we also could
\r
3871 // remove the changelist from m_changelists ?
\r
3875 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3880 case IDSVNLC_CREATEIGNORECS:
\r
3881 CreateChangeList(SVNSLC_IGNORECHANGELIST);
\r
3883 case IDSVNLC_CREATECS:
\r
3885 CCreateChangelistDlg dlg;
\r
3886 if (dlg.DoModal() == IDOK)
\r
3888 CreateChangeList(dlg.m_sName);
\r
3894 if (cmd < IDSVNLC_MOVETOCS)
\r
3896 CTSVNPathList changelistItems;
\r
3897 FillListOfSelectedItemPaths(changelistItems);
\r
3899 // find the changelist name
\r
3900 CString sChangelist;
\r
3901 int cmdID = IDSVNLC_MOVETOCS;
\r
3903 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
3905 if ((it->first.Compare(SVNSLC_IGNORECHANGELIST))&&(entry->changelist.Compare(it->first)))
\r
3909 sChangelist = it->first;
\r
3914 if (!sChangelist.IsEmpty())
\r
3917 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
\r
3919 // The changelists were moved, but we now need to run through the selected items again
\r
3920 // and update their changelist
\r
3921 POSITION pos = GetFirstSelectedItemPosition();
\r
3923 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
3925 FileEntry * e = GetListEntry(index);
\r
3926 e->changelist = sChangelist;
\r
3927 if (!e->IsFolder())
\r
3929 if (m_changelists.find(e->changelist)!=m_changelists.end())
\r
3930 SetItemGroup(index, m_changelists[e->changelist]);
\r
3932 SetItemGroup(index, 0);
\r
3938 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
3948 AfxGetApp()->DoWaitCursor(-1);
\r
3949 GetStatisticsString();
\r
3950 int iItemCountAfterMenuCmd = GetItemCount();
\r
3951 //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)
\r
3953 // CWnd* pParent = GetParent();
\r
3954 // if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
3956 // pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);
\r
3959 } // if (popup.CreatePopupMenu())
\r
3960 } // if (selIndex >= 0)
\r
3964 void CGitStatusListCtrl::OnContextMenuHeader(CWnd * pWnd, CPoint point)
\r
3966 bool XPorLater = false;
\r
3967 OSVERSIONINFOEX inf;
\r
3968 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
\r
3969 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
\r
3970 GetVersionEx((OSVERSIONINFO *)&inf);
\r
3971 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
\r
3972 if (fullver >= 0x0501)
\r
3975 CHeaderCtrl * pHeaderCtrl = (CHeaderCtrl *)pWnd;
\r
3976 if ((point.x == -1) && (point.y == -1))
\r
3979 pHeaderCtrl->GetItemRect(0, &rect);
\r
3980 ClientToScreen(&rect);
\r
3981 point = rect.CenterPoint();
\r
3983 Locker lock(m_critSec);
\r
3985 if (popup.CreatePopupMenu())
\r
3987 int columnCount = m_ColumnManager.GetColumnCount();
\r
3990 UINT uCheckedFlags = MF_STRING | MF_ENABLED | MF_CHECKED;
\r
3991 UINT uUnCheckedFlags = MF_STRING | MF_ENABLED;
\r
3993 // build control menu
\r
3997 temp.LoadString(IDS_STATUSLIST_SHOWGROUPS);
\r
3998 popup.AppendMenu(IsGroupViewEnabled() ? uCheckedFlags : uUnCheckedFlags, columnCount, temp);
\r
4001 if (m_ColumnManager.AnyUnusedProperties())
\r
4003 temp.LoadString(IDS_STATUSLIST_REMOVEUNUSEDPROPS);
\r
4004 popup.AppendMenu(uUnCheckedFlags, columnCount+1, temp);
\r
4007 temp.LoadString(IDS_STATUSLIST_RESETCOLUMNORDER);
\r
4008 popup.AppendMenu(uUnCheckedFlags, columnCount+2, temp);
\r
4009 popup.AppendMenu(MF_SEPARATOR);
\r
4011 // standard columns
\r
4013 for (int i = 1; i < SVNSLC_NUMCOLUMNS; ++i)
\r
4015 popup.AppendMenu ( m_ColumnManager.IsVisible(i)
\r
4019 , m_ColumnManager.GetName(i));
\r
4022 // user-prop columns:
\r
4023 // find relevant ones and sort 'em
\r
4025 std::map<CString, int> sortedProps;
\r
4026 for (int i = SVNSLC_NUMCOLUMNS; i < columnCount; ++i)
\r
4027 if (m_ColumnManager.IsRelevant(i))
\r
4028 sortedProps[m_ColumnManager.GetName(i)] = i;
\r
4030 if (!sortedProps.empty())
\r
4032 // add 'em to the menu
\r
4034 popup.AppendMenu(MF_SEPARATOR);
\r
4036 typedef std::map<CString, int>::const_iterator CIT;
\r
4037 for ( CIT iter = sortedProps.begin(), end = sortedProps.end()
\r
4041 popup.AppendMenu ( m_ColumnManager.IsVisible(iter->second)
\r
4049 // show menu & let user pick an entry
\r
4051 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
\r
4052 if ((cmd >= 1)&&(cmd < columnCount))
\r
4054 m_ColumnManager.SetVisible (cmd, !m_ColumnManager.IsVisible(cmd));
\r
4056 else if (cmd == columnCount)
\r
4058 EnableGroupView(!IsGroupViewEnabled());
\r
4060 else if (cmd == columnCount+1)
\r
4062 m_ColumnManager.RemoveUnusedProps();
\r
4064 else if (cmd == columnCount+2)
\r
4066 m_ColumnManager.ResetColumns (m_dwDefaultColumns);
\r
4071 void CGitStatusListCtrl::OnContextMenu(CWnd* pWnd, CPoint point)
\r
4076 OnContextMenuList(pWnd, point);
\r
4077 } // if (pWnd == this)
\r
4078 else if (pWnd == GetHeaderCtrl())
\r
4080 OnContextMenuHeader(pWnd, point);
\r
4084 void CGitStatusListCtrl::CreateChangeList(const CString& name)
\r
4087 CTGitPathList changelistItems;
\r
4088 FillListOfSelectedItemPaths(changelistItems);
\r
4090 if (git.AddToChangeList(changelistItems, name, git_depth_empty))
\r
4092 TCHAR groupname[1024];
\r
4093 LVGROUP grp = {0};
\r
4094 grp.cbSize = sizeof(LVGROUP);
\r
4095 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
4096 _tcsncpy_s(groupname, 1024, name, 1023);
\r
4097 grp.pszHeader = groupname;
\r
4098 grp.iGroupId = (int)m_changelists.size();
\r
4099 grp.uAlign = LVGA_HEADER_LEFT;
\r
4100 m_changelists[name] = InsertGroup(-1, &grp);
\r
4102 PrepareGroups(true);
\r
4104 POSITION pos = GetFirstSelectedItemPosition();
\r
4106 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
4108 FileEntry * e = GetListEntry(index);
\r
4109 e->changelist = name;
\r
4110 SetEntryCheck(e, index, FALSE);
\r
4113 for (index = 0; index < GetItemCount(); ++index)
\r
4115 FileEntry * e = GetListEntry(index);
\r
4116 if (m_changelists.find(e->changelist)!=m_changelists.end())
\r
4117 SetItemGroup(index, m_changelists[e->changelist]);
\r
4119 SetItemGroup(index, 0);
\r
4124 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("Tortoisegit"), MB_ICONERROR);
\r
4129 void CGitStatusListCtrl::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
\r
4132 Locker lock(m_critSec);
\r
4133 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
\r
4138 if (pNMLV->iItem < 0)
\r
4140 if (!IsGroupViewEnabled())
\r
4143 DWORD ptW = GetMessagePos();
\r
4144 pt.x = GET_X_LPARAM(ptW);
\r
4145 pt.y = GET_Y_LPARAM(ptW);
\r
4146 ScreenToClient(&pt);
\r
4147 int group = GetGroupFromPoint(&pt);
\r
4150 // check/uncheck the whole group depending on the check-state
\r
4151 // of the first item in the group
\r
4153 bool bCheck = false;
\r
4154 bool bFirst = false;
\r
4156 for (int i=0; i<GetItemCount(); ++i)
\r
4158 SecureZeroMemory(&lv, sizeof(LVITEM));
\r
4159 lv.mask = LVIF_GROUPID;
\r
4162 if (lv.iGroupId == group)
\r
4164 FileEntry * entry = GetListEntry(i);
\r
4167 bCheck = !GetCheck(i);
\r
4172 bool bOldCheck = !!GetCheck(i);
\r
4173 SetEntryCheck(entry, i, bCheck);
\r
4174 if (bCheck != bOldCheck)
\r
4184 GetStatisticsString();
\r
4190 // FileEntry * entry = GetListEntry(pNMLV->iItem);
\r
4193 // if (entry->isConflicted)
\r
4195 // gitDiff::StartConflictEditor(entry->GetPath());
\r
4199 StartDiff(pNMLV->iItem);
\r
4205 void CGitStatusListCtrl::StartDiff(int fileindex)
\r
4209 CGitDiff::Diff((CTGitPath*)GetItemData(fileindex),
\r
4210 CString(GIT_REV_ZERO),
\r
4211 GitRev::GetHead());
\r
4214 if (fileindex < 0)
\r
4216 FileEntry * entry = GetListEntry(fileindex);
\r
4217 ASSERT(entry != NULL);
\r
4218 if (entry == NULL)
\r
4220 if (((entry->status == git_wc_status_normal)&&(entry->remotestatus <= git_wc_status_normal))||
\r
4221 (entry->status == git_wc_status_unversioned)||(entry->status == git_wc_status_none))
\r
4223 int ret = (int)ShellExecute(this->m_hWnd, NULL, entry->path.GetWinPath(), NULL, NULL, SW_SHOW);
\r
4224 if (ret <= HINSTANCE_ERROR)
\r
4226 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
\r
4227 cmd += entry->path.GetWinPathString();
\r
4228 CAppUtils::LaunchApplication(cmd, NULL, false);
\r
4233 GitDiff diff(NULL, m_hWnd, true);
\r
4234 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
\r
4236 entry->path, entry->textstatus, entry->propstatus,
\r
4237 entry->remotetextstatus, entry->remotepropstatus);
\r
4241 CString CGitStatusListCtrl::GetStatisticsString()
\r
4244 CString sNormal, sAdded, sDeleted, sModified, sConflicted, sUnversioned;
\r
4245 WORD langID = (WORD)(DWORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
4246 TCHAR buf[MAX_STATUS_STRING_LENGTH];
\r
4247 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_normal, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4249 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_added, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4251 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_deleted, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4253 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_modified, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4255 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_conflicted, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4256 sConflicted = buf;
\r
4257 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_unversioned, buf, sizeof(buf)/sizeof(TCHAR), langID);
\r
4258 sUnversioned = buf;
\r
4260 sToolTip.Format(_T("%s = %d\n%s = %d\n%s = %d\n%s = %d\n%s = %d\n%s = %d"),
\r
4261 (LPCTSTR)sNormal, m_nNormal,
\r
4262 (LPCTSTR)sUnversioned, m_nUnversioned,
\r
4263 (LPCTSTR)sModified, m_nModified,
\r
4264 (LPCTSTR)sAdded, m_nAdded,
\r
4265 (LPCTSTR)sDeleted, m_nDeleted,
\r
4266 (LPCTSTR)sConflicted, m_nConflicted
\r
4269 sStats.Format(IDS_COMMITDLG_STATISTICSFORMAT, m_nSelected, GetItemCount());
\r
4272 m_pStatLabel->SetWindowText(sStats);
\r
4275 if (m_pSelectButton)
\r
4277 if (m_nSelected == 0)
\r
4278 m_pSelectButton->SetCheck(BST_UNCHECKED);
\r
4279 else if (m_nSelected != GetItemCount())
\r
4280 m_pSelectButton->SetCheck(BST_INDETERMINATE);
\r
4282 m_pSelectButton->SetCheck(BST_CHECKED);
\r
4285 if (m_pConfirmButton)
\r
4287 m_pConfirmButton->EnableWindow(m_nSelected>0);
\r
4295 CTGitPath CGitStatusListCtrl::GetCommonDirectory(bool bStrict)
\r
4299 // not strict means that the selected folder has priority
\r
4300 if (!m_StatusFileList.GetCommonDirectory().IsEmpty())
\r
4301 return m_StatusFileList.GetCommonDirectory();
\r
4304 CTGitPath commonBaseDirectory;
\r
4305 int nListItems = GetItemCount();
\r
4306 for (int i=0; i<nListItems; ++i)
\r
4308 CTGitPath& baseDirectory = *(CTGitPath*)this->GetItemData(i);
\r
4309 if(commonBaseDirectory.IsEmpty())
\r
4311 commonBaseDirectory = baseDirectory;
\r
4315 if (commonBaseDirectory.GetWinPathString().GetLength() > baseDirectory.GetWinPathString().GetLength())
\r
4317 if (baseDirectory.IsAncestorOf(commonBaseDirectory))
\r
4318 commonBaseDirectory = baseDirectory;
\r
4322 return commonBaseDirectory;
\r
4325 CTGitPath CGitStatusListCtrl::GetCommonURL(bool bStrict)
\r
4327 CTGitPath commonBaseURL;
\r
4332 // not strict means that the selected folder has priority
\r
4333 if (!m_StatusUrlList.GetCommonDirectory().IsEmpty())
\r
4334 return m_StatusUrlList.GetCommonDirectory();
\r
4337 int nListItems = GetItemCount();
\r
4338 for (int i=0; i<nListItems; ++i)
\r
4340 const CTGitPath& baseURL = CTGitPath(GetListEntry(i)->GetURL());
\r
4341 if (baseURL.IsEmpty())
\r
4342 continue; // item has no url
\r
4343 if(commonBaseURL.IsEmpty())
\r
4345 commonBaseURL = baseURL;
\r
4349 if (commonBaseURL.GetGitPathString().GetLength() > baseURL.GetGitPathString().GetLength())
\r
4351 if (baseURL.IsAncestorOf(commonBaseURL))
\r
4352 commonBaseURL = baseURL;
\r
4358 return commonBaseURL;
\r
4361 void CGitStatusListCtrl::SelectAll(bool bSelect, bool bIncludeNoCommits)
\r
4363 CWaitCursor waitCursor;
\r
4364 // block here so the LVN_ITEMCHANGED messages
\r
4369 int nListItems = GetItemCount();
\r
4371 m_nSelected = nListItems;
\r
4375 for (int i=0; i<nListItems; ++i)
\r
4377 //FileEntry * entry = GetListEntry(i);
\r
4378 //ASSERT(entry != NULL);
\r
4379 CTGitPath *path = (CTGitPath *) GetItemData(i);
\r
4382 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))
\r
4383 SetEntryCheck(path,i,bSelect);
\r
4386 // unblock before redrawing
\r
4389 GetStatisticsString();
\r
4393 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR *pNMHDR, LRESULT *pResult)
\r
4395 LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast<LPNMLVGETINFOTIP>(pNMHDR);
\r
4399 if (GetListEntry(pGetInfoTip->iItem >= 0))
\r
4400 if (pGetInfoTip->cchTextMax > GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString().GetLength())
\r
4402 if (GetListEntry(pGetInfoTip->iItem)->GetRelativeGitPath().Compare(GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString())!= 0)
\r
4403 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString(), pGetInfoTip->cchTextMax);
\r
4404 else if (GetStringWidth(GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString()) > GetColumnWidth(pGetInfoTip->iItem))
\r
4405 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, GetListEntry(pGetInfoTip->iItem)->path.GetGitPathString(), pGetInfoTip->cchTextMax);
\r
4409 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult)
\r
4411 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
\r
4413 // Take the default processing unless we set this to something else below.
\r
4414 *pResult = CDRF_DODEFAULT;
\r
4416 // First thing - check the draw stage. If it's the control's prepaint
\r
4417 // stage, then tell Windows we want messages for every item.
\r
4419 switch (pLVCD->nmcd.dwDrawStage)
\r
4421 case CDDS_PREPAINT:
\r
4422 *pResult = CDRF_NOTIFYITEMDRAW;
\r
4424 case CDDS_ITEMPREPAINT:
\r
4426 // This is the prepaint stage for an item. Here's where we set the
\r
4427 // item's text color. Our return value will tell Windows to draw the
\r
4428 // item itself, but it will use the new color we set here.
\r
4430 // Tell Windows to paint the control itself.
\r
4431 *pResult = CDRF_DODEFAULT;
\r
4435 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
\r
4437 if (m_arListArray.size() > (DWORD_PTR)pLVCD->nmcd.dwItemSpec)
\r
4439 FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);
\r
4440 if (entry == NULL)
\r
4445 // black : unversioned, normal
\r
4447 // blue : modified
\r
4448 // brown : missing, deleted, replaced
\r
4449 // green : merged (or potential merges)
\r
4450 // red : conflicts or sure conflicts
\r
4451 switch (entry->status)
\r
4453 case git_wc_status_added:
\r
4454 // if (entry->remotestatus > git_wc_status_unversioned)
\r
4455 // locally added file, but file already exists in repository!
\r
4456 // crText = m_Colors.GetColor(CColors::Conflict);
\r
4458 crText = m_Colors.GetColor(CColors::Added);
\r
4460 case git_wc_status_missing:
\r
4461 case git_wc_status_deleted:
\r
4462 case git_wc_status_replaced:
\r
4463 crText = m_Colors.GetColor(CColors::Deleted);
\r
4465 case git_wc_status_modified:
\r
4466 // if (entry->remotestatus == git_wc_status_modified)
\r
4467 // indicate a merge (both local and remote changes will require a merge)
\r
4468 // crText = m_Colors.GetColor(CColors::Merged);
\r
4469 // else if (entry->remotestatus == git_wc_status_deleted)
\r
4470 // // locally modified, but already deleted in the repository
\r
4471 // crText = m_Colors.GetColor(CColors::Conflict);
\r
4473 crText = m_Colors.GetColor(CColors::Modified);
\r
4475 case git_wc_status_merged:
\r
4476 crText = m_Colors.GetColor(CColors::Merged);
\r
4478 case git_wc_status_conflicted:
\r
4479 case git_wc_status_obstructed:
\r
4480 crText = m_Colors.GetColor(CColors::Conflict);
\r
4482 case git_wc_status_none:
\r
4483 case git_wc_status_unversioned:
\r
4484 case git_wc_status_ignored:
\r
4485 case git_wc_status_incomplete:
\r
4486 case git_wc_status_normal:
\r
4487 case git_wc_status_external:
\r
4489 crText = GetSysColor(COLOR_WINDOWTEXT);
\r
4493 if (entry->isConflicted)
\r
4494 crText = m_Colors.GetColor(CColors::Conflict);
\r
4496 // Store the color back in the NMLVCUSTOMDRAW struct.
\r
4497 pLVCD->clrText = crText;
\r
4504 BOOL CGitStatusListCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
\r
4507 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
\r
4510 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
\r
4512 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
\r
4514 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
\r
4519 void CGitStatusListCtrl::RemoveListEntry(int index)
\r
4522 Locker lock(m_critSec);
\r
4523 DeleteItem(index);
\r
4524 delete m_arStatusArray[m_arListArray[index]];
\r
4525 m_arStatusArray.erase(m_arStatusArray.begin()+m_arListArray[index]);
\r
4526 m_arListArray.erase(m_arListArray.begin()+index);
\r
4527 for (int i=index; i< (int)m_arListArray.size(); ++i)
\r
4529 m_arListArray[i]--;
\r
4534 ///< Set a checkbox on an entry in the listbox
\r
4535 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync
\r
4536 void CGitStatusListCtrl::SetEntryCheck(CTGitPath* pEntry, int listboxIndex, bool bCheck)
\r
4538 pEntry->m_Checked = bCheck;
\r
4539 SetCheck(listboxIndex, bCheck);
\r
4543 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry* parentEntry, bool bCheck)
\r
4546 int nListItems = GetItemCount();
\r
4547 for (int j=0; j< nListItems ; ++j)
\r
4549 FileEntry * childEntry = GetListEntry(j);
\r
4550 ASSERT(childEntry != NULL);
\r
4551 if (childEntry == NULL || childEntry == parentEntry)
\r
4553 if (childEntry->checked != bCheck)
\r
4555 if (parentEntry->path.IsAncestorOf(childEntry->path))
\r
4557 SetEntryCheck(childEntry,j,bCheck);
\r
4572 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList& pathList)
\r
4575 int nListItems = GetItemCount();
\r
4576 for (int i=0; i< nListItems; i++)
\r
4578 const FileEntry* entry = GetListEntry(i);
\r
4579 ASSERT(entry != NULL);
\r
4580 if (entry->IsChecked())
\r
4582 pathList.AddPath(entry->path);
\r
4585 pathList.SortByPathname();
\r
4589 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)
\r
4590 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList& pathList, bool bNoIgnored)
\r
4594 POSITION pos = GetFirstSelectedItemPosition();
\r
4596 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
4598 CTGitPath * entry = (CTGitPath*)GetItemData(index);
\r
4599 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))
\r
4601 pathList.AddPath(*entry);
\r
4605 UINT CGitStatusListCtrl::OnGetDlgCode()
\r
4607 // we want to process the return key and not have that one
\r
4608 // routed to the default pushbutton
\r
4609 return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS;
\r
4612 void CGitStatusListCtrl::OnNMReturn(NMHDR * /*pNMHDR*/, LRESULT *pResult)
\r
4617 POSITION pos = GetFirstSelectedItemPosition();
\r
4620 int index = GetNextSelectedItem(pos);
\r
4625 void CGitStatusListCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
\r
4627 // Since we catch all keystrokes (to have the enter key processed here instead
\r
4628 // of routed to the default pushbutton) we have to make sure that other
\r
4629 // keys like Tab and Esc still do what they're supposed to do
\r
4630 // Tab = change focus to next/previous control
\r
4631 // Esc = quit the dialog
\r
4636 ::PostMessage(GetParent()->GetSafeHwnd(), WM_NEXTDLGCTL, GetKeyState(VK_SHIFT)&0x8000, 0);
\r
4642 ::SendMessage(GetParent()->GetSafeHwnd(), WM_CLOSE, 0, 0);
\r
4647 CListCtrl::OnKeyDown(nChar, nRepCnt, nFlags);
\r
4650 void CGitStatusListCtrl::PreSubclassWindow()
\r
4652 CListCtrl::PreSubclassWindow();
\r
4653 EnableToolTips(TRUE);
\r
4656 INT_PTR CGitStatusListCtrl::OnToolHitTest(CPoint point, TOOLINFO* pTI) const
\r
4660 row = CellRectFromPoint(point, &cellrect, &col );
\r
4666 pTI->hwnd = m_hWnd;
\r
4667 pTI->uId = (UINT)((row<<10)+(col&0x3ff)+1);
\r
4668 pTI->lpszText = LPSTR_TEXTCALLBACK;
\r
4670 pTI->rect = cellrect;
\r
4675 int CGitStatusListCtrl::CellRectFromPoint(CPoint& point, RECT *cellrect, int *col) const
\r
4679 // Make sure that the ListView is in LVS_REPORT
\r
4680 if ((GetWindowLong(m_hWnd, GWL_STYLE) & LVS_TYPEMASK) != LVS_REPORT)
\r
4683 // Get the top and bottom row visible
\r
4684 int row = GetTopIndex();
\r
4685 int bottom = row + GetCountPerPage();
\r
4686 if (bottom > GetItemCount())
\r
4687 bottom = GetItemCount();
\r
4689 // Get the number of columns
\r
4690 CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
\r
4691 int nColumnCount = pHeader->GetItemCount();
\r
4693 // Loop through the visible rows
\r
4694 for ( ;row <=bottom;row++)
\r
4696 // Get bounding rect of item and check whether point falls in it.
\r
4698 GetItemRect(row, &rect, LVIR_BOUNDS);
\r
4699 if (rect.PtInRect(point))
\r
4701 // Now find the column
\r
4702 for (colnum = 0; colnum < nColumnCount; colnum++)
\r
4704 int colwidth = GetColumnWidth(colnum);
\r
4705 if (point.x >= rect.left && point.x <= (rect.left + colwidth))
\r
4708 GetClientRect(&rectClient);
\r
4711 rect.right = rect.left + colwidth;
\r
4713 // Make sure that the right extent does not exceed
\r
4714 // the client area
\r
4715 if (rect.right > rectClient.right)
\r
4716 rect.right = rectClient.right;
\r
4720 rect.left += colwidth;
\r
4727 BOOL CGitStatusListCtrl::OnToolTipText(UINT /*id*/, NMHDR *pNMHDR, LRESULT *pResult)
\r
4730 TOOLTIPTEXTW* pTTTW = (TOOLTIPTEXTW*)pNMHDR;
\r
4731 CString strTipText;
\r
4732 UINT_PTR nID = pNMHDR->idFrom;
\r
4737 UINT_PTR row = ((nID-1) >> 10) & 0x3fffff;
\r
4738 UINT_PTR col = (nID-1) & 0x3ff;
\r
4741 return FALSE; // no custom tooltip for the path, we use the infotip there!
\r
4743 // get the internal column from the visible columns
\r
4744 int internalcol = 0;
\r
4745 UINT_PTR currentcol = 0;
\r
4746 for (; (currentcol != col)
\r
4747 && (internalcol < m_ColumnManager.GetColumnCount()-1)
\r
4750 if (m_ColumnManager.IsVisible (internalcol))
\r
4754 AFX_MODULE_THREAD_STATE* pModuleThreadState = AfxGetModuleThreadState();
\r
4755 CToolTipCtrl* pToolTip = pModuleThreadState->m_pToolTip;
\r
4756 pToolTip->SendMessage(TTM_SETMAXTIPWIDTH, 0, 300);
\r
4759 if ((internalcol == 2)||(internalcol == 4))
\r
4761 FileEntry *fentry = GetListEntry(row);
\r
4764 if (fentry->copied)
\r
4767 url.Format(IDS_STATUSLIST_COPYFROM, (LPCTSTR)CPathUtils::PathUnescape(fentry->copyfrom_url), (LONG)fentry->copyfrom_rev);
\r
4768 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);
\r
4771 if (fentry->switched)
\r
4774 url.Format(IDS_STATUSLIST_SWITCHEDTO, (LPCTSTR)CPathUtils::PathUnescape(fentry->url));
\r
4775 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);
\r
4778 if (fentry->keeplocal)
\r
4780 lstrcpyn(pTTTW->szText, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_KEEPLOCAL)), 80);
\r
4789 void CGitStatusListCtrl::OnPaint()
\r
4792 if ((m_bBusy)||(m_bEmpty))
\r
4797 if (m_sBusy.IsEmpty())
\r
4798 str.LoadString(IDS_STATUSLIST_BUSYMSG);
\r
4804 if (m_sEmpty.IsEmpty())
\r
4805 str.LoadString(IDS_STATUSLIST_EMPTYMSG);
\r
4809 COLORREF clrText = ::GetSysColor(COLOR_WINDOWTEXT);
\r
4810 COLORREF clrTextBk;
\r
4811 if (IsWindowEnabled())
\r
4812 clrTextBk = ::GetSysColor(COLOR_WINDOW);
\r
4814 clrTextBk = ::GetSysColor(COLOR_3DFACE);
\r
4817 GetClientRect(&rc);
\r
4819 pHC = GetHeaderCtrl();
\r
4823 pHC->GetItemRect(0, &rcH);
\r
4824 rc.top += rcH.bottom;
\r
4826 CDC* pDC = GetDC();
\r
4828 CMyMemDC memDC(pDC, &rc);
\r
4830 memDC.SetTextColor(clrText);
\r
4831 memDC.SetBkColor(clrTextBk);
\r
4832 memDC.FillSolidRect(rc, clrTextBk);
\r
4834 CGdiObject * oldfont = memDC.SelectStockObject(DEFAULT_GUI_FONT);
\r
4835 memDC.DrawText(str, rc, DT_CENTER | DT_VCENTER |
\r
4836 DT_WORDBREAK | DT_NOPREFIX | DT_NOCLIP);
\r
4837 memDC.SelectObject(oldfont);
\r
4843 // prevent users from extending our hidden (size 0) columns
\r
4844 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR *pNMHDR, LRESULT *pResult)
\r
4846 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
4848 if ((phdr->iItem < 0)||(phdr->iItem >= SVNSLC_NUMCOLUMNS))
\r
4851 if (m_ColumnManager.IsVisible (phdr->iItem))
\r
4858 // prevent any function from extending our hidden (size 0) columns
\r
4859 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
\r
4861 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
\r
4863 if ((phdr->iItem < 0)||(phdr->iItem >= m_ColumnManager.GetColumnCount()))
\r
4869 // visible columns may be modified
\r
4871 if (m_ColumnManager.IsVisible (phdr->iItem))
\r
4877 // columns already marked as "invisible" internally may be (re-)sized to 0
\r
4879 if ( (phdr->pitem != NULL)
\r
4880 && (phdr->pitem->mask == HDI_WIDTH)
\r
4881 && (phdr->pitem->cxy == 0))
\r
4887 if ( (phdr->pitem != NULL)
\r
4888 && (phdr->pitem->mask != HDI_WIDTH))
\r
4897 void CGitStatusListCtrl::OnDestroy()
\r
4899 SaveColumnWidths(true);
\r
4900 CListCtrl::OnDestroy();
\r
4903 void CGitStatusListCtrl::OnBeginDrag(NMHDR* /*pNMHDR*/, LRESULT* pResult)
\r
4906 Locker lock(m_critSec);
\r
4907 CDropFiles dropFiles; // class for creating DROPFILES struct
\r
4910 POSITION pos = GetFirstSelectedItemPosition();
\r
4911 while ( (index = GetNextSelectedItem(pos)) >= 0 )
\r
4913 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
\r
4914 CTGitPath path = fentry->GetPath();
\r
4915 dropFiles.AddFile( path.GetWinPathString() );
\r
4918 if ( dropFiles.GetCount()>0 )
\r
4920 m_bOwnDrag = true;
\r
4921 dropFiles.CreateStructure();
\r
4922 m_bOwnDrag = false;
\r
4928 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry /* = false */)
\r
4930 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
\r
4931 for (int col = 0; col <= maxcol; col++)
\r
4932 if (m_ColumnManager.IsVisible (col))
\r
4933 m_ColumnManager.ColumnResized (col);
\r
4935 if (bSaveToRegistry)
\r
4936 m_ColumnManager.WriteSettings();
\r
4939 bool CGitStatusListCtrl::EnableFileDrop()
\r
4941 m_bFileDropsEnabled = true;
\r
4945 bool CGitStatusListCtrl::HasPath(const CTGitPath& path)
\r
4948 for (size_t i=0; i < m_arStatusArray.size(); i++)
\r
4950 FileEntry * entry = m_arStatusArray[i];
\r
4951 if (entry->GetPath().IsEquivalentTo(path))
\r
4958 bool CGitStatusListCtrl::IsPathShown(const CTGitPath& path)
\r
4960 int itemCount = GetItemCount();
\r
4961 for (int i=0; i < itemCount; i++)
\r
4963 FileEntry * entry = GetListEntry(i);
\r
4964 if (entry->GetPath().IsEquivalentTo(path))
\r
4970 BOOL CGitStatusListCtrl::PreTranslateMessage(MSG* pMsg)
\r
4972 if (pMsg->message == WM_KEYDOWN)
\r
4974 switch (pMsg->wParam)
\r
4978 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
\r
4980 // select all entries
\r
4981 for (int i=0; i<GetItemCount(); ++i)
\r
4983 SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
\r
4992 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
\r
4994 // copy all selected paths to the clipboard
\r
4995 if (GetAsyncKeyState(VK_SHIFT)&0x8000)
\r
4996 CopySelectedEntriesToClipboard(SVNSLC_COLSTATUS);
\r
4998 CopySelectedEntriesToClipboard(0);
\r
5006 return CListCtrl::PreTranslateMessage(pMsg);
\r
5009 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols)
\r
5012 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
\r
5013 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
\r
5014 WORD langID = (WORD)CRegStdWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
\r
5016 CString sClipboard;
\r
5019 if (GetSelectedCount() == 0)
\r
5021 // first add the column titles as the first line
\r
5022 temp.LoadString(IDS_STATUSLIST_COLFILE);
\r
5023 sClipboard = temp;
\r
5025 DWORD selection = 0;
\r
5026 for (int i = 0, count = m_ColumnManager.GetColumnCount(); i < count; ++i)
\r
5027 if ( ((dwCols == -1) && m_ColumnManager.IsVisible (i))
\r
5028 || ((dwCols != 1) && (i < 32) && ((dwCols & (1 << i)) != 0)))
\r
5030 sClipboard += _T("\t") + m_ColumnManager.GetName(i);
\r
5033 selection += 1 << i;
\r
5036 sClipboard += _T("\r\n");
\r
5038 POSITION pos = GetFirstSelectedItemPosition();
\r
5040 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
5042 FileEntry * entry = GetListEntry(index);
\r
5043 sClipboard += entry->GetDisplayName();
\r
5044 if (selection & SVNSLC_COLFILENAME)
\r
5046 sClipboard += _T("\t")+entry->path.GetFileOrDirectoryName();
\r
5048 if (selection & SVNSLC_COLEXT)
\r
5050 sClipboard += _T("\t")+entry->path.GetFileExtension();
\r
5052 if (selection & SVNSLC_COLSTATUS)
\r
5054 if (entry->isNested)
\r
5056 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
5060 GitStatus::GetStatusString(hResourceHandle, entry->status, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
5061 if ((entry->copied)&&(_tcslen(buf)>1))
\r
5062 _tcscat_s(buf, 100, _T(" (+)"));
\r
5063 if ((entry->switched)&&(_tcslen(buf)>1))
\r
5064 _tcscat_s(buf, 100, _T(" (s)"));
\r
5065 if ((entry->status == entry->propstatus)&&
\r
5066 (entry->status != git_wc_status_normal)&&
\r
5067 (entry->status != git_wc_status_unversioned)&&
\r
5068 (!GitStatus::IsImportant(entry->textstatus)))
\r
5069 _tcscat_s(buf, 100, ponly);
\r
5072 sClipboard += _T("\t")+temp;
\r
5074 if (selection & SVNSLC_COLTEXTSTATUS)
\r
5076 if (entry->isNested)
\r
5078 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
5082 GitStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
5083 if ((entry->copied)&&(_tcslen(buf)>1))
\r
5084 _tcscat_s(buf, 100, _T(" (+)"));
\r
5085 if ((entry->switched)&&(_tcslen(buf)>1))
\r
5086 _tcscat_s(buf, 100, _T(" (s)"));
\r
5089 sClipboard += _T("\t")+temp;
\r
5091 if (selection & SVNSLC_COLREMOTESTATUS)
\r
5093 if (entry->isNested)
\r
5095 temp.LoadString(IDS_STATUSLIST_NESTED);
\r
5099 GitStatus::GetStatusString(hResourceHandle, entry->remotestatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
5100 if ((entry->copied)&&(_tcslen(buf)>1))
\r
5101 _tcscat_s(buf, 100, _T(" (+)"));
\r
5102 if ((entry->switched)&&(_tcslen(buf)>1))
\r
5103 _tcscat_s(buf, 100, _T(" (s)"));
\r
5104 if ((entry->remotestatus == entry->remotepropstatus)&&
\r
5105 (entry->remotestatus != git_wc_status_none)&&
\r
5106 (entry->remotestatus != git_wc_status_normal)&&
\r
5107 (entry->remotestatus != git_wc_status_unversioned)&&
\r
5108 (!SVNStatus::IsImportant(entry->remotetextstatus)))
\r
5109 _tcscat_s(buf, 100, ponly);
\r
5112 sClipboard += _T("\t")+temp;
\r
5114 if (selection & GitSLC_COLPROPSTATUS)
\r
5116 if (entry->isNested)
\r
5122 GitStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
5123 if ((entry->copied)&&(_tcslen(buf)>1))
\r
5124 _tcscat_s(buf, 100, _T(" (+)"));
\r
5125 if ((entry->switched)&&(_tcslen(buf)>1))
\r
5126 _tcscat_s(buf, 100, _T(" (s)"));
\r
5129 sClipboard += _T("\t")+temp;
\r
5131 if (selection & SVNSLC_COLREMOTETEXT)
\r
5133 if (entry->isNested)
\r
5139 GitStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
5142 sClipboard += _T("\t")+temp;
\r
5144 if (selection & SVNSLC_COLREMOTEPROP)
\r
5146 // SVNSLC_COLREMOTEPROP
\r
5147 if (entry->isNested)
\r
5153 GitStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, sizeof(buf)/sizeof(TCHAR), (WORD)langID);
\r
5156 sClipboard += _T("\t")+temp;
\r
5158 if (selection & SVNSLC_COLURL)
\r
5159 sClipboard += _T("\t")+entry->url;
\r
5160 if (selection & SVNSLC_COLLOCK)
\r
5162 if (!m_HeadRev.IsHead())
\r
5164 // we have contacted the repository
\r
5166 // decision-matrix
\r
5167 // wc repository text
\r
5170 // UID1 UID1 owner
\r
5171 // UID1 "" lock has been broken
\r
5172 // UID1 UID2 lock has been stolen
\r
5173 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))
\r
5175 if (entry->lock_owner.IsEmpty())
\r
5176 temp = entry->lock_remoteowner;
\r
5178 temp = entry->lock_owner;
\r
5180 else if (entry->lock_remotetoken.IsEmpty())
\r
5183 temp.LoadString(IDS_STATUSLIST_LOCKBROKEN);
\r
5188 temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);
\r
5192 temp = entry->lock_owner;
\r
5193 sClipboard += _T("\t")+temp;
\r
5195 if (selection & SVNSLC_COLLOCKCOMMENT)
\r
5196 sClipboard += _T("\t")+entry->lock_comment;
\r
5197 if (selection & SVNSLC_COLAUTHOR)
\r
5198 sClipboard += _T("\t")+entry->last_commit_author;
\r
5199 if (selection & SVNSLC_COLREVISION)
\r
5201 temp.Format(_T("%ld"), entry->last_commit_rev);
\r
5202 if (entry->last_commit_rev == 0)
\r
5204 sClipboard += _T("\t")+temp;
\r
5206 if (selection & SVNSLC_COLREMOTEREVISION)
\r
5208 temp.Format(_T("%ld"), entry->remoterev);
\r
5209 if (entry->remoterev == 0)
\r
5211 sClipboard += _T("\t")+temp;
\r
5213 if (selection & SVNSLC_COLDATE)
\r
5215 TCHAR datebuf[SVN_DATE_BUFFER];
\r
5216 apr_time_t date = entry->last_commit_date;
\r
5217 SVN::formatDate(datebuf, date, true);
\r
5222 sClipboard += _T("\t")+temp;
\r
5224 if (selection & SVNSLC_COLCOPYFROM)
\r
5226 if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)
\r
5227 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());
\r
5229 temp = entry->copyfrom_url;
\r
5230 sClipboard += _T("\t")+temp;
\r
5233 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
\r
5237 if ((dwCols == -1) && m_ColumnManager.IsVisible (i))
\r
5240 = entry->present_props[m_ColumnManager.GetName(i)];
\r
5241 sClipboard += _T("\t") + value;
\r
5245 sClipboard += _T("\r\n");
\r
5248 return CStringUtils::WriteAsciiStringToClipboard(sClipboard);
\r
5254 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()
\r
5256 std::set<CString> changelists;
\r
5257 POSITION pos = GetFirstSelectedItemPosition();
\r
5259 while ((index = GetNextSelectedItem(pos)) >= 0)
\r
5261 FileEntry * entry = GetListEntry(index);
\r
5262 if (!entry->changelist.IsEmpty())
\r
5263 changelists.insert(entry->changelist);
\r
5265 return changelists.size();
\r
5268 bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
\r
5271 bool bHasGroups=false;
\r
5272 if ( this->m_UnRevFileList.GetCount()>0 ||
\r
5273 this->m_IgnoreFileList.GetCount()>0 || bForce)
\r
5275 bHasGroups = true;
\r
5278 RemoveAllGroups();
\r
5279 EnableGroupView(bHasGroups);
\r
5281 TCHAR groupname[1024];
\r
5282 int groupindex = 0;
\r
5286 LVGROUP grp = {0};
\r
5287 grp.cbSize = sizeof(LVGROUP);
\r
5288 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5289 CString sUnassignedName(_T("Modified File"));
\r
5290 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
\r
5291 grp.pszHeader = groupname;
\r
5292 grp.iGroupId = groupindex;
\r
5293 grp.uAlign = LVGA_HEADER_LEFT;
\r
5294 InsertGroup(groupindex++, &grp);
\r
5296 //if(m_UnRevFileList.GetCount()>0)
\r
5298 _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("No Version Control"), 1023);
\r
5299 grp.pszHeader = groupname;
\r
5300 grp.iGroupId = groupindex;
\r
5301 grp.uAlign = LVGA_HEADER_LEFT;
\r
5302 InsertGroup(groupindex++, &grp);
\r
5305 //if(m_IgnoreFileList.GetCount()>0)
\r
5307 _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("Ignored File"), 1023);
\r
5308 grp.pszHeader = groupname;
\r
5309 grp.iGroupId = groupindex;
\r
5310 grp.uAlign = LVGA_HEADER_LEFT;
\r
5311 InsertGroup(groupindex++, &grp);
\r
5317 m_bHasIgnoreGroup = false;
\r
5319 // now add the items which don't belong to a group
\r
5320 LVGROUP grp = {0};
\r
5321 grp.cbSize = sizeof(LVGROUP);
\r
5322 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5323 CString sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET));
\r
5324 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
\r
5325 grp.pszHeader = groupname;
\r
5326 grp.iGroupId = groupindex;
\r
5327 grp.uAlign = LVGA_HEADER_LEFT;
\r
5328 InsertGroup(groupindex++, &grp);
\r
5330 for (std::map<CString,int>::iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
\r
5332 if (it->first.Compare(SVNSLC_IGNORECHANGELIST)!=0)
\r
5334 LVGROUP grp = {0};
\r
5335 grp.cbSize = sizeof(LVGROUP);
\r
5336 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5337 _tcsncpy_s(groupname, 1024, it->first, 1023);
\r
5338 grp.pszHeader = groupname;
\r
5339 grp.iGroupId = groupindex;
\r
5340 grp.uAlign = LVGA_HEADER_LEFT;
\r
5341 it->second = InsertGroup(groupindex++, &grp);
\r
5344 m_bHasIgnoreGroup = true;
\r
5347 if (m_bHasIgnoreGroup)
\r
5349 // and now add the group 'ignore-on-commit'
\r
5350 std::map<CString,int>::iterator it = m_changelists.find(SVNSLC_IGNORECHANGELIST);
\r
5351 if (it != m_changelists.end())
\r
5353 grp.cbSize = sizeof(LVGROUP);
\r
5354 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
\r
5355 _tcsncpy_s(groupname, 1024, SVNSLC_IGNORECHANGELIST, 1023);
\r
5356 grp.pszHeader = groupname;
\r
5357 grp.iGroupId = groupindex;
\r
5358 grp.uAlign = LVGA_HEADER_LEFT;
\r
5359 it->second = InsertGroup(groupindex, &grp);
\r
5363 return bHasGroups;
\r
5366 void CGitStatusListCtrl::NotifyCheck()
\r
5368 CWnd* pParent = GetParent();
\r
5369 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
\r
5371 pParent->SendMessage(SVNSLNM_CHECKCHANGED, m_nSelected);
\r
5375 int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash,CTGitPathList *list)
\r
5378 this->m_bBusy=TRUE;
\r
5379 if(hash == GIT_REV_ZERO)
\r
5385 count = list->GetCount();
\r
5387 for(int i=0;i<count;i++)
\r
5392 cmd=(_T("git.cmd diff-index --raw HEAD --numstat -C -M"));
\r
5394 cmd.Format(_T("git.cmd diff-index --raw HEAD --numstat -C -M -- \"%s\""),(*list)[i].GetGitPathString());
\r
5396 g_Git.Run(cmd,&cmdout);
\r
5402 this->m_StatusFileList.ParserFromLog(out);
\r
5404 for(int i=0;i<m_StatusFileList.GetCount();i++)
\r
5406 CTGitPath * gitpatch=(CTGitPath*)&m_StatusFileList[i];
\r
5407 gitpatch->m_Checked = TRUE;
\r
5408 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
\r
5410 this->m_bBusy=FALSE;
\r
5413 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList *List)
\r
5415 this->m_UnRevFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER,List);
\r
5416 for(int i=0;i<m_UnRevFileList.GetCount();i++)
\r
5418 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
\r
5419 gitpatch->m_Checked = FALSE;
\r
5420 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
\r
5425 int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList *List)
\r
5427 this->m_IgnoreFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER|CTGitPath::LOGACTIONS_IGNORE,List);
\r
5428 for(int i=0;i<m_IgnoreFileList.GetCount();i++)
\r
5430 CTGitPath * gitpatch=(CTGitPath*)&m_IgnoreFileList[i];
\r
5431 gitpatch->m_Checked = FALSE;
\r
5432 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
\r
5436 int CGitStatusListCtrl::UpdateFileList(int mask,bool once,CTGitPathList *List)
\r
5438 if(mask&CGitStatusListCtrl::FILELIST_MODIFY)
\r
5440 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_MODIFY)))
\r
5442 UpdateFileList(git_revnum_t(GIT_REV_ZERO),List);
\r
5443 m_FileLoaded|=CGitStatusListCtrl::FILELIST_MODIFY;
\r
5446 if(mask&CGitStatusListCtrl::FILELIST_UNVER)
\r
5448 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_UNVER)))
\r
5450 UpdateUnRevFileList(List);
\r
5451 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
\r
5456 //////////////////////////////////////////////////////////////////////////
\r
5458 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium, DWORD * /*pdwEffect*/, POINTL pt)
\r
5460 if(pFmtEtc->cfFormat == CF_HDROP && medium.tymed == TYMED_HGLOBAL)
\r
5462 HDROP hDrop = (HDROP)GlobalLock(medium.hGlobal);
\r
5465 TCHAR szFileName[MAX_PATH];
\r
5467 UINT cFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
\r
5469 POINT clientpoint;
\r
5470 clientpoint.x = pt.x;
\r
5471 clientpoint.y = pt.y;
\r
5472 ScreenToClient(m_hTargetWnd, &clientpoint);
\r
5473 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
\r
5475 CTSVNPathList changelistItems;
\r
5476 for(UINT i = 0; i < cFiles; ++i)
\r
5478 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
\r
5479 changelistItems.AddPath(CTSVNPath(szFileName));
\r
5481 // find the changelist name
\r
5482 CString sChangelist;
\r
5483 LONG_PTR nGroup = m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint);
\r
5484 for (std::map<CString, int>::iterator it = m_pSVNStatusListCtrl->m_changelists.begin(); it != m_pSVNStatusListCtrl->m_changelists.end(); ++it)
\r
5485 if (it->second == nGroup)
\r
5486 sChangelist = it->first;
\r
5487 if (!sChangelist.IsEmpty())
\r
5490 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
\r
5492 for (int l=0; l<changelistItems.GetCount(); ++l)
\r
5494 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
\r
5497 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
\r
5500 e->changelist = sChangelist;
\r
5501 if (!e->IsFolder())
\r
5503 if (m_pSVNStatusListCtrl->m_changelists.find(e->changelist)!=m_pSVNStatusListCtrl->m_changelists.end())
\r
5504 m_pSVNStatusListCtrl->SetItemGroup(index, m_pSVNStatusListCtrl->m_changelists[e->changelist]);
\r
5506 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
\r
5512 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5513 if (hParentWnd != NULL)
\r
5514 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
\r
5520 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
5526 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
\r
5528 for (int l=0; l<changelistItems.GetCount(); ++l)
\r
5530 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
\r
5533 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
\r
5536 e->changelist = sChangelist;
\r
5537 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
\r
5542 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5543 if (hParentWnd != NULL)
\r
5544 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
\r
5550 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseSVN"), MB_ICONERROR);
\r
5556 for(UINT i = 0; i < cFiles; ++i)
\r
5558 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
\r
5559 HWND hParentWnd = GetParent(m_hTargetWnd);
\r
5560 if (hParentWnd != NULL)
\r
5561 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)szFileName);
\r
5565 GlobalUnlock(medium.hGlobal);
\r
5567 return true; //let base free the medium
\r
5569 HRESULT STDMETHODCALLTYPE CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect)
\r
5571 CIDropTarget::DragOver(grfKeyState, pt, pdwEffect);
\r
5572 *pdwEffect = DROPEFFECT_COPY;
\r
5573 if (m_pSVNStatusListCtrl)
\r
5575 POINT clientpoint;
\r
5576 clientpoint.x = pt.x;
\r
5577 clientpoint.y = pt.y;
\r
5578 ScreenToClient(m_hTargetWnd, &clientpoint);
\r
5579 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
\r
5581 *pdwEffect = DROPEFFECT_MOVE;
\r
5583 else if ((!m_pSVNStatusListCtrl->m_bFileDropsEnabled)||(m_pSVNStatusListCtrl->m_bOwnDrag))
\r
5585 *pdwEffect = DROPEFFECT_NONE;
\r
OSDN Git Service
