GitStatusListCtrl: Refresh list after ignoring a file
[TortoiseGit.git] / src / Git / GitStatusListCtrl.cpp
blobb24771c40bbee9fdd307f966f622b274986f7190
1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2012 - TortoiseGit
4 // Copyright (C) 2003-2008 - TortoiseSVN
5 // Copyright (C) 2010-2012 Sven Strickroth <email@cs-ware.de>
7 // This program is free software; you can redistribute it and/or
8 // modify it under the terms of the GNU General Public License
9 // as published by the Free Software Foundation; either version 2
10 // of the License, or (at your option) any later version.
12 // This program is distributed in the hope that it will be useful,
13 // but WITHOUT ANY WARRANTY; without even the implied warranty of
14 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 // GNU General Public License for more details.
17 // You should have received a copy of the GNU General Public License
18 // along with this program; if not, write to the Free Software Foundation,
19 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
22 #include "StdAfx.h"
23 #include "resource.h"
24 #include "..\\TortoiseShell\resource.h"
25 #include "GitStatusListCtrl.h"
26 #include "MessageBox.h"
27 #include "MyMemDC.h"
28 #include "UnicodeUtils.h"
29 #include "AppUtils.h"
30 #include "PathUtils.h"
31 #include "TempFile.h"
32 #include "StringUtils.h"
33 #include "DirFileEnum.h"
34 #include "GitConfig.h"
35 #include "LoglistUtils.h"
36 //#include "SVNProperties.h"
37 #include "Git.h"
38 #include "GitDiff.h"
39 //#include "LogDlg.h"
40 //#include "SVNProgressDlg.h"
41 #include "SysImageList.h"
42 //#include "Svnstatuslistctrl.h"
43 #include "TGitPath.h"
44 #include "Registry.h"
45 #include "GitStatus.h"
46 //#include "SVNHelpers.h"
47 #include "InputDlg.h"
48 #include "ShellUpdater.h"
49 #include "GitAdminDir.h"
50 //#include "DropFiles.h"
51 #include "IconMenu.h"
52 //#include "AddDlg.h"
53 //#include "EditPropertiesDlg.h"
54 //#include "CreateChangelistDlg.h"
55 #include "FormatMessageWrapper.h"
56 #include "MassiveGitTask.h"
58 const UINT CGitStatusListCtrl::GITSLNM_ITEMCOUNTCHANGED
59 = ::RegisterWindowMessage(_T("GITSLNM_ITEMCOUNTCHANGED"));
60 const UINT CGitStatusListCtrl::GITSLNM_NEEDSREFRESH
61 = ::RegisterWindowMessage(_T("GITSLNM_NEEDSREFRESH"));
62 const UINT CGitStatusListCtrl::GITSLNM_ADDFILE
63 = ::RegisterWindowMessage(_T("GITSLNM_ADDFILE"));
64 const UINT CGitStatusListCtrl::GITSLNM_CHECKCHANGED
65 = ::RegisterWindowMessage(_T("GITSLNM_CHECKCHANGED"));
66 const UINT CGitStatusListCtrl::GITSLNM_ITEMCHANGED
67 = ::RegisterWindowMessage(_T("GITSLNM_ITEMCHANGED"));
72 BEGIN_MESSAGE_MAP(CGitStatusListCtrl, CListCtrl)
73 ON_NOTIFY(HDN_ITEMCLICKA, 0, OnHdnItemclick)
74 ON_NOTIFY(HDN_ITEMCLICKW, 0, OnHdnItemclick)
75 ON_NOTIFY(HDN_ENDTRACK, 0, OnColumnResized)
76 ON_NOTIFY(HDN_ENDDRAG, 0, OnColumnMoved)
77 ON_NOTIFY_REFLECT_EX(LVN_ITEMCHANGED, OnLvnItemchanged)
78 ON_WM_CONTEXTMENU()
79 ON_NOTIFY_REFLECT(NM_DBLCLK, OnNMDblclk)
80 ON_NOTIFY_REFLECT(LVN_GETINFOTIP, OnLvnGetInfoTip)
81 ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, OnNMCustomdraw)
82 ON_WM_SETCURSOR()
83 ON_WM_GETDLGCODE()
84 ON_NOTIFY_REFLECT(NM_RETURN, OnNMReturn)
85 ON_WM_KEYDOWN()
86 ON_WM_PAINT()
87 ON_NOTIFY(HDN_BEGINTRACKA, 0, &CGitStatusListCtrl::OnHdnBegintrack)
88 ON_NOTIFY(HDN_BEGINTRACKW, 0, &CGitStatusListCtrl::OnHdnBegintrack)
89 ON_NOTIFY(HDN_ITEMCHANGINGA, 0, &CGitStatusListCtrl::OnHdnItemchanging)
90 ON_NOTIFY(HDN_ITEMCHANGINGW, 0, &CGitStatusListCtrl::OnHdnItemchanging)
91 ON_WM_DESTROY()
92 ON_NOTIFY_REFLECT(LVN_BEGINDRAG, OnBeginDrag)
93 ON_NOTIFY_REFLECT(LVN_ITEMCHANGING, &CGitStatusListCtrl::OnLvnItemchanging)
94 END_MESSAGE_MAP()
98 CGitStatusListCtrl::CGitStatusListCtrl() : CListCtrl()
99 //, m_HeadRev(GitRev::REV_HEAD)
100 , m_pbCanceled(NULL)
101 , m_pStatLabel(NULL)
102 , m_pSelectButton(NULL)
103 , m_pConfirmButton(NULL)
104 , m_bBusy(false)
105 , m_bEmpty(false)
106 , m_bShowIgnores(false)
107 , m_pDropTarget(NULL)
108 , m_bIgnoreRemoveOnly(false)
109 , m_bCheckChildrenWithParent(false)
110 , m_bUnversionedLast(true)
111 , m_bHasChangeLists(false)
112 , m_bHasLocks(false)
113 , m_bBlock(false)
114 , m_bBlockUI(false)
115 , m_bHasCheckboxes(false)
116 , m_bCheckIfGroupsExist(true)
117 , m_bFileDropsEnabled(false)
118 , m_bOwnDrag(false)
119 , m_dwDefaultColumns(0)
120 , m_ColumnManager(this)
121 , m_bAscending(false)
122 , m_nSortedColumn(-1)
123 , m_bHasExternalsFromDifferentRepos(false)
124 , m_sNoPropValueText(MAKEINTRESOURCE(IDS_STATUSLIST_NOPROPVALUE))
125 , m_amend(false)
126 , m_bDoNotAutoselectSubmodules(false)
127 , m_bHasWC(true)
129 m_FileLoaded=0;
130 m_critSec.Init();
131 m_bIsRevertTheirMy = false;
132 this->m_nLineAdded =this->m_nLineDeleted =0;
135 CGitStatusListCtrl::~CGitStatusListCtrl()
137 // if (m_pDropTarget)
138 // delete m_pDropTarget;
139 ClearStatusArray();
142 void CGitStatusListCtrl::ClearStatusArray()
144 #if 0
145 Locker lock(m_critSec);
146 for (size_t i=0; i < m_arStatusArray.size(); i++)
148 delete m_arStatusArray[i];
150 m_arStatusArray.clear();
151 #endif
154 void CGitStatusListCtrl::Init(DWORD dwColumns, const CString& sColumnInfoContainer, unsigned __int64 dwContextMenus /* = GitSLC_POPALL */, bool bHasCheckboxes /* = true */, bool bHasWC /* = true */, DWORD allowedColumns /* = 0xffffffff */)
156 Locker lock(m_critSec);
158 m_dwDefaultColumns = dwColumns | 1;
159 m_dwContextMenus = dwContextMenus;
160 m_bHasCheckboxes = bHasCheckboxes;
161 m_bHasWC = bHasWC;
163 // set the extended style of the listcontrol
164 // 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.
165 CRegDWORD regFullRowSelect(_T("Software\\TortoiseGit\\FullRowSelect"), TRUE);
166 DWORD exStyle = LVS_EX_HEADERDRAGDROP | LVS_EX_DOUBLEBUFFER | LVS_EX_INFOTIP | LVS_EX_SUBITEMIMAGES;
167 if (DWORD(regFullRowSelect))
168 exStyle |= LVS_EX_FULLROWSELECT;
169 exStyle |= (bHasCheckboxes ? LVS_EX_CHECKBOXES : 0);
170 SetRedraw(false);
171 SetExtendedStyle(exStyle);
173 SetWindowTheme(m_hWnd, L"Explorer", NULL);
175 m_nIconFolder = SYS_IMAGE_LIST().GetDirIconIndex();
176 m_nRestoreOvl = SYS_IMAGE_LIST().AddIcon((HICON)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_RESTOREOVL), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE));
177 SYS_IMAGE_LIST().SetOverlayImage(m_nRestoreOvl, OVL_RESTORE);
178 SetImageList(&SYS_IMAGE_LIST(), LVSIL_SMALL);
180 // keep CSorter::operator() in sync!!
181 static UINT standardColumnNames[GITSLC_NUMCOLUMNS]
182 = { IDS_STATUSLIST_COLFILE
183 , IDS_STATUSLIST_COLFILENAME
184 , IDS_STATUSLIST_COLEXT
185 , IDS_STATUSLIST_COLSTATUS
186 , IDS_STATUSLIST_COLADD
187 , IDS_STATUSLIST_COLDEL
188 , IDS_STATUSLIST_COLLASTMODIFIED
189 , IDS_STATUSLIST_COLSIZE
192 m_ColumnManager.SetNames(standardColumnNames,GITSLC_NUMCOLUMNS);
193 m_ColumnManager.ReadSettings(m_dwDefaultColumns, 0xffffffff & ~(allowedColumns | m_dwDefaultColumns), sColumnInfoContainer, GITSLC_NUMCOLUMNS);
195 // enable file drops
196 #if 0
197 if (m_pDropTarget == NULL)
199 m_pDropTarget = new CGitStatusListCtrlDropTarget(this);
200 RegisterDragDrop(m_hWnd,m_pDropTarget);
201 // create the supported formats:
202 FORMATETC ftetc={0};
203 ftetc.dwAspect = DVASPECT_CONTENT;
204 ftetc.lindex = -1;
205 ftetc.tymed = TYMED_HGLOBAL;
206 ftetc.cfFormat=CF_HDROP;
207 m_pDropTarget->AddSuportedFormat(ftetc);
209 #endif
211 SetRedraw(true);
214 bool CGitStatusListCtrl::SetBackgroundImage(UINT nID)
216 return CAppUtils::SetListCtrlBackgroundImage(GetSafeHwnd(), nID);
219 BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList* pathList
220 , bool bUpdate /* = FALSE */
221 , bool bShowIgnores /* = false */
222 , bool bShowUnRev)
224 Locker lock(m_critSec);
225 int mask= CGitStatusListCtrl::FILELIST_MODIFY;
226 if(bShowIgnores)
227 mask|= CGitStatusListCtrl::FILELIST_IGNORE;
228 if(bShowUnRev)
229 mask|= CGitStatusListCtrl::FILELIST_UNVER;
230 this->UpdateFileList(mask,bUpdate,(CTGitPathList*)pathList);
233 #if 0
234 int refetchcounter = 0;
235 BOOL bRet = TRUE;
236 Invalidate();
237 // force the cursor to change
238 POINT pt;
239 GetCursorPos(&pt);
240 SetCursorPos(pt.x, pt.y);
242 m_mapFilenameToChecked.clear();
243 //m_StatusUrlList.Clear();
244 bool bHasChangelists = (m_changelists.size()>1 || (m_changelists.size()>0 && !m_bHasIgnoreGroup));
245 m_changelists.clear();
246 for (size_t i=0; i < m_arStatusArray.size(); i++)
248 FileEntry * entry = m_arStatusArray[i];
249 if ( bHasChangelists && entry->checked)
251 // If change lists are present, remember all checked entries
252 CString path = entry->GetPath().GetGitPathString();
253 m_mapFilenameToChecked[path] = true;
255 if ( (entry->status==git_wc_status_unversioned || entry->status==git_wc_status_missing ) && entry->checked )
257 // The user manually selected an unversioned or missing file. We remember
258 // this so that the selection can be restored when refreshing.
259 CString path = entry->GetPath().GetGitPathString();
260 m_mapFilenameToChecked[path] = true;
262 else if ( entry->status > git_wc_status_normal && !entry->checked )
264 // The user manually deselected a versioned file. We remember
265 // this so that the deselection can be restored when refreshing.
266 CString path = entry->GetPath().GetGitPathString();
267 m_mapFilenameToChecked[path] = false;
271 // use a sorted path list to make sure we fetch the status of
272 // parent items first, *then* the child items (if any)
273 CTGitPathList sortedPathList = pathList;
274 sortedPathList.SortByPathname();
277 bRet = TRUE;
278 m_nTargetCount = 0;
279 m_bHasExternalsFromDifferentRepos = FALSE;
280 m_bHasExternals = FALSE;
281 m_bHasUnversionedItems = FALSE;
282 m_bHasLocks = false;
283 m_bHasChangeLists = false;
284 m_bShowIgnores = bShowIgnores;
285 m_nSortedColumn = 0;
286 m_bBlock = TRUE;
287 m_bBusy = true;
288 m_bEmpty = false;
289 Invalidate();
291 // first clear possible status data left from
292 // previous GetStatus() calls
293 ClearStatusArray();
295 m_StatusFileList = sortedPathList;
297 // Since Git_client_status() returns all files, even those in
298 // folders included with Git:externals we need to check if all
299 // files we get here belongs to the same repository.
300 // It is possible to commit changes in an external folder, as long
301 // as the folder belongs to the same repository (but another path),
302 // but it is not possible to commit all files if the externals are
303 // from a different repository.
305 // To check if all files belong to the same repository, we compare the
306 // UUID's - if they're identical then the files belong to the same
307 // repository and can be committed. But if they're different, then
308 // tell the user to commit all changes in the external folders
309 // first and exit.
310 CStringA sUUID; // holds the repo UUID
311 CTGitPathList arExtPaths; // list of Git:external paths
313 GitConfig config;
315 m_sURL.Empty();
317 m_nTargetCount = sortedPathList.GetCount();
319 GitStatus status(m_pbCanceled);
320 if(m_nTargetCount > 1 && sortedPathList.AreAllPathsFilesInOneDirectory())
322 // This is a special case, where we've been given a list of files
323 // all from one folder
324 // We handle them by setting a status filter, then requesting the Git status of
325 // all the files in the directory, filtering for the ones we're interested in
326 status.SetFilter(sortedPathList);
328 // if all selected entries are files, we don't do a recursive status
329 // fetching. But if only one is a directory, we have to recurse.
330 git_depth_t depth = git_depth_files;
331 // We have set a filter. If all selected items were files or we fetch
332 // the status not recursively, then we have to include
333 // ignored items too - the user has selected them
334 bool bShowIgnoresRight = true;
335 for (int fcindex=0; fcindex<sortedPathList.GetCount(); ++fcindex)
337 if (sortedPathList[fcindex].IsDirectory())
339 depth = git_depth_infinity;
340 bShowIgnoresRight = false;
341 break;
344 if(!FetchStatusForSingleTarget(config, status, sortedPathList.GetCommonDirectory(), bUpdate, sUUID, arExtPaths, true, depth, bShowIgnoresRight))
346 bRet = FALSE;
349 else
351 for(int nTarget = 0; nTarget < m_nTargetCount; nTarget++)
353 // check whether the path we want the status for is already fetched due to status-fetching
354 // of a parent path.
355 // this check is only done for file paths, because folder paths could be included already
356 // but not recursively
357 if (sortedPathList[nTarget].IsDirectory() || GetListEntry(sortedPathList[nTarget]) == NULL)
359 if(!FetchStatusForSingleTarget(config, status, sortedPathList[nTarget], bUpdate, sUUID,
360 arExtPaths, false, git_depth_infinity, bShowIgnores))
362 bRet = FALSE;
368 // remove the 'helper' files of conflicted items from the list.
369 // otherwise they would appear as unversioned files.
370 for (INT_PTR cind = 0; cind < m_ConflictFileList.GetCount(); ++cind)
372 for (size_t i=0; i < m_arStatusArray.size(); i++)
374 if (m_arStatusArray[i]->GetPath().IsEquivalentTo(m_ConflictFileList[cind]))
376 delete m_arStatusArray[i];
377 m_arStatusArray.erase(m_arStatusArray.begin()+i);
378 break;
382 refetchcounter++;
383 } while(!BuildStatistics() && (refetchcounter < 2) && (*m_pbCanceled==false));
385 m_bBlock = FALSE;
386 m_bBusy = false;
387 GetCursorPos(&pt);
388 SetCursorPos(pt.x, pt.y);
389 return bRet;
390 #endif
391 BuildStatistics();
392 return TRUE;
395 // Get the show-flags bitmap value which corresponds to a particular Git status
396 DWORD CGitStatusListCtrl::GetShowFlagsFromGitStatus(git_wc_status_kind status)
398 switch (status)
400 case git_wc_status_none:
401 case git_wc_status_unversioned:
402 return GITSLC_SHOWUNVERSIONED;
403 case git_wc_status_ignored:
404 if (!m_bShowIgnores)
405 return GITSLC_SHOWDIRECTS;
406 return GITSLC_SHOWDIRECTS|GITSLC_SHOWIGNORED;
407 case git_wc_status_incomplete:
408 return GITSLC_SHOWINCOMPLETE;
409 case git_wc_status_normal:
410 return GITSLC_SHOWNORMAL;
411 case git_wc_status_external:
412 return GITSLC_SHOWEXTERNAL;
413 case git_wc_status_added:
414 return GITSLC_SHOWADDED;
415 case git_wc_status_missing:
416 return GITSLC_SHOWMISSING;
417 case git_wc_status_deleted:
418 return GITSLC_SHOWREMOVED;
419 case git_wc_status_replaced:
420 return GITSLC_SHOWREPLACED;
421 case git_wc_status_modified:
422 return GITSLC_SHOWMODIFIED;
423 case git_wc_status_merged:
424 return GITSLC_SHOWMERGED;
425 case git_wc_status_conflicted:
426 return GITSLC_SHOWCONFLICTED;
427 case git_wc_status_obstructed:
428 return GITSLC_SHOWOBSTRUCTED;
429 default:
430 // we should NEVER get here!
431 ASSERT(FALSE);
432 break;
434 return 0;
437 void CGitStatusListCtrl::Show(unsigned int dwShow, unsigned int dwCheck /*=0*/, bool /*bShowFolders*/ /* = true */,BOOL UpdateStatusList,bool UseStoredCheckStatus)
439 CWinApp * pApp = AfxGetApp();
440 if (pApp)
441 pApp->DoWaitCursor(1);
443 Locker lock(m_critSec);
444 WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
446 //SetItemCount(listIndex);
447 SetRedraw(FALSE);
448 DeleteAllItems();
449 m_nSelected = 0;
451 m_nShownUnversioned = 0;
452 m_nShownModified = 0;
453 m_nShownAdded = 0;
454 m_nShownDeleted = 0;
455 m_nShownConflicted = 0;
456 m_nShownFiles = 0;
457 m_nShownSubmodules = 0;
459 if(UpdateStatusList)
461 m_arStatusArray.clear();
462 for(int i=0;i<this->m_StatusFileList.GetCount();i++)
464 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
467 for(int i=0;i<this->m_UnRevFileList.GetCount();i++)
469 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
472 for(int i=0;i<this->m_IgnoreFileList.GetCount();i++)
474 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
477 PrepareGroups();
478 if (m_nSortedColumn >= 0)
480 CSorter predicate (&m_ColumnManager, m_nSortedColumn, m_bAscending);
481 std::sort(m_arStatusArray.begin(), m_arStatusArray.end(), predicate);
484 int index =0;
485 for(int i=0;i<this->m_arStatusArray.size();i++)
487 //set default checkbox status
488 CTGitPath* entry = ((CTGitPath*)m_arStatusArray[i]);
489 CString path = entry->GetGitPathString();
490 if (m_mapFilenameToChecked.size()!=0 && m_mapFilenameToChecked.find(path) != m_mapFilenameToChecked.end())
492 entry->m_Checked=m_mapFilenameToChecked[path];
494 else if (!UseStoredCheckStatus)
496 bool autoSelectSubmodules = !(entry->IsDirectory() && m_bDoNotAutoselectSubmodules);
497 if(entry->m_Action & dwCheck && autoSelectSubmodules)
498 entry->m_Checked=true;
499 else
500 entry->m_Checked=false;
501 m_mapFilenameToChecked[path] = entry->m_Checked;
504 if(entry->m_Action & dwShow)
506 AddEntry(entry,langID,index);
507 index++;
511 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
512 for (int col = 0; col <= maxcol; col++)
513 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
515 SetRedraw(TRUE);
516 GetStatisticsString();
518 CHeaderCtrl * pHeader = GetHeaderCtrl();
519 HDITEM HeaderItem = {0};
520 HeaderItem.mask = HDI_FORMAT;
521 for (int i=0; i<pHeader->GetItemCount(); ++i)
523 pHeader->GetItem(i, &HeaderItem);
524 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
525 pHeader->SetItem(i, &HeaderItem);
527 if (m_nSortedColumn >= 0)
529 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
530 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
531 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
534 #if 0
535 if (nSelectedEntry)
537 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
538 EnsureVisible(nSelectedEntry, false);
540 else
542 // Restore the item at the top of the list.
543 for (int i=0;GetTopIndex() != nTopIndex;i++)
545 if ( !EnsureVisible(nTopIndex+i,false) )
547 break;
551 #endif
552 if (pApp)
553 pApp->DoWaitCursor(-1);
555 Invalidate();
557 m_dwShow = dwShow;
559 this->BuildStatistics();
561 #if 0
563 CWinApp * pApp = AfxGetApp();
564 if (pApp)
565 pApp->DoWaitCursor(1);
567 m_bShowFolders = bShowFolders;
569 int nTopIndex = GetTopIndex();
570 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
571 int nSelectedEntry = 0;
572 if (posSelectedEntry)
573 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
574 SetRedraw(FALSE);
575 DeleteAllItems();
577 PrepareGroups();
579 m_arListArray.clear();
581 m_arListArray.reserve(m_arStatusArray.size());
582 SetItemCount (static_cast<int>(m_arStatusArray.size()));
584 int listIndex = 0;
585 for (size_t i=0; i < m_arStatusArray.size(); ++i)
587 FileEntry * entry = m_arStatusArray[i];
588 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
589 continue;
590 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
591 continue;
592 if (entry->IsFolder() && (!bShowFolders))
593 continue; // don't show folders if they're not wanted.
595 #if 0
596 git_wc_status_kind status = GitStatus::GetMoreImportant(entry->status, entry->remotestatus);
597 DWORD showFlags = GetShowFlagsFromGitStatus(status);
598 if (entry->IsLocked())
599 showFlags |= SVNSLC_SHOWLOCKS;
600 if (entry->switched)
601 showFlags |= SVNSLC_SHOWSWITCHED;
602 if (!entry->changelist.IsEmpty())
603 showFlags |= SVNSLC_SHOWINCHANGELIST;
604 #endif
605 bool bAllowCheck = ((entry->changelist.Compare(GITSLC_IGNORECHANGELIST) != 0)
606 && (m_bCheckIfGroupsExist || (m_changelists.size()==0 || (m_changelists.size()==1 && m_bHasIgnoreGroup))));
608 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
609 #if 0
610 if (status != Git_wc_status_ignored || (entry->direct) || (dwShow & GitSLC_SHOWIGNORED))
612 if ((!entry->IsFolder()) && (status == Git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
614 if (PathFileExists(entry->GetPath().GetWinPath()))
616 m_arListArray.push_back(i);
617 if ((dwCheck & SVNSLC_SHOWREMOVEDANDPRESENT)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
619 if (bAllowCheck)
620 entry->checked = true;
622 AddEntry(entry, langID, listIndex++);
625 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
627 m_arListArray.push_back(i);
628 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
630 if (bAllowCheck)
631 entry->checked = true;
633 AddEntry(entry, langID, listIndex++);
635 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
637 m_arListArray.push_back(i);
638 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
640 if (bAllowCheck)
641 entry->checked = true;
643 AddEntry(entry, langID, listIndex++);
646 #endif
649 SetItemCount(listIndex);
651 m_ColumnManager.UpdateRelevance (m_arStatusArray, m_arListArray);
653 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
654 for (int col = 0; col <= maxcol; col++)
655 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
657 SetRedraw(TRUE);
658 GetStatisticsString();
660 CHeaderCtrl * pHeader = GetHeaderCtrl();
661 HDITEM HeaderItem = {0};
662 HeaderItem.mask = HDI_FORMAT;
663 for (int i=0; i<pHeader->GetItemCount(); ++i)
665 pHeader->GetItem(i, &HeaderItem);
666 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
667 pHeader->SetItem(i, &HeaderItem);
669 if (m_nSortedColumn)
671 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
672 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
673 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
676 if (nSelectedEntry)
678 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
679 EnsureVisible(nSelectedEntry, false);
681 else
683 // Restore the item at the top of the list.
684 for (int i=0;GetTopIndex() != nTopIndex;i++)
686 if ( !EnsureVisible(nTopIndex+i,false) )
688 break;
693 if (pApp)
694 pApp->DoWaitCursor(-1);
696 m_bEmpty = (GetItemCount() == 0);
697 Invalidate();
698 #endif
702 void CGitStatusListCtrl::Show(unsigned int /*dwShow*/, const CTGitPathList& checkedList, bool /*bShowFolders*/ /* = true */)
704 DeleteAllItems();
705 for(int i=0;i<checkedList.GetCount();i++)
706 this->AddEntry((CTGitPath *)&checkedList[i],0,i);
707 return ;
708 #if 0
710 Locker lock(m_critSec);
711 WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
713 CWinApp * pApp = AfxGetApp();
714 if (pApp)
715 pApp->DoWaitCursor(1);
716 m_dwShow = dwShow;
717 m_bShowFolders = bShowFolders;
718 m_nSelected = 0;
719 int nTopIndex = GetTopIndex();
720 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
721 int nSelectedEntry = 0;
722 if (posSelectedEntry)
723 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
724 SetRedraw(FALSE);
725 DeleteAllItems();
727 PrepareGroups();
729 m_arListArray.clear();
731 m_arListArray.reserve(m_arStatusArray.size());
732 SetItemCount (static_cast<int>(m_arStatusArray.size()));
734 int listIndex = 0;
735 for (size_t i=0; i < m_arStatusArray.size(); ++i)
737 FileEntry * entry = m_arStatusArray[i];
738 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
739 continue;
740 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
741 continue;
742 if (entry->IsFolder() && (!bShowFolders))
743 continue; // don't show folders if they're not wanted.
744 #if 0
745 git_wc_status_kind status = SVNStatus::GetMoreImportant(entry->status, entry->remotestatus);
746 DWORD showFlags = GetShowFlagsFromSVNStatus(status);
747 if (entry->IsLocked())
748 showFlags |= SVNSLC_SHOWLOCKS;
749 if (!entry->changelist.IsEmpty())
750 showFlags |= SVNSLC_SHOWINCHANGELIST;
752 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
753 if (status != git_wc_status_ignored || (entry->direct) || (dwShow & SVNSLC_SHOWIGNORED))
755 for (int npath = 0; npath < checkedList.GetCount(); ++npath)
757 if (entry->GetPath().IsEquivalentTo(checkedList[npath]))
759 entry->checked = true;
760 break;
763 if ((!entry->IsFolder()) && (status == git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
765 if (PathFileExists(entry->GetPath().GetWinPath()))
767 m_arListArray.push_back(i);
768 AddEntry(entry, langID, listIndex++);
771 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
773 m_arListArray.push_back(i);
774 AddEntry(entry, langID, listIndex++);
776 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
778 m_arListArray.push_back(i);
779 AddEntry(entry, langID, listIndex++);
781 else if (entry->switched)
783 m_arListArray.push_back(i);
784 AddEntry(entry, langID, listIndex++);
787 #endif
790 SetItemCount(listIndex);
792 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
793 for (int col = 0; col <= maxcol; col++)
794 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
796 SetRedraw(TRUE);
797 GetStatisticsString();
799 CHeaderCtrl * pHeader = GetHeaderCtrl();
800 HDITEM HeaderItem = {0};
801 HeaderItem.mask = HDI_FORMAT;
802 for (int i=0; i<pHeader->GetItemCount(); ++i)
804 pHeader->GetItem(i, &HeaderItem);
805 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
806 pHeader->SetItem(i, &HeaderItem);
808 if (m_nSortedColumn)
810 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
811 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
812 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
815 if (nSelectedEntry)
817 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
818 EnsureVisible(nSelectedEntry, false);
820 else
822 // Restore the item at the top of the list.
823 for (int i=0;GetTopIndex() != nTopIndex;i++)
825 if ( !EnsureVisible(nTopIndex+i,false) )
827 break;
832 if (pApp)
833 pApp->DoWaitCursor(-1);
835 m_bEmpty = (GetItemCount() == 0);
836 Invalidate();
837 #endif
840 int CGitStatusListCtrl::GetColumnIndex(int mask)
842 int i=0;
843 for(i=0;i<32;i++)
844 if(mask&0x1)
845 return i;
846 else
847 mask=mask>>1;
848 return -1;
850 void CGitStatusListCtrl::AddEntry(CTGitPath * GitPath, WORD /*langID*/, int listIndex)
852 static CString from(MAKEINTRESOURCE(IDS_STATUSLIST_FROM));
853 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
854 static bool abbreviateRenamings(((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\AbbreviateRenamings"), FALSE)) == TRUE);
855 static bool relativeTimes = (CRegDWORD(_T("Software\\TortoiseGit\\RelativeTimes"), FALSE) != FALSE);
857 CString path = GitPath->GetGitPathString();
859 m_bBlock = TRUE;
860 int index = listIndex;
861 int nCol = 1;
862 CString entryname = GitPath->GetGitPathString();
863 int icon_idx = 0;
864 if (GitPath->IsDirectory())
866 icon_idx = m_nIconFolder;
867 m_nShownSubmodules++;
869 else
871 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(*GitPath);
872 m_nShownFiles++;
874 switch (GitPath->m_Action)
876 case CTGitPath::LOGACTIONS_ADDED:
877 case CTGitPath::LOGACTIONS_COPY:
878 m_nShownAdded++;
879 break;
880 case CTGitPath::LOGACTIONS_DELETED:
881 m_nShownDeleted++;
882 break;
883 case CTGitPath::LOGACTIONS_REPLACED:
884 case CTGitPath::LOGACTIONS_MODIFIED:
885 case CTGitPath::LOGACTIONS_MERGED:
886 m_nShownModified++;
887 break;
888 case CTGitPath::LOGACTIONS_UNMERGED:
889 m_nShownConflicted++;
890 break;
891 case CTGitPath::LOGACTIONS_UNVER:
892 m_nShownUnversioned++;
893 break;
894 default:
895 m_nShownUnversioned++;
896 break;
898 if(GitPath->m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY) && !GitPath->GetGitOldPathString().IsEmpty())
900 if (!abbreviateRenamings)
902 // relative path
903 CString rename;
904 rename.Format(from, GitPath->GetGitOldPathString());
905 entryname += _T(" ") + rename;
907 else
909 CTGitPathList tgpl;
910 tgpl.AddPath(*GitPath);
911 CTGitPath old(GitPath->GetGitOldPathString());
912 tgpl.AddPath(old);
913 CString commonRoot = tgpl.GetCommonRoot().GetGitPathString();
914 if (!commonRoot.IsEmpty())
915 commonRoot += _T("/");
916 if (old.GetFileOrDirectoryName() == GitPath->GetFileOrDirectoryName() && old.GetContainingDirectory().GetGitPathString() != "" && GitPath->GetContainingDirectory().GetGitPathString())
918 entryname = commonRoot + _T("{") + GitPath->GetGitOldPathString().Mid(commonRoot.GetLength(), old.GetGitPathString().GetLength() - commonRoot.GetLength() - old.GetFileOrDirectoryName().GetLength() - 1) + _T(" => ") + GitPath->GetGitPathString().Mid(commonRoot.GetLength(), GitPath->GetGitPathString().GetLength() - commonRoot.GetLength() - old.GetFileOrDirectoryName().GetLength() - 1) + _T("}/") + old.GetFileOrDirectoryName();
920 else if (!commonRoot.IsEmpty())
922 entryname = commonRoot + _T("{") + GitPath->GetGitOldPathString().Mid(commonRoot.GetLength()) + _T(" => ") + GitPath->GetGitPathString().Mid(commonRoot.GetLength()) + _T("}");
924 else
926 entryname = GitPath->GetGitOldPathString().Mid(commonRoot.GetLength()) + _T(" => ") + GitPath->GetGitPathString().Mid(commonRoot.GetLength());
931 InsertItem(index, entryname, icon_idx);
932 if (m_restorepaths.find(GitPath->GetWinPathString()) != m_restorepaths.end())
933 SetItemState(index, INDEXTOOVERLAYMASK(OVL_RESTORE), TVIS_OVERLAYMASK);
935 this->SetItemData(index, (DWORD_PTR)GitPath);
936 // SVNSLC_COLFILENAME
937 SetItemText(index, nCol++, GitPath->GetFileOrDirectoryName());
938 // SVNSLC_COLEXT
939 SetItemText(index, nCol++, GitPath->GetFileExtension());
940 // SVNSLC_COLSTATUS
941 SetItemText(index, nCol++, GitPath->GetActionName());
943 SetItemText(index, GetColumnIndex(GITSLC_COLADD),GitPath->m_StatAdd);
944 SetItemText(index, GetColumnIndex(GITSLC_COLDEL),GitPath->m_StatDel);
947 CString modificationDate;
948 __int64 filetime = GitPath->GetLastWriteTime();
949 if (filetime && (GitPath->m_Action != CTGitPath::LOGACTIONS_DELETED))
951 FILETIME* f = (FILETIME*)(__int64*)&filetime;
952 modificationDate = CLoglistUtils::FormatDateAndTime(CTime(g_Git.filetime_to_time_t(f)), DATE_SHORTDATE, true, relativeTimes);
954 SetItemText(index, GetColumnIndex(GITSLC_COLMODIFICATIONDATE), modificationDate);
956 // SVNSLC_COLSIZE
957 if (GitPath->IsDirectory())
958 SetItemText(index, GetColumnIndex(GITSLC_COLSIZE), _T(""));
959 else
961 TCHAR buf[100];
962 StrFormatByteSize64(GitPath->GetFileSize(), buf, 100);
963 SetItemText(index, GetColumnIndex(GITSLC_COLSIZE), buf);
966 SetCheck(index, GitPath->m_Checked);
967 if (GitPath->m_Checked)
968 m_nSelected++;
971 if( GitPath->m_Action & CTGitPath::LOGACTIONS_IGNORE)
972 SetItemGroup(index, 2);
973 else if( GitPath->m_Action & CTGitPath::LOGACTIONS_UNVER)
974 SetItemGroup(index,1);
975 else
977 SetItemGroup(index, GitPath->m_ParentNo&(PARENT_MASK|MERGE_MASK));
980 m_bBlock = FALSE;
985 bool CGitStatusListCtrl::SetItemGroup(int item, int groupindex)
987 // if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS) == NULL)
988 // return false;
989 if (groupindex < 0)
990 return false;
991 LVITEM i = {0};
992 i.mask = LVIF_GROUPID;
993 i.iItem = item;
994 i.iSubItem = 0;
995 i.iGroupId = groupindex;
997 return !!SetItem(&i);
1000 void CGitStatusListCtrl::OnHdnItemclick(NMHDR *pNMHDR, LRESULT *pResult)
1002 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
1003 *pResult = 0;
1004 if (m_bBlock)
1005 return;
1006 m_bBlock = TRUE;
1007 if (m_nSortedColumn == phdr->iItem)
1008 m_bAscending = !m_bAscending;
1009 else
1010 m_bAscending = TRUE;
1011 m_nSortedColumn = phdr->iItem;
1012 Show(m_dwShow, 0, m_bShowFolders,false,true);
1014 m_bBlock = FALSE;
1017 void CGitStatusListCtrl::OnLvnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
1019 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1020 *pResult = 0;
1022 #define ISCHECKED(x) ((x) ? ((((x)&LVIS_STATEIMAGEMASK)>>12)-1) : FALSE)
1023 if ((m_bBlock)&&(m_bBlockUI))
1025 // if we're blocked, prevent changing of the check state
1026 if ((!ISCHECKED(pNMLV->uOldState) && ISCHECKED(pNMLV->uNewState))||
1027 (ISCHECKED(pNMLV->uOldState) && !ISCHECKED(pNMLV->uNewState)))
1028 *pResult = TRUE;
1032 BOOL CGitStatusListCtrl::OnLvnItemchanged(NMHDR *pNMHDR, LRESULT *pResult)
1034 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1035 *pResult = 0;
1036 CWnd* pParent = GetParent();
1037 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
1039 pParent->SendMessage(GITSLNM_ITEMCHANGED, pNMLV->iItem);
1042 if ((pNMLV->uNewState==0)||(pNMLV->uNewState & LVIS_SELECTED)||(pNMLV->uNewState & LVIS_FOCUSED))
1043 return FALSE;
1045 if (m_bBlock)
1046 return FALSE;
1048 bool bSelected = !!(ListView_GetItemState(m_hWnd, pNMLV->iItem, LVIS_SELECTED) & LVIS_SELECTED);
1049 int nListItems = GetItemCount();
1051 m_bBlock = TRUE;
1052 // was the item checked?
1054 //CTGitPath *gitpath=(CTGitPath*)GetItemData(pNMLV->iItem);
1055 //gitpath->m_Checked=GetCheck(pNMLV->iItem);
1057 if (GetCheck(pNMLV->iItem))
1059 CheckEntry(pNMLV->iItem, nListItems);
1060 if (bSelected)
1062 POSITION pos = GetFirstSelectedItemPosition();
1063 int index;
1064 while ((index = GetNextSelectedItem(pos)) >= 0)
1066 if (index != pNMLV->iItem)
1067 CheckEntry(index, nListItems);
1071 else
1073 UncheckEntry(pNMLV->iItem, nListItems);
1074 if (bSelected)
1076 POSITION pos = GetFirstSelectedItemPosition();
1077 int index;
1078 while ((index = GetNextSelectedItem(pos)) >= 0)
1080 if (index != pNMLV->iItem)
1081 UncheckEntry(index, nListItems);
1086 GetStatisticsString();
1087 m_bBlock = FALSE;
1088 NotifyCheck();
1090 return FALSE;
1093 void CGitStatusListCtrl::OnColumnResized(NMHDR *pNMHDR, LRESULT *pResult)
1095 m_ColumnManager.OnColumnResized(pNMHDR,pResult);
1097 *pResult = FALSE;
1100 void CGitStatusListCtrl::OnColumnMoved(NMHDR *pNMHDR, LRESULT *pResult)
1102 m_ColumnManager.OnColumnMoved(pNMHDR, pResult);
1104 Invalidate(FALSE);
1107 void CGitStatusListCtrl::CheckEntry(int index, int /*nListItems*/)
1109 Locker lock(m_critSec);
1110 //FileEntry * entry = GetListEntry(index);
1111 CTGitPath *path=(CTGitPath*)GetItemData(index);
1112 ASSERT(path != NULL);
1113 if (path == NULL)
1114 return;
1115 m_mapFilenameToChecked[path->GetGitPathString()] = true;
1116 SetCheck(index, TRUE);
1117 //entry = GetListEntry(index);
1118 // if an unversioned item was checked, then we need to check if
1119 // the parent folders are unversioned too. If the parent folders actually
1120 // are unversioned, then check those too.
1121 #if 0
1122 if (entry->status == git_wc_status_unversioned)
1124 // we need to check the parent folder too
1125 const CTGitPath& folderpath = entry->path;
1126 for (int i=0; i< nListItems; ++i)
1128 FileEntry * testEntry = GetListEntry(i);
1129 ASSERT(testEntry != NULL);
1130 if (testEntry == NULL)
1131 continue;
1132 if (!testEntry->checked)
1134 if (testEntry->path.IsAncestorOf(folderpath) && (!testEntry->path.IsEquivalentTo(folderpath)))
1136 SetEntryCheck(testEntry,i,true);
1137 m_nSelected++;
1142 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1143 if ( (entry->status == git_wc_status_deleted) || (m_bCheckChildrenWithParent) || (bShift) )
1145 // if a deleted folder gets checked, we have to check all
1146 // children of that folder too.
1147 if (entry->path.IsDirectory())
1149 SetCheckOnAllDescendentsOf(entry, true);
1152 // if a deleted file or folder gets checked, we have to
1153 // check all parents of this item too.
1154 for (int i=0; i<nListItems; ++i)
1156 FileEntry * testEntry = GetListEntry(i);
1157 ASSERT(testEntry != NULL);
1158 if (testEntry == NULL)
1159 continue;
1160 if (!testEntry->checked)
1162 if (testEntry->path.IsAncestorOf(entry->path) && (!testEntry->path.IsEquivalentTo(entry->path)))
1164 if ((testEntry->status == git_wc_status_deleted)||(m_bCheckChildrenWithParent))
1166 SetEntryCheck(testEntry,i,true);
1167 m_nSelected++;
1168 // now we need to check all children of this parent folder
1169 SetCheckOnAllDescendentsOf(testEntry, true);
1175 #endif
1176 if ( !path->m_Checked )
1178 path->m_Checked = TRUE;
1179 m_nSelected++;
1183 void CGitStatusListCtrl::UncheckEntry(int index, int /*nListItems*/)
1185 Locker lock(m_critSec);
1186 CTGitPath *path=(CTGitPath*)GetItemData(index);
1187 ASSERT(path != NULL);
1188 if (path == NULL)
1189 return;
1190 SetCheck(index, FALSE);
1191 m_mapFilenameToChecked[path->GetGitPathString()] = false;
1192 //entry = GetListEntry(index);
1193 // item was unchecked
1194 #if 0
1195 if (entry->path.IsDirectory())
1197 // disable all files within an unselected folder, except when unchecking a folder with property changes
1198 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1199 if ( (entry->status != git_wc_status_modified) || (bShift) )
1201 SetCheckOnAllDescendentsOf(entry, false);
1204 else if (entry->status == git_wc_status_deleted)
1206 // a "deleted" file was unchecked, so uncheck all parent folders
1207 // and all children of those parents
1208 for (int i=0; i<nListItems; i++)
1210 FileEntry * testEntry = GetListEntry(i);
1211 ASSERT(testEntry != NULL);
1212 if (testEntry == NULL)
1213 continue;
1214 if (testEntry->checked)
1216 if (testEntry->path.IsAncestorOf(entry->path))
1218 if (testEntry->status == git_wc_status_deleted)
1220 SetEntryCheck(testEntry,i,false);
1221 m_nSelected--;
1223 SetCheckOnAllDescendentsOf(testEntry, false);
1229 #endif
1230 if ( path->m_Checked )
1232 path->m_Checked = FALSE;
1233 m_nSelected--;
1236 bool CGitStatusListCtrl::BuildStatistics()
1239 bool bRefetchStatus = false;
1241 // now gather some statistics
1242 m_nUnversioned = 0;
1243 m_nNormal = 0;
1244 m_nModified = 0;
1245 m_nAdded = 0;
1246 m_nDeleted = 0;
1247 m_nConflicted = 0;
1248 m_nTotal = 0;
1249 m_nSelected = 0;
1250 m_nLineAdded = 0;
1251 m_nLineDeleted = 0;
1252 m_nRenamed = 0;
1254 for (int i=0; i < (int)m_arStatusArray.size(); ++i)
1256 int status=((CTGitPath*)m_arStatusArray[i])->m_Action;
1258 m_nLineAdded += _tstol(((CTGitPath*)m_arStatusArray[i])->m_StatAdd);
1259 m_nLineDeleted += _tstol(((CTGitPath*)m_arStatusArray[i])->m_StatDel);
1261 if(status&(CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))
1262 m_nAdded++;
1264 if(status&CTGitPath::LOGACTIONS_DELETED)
1265 m_nDeleted++;
1267 if(status&(CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_MODIFIED))
1268 m_nModified++;
1270 if(status&CTGitPath::LOGACTIONS_UNMERGED)
1271 m_nConflicted++;
1273 if(status&(CTGitPath::LOGACTIONS_IGNORE|CTGitPath::LOGACTIONS_UNVER))
1274 m_nUnversioned++;
1276 if(status&(CTGitPath::LOGACTIONS_REPLACED))
1277 m_nRenamed++;
1279 if(((CTGitPath*)m_arStatusArray[i])->m_Checked)
1280 m_nSelected++;
1282 // } // switch (entry->status)
1283 // } // if (entry)
1284 } // for (int i=0; i < (int)m_arStatusArray.size(); ++i)
1285 return !bRefetchStatus;
1287 return FALSE;
1291 int CGitStatusListCtrl::GetGroupFromPoint(POINT * ppt)
1293 // the point must be relative to the upper left corner of the control
1295 if (ppt == NULL)
1296 return -1;
1297 if (!IsGroupViewEnabled())
1298 return -1;
1300 POINT pt = *ppt;
1301 pt.x = 10;
1302 UINT flags = 0;
1303 int nItem = -1;
1304 RECT rc;
1305 GetWindowRect(&rc);
1306 while (((flags & LVHT_BELOW) == 0)&&(pt.y < rc.bottom))
1308 nItem = HitTest(pt, &flags);
1309 if ((flags & LVHT_ONITEM)||(flags & LVHT_EX_GROUP_HEADER))
1311 // the first item below the point
1313 // check if the point is too much right (i.e. if the point
1314 // is farther to the right than the width of the item)
1315 RECT r;
1316 GetItemRect(nItem, &r, LVIR_LABEL);
1317 if (ppt->x > r.right)
1318 return -1;
1320 LVITEM lv = {0};
1321 lv.mask = LVIF_GROUPID;
1322 lv.iItem = nItem;
1323 GetItem(&lv);
1324 int groupID = lv.iGroupId;
1325 // now we search upwards and check if the item above this one
1326 // belongs to another group. If it belongs to the same group,
1327 // we're not over a group header
1328 while (pt.y >= 0)
1330 pt.y -= 2;
1331 nItem = HitTest(pt, &flags);
1332 if ((flags & LVHT_ONITEM)&&(nItem >= 0))
1334 // the first item below the point
1335 LVITEM lv = {0};
1336 lv.mask = LVIF_GROUPID;
1337 lv.iItem = nItem;
1338 GetItem(&lv);
1339 if (lv.iGroupId != groupID)
1340 return groupID;
1341 else
1342 return -1;
1345 if (pt.y < 0)
1346 return groupID;
1347 return -1;
1349 pt.y += 2;
1351 return -1;
1354 void CGitStatusListCtrl::OnContextMenuGroup(CWnd * /*pWnd*/, CPoint point)
1356 POINT clientpoint = point;
1357 ScreenToClient(&clientpoint);
1358 if ((IsGroupViewEnabled())&&(GetGroupFromPoint(&clientpoint) >= 0))
1360 CMenu popup;
1361 if (popup.CreatePopupMenu())
1363 CString temp;
1364 temp.LoadString(IDS_STATUSLIST_CHECKGROUP);
1365 popup.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_CHECKGROUP, temp);
1366 temp.LoadString(IDS_STATUSLIST_UNCHECKGROUP);
1367 popup.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_UNCHECKGROUP, temp);
1368 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1369 bool bCheck = false;
1370 switch (cmd)
1372 case IDGITLC_CHECKGROUP:
1373 bCheck = true;
1374 // fall through here
1375 case IDGITLC_UNCHECKGROUP:
1377 int group = GetGroupFromPoint(&clientpoint);
1378 // go through all items and check/uncheck those assigned to the group
1379 // but block the OnLvnItemChanged handler
1380 m_bBlock = true;
1381 LVITEM lv;
1382 for (int i=0; i<GetItemCount(); ++i)
1384 SecureZeroMemory(&lv, sizeof(LVITEM));
1385 lv.mask = LVIF_GROUPID;
1386 lv.iItem = i;
1387 GetItem(&lv);
1389 if (lv.iGroupId == group)
1391 CTGitPath * entry = (CTGitPath*)GetItemData(i);
1392 if (entry)
1394 bool bOldCheck = entry->m_Checked;
1395 SetEntryCheck(entry, i, bCheck);
1396 if (bCheck != bOldCheck)
1398 if (bCheck)
1399 m_nSelected++;
1400 else
1401 m_nSelected--;
1407 GetStatisticsString();
1408 NotifyCheck();
1409 m_bBlock = false;
1411 break;
1417 void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
1420 //WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
1422 //bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1423 CTGitPath * filepath;
1425 int selIndex = GetSelectionMark();
1426 if ((point.x == -1) && (point.y == -1))
1428 CRect rect;
1429 GetItemRect(selIndex, &rect, LVIR_LABEL);
1430 ClientToScreen(&rect);
1431 point = rect.CenterPoint();
1433 if ((GetSelectedCount() == 0) && (m_bHasCheckboxes))
1435 // nothing selected could mean the context menu is requested for
1436 // a group header
1437 OnContextMenuGroup(pWnd, point);
1439 else if (selIndex >= 0)
1441 //FileEntry * entry = GetListEntry(selIndex);
1443 filepath = (CTGitPath * )GetItemData(selIndex);
1445 ASSERT(filepath != NULL);
1446 if (filepath == NULL)
1447 return;
1449 //const CTGitPath& filepath = entry->path;
1450 int wcStatus = filepath->m_Action;
1451 // entry is selected, now show the popup menu
1452 Locker lock(m_critSec);
1453 CIconMenu popup;
1454 CMenu changelistSubMenu;
1455 CMenu ignoreSubMenu;
1456 if (popup.CreatePopupMenu())
1458 //Add Menu for version controlled file
1460 if (GetSelectedCount() > 0 && wcStatus & CTGitPath::LOGACTIONS_UNMERGED)
1462 if (GetSelectedCount() == 1 && (m_dwContextMenus & GITSLC_POPCONFLICT)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1464 popup.AppendMenuIcon(IDGITLC_EDITCONFLICT, IDS_MENUCONFLICT, IDI_CONFLICT);
1466 if (m_dwContextMenus & GITSLC_POPRESOLVE)
1468 popup.AppendMenuIcon(IDGITLC_RESOLVECONFLICT, IDS_STATUSLIST_CONTEXT_RESOLVED, IDI_RESOLVE);
1470 if ((m_dwContextMenus & GITSLC_POPRESOLVE)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1472 popup.AppendMenuIcon(IDGITLC_RESOLVETHEIRS, IDS_SVNPROGRESS_MENUUSETHEIRS, IDI_RESOLVE);
1473 popup.AppendMenuIcon(IDGITLC_RESOLVEMINE, IDS_SVNPROGRESS_MENUUSEMINE, IDI_RESOLVE);
1475 if ((m_dwContextMenus & GITSLC_POPCONFLICT)||(m_dwContextMenus & GITSLC_POPRESOLVE))
1476 popup.AppendMenu(MF_SEPARATOR);
1479 if (GetSelectedCount() > 0)
1481 if (wcStatus & CTGitPath::LOGACTIONS_UNVER)
1482 if (m_dwContextMenus & GITSLC_POPADD)
1484 //if ( entry->IsFolder() )
1486 // popup.AppendMenuIcon(IDSVNLC_ADD_RECURSIVE, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE, IDI_ADD);
1488 //else
1490 popup.AppendMenuIcon(IDGITLC_ADD, IDS_STATUSLIST_CONTEXT_ADD, IDI_ADD);
1495 if (!(wcStatus &CTGitPath::LOGACTIONS_UNVER))
1497 if ( (m_dwContextMenus & GITSLC_POPCOMPAREWITHBASE) && GetSelectedCount()>0)
1499 if(filepath->m_ParentNo & MERGE_MASK)
1500 popup.AppendMenuIcon(IDGITLC_COMPARE, IDS_TREE_DIFF, IDI_DIFF);
1501 else
1502 popup.AppendMenuIcon(IDGITLC_COMPARE, IDS_LOG_COMPAREWITHBASE, IDI_DIFF);
1504 popup.SetDefaultItem(IDGITLC_COMPARE, FALSE);
1507 if ((m_dwContextMenus & this->GetContextMenuBit(IDGITLC_COMPAREWC)) && GetSelectedCount()>0 && m_bHasWC)
1509 if( (!m_CurrentVersion.IsEmpty()) && m_CurrentVersion != GIT_REV_ZERO)
1510 popup.AppendMenuIcon(IDGITLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
1512 //Select one items
1513 if (GetSelectedCount() == 1)
1515 bool bEntryAdded = false;
1516 //if (entry->remotestatus <= git_wc_status_normal)
1518 // if (wcStatus > git_wc_status_normal)
1519 // {
1520 // if ((m_dwContextMenus & SVNSLC_POPGNUDIFF)&&(wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing))
1521 // {
1522 if(!g_Git.IsInitRepos() && (m_dwContextMenus&GITSLC_POPGNUDIFF))
1524 popup.AppendMenuIcon(IDGITLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1526 bEntryAdded = true;
1528 // }
1529 // }
1532 //else if (wcStatus != git_wc_status_deleted)
1534 // if (m_dwContextMenus & SVNSLC_POPCOMPARE)
1535 // {
1536 // popup.AppendMenuIcon(IDSVNLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
1537 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
1538 // bEntryAdded = true;
1539 // }
1540 // if (m_dwContextMenus & SVNSLC_POPGNUDIFF)
1541 // {
1542 // popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1543 // bEntryAdded = true;
1544 // }
1546 if (bEntryAdded)
1547 popup.AppendMenu(MF_SEPARATOR);
1549 //else if (GetSelectedCount() > 1)
1551 // if (m_dwContextMenus & SVNSLC_POPCOMMIT)
1552 // {
1553 // popup.AppendMenuIcon(IDSVNLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);
1554 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
1555 // }
1559 if( (!this->m_Rev1.IsEmpty()) || (!this->m_Rev1.IsEmpty()) )
1561 if(GetSelectedCount() == 1)
1563 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_COMPARETWO))
1565 popup.AppendMenuIcon(IDGITLC_COMPARETWO, IDS_LOG_POPUP_COMPARETWO, IDI_DIFF);
1566 popup.SetDefaultItem(IDGITLC_COMPARETWO, FALSE);
1568 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_GNUDIFF2))
1570 popup.AppendMenuIcon(IDGITLC_GNUDIFF2, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1575 //Select Multi item
1576 if (GetSelectedCount() > 0)
1578 if ((GetSelectedCount() == 2) && (m_dwContextMenus & this->GetContextMenuBit(GITSLC_POPCOMPARETWOFILES)) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO))
1580 POSITION pos = GetFirstSelectedItemPosition();
1581 int index = GetNextSelectedItem(pos);
1582 if (index >= 0)
1584 CTGitPath * entry2 = NULL;
1585 bool bothItemsAreExistingFiles = true;
1586 entry2 = (CTGitPath * )GetItemData(index);
1587 if (entry2)
1588 bothItemsAreExistingFiles = !entry2->IsDirectory() && entry2->Exists();
1589 index = GetNextSelectedItem(pos);
1590 if (index >= 0)
1592 entry2 = (CTGitPath * )GetItemData(index);
1593 if (entry2)
1594 bothItemsAreExistingFiles = bothItemsAreExistingFiles && !entry2->IsDirectory() && entry2->Exists();
1595 if (bothItemsAreExistingFiles)
1596 popup.AppendMenuIcon(IDGITLC_COMPARETWOFILES, IDS_STATUSLIST_CONTEXT_COMPARETWOFILES, IDI_DIFF);
1600 // if ((GetSelectedCount() == 2)&&(m_dwContextMenus & SVNSLC_POPREPAIRMOVE))
1601 // {
1602 // POSITION pos = GetFirstSelectedItemPosition();
1603 // int index = GetNextSelectedItem(pos);
1604 // if (index >= 0)
1605 // {
1606 // FileEntry * entry = GetListEntry(index);
1607 // git_wc_status_kind status1 = git_wc_status_none;
1608 // git_wc_status_kind status2 = git_wc_status_none;
1609 // if (entry)
1610 // status1 = entry->status;
1611 // index = GetNextSelectedItem(pos);
1612 // if (index >= 0)
1613 // {
1614 // entry = GetListEntry(index);
1615 // if (entry)
1616 // status2 = entry->status;
1617 // if ((status1 == git_wc_status_missing && status2 == git_wc_status_unversioned) ||
1618 // (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned))
1619 // {
1620 // popup.AppendMenuIcon(IDSVNLC_REPAIRMOVE, IDS_STATUSLIST_CONTEXT_REPAIRMOVE);
1621 // }
1622 // }
1623 // }
1624 // }
1625 // if (wcStatus > git_wc_status_normal)
1626 // {
1627 // if (m_dwContextMenus & SVNSLC_POPREVERT)
1628 // {
1629 // // reverting missing folders is not possible
1630 // if (!entry->IsFolder() || (wcStatus != git_wc_status_missing))
1631 // {
1632 // popup.AppendMenuIcon(IDSVNLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
1633 // }
1634 // }
1635 // }
1636 // if (entry->remotestatus > git_wc_status_normal)
1637 // {
1638 // if (m_dwContextMenus & SVNSLC_POPUPDATE)
1639 // {
1640 // popup.AppendMenuIcon(IDSVNLC_UPDATE, IDS_MENUUPDATE, IDI_UPDATE);
1641 // }
1642 // }
1645 if ( (GetSelectedCount() >0 ) && (!(wcStatus & CTGitPath::LOGACTIONS_UNVER)) && m_bHasWC)
1647 if ((m_dwContextMenus & GITSLC_POPREVERT) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO))
1649 popup.AppendMenuIcon(IDGITLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
1652 if ((m_dwContextMenus & GITSLC_POPASSUMEVALID) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO) && !(wcStatus & (CTGitPath::LOGACTIONS_ADDED | CTGitPath::LOGACTIONS_DELETED | CTGitPath::LOGACTIONS_UNMERGED)) && !filepath->IsDirectory())
1654 popup.AppendMenuIcon(IDGITLC_ASSUMEVALID, IDS_MENUASSUMEVALID);
1657 if (m_dwContextMenus & GITSLC_POPRESTORE && !filepath->IsDirectory())
1659 if (m_restorepaths.find(filepath->GetWinPathString()) == m_restorepaths.end())
1660 popup.AppendMenuIcon(IDGITLC_CREATERESTORE, IDS_MENUCREATERESTORE, IDI_RESTORE);
1661 else
1662 popup.AppendMenuIcon(IDGITLC_RESTOREPATH, IDS_MENURESTORE, IDI_RESTORE);
1665 if ((m_dwContextMenus & GetContextMenuBit(IDGITLC_REVERTTOREV)) && ( !this->m_CurrentVersion.IsEmpty() )
1666 && this->m_CurrentVersion != GIT_REV_ZERO && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1668 popup.AppendMenuIcon(IDGITLC_REVERTTOREV, IDS_LOG_POPUP_REVERTTOREV, IDI_REVERT);
1672 if ((GetSelectedCount() == 1)&&(!(wcStatus & CTGitPath::LOGACTIONS_UNVER))
1673 &&(!(wcStatus & CTGitPath::LOGACTIONS_IGNORE)))
1675 if (m_dwContextMenus & GITSLC_POPSHOWLOG)
1677 popup.AppendMenuIcon(IDGITLC_LOG, IDS_REPOBROWSE_SHOWLOG, IDI_LOG);
1679 if (m_dwContextMenus & GITSLC_POPSHOWLOGOLDNAME && (wcStatus & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY) && !filepath->GetGitOldPathString().IsEmpty()))
1681 popup.AppendMenuIcon(IDGITLC_LOGOLDNAME, IDS_STATUSLIST_SHOWLOGOLDNAME, IDI_LOG);
1683 if (m_dwContextMenus & GITSLC_POPBLAME && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED) && m_bHasWC)
1685 popup.AppendMenuIcon(IDGITLC_BLAME, IDS_MENUBLAME, IDI_BLAME);
1688 // if ((wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing) && (GetSelectedCount() == 1))
1689 if ( (GetSelectedCount() == 1) )
1691 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_SAVEAS) && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1693 popup.AppendMenuIcon(IDGITLC_SAVEAS, IDS_LOG_POPUP_SAVE, IDI_SAVEAS);
1696 if (m_dwContextMenus & GITSLC_POPOPEN && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1698 popup.AppendMenuIcon(IDGITLC_VIEWREV, IDS_LOG_POPUP_VIEWREV);
1699 popup.AppendMenuIcon(IDGITLC_OPEN, IDS_REPOBROWSE_OPEN, IDI_OPEN);
1700 popup.AppendMenuIcon(IDGITLC_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
1701 if (wcStatus &CTGitPath::LOGACTIONS_UNVER) {
1702 popup.SetDefaultItem(IDGITLC_OPEN, FALSE);
1706 if (m_dwContextMenus & GITSLC_POPEXPLORE && !(wcStatus & CTGitPath::LOGACTIONS_DELETED) && m_bHasWC)
1708 popup.AppendMenuIcon(IDGITLC_EXPLORE, IDS_STATUSLIST_CONTEXT_EXPLORE, IDI_EXPLORER);
1712 if (GetSelectedCount() > 0)
1714 // if (((wcStatus == git_wc_status_unversioned)||(wcStatus == git_wc_status_ignored))&&(m_dwContextMenus & SVNSLC_POPDELETE))
1715 // {
1716 // popup.AppendMenuIcon(IDSVNLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
1717 // }
1718 // 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))
1719 // {
1720 // if (bShift)
1721 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVEKEEP, IDI_DELETE);
1722 // else
1723 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVE, IDI_DELETE);
1724 // }
1725 if ((wcStatus & CTGitPath::LOGACTIONS_UNVER)/*||(wcStatus == git_wc_status_deleted)*/)
1727 if (m_dwContextMenus & GITSLC_POPDELETE)
1729 popup.AppendMenuIcon(IDGITLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
1732 if ( (wcStatus & CTGitPath::LOGACTIONS_UNVER || wcStatus & CTGitPath::LOGACTIONS_DELETED) )
1734 if (m_dwContextMenus & GITSLC_POPIGNORE)
1737 CTGitPathList ignorelist;
1738 FillListOfSelectedItemPaths(ignorelist);
1739 //check if all selected entries have the same extension
1740 bool bSameExt = true;
1741 CString sExt;
1742 for (int i=0; i<ignorelist.GetCount(); ++i)
1744 if (sExt.IsEmpty() && (i==0))
1745 sExt = ignorelist[i].GetFileExtension();
1746 else if (sExt.CompareNoCase(ignorelist[i].GetFileExtension())!=0)
1747 bSameExt = false;
1749 if (bSameExt)
1751 if (ignoreSubMenu.CreateMenu())
1753 CString ignorepath;
1754 if (ignorelist.GetCount()==1)
1755 ignorepath = ignorelist[0].GetFileOrDirectoryName();
1756 else
1757 ignorepath.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
1758 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_IGNORE, ignorepath);
1759 ignorepath = _T("*")+sExt;
1760 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_IGNOREMASK, ignorepath);
1761 CString temp;
1762 temp.LoadString(IDS_MENUIGNORE);
1763 popup.InsertMenu((UINT)-1, MF_BYPOSITION | MF_POPUP, (UINT_PTR)ignoreSubMenu.m_hMenu, temp);
1766 else
1768 CString temp;
1769 if (ignorelist.GetCount()==1)
1771 temp.LoadString(IDS_MENUIGNORE);
1773 else
1775 temp.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
1777 popup.AppendMenuIcon(IDGITLC_IGNORE, temp, IDI_IGNORE);
1785 if (GetSelectedCount() > 0)
1787 popup.AppendMenu(MF_SEPARATOR);
1788 popup.AppendMenuIcon(IDGITLC_COPY, IDS_STATUSLIST_CONTEXT_COPY, IDI_COPYCLIP);
1789 popup.AppendMenuIcon(IDGITLC_COPYEXT, IDS_STATUSLIST_CONTEXT_COPYEXT, IDI_COPYCLIP);
1790 #if 0
1791 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS))
1792 &&(wcStatus != git_wc_status_unversioned)&&(wcStatus != git_wc_status_none))
1794 popup.AppendMenu(MF_SEPARATOR);
1795 // changelist commands
1796 size_t numChangelists = GetNumberOfChangelistsInSelection();
1797 if (numChangelists > 0)
1799 popup.AppendMenuIcon(IDSVNLC_REMOVEFROMCS, IDS_STATUSLIST_CONTEXT_REMOVEFROMCS);
1801 if ((!entry->IsFolder())&&(changelistSubMenu.CreateMenu()))
1803 CString temp;
1804 temp.LoadString(IDS_STATUSLIST_CONTEXT_CREATECS);
1805 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATECS, temp);
1807 if (entry->changelist.Compare(SVNSLC_IGNORECHANGELIST))
1809 changelistSubMenu.AppendMenu(MF_SEPARATOR);
1810 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATEIGNORECS, SVNSLC_IGNORECHANGELIST);
1813 if (m_changelists.size() > 0)
1815 // find the changelist names
1816 bool bNeedSeparator = true;
1817 int cmdID = IDSVNLC_MOVETOCS;
1818 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
1820 if ((entry->changelist.Compare(it->first))&&(it->first.Compare(SVNSLC_IGNORECHANGELIST)))
1822 if (bNeedSeparator)
1824 changelistSubMenu.AppendMenu(MF_SEPARATOR);
1825 bNeedSeparator = false;
1827 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, cmdID, it->first);
1828 cmdID++;
1832 temp.LoadString(IDS_STATUSLIST_CONTEXT_MOVETOCS);
1833 popup.AppendMenu(MF_POPUP|MF_STRING, (UINT_PTR)changelistSubMenu.GetSafeHmenu(), temp);
1836 #endif
1839 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1841 m_bBlock = TRUE;
1842 AfxGetApp()->DoWaitCursor(1);
1843 //int iItemCountBeforeMenuCmd = GetItemCount();
1844 //bool bForce = false;
1845 switch (cmd)
1847 case IDGITLC_VIEWREV:
1848 OpenFile(filepath, ALTERNATIVEEDITOR);
1849 break;
1850 case IDGITLC_OPEN:
1851 OpenFile(filepath,OPEN);
1852 break;
1853 case IDGITLC_OPENWITH:
1854 OpenFile(filepath,OPEN_WITH);
1855 break;
1856 case IDGITLC_EXPLORE:
1858 ShellExecute(this->m_hWnd, _T("explore"), filepath->GetDirectory().GetWinPath(), NULL, NULL, SW_SHOW);
1860 break;
1861 case IDGITLC_CREATERESTORE:
1863 POSITION pos = GetFirstSelectedItemPosition();
1864 while (pos)
1866 int index = GetNextSelectedItem(pos);
1867 CTGitPath * entry2 = (CTGitPath * )GetItemData(index);
1868 ASSERT(entry2 != NULL);
1869 if (entry2 == NULL || entry2->IsDirectory())
1870 continue;
1871 if (m_restorepaths.find(entry2->GetWinPathString()) != m_restorepaths.end())
1872 continue;
1873 CTGitPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
1874 if (CopyFile(g_Git.m_CurrentDir + _T("\\") + entry2->GetWinPathString(), tempFile.GetWinPath(), FALSE))
1876 m_restorepaths[entry2->GetWinPathString()] = tempFile.GetWinPathString();
1877 SetItemState(index, INDEXTOOVERLAYMASK(OVL_RESTORE), LVIS_OVERLAYMASK);
1880 Invalidate();
1882 break;
1883 case IDGITLC_RESTOREPATH:
1885 if (CMessageBox::Show(m_hWnd, IDS_STATUSLIST_RESTOREPATH, IDS_APPNAME, 2, IDI_QUESTION, IDS_RESTOREBUTTON, IDS_ABORTBUTTON) == 2)
1886 break;
1887 POSITION pos = GetFirstSelectedItemPosition();
1888 while (pos)
1890 int index = GetNextSelectedItem(pos);
1891 CTGitPath * entry2 = (CTGitPath * )GetItemData(index);
1892 ASSERT(entry2 != NULL);
1893 if (entry2 == NULL)
1894 continue;
1895 if (m_restorepaths.find(entry2->GetWinPathString()) == m_restorepaths.end())
1896 continue;
1897 if (CopyFile(m_restorepaths[entry2->GetWinPathString()], g_Git.m_CurrentDir + _T("\\") + entry2->GetWinPathString(), FALSE))
1899 m_restorepaths.erase(entry2->GetWinPathString());
1900 SetItemState(index, 0, LVIS_OVERLAYMASK);
1903 Invalidate();
1905 break;
1906 // Compare current version and work copy.
1907 case IDGITLC_COMPAREWC:
1909 POSITION pos = GetFirstSelectedItemPosition();
1910 while ( pos )
1912 int index = GetNextSelectedItem(pos);
1913 StartDiffWC(index);
1916 break;
1917 // Compare with base version. when current version is zero, compare workcopy and HEAD.
1918 case IDGITLC_COMPARE:
1920 POSITION pos = GetFirstSelectedItemPosition();
1921 while ( pos )
1923 int index = GetNextSelectedItem(pos);
1924 StartDiff(index);
1927 break;
1928 case IDGITLC_COMPARETWO:
1930 POSITION pos = GetFirstSelectedItemPosition();
1931 while ( pos )
1933 int index = GetNextSelectedItem(pos);
1934 StartDiffTwo(index);
1937 break;
1938 case IDGITLC_COMPARETWOFILES:
1940 POSITION pos = GetFirstSelectedItemPosition();
1941 CTGitPath * firstfilepath = NULL, * secondfilepath = NULL;
1942 if (pos)
1944 firstfilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
1945 ASSERT(firstfilepath != NULL);
1946 if (firstfilepath == NULL)
1947 break;
1949 secondfilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
1950 ASSERT(secondfilepath != NULL);
1951 if (secondfilepath == NULL)
1952 break;
1954 CString sCmd;
1955 sCmd.Format(_T("/command:diff /path:\"%s\" /path2:\"%s\" /hwnd:%ld"), firstfilepath->GetWinPath(), secondfilepath->GetWinPath(), (unsigned long)m_hWnd);
1956 CAppUtils::RunTortoiseProc(sCmd);
1959 break;
1960 case IDGITLC_GNUDIFF1:
1962 // SVNDiff diff(NULL, this->m_hWnd, true);
1964 // if (entry->remotestatus <= git_wc_status_normal)
1965 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
1966 // else
1967 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
1968 if(m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
1970 CString fromwhere;
1971 if(m_amend)
1972 fromwhere = _T("~1");
1973 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,GitRev::GetHead()+fromwhere,
1974 *filepath,GitRev::GetWorkingCopy());
1976 else
1978 if((filepath->m_ParentNo&(PARENT_MASK|MERGE_MASK)) ==0)
1979 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,m_CurrentVersion+_T("~1"),
1980 *filepath,m_CurrentVersion);
1981 else
1983 CString str;
1984 if(filepath->m_ParentNo & MERGE_MASK)
1987 else
1989 str.Format(_T("%s^%d"),m_CurrentVersion,(filepath->m_ParentNo&PARENT_MASK)+1);
1992 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath, str,
1993 *filepath, m_CurrentVersion, false, false, false,
1994 !!(filepath->m_ParentNo & MERGE_MASK));
1998 break;
1999 case IDGITLC_GNUDIFF2:
2001 CAppUtils::StartShowUnifiedDiff(m_hWnd, *filepath, m_Rev2, *filepath, m_Rev1);
2003 break;
2005 case IDGITLC_ADD:
2006 { // The add went ok, but we now need to run through the selected items again
2007 // and update their status
2008 std::vector<int> selectIndex;
2010 POSITION pos = GetFirstSelectedItemPosition();
2011 int index;
2012 CMassiveGitTask mgt(L"add -f");
2013 while ((index = GetNextSelectedItem(pos)) >= 0)
2015 CTGitPath * path = (CTGitPath *)GetItemData(index);
2016 ASSERT(path);
2017 if(path == NULL)
2018 continue;
2020 selectIndex.push_back(index);
2021 mgt.AddFile(*path);
2023 BOOL cancel = FALSE;
2024 mgt.Execute(cancel);
2026 if (NULL != GetParent() && NULL != GetParent()->GetSafeHwnd())
2027 GetParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2029 SetRedraw(TRUE);
2031 break;
2033 case IDGITLC_DELETE:
2035 //Collect paths
2036 std::vector<int> selectIndex;
2038 POSITION pos = GetFirstSelectedItemPosition();
2039 int index;
2040 while ((index = GetNextSelectedItem(pos)) >= 0)
2042 selectIndex.push_back(index);
2045 //Create file-list ('\0' separated) for SHFileOperation
2046 CString filelist;
2047 for(int i=0;i<selectIndex.size();i++)
2049 index=selectIndex[i];
2051 CTGitPath * path=(CTGitPath*)GetItemData(index);
2052 ASSERT(path);
2053 if(path == NULL)
2054 continue;
2056 filelist += path->GetWinPathString();
2057 filelist += _T("|");
2059 filelist += _T("|");
2060 int len = filelist.GetLength();
2061 TCHAR * buf = new TCHAR[len+2];
2062 _tcscpy_s(buf, len+2, filelist);
2063 for (int i=0; i<len; ++i)
2064 if (buf[i] == '|')
2065 buf[i] = 0;
2066 SHFILEOPSTRUCT fileop;
2067 fileop.hwnd = this->m_hWnd;
2068 fileop.wFunc = FO_DELETE;
2069 fileop.pFrom = buf;
2070 fileop.pTo = NULL;
2071 fileop.fFlags = FOF_NO_CONNECTED_ELEMENTS | ((GetAsyncKeyState(VK_SHIFT) & 0x8000) ? 0 : FOF_ALLOWUNDO);
2072 fileop.lpszProgressTitle = _T("deleting file");
2073 int result = SHFileOperation(&fileop);
2074 delete [] buf;
2076 if ( (result==0) && (!fileop.fAnyOperationsAborted) )
2078 SetRedraw(FALSE);
2079 POSITION pos = NULL;
2080 while ((pos = GetFirstSelectedItemPosition()) != 0)
2082 int index = GetNextSelectedItem(pos);
2083 if (GetCheck(index))
2084 m_nSelected--;
2085 m_nTotal--;
2087 RemoveListEntry(index);
2089 SetRedraw(TRUE);
2092 break;
2094 case IDGITLC_BLAME:
2096 CAppUtils::LaunchTortoiseBlame(g_Git.m_CurrentDir+_T("\\")+filepath->GetWinPath(), m_CurrentVersion);
2098 break;
2100 case IDGITLC_LOG:
2102 CString sCmd;
2103 sCmd.Format(_T("/command:log /path:\"%s\""), g_Git.m_CurrentDir + _T("\\") + filepath->GetWinPath());
2104 CAppUtils::RunTortoiseProc(sCmd);
2106 break;
2108 case IDGITLC_LOGOLDNAME:
2110 CTGitPath oldName(filepath->GetGitOldPathString());
2111 CString sCmd;
2112 sCmd.Format(_T("/command:log /path:\"%s\""), g_Git.m_CurrentDir + _T("\\") + oldName.GetWinPath());
2113 CAppUtils::RunTortoiseProc(sCmd);
2115 break;
2118 case IDGITLC_EDITCONFLICT:
2120 CAppUtils::ConflictEdit(*filepath,false,this->m_bIsRevertTheirMy);
2121 break;
2123 case IDGITLC_RESOLVETHEIRS: //follow up
2124 case IDGITLC_RESOLVEMINE: //follow up
2125 case IDGITLC_RESOLVECONFLICT:
2127 if (CMessageBox::Show(m_hWnd, IDS_PROC_RESOLVE, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO)==IDYES)
2129 POSITION pos = GetFirstSelectedItemPosition();
2130 while (pos != 0)
2132 int index;
2133 index = GetNextSelectedItem(pos);
2134 CTGitPath * fentry =(CTGitPath*) this->GetItemData(index);
2135 if(fentry == NULL)
2136 continue;
2137 CString gitcmd,output;
2138 output.Empty();
2140 if ( ((!this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVETHEIRS) ||
2141 ((this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVEMINE) )
2143 gitcmd.Format(_T("git.exe checkout-index -f --stage=3 -- \"%s\""),fentry->GetGitPathString());
2144 if (g_Git.Run(gitcmd, &output,CP_UTF8))
2146 CMessageBox::Show(m_hWnd, output, _T("TortoiseGit"), MB_ICONERROR);
2147 continue;
2150 output.Empty();
2151 if ( ((!this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVEMINE) ||
2152 ((this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVETHEIRS) )
2154 gitcmd.Format(_T("git.exe checkout-index -f --stage=2 -- \"%s\""),fentry->GetGitPathString());
2155 if (g_Git.Run(gitcmd, &output,CP_UTF8))
2157 CMessageBox::Show(m_hWnd, output, _T("TortoiseGit"), MB_ICONERROR);
2158 continue;
2162 output.Empty();
2163 if ( fentry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
2165 gitcmd.Format(_T("git.exe add -f -- \"%s\""),fentry->GetGitPathString());
2166 if (g_Git.Run(gitcmd, &output,CP_UTF8))
2168 CMessageBox::Show(m_hWnd, output, _T("TortoiseGit"), MB_ICONERROR);
2170 else
2172 fentry->m_Action |= CTGitPath::LOGACTIONS_MODIFIED;
2173 fentry->m_Action &=~CTGitPath::LOGACTIONS_UNMERGED;
2177 CAppUtils::RemoveTempMergeFile(*fentry);
2180 Show(m_dwShow, 0, m_bShowFolders,0,true);
2183 break;
2185 case IDGITLC_IGNORE:
2187 CTGitPathList ignorelist;
2188 //std::vector<CString> toremove;
2189 FillListOfSelectedItemPaths(ignorelist, true);
2190 SetRedraw(FALSE);
2192 if(!CAppUtils::IgnoreFile(ignorelist,false))
2193 break;
2195 CWnd* pParent = GetParent();
2196 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2198 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2200 SetRedraw(TRUE);
2202 break;
2203 case IDGITLC_IGNOREMASK:
2205 CString common;
2206 CString ext=filepath->GetFileExtension();
2207 CTGitPathList ignorelist;
2208 FillListOfSelectedItemPaths(ignorelist, true);
2209 SetRedraw(FALSE);
2211 if (!CAppUtils::IgnoreFile(ignorelist,true))
2212 break;
2214 CWnd* pParent = GetParent();
2215 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2217 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2220 SetRedraw(TRUE);
2222 break;
2224 case IDGITLC_REVERT:
2226 // If at least one item is not in the status "added"
2227 // we ask for a confirmation
2228 BOOL bConfirm = FALSE;
2229 POSITION pos = GetFirstSelectedItemPosition();
2230 int index;
2231 while ((index = GetNextSelectedItem(pos)) >= 0)
2233 //FileEntry * fentry = GetListEntry(index);
2234 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
2235 if(fentry && fentry->m_Action &CTGitPath::LOGACTIONS_MODIFIED && !fentry->IsDirectory())
2237 bConfirm = TRUE;
2238 break;
2242 CString str;
2243 str.Format(IDS_PROC_WARNREVERT,GetSelectedCount());
2245 if (!bConfirm || CMessageBox::Show(this->m_hWnd, str, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION)==IDYES)
2247 CTGitPathList targetList;
2248 FillListOfSelectedItemPaths(targetList);
2250 // make sure that the list is reverse sorted, so that
2251 // children are removed before any parents
2252 targetList.SortByPathname(true);
2254 // put all reverted files in the trashbin, except the ones with 'added'
2255 // status because they are not restored by the revert.
2256 CTGitPathList delList;
2257 POSITION pos = GetFirstSelectedItemPosition();
2258 int index;
2259 while ((index = GetNextSelectedItem(pos)) >= 0)
2261 CTGitPath *entry=(CTGitPath *)GetItemData(index);
2262 if (entry&&(!(entry->m_Action& CTGitPath::LOGACTIONS_ADDED))
2263 && (!(entry->m_Action& CTGitPath::LOGACTIONS_REPLACED)) && !entry->IsDirectory())
2265 CTGitPath fullpath;
2266 fullpath.SetFromWin(g_Git.m_CurrentDir+_T("\\")+entry->GetWinPath());
2267 delList.AddPath(fullpath);
2270 if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))
2271 delList.DeleteAllFiles(true);
2273 CString revertToCommit = _T("HEAD");
2274 if (m_amend)
2275 revertToCommit = _T("HEAD~1");
2276 if (g_Git.Revert(revertToCommit, targetList))
2278 CMessageBox::Show(this->m_hWnd, _T("Revert Fail"), _T("TortoiseGit"), MB_ICONERROR);
2280 else
2282 bool updateStatusList = false;
2283 for(int i=0;i<targetList.GetCount();i++)
2285 int nListboxEntries = GetItemCount();
2286 for (int nItem=0; nItem<nListboxEntries; ++nItem)
2288 CTGitPath *path=(CTGitPath*)GetItemData(nItem);
2289 if (path->GetGitPathString()==targetList[i].GetGitPathString() && !path->IsDirectory())
2291 if(path->m_Action & CTGitPath::LOGACTIONS_ADDED)
2293 path->m_Action = CTGitPath::LOGACTIONS_UNVER;
2294 SetEntryCheck(path,nItem,false);
2295 updateStatusList = true;
2296 SetItemGroup(nItem,1);
2297 this->m_StatusFileList.RemoveItem(*path);
2298 this->m_UnRevFileList.AddPath(*path);
2299 //this->m_IgnoreFileList.RemoveItem(*path);
2302 else
2304 RemoveListEntry(nItem);
2306 break;
2308 else if (path->GetGitPathString()==targetList[i].GetGitPathString() && path->IsDirectory() && path->IsWCRoot())
2310 CString sCmd;
2311 sCmd.Format(_T("/command:revert /path:\"%s\""), path->GetGitPathString());
2312 CCommonAppUtils::RunTortoiseProc(sCmd);
2316 SetRedraw(TRUE);
2317 SaveColumnWidths();
2318 Show(m_dwShow, 0, m_bShowFolders,updateStatusList,true);
2319 NotifyCheck();
2323 break;
2325 case IDGITLC_ASSUMEVALID:
2327 CString cmdTemplate;
2328 cmdTemplate = _T("git.exe update-index --assume-unchanged \"%s\"");
2329 POSITION pos = GetFirstSelectedItemPosition();
2330 int index = -1;
2331 while ((index = GetNextSelectedItem(pos)) >= 0)
2333 CTGitPath * path = (CTGitPath *)GetItemData(index);
2334 ASSERT(path);
2335 if(path == NULL)
2336 continue;
2338 CString cmd, output;
2339 cmd.Format(cmdTemplate, path->GetGitPathString());
2340 if (g_Git.Run(cmd, &output, CP_UTF8))
2342 MessageBox(output, _T("TortoiseGit"), MB_ICONERROR);
2345 if (NULL != GetParent() && NULL != GetParent()->GetSafeHwnd())
2346 GetParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2348 SetRedraw(TRUE);
2350 break;
2352 case IDGITLC_COPY:
2353 CopySelectedEntriesToClipboard(0);
2354 break;
2355 case IDGITLC_COPYEXT:
2356 CopySelectedEntriesToClipboard((DWORD)-1);
2357 break;
2359 case IDGITLC_SAVEAS:
2360 FileSaveAs(filepath);
2361 break;
2363 case IDGITLC_REVERTTOREV:
2364 RevertSelectedItemToVersion();
2365 break;
2366 #if 0
2367 case IDSVNLC_COMMIT:
2369 CTSVNPathList targetList;
2370 FillListOfSelectedItemPaths(targetList);
2371 CTSVNPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
2372 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
2373 CString commandline = CPathUtils::GetAppDirectory();
2374 commandline += _T("TortoiseProc.exe /command:commit /pathfile:\"");
2375 commandline += tempFile.GetWinPathString();
2376 commandline += _T("\"");
2377 commandline += _T(" /deletepathfile");
2378 CAppUtils::LaunchApplication(commandline, NULL, false);
2380 break;
2381 case IDSVNLC_CREATEIGNORECS:
2382 CreateChangeList(SVNSLC_IGNORECHANGELIST);
2383 break;
2384 case IDSVNLC_CREATECS:
2386 CCreateChangelistDlg dlg;
2387 if (dlg.DoModal() == IDOK)
2389 CreateChangeList(dlg.m_sName);
2392 break;
2393 default:
2395 if (cmd < IDSVNLC_MOVETOCS)
2396 break;
2397 CTSVNPathList changelistItems;
2398 FillListOfSelectedItemPaths(changelistItems);
2400 // find the changelist name
2401 CString sChangelist;
2402 int cmdID = IDSVNLC_MOVETOCS;
2403 SetRedraw(FALSE);
2404 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
2406 if ((it->first.Compare(SVNSLC_IGNORECHANGELIST))&&(entry->changelist.Compare(it->first)))
2408 if (cmd == cmdID)
2410 sChangelist = it->first;
2412 cmdID++;
2415 if (!sChangelist.IsEmpty())
2417 SVN git;
2418 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
2420 // The changelists were moved, but we now need to run through the selected items again
2421 // and update their changelist
2422 POSITION pos = GetFirstSelectedItemPosition();
2423 int index;
2424 while ((index = GetNextSelectedItem(pos)) >= 0)
2426 FileEntry * e = GetListEntry(index);
2427 e->changelist = sChangelist;
2428 if (!e->IsFolder())
2430 if (m_changelists.find(e->changelist)!=m_changelists.end())
2431 SetItemGroup(index, m_changelists[e->changelist]);
2432 else
2433 SetItemGroup(index, 0);
2437 else
2439 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
2442 SetRedraw(TRUE);
2444 break;
2445 #endif
2447 } // switch (cmd)
2448 m_bBlock = FALSE;
2449 AfxGetApp()->DoWaitCursor(-1);
2450 GetStatisticsString();
2451 //int iItemCountAfterMenuCmd = GetItemCount();
2452 //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)
2454 // CWnd* pParent = GetParent();
2455 // if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2456 // {
2457 // pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);
2458 // }
2460 } // if (popup.CreatePopupMenu())
2461 } // if (selIndex >= 0)
2465 void CGitStatusListCtrl::OnContextMenuHeader(CWnd * pWnd, CPoint point)
2467 Locker lock(m_critSec);
2468 m_ColumnManager.OnContextMenuHeader(pWnd,point,!!IsGroupViewEnabled());
2471 void CGitStatusListCtrl::OnContextMenu(CWnd* pWnd, CPoint point)
2474 if (pWnd == this)
2476 OnContextMenuList(pWnd, point);
2477 } // if (pWnd == this)
2478 else if (pWnd == GetHeaderCtrl())
2480 OnContextMenuHeader(pWnd, point);
2484 void CGitStatusListCtrl::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
2487 Locker lock(m_critSec);
2488 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
2489 *pResult = 0;
2490 if (m_bBlock)
2491 return;
2493 if (pNMLV->iItem < 0)
2495 if (!IsGroupViewEnabled())
2496 return;
2497 POINT pt;
2498 DWORD ptW = GetMessagePos();
2499 pt.x = GET_X_LPARAM(ptW);
2500 pt.y = GET_Y_LPARAM(ptW);
2501 ScreenToClient(&pt);
2502 int group = GetGroupFromPoint(&pt);
2503 if (group < 0)
2504 return;
2505 // check/uncheck the whole group depending on the check-state
2506 // of the first item in the group
2507 m_bBlock = true;
2508 bool bCheck = false;
2509 bool bFirst = false;
2510 LVITEM lv;
2511 for (int i=0; i<GetItemCount(); ++i)
2513 SecureZeroMemory(&lv, sizeof(LVITEM));
2514 lv.mask = LVIF_GROUPID;
2515 lv.iItem = i;
2516 GetItem(&lv);
2517 if (lv.iGroupId == group)
2519 CTGitPath *entry=(CTGitPath*)GetItemData(i);
2521 if (!bFirst)
2523 bCheck = !GetCheck(i);
2524 bFirst = true;
2526 if (entry)
2528 bool bOldCheck = !!GetCheck(i);
2529 SetEntryCheck(entry, i, bCheck);
2530 if (bCheck != bOldCheck)
2532 if (bCheck)
2533 m_nSelected++;
2534 else
2535 m_nSelected--;
2540 GetStatisticsString();
2541 m_bBlock = false;
2542 NotifyCheck();
2543 return;
2546 CTGitPath *file=(CTGitPath*)GetItemData(pNMLV->iItem);
2548 if (file->m_Action == CTGitPath::LOGACTIONS_UNVER) {
2549 OpenFile(file, OPEN);
2550 return;
2552 if( file->m_Action&CTGitPath::LOGACTIONS_UNMERGED )
2554 CAppUtils::ConflictEdit(*file,false,m_bIsRevertTheirMy);
2557 else
2559 if( (!m_Rev1.IsEmpty()) || (!m_Rev1.IsEmpty())) // m_Rev1 twice???
2560 StartDiffTwo(pNMLV->iItem);
2561 else
2562 StartDiff(pNMLV->iItem);
2566 void CGitStatusListCtrl::StartDiffTwo(int fileindex)
2568 if(fileindex<0)
2569 return;
2571 CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);
2573 CGitDiff::Diff(&file1,&file1,
2574 m_Rev1,
2575 m_Rev2);
2578 void CGitStatusListCtrl::StartDiffWC(int fileindex)
2580 if(fileindex<0)
2581 return;
2583 CString Ver;
2584 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
2585 return;
2587 CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);
2589 CGitDiff::Diff(&file1,&file1, GIT_REV_ZERO, m_CurrentVersion);
2593 void CGitStatusListCtrl::StartDiff(int fileindex)
2595 if(fileindex<0)
2596 return;
2598 CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);
2599 CTGitPath file2;
2600 if(file1.m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY))
2602 file2.SetFromGit(file1.GetGitOldPathString());
2604 else
2606 file2=file1;
2609 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
2611 CString fromwhere;
2612 if(m_amend && (file1.m_Action & CTGitPath::LOGACTIONS_ADDED) == 0)
2613 fromwhere = _T("~1");
2614 if( g_Git.IsInitRepos())
2615 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2616 GIT_REV_ZERO);
2617 else if( file1.m_Action&CTGitPath::LOGACTIONS_ADDED )
2618 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2619 m_CurrentVersion+fromwhere,true);
2620 else if( file1.m_Action&CTGitPath::LOGACTIONS_DELETED )
2621 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2622 GitRev::GetHead()+fromwhere,false);
2623 else
2624 CGitDiff::Diff(&file1,&file2,
2625 CString(GIT_REV_ZERO),
2626 GitRev::GetHead()+fromwhere);
2628 else
2630 GitRev rev;
2631 CString fromwhere = m_CurrentVersion+_T("~1");
2632 if(m_amend)
2633 fromwhere = m_CurrentVersion+_T("~2");
2634 if(rev.GetCommit(fromwhere) || (file1.m_Action == file1.LOGACTIONS_ADDED))
2636 CGitDiff::DiffNull(&file1,m_CurrentVersion,true);
2639 else if (file1.m_Action == file1.LOGACTIONS_DELETED)
2641 if (file1.m_ParentNo > 0)
2642 fromwhere.Format(_T("%s^%d"), m_CurrentVersion, file1.m_ParentNo + 1);
2644 CGitDiff::DiffNull(&file1,fromwhere,false);
2646 else
2648 if( file1.m_ParentNo & MERGE_MASK)
2651 CTGitPath base, theirs, mine, merge;
2653 CString temppath;
2654 GetTempPath(temppath);
2655 temppath.TrimRight(_T("\\"));
2657 mine.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".LOCAL") + file1.GetFileExtension());
2658 theirs.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".REMOTE") + file1.GetFileExtension());
2659 base.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".BASE") + file1.GetFileExtension());
2661 CFile tempfile;
2662 //create a empty file, incase stage is not three
2663 tempfile.Open(mine.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2664 tempfile.Close();
2665 tempfile.Open(theirs.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2666 tempfile.Close();
2667 tempfile.Open(base.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2668 tempfile.Close();
2670 merge.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".Merged") + file1.GetFileExtension());
2672 int parent1=-1, parent2 =-1;
2673 for(int i=0;i<this->m_arStatusArray.size();i++)
2675 if(m_arStatusArray[i]->GetGitPathString() == file1.GetGitPathString())
2677 if(m_arStatusArray[i]->m_ParentNo & MERGE_MASK)
2680 else
2682 if(parent1<0)
2684 parent1 = m_arStatusArray[i]->m_ParentNo & PARENT_MASK;
2686 else if (parent2 <0)
2688 parent2 = m_arStatusArray[i]->m_ParentNo & PARENT_MASK;
2694 if(g_Git.GetOneFile(m_CurrentVersion, file1, (CString&)merge.GetWinPathString()))
2696 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2699 if(parent1>=0)
2701 CString str;
2702 str.Format(_T("%s^%d"),this->m_CurrentVersion, parent1+1);
2704 if(g_Git.GetOneFile(str, file1, (CString&)mine.GetWinPathString()))
2706 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2710 if(parent2>=0)
2712 CString str;
2713 str.Format(_T("%s^%d"),this->m_CurrentVersion, parent2+1);
2715 if(g_Git.GetOneFile(str, file1, (CString&)theirs.GetWinPathString()))
2717 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2721 if(parent1>=0 && parent2>=0)
2723 CString cmd, output;
2724 cmd.Format(_T("git.exe merge-base %s^%d %s^%d"), this->m_CurrentVersion, parent1+1,
2725 this->m_CurrentVersion,parent2+1);
2727 if (g_Git.Run(cmd, &output, NULL, CP_UTF8))
2730 else
2732 if(g_Git.GetOneFile(output.Left(40), file1, (CString&)base.GetWinPathString()))
2734 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETBASEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2738 CAppUtils::StartExtMerge(base, theirs, mine, merge,_T("BASE"),_T("REMOTE"),_T("LOCAL"));
2741 else
2743 CString str;
2744 if( (file1.m_ParentNo&PARENT_MASK) == 0)
2746 str = _T("~1");
2748 else
2750 str.Format(_T("^%d"), (file1.m_ParentNo&PARENT_MASK)+1);
2752 CGitDiff::Diff(&file1,&file2,
2753 m_CurrentVersion,
2754 m_CurrentVersion+str);
2760 CString CGitStatusListCtrl::GetStatisticsString(bool simple)
2763 CString sNormal, sAdded, sDeleted, sModified, sConflicted, sUnversioned, sRenamed;
2764 WORD langID = (WORD)(DWORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
2765 TCHAR buf[MAX_STATUS_STRING_LENGTH];
2766 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_normal, buf, _countof(buf), langID);
2767 sNormal = buf;
2768 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_added, buf, _countof(buf), langID);
2769 sAdded = buf;
2770 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_deleted, buf, _countof(buf), langID);
2771 sDeleted = buf;
2772 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_modified, buf, _countof(buf), langID);
2773 sModified = buf;
2774 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_conflicted, buf, _countof(buf), langID);
2775 sConflicted = buf;
2776 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_unversioned, buf, _countof(buf), langID);
2777 sUnversioned = buf;
2778 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_replaced, buf, _countof(buf), langID);
2779 sRenamed = buf;
2780 CString sToolTip;
2781 if(simple)
2783 sToolTip.Format(IDS_STATUSLIST_STATUSLINE1,
2784 this->m_nLineAdded,this->m_nLineDeleted,
2785 (LPCTSTR)sModified, m_nModified,
2786 (LPCTSTR)sAdded, m_nAdded,
2787 (LPCTSTR)sDeleted, m_nDeleted,
2788 (LPCTSTR)sRenamed, m_nRenamed
2791 else
2793 sToolTip.Format(IDS_STATUSLIST_STATUSLINE2,
2794 this->m_nLineAdded,this->m_nLineDeleted,
2795 (LPCTSTR)sNormal, m_nNormal,
2796 (LPCTSTR)sUnversioned, m_nUnversioned,
2797 (LPCTSTR)sModified, m_nModified,
2798 (LPCTSTR)sAdded, m_nAdded,
2799 (LPCTSTR)sDeleted, m_nDeleted,
2800 (LPCTSTR)sConflicted, m_nConflicted
2803 CString sStats;
2804 sStats.Format(IDS_COMMITDLG_STATISTICSFORMAT, m_nSelected, GetItemCount());
2805 if (m_pStatLabel)
2807 m_pStatLabel->SetWindowText(sStats);
2810 if (m_pSelectButton)
2812 if (m_nSelected == 0)
2813 m_pSelectButton->SetCheck(BST_UNCHECKED);
2814 else if (m_nSelected != GetItemCount())
2815 m_pSelectButton->SetCheck(BST_INDETERMINATE);
2816 else
2817 m_pSelectButton->SetCheck(BST_CHECKED);
2820 if (m_pConfirmButton)
2822 m_pConfirmButton->EnableWindow(m_nSelected>0);
2825 return sToolTip;
2830 CString CGitStatusListCtrl::GetCommonDirectory(bool bStrict)
2832 if (!bStrict)
2834 // not strict means that the selected folder has priority
2835 if (!m_StatusFileList.GetCommonDirectory().IsEmpty())
2836 return m_StatusFileList.GetCommonDirectory().GetWinPath();
2839 CTGitPath commonBaseDirectory;
2840 int nListItems = GetItemCount();
2841 for (int i=0; i<nListItems; ++i)
2843 CTGitPath baseDirectory,*p= (CTGitPath*)this->GetItemData(i);
2844 ASSERT(p);
2845 if(p==NULL)
2846 continue;
2847 baseDirectory = p->GetDirectory();
2849 if(commonBaseDirectory.IsEmpty())
2851 commonBaseDirectory = baseDirectory;
2853 else
2855 if (commonBaseDirectory.GetWinPathString().GetLength() > baseDirectory.GetWinPathString().GetLength())
2857 if (baseDirectory.IsAncestorOf(commonBaseDirectory))
2858 commonBaseDirectory = baseDirectory;
2862 return g_Git.m_CurrentDir+CString(_T("\\"))+commonBaseDirectory.GetWinPath();
2866 void CGitStatusListCtrl::SelectAll(bool bSelect, bool /*bIncludeNoCommits*/)
2868 CWaitCursor waitCursor;
2869 // block here so the LVN_ITEMCHANGED messages
2870 // get ignored
2871 m_bBlock = TRUE;
2872 SetRedraw(FALSE);
2874 int nListItems = GetItemCount();
2875 if (bSelect)
2876 m_nSelected = nListItems;
2877 else
2878 m_nSelected = 0;
2880 for (int i=0; i<nListItems; ++i)
2882 //FileEntry * entry = GetListEntry(i);
2883 //ASSERT(entry != NULL);
2884 CTGitPath *path = (CTGitPath *) GetItemData(i);
2885 if (path == NULL)
2886 continue;
2887 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))
2888 SetEntryCheck(path,i,bSelect);
2891 // unblock before redrawing
2892 m_bBlock = FALSE;
2893 SetRedraw(TRUE);
2894 GetStatisticsString();
2895 NotifyCheck();
2898 void CGitStatusListCtrl::Check(DWORD dwCheck, bool uncheckNonMatches)
2900 CWaitCursor waitCursor;
2901 // block here so the LVN_ITEMCHANGED messages
2902 // get ignored
2903 m_bBlock = TRUE;
2904 SetRedraw(FALSE);
2906 int nListItems = GetItemCount();
2907 m_nSelected = 0;
2909 for (int i = 0; i < nListItems; ++i)
2911 CTGitPath *entry = (CTGitPath *) GetItemData(i);
2912 if (entry == NULL)
2913 continue;
2915 DWORD showFlags = entry->m_Action;
2916 if (entry->IsDirectory())
2917 showFlags |= GITSLC_SHOWSUBMODULES;
2918 else
2919 showFlags |= GITSLC_SHOWFILES;
2921 if (showFlags & dwCheck && !(entry->IsDirectory() && m_bDoNotAutoselectSubmodules && !(dwCheck & GITSLC_SHOWSUBMODULES)))
2923 SetEntryCheck(entry, i, true);
2924 m_nSelected++;
2926 else if (uncheckNonMatches)
2927 SetEntryCheck(entry, i, false);
2929 // unblock before redrawing
2930 m_bBlock = FALSE;
2931 SetRedraw(TRUE);
2932 GetStatisticsString();
2933 NotifyCheck();
2936 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR *pNMHDR, LRESULT *pResult)
2938 LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast<LPNMLVGETINFOTIP>(pNMHDR);
2939 *pResult = 0;
2940 if (m_bBlock)
2941 return;
2943 CTGitPath *entry=(CTGitPath *)GetItemData(pGetInfoTip->iItem);
2945 if (entry)
2946 if (pGetInfoTip->cchTextMax > entry->GetGitPathString().GetLength() + g_Git.m_CurrentDir.GetLength())
2948 CString str;
2949 str += g_Git.m_CurrentDir;
2950 str += _T("\\");
2951 str += entry->GetWinPathString();
2953 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, str.GetBuffer(), str.GetLength());
2957 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult)
2959 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
2961 // Take the default processing unless we set this to something else below.
2962 *pResult = CDRF_DODEFAULT;
2964 // First thing - check the draw stage. If it's the control's prepaint
2965 // stage, then tell Windows we want messages for every item.
2967 switch (pLVCD->nmcd.dwDrawStage)
2969 case CDDS_PREPAINT:
2970 *pResult = CDRF_NOTIFYITEMDRAW;
2971 break;
2972 case CDDS_ITEMPREPAINT:
2974 // This is the prepaint stage for an item. Here's where we set the
2975 // item's text color. Our return value will tell Windows to draw the
2976 // item itself, but it will use the new color we set here.
2978 // Tell Windows to paint the control itself.
2979 *pResult = CDRF_DODEFAULT;
2980 if (m_bBlock)
2981 return;
2983 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
2985 if (m_arStatusArray.size() > (DWORD_PTR)pLVCD->nmcd.dwItemSpec)
2988 //FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);
2989 CTGitPath *entry=(CTGitPath *)GetItemData((int)pLVCD->nmcd.dwItemSpec);
2990 if (entry == NULL)
2991 return;
2993 // coloring
2994 // ========
2995 // black : unversioned, normal
2996 // purple : added
2997 // blue : modified
2998 // brown : missing, deleted, replaced
2999 // green : merged (or potential merges)
3000 // red : conflicts or sure conflicts
3001 if(entry->m_Action & CTGitPath::LOGACTIONS_GRAY)
3003 crText = RGB(128,128,128);
3006 else if(entry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
3008 crText = m_Colors.GetColor(CColors::Conflict);
3011 else if(entry->m_Action & (CTGitPath::LOGACTIONS_MODIFIED))
3013 crText = m_Colors.GetColor(CColors::Modified);
3016 else if(entry->m_Action & (CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))
3018 crText = m_Colors.GetColor(CColors::Added);
3020 else if(entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
3022 crText = m_Colors.GetColor(CColors::DeletedNode);
3024 else if(entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
3026 crText = m_Colors.GetColor(CColors::RenamedNode);
3028 else if(entry->m_Action & CTGitPath::LOGACTIONS_MERGED)
3030 crText = m_Colors.GetColor(CColors::Merged);
3032 else
3034 crText = GetSysColor(COLOR_WINDOWTEXT);
3036 // Store the color back in the NMLVCUSTOMDRAW struct.
3037 pLVCD->clrText = crText;
3040 break;
3044 BOOL CGitStatusListCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
3046 if (pWnd != this)
3047 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
3048 if (!m_bBlock)
3050 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
3051 SetCursor(hCur);
3052 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
3054 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
3055 SetCursor(hCur);
3056 return TRUE;
3059 void CGitStatusListCtrl::RemoveListEntry(int index)
3062 Locker lock(m_critSec);
3063 DeleteItem(index);
3065 m_arStatusArray.erase(m_arStatusArray.begin()+index);
3067 #if 0
3068 delete m_arStatusArray[m_arListArray[index]];
3069 m_arStatusArray.erase(m_arStatusArray.begin()+m_arListArray[index]);
3070 m_arListArray.erase(m_arListArray.begin()+index);
3071 for (int i=index; i< (int)m_arListArray.size(); ++i)
3073 m_arListArray[i]--;
3075 #endif
3078 ///< Set a checkbox on an entry in the listbox
3079 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync
3080 void CGitStatusListCtrl::SetEntryCheck(CTGitPath* pEntry, int listboxIndex, bool bCheck)
3082 pEntry->m_Checked = bCheck;
3083 m_mapFilenameToChecked[pEntry->GetGitPathString()] = bCheck;
3084 SetCheck(listboxIndex, bCheck);
3087 #if 0
3088 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry* parentEntry, bool bCheck)
3091 int nListItems = GetItemCount();
3092 for (int j=0; j< nListItems ; ++j)
3094 FileEntry * childEntry = GetListEntry(j);
3095 ASSERT(childEntry != NULL);
3096 if (childEntry == NULL || childEntry == parentEntry)
3097 continue;
3098 if (childEntry->checked != bCheck)
3100 if (parentEntry->path.IsAncestorOf(childEntry->path))
3102 SetEntryCheck(childEntry,j,bCheck);
3103 if(bCheck)
3105 m_nSelected++;
3107 else
3109 m_nSelected--;
3116 #endif
3118 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList& pathList)
3121 pathList.Clear();
3122 int nListItems = GetItemCount();
3123 for (int i=0; i< nListItems; i++)
3125 CTGitPath * entry = (CTGitPath*)GetItemData(i);
3126 ASSERT(entry != NULL);
3127 if (entry->m_Checked)
3129 pathList.AddPath(*entry);
3132 pathList.SortByPathname();
3137 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)
3138 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList& pathList, bool /*bNoIgnored*/)
3140 pathList.Clear();
3142 POSITION pos = GetFirstSelectedItemPosition();
3143 int index;
3144 while ((index = GetNextSelectedItem(pos)) >= 0)
3146 CTGitPath * entry = (CTGitPath*)GetItemData(index);
3147 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))
3148 // continue;
3149 pathList.AddPath(*entry);
3153 UINT CGitStatusListCtrl::OnGetDlgCode()
3155 // we want to process the return key and not have that one
3156 // routed to the default pushbutton
3157 return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS;
3160 void CGitStatusListCtrl::OnNMReturn(NMHDR * /*pNMHDR*/, LRESULT *pResult)
3162 *pResult = 0;
3163 if (m_bBlock)
3164 return;
3165 POSITION pos = GetFirstSelectedItemPosition();
3166 while ( pos )
3168 int index = GetNextSelectedItem(pos);
3169 CTGitPath *file=(CTGitPath*)GetItemData(index);
3170 if (file->m_Action == CTGitPath::LOGACTIONS_UNVER)
3172 OpenFile(file, OPEN);
3174 else
3176 StartDiff(index);
3181 void CGitStatusListCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
3183 // Since we catch all keystrokes (to have the enter key processed here instead
3184 // of routed to the default pushbutton) we have to make sure that other
3185 // keys like Tab and Esc still do what they're supposed to do
3186 // Tab = change focus to next/previous control
3187 // Esc = quit the dialog
3188 switch (nChar)
3190 case (VK_TAB):
3192 ::PostMessage(GetParent()->GetSafeHwnd(), WM_NEXTDLGCTL, GetKeyState(VK_SHIFT)&0x8000, 0);
3193 return;
3195 break;
3196 case (VK_ESCAPE):
3198 ::SendMessage(GetParent()->GetSafeHwnd(), WM_CLOSE, 0, 0);
3200 break;
3203 CListCtrl::OnKeyDown(nChar, nRepCnt, nFlags);
3206 void CGitStatusListCtrl::PreSubclassWindow()
3208 CListCtrl::PreSubclassWindow();
3209 EnableToolTips(TRUE);
3210 SetWindowTheme(GetSafeHwnd(), L"Explorer", NULL);
3213 INT_PTR CGitStatusListCtrl::OnToolHitTest(CPoint point, TOOLINFO* pTI) const
3215 int row, col;
3216 RECT cellrect;
3217 row = CellRectFromPoint(point, &cellrect, &col );
3219 if (row == -1)
3220 return -1;
3223 pTI->hwnd = m_hWnd;
3224 pTI->uId = (UINT)((row<<10)+(col&0x3ff)+1);
3225 pTI->lpszText = LPSTR_TEXTCALLBACK;
3227 pTI->rect = cellrect;
3229 return pTI->uId;
3232 int CGitStatusListCtrl::CellRectFromPoint(CPoint& point, RECT *cellrect, int *col) const
3234 int colnum;
3236 // Make sure that the ListView is in LVS_REPORT
3237 if ((GetWindowLong(m_hWnd, GWL_STYLE) & LVS_TYPEMASK) != LVS_REPORT)
3238 return -1;
3240 // Get the top and bottom row visible
3241 int row = GetTopIndex();
3242 int bottom = row + GetCountPerPage();
3243 if (bottom > GetItemCount())
3244 bottom = GetItemCount();
3246 // Get the number of columns
3247 CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
3248 int nColumnCount = pHeader->GetItemCount();
3250 // Loop through the visible rows
3251 for ( ;row <=bottom;row++)
3253 // Get bounding rect of item and check whether point falls in it.
3254 CRect rect;
3255 GetItemRect(row, &rect, LVIR_BOUNDS);
3256 if (rect.PtInRect(point))
3258 // Now find the column
3259 for (colnum = 0; colnum < nColumnCount; colnum++)
3261 int colwidth = GetColumnWidth(colnum);
3262 if (point.x >= rect.left && point.x <= (rect.left + colwidth))
3264 RECT rectClient;
3265 GetClientRect(&rectClient);
3266 if (col)
3267 *col = colnum;
3268 rect.right = rect.left + colwidth;
3270 // Make sure that the right extent does not exceed
3271 // the client area
3272 if (rect.right > rectClient.right)
3273 rect.right = rectClient.right;
3274 *cellrect = rect;
3275 return row;
3277 rect.left += colwidth;
3281 return -1;
3284 void CGitStatusListCtrl::OnPaint()
3286 Default();
3287 if ((m_bBusy)||(m_bEmpty))
3289 CString str;
3290 if (m_bBusy)
3292 if (m_sBusy.IsEmpty())
3293 str.LoadString(IDS_STATUSLIST_BUSYMSG);
3294 else
3295 str = m_sBusy;
3297 else
3299 if (m_sEmpty.IsEmpty())
3300 str.LoadString(IDS_STATUSLIST_EMPTYMSG);
3301 else
3302 str = m_sEmpty;
3304 COLORREF clrText = ::GetSysColor(COLOR_WINDOWTEXT);
3305 COLORREF clrTextBk;
3306 if (IsWindowEnabled())
3307 clrTextBk = ::GetSysColor(COLOR_WINDOW);
3308 else
3309 clrTextBk = ::GetSysColor(COLOR_3DFACE);
3311 CRect rc;
3312 GetClientRect(&rc);
3313 CHeaderCtrl* pHC;
3314 pHC = GetHeaderCtrl();
3315 if (pHC != NULL)
3317 CRect rcH;
3318 pHC->GetItemRect(0, &rcH);
3319 rc.top += rcH.bottom;
3321 CDC* pDC = GetDC();
3323 CMyMemDC memDC(pDC, &rc);
3325 memDC.SetTextColor(clrText);
3326 memDC.SetBkColor(clrTextBk);
3327 memDC.FillSolidRect(rc, clrTextBk);
3328 rc.top += 10;
3329 CGdiObject * oldfont = memDC.SelectStockObject(DEFAULT_GUI_FONT);
3330 memDC.DrawText(str, rc, DT_CENTER | DT_VCENTER |
3331 DT_WORDBREAK | DT_NOPREFIX | DT_NOCLIP);
3332 memDC.SelectObject(oldfont);
3334 ReleaseDC(pDC);
3338 // prevent users from extending our hidden (size 0) columns
3339 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR *pNMHDR, LRESULT *pResult)
3341 m_ColumnManager.OnHdnBegintrack(pNMHDR, pResult);
3344 // prevent any function from extending our hidden (size 0) columns
3345 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
3347 if(!m_ColumnManager.OnHdnItemchanging(pNMHDR, pResult))
3348 Default();
3351 void CGitStatusListCtrl::OnDestroy()
3353 SaveColumnWidths(true);
3354 CListCtrl::OnDestroy();
3357 void CGitStatusListCtrl::OnBeginDrag(NMHDR* /*pNMHDR*/, LRESULT* pResult)
3359 #if 0
3360 Locker lock(m_critSec);
3361 CDropFiles dropFiles; // class for creating DROPFILES struct
3363 int index;
3364 POSITION pos = GetFirstSelectedItemPosition();
3365 while ( (index = GetNextSelectedItem(pos)) >= 0 )
3367 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
3368 CTGitPath path = fentry->GetPath();
3369 dropFiles.AddFile( path.GetWinPathString() );
3372 if ( dropFiles.GetCount()>0 )
3374 m_bOwnDrag = true;
3375 dropFiles.CreateStructure();
3376 m_bOwnDrag = false;
3378 #endif
3379 *pResult = 0;
3382 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry /* = false */)
3384 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
3385 for (int col = 0; col <= maxcol; col++)
3386 if (m_ColumnManager.IsVisible (col))
3387 m_ColumnManager.ColumnResized (col);
3389 if (bSaveToRegistry)
3390 m_ColumnManager.WriteSettings();
3393 bool CGitStatusListCtrl::EnableFileDrop()
3395 m_bFileDropsEnabled = true;
3396 return true;
3399 bool CGitStatusListCtrl::HasPath(const CTGitPath& path)
3401 for (size_t i=0; i < m_arStatusArray.size(); i++)
3403 if (m_arStatusArray[i]->IsEquivalentTo(path))
3404 return true;
3407 return false;
3410 BOOL CGitStatusListCtrl::PreTranslateMessage(MSG* pMsg)
3412 if (pMsg->message == WM_KEYDOWN)
3414 switch (pMsg->wParam)
3416 case 'A':
3418 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
3420 // select all entries
3421 for (int i=0; i<GetItemCount(); ++i)
3423 SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
3425 return TRUE;
3428 break;
3429 case 'C':
3430 case VK_INSERT:
3432 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
3434 // copy all selected paths to the clipboard
3435 if (GetAsyncKeyState(VK_SHIFT)&0x8000)
3436 CopySelectedEntriesToClipboard(GITSLC_COLSTATUS);
3437 else
3438 CopySelectedEntriesToClipboard(0);
3439 return TRUE;
3442 break;
3446 return CListCtrl::PreTranslateMessage(pMsg);
3449 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols)
3452 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
3453 // WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
3455 CString sClipboard;
3456 CString temp;
3457 //TCHAR buf[100];
3458 if (GetSelectedCount() == 0)
3459 return false;
3461 // first add the column titles as the first line
3462 // We needn't head when only path copy
3463 //temp.LoadString(IDS_STATUSLIST_COLFILE);
3464 //sClipboard = temp;
3466 DWORD selection = 0;
3467 for (int i = 0, count = m_ColumnManager.GetColumnCount(); i < count; ++i)
3468 if ( ((dwCols == -1) && m_ColumnManager.IsVisible (i))
3469 || ((dwCols != 1) && (i < 32) && ((dwCols & (1 << i)) != 0)))
3471 sClipboard += _T("\t") + m_ColumnManager.GetName(i);
3473 if (i < 32)
3474 selection += 1 << i;
3477 if(dwCols)
3478 sClipboard += _T("\r\n");
3480 POSITION pos = GetFirstSelectedItemPosition();
3481 int index;
3482 while ((index = GetNextSelectedItem(pos)) >= 0)
3484 CTGitPath * entry = (CTGitPath*)GetItemData(index);
3485 if(entry == NULL)
3486 continue;
3488 sClipboard += entry->GetWinPathString();
3489 if (selection & GITSLC_COLFILENAME)
3491 sClipboard += _T("\t")+entry->GetFileOrDirectoryName();
3493 if (selection & GITSLC_COLEXT)
3495 sClipboard += _T("\t")+entry->GetFileExtension();
3498 if (selection & GITSLC_COLSTATUS)
3500 sClipboard += _T("\t")+entry->GetActionName();
3502 #if 0
3503 if (selection & SVNSLC_COLDATE)
3505 TCHAR datebuf[SVN_DATE_BUFFER];
3506 apr_time_t date = entry->last_commit_date;
3507 SVN::formatDate(datebuf, date, true);
3508 if (date)
3509 temp = datebuf;
3510 else
3511 temp.Empty();
3512 sClipboard += _T("\t")+temp;
3514 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
3515 ; i < count
3516 ; ++i)
3518 if ((dwCols == -1) && m_ColumnManager.IsVisible (i))
3520 CString value
3521 = entry->present_props[m_ColumnManager.GetName(i)];
3522 sClipboard += _T("\t") + value;
3525 #endif
3526 if (selection & GITSLC_COLADD)
3528 sClipboard += _T("\t")+entry->m_StatAdd;
3530 if (selection & GITSLC_COLDEL)
3532 sClipboard += _T("\t")+entry->m_StatDel;
3535 sClipboard += _T("\r\n");
3538 return CStringUtils::WriteAsciiStringToClipboard(sClipboard);
3540 return TRUE;
3544 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()
3546 #if 0
3547 std::set<CString> changelists;
3548 POSITION pos = GetFirstSelectedItemPosition();
3549 int index;
3550 while ((index = GetNextSelectedItem(pos)) >= 0)
3552 FileEntry * entry = GetListEntry(index);
3553 if (!entry->changelist.IsEmpty())
3554 changelists.insert(entry->changelist);
3556 return changelists.size();
3557 #endif
3558 return 0;
3561 bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
3564 bool bHasGroups=false;
3565 int max =0;
3567 for(int i=0;i< this->m_arStatusArray.size(); i++)
3569 int ParentNo = m_arStatusArray[i]->m_ParentNo&PARENT_MASK;
3570 if( ParentNo > max)
3571 max=m_arStatusArray[i]->m_ParentNo&PARENT_MASK;
3574 if ( this->m_UnRevFileList.GetCount()>0 ||
3575 this->m_IgnoreFileList.GetCount()>0 ||
3576 max>0 || bForce)
3578 bHasGroups = true;
3581 RemoveAllGroups();
3582 EnableGroupView(bHasGroups);
3584 TCHAR groupname[1024];
3585 int groupindex = 0;
3587 if(bHasGroups)
3589 LVGROUP grp = {0};
3590 grp.cbSize = sizeof(LVGROUP);
3591 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3592 groupindex=0;
3594 //if(m_UnRevFileList.GetCount()>0)
3595 if(max >0)
3597 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MERGEDFILES)), 1023);
3598 grp.pszHeader = groupname;
3599 grp.iGroupId = MERGE_MASK;
3600 grp.uAlign = LVGA_HEADER_LEFT;
3601 InsertGroup(0, &grp);
3603 for(int i=0;i<=max;i++)
3605 CString str;
3606 str.Format(IDS_STATUSLIST_GROUP_DIFFWITHPARENT, i+1);
3607 grp.pszHeader = str.GetBuffer();
3608 str.ReleaseBuffer();
3609 grp.iGroupId = i;
3610 grp.uAlign = LVGA_HEADER_LEFT;
3611 InsertGroup(i+1, &grp);
3614 else
3616 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MODIFIEDFILES)), 1023);
3617 grp.pszHeader = groupname;
3618 grp.iGroupId = groupindex;
3619 grp.uAlign = LVGA_HEADER_LEFT;
3620 InsertGroup(groupindex++, &grp);
3624 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_NOTVERSIONEDFILES)), 1023);
3625 grp.pszHeader = groupname;
3626 grp.iGroupId = groupindex;
3627 grp.uAlign = LVGA_HEADER_LEFT;
3628 InsertGroup(groupindex++, &grp);
3631 //if(m_IgnoreFileList.GetCount()>0)
3633 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_IGNOREDFILES)), 1023);
3634 grp.pszHeader = groupname;
3635 grp.iGroupId = groupindex;
3636 grp.uAlign = LVGA_HEADER_LEFT;
3637 InsertGroup(groupindex++, &grp);
3642 #if 0
3643 m_bHasIgnoreGroup = false;
3645 // now add the items which don't belong to a group
3646 LVGROUP grp = {0};
3647 grp.cbSize = sizeof(LVGROUP);
3648 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3649 CString sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET));
3650 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
3651 grp.pszHeader = groupname;
3652 grp.iGroupId = groupindex;
3653 grp.uAlign = LVGA_HEADER_LEFT;
3654 InsertGroup(groupindex++, &grp);
3656 for (std::map<CString,int>::iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
3658 if (it->first.Compare(SVNSLC_IGNORECHANGELIST)!=0)
3660 LVGROUP grp = {0};
3661 grp.cbSize = sizeof(LVGROUP);
3662 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3663 _tcsncpy_s(groupname, 1024, it->first, 1023);
3664 grp.pszHeader = groupname;
3665 grp.iGroupId = groupindex;
3666 grp.uAlign = LVGA_HEADER_LEFT;
3667 it->second = InsertGroup(groupindex++, &grp);
3669 else
3670 m_bHasIgnoreGroup = true;
3673 if (m_bHasIgnoreGroup)
3675 // and now add the group 'ignore-on-commit'
3676 std::map<CString,int>::iterator it = m_changelists.find(SVNSLC_IGNORECHANGELIST);
3677 if (it != m_changelists.end())
3679 grp.cbSize = sizeof(LVGROUP);
3680 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3681 _tcsncpy_s(groupname, 1024, SVNSLC_IGNORECHANGELIST, 1023);
3682 grp.pszHeader = groupname;
3683 grp.iGroupId = groupindex;
3684 grp.uAlign = LVGA_HEADER_LEFT;
3685 it->second = InsertGroup(groupindex, &grp);
3688 #endif
3689 return bHasGroups;
3692 void CGitStatusListCtrl::NotifyCheck()
3694 CWnd* pParent = GetParent();
3695 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
3697 pParent->SendMessage(GITSLNM_CHECKCHANGED, m_nSelected);
3701 int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash,CTGitPathList *list)
3703 BYTE_VECTOR out;
3704 this->m_bBusy=TRUE;
3705 m_CurrentVersion=hash;
3707 int count = 0;
3708 if(list == NULL)
3709 count = 1;
3710 else
3711 count = list->GetCount();
3713 CString head = _T("HEAD");
3714 if(m_amend)
3715 head = _T("HEAD~1");
3717 if(hash == GIT_REV_ZERO)
3719 for(int i=0;i<count;i++)
3721 BYTE_VECTOR cmdout;
3722 cmdout.clear();
3723 CString cmd;
3724 if(!g_Git.IsInitRepos())
3726 // also list staged files which will be in the commit
3727 cmd=(_T("git.exe diff-index --cached --raw ") + head + _T(" --numstat -C -M -z"));
3728 g_Git.Run(cmd, &cmdout);
3730 if(list == NULL)
3731 cmd=(_T("git.exe diff-index --raw ") + head + _T(" --numstat -C -M -z"));
3732 else
3733 cmd.Format(_T("git.exe diff-index --raw ") + head + _T(" --numstat -C -M -z -- \"%s\""),(*list)[i].GetGitPathString());
3735 BYTE_VECTOR cmdErr;
3736 if(g_Git.Run(cmd, &cmdout, &cmdErr))
3738 int last = cmdErr.RevertFind(0,-1);
3739 CString str;
3740 g_Git.StringAppend(&str, &cmdErr[last + 1], CP_UTF8, cmdErr.size() - last -1);
3741 CMessageBox::Show(NULL, str, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
3744 out.append(cmdout, 0);
3746 else // Init Repository
3748 //We will list all added file for init repository because commit will comit these
3749 //if(list == NULL)
3750 cmd=_T("git.exe ls-files -s -t -z");
3751 //else
3752 // cmd.Format(_T("git.exe ls-files -s -t -z -- \"%s\""),(*list)[i].GetGitPathString());
3754 g_Git.Run(cmd, &cmdout);
3755 //out+=cmdout;
3756 out.append(cmdout,0);
3760 if(g_Git.IsInitRepos())
3762 m_StatusFileList.ParserFromLsFile(out);
3763 for(int i=0;i<m_StatusFileList.GetCount();i++)
3764 ((CTGitPath&)(m_StatusFileList[i])).m_Action=CTGitPath::LOGACTIONS_ADDED;
3766 else
3767 this->m_StatusFileList.ParserFromLog(out);
3769 //handle delete conflict case, when remote : modified, local : deleted.
3770 for(int i=0;i<count;i++)
3772 BYTE_VECTOR cmdout;
3773 CString cmd;
3775 if(list == NULL)
3776 cmd=_T("git.exe ls-files -u -t -z");
3777 else
3778 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),(*list)[i].GetGitPathString());
3780 g_Git.Run(cmd, &cmdout);
3782 CTGitPathList conflictlist;
3783 conflictlist.ParserFromLog(cmdout);
3784 for(int i=0;i<conflictlist.GetCount();i++)
3786 CTGitPath *p=m_StatusFileList.LookForGitPath(conflictlist[i].GetGitPathString());
3787 if(p)
3788 p->m_Action|=CTGitPath::LOGACTIONS_UNMERGED;
3789 else
3790 m_StatusFileList.AddPath(conflictlist[i]);
3794 // handle source files of file renames/moves (issue #860)
3795 // if a file gets renamed and the new file "git add"ed, diff-index doesn't list the source file anymore
3796 for(int i = 0; i < count; i++)
3798 BYTE_VECTOR cmdout;
3799 CString cmd;
3801 if(list == NULL)
3802 cmd = _T("git.exe ls-files -d -z");
3803 else
3804 cmd.Format(_T("git.exe ls-files -d -z -- \"%s\""),(*list)[i].GetGitPathString());
3806 g_Git.Run(cmd, &cmdout);
3808 CTGitPathList deletelist;
3809 deletelist.ParserFromLog(cmdout, true);
3810 for(int i = 0; i < deletelist.GetCount(); i++)
3812 CTGitPath *p = m_StatusFileList.LookForGitPath(deletelist[i].GetGitPathString());
3813 if(!p)
3814 m_StatusFileList.AddPath(deletelist[i]);
3815 else if ((p->m_Action == CTGitPath::LOGACTIONS_ADDED || p->m_Action == CTGitPath::LOGACTIONS_REPLACED) && !p->Exists())
3817 if (CMessageBox::Show(m_hWnd, _T("TortoiseGit detected that the file \"") + p->GetWinPathString() +_T("\" does not exist, but is staged as \"Added\".\nThe commit dialog cannot handle this.\n\nDo you want to remove it from the index?"), _T("TortoiseGit"), 1, IDI_EXCLAMATION, _T("&Remove file from index"), _T("&Ignore")) == 1)
3819 g_Git.Run(_T("git.exe rm -f --cache -- \"") + p->GetWinPathString() + _T("\""), &cmdout);
3820 m_StatusFileList.RemoveItem(*p);
3826 else
3828 int count = 0;
3829 if(list == NULL)
3830 count = 1;
3831 else
3832 count = list->GetCount();
3834 for(int i=0;i<count;i++)
3836 BYTE_VECTOR cmdout;
3837 CString cmd;
3838 if(list == NULL)
3839 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M -z %s"),hash);
3840 else
3841 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M %s -z -- \"%s\""),hash,(*list)[i].GetGitPathString());
3843 g_Git.Run(cmd, &cmdout, NULL);
3845 out.append(cmdout);
3847 this->m_StatusFileList.ParserFromLog(out);
3851 for(int i=0;i<m_StatusFileList.GetCount();i++)
3853 CTGitPath * gitpatch=(CTGitPath*)&m_StatusFileList[i];
3854 gitpatch->m_Checked = TRUE;
3855 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
3858 this->m_bBusy=FALSE;
3859 return 0;
3862 int CGitStatusListCtrl::UpdateWithGitPathList(CTGitPathList &list)
3864 m_arStatusArray.clear();
3865 for(int i=0;i<list.GetCount();i++)
3867 CTGitPath * gitpath=(CTGitPath*)&list[i];
3869 if(gitpath ->m_Action & CTGitPath::LOGACTIONS_HIDE)
3870 continue;
3872 gitpath->m_Checked = TRUE;
3873 m_arStatusArray.push_back((CTGitPath*)&list[i]);
3875 return 0;
3878 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList *List)
3880 this->m_UnRevFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER,List);
3881 for(int i=0;i<m_UnRevFileList.GetCount();i++)
3883 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
3884 gitpatch->m_Checked = FALSE;
3885 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
3887 return 0;
3890 int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList *List)
3892 this->m_IgnoreFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER|CTGitPath::LOGACTIONS_IGNORE,List);
3893 for(int i=0;i<m_IgnoreFileList.GetCount();i++)
3895 CTGitPath * gitpatch=(CTGitPath*)&m_IgnoreFileList[i];
3896 gitpatch->m_Checked = FALSE;
3897 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
3899 return 0;
3901 int CGitStatusListCtrl::UpdateFileList(int mask,bool once,CTGitPathList *List)
3903 if(mask&CGitStatusListCtrl::FILELIST_MODIFY)
3905 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_MODIFY)))
3907 UpdateFileList(git_revnum_t(GIT_REV_ZERO),List);
3908 m_FileLoaded|=CGitStatusListCtrl::FILELIST_MODIFY;
3911 if(mask&CGitStatusListCtrl::FILELIST_UNVER)
3913 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_UNVER)))
3915 UpdateUnRevFileList(List);
3916 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
3918 if(mask&CGitStatusListCtrl::FILELIST_IGNORE && (once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_IGNORE))))
3920 UpdateIgnoreFileList(List);
3921 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
3924 return 0;
3927 void CGitStatusListCtrl::Clear()
3929 m_FileLoaded=0;
3930 this->DeleteAllItems();
3931 this->m_arListArray.clear();
3932 this->m_arStatusArray.clear();
3933 this->m_changelists.clear();
3935 //////////////////////////////////////////////////////////////////////////
3936 #if 0
3937 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium, DWORD * /*pdwEffect*/, POINTL pt)
3939 if(pFmtEtc->cfFormat == CF_HDROP && medium.tymed == TYMED_HGLOBAL)
3941 HDROP hDrop = (HDROP)GlobalLock(medium.hGlobal);
3942 if(hDrop != NULL)
3944 TCHAR szFileName[MAX_PATH];
3946 UINT cFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
3948 POINT clientpoint;
3949 clientpoint.x = pt.x;
3950 clientpoint.y = pt.y;
3951 ScreenToClient(m_hTargetWnd, &clientpoint);
3952 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
3954 CTSVNPathList changelistItems;
3955 for(UINT i = 0; i < cFiles; ++i)
3957 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
3958 changelistItems.AddPath(CTSVNPath(szFileName));
3960 // find the changelist name
3961 CString sChangelist;
3962 LONG_PTR nGroup = m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint);
3963 for (std::map<CString, int>::iterator it = m_pSVNStatusListCtrl->m_changelists.begin(); it != m_pSVNStatusListCtrl->m_changelists.end(); ++it)
3964 if (it->second == nGroup)
3965 sChangelist = it->first;
3966 if (!sChangelist.IsEmpty())
3968 SVN git;
3969 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
3971 for (int l=0; l<changelistItems.GetCount(); ++l)
3973 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
3974 if (index >= 0)
3976 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
3977 if (e)
3979 e->changelist = sChangelist;
3980 if (!e->IsFolder())
3982 if (m_pSVNStatusListCtrl->m_changelists.find(e->changelist)!=m_pSVNStatusListCtrl->m_changelists.end())
3983 m_pSVNStatusListCtrl->SetItemGroup(index, m_pSVNStatusListCtrl->m_changelists[e->changelist]);
3984 else
3985 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
3989 else
3991 HWND hParentWnd = GetParent(m_hTargetWnd);
3992 if (hParentWnd != NULL)
3993 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
3997 else
3999 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
4002 else
4004 SVN git;
4005 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
4007 for (int l=0; l<changelistItems.GetCount(); ++l)
4009 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
4010 if (index >= 0)
4012 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
4013 if (e)
4015 e->changelist = sChangelist;
4016 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
4019 else
4021 HWND hParentWnd = GetParent(m_hTargetWnd);
4022 if (hParentWnd != NULL)
4023 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
4027 else
4029 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
4033 else
4035 for(UINT i = 0; i < cFiles; ++i)
4037 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
4038 HWND hParentWnd = GetParent(m_hTargetWnd);
4039 if (hParentWnd != NULL)
4040 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)szFileName);
4044 GlobalUnlock(medium.hGlobal);
4046 return true; //let base free the medium
4048 HRESULT STDMETHODCALLTYPE CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect)
4050 CIDropTarget::DragOver(grfKeyState, pt, pdwEffect);
4051 *pdwEffect = DROPEFFECT_COPY;
4052 if (m_pSVNStatusListCtrl)
4054 POINT clientpoint;
4055 clientpoint.x = pt.x;
4056 clientpoint.y = pt.y;
4057 ScreenToClient(m_hTargetWnd, &clientpoint);
4058 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
4060 *pdwEffect = DROPEFFECT_MOVE;
4062 else if ((!m_pSVNStatusListCtrl->m_bFileDropsEnabled)||(m_pSVNStatusListCtrl->m_bOwnDrag))
4064 *pdwEffect = DROPEFFECT_NONE;
4067 return S_OK;
4070 #endif
4072 void CGitStatusListCtrl::FileSaveAs(CTGitPath *path)
4074 CString filename;
4075 filename.Format(_T("%s-%s%s"), path->GetBaseFilename(), this->m_CurrentVersion.Left(g_Git.GetShortHASHLength()), path->GetFileExtension());
4076 CFileDialog dlg(FALSE,NULL,
4077 filename,
4078 OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
4079 NULL);
4080 CString currentpath;
4081 currentpath=g_Git.m_CurrentDir+_T("\\");
4082 currentpath+=path->GetWinPathString();
4084 dlg.m_ofn.lpstrInitialDir=currentpath.GetBuffer();
4086 CString cmd,out;
4087 if(dlg.DoModal()==IDOK)
4089 filename = dlg.GetPathName();
4090 if(m_CurrentVersion == GIT_REV_ZERO)
4092 if(!CopyFile(g_Git.m_CurrentDir +_T("\\") + path->GetWinPath(),filename,false))
4094 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
4095 return;
4099 else
4101 if(g_Git.GetOneFile(m_CurrentVersion,*path,filename))
4103 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, path->GetGitPathString(), m_CurrentVersion, filename);
4104 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
4105 return;
4112 int CGitStatusListCtrl::RevertSelectedItemToVersion()
4114 if(this->m_CurrentVersion.IsEmpty())
4115 return 0;
4116 if(this->m_CurrentVersion == GIT_REV_ZERO)
4117 return 0;
4119 POSITION pos = GetFirstSelectedItemPosition();
4120 int index;
4121 CString cmd,out;
4122 int count =0;
4123 while ((index = GetNextSelectedItem(pos)) >= 0)
4125 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
4126 cmd.Format(_T("git.exe checkout %s -- \"%s\""),m_CurrentVersion,fentry->GetGitPathString());
4127 out.Empty();
4128 if (g_Git.Run(cmd, &out, CP_UTF8))
4130 if (MessageBox(out, _T("TortoiseGit"), MB_ICONEXCLAMATION | MB_OKCANCEL) == IDCANCEL)
4131 break;
4133 else
4134 count++;
4137 out.Format(IDS_STATUSLIST_FILESREVERTED, count, m_CurrentVersion);
4138 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
4139 return 0;
4142 void CGitStatusListCtrl::OpenFile(CTGitPath*filepath,int mode)
4144 CString file;
4145 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
4147 file = g_Git.m_CurrentDir + _T("\\") + filepath->GetWinPath();
4149 else
4151 CString temppath;
4152 GetTempPath(temppath);
4153 file.Format(_T("%s%s_%s%s"),
4154 temppath,
4155 filepath->GetBaseFilename(),
4156 m_CurrentVersion.Left(g_Git.GetShortHASHLength()),
4157 filepath->GetFileExtension());
4158 CString cmd,out;
4159 if(g_Git.GetOneFile(m_CurrentVersion, *filepath, file))
4161 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, filepath->GetGitPathString(), m_CurrentVersion, file);
4162 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
4163 return;
4165 SetFileAttributes(file, FILE_ATTRIBUTE_READONLY);
4167 if(mode == ALTERNATIVEEDITOR)
4169 CAppUtils::LaunchAlternativeEditor(file);
4170 return;
4172 int ret = HINSTANCE_ERROR;
4174 if(mode == OPEN )
4176 ret = (int)ShellExecute(this->m_hWnd, NULL,file, NULL, NULL, SW_SHOW);
4178 if (ret > HINSTANCE_ERROR)
4180 return;
4185 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
4186 cmd += file;
4187 CAppUtils::LaunchApplication(cmd, NULL, false);