Validate the drawing area after the custom painting of the control
[TortoiseGit.git] / src / Git / GitStatusListCtrl.cpp
blob68a6369797d50a6f51bde7c7fdde2c1a7221a623
1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2013 - TortoiseGit
4 // Copyright (C) 2003-2008, 2013 - 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 "GitProgressDlg.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 "BrowseFolder.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)
128 , m_hwndLogicalParent(NULL)
129 , m_bHasUnversionedItems(FALSE)
131 m_FileLoaded=0;
132 m_dwDefaultColumns = 0;
133 m_critSec.Init();
134 m_bIsRevertTheirMy = false;
135 this->m_nLineAdded =this->m_nLineDeleted =0;
138 CGitStatusListCtrl::~CGitStatusListCtrl()
140 // if (m_pDropTarget)
141 // delete m_pDropTarget;
142 ClearStatusArray();
145 void CGitStatusListCtrl::ClearStatusArray()
147 #if 0
148 Locker lock(m_critSec);
149 for (size_t i=0; i < m_arStatusArray.size(); i++)
151 delete m_arStatusArray[i];
153 m_arStatusArray.clear();
154 #endif
157 void CGitStatusListCtrl::Init(DWORD dwColumns, const CString& sColumnInfoContainer, unsigned __int64 dwContextMenus /* = GitSLC_POPALL */, bool bHasCheckboxes /* = true */, bool bHasWC /* = true */, DWORD allowedColumns /* = 0xffffffff */)
159 Locker lock(m_critSec);
161 m_dwDefaultColumns = dwColumns | 1;
162 m_dwContextMenus = dwContextMenus;
163 m_bHasCheckboxes = bHasCheckboxes;
164 m_bHasWC = bHasWC;
166 // set the extended style of the listcontrol
167 // 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.
168 CRegDWORD regFullRowSelect(_T("Software\\TortoiseGit\\FullRowSelect"), TRUE);
169 DWORD exStyle = LVS_EX_HEADERDRAGDROP | LVS_EX_DOUBLEBUFFER | LVS_EX_INFOTIP | LVS_EX_SUBITEMIMAGES;
170 if (DWORD(regFullRowSelect))
171 exStyle |= LVS_EX_FULLROWSELECT;
172 exStyle |= (bHasCheckboxes ? LVS_EX_CHECKBOXES : 0);
173 SetRedraw(false);
174 SetExtendedStyle(exStyle);
176 SetWindowTheme(m_hWnd, L"Explorer", NULL);
178 m_nIconFolder = SYS_IMAGE_LIST().GetDirIconIndex();
179 m_nRestoreOvl = SYS_IMAGE_LIST().AddIcon((HICON)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_RESTOREOVL), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE));
180 SYS_IMAGE_LIST().SetOverlayImage(m_nRestoreOvl, OVL_RESTORE);
181 SetImageList(&SYS_IMAGE_LIST(), LVSIL_SMALL);
183 // keep CSorter::operator() in sync!!
184 static UINT standardColumnNames[GITSLC_NUMCOLUMNS]
185 = { IDS_STATUSLIST_COLFILE
186 , IDS_STATUSLIST_COLFILENAME
187 , IDS_STATUSLIST_COLEXT
188 , IDS_STATUSLIST_COLSTATUS
189 , IDS_STATUSLIST_COLADD
190 , IDS_STATUSLIST_COLDEL
191 , IDS_STATUSLIST_COLLASTMODIFIED
192 , IDS_STATUSLIST_COLSIZE
195 m_ColumnManager.SetNames(standardColumnNames,GITSLC_NUMCOLUMNS);
196 m_ColumnManager.ReadSettings(m_dwDefaultColumns, 0xffffffff & ~(allowedColumns | m_dwDefaultColumns), sColumnInfoContainer, GITSLC_NUMCOLUMNS);
198 // enable file drops
199 #if 0
200 if (m_pDropTarget == NULL)
202 m_pDropTarget = new CGitStatusListCtrlDropTarget(this);
203 RegisterDragDrop(m_hWnd,m_pDropTarget);
204 // create the supported formats:
205 FORMATETC ftetc={0};
206 ftetc.dwAspect = DVASPECT_CONTENT;
207 ftetc.lindex = -1;
208 ftetc.tymed = TYMED_HGLOBAL;
209 ftetc.cfFormat=CF_HDROP;
210 m_pDropTarget->AddSuportedFormat(ftetc);
212 #endif
214 SetRedraw(true);
217 bool CGitStatusListCtrl::SetBackgroundImage(UINT nID)
219 return CAppUtils::SetListCtrlBackgroundImage(GetSafeHwnd(), nID);
222 BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList* pathList
223 , bool bUpdate /* = FALSE */
224 , bool bShowIgnores /* = false */
225 , bool bShowUnRev)
227 Locker lock(m_critSec);
228 int mask= CGitStatusListCtrl::FILELIST_MODIFY;
229 if(bShowIgnores)
230 mask|= CGitStatusListCtrl::FILELIST_IGNORE;
231 if(bShowUnRev)
232 mask|= CGitStatusListCtrl::FILELIST_UNVER;
233 this->UpdateFileList(mask,bUpdate,(CTGitPathList*)pathList);
236 #if 0
237 int refetchcounter = 0;
238 BOOL bRet = TRUE;
239 Invalidate();
240 // force the cursor to change
241 POINT pt;
242 GetCursorPos(&pt);
243 SetCursorPos(pt.x, pt.y);
245 m_mapFilenameToChecked.clear();
246 //m_StatusUrlList.Clear();
247 bool bHasChangelists = (m_changelists.size() > 1 || (!m_changelists.empty() && !m_bHasIgnoreGroup));
248 m_changelists.clear();
249 for (size_t i=0; i < m_arStatusArray.size(); i++)
251 FileEntry * entry = m_arStatusArray[i];
252 if ( bHasChangelists && entry->checked)
254 // If change lists are present, remember all checked entries
255 CString path = entry->GetPath().GetGitPathString();
256 m_mapFilenameToChecked[path] = true;
258 if ( (entry->status==git_wc_status_unversioned || entry->status==git_wc_status_missing ) && entry->checked )
260 // The user manually selected an unversioned or missing file. We remember
261 // this so that the selection can be restored when refreshing.
262 CString path = entry->GetPath().GetGitPathString();
263 m_mapFilenameToChecked[path] = true;
265 else if ( entry->status > git_wc_status_normal && !entry->checked )
267 // The user manually deselected a versioned file. We remember
268 // this so that the deselection can be restored when refreshing.
269 CString path = entry->GetPath().GetGitPathString();
270 m_mapFilenameToChecked[path] = false;
274 // use a sorted path list to make sure we fetch the status of
275 // parent items first, *then* the child items (if any)
276 CTGitPathList sortedPathList = pathList;
277 sortedPathList.SortByPathname();
280 bRet = TRUE;
281 m_nTargetCount = 0;
282 m_bHasExternalsFromDifferentRepos = FALSE;
283 m_bHasExternals = FALSE;
284 m_bHasUnversionedItems = FALSE;
285 m_bHasLocks = false;
286 m_bHasChangeLists = false;
287 m_bShowIgnores = bShowIgnores;
288 m_nSortedColumn = 0;
289 m_bBlock = TRUE;
290 m_bBusy = true;
291 m_bEmpty = false;
292 Invalidate();
294 // first clear possible status data left from
295 // previous GetStatus() calls
296 ClearStatusArray();
298 m_StatusFileList = sortedPathList;
300 // Since Git_client_status() returns all files, even those in
301 // folders included with Git:externals we need to check if all
302 // files we get here belongs to the same repository.
303 // It is possible to commit changes in an external folder, as long
304 // as the folder belongs to the same repository (but another path),
305 // but it is not possible to commit all files if the externals are
306 // from a different repository.
308 // To check if all files belong to the same repository, we compare the
309 // UUID's - if they're identical then the files belong to the same
310 // repository and can be committed. But if they're different, then
311 // tell the user to commit all changes in the external folders
312 // first and exit.
313 CStringA sUUID; // holds the repo UUID
314 CTGitPathList arExtPaths; // list of Git:external paths
316 GitConfig config;
318 m_sURL.Empty();
320 m_nTargetCount = sortedPathList.GetCount();
322 GitStatus status(m_pbCanceled);
323 if(m_nTargetCount > 1 && sortedPathList.AreAllPathsFilesInOneDirectory())
325 // This is a special case, where we've been given a list of files
326 // all from one folder
327 // We handle them by setting a status filter, then requesting the Git status of
328 // all the files in the directory, filtering for the ones we're interested in
329 status.SetFilter(sortedPathList);
331 // if all selected entries are files, we don't do a recursive status
332 // fetching. But if only one is a directory, we have to recurse.
333 git_depth_t depth = git_depth_files;
334 // We have set a filter. If all selected items were files or we fetch
335 // the status not recursively, then we have to include
336 // ignored items too - the user has selected them
337 bool bShowIgnoresRight = true;
338 for (int fcindex=0; fcindex<sortedPathList.GetCount(); ++fcindex)
340 if (sortedPathList[fcindex].IsDirectory())
342 depth = git_depth_infinity;
343 bShowIgnoresRight = false;
344 break;
347 if(!FetchStatusForSingleTarget(config, status, sortedPathList.GetCommonDirectory(), bUpdate, sUUID, arExtPaths, true, depth, bShowIgnoresRight))
349 bRet = FALSE;
352 else
354 for(int nTarget = 0; nTarget < m_nTargetCount; nTarget++)
356 // check whether the path we want the status for is already fetched due to status-fetching
357 // of a parent path.
358 // this check is only done for file paths, because folder paths could be included already
359 // but not recursively
360 if (sortedPathList[nTarget].IsDirectory() || GetListEntry(sortedPathList[nTarget]) == NULL)
362 if(!FetchStatusForSingleTarget(config, status, sortedPathList[nTarget], bUpdate, sUUID,
363 arExtPaths, false, git_depth_infinity, bShowIgnores))
365 bRet = FALSE;
371 // remove the 'helper' files of conflicted items from the list.
372 // otherwise they would appear as unversioned files.
373 for (INT_PTR cind = 0; cind < m_ConflictFileList.GetCount(); ++cind)
375 for (size_t i=0; i < m_arStatusArray.size(); i++)
377 if (m_arStatusArray[i]->GetPath().IsEquivalentTo(m_ConflictFileList[cind]))
379 delete m_arStatusArray[i];
380 m_arStatusArray.erase(m_arStatusArray.begin()+i);
381 break;
385 refetchcounter++;
386 } while(!BuildStatistics() && (refetchcounter < 2) && (*m_pbCanceled==false));
388 m_bBlock = FALSE;
389 m_bBusy = false;
390 GetCursorPos(&pt);
391 SetCursorPos(pt.x, pt.y);
392 return bRet;
393 #endif
394 BuildStatistics();
395 return TRUE;
398 // Get the show-flags bitmap value which corresponds to a particular Git status
399 DWORD CGitStatusListCtrl::GetShowFlagsFromGitStatus(git_wc_status_kind status)
401 switch (status)
403 case git_wc_status_none:
404 case git_wc_status_unversioned:
405 return GITSLC_SHOWUNVERSIONED;
406 case git_wc_status_ignored:
407 if (!m_bShowIgnores)
408 return GITSLC_SHOWDIRECTS;
409 return GITSLC_SHOWDIRECTS|GITSLC_SHOWIGNORED;
410 case git_wc_status_incomplete:
411 return GITSLC_SHOWINCOMPLETE;
412 case git_wc_status_normal:
413 return GITSLC_SHOWNORMAL;
414 case git_wc_status_external:
415 return GITSLC_SHOWEXTERNAL;
416 case git_wc_status_added:
417 return GITSLC_SHOWADDED;
418 case git_wc_status_missing:
419 return GITSLC_SHOWMISSING;
420 case git_wc_status_deleted:
421 return GITSLC_SHOWREMOVED;
422 case git_wc_status_replaced:
423 return GITSLC_SHOWREPLACED;
424 case git_wc_status_modified:
425 return GITSLC_SHOWMODIFIED;
426 case git_wc_status_merged:
427 return GITSLC_SHOWMERGED;
428 case git_wc_status_conflicted:
429 return GITSLC_SHOWCONFLICTED;
430 case git_wc_status_obstructed:
431 return GITSLC_SHOWOBSTRUCTED;
432 default:
433 // we should NEVER get here!
434 ASSERT(FALSE);
435 break;
437 return 0;
440 void CGitStatusListCtrl::Show(unsigned int dwShow, unsigned int dwCheck /*=0*/, bool /*bShowFolders*/ /* = true */,BOOL UpdateStatusList,bool UseStoredCheckStatus)
442 CWinApp * pApp = AfxGetApp();
443 if (pApp)
444 pApp->DoWaitCursor(1);
446 Locker lock(m_critSec);
447 WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
449 //SetItemCount(listIndex);
450 SetRedraw(FALSE);
451 DeleteAllItems();
452 m_nSelected = 0;
454 m_nShownUnversioned = 0;
455 m_nShownModified = 0;
456 m_nShownAdded = 0;
457 m_nShownDeleted = 0;
458 m_nShownConflicted = 0;
459 m_nShownFiles = 0;
460 m_nShownSubmodules = 0;
462 if(UpdateStatusList)
464 m_arStatusArray.clear();
465 for(int i=0;i<this->m_StatusFileList.GetCount();i++)
467 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
470 for(int i=0;i<this->m_UnRevFileList.GetCount();i++)
472 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
475 for(int i=0;i<this->m_IgnoreFileList.GetCount();i++)
477 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
480 PrepareGroups();
481 if (m_nSortedColumn >= 0)
483 CSorter predicate (&m_ColumnManager, m_nSortedColumn, m_bAscending);
484 std::sort(m_arStatusArray.begin(), m_arStatusArray.end(), predicate);
487 int index =0;
488 for(int i=0;i<this->m_arStatusArray.size();i++)
490 //set default checkbox status
491 CTGitPath* entry = ((CTGitPath*)m_arStatusArray[i]);
492 CString path = entry->GetGitPathString();
493 if (!m_mapFilenameToChecked.empty() && m_mapFilenameToChecked.find(path) != m_mapFilenameToChecked.end())
495 entry->m_Checked=m_mapFilenameToChecked[path];
497 else if (!UseStoredCheckStatus)
499 bool autoSelectSubmodules = !(entry->IsDirectory() && m_bDoNotAutoselectSubmodules);
500 if(entry->m_Action & dwCheck && autoSelectSubmodules)
501 entry->m_Checked=true;
502 else
503 entry->m_Checked=false;
504 m_mapFilenameToChecked[path] = entry->m_Checked;
507 if(entry->m_Action & dwShow)
509 AddEntry(entry,langID,index);
510 index++;
514 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
515 for (int col = 0; col <= maxcol; col++)
516 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
518 SetRedraw(TRUE);
519 GetStatisticsString();
521 CHeaderCtrl * pHeader = GetHeaderCtrl();
522 HDITEM HeaderItem = {0};
523 HeaderItem.mask = HDI_FORMAT;
524 for (int i=0; i<pHeader->GetItemCount(); ++i)
526 pHeader->GetItem(i, &HeaderItem);
527 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
528 pHeader->SetItem(i, &HeaderItem);
530 if (m_nSortedColumn >= 0)
532 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
533 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
534 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
537 #if 0
538 if (nSelectedEntry)
540 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
541 EnsureVisible(nSelectedEntry, false);
543 else
545 // Restore the item at the top of the list.
546 for (int i=0;GetTopIndex() != nTopIndex;i++)
548 if ( !EnsureVisible(nTopIndex+i,false) )
550 break;
554 #endif
555 if (pApp)
556 pApp->DoWaitCursor(-1);
558 Invalidate();
560 m_dwShow = dwShow;
562 this->BuildStatistics();
564 #if 0
566 CWinApp * pApp = AfxGetApp();
567 if (pApp)
568 pApp->DoWaitCursor(1);
570 m_bShowFolders = bShowFolders;
572 int nTopIndex = GetTopIndex();
573 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
574 int nSelectedEntry = 0;
575 if (posSelectedEntry)
576 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
577 SetRedraw(FALSE);
578 DeleteAllItems();
580 PrepareGroups();
582 m_arListArray.clear();
584 m_arListArray.reserve(m_arStatusArray.size());
585 SetItemCount (static_cast<int>(m_arStatusArray.size()));
587 int listIndex = 0;
588 for (size_t i=0; i < m_arStatusArray.size(); ++i)
590 FileEntry * entry = m_arStatusArray[i];
591 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
592 continue;
593 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
594 continue;
595 if (entry->IsFolder() && (!bShowFolders))
596 continue; // don't show folders if they're not wanted.
598 #if 0
599 git_wc_status_kind status = GitStatus::GetMoreImportant(entry->status, entry->remotestatus);
600 DWORD showFlags = GetShowFlagsFromGitStatus(status);
601 if (entry->IsLocked())
602 showFlags |= SVNSLC_SHOWLOCKS;
603 if (entry->switched)
604 showFlags |= SVNSLC_SHOWSWITCHED;
605 if (!entry->changelist.IsEmpty())
606 showFlags |= SVNSLC_SHOWINCHANGELIST;
607 #endif
608 bool bAllowCheck = ((entry->changelist.Compare(GITSLC_IGNORECHANGELIST) != 0)
609 && (m_bCheckIfGroupsExist || (m_changelists.empty() || (m_changelists.size() == 1 && m_bHasIgnoreGroup))));
611 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
612 #if 0
613 if (status != Git_wc_status_ignored || (entry->direct) || (dwShow & GitSLC_SHOWIGNORED))
615 if ((!entry->IsFolder()) && (status == Git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
617 if (PathFileExists(entry->GetPath().GetWinPath()))
619 m_arListArray.push_back(i);
620 if ((dwCheck & SVNSLC_SHOWREMOVEDANDPRESENT)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
622 if (bAllowCheck)
623 entry->checked = true;
625 AddEntry(entry, langID, listIndex++);
628 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
630 m_arListArray.push_back(i);
631 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
633 if (bAllowCheck)
634 entry->checked = true;
636 AddEntry(entry, langID, listIndex++);
638 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
640 m_arListArray.push_back(i);
641 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
643 if (bAllowCheck)
644 entry->checked = true;
646 AddEntry(entry, langID, listIndex++);
649 #endif
652 SetItemCount(listIndex);
654 m_ColumnManager.UpdateRelevance (m_arStatusArray, m_arListArray);
656 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
657 for (int col = 0; col <= maxcol; col++)
658 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
660 SetRedraw(TRUE);
661 GetStatisticsString();
663 CHeaderCtrl * pHeader = GetHeaderCtrl();
664 HDITEM HeaderItem = {0};
665 HeaderItem.mask = HDI_FORMAT;
666 for (int i=0; i<pHeader->GetItemCount(); ++i)
668 pHeader->GetItem(i, &HeaderItem);
669 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
670 pHeader->SetItem(i, &HeaderItem);
672 if (m_nSortedColumn)
674 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
675 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
676 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
679 if (nSelectedEntry)
681 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
682 EnsureVisible(nSelectedEntry, false);
684 else
686 // Restore the item at the top of the list.
687 for (int i=0;GetTopIndex() != nTopIndex;i++)
689 if ( !EnsureVisible(nTopIndex+i,false) )
691 break;
696 if (pApp)
697 pApp->DoWaitCursor(-1);
699 m_bEmpty = (GetItemCount() == 0);
700 Invalidate();
701 #endif
705 void CGitStatusListCtrl::Show(unsigned int /*dwShow*/, const CTGitPathList& checkedList, bool /*bShowFolders*/ /* = true */)
707 DeleteAllItems();
708 for(int i=0;i<checkedList.GetCount();i++)
709 this->AddEntry((CTGitPath *)&checkedList[i],0,i);
710 return ;
711 #if 0
713 Locker lock(m_critSec);
714 WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
716 CWinApp * pApp = AfxGetApp();
717 if (pApp)
718 pApp->DoWaitCursor(1);
719 m_dwShow = dwShow;
720 m_bShowFolders = bShowFolders;
721 m_nSelected = 0;
722 int nTopIndex = GetTopIndex();
723 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
724 int nSelectedEntry = 0;
725 if (posSelectedEntry)
726 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
727 SetRedraw(FALSE);
728 DeleteAllItems();
730 PrepareGroups();
732 m_arListArray.clear();
734 m_arListArray.reserve(m_arStatusArray.size());
735 SetItemCount (static_cast<int>(m_arStatusArray.size()));
737 int listIndex = 0;
738 for (size_t i=0; i < m_arStatusArray.size(); ++i)
740 FileEntry * entry = m_arStatusArray[i];
741 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
742 continue;
743 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
744 continue;
745 if (entry->IsFolder() && (!bShowFolders))
746 continue; // don't show folders if they're not wanted.
747 #if 0
748 git_wc_status_kind status = SVNStatus::GetMoreImportant(entry->status, entry->remotestatus);
749 DWORD showFlags = GetShowFlagsFromSVNStatus(status);
750 if (entry->IsLocked())
751 showFlags |= SVNSLC_SHOWLOCKS;
752 if (!entry->changelist.IsEmpty())
753 showFlags |= SVNSLC_SHOWINCHANGELIST;
755 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
756 if (status != git_wc_status_ignored || (entry->direct) || (dwShow & SVNSLC_SHOWIGNORED))
758 for (int npath = 0; npath < checkedList.GetCount(); ++npath)
760 if (entry->GetPath().IsEquivalentTo(checkedList[npath]))
762 entry->checked = true;
763 break;
766 if ((!entry->IsFolder()) && (status == git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
768 if (PathFileExists(entry->GetPath().GetWinPath()))
770 m_arListArray.push_back(i);
771 AddEntry(entry, langID, listIndex++);
774 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
776 m_arListArray.push_back(i);
777 AddEntry(entry, langID, listIndex++);
779 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
781 m_arListArray.push_back(i);
782 AddEntry(entry, langID, listIndex++);
784 else if (entry->switched)
786 m_arListArray.push_back(i);
787 AddEntry(entry, langID, listIndex++);
790 #endif
793 SetItemCount(listIndex);
795 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
796 for (int col = 0; col <= maxcol; col++)
797 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
799 SetRedraw(TRUE);
800 GetStatisticsString();
802 CHeaderCtrl * pHeader = GetHeaderCtrl();
803 HDITEM HeaderItem = {0};
804 HeaderItem.mask = HDI_FORMAT;
805 for (int i=0; i<pHeader->GetItemCount(); ++i)
807 pHeader->GetItem(i, &HeaderItem);
808 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
809 pHeader->SetItem(i, &HeaderItem);
811 if (m_nSortedColumn)
813 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
814 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
815 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
818 if (nSelectedEntry)
820 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
821 EnsureVisible(nSelectedEntry, false);
823 else
825 // Restore the item at the top of the list.
826 for (int i=0;GetTopIndex() != nTopIndex;i++)
828 if ( !EnsureVisible(nTopIndex+i,false) )
830 break;
835 if (pApp)
836 pApp->DoWaitCursor(-1);
838 m_bEmpty = (GetItemCount() == 0);
839 Invalidate();
840 #endif
843 int CGitStatusListCtrl::GetColumnIndex(int mask)
845 int i=0;
846 for(i=0;i<32;i++)
847 if(mask&0x1)
848 return i;
849 else
850 mask=mask>>1;
851 return -1;
853 void CGitStatusListCtrl::AddEntry(CTGitPath * GitPath, WORD /*langID*/, int listIndex)
855 static CString from(MAKEINTRESOURCE(IDS_STATUSLIST_FROM));
856 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
857 static bool abbreviateRenamings(((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\AbbreviateRenamings"), FALSE)) == TRUE);
858 static bool relativeTimes = (CRegDWORD(_T("Software\\TortoiseGit\\RelativeTimes"), FALSE) != FALSE);
860 CString path = GitPath->GetGitPathString();
862 m_bBlock = TRUE;
863 int index = listIndex;
864 int nCol = 1;
865 CString entryname = GitPath->GetGitPathString();
866 int icon_idx = 0;
867 if (GitPath->IsDirectory())
869 icon_idx = m_nIconFolder;
870 m_nShownSubmodules++;
872 else
874 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(*GitPath);
875 m_nShownFiles++;
877 switch (GitPath->m_Action)
879 case CTGitPath::LOGACTIONS_ADDED:
880 case CTGitPath::LOGACTIONS_COPY:
881 m_nShownAdded++;
882 break;
883 case CTGitPath::LOGACTIONS_DELETED:
884 m_nShownDeleted++;
885 break;
886 case CTGitPath::LOGACTIONS_REPLACED:
887 case CTGitPath::LOGACTIONS_MODIFIED:
888 case CTGitPath::LOGACTIONS_MERGED:
889 m_nShownModified++;
890 break;
891 case CTGitPath::LOGACTIONS_UNMERGED:
892 m_nShownConflicted++;
893 break;
894 case CTGitPath::LOGACTIONS_UNVER:
895 m_nShownUnversioned++;
896 break;
897 default:
898 m_nShownUnversioned++;
899 break;
901 if(GitPath->m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY) && !GitPath->GetGitOldPathString().IsEmpty())
903 if (!abbreviateRenamings)
905 // relative path
906 CString rename;
907 rename.Format(from, GitPath->GetGitOldPathString());
908 entryname += _T(" ") + rename;
910 else
912 CTGitPathList tgpl;
913 tgpl.AddPath(*GitPath);
914 CTGitPath old(GitPath->GetGitOldPathString());
915 tgpl.AddPath(old);
916 CString commonRoot = tgpl.GetCommonRoot().GetGitPathString();
917 if (!commonRoot.IsEmpty())
918 commonRoot += _T("/");
919 if (old.GetFileOrDirectoryName() == GitPath->GetFileOrDirectoryName() && old.GetContainingDirectory().GetGitPathString() != "" && GitPath->GetContainingDirectory().GetGitPathString())
921 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();
923 else if (!commonRoot.IsEmpty())
925 entryname = commonRoot + _T("{") + GitPath->GetGitOldPathString().Mid(commonRoot.GetLength()) + _T(" => ") + GitPath->GetGitPathString().Mid(commonRoot.GetLength()) + _T("}");
927 else
929 entryname = GitPath->GetGitOldPathString().Mid(commonRoot.GetLength()) + _T(" => ") + GitPath->GetGitPathString().Mid(commonRoot.GetLength());
934 InsertItem(index, entryname, icon_idx);
935 if (m_restorepaths.find(GitPath->GetWinPathString()) != m_restorepaths.end())
936 SetItemState(index, INDEXTOOVERLAYMASK(OVL_RESTORE), TVIS_OVERLAYMASK);
938 this->SetItemData(index, (DWORD_PTR)GitPath);
939 // SVNSLC_COLFILENAME
940 SetItemText(index, nCol++, GitPath->GetFileOrDirectoryName());
941 // SVNSLC_COLEXT
942 SetItemText(index, nCol++, GitPath->GetFileExtension());
943 // SVNSLC_COLSTATUS
944 SetItemText(index, nCol++, GitPath->GetActionName());
946 SetItemText(index, GetColumnIndex(GITSLC_COLADD),GitPath->m_StatAdd);
947 SetItemText(index, GetColumnIndex(GITSLC_COLDEL),GitPath->m_StatDel);
950 CString modificationDate;
951 __int64 filetime = GitPath->GetLastWriteTime();
952 if (filetime && (GitPath->m_Action != CTGitPath::LOGACTIONS_DELETED))
954 FILETIME* f = (FILETIME*)(__int64*)&filetime;
955 modificationDate = CLoglistUtils::FormatDateAndTime(CTime(g_Git.filetime_to_time_t(f)), DATE_SHORTDATE, true, relativeTimes);
957 SetItemText(index, GetColumnIndex(GITSLC_COLMODIFICATIONDATE), modificationDate);
959 // SVNSLC_COLSIZE
960 if (GitPath->IsDirectory())
961 SetItemText(index, GetColumnIndex(GITSLC_COLSIZE), _T(""));
962 else
964 TCHAR buf[100];
965 StrFormatByteSize64(GitPath->GetFileSize(), buf, 100);
966 SetItemText(index, GetColumnIndex(GITSLC_COLSIZE), buf);
969 SetCheck(index, GitPath->m_Checked);
970 if (GitPath->m_Checked)
971 m_nSelected++;
974 if( GitPath->m_Action & CTGitPath::LOGACTIONS_IGNORE)
975 SetItemGroup(index, 2);
976 else if( GitPath->m_Action & CTGitPath::LOGACTIONS_UNVER)
977 SetItemGroup(index,1);
978 else
980 SetItemGroup(index, GitPath->m_ParentNo&(PARENT_MASK|MERGE_MASK));
983 m_bBlock = FALSE;
988 bool CGitStatusListCtrl::SetItemGroup(int item, int groupindex)
990 // if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS) == NULL)
991 // return false;
992 if (groupindex < 0)
993 return false;
994 LVITEM i = {0};
995 i.mask = LVIF_GROUPID;
996 i.iItem = item;
997 i.iSubItem = 0;
998 i.iGroupId = groupindex;
1000 return !!SetItem(&i);
1003 void CGitStatusListCtrl::OnHdnItemclick(NMHDR *pNMHDR, LRESULT *pResult)
1005 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
1006 *pResult = 0;
1007 if (m_bBlock || m_arStatusArray.empty())
1008 return;
1009 m_bBlock = TRUE;
1010 if (m_nSortedColumn == phdr->iItem)
1011 m_bAscending = !m_bAscending;
1012 else
1013 m_bAscending = TRUE;
1014 m_nSortedColumn = phdr->iItem;
1015 Show(m_dwShow, 0, m_bShowFolders,false,true);
1017 m_bBlock = FALSE;
1020 void CGitStatusListCtrl::OnLvnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
1022 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1023 *pResult = 0;
1025 #define ISCHECKED(x) ((x) ? ((((x)&LVIS_STATEIMAGEMASK)>>12)-1) : FALSE)
1026 if ((m_bBlock)&&(m_bBlockUI))
1028 // if we're blocked, prevent changing of the check state
1029 if ((!ISCHECKED(pNMLV->uOldState) && ISCHECKED(pNMLV->uNewState))||
1030 (ISCHECKED(pNMLV->uOldState) && !ISCHECKED(pNMLV->uNewState)))
1031 *pResult = TRUE;
1035 BOOL CGitStatusListCtrl::OnLvnItemchanged(NMHDR *pNMHDR, LRESULT *pResult)
1037 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1038 *pResult = 0;
1039 CWnd* pParent = GetLogicalParent();
1040 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
1042 pParent->SendMessage(GITSLNM_ITEMCHANGED, pNMLV->iItem);
1045 if ((pNMLV->uNewState==0)||(pNMLV->uNewState & LVIS_SELECTED)||(pNMLV->uNewState & LVIS_FOCUSED))
1046 return FALSE;
1048 if (m_bBlock)
1049 return FALSE;
1051 bool bSelected = !!(ListView_GetItemState(m_hWnd, pNMLV->iItem, LVIS_SELECTED) & LVIS_SELECTED);
1052 int nListItems = GetItemCount();
1054 m_bBlock = TRUE;
1055 // was the item checked?
1057 //CTGitPath *gitpath=(CTGitPath*)GetItemData(pNMLV->iItem);
1058 //gitpath->m_Checked=GetCheck(pNMLV->iItem);
1060 if (GetCheck(pNMLV->iItem))
1062 CheckEntry(pNMLV->iItem, nListItems);
1063 if (bSelected)
1065 POSITION pos = GetFirstSelectedItemPosition();
1066 int index;
1067 while ((index = GetNextSelectedItem(pos)) >= 0)
1069 if (index != pNMLV->iItem)
1070 CheckEntry(index, nListItems);
1074 else
1076 UncheckEntry(pNMLV->iItem, nListItems);
1077 if (bSelected)
1079 POSITION pos = GetFirstSelectedItemPosition();
1080 int index;
1081 while ((index = GetNextSelectedItem(pos)) >= 0)
1083 if (index != pNMLV->iItem)
1084 UncheckEntry(index, nListItems);
1089 GetStatisticsString();
1090 m_bBlock = FALSE;
1091 NotifyCheck();
1093 return FALSE;
1096 void CGitStatusListCtrl::OnColumnResized(NMHDR *pNMHDR, LRESULT *pResult)
1098 m_ColumnManager.OnColumnResized(pNMHDR,pResult);
1100 *pResult = FALSE;
1103 void CGitStatusListCtrl::OnColumnMoved(NMHDR *pNMHDR, LRESULT *pResult)
1105 m_ColumnManager.OnColumnMoved(pNMHDR, pResult);
1107 Invalidate(FALSE);
1110 void CGitStatusListCtrl::CheckEntry(int index, int /*nListItems*/)
1112 Locker lock(m_critSec);
1113 //FileEntry * entry = GetListEntry(index);
1114 CTGitPath *path=(CTGitPath*)GetItemData(index);
1115 ASSERT(path != NULL);
1116 if (path == NULL)
1117 return;
1118 m_mapFilenameToChecked[path->GetGitPathString()] = true;
1119 SetCheck(index, TRUE);
1120 //entry = GetListEntry(index);
1121 // if an unversioned item was checked, then we need to check if
1122 // the parent folders are unversioned too. If the parent folders actually
1123 // are unversioned, then check those too.
1124 #if 0
1125 if (entry->status == git_wc_status_unversioned)
1127 // we need to check the parent folder too
1128 const CTGitPath& folderpath = entry->path;
1129 for (int i=0; i< nListItems; ++i)
1131 FileEntry * testEntry = GetListEntry(i);
1132 ASSERT(testEntry != NULL);
1133 if (testEntry == NULL)
1134 continue;
1135 if (!testEntry->checked)
1137 if (testEntry->path.IsAncestorOf(folderpath) && (!testEntry->path.IsEquivalentTo(folderpath)))
1139 SetEntryCheck(testEntry,i,true);
1140 m_nSelected++;
1145 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1146 if ( (entry->status == git_wc_status_deleted) || (m_bCheckChildrenWithParent) || (bShift) )
1148 // if a deleted folder gets checked, we have to check all
1149 // children of that folder too.
1150 if (entry->path.IsDirectory())
1152 SetCheckOnAllDescendentsOf(entry, true);
1155 // if a deleted file or folder gets checked, we have to
1156 // check all parents of this item too.
1157 for (int i=0; i<nListItems; ++i)
1159 FileEntry * testEntry = GetListEntry(i);
1160 ASSERT(testEntry != NULL);
1161 if (testEntry == NULL)
1162 continue;
1163 if (!testEntry->checked)
1165 if (testEntry->path.IsAncestorOf(entry->path) && (!testEntry->path.IsEquivalentTo(entry->path)))
1167 if ((testEntry->status == git_wc_status_deleted)||(m_bCheckChildrenWithParent))
1169 SetEntryCheck(testEntry,i,true);
1170 m_nSelected++;
1171 // now we need to check all children of this parent folder
1172 SetCheckOnAllDescendentsOf(testEntry, true);
1178 #endif
1179 if ( !path->m_Checked )
1181 path->m_Checked = TRUE;
1182 m_nSelected++;
1186 void CGitStatusListCtrl::UncheckEntry(int index, int /*nListItems*/)
1188 Locker lock(m_critSec);
1189 CTGitPath *path=(CTGitPath*)GetItemData(index);
1190 ASSERT(path != NULL);
1191 if (path == NULL)
1192 return;
1193 SetCheck(index, FALSE);
1194 m_mapFilenameToChecked[path->GetGitPathString()] = false;
1195 //entry = GetListEntry(index);
1196 // item was unchecked
1197 #if 0
1198 if (entry->path.IsDirectory())
1200 // disable all files within an unselected folder, except when unchecking a folder with property changes
1201 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1202 if ( (entry->status != git_wc_status_modified) || (bShift) )
1204 SetCheckOnAllDescendentsOf(entry, false);
1207 else if (entry->status == git_wc_status_deleted)
1209 // a "deleted" file was unchecked, so uncheck all parent folders
1210 // and all children of those parents
1211 for (int i=0; i<nListItems; i++)
1213 FileEntry * testEntry = GetListEntry(i);
1214 ASSERT(testEntry != NULL);
1215 if (testEntry == NULL)
1216 continue;
1217 if (testEntry->checked)
1219 if (testEntry->path.IsAncestorOf(entry->path))
1221 if (testEntry->status == git_wc_status_deleted)
1223 SetEntryCheck(testEntry,i,false);
1224 m_nSelected--;
1226 SetCheckOnAllDescendentsOf(testEntry, false);
1232 #endif
1233 if ( path->m_Checked )
1235 path->m_Checked = FALSE;
1236 m_nSelected--;
1239 bool CGitStatusListCtrl::BuildStatistics()
1242 bool bRefetchStatus = false;
1244 // now gather some statistics
1245 m_nUnversioned = 0;
1246 m_nNormal = 0;
1247 m_nModified = 0;
1248 m_nAdded = 0;
1249 m_nDeleted = 0;
1250 m_nConflicted = 0;
1251 m_nTotal = 0;
1252 m_nSelected = 0;
1253 m_nLineAdded = 0;
1254 m_nLineDeleted = 0;
1255 m_nRenamed = 0;
1257 for (int i=0; i < (int)m_arStatusArray.size(); ++i)
1259 int status=((CTGitPath*)m_arStatusArray[i])->m_Action;
1261 m_nLineAdded += _tstol(((CTGitPath*)m_arStatusArray[i])->m_StatAdd);
1262 m_nLineDeleted += _tstol(((CTGitPath*)m_arStatusArray[i])->m_StatDel);
1264 if(status&(CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))
1265 m_nAdded++;
1267 if(status&CTGitPath::LOGACTIONS_DELETED)
1268 m_nDeleted++;
1270 if(status&(CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_MODIFIED))
1271 m_nModified++;
1273 if(status&CTGitPath::LOGACTIONS_UNMERGED)
1274 m_nConflicted++;
1276 if(status&(CTGitPath::LOGACTIONS_IGNORE|CTGitPath::LOGACTIONS_UNVER))
1277 m_nUnversioned++;
1279 if(status&(CTGitPath::LOGACTIONS_REPLACED))
1280 m_nRenamed++;
1282 if(((CTGitPath*)m_arStatusArray[i])->m_Checked)
1283 m_nSelected++;
1285 // } // switch (entry->status)
1286 // } // if (entry)
1287 } // for (int i=0; i < (int)m_arStatusArray.size(); ++i)
1288 return !bRefetchStatus;
1292 int CGitStatusListCtrl::GetGroupFromPoint(POINT * ppt)
1294 // the point must be relative to the upper left corner of the control
1296 if (ppt == NULL)
1297 return -1;
1298 if (!IsGroupViewEnabled())
1299 return -1;
1301 POINT pt = *ppt;
1302 pt.x = 10;
1303 UINT flags = 0;
1304 int nItem = -1;
1305 RECT rc;
1306 GetWindowRect(&rc);
1307 while (((flags & LVHT_BELOW) == 0)&&(pt.y < rc.bottom))
1309 nItem = HitTest(pt, &flags);
1310 if ((flags & LVHT_ONITEM)||(flags & LVHT_EX_GROUP_HEADER))
1312 // the first item below the point
1314 // check if the point is too much right (i.e. if the point
1315 // is farther to the right than the width of the item)
1316 RECT r;
1317 GetItemRect(nItem, &r, LVIR_LABEL);
1318 if (ppt->x > r.right)
1319 return -1;
1321 LVITEM lv = {0};
1322 lv.mask = LVIF_GROUPID;
1323 lv.iItem = nItem;
1324 GetItem(&lv);
1325 int groupID = lv.iGroupId;
1326 // now we search upwards and check if the item above this one
1327 // belongs to another group. If it belongs to the same group,
1328 // we're not over a group header
1329 while (pt.y >= 0)
1331 pt.y -= 2;
1332 nItem = HitTest(pt, &flags);
1333 if ((flags & LVHT_ONITEM)&&(nItem >= 0))
1335 // the first item below the point
1336 LVITEM lv = {0};
1337 lv.mask = LVIF_GROUPID;
1338 lv.iItem = nItem;
1339 GetItem(&lv);
1340 if (lv.iGroupId != groupID)
1341 return groupID;
1342 else
1343 return -1;
1346 if (pt.y < 0)
1347 return groupID;
1348 return -1;
1350 pt.y += 2;
1352 return -1;
1355 void CGitStatusListCtrl::OnContextMenuGroup(CWnd * /*pWnd*/, CPoint point)
1357 POINT clientpoint = point;
1358 ScreenToClient(&clientpoint);
1359 if ((IsGroupViewEnabled())&&(GetGroupFromPoint(&clientpoint) >= 0))
1361 CMenu popup;
1362 if (popup.CreatePopupMenu())
1364 CString temp;
1365 temp.LoadString(IDS_STATUSLIST_CHECKGROUP);
1366 popup.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_CHECKGROUP, temp);
1367 temp.LoadString(IDS_STATUSLIST_UNCHECKGROUP);
1368 popup.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_UNCHECKGROUP, temp);
1369 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1370 bool bCheck = false;
1371 switch (cmd)
1373 case IDGITLC_CHECKGROUP:
1374 bCheck = true;
1375 // fall through here
1376 case IDGITLC_UNCHECKGROUP:
1378 int group = GetGroupFromPoint(&clientpoint);
1379 // go through all items and check/uncheck those assigned to the group
1380 // but block the OnLvnItemChanged handler
1381 m_bBlock = true;
1382 LVITEM lv;
1383 for (int i=0; i<GetItemCount(); ++i)
1385 SecureZeroMemory(&lv, sizeof(LVITEM));
1386 lv.mask = LVIF_GROUPID;
1387 lv.iItem = i;
1388 GetItem(&lv);
1390 if (lv.iGroupId == group)
1392 CTGitPath * entry = (CTGitPath*)GetItemData(i);
1393 if (entry)
1395 bool bOldCheck = entry->m_Checked;
1396 SetEntryCheck(entry, i, bCheck);
1397 if (bCheck != bOldCheck)
1399 if (bCheck)
1400 m_nSelected++;
1401 else
1402 m_nSelected--;
1408 GetStatisticsString();
1409 NotifyCheck();
1410 m_bBlock = false;
1412 break;
1418 void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
1421 //WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
1423 //bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1424 CTGitPath * filepath;
1426 int selIndex = GetSelectionMark();
1427 if ((point.x == -1) && (point.y == -1))
1429 CRect rect;
1430 GetItemRect(selIndex, &rect, LVIR_LABEL);
1431 ClientToScreen(&rect);
1432 point = rect.CenterPoint();
1434 if ((GetSelectedCount() == 0) && (m_bHasCheckboxes))
1436 // nothing selected could mean the context menu is requested for
1437 // a group header
1438 OnContextMenuGroup(pWnd, point);
1440 else if (selIndex >= 0)
1442 //FileEntry * entry = GetListEntry(selIndex);
1444 filepath = (CTGitPath * )GetItemData(selIndex);
1446 ASSERT(filepath != NULL);
1447 if (filepath == NULL)
1448 return;
1450 //const CTGitPath& filepath = entry->path;
1451 int wcStatus = filepath->m_Action;
1452 // entry is selected, now show the popup menu
1453 Locker lock(m_critSec);
1454 CIconMenu popup;
1455 CMenu changelistSubMenu;
1456 CMenu ignoreSubMenu;
1457 if (popup.CreatePopupMenu())
1459 //Add Menu for version controlled file
1461 if (GetSelectedCount() > 0 && wcStatus & CTGitPath::LOGACTIONS_UNMERGED)
1463 if (GetSelectedCount() == 1 && (m_dwContextMenus & GITSLC_POPCONFLICT)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1465 popup.AppendMenuIcon(IDGITLC_EDITCONFLICT, IDS_MENUCONFLICT, IDI_CONFLICT);
1467 if (m_dwContextMenus & GITSLC_POPRESOLVE)
1469 popup.AppendMenuIcon(IDGITLC_RESOLVECONFLICT, IDS_STATUSLIST_CONTEXT_RESOLVED, IDI_RESOLVE);
1471 if ((m_dwContextMenus & GITSLC_POPRESOLVE)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1473 popup.AppendMenuIcon(IDGITLC_RESOLVETHEIRS, IDS_SVNPROGRESS_MENUUSETHEIRS, IDI_RESOLVE);
1474 popup.AppendMenuIcon(IDGITLC_RESOLVEMINE, IDS_SVNPROGRESS_MENUUSEMINE, IDI_RESOLVE);
1476 if ((m_dwContextMenus & GITSLC_POPCONFLICT)||(m_dwContextMenus & GITSLC_POPRESOLVE))
1477 popup.AppendMenu(MF_SEPARATOR);
1480 if (GetSelectedCount() > 0)
1482 if (wcStatus & CTGitPath::LOGACTIONS_UNVER)
1483 if (m_dwContextMenus & GITSLC_POPADD)
1485 //if ( entry->IsFolder() )
1487 // popup.AppendMenuIcon(IDSVNLC_ADD_RECURSIVE, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE, IDI_ADD);
1489 //else
1491 popup.AppendMenuIcon(IDGITLC_ADD, IDS_STATUSLIST_CONTEXT_ADD, IDI_ADD);
1496 if (!(wcStatus & CTGitPath::LOGACTIONS_UNVER) && GetSelectedCount() > 0)
1498 bool bEntryAdded = false;
1499 if (m_dwContextMenus & GITSLC_POPCOMPAREWITHBASE)
1501 if(filepath->m_ParentNo & MERGE_MASK)
1502 popup.AppendMenuIcon(IDGITLC_COMPARE, IDS_TREE_DIFF, IDI_DIFF);
1503 else
1504 popup.AppendMenuIcon(IDGITLC_COMPARE, IDS_LOG_COMPAREWITHBASE, IDI_DIFF);
1506 popup.SetDefaultItem(IDGITLC_COMPARE, FALSE);
1507 bEntryAdded = true;
1510 if (!g_Git.IsInitRepos() && (m_dwContextMenus & GITSLC_POPGNUDIFF))
1512 popup.AppendMenuIcon(IDGITLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1513 bEntryAdded = true;
1516 if ((m_dwContextMenus & this->GetContextMenuBit(IDGITLC_COMPAREWC)) && m_bHasWC)
1518 if ((!m_CurrentVersion.IsEmpty()) && m_CurrentVersion != GIT_REV_ZERO)
1520 popup.AppendMenuIcon(IDGITLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
1521 bEntryAdded = true;
1525 //else if (GetSelectedCount() > 1)
1527 // if (m_dwContextMenus & SVNSLC_POPCOMMIT)
1528 // {
1529 // popup.AppendMenuIcon(IDSVNLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);
1530 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
1531 // }
1534 if (bEntryAdded)
1535 popup.AppendMenu(MF_SEPARATOR);
1538 if( (!this->m_Rev1.IsEmpty()) || (!this->m_Rev1.IsEmpty()) )
1540 if(GetSelectedCount() == 1)
1542 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_COMPARETWO))
1544 popup.AppendMenuIcon(IDGITLC_COMPARETWO, IDS_LOG_POPUP_COMPARETWO, IDI_DIFF);
1545 popup.SetDefaultItem(IDGITLC_COMPARETWO, FALSE);
1547 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_GNUDIFF2))
1549 popup.AppendMenuIcon(IDGITLC_GNUDIFF2, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1554 //Select Multi item
1555 if (GetSelectedCount() > 0)
1557 if ((GetSelectedCount() == 2) && (m_dwContextMenus & GITSLC_POPCOMPARETWOFILES) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO))
1559 POSITION pos = GetFirstSelectedItemPosition();
1560 int index = GetNextSelectedItem(pos);
1561 if (index >= 0)
1563 CTGitPath * entry2 = NULL;
1564 bool bothItemsAreExistingFiles = true;
1565 entry2 = (CTGitPath * )GetItemData(index);
1566 if (entry2)
1567 bothItemsAreExistingFiles = !entry2->IsDirectory() && entry2->Exists();
1568 index = GetNextSelectedItem(pos);
1569 if (index >= 0)
1571 entry2 = (CTGitPath * )GetItemData(index);
1572 if (entry2)
1573 bothItemsAreExistingFiles = bothItemsAreExistingFiles && !entry2->IsDirectory() && entry2->Exists();
1574 if (bothItemsAreExistingFiles)
1575 popup.AppendMenuIcon(IDGITLC_COMPARETWOFILES, IDS_STATUSLIST_CONTEXT_COMPARETWOFILES, IDI_DIFF);
1579 // if (wcStatus > git_wc_status_normal)
1580 // {
1581 // if (m_dwContextMenus & SVNSLC_POPREVERT)
1582 // {
1583 // // reverting missing folders is not possible
1584 // if (!entry->IsFolder() || (wcStatus != git_wc_status_missing))
1585 // {
1586 // popup.AppendMenuIcon(IDSVNLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
1587 // }
1588 // }
1589 // }
1590 // if (entry->remotestatus > git_wc_status_normal)
1591 // {
1592 // if (m_dwContextMenus & SVNSLC_POPUPDATE)
1593 // {
1594 // popup.AppendMenuIcon(IDSVNLC_UPDATE, IDS_MENUUPDATE, IDI_UPDATE);
1595 // }
1596 // }
1599 if ( (GetSelectedCount() >0 ) && (!(wcStatus & CTGitPath::LOGACTIONS_UNVER)) && m_bHasWC)
1601 if ((m_dwContextMenus & GITSLC_POPREVERT) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO))
1603 popup.AppendMenuIcon(IDGITLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
1606 if ((m_dwContextMenus & GITSLC_POPSKIPWORKTREE) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO) && !(wcStatus & (CTGitPath::LOGACTIONS_ADDED | CTGitPath::LOGACTIONS_DELETED | CTGitPath::LOGACTIONS_UNMERGED)) && !filepath->IsDirectory())
1608 popup.AppendMenuIcon(IDGITLC_SKIPWORKTREE, IDS_STATUSLIST_SKIPWORKTREE);
1611 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())
1613 popup.AppendMenuIcon(IDGITLC_ASSUMEVALID, IDS_MENUASSUMEVALID);
1616 if (m_dwContextMenus & GITSLC_POPRESTORE && !filepath->IsDirectory())
1618 if (m_restorepaths.find(filepath->GetWinPathString()) == m_restorepaths.end())
1619 popup.AppendMenuIcon(IDGITLC_CREATERESTORE, IDS_MENUCREATERESTORE, IDI_RESTORE);
1620 else
1621 popup.AppendMenuIcon(IDGITLC_RESTOREPATH, IDS_MENURESTORE, IDI_RESTORE);
1624 if ((m_dwContextMenus & GetContextMenuBit(IDGITLC_REVERTTOREV)) && ( !this->m_CurrentVersion.IsEmpty() )
1625 && this->m_CurrentVersion != GIT_REV_ZERO && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1627 popup.AppendMenuIcon(IDGITLC_REVERTTOREV, IDS_LOG_POPUP_REVERTTOREV, IDI_REVERT);
1630 if ((m_dwContextMenus & GetContextMenuBit(IDGITLC_REVERTTOPARENT)) && ( !this->m_CurrentVersion.IsEmpty() )
1631 && this->m_CurrentVersion != GIT_REV_ZERO && !(wcStatus & CTGitPath::LOGACTIONS_ADDED))
1633 popup.AppendMenuIcon(IDGITLC_REVERTTOPARENT, IDS_LOG_POPUP_REVERTTOPARENT, IDI_REVERT);
1637 if ((GetSelectedCount() == 1)&&(!(wcStatus & CTGitPath::LOGACTIONS_UNVER))
1638 &&(!(wcStatus & CTGitPath::LOGACTIONS_IGNORE)))
1640 if (m_dwContextMenus & GITSLC_POPSHOWLOG)
1642 popup.AppendMenuIcon(IDGITLC_LOG, IDS_REPOBROWSE_SHOWLOG, IDI_LOG);
1644 if (m_dwContextMenus & GITSLC_POPSHOWLOGSUBMODULE && filepath->IsDirectory())
1646 popup.AppendMenuIcon(IDGITLC_LOGSUBMODULE, IDS_LOG_SUBMODULE, IDI_LOG);
1648 if (m_dwContextMenus & GITSLC_POPSHOWLOGOLDNAME && (wcStatus & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY) && !filepath->GetGitOldPathString().IsEmpty()))
1650 popup.AppendMenuIcon(IDGITLC_LOGOLDNAME, IDS_STATUSLIST_SHOWLOGOLDNAME, IDI_LOG);
1652 if (m_dwContextMenus & GITSLC_POPBLAME && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED) && m_bHasWC)
1654 popup.AppendMenuIcon(IDGITLC_BLAME, IDS_MENUBLAME, IDI_BLAME);
1658 if (GetSelectedCount() > 0)
1660 if ((m_dwContextMenus & GetContextMenuBit(IDGITLC_EXPORT)) && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1661 popup.AppendMenuIcon(IDGITLC_EXPORT, IDS_LOG_POPUP_EXPORT, IDI_EXPORT);
1664 // if ((wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing) && (GetSelectedCount() == 1))
1665 if ( (GetSelectedCount() == 1) )
1667 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_SAVEAS) && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1669 popup.AppendMenuIcon(IDGITLC_SAVEAS, IDS_LOG_POPUP_SAVE, IDI_SAVEAS);
1672 if (m_dwContextMenus & GITSLC_POPOPEN && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1674 popup.AppendMenuIcon(IDGITLC_VIEWREV, IDS_LOG_POPUP_VIEWREV);
1675 popup.AppendMenuIcon(IDGITLC_OPEN, IDS_REPOBROWSE_OPEN, IDI_OPEN);
1676 popup.AppendMenuIcon(IDGITLC_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
1677 if (wcStatus &CTGitPath::LOGACTIONS_UNVER) {
1678 popup.SetDefaultItem(IDGITLC_OPEN, FALSE);
1682 if (m_dwContextMenus & GITSLC_POPEXPLORE && !(wcStatus & CTGitPath::LOGACTIONS_DELETED) && m_bHasWC)
1684 popup.AppendMenuIcon(IDGITLC_EXPLORE, IDS_STATUSLIST_CONTEXT_EXPLORE, IDI_EXPLORER);
1688 if (GetSelectedCount() > 0)
1690 // if (((wcStatus == git_wc_status_unversioned)||(wcStatus == git_wc_status_ignored))&&(m_dwContextMenus & SVNSLC_POPDELETE))
1691 // {
1692 // popup.AppendMenuIcon(IDSVNLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
1693 // }
1694 // 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))
1695 // {
1696 // if (bShift)
1697 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVEKEEP, IDI_DELETE);
1698 // else
1699 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVE, IDI_DELETE);
1700 // }
1701 if ((wcStatus & CTGitPath::LOGACTIONS_UNVER)/*||(wcStatus == git_wc_status_deleted)*/)
1703 if (m_dwContextMenus & GITSLC_POPDELETE)
1705 popup.AppendMenuIcon(IDGITLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
1708 if ( (wcStatus & CTGitPath::LOGACTIONS_UNVER || wcStatus & CTGitPath::LOGACTIONS_DELETED) )
1710 if (m_dwContextMenus & GITSLC_POPIGNORE)
1713 CTGitPathList ignorelist;
1714 FillListOfSelectedItemPaths(ignorelist);
1715 //check if all selected entries have the same extension
1716 bool bSameExt = true;
1717 CString sExt;
1718 for (int i=0; i<ignorelist.GetCount(); ++i)
1720 if (sExt.IsEmpty() && (i==0))
1721 sExt = ignorelist[i].GetFileExtension();
1722 else if (sExt.CompareNoCase(ignorelist[i].GetFileExtension())!=0)
1723 bSameExt = false;
1725 if (bSameExt)
1727 if (ignoreSubMenu.CreateMenu())
1729 CString ignorepath;
1730 if (ignorelist.GetCount()==1)
1731 ignorepath = ignorelist[0].GetFileOrDirectoryName();
1732 else
1733 ignorepath.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
1734 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_IGNORE, ignorepath);
1735 ignorepath = _T("*")+sExt;
1736 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_IGNOREMASK, ignorepath);
1737 CString temp;
1738 temp.LoadString(IDS_MENUIGNORE);
1739 popup.InsertMenu((UINT)-1, MF_BYPOSITION | MF_POPUP, (UINT_PTR)ignoreSubMenu.m_hMenu, temp);
1742 else
1744 CString temp;
1745 if (ignorelist.GetCount()==1)
1747 temp.LoadString(IDS_MENUIGNORE);
1749 else
1751 temp.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
1753 popup.AppendMenuIcon(IDGITLC_IGNORE, temp, IDI_IGNORE);
1761 if (GetSelectedCount() > 0)
1763 popup.AppendMenu(MF_SEPARATOR);
1764 popup.AppendMenuIcon(IDGITLC_COPY, IDS_STATUSLIST_CONTEXT_COPY, IDI_COPYCLIP);
1765 popup.AppendMenuIcon(IDGITLC_COPYEXT, IDS_STATUSLIST_CONTEXT_COPYEXT, IDI_COPYCLIP);
1766 #if 0
1767 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS))
1768 &&(wcStatus != git_wc_status_unversioned)&&(wcStatus != git_wc_status_none))
1770 popup.AppendMenu(MF_SEPARATOR);
1771 // changelist commands
1772 size_t numChangelists = GetNumberOfChangelistsInSelection();
1773 if (numChangelists > 0)
1775 popup.AppendMenuIcon(IDSVNLC_REMOVEFROMCS, IDS_STATUSLIST_CONTEXT_REMOVEFROMCS);
1777 if ((!entry->IsFolder())&&(changelistSubMenu.CreateMenu()))
1779 CString temp;
1780 temp.LoadString(IDS_STATUSLIST_CONTEXT_CREATECS);
1781 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATECS, temp);
1783 if (entry->changelist.Compare(SVNSLC_IGNORECHANGELIST))
1785 changelistSubMenu.AppendMenu(MF_SEPARATOR);
1786 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATEIGNORECS, SVNSLC_IGNORECHANGELIST);
1789 if (!m_changelists.empty())
1791 // find the changelist names
1792 bool bNeedSeparator = true;
1793 int cmdID = IDSVNLC_MOVETOCS;
1794 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
1796 if ((entry->changelist.Compare(it->first))&&(it->first.Compare(SVNSLC_IGNORECHANGELIST)))
1798 if (bNeedSeparator)
1800 changelistSubMenu.AppendMenu(MF_SEPARATOR);
1801 bNeedSeparator = false;
1803 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, cmdID, it->first);
1804 cmdID++;
1808 temp.LoadString(IDS_STATUSLIST_CONTEXT_MOVETOCS);
1809 popup.AppendMenu(MF_POPUP|MF_STRING, (UINT_PTR)changelistSubMenu.GetSafeHmenu(), temp);
1812 #endif
1815 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1817 m_bBlock = TRUE;
1818 AfxGetApp()->DoWaitCursor(1);
1819 //int iItemCountBeforeMenuCmd = GetItemCount();
1820 //bool bForce = false;
1821 switch (cmd)
1823 case IDGITLC_VIEWREV:
1824 OpenFile(filepath, ALTERNATIVEEDITOR);
1825 break;
1826 case IDGITLC_OPEN:
1827 OpenFile(filepath,OPEN);
1828 break;
1829 case IDGITLC_OPENWITH:
1830 OpenFile(filepath,OPEN_WITH);
1831 break;
1832 case IDGITLC_EXPLORE:
1834 ShellExecute(this->m_hWnd, _T("explore"), filepath->GetDirectory().GetWinPath(), NULL, NULL, SW_SHOW);
1836 break;
1837 case IDGITLC_CREATERESTORE:
1839 POSITION pos = GetFirstSelectedItemPosition();
1840 while (pos)
1842 int index = GetNextSelectedItem(pos);
1843 CTGitPath * entry2 = (CTGitPath * )GetItemData(index);
1844 ASSERT(entry2 != NULL);
1845 if (entry2 == NULL || entry2->IsDirectory())
1846 continue;
1847 if (m_restorepaths.find(entry2->GetWinPathString()) != m_restorepaths.end())
1848 continue;
1849 CTGitPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
1850 if (CopyFile(g_Git.m_CurrentDir + _T("\\") + entry2->GetWinPathString(), tempFile.GetWinPath(), FALSE))
1852 m_restorepaths[entry2->GetWinPathString()] = tempFile.GetWinPathString();
1853 SetItemState(index, INDEXTOOVERLAYMASK(OVL_RESTORE), LVIS_OVERLAYMASK);
1856 Invalidate();
1858 break;
1859 case IDGITLC_RESTOREPATH:
1861 if (CMessageBox::Show(m_hWnd, IDS_STATUSLIST_RESTOREPATH, IDS_APPNAME, 2, IDI_QUESTION, IDS_RESTOREBUTTON, IDS_ABORTBUTTON) == 2)
1862 break;
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)
1870 continue;
1871 if (m_restorepaths.find(entry2->GetWinPathString()) == m_restorepaths.end())
1872 continue;
1873 if (CopyFile(m_restorepaths[entry2->GetWinPathString()], g_Git.m_CurrentDir + _T("\\") + entry2->GetWinPathString(), FALSE))
1875 m_restorepaths.erase(entry2->GetWinPathString());
1876 SetItemState(index, 0, LVIS_OVERLAYMASK);
1879 Invalidate();
1881 break;
1882 // Compare current version and work copy.
1883 case IDGITLC_COMPAREWC:
1885 POSITION pos = GetFirstSelectedItemPosition();
1886 while ( pos )
1888 int index = GetNextSelectedItem(pos);
1889 StartDiffWC(index);
1892 break;
1893 // Compare with base version. when current version is zero, compare workcopy and HEAD.
1894 case IDGITLC_COMPARE:
1896 POSITION pos = GetFirstSelectedItemPosition();
1897 while ( pos )
1899 int index = GetNextSelectedItem(pos);
1900 StartDiff(index);
1903 break;
1904 case IDGITLC_COMPARETWO:
1906 POSITION pos = GetFirstSelectedItemPosition();
1907 while ( pos )
1909 int index = GetNextSelectedItem(pos);
1910 StartDiffTwo(index);
1913 break;
1914 case IDGITLC_COMPARETWOFILES:
1916 POSITION pos = GetFirstSelectedItemPosition();
1917 CTGitPath * firstfilepath = NULL, * secondfilepath = NULL;
1918 if (pos)
1920 firstfilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
1921 ASSERT(firstfilepath != NULL);
1922 if (firstfilepath == NULL)
1923 break;
1925 secondfilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
1926 ASSERT(secondfilepath != NULL);
1927 if (secondfilepath == NULL)
1928 break;
1930 CString sCmd;
1931 sCmd.Format(_T("/command:diff /path:\"%s\" /path2:\"%s\" /hwnd:%ld"), firstfilepath->GetWinPath(), secondfilepath->GetWinPath(), (unsigned long)m_hWnd);
1932 CAppUtils::RunTortoiseGitProc(sCmd);
1935 break;
1936 case IDGITLC_GNUDIFF1:
1938 POSITION pos = GetFirstSelectedItemPosition();
1939 while (pos)
1941 CTGitPath * selectedFilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
1942 if (m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
1944 CString fromwhere;
1945 if (m_amend)
1946 fromwhere = _T("~1");
1947 CAppUtils::StartShowUnifiedDiff(m_hWnd, *selectedFilepath, GitRev::GetHead() + fromwhere, *selectedFilepath, GitRev::GetWorkingCopy());
1949 else
1951 if ((selectedFilepath->m_ParentNo & (PARENT_MASK | MERGE_MASK)) == 0)
1952 CAppUtils::StartShowUnifiedDiff(m_hWnd, *selectedFilepath, m_CurrentVersion + _T("~1"), *selectedFilepath, m_CurrentVersion);
1953 else
1955 CString str;
1956 if (!(selectedFilepath->m_ParentNo & MERGE_MASK))
1957 str.Format(_T("%s^%d"), m_CurrentVersion, (selectedFilepath->m_ParentNo & PARENT_MASK) + 1);
1959 CAppUtils::StartShowUnifiedDiff(m_hWnd, *selectedFilepath, str, *selectedFilepath, m_CurrentVersion, false, false, false, !!(selectedFilepath->m_ParentNo & MERGE_MASK));
1964 break;
1965 case IDGITLC_GNUDIFF2:
1967 CAppUtils::StartShowUnifiedDiff(m_hWnd, *filepath, m_Rev2, *filepath, m_Rev1);
1969 break;
1971 case IDGITLC_ADD:
1973 CTGitPathList paths;
1974 FillListOfSelectedItemPaths(paths, true);
1976 CGitProgressDlg progDlg;
1977 progDlg.SetCommand(CGitProgressDlg::GitProgress_Add);
1978 progDlg.SetPathList(paths);
1979 progDlg.SetItemCount(paths.GetCount());
1980 progDlg.DoModal();
1982 // reset unchecked status
1983 POSITION pos = GetFirstSelectedItemPosition();
1984 int index;
1985 while ((index = GetNextSelectedItem(pos)) >= 0)
1987 m_mapFilenameToChecked.erase(((CTGitPath*)GetItemData(index))->GetGitPathString());
1990 if (NULL != GetLogicalParent() && NULL != GetLogicalParent()->GetSafeHwnd())
1991 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
1993 SetRedraw(TRUE);
1995 break;
1997 case IDGITLC_DELETE:
1999 //Collect paths
2000 std::vector<int> selectIndex;
2002 POSITION pos = GetFirstSelectedItemPosition();
2003 int index;
2004 while ((index = GetNextSelectedItem(pos)) >= 0)
2006 selectIndex.push_back(index);
2009 //Create file-list ('\0' separated) for SHFileOperation
2010 CString filelist;
2011 for(int i=0;i<selectIndex.size();i++)
2013 index=selectIndex[i];
2015 CTGitPath * path=(CTGitPath*)GetItemData(index);
2016 ASSERT(path);
2017 if(path == NULL)
2018 continue;
2020 filelist += path->GetWinPathString();
2021 filelist += _T("|");
2023 filelist += _T("|");
2024 int len = filelist.GetLength();
2025 std::unique_ptr<TCHAR[]> buf(new TCHAR[len + 2]);
2026 _tcscpy_s(buf.get(), len + 2, filelist);
2027 for (int i=0; i<len; ++i)
2028 if (buf.get()[i] == '|')
2029 buf.get()[i] = 0;
2030 SHFILEOPSTRUCT fileop;
2031 fileop.hwnd = this->m_hWnd;
2032 fileop.wFunc = FO_DELETE;
2033 fileop.pFrom = buf.get();
2034 fileop.pTo = NULL;
2035 fileop.fFlags = FOF_NO_CONNECTED_ELEMENTS | ((GetAsyncKeyState(VK_SHIFT) & 0x8000) ? 0 : FOF_ALLOWUNDO);
2036 fileop.lpszProgressTitle = _T("deleting file");
2037 int result = SHFileOperation(&fileop);
2039 if ( (result==0) && (!fileop.fAnyOperationsAborted) )
2041 SetRedraw(FALSE);
2042 POSITION pos = NULL;
2043 while ((pos = GetFirstSelectedItemPosition()) != 0)
2045 int index = GetNextSelectedItem(pos);
2046 if (GetCheck(index))
2047 m_nSelected--;
2048 m_nTotal--;
2050 RemoveListEntry(index);
2052 SetRedraw(TRUE);
2055 break;
2057 case IDGITLC_BLAME:
2059 CAppUtils::LaunchTortoiseBlame(g_Git.m_CurrentDir+_T("\\")+filepath->GetWinPath(), m_CurrentVersion);
2061 break;
2063 case IDGITLC_LOG:
2064 case IDGITLC_LOGSUBMODULE:
2066 CString sCmd;
2067 sCmd.Format(_T("/command:log /path:\"%s\""), g_Git.m_CurrentDir + _T("\\") + filepath->GetWinPath());
2068 if (cmd == IDGITLC_LOG && filepath->IsDirectory())
2069 sCmd += _T(" /submodule");
2070 CAppUtils::RunTortoiseGitProc(sCmd);
2072 break;
2074 case IDGITLC_LOGOLDNAME:
2076 CTGitPath oldName(filepath->GetGitOldPathString());
2077 CString sCmd;
2078 sCmd.Format(_T("/command:log /path:\"%s\""), g_Git.m_CurrentDir + _T("\\") + oldName.GetWinPath());
2079 CAppUtils::RunTortoiseGitProc(sCmd);
2081 break;
2084 case IDGITLC_EDITCONFLICT:
2086 if (CAppUtils::ConflictEdit(*filepath, false, this->m_bIsRevertTheirMy))
2088 CString conflictedFile = g_Git.m_CurrentDir + _T("\\") + filepath->GetWinPathString();
2089 if (!PathFileExists(conflictedFile) && NULL != GetLogicalParent() && NULL != GetLogicalParent()->GetSafeHwnd())
2090 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2092 break;
2094 case IDGITLC_RESOLVETHEIRS: //follow up
2095 case IDGITLC_RESOLVEMINE: //follow up
2096 case IDGITLC_RESOLVECONFLICT:
2098 if (CMessageBox::Show(m_hWnd, IDS_PROC_RESOLVE, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO)==IDYES)
2100 POSITION pos = GetFirstSelectedItemPosition();
2101 while (pos != 0)
2103 int index;
2104 index = GetNextSelectedItem(pos);
2105 CTGitPath * fentry =(CTGitPath*) this->GetItemData(index);
2106 if(fentry == NULL)
2107 continue;
2108 CString gitcmd,output;
2109 output.Empty();
2111 if ( ((!this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVETHEIRS) ||
2112 ((this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVEMINE) )
2114 gitcmd.Format(_T("git.exe checkout-index -f --stage=3 -- \"%s\""),fentry->GetGitPathString());
2115 if (g_Git.Run(gitcmd, &output,CP_UTF8))
2117 CMessageBox::Show(m_hWnd, output, _T("TortoiseGit"), MB_ICONERROR);
2118 continue;
2121 output.Empty();
2122 if ( ((!this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVEMINE) ||
2123 ((this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVETHEIRS) )
2125 gitcmd.Format(_T("git.exe checkout-index -f --stage=2 -- \"%s\""),fentry->GetGitPathString());
2126 if (g_Git.Run(gitcmd, &output,CP_UTF8))
2128 CMessageBox::Show(m_hWnd, output, _T("TortoiseGit"), MB_ICONERROR);
2129 continue;
2133 output.Empty();
2134 if ( fentry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
2136 gitcmd.Format(_T("git.exe add -f -- \"%s\""),fentry->GetGitPathString());
2137 if (g_Git.Run(gitcmd, &output,CP_UTF8))
2139 CMessageBox::Show(m_hWnd, output, _T("TortoiseGit"), MB_ICONERROR);
2141 else
2143 fentry->m_Action |= CTGitPath::LOGACTIONS_MODIFIED;
2144 fentry->m_Action &=~CTGitPath::LOGACTIONS_UNMERGED;
2148 CAppUtils::RemoveTempMergeFile(*fentry);
2151 Show(m_dwShow, 0, m_bShowFolders,0,true);
2154 break;
2156 case IDGITLC_IGNORE:
2158 CTGitPathList ignorelist;
2159 //std::vector<CString> toremove;
2160 FillListOfSelectedItemPaths(ignorelist, true);
2161 SetRedraw(FALSE);
2163 if(!CAppUtils::IgnoreFile(ignorelist,false))
2164 break;
2166 CWnd* pParent = GetLogicalParent();
2167 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2169 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2171 SetRedraw(TRUE);
2173 break;
2174 case IDGITLC_IGNOREMASK:
2176 CString common;
2177 CString ext=filepath->GetFileExtension();
2178 CTGitPathList ignorelist;
2179 FillListOfSelectedItemPaths(ignorelist, true);
2180 SetRedraw(FALSE);
2182 if (!CAppUtils::IgnoreFile(ignorelist,true))
2183 break;
2185 CWnd* pParent = GetLogicalParent();
2186 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2188 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2191 SetRedraw(TRUE);
2193 break;
2195 case IDGITLC_REVERT:
2197 // If at least one item is not in the status "added"
2198 // we ask for a confirmation
2199 BOOL bConfirm = FALSE;
2200 POSITION pos = GetFirstSelectedItemPosition();
2201 int index;
2202 while ((index = GetNextSelectedItem(pos)) >= 0)
2204 //FileEntry * fentry = GetListEntry(index);
2205 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
2206 if(fentry && fentry->m_Action &CTGitPath::LOGACTIONS_MODIFIED && !fentry->IsDirectory())
2208 bConfirm = TRUE;
2209 break;
2213 CString str;
2214 str.Format(IDS_PROC_WARNREVERT,GetSelectedCount());
2216 if (!bConfirm || CMessageBox::Show(this->m_hWnd, str, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION)==IDYES)
2218 CTGitPathList targetList;
2219 FillListOfSelectedItemPaths(targetList);
2221 // make sure that the list is reverse sorted, so that
2222 // children are removed before any parents
2223 targetList.SortByPathname(true);
2225 // put all reverted files in the trashbin, except the ones with 'added'
2226 // status because they are not restored by the revert.
2227 CTGitPathList delList;
2228 POSITION pos = GetFirstSelectedItemPosition();
2229 int index;
2230 while ((index = GetNextSelectedItem(pos)) >= 0)
2232 CTGitPath *entry=(CTGitPath *)GetItemData(index);
2233 if (entry&&(!(entry->m_Action& CTGitPath::LOGACTIONS_ADDED))
2234 && (!(entry->m_Action& CTGitPath::LOGACTIONS_REPLACED)) && !entry->IsDirectory())
2236 CTGitPath fullpath;
2237 fullpath.SetFromWin(g_Git.m_CurrentDir+_T("\\")+entry->GetWinPath());
2238 delList.AddPath(fullpath);
2241 if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))
2242 delList.DeleteAllFiles(true);
2244 CString revertToCommit = _T("HEAD");
2245 if (m_amend)
2246 revertToCommit = _T("HEAD~1");
2247 if (g_Git.Revert(revertToCommit, targetList))
2249 CMessageBox::Show(this->m_hWnd, _T("Revert Fail"), _T("TortoiseGit"), MB_ICONERROR);
2251 else
2253 bool updateStatusList = false;
2254 for(int i=0;i<targetList.GetCount();i++)
2256 int nListboxEntries = GetItemCount();
2257 for (int nItem=0; nItem<nListboxEntries; ++nItem)
2259 CTGitPath *path=(CTGitPath*)GetItemData(nItem);
2260 if (path->GetGitPathString()==targetList[i].GetGitPathString() && !path->IsDirectory())
2262 if(path->m_Action & CTGitPath::LOGACTIONS_ADDED)
2264 path->m_Action = CTGitPath::LOGACTIONS_UNVER;
2265 SetEntryCheck(path,nItem,false);
2266 updateStatusList = true;
2267 SetItemGroup(nItem,1);
2268 this->m_StatusFileList.RemoveItem(*path);
2269 this->m_UnRevFileList.AddPath(*path);
2270 //this->m_IgnoreFileList.RemoveItem(*path);
2273 else
2275 RemoveListEntry(nItem);
2277 break;
2279 else if (path->GetGitPathString()==targetList[i].GetGitPathString() && path->IsDirectory() && path->IsWCRoot())
2281 CString sCmd;
2282 sCmd.Format(_T("/command:revert /path:\"%s\""), path->GetGitPathString());
2283 CCommonAppUtils::RunTortoiseGitProc(sCmd);
2287 SetRedraw(TRUE);
2288 SaveColumnWidths();
2289 Show(m_dwShow, 0, m_bShowFolders,updateStatusList,true);
2290 NotifyCheck();
2294 break;
2296 case IDGITLC_ASSUMEVALID:
2298 CString cmdTemplate;
2299 cmdTemplate = _T("git.exe update-index --assume-unchanged \"%s\"");
2300 POSITION pos = GetFirstSelectedItemPosition();
2301 int index = -1;
2302 while ((index = GetNextSelectedItem(pos)) >= 0)
2304 CTGitPath * path = (CTGitPath *)GetItemData(index);
2305 ASSERT(path);
2306 if(path == NULL)
2307 continue;
2309 CString cmd, output;
2310 cmd.Format(cmdTemplate, path->GetGitPathString());
2311 if (g_Git.Run(cmd, &output, CP_UTF8))
2313 MessageBox(output, _T("TortoiseGit"), MB_ICONERROR);
2316 if (NULL != GetLogicalParent() && NULL != GetLogicalParent()->GetSafeHwnd())
2317 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2319 SetRedraw(TRUE);
2321 break;
2322 case IDGITLC_SKIPWORKTREE:
2324 CString cmdTemplate;
2325 cmdTemplate = _T("git.exe update-index --skip-worktree \"%s\"");
2326 POSITION pos = GetFirstSelectedItemPosition();
2327 int index = -1;
2328 while ((index = GetNextSelectedItem(pos)) >= 0)
2330 CTGitPath * path = (CTGitPath *)GetItemData(index);
2331 ASSERT(path);
2332 if(path == NULL)
2333 continue;
2335 CString cmd, output;
2336 cmd.Format(cmdTemplate, path->GetGitPathString());
2337 if (g_Git.Run(cmd, &output, CP_UTF8))
2339 MessageBox(output, _T("TortoiseGit"), MB_ICONERROR);
2342 if (NULL != GetLogicalParent() && NULL != GetLogicalParent()->GetSafeHwnd())
2343 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2345 SetRedraw(TRUE);
2347 break;
2348 case IDGITLC_COPY:
2349 CopySelectedEntriesToClipboard(0);
2350 break;
2351 case IDGITLC_COPYEXT:
2352 CopySelectedEntriesToClipboard((DWORD)-1);
2353 break;
2354 case IDGITLC_EXPORT:
2355 FilesExport();
2356 break;
2357 case IDGITLC_SAVEAS:
2358 FileSaveAs(filepath);
2359 break;
2361 case IDGITLC_REVERTTOREV:
2362 RevertSelectedItemToVersion();
2363 break;
2364 case IDGITLC_REVERTTOPARENT:
2365 RevertSelectedItemToVersion(true);
2366 break;
2367 #if 0
2368 case IDSVNLC_COMMIT:
2370 CTSVNPathList targetList;
2371 FillListOfSelectedItemPaths(targetList);
2372 CTSVNPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
2373 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
2374 CString commandline = CPathUtils::GetAppDirectory();
2375 commandline += _T("TortoiseGitProc.exe /command:commit /pathfile:\"");
2376 commandline += tempFile.GetWinPathString();
2377 commandline += _T("\"");
2378 commandline += _T(" /deletepathfile");
2379 CAppUtils::LaunchApplication(commandline, NULL, false);
2381 break;
2382 case IDSVNLC_CREATEIGNORECS:
2383 CreateChangeList(SVNSLC_IGNORECHANGELIST);
2384 break;
2385 case IDSVNLC_CREATECS:
2387 CCreateChangelistDlg dlg;
2388 if (dlg.DoModal() == IDOK)
2390 CreateChangeList(dlg.m_sName);
2393 break;
2394 default:
2396 if (cmd < IDSVNLC_MOVETOCS)
2397 break;
2398 CTSVNPathList changelistItems;
2399 FillListOfSelectedItemPaths(changelistItems);
2401 // find the changelist name
2402 CString sChangelist;
2403 int cmdID = IDSVNLC_MOVETOCS;
2404 SetRedraw(FALSE);
2405 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
2407 if ((it->first.Compare(SVNSLC_IGNORECHANGELIST))&&(entry->changelist.Compare(it->first)))
2409 if (cmd == cmdID)
2411 sChangelist = it->first;
2413 cmdID++;
2416 if (!sChangelist.IsEmpty())
2418 SVN git;
2419 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
2421 // The changelists were moved, but we now need to run through the selected items again
2422 // and update their changelist
2423 POSITION pos = GetFirstSelectedItemPosition();
2424 int index;
2425 while ((index = GetNextSelectedItem(pos)) >= 0)
2427 FileEntry * e = GetListEntry(index);
2428 e->changelist = sChangelist;
2429 if (!e->IsFolder())
2431 if (m_changelists.find(e->changelist)!=m_changelists.end())
2432 SetItemGroup(index, m_changelists[e->changelist]);
2433 else
2434 SetItemGroup(index, 0);
2438 else
2440 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
2443 SetRedraw(TRUE);
2445 break;
2446 #endif
2448 } // switch (cmd)
2449 m_bBlock = FALSE;
2450 AfxGetApp()->DoWaitCursor(-1);
2451 GetStatisticsString();
2452 //int iItemCountAfterMenuCmd = GetItemCount();
2453 //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)
2455 // CWnd* pParent = GetParent();
2456 // if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2457 // {
2458 // pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);
2459 // }
2461 } // if (popup.CreatePopupMenu())
2462 } // if (selIndex >= 0)
2466 void CGitStatusListCtrl::OnContextMenuHeader(CWnd * pWnd, CPoint point)
2468 Locker lock(m_critSec);
2469 m_ColumnManager.OnContextMenuHeader(pWnd,point,!!IsGroupViewEnabled());
2472 void CGitStatusListCtrl::OnContextMenu(CWnd* pWnd, CPoint point)
2475 if (pWnd == this)
2477 OnContextMenuList(pWnd, point);
2478 } // if (pWnd == this)
2479 else if (pWnd == GetHeaderCtrl())
2481 OnContextMenuHeader(pWnd, point);
2485 void CGitStatusListCtrl::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
2488 Locker lock(m_critSec);
2489 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
2490 *pResult = 0;
2491 if (m_bBlock)
2492 return;
2494 if (pNMLV->iItem < 0)
2496 if (!IsGroupViewEnabled())
2497 return;
2498 POINT pt;
2499 DWORD ptW = GetMessagePos();
2500 pt.x = GET_X_LPARAM(ptW);
2501 pt.y = GET_Y_LPARAM(ptW);
2502 ScreenToClient(&pt);
2503 int group = GetGroupFromPoint(&pt);
2504 if (group < 0)
2505 return;
2506 // check/uncheck the whole group depending on the check-state
2507 // of the first item in the group
2508 m_bBlock = true;
2509 bool bCheck = false;
2510 bool bFirst = false;
2511 LVITEM lv;
2512 for (int i=0; i<GetItemCount(); ++i)
2514 SecureZeroMemory(&lv, sizeof(LVITEM));
2515 lv.mask = LVIF_GROUPID;
2516 lv.iItem = i;
2517 GetItem(&lv);
2518 if (lv.iGroupId == group)
2520 CTGitPath *entry=(CTGitPath*)GetItemData(i);
2522 if (!bFirst)
2524 bCheck = !GetCheck(i);
2525 bFirst = true;
2527 if (entry)
2529 bool bOldCheck = !!GetCheck(i);
2530 SetEntryCheck(entry, i, bCheck);
2531 if (bCheck != bOldCheck)
2533 if (bCheck)
2534 m_nSelected++;
2535 else
2536 m_nSelected--;
2541 GetStatisticsString();
2542 m_bBlock = false;
2543 NotifyCheck();
2544 return;
2547 CTGitPath *file=(CTGitPath*)GetItemData(pNMLV->iItem);
2549 if (file->m_Action == CTGitPath::LOGACTIONS_UNVER) {
2550 OpenFile(file, OPEN);
2551 return;
2553 if( file->m_Action&CTGitPath::LOGACTIONS_UNMERGED )
2555 if (CAppUtils::ConflictEdit(*file, false, m_bIsRevertTheirMy))
2557 CString conflictedFile = g_Git.m_CurrentDir + _T("\\") + file->GetWinPathString();
2558 if (!PathFileExists(conflictedFile) && NULL != GetLogicalParent() && NULL != GetLogicalParent()->GetSafeHwnd())
2559 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2562 else
2564 if( (!m_Rev1.IsEmpty()) || (!m_Rev1.IsEmpty())) // m_Rev1 twice???
2565 StartDiffTwo(pNMLV->iItem);
2566 else
2567 StartDiff(pNMLV->iItem);
2571 void CGitStatusListCtrl::StartDiffTwo(int fileindex)
2573 if(fileindex<0)
2574 return;
2576 CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);
2578 CGitDiff::Diff(&file1,&file1,
2579 m_Rev1,
2580 m_Rev2);
2583 void CGitStatusListCtrl::StartDiffWC(int fileindex)
2585 if(fileindex<0)
2586 return;
2588 CString Ver;
2589 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
2590 return;
2592 CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);
2594 CGitDiff::Diff(&file1,&file1, GIT_REV_ZERO, m_CurrentVersion);
2598 void CGitStatusListCtrl::StartDiff(int fileindex)
2600 if(fileindex<0)
2601 return;
2603 CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);
2604 CTGitPath file2;
2605 if(file1.m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY))
2607 file2.SetFromGit(file1.GetGitOldPathString());
2609 else
2611 file2=file1;
2614 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
2616 CString fromwhere;
2617 if(m_amend && (file1.m_Action & CTGitPath::LOGACTIONS_ADDED) == 0)
2618 fromwhere = _T("~1");
2619 if( g_Git.IsInitRepos())
2620 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2621 GIT_REV_ZERO);
2622 else if( file1.m_Action&CTGitPath::LOGACTIONS_ADDED )
2623 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2624 m_CurrentVersion+fromwhere,true);
2625 else if( file1.m_Action&CTGitPath::LOGACTIONS_DELETED )
2626 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2627 GitRev::GetHead()+fromwhere,false);
2628 else
2629 CGitDiff::Diff(&file1,&file2,
2630 CString(GIT_REV_ZERO),
2631 GitRev::GetHead()+fromwhere);
2633 else
2635 GitRev rev;
2636 CString fromwhere = m_CurrentVersion+_T("~1");
2637 if(m_amend)
2638 fromwhere = m_CurrentVersion+_T("~2");
2639 if (rev.GetCommit(fromwhere) || (file1.m_Action & file1.LOGACTIONS_ADDED))
2641 CGitDiff::DiffNull(&file1,m_CurrentVersion,true);
2644 else if (file1.m_Action & file1.LOGACTIONS_DELETED)
2646 if (file1.m_ParentNo > 0)
2647 fromwhere.Format(_T("%s^%d"), m_CurrentVersion, file1.m_ParentNo + 1);
2649 CGitDiff::DiffNull(&file1,fromwhere,false);
2651 else
2653 if( file1.m_ParentNo & MERGE_MASK)
2656 CTGitPath base, theirs, mine, merge;
2658 CString temppath;
2659 GetTempPath(temppath);
2660 temppath.TrimRight(_T("\\"));
2662 mine.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".LOCAL") + file1.GetFileExtension());
2663 theirs.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".REMOTE") + file1.GetFileExtension());
2664 base.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".BASE") + file1.GetFileExtension());
2666 CFile tempfile;
2667 //create a empty file, incase stage is not three
2668 tempfile.Open(mine.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2669 tempfile.Close();
2670 tempfile.Open(theirs.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2671 tempfile.Close();
2672 tempfile.Open(base.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2673 tempfile.Close();
2675 merge.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".Merged") + file1.GetFileExtension());
2677 int parent1=-1, parent2 =-1;
2678 for(int i=0;i<this->m_arStatusArray.size();i++)
2680 if(m_arStatusArray[i]->GetGitPathString() == file1.GetGitPathString())
2682 if(m_arStatusArray[i]->m_ParentNo & MERGE_MASK)
2685 else
2687 if(parent1<0)
2689 parent1 = m_arStatusArray[i]->m_ParentNo & PARENT_MASK;
2691 else if (parent2 <0)
2693 parent2 = m_arStatusArray[i]->m_ParentNo & PARENT_MASK;
2699 if(g_Git.GetOneFile(m_CurrentVersion, file1, (CString&)merge.GetWinPathString()))
2701 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2704 if(parent1>=0)
2706 CString str;
2707 str.Format(_T("%s^%d"),this->m_CurrentVersion, parent1+1);
2709 if(g_Git.GetOneFile(str, file1, (CString&)mine.GetWinPathString()))
2711 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2715 if(parent2>=0)
2717 CString str;
2718 str.Format(_T("%s^%d"),this->m_CurrentVersion, parent2+1);
2720 if(g_Git.GetOneFile(str, file1, (CString&)theirs.GetWinPathString()))
2722 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2726 if(parent1>=0 && parent2>=0)
2728 CString cmd, output;
2729 cmd.Format(_T("git.exe merge-base %s^%d %s^%d"), this->m_CurrentVersion, parent1+1,
2730 this->m_CurrentVersion,parent2+1);
2732 if (g_Git.Run(cmd, &output, NULL, CP_UTF8))
2735 else
2737 if(g_Git.GetOneFile(output.Left(40), file1, (CString&)base.GetWinPathString()))
2739 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETBASEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2743 CAppUtils::StartExtMerge(base, theirs, mine, merge,_T("BASE"),_T("REMOTE"),_T("LOCAL"));
2746 else
2748 CString str;
2749 if( (file1.m_ParentNo&PARENT_MASK) == 0)
2751 str = _T("~1");
2753 else
2755 str.Format(_T("^%d"), (file1.m_ParentNo&PARENT_MASK)+1);
2757 CGitDiff::Diff(&file1,&file2,
2758 m_CurrentVersion,
2759 m_CurrentVersion+str);
2765 CString CGitStatusListCtrl::GetStatisticsString(bool simple)
2768 CString sNormal, sAdded, sDeleted, sModified, sConflicted, sUnversioned, sRenamed;
2769 WORD langID = (WORD)(DWORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
2770 TCHAR buf[MAX_STATUS_STRING_LENGTH];
2771 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_normal, buf, _countof(buf), langID);
2772 sNormal = buf;
2773 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_added, buf, _countof(buf), langID);
2774 sAdded = buf;
2775 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_deleted, buf, _countof(buf), langID);
2776 sDeleted = buf;
2777 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_modified, buf, _countof(buf), langID);
2778 sModified = buf;
2779 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_conflicted, buf, _countof(buf), langID);
2780 sConflicted = buf;
2781 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_unversioned, buf, _countof(buf), langID);
2782 sUnversioned = buf;
2783 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_replaced, buf, _countof(buf), langID);
2784 sRenamed = buf;
2785 CString sToolTip;
2786 if(simple)
2788 sToolTip.Format(IDS_STATUSLIST_STATUSLINE1,
2789 this->m_nLineAdded,this->m_nLineDeleted,
2790 (LPCTSTR)sModified, m_nModified,
2791 (LPCTSTR)sAdded, m_nAdded,
2792 (LPCTSTR)sDeleted, m_nDeleted,
2793 (LPCTSTR)sRenamed, m_nRenamed
2796 else
2798 sToolTip.Format(IDS_STATUSLIST_STATUSLINE2,
2799 this->m_nLineAdded,this->m_nLineDeleted,
2800 (LPCTSTR)sNormal, m_nNormal,
2801 (LPCTSTR)sUnversioned, m_nUnversioned,
2802 (LPCTSTR)sModified, m_nModified,
2803 (LPCTSTR)sAdded, m_nAdded,
2804 (LPCTSTR)sDeleted, m_nDeleted,
2805 (LPCTSTR)sConflicted, m_nConflicted
2808 CString sStats;
2809 sStats.Format(IDS_COMMITDLG_STATISTICSFORMAT, m_nSelected, GetItemCount());
2810 if (m_pStatLabel)
2812 m_pStatLabel->SetWindowText(sStats);
2815 if (m_pSelectButton)
2817 if (m_nSelected == 0)
2818 m_pSelectButton->SetCheck(BST_UNCHECKED);
2819 else if (m_nSelected != GetItemCount())
2820 m_pSelectButton->SetCheck(BST_INDETERMINATE);
2821 else
2822 m_pSelectButton->SetCheck(BST_CHECKED);
2825 if (m_pConfirmButton)
2827 m_pConfirmButton->EnableWindow(m_nSelected>0);
2830 return sToolTip;
2835 CString CGitStatusListCtrl::GetCommonDirectory(bool bStrict)
2837 if (!bStrict)
2839 // not strict means that the selected folder has priority
2840 if (!m_StatusFileList.GetCommonDirectory().IsEmpty())
2841 return m_StatusFileList.GetCommonDirectory().GetWinPath();
2844 CTGitPath commonBaseDirectory;
2845 int nListItems = GetItemCount();
2846 for (int i=0; i<nListItems; ++i)
2848 CTGitPath baseDirectory,*p= (CTGitPath*)this->GetItemData(i);
2849 ASSERT(p);
2850 if(p==NULL)
2851 continue;
2852 baseDirectory = p->GetDirectory();
2854 if(commonBaseDirectory.IsEmpty())
2856 commonBaseDirectory = baseDirectory;
2858 else
2860 if (commonBaseDirectory.GetWinPathString().GetLength() > baseDirectory.GetWinPathString().GetLength())
2862 if (baseDirectory.IsAncestorOf(commonBaseDirectory))
2863 commonBaseDirectory = baseDirectory;
2867 return g_Git.m_CurrentDir+CString(_T("\\"))+commonBaseDirectory.GetWinPath();
2871 void CGitStatusListCtrl::SelectAll(bool bSelect, bool /*bIncludeNoCommits*/)
2873 CWaitCursor waitCursor;
2874 // block here so the LVN_ITEMCHANGED messages
2875 // get ignored
2876 m_bBlock = TRUE;
2877 SetRedraw(FALSE);
2879 int nListItems = GetItemCount();
2880 if (bSelect)
2881 m_nSelected = nListItems;
2882 else
2883 m_nSelected = 0;
2885 for (int i=0; i<nListItems; ++i)
2887 //FileEntry * entry = GetListEntry(i);
2888 //ASSERT(entry != NULL);
2889 CTGitPath *path = (CTGitPath *) GetItemData(i);
2890 if (path == NULL)
2891 continue;
2892 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))
2893 SetEntryCheck(path,i,bSelect);
2896 // unblock before redrawing
2897 m_bBlock = FALSE;
2898 SetRedraw(TRUE);
2899 GetStatisticsString();
2900 NotifyCheck();
2903 void CGitStatusListCtrl::Check(DWORD dwCheck, bool check)
2905 CWaitCursor waitCursor;
2906 // block here so the LVN_ITEMCHANGED messages
2907 // get ignored
2908 m_bBlock = TRUE;
2909 SetRedraw(FALSE);
2911 int nListItems = GetItemCount();
2913 for (int i = 0; i < nListItems; ++i)
2915 CTGitPath *entry = (CTGitPath *) GetItemData(i);
2916 if (entry == NULL)
2917 continue;
2919 DWORD showFlags = entry->m_Action;
2920 if (entry->IsDirectory())
2921 showFlags |= GITSLC_SHOWSUBMODULES;
2922 else
2923 showFlags |= GITSLC_SHOWFILES;
2925 if (check && (showFlags & dwCheck) && !GetCheck(i) && !(entry->IsDirectory() && m_bDoNotAutoselectSubmodules && !(dwCheck & GITSLC_SHOWSUBMODULES)))
2927 SetEntryCheck(entry, i, true);
2928 m_nSelected++;
2930 else if (!check && (showFlags & dwCheck) && GetCheck(i))
2932 SetEntryCheck(entry, i, false);
2933 m_nSelected--;
2936 // unblock before redrawing
2937 m_bBlock = FALSE;
2938 SetRedraw(TRUE);
2939 GetStatisticsString();
2940 NotifyCheck();
2943 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR *pNMHDR, LRESULT *pResult)
2945 LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast<LPNMLVGETINFOTIP>(pNMHDR);
2946 *pResult = 0;
2947 if (m_bBlock)
2948 return;
2950 CTGitPath *entry=(CTGitPath *)GetItemData(pGetInfoTip->iItem);
2952 if (entry)
2953 if (pGetInfoTip->cchTextMax > entry->GetGitPathString().GetLength() + g_Git.m_CurrentDir.GetLength())
2955 CString str;
2956 str += g_Git.m_CurrentDir;
2957 str += _T("\\");
2958 str += entry->GetWinPathString();
2960 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, str.GetBuffer(), str.GetLength());
2964 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult)
2966 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
2968 // Take the default processing unless we set this to something else below.
2969 *pResult = CDRF_DODEFAULT;
2971 // First thing - check the draw stage. If it's the control's prepaint
2972 // stage, then tell Windows we want messages for every item.
2974 switch (pLVCD->nmcd.dwDrawStage)
2976 case CDDS_PREPAINT:
2977 *pResult = CDRF_NOTIFYITEMDRAW;
2978 break;
2979 case CDDS_ITEMPREPAINT:
2981 // This is the prepaint stage for an item. Here's where we set the
2982 // item's text color. Our return value will tell Windows to draw the
2983 // item itself, but it will use the new color we set here.
2985 // Tell Windows to paint the control itself.
2986 *pResult = CDRF_DODEFAULT;
2987 if (m_bBlock)
2988 return;
2990 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
2992 if (m_arStatusArray.size() > (DWORD_PTR)pLVCD->nmcd.dwItemSpec)
2995 //FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);
2996 CTGitPath *entry=(CTGitPath *)GetItemData((int)pLVCD->nmcd.dwItemSpec);
2997 if (entry == NULL)
2998 return;
3000 // coloring
3001 // ========
3002 // black : unversioned, normal
3003 // purple : added
3004 // blue : modified
3005 // brown : missing, deleted, replaced
3006 // green : merged (or potential merges)
3007 // red : conflicts or sure conflicts
3008 if(entry->m_Action & CTGitPath::LOGACTIONS_GRAY)
3010 crText = RGB(128,128,128);
3013 else if(entry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
3015 crText = m_Colors.GetColor(CColors::Conflict);
3018 else if(entry->m_Action & (CTGitPath::LOGACTIONS_MODIFIED))
3020 crText = m_Colors.GetColor(CColors::Modified);
3023 else if(entry->m_Action & (CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))
3025 crText = m_Colors.GetColor(CColors::Added);
3027 else if(entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
3029 crText = m_Colors.GetColor(CColors::DeletedNode);
3031 else if(entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
3033 crText = m_Colors.GetColor(CColors::RenamedNode);
3035 else if(entry->m_Action & CTGitPath::LOGACTIONS_MERGED)
3037 crText = m_Colors.GetColor(CColors::Merged);
3039 else
3041 crText = GetSysColor(COLOR_WINDOWTEXT);
3043 // Store the color back in the NMLVCUSTOMDRAW struct.
3044 pLVCD->clrText = crText;
3047 break;
3051 BOOL CGitStatusListCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
3053 if (pWnd != this)
3054 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
3055 if (!m_bBlock)
3057 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
3058 SetCursor(hCur);
3059 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
3061 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
3062 SetCursor(hCur);
3063 return TRUE;
3066 void CGitStatusListCtrl::RemoveListEntry(int index)
3069 Locker lock(m_critSec);
3070 DeleteItem(index);
3072 m_arStatusArray.erase(m_arStatusArray.begin()+index);
3074 #if 0
3075 delete m_arStatusArray[m_arListArray[index]];
3076 m_arStatusArray.erase(m_arStatusArray.begin()+m_arListArray[index]);
3077 m_arListArray.erase(m_arListArray.begin()+index);
3078 for (int i=index; i< (int)m_arListArray.size(); ++i)
3080 m_arListArray[i]--;
3082 #endif
3085 ///< Set a checkbox on an entry in the listbox
3086 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync
3087 void CGitStatusListCtrl::SetEntryCheck(CTGitPath* pEntry, int listboxIndex, bool bCheck)
3089 pEntry->m_Checked = bCheck;
3090 m_mapFilenameToChecked[pEntry->GetGitPathString()] = bCheck;
3091 SetCheck(listboxIndex, bCheck);
3094 #if 0
3095 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry* parentEntry, bool bCheck)
3098 int nListItems = GetItemCount();
3099 for (int j=0; j< nListItems ; ++j)
3101 FileEntry * childEntry = GetListEntry(j);
3102 ASSERT(childEntry != NULL);
3103 if (childEntry == NULL || childEntry == parentEntry)
3104 continue;
3105 if (childEntry->checked != bCheck)
3107 if (parentEntry->path.IsAncestorOf(childEntry->path))
3109 SetEntryCheck(childEntry,j,bCheck);
3110 if(bCheck)
3112 m_nSelected++;
3114 else
3116 m_nSelected--;
3123 #endif
3125 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList& pathList)
3128 pathList.Clear();
3129 int nListItems = GetItemCount();
3130 for (int i=0; i< nListItems; i++)
3132 CTGitPath * entry = (CTGitPath*)GetItemData(i);
3133 ASSERT(entry != NULL);
3134 if (entry->m_Checked)
3136 pathList.AddPath(*entry);
3139 pathList.SortByPathname();
3144 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)
3145 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList& pathList, bool /*bNoIgnored*/)
3147 pathList.Clear();
3149 POSITION pos = GetFirstSelectedItemPosition();
3150 int index;
3151 while ((index = GetNextSelectedItem(pos)) >= 0)
3153 CTGitPath * entry = (CTGitPath*)GetItemData(index);
3154 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))
3155 // continue;
3156 pathList.AddPath(*entry);
3160 UINT CGitStatusListCtrl::OnGetDlgCode()
3162 // we want to process the return key and not have that one
3163 // routed to the default pushbutton
3164 return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS;
3167 void CGitStatusListCtrl::OnNMReturn(NMHDR * /*pNMHDR*/, LRESULT *pResult)
3169 *pResult = 0;
3170 if (m_bBlock)
3171 return;
3172 POSITION pos = GetFirstSelectedItemPosition();
3173 while ( pos )
3175 int index = GetNextSelectedItem(pos);
3176 CTGitPath *file=(CTGitPath*)GetItemData(index);
3177 if (file->m_Action == CTGitPath::LOGACTIONS_UNVER)
3179 OpenFile(file, OPEN);
3181 else
3183 if( (!m_Rev1.IsEmpty()) || (!m_Rev1.IsEmpty())) // m_Rev1 twice???
3184 StartDiffTwo(index);
3185 else
3186 StartDiff(index);
3191 void CGitStatusListCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
3193 // Since we catch all keystrokes (to have the enter key processed here instead
3194 // of routed to the default pushbutton) we have to make sure that other
3195 // keys like Tab and Esc still do what they're supposed to do
3196 // Tab = change focus to next/previous control
3197 // Esc = quit the dialog
3198 switch (nChar)
3200 case (VK_TAB):
3202 ::PostMessage(GetLogicalParent()->GetSafeHwnd(), WM_NEXTDLGCTL, GetKeyState(VK_SHIFT)&0x8000, 0);
3203 return;
3205 break;
3206 case (VK_ESCAPE):
3208 ::SendMessage(GetLogicalParent()->GetSafeHwnd(), WM_CLOSE, 0, 0);
3210 break;
3213 CListCtrl::OnKeyDown(nChar, nRepCnt, nFlags);
3216 void CGitStatusListCtrl::PreSubclassWindow()
3218 CListCtrl::PreSubclassWindow();
3219 EnableToolTips(TRUE);
3220 SetWindowTheme(GetSafeHwnd(), L"Explorer", NULL);
3223 INT_PTR CGitStatusListCtrl::OnToolHitTest(CPoint point, TOOLINFO* pTI) const
3225 int row, col;
3226 RECT cellrect;
3227 row = CellRectFromPoint(point, &cellrect, &col );
3229 if (row == -1)
3230 return -1;
3233 pTI->hwnd = m_hWnd;
3234 pTI->uId = (UINT)((row<<10)+(col&0x3ff)+1);
3235 pTI->lpszText = LPSTR_TEXTCALLBACK;
3237 pTI->rect = cellrect;
3239 return pTI->uId;
3242 int CGitStatusListCtrl::CellRectFromPoint(CPoint& point, RECT *cellrect, int *col) const
3244 int colnum;
3246 // Make sure that the ListView is in LVS_REPORT
3247 if ((GetWindowLong(m_hWnd, GWL_STYLE) & LVS_TYPEMASK) != LVS_REPORT)
3248 return -1;
3250 // Get the top and bottom row visible
3251 int row = GetTopIndex();
3252 int bottom = row + GetCountPerPage();
3253 if (bottom > GetItemCount())
3254 bottom = GetItemCount();
3256 // Get the number of columns
3257 CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
3258 int nColumnCount = pHeader->GetItemCount();
3260 // Loop through the visible rows
3261 for ( ;row <=bottom;row++)
3263 // Get bounding rect of item and check whether point falls in it.
3264 CRect rect;
3265 GetItemRect(row, &rect, LVIR_BOUNDS);
3266 if (rect.PtInRect(point))
3268 // Now find the column
3269 for (colnum = 0; colnum < nColumnCount; colnum++)
3271 int colwidth = GetColumnWidth(colnum);
3272 if (point.x >= rect.left && point.x <= (rect.left + colwidth))
3274 RECT rectClient;
3275 GetClientRect(&rectClient);
3276 if (col)
3277 *col = colnum;
3278 rect.right = rect.left + colwidth;
3280 // Make sure that the right extent does not exceed
3281 // the client area
3282 if (rect.right > rectClient.right)
3283 rect.right = rectClient.right;
3284 *cellrect = rect;
3285 return row;
3287 rect.left += colwidth;
3291 return -1;
3294 void CGitStatusListCtrl::OnPaint()
3296 Default();
3297 if ((m_bBusy)||(m_bEmpty))
3299 CString str;
3300 if (m_bBusy)
3302 if (m_sBusy.IsEmpty())
3303 str.LoadString(IDS_STATUSLIST_BUSYMSG);
3304 else
3305 str = m_sBusy;
3307 else
3309 if (m_sEmpty.IsEmpty())
3310 str.LoadString(IDS_STATUSLIST_EMPTYMSG);
3311 else
3312 str = m_sEmpty;
3314 COLORREF clrText = ::GetSysColor(COLOR_WINDOWTEXT);
3315 COLORREF clrTextBk;
3316 if (IsWindowEnabled())
3317 clrTextBk = ::GetSysColor(COLOR_WINDOW);
3318 else
3319 clrTextBk = ::GetSysColor(COLOR_3DFACE);
3321 CRect rc;
3322 GetClientRect(&rc);
3323 CHeaderCtrl* pHC;
3324 pHC = GetHeaderCtrl();
3325 if (pHC != NULL)
3327 CRect rcH;
3328 pHC->GetItemRect(0, &rcH);
3329 rc.top += rcH.bottom;
3331 CDC* pDC = GetDC();
3333 CMyMemDC memDC(pDC, &rc);
3335 memDC.SetTextColor(clrText);
3336 memDC.SetBkColor(clrTextBk);
3337 memDC.FillSolidRect(rc, clrTextBk);
3338 rc.top += 10;
3339 CGdiObject * oldfont = memDC.SelectStockObject(DEFAULT_GUI_FONT);
3340 memDC.DrawText(str, rc, DT_CENTER | DT_VCENTER |
3341 DT_WORDBREAK | DT_NOPREFIX | DT_NOCLIP);
3342 memDC.SelectObject(oldfont);
3344 ReleaseDC(pDC);
3346 ValidateRect(NULL);
3349 // prevent users from extending our hidden (size 0) columns
3350 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR *pNMHDR, LRESULT *pResult)
3352 m_ColumnManager.OnHdnBegintrack(pNMHDR, pResult);
3355 // prevent any function from extending our hidden (size 0) columns
3356 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
3358 if(!m_ColumnManager.OnHdnItemchanging(pNMHDR, pResult))
3359 Default();
3362 void CGitStatusListCtrl::OnDestroy()
3364 SaveColumnWidths(true);
3365 CListCtrl::OnDestroy();
3368 void CGitStatusListCtrl::OnBeginDrag(NMHDR* /*pNMHDR*/, LRESULT* pResult)
3370 #if 0
3371 Locker lock(m_critSec);
3372 CDropFiles dropFiles; // class for creating DROPFILES struct
3374 int index;
3375 POSITION pos = GetFirstSelectedItemPosition();
3376 while ( (index = GetNextSelectedItem(pos)) >= 0 )
3378 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
3379 CTGitPath path = fentry->GetPath();
3380 dropFiles.AddFile( path.GetWinPathString() );
3383 if ( dropFiles.GetCount()>0 )
3385 m_bOwnDrag = true;
3386 dropFiles.CreateStructure();
3387 m_bOwnDrag = false;
3389 #endif
3390 *pResult = 0;
3393 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry /* = false */)
3395 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
3396 for (int col = 0; col <= maxcol; col++)
3397 if (m_ColumnManager.IsVisible (col))
3398 m_ColumnManager.ColumnResized (col);
3400 if (bSaveToRegistry)
3401 m_ColumnManager.WriteSettings();
3404 bool CGitStatusListCtrl::EnableFileDrop()
3406 m_bFileDropsEnabled = true;
3407 return true;
3410 bool CGitStatusListCtrl::HasPath(const CTGitPath& path)
3412 for (size_t i=0; i < m_arStatusArray.size(); i++)
3414 if (m_arStatusArray[i]->IsEquivalentTo(path))
3415 return true;
3418 return false;
3421 BOOL CGitStatusListCtrl::PreTranslateMessage(MSG* pMsg)
3423 if (pMsg->message == WM_KEYDOWN)
3425 switch (pMsg->wParam)
3427 case 'A':
3429 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
3431 // select all entries
3432 for (int i=0; i<GetItemCount(); ++i)
3434 SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
3436 return TRUE;
3439 break;
3440 case 'C':
3441 case VK_INSERT:
3443 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
3445 // copy all selected paths to the clipboard
3446 if (GetAsyncKeyState(VK_SHIFT)&0x8000)
3447 CopySelectedEntriesToClipboard(GITSLC_COLSTATUS);
3448 else
3449 CopySelectedEntriesToClipboard(0);
3450 return TRUE;
3453 break;
3457 return CListCtrl::PreTranslateMessage(pMsg);
3460 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols)
3463 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
3464 // WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
3466 CString sClipboard;
3467 CString temp;
3468 //TCHAR buf[100];
3469 if (GetSelectedCount() == 0)
3470 return false;
3472 // first add the column titles as the first line
3473 // We needn't head when only path copy
3474 //temp.LoadString(IDS_STATUSLIST_COLFILE);
3475 //sClipboard = temp;
3477 DWORD selection = 0;
3478 for (int i = 0, count = m_ColumnManager.GetColumnCount(); i < count; ++i)
3479 if ( ((dwCols == -1) && m_ColumnManager.IsVisible (i))
3480 || ((dwCols != 1) && (i < 32) && ((dwCols & (1 << i)) != 0)))
3482 sClipboard += _T("\t") + m_ColumnManager.GetName(i);
3484 if (i < 32)
3485 selection += 1 << i;
3488 if(dwCols)
3489 sClipboard += _T("\r\n");
3491 POSITION pos = GetFirstSelectedItemPosition();
3492 int index;
3493 while ((index = GetNextSelectedItem(pos)) >= 0)
3495 CTGitPath * entry = (CTGitPath*)GetItemData(index);
3496 if(entry == NULL)
3497 continue;
3499 sClipboard += entry->GetWinPathString();
3500 if (selection & GITSLC_COLFILENAME)
3502 sClipboard += _T("\t")+entry->GetFileOrDirectoryName();
3504 if (selection & GITSLC_COLEXT)
3506 sClipboard += _T("\t")+entry->GetFileExtension();
3509 if (selection & GITSLC_COLSTATUS)
3511 sClipboard += _T("\t")+entry->GetActionName();
3513 #if 0
3514 if (selection & SVNSLC_COLDATE)
3516 TCHAR datebuf[SVN_DATE_BUFFER];
3517 apr_time_t date = entry->last_commit_date;
3518 SVN::formatDate(datebuf, date, true);
3519 if (date)
3520 temp = datebuf;
3521 else
3522 temp.Empty();
3523 sClipboard += _T("\t")+temp;
3525 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
3526 ; i < count
3527 ; ++i)
3529 if ((dwCols == -1) && m_ColumnManager.IsVisible (i))
3531 CString value
3532 = entry->present_props[m_ColumnManager.GetName(i)];
3533 sClipboard += _T("\t") + value;
3536 #endif
3537 if (selection & GITSLC_COLADD)
3539 sClipboard += _T("\t")+entry->m_StatAdd;
3541 if (selection & GITSLC_COLDEL)
3543 sClipboard += _T("\t")+entry->m_StatDel;
3546 sClipboard += _T("\r\n");
3549 return CStringUtils::WriteAsciiStringToClipboard(sClipboard);
3552 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()
3554 #if 0
3555 std::set<CString> changelists;
3556 POSITION pos = GetFirstSelectedItemPosition();
3557 int index;
3558 while ((index = GetNextSelectedItem(pos)) >= 0)
3560 FileEntry * entry = GetListEntry(index);
3561 if (!entry->changelist.IsEmpty())
3562 changelists.insert(entry->changelist);
3564 return changelists.size();
3565 #endif
3566 return 0;
3569 bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
3572 bool bHasGroups=false;
3573 int max =0;
3575 for(int i=0;i< this->m_arStatusArray.size(); i++)
3577 int ParentNo = m_arStatusArray[i]->m_ParentNo&PARENT_MASK;
3578 if( ParentNo > max)
3579 max=m_arStatusArray[i]->m_ParentNo&PARENT_MASK;
3582 if ( this->m_UnRevFileList.GetCount()>0 ||
3583 this->m_IgnoreFileList.GetCount()>0 ||
3584 max>0 || bForce)
3586 bHasGroups = true;
3589 RemoveAllGroups();
3590 EnableGroupView(bHasGroups);
3592 TCHAR groupname[1024];
3593 int groupindex = 0;
3595 if(bHasGroups)
3597 LVGROUP grp = {0};
3598 grp.cbSize = sizeof(LVGROUP);
3599 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3600 groupindex=0;
3602 //if(m_UnRevFileList.GetCount()>0)
3603 if(max >0)
3605 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MERGEDFILES)), 1023);
3606 grp.pszHeader = groupname;
3607 grp.iGroupId = MERGE_MASK;
3608 grp.uAlign = LVGA_HEADER_LEFT;
3609 InsertGroup(0, &grp);
3611 for(int i=0;i<=max;i++)
3613 CString str;
3614 str.Format(IDS_STATUSLIST_GROUP_DIFFWITHPARENT, i+1);
3615 grp.pszHeader = str.GetBuffer();
3616 str.ReleaseBuffer();
3617 grp.iGroupId = i;
3618 grp.uAlign = LVGA_HEADER_LEFT;
3619 InsertGroup(i+1, &grp);
3622 else
3624 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MODIFIEDFILES)), 1023);
3625 grp.pszHeader = groupname;
3626 grp.iGroupId = groupindex;
3627 grp.uAlign = LVGA_HEADER_LEFT;
3628 InsertGroup(groupindex++, &grp);
3632 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_NOTVERSIONEDFILES)), 1023);
3633 grp.pszHeader = groupname;
3634 grp.iGroupId = groupindex;
3635 grp.uAlign = LVGA_HEADER_LEFT;
3636 InsertGroup(groupindex++, &grp);
3639 //if(m_IgnoreFileList.GetCount()>0)
3641 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_IGNOREDFILES)), 1023);
3642 grp.pszHeader = groupname;
3643 grp.iGroupId = groupindex;
3644 grp.uAlign = LVGA_HEADER_LEFT;
3645 InsertGroup(groupindex++, &grp);
3650 #if 0
3651 m_bHasIgnoreGroup = false;
3653 // now add the items which don't belong to a group
3654 LVGROUP grp = {0};
3655 grp.cbSize = sizeof(LVGROUP);
3656 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3657 CString sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET));
3658 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
3659 grp.pszHeader = groupname;
3660 grp.iGroupId = groupindex;
3661 grp.uAlign = LVGA_HEADER_LEFT;
3662 InsertGroup(groupindex++, &grp);
3664 for (std::map<CString,int>::iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
3666 if (it->first.Compare(SVNSLC_IGNORECHANGELIST)!=0)
3668 LVGROUP grp = {0};
3669 grp.cbSize = sizeof(LVGROUP);
3670 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3671 _tcsncpy_s(groupname, 1024, it->first, 1023);
3672 grp.pszHeader = groupname;
3673 grp.iGroupId = groupindex;
3674 grp.uAlign = LVGA_HEADER_LEFT;
3675 it->second = InsertGroup(groupindex++, &grp);
3677 else
3678 m_bHasIgnoreGroup = true;
3681 if (m_bHasIgnoreGroup)
3683 // and now add the group 'ignore-on-commit'
3684 std::map<CString,int>::iterator it = m_changelists.find(SVNSLC_IGNORECHANGELIST);
3685 if (it != m_changelists.end())
3687 grp.cbSize = sizeof(LVGROUP);
3688 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3689 _tcsncpy_s(groupname, 1024, SVNSLC_IGNORECHANGELIST, 1023);
3690 grp.pszHeader = groupname;
3691 grp.iGroupId = groupindex;
3692 grp.uAlign = LVGA_HEADER_LEFT;
3693 it->second = InsertGroup(groupindex, &grp);
3696 #endif
3697 return bHasGroups;
3700 void CGitStatusListCtrl::NotifyCheck()
3702 CWnd* pParent = GetLogicalParent();
3703 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
3705 pParent->SendMessage(GITSLNM_CHECKCHANGED, m_nSelected);
3709 int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash,CTGitPathList *list)
3711 BYTE_VECTOR out;
3712 this->m_bBusy=TRUE;
3713 m_CurrentVersion=hash;
3715 int count = 0;
3716 if(list == NULL)
3717 count = 1;
3718 else
3719 count = list->GetCount();
3721 CString head = _T("HEAD");
3722 if(m_amend)
3723 head = _T("HEAD~1");
3725 if(hash == GIT_REV_ZERO)
3727 for(int i=0;i<count;i++)
3729 BYTE_VECTOR cmdout;
3730 cmdout.clear();
3731 CString cmd;
3732 if(!g_Git.IsInitRepos())
3734 // also list staged files which will be in the commit
3735 cmd=(_T("git.exe diff-index --cached --raw ") + head + _T(" --numstat -C -M -z"));
3736 g_Git.Run(cmd, &cmdout);
3738 if(list == NULL)
3739 cmd=(_T("git.exe diff-index --raw ") + head + _T(" --numstat -C -M -z"));
3740 else
3741 cmd.Format(_T("git.exe diff-index --raw ") + head + _T(" --numstat -C -M -z -- \"%s\""),(*list)[i].GetGitPathString());
3743 BYTE_VECTOR cmdErr;
3744 if(g_Git.Run(cmd, &cmdout, &cmdErr))
3746 int last = cmdErr.RevertFind(0,-1);
3747 CString str;
3748 g_Git.StringAppend(&str, &cmdErr[last + 1], CP_UTF8, (int)cmdErr.size() - last -1);
3749 CMessageBox::Show(NULL, str, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
3752 out.append(cmdout, 0);
3754 else // Init Repository
3756 //We will list all added file for init repository because commit will comit these
3757 //if(list == NULL)
3758 cmd=_T("git.exe ls-files -s -t -z");
3759 //else
3760 // cmd.Format(_T("git.exe ls-files -s -t -z -- \"%s\""),(*list)[i].GetGitPathString());
3762 g_Git.Run(cmd, &cmdout);
3763 //out+=cmdout;
3764 out.append(cmdout,0);
3768 if(g_Git.IsInitRepos())
3770 m_StatusFileList.ParserFromLsFile(out);
3771 for(int i=0;i<m_StatusFileList.GetCount();i++)
3772 ((CTGitPath&)(m_StatusFileList[i])).m_Action=CTGitPath::LOGACTIONS_ADDED;
3774 else
3775 this->m_StatusFileList.ParserFromLog(out);
3777 //handle delete conflict case, when remote : modified, local : deleted.
3778 for(int i=0;i<count;i++)
3780 BYTE_VECTOR cmdout;
3781 CString cmd;
3783 if(list == NULL)
3784 cmd=_T("git.exe ls-files -u -t -z");
3785 else
3786 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),(*list)[i].GetGitPathString());
3788 g_Git.Run(cmd, &cmdout);
3790 CTGitPathList conflictlist;
3791 conflictlist.ParserFromLog(cmdout);
3792 for(int i=0;i<conflictlist.GetCount();i++)
3794 CTGitPath *p=m_StatusFileList.LookForGitPath(conflictlist[i].GetGitPathString());
3795 if(p)
3796 p->m_Action|=CTGitPath::LOGACTIONS_UNMERGED;
3797 else
3798 m_StatusFileList.AddPath(conflictlist[i]);
3802 // handle source files of file renames/moves (issue #860)
3803 // if a file gets renamed and the new file "git add"ed, diff-index doesn't list the source file anymore
3804 for(int i = 0; i < count; i++)
3806 BYTE_VECTOR cmdout;
3807 CString cmd;
3809 if(list == NULL)
3810 cmd = _T("git.exe ls-files -d -z");
3811 else
3812 cmd.Format(_T("git.exe ls-files -d -z -- \"%s\""),(*list)[i].GetGitPathString());
3814 g_Git.Run(cmd, &cmdout);
3816 CTGitPathList deletelist;
3817 deletelist.ParserFromLog(cmdout, true);
3818 for(int i = 0; i < deletelist.GetCount(); i++)
3820 CTGitPath *p = m_StatusFileList.LookForGitPath(deletelist[i].GetGitPathString());
3821 if(!p)
3822 m_StatusFileList.AddPath(deletelist[i]);
3823 else if ((p->m_Action == CTGitPath::LOGACTIONS_ADDED || p->m_Action == CTGitPath::LOGACTIONS_REPLACED) && !p->Exists())
3825 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)
3827 g_Git.Run(_T("git.exe rm -f --cache -- \"") + p->GetWinPathString() + _T("\""), &cmdout);
3828 m_StatusFileList.RemoveItem(*p);
3834 else
3836 int count = 0;
3837 if(list == NULL)
3838 count = 1;
3839 else
3840 count = list->GetCount();
3842 for(int i=0;i<count;i++)
3844 BYTE_VECTOR cmdout;
3845 CString cmd;
3846 if(list == NULL)
3847 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M -z %s"),hash);
3848 else
3849 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M %s -z -- \"%s\""),hash,(*list)[i].GetGitPathString());
3851 g_Git.Run(cmd, &cmdout, NULL);
3853 out.append(cmdout);
3855 this->m_StatusFileList.ParserFromLog(out);
3859 for(int i=0;i<m_StatusFileList.GetCount();i++)
3861 CTGitPath * gitpatch=(CTGitPath*)&m_StatusFileList[i];
3862 gitpatch->m_Checked = TRUE;
3863 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
3866 this->m_bBusy=FALSE;
3867 return 0;
3870 int CGitStatusListCtrl::UpdateWithGitPathList(CTGitPathList &list)
3872 m_arStatusArray.clear();
3873 for(int i=0;i<list.GetCount();i++)
3875 CTGitPath * gitpath=(CTGitPath*)&list[i];
3877 if(gitpath ->m_Action & CTGitPath::LOGACTIONS_HIDE)
3878 continue;
3880 gitpath->m_Checked = TRUE;
3881 m_arStatusArray.push_back((CTGitPath*)&list[i]);
3883 return 0;
3886 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList &list)
3888 m_UnRevFileList = list;
3889 for(int i=0;i<m_UnRevFileList.GetCount();i++)
3891 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
3892 gitpatch->m_Checked = FALSE;
3893 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
3895 return 0;
3898 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList *List)
3900 this->m_UnRevFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER,List);
3901 for(int i=0;i<m_UnRevFileList.GetCount();i++)
3903 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
3904 gitpatch->m_Checked = FALSE;
3905 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
3907 return 0;
3910 int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList *List)
3912 this->m_IgnoreFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER|CTGitPath::LOGACTIONS_IGNORE,List);
3913 for(int i=0;i<m_IgnoreFileList.GetCount();i++)
3915 CTGitPath * gitpatch=(CTGitPath*)&m_IgnoreFileList[i];
3916 gitpatch->m_Checked = FALSE;
3917 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
3919 return 0;
3921 int CGitStatusListCtrl::UpdateFileList(int mask,bool once,CTGitPathList *List)
3923 if(mask&CGitStatusListCtrl::FILELIST_MODIFY)
3925 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_MODIFY)))
3927 UpdateFileList(git_revnum_t(GIT_REV_ZERO),List);
3928 m_FileLoaded|=CGitStatusListCtrl::FILELIST_MODIFY;
3931 if(mask&CGitStatusListCtrl::FILELIST_UNVER)
3933 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_UNVER)))
3935 UpdateUnRevFileList(List);
3936 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
3938 if(mask&CGitStatusListCtrl::FILELIST_IGNORE && (once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_IGNORE))))
3940 UpdateIgnoreFileList(List);
3941 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
3944 return 0;
3947 void CGitStatusListCtrl::Clear()
3949 m_FileLoaded=0;
3950 this->DeleteAllItems();
3951 this->m_arListArray.clear();
3952 this->m_arStatusArray.clear();
3953 this->m_changelists.clear();
3955 //////////////////////////////////////////////////////////////////////////
3956 #if 0
3957 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium, DWORD * /*pdwEffect*/, POINTL pt)
3959 if(pFmtEtc->cfFormat == CF_HDROP && medium.tymed == TYMED_HGLOBAL)
3961 HDROP hDrop = (HDROP)GlobalLock(medium.hGlobal);
3962 if(hDrop != NULL)
3964 TCHAR szFileName[MAX_PATH];
3966 UINT cFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
3968 POINT clientpoint;
3969 clientpoint.x = pt.x;
3970 clientpoint.y = pt.y;
3971 ScreenToClient(m_hTargetWnd, &clientpoint);
3972 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
3974 CTSVNPathList changelistItems;
3975 for(UINT i = 0; i < cFiles; ++i)
3977 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
3978 changelistItems.AddPath(CTSVNPath(szFileName));
3980 // find the changelist name
3981 CString sChangelist;
3982 LONG_PTR nGroup = m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint);
3983 for (std::map<CString, int>::iterator it = m_pSVNStatusListCtrl->m_changelists.begin(); it != m_pSVNStatusListCtrl->m_changelists.end(); ++it)
3984 if (it->second == nGroup)
3985 sChangelist = it->first;
3986 if (!sChangelist.IsEmpty())
3988 SVN git;
3989 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
3991 for (int l=0; l<changelistItems.GetCount(); ++l)
3993 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
3994 if (index >= 0)
3996 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
3997 if (e)
3999 e->changelist = sChangelist;
4000 if (!e->IsFolder())
4002 if (m_pSVNStatusListCtrl->m_changelists.find(e->changelist)!=m_pSVNStatusListCtrl->m_changelists.end())
4003 m_pSVNStatusListCtrl->SetItemGroup(index, m_pSVNStatusListCtrl->m_changelists[e->changelist]);
4004 else
4005 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
4009 else
4011 HWND hParentWnd = GetParent(m_hTargetWnd);
4012 if (hParentWnd != NULL)
4013 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
4017 else
4019 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
4022 else
4024 SVN git;
4025 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
4027 for (int l=0; l<changelistItems.GetCount(); ++l)
4029 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
4030 if (index >= 0)
4032 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
4033 if (e)
4035 e->changelist = sChangelist;
4036 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
4039 else
4041 HWND hParentWnd = GetParent(m_hTargetWnd);
4042 if (hParentWnd != NULL)
4043 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
4047 else
4049 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
4053 else
4055 for(UINT i = 0; i < cFiles; ++i)
4057 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
4058 HWND hParentWnd = GetParent(m_hTargetWnd);
4059 if (hParentWnd != NULL)
4060 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)szFileName);
4064 GlobalUnlock(medium.hGlobal);
4066 return true; //let base free the medium
4068 HRESULT STDMETHODCALLTYPE CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect)
4070 CIDropTarget::DragOver(grfKeyState, pt, pdwEffect);
4071 *pdwEffect = DROPEFFECT_COPY;
4072 if (m_pSVNStatusListCtrl)
4074 POINT clientpoint;
4075 clientpoint.x = pt.x;
4076 clientpoint.y = pt.y;
4077 ScreenToClient(m_hTargetWnd, &clientpoint);
4078 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
4080 *pdwEffect = DROPEFFECT_MOVE;
4082 else if ((!m_pSVNStatusListCtrl->m_bFileDropsEnabled)||(m_pSVNStatusListCtrl->m_bOwnDrag))
4084 *pdwEffect = DROPEFFECT_NONE;
4087 return S_OK;
4090 #endif
4092 void CGitStatusListCtrl::FilesExport()
4094 CString exportDir;
4095 // export all changed files to a folder
4096 CBrowseFolder browseFolder;
4097 browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
4098 if (browseFolder.Show(GetSafeHwnd(), exportDir) != CBrowseFolder::OK)
4099 return;
4101 POSITION pos = GetFirstSelectedItemPosition();
4102 int index;
4103 while ((index = GetNextSelectedItem(pos)) >= 0)
4105 CTGitPath *fd = (CTGitPath*)GetItemData(index);
4106 // we cannot export directories or folders
4107 if (fd->m_Action == CTGitPath::LOGACTIONS_DELETED || fd->IsDirectory())
4108 continue;
4110 CAppUtils::CreateMultipleDirectory(exportDir + _T("\\") + fd->GetDirectory().GetWinPathString());
4111 CString filename = exportDir + _T("\\") + fd->GetWinPathString();
4112 if (m_CurrentVersion == GIT_REV_ZERO)
4114 if (!CopyFile(g_Git.m_CurrentDir + _T("\\") + fd->GetWinPath(), filename, false))
4116 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
4117 return;
4120 else
4122 if (g_Git.GetOneFile(m_CurrentVersion, *fd, filename))
4124 CString out;
4125 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, fd->GetGitPathString(), m_CurrentVersion, filename);
4126 if (CMessageBox::Show(NULL, out, _T("TortoiseGit"), 2, IDI_WARNING, CString(MAKEINTRESOURCE(IDS_IGNOREBUTTON)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON))) == 2)
4127 return;
4133 void CGitStatusListCtrl::FileSaveAs(CTGitPath *path)
4135 CString filename;
4136 filename.Format(_T("%s-%s%s"), path->GetBaseFilename(), this->m_CurrentVersion.Left(g_Git.GetShortHASHLength()), path->GetFileExtension());
4137 CFileDialog dlg(FALSE,NULL,
4138 filename,
4139 OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
4140 NULL);
4141 CString currentpath;
4142 currentpath=g_Git.m_CurrentDir+_T("\\");
4143 currentpath+=path->GetWinPathString();
4145 dlg.m_ofn.lpstrInitialDir=currentpath.GetBuffer();
4147 CString cmd,out;
4148 INT_PTR ret = dlg.DoModal();
4149 SetCurrentDirectory(g_Git.m_CurrentDir);
4150 if (ret == IDOK)
4152 filename = dlg.GetPathName();
4153 if(m_CurrentVersion == GIT_REV_ZERO)
4155 if(!CopyFile(g_Git.m_CurrentDir +_T("\\") + path->GetWinPath(),filename,false))
4157 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
4158 return;
4162 else
4164 if(g_Git.GetOneFile(m_CurrentVersion,*path,filename))
4166 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, path->GetGitPathString(), m_CurrentVersion, filename);
4167 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
4168 return;
4175 int CGitStatusListCtrl::RevertSelectedItemToVersion(bool parent)
4177 if(this->m_CurrentVersion.IsEmpty())
4178 return 0;
4179 if(this->m_CurrentVersion == GIT_REV_ZERO)
4180 return 0;
4182 POSITION pos = GetFirstSelectedItemPosition();
4183 int index;
4184 CString cmd,out;
4185 std::map<CString, int> versionMap;
4186 while ((index = GetNextSelectedItem(pos)) >= 0)
4188 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
4189 CString version;
4190 if (parent)
4192 int parentNo = fentry->m_ParentNo & PARENT_MASK;
4193 CString ref;
4194 ref.Format(_T("%s^%d"), m_CurrentVersion, parentNo + 1);
4195 CGitHash hash;
4196 if (g_Git.GetHash(hash, ref))
4198 MessageBox(g_Git.GetGitLastErr(_T("Could not get hash of ref \"") + ref + _T("\".")), _T("TortoiseGit"), MB_ICONERROR);
4199 continue;
4202 version = hash.ToString();
4204 else
4205 version = m_CurrentVersion;
4207 cmd.Format(_T("git.exe checkout %s -- \"%s\""), version, fentry->GetGitPathString());
4208 out.Empty();
4209 if (g_Git.Run(cmd, &out, CP_UTF8))
4211 if (MessageBox(out, _T("TortoiseGit"), MB_ICONEXCLAMATION | MB_OKCANCEL) == IDCANCEL)
4212 continue;
4214 else
4215 versionMap[version]++;
4218 out.Empty();
4219 for (auto it = versionMap.begin(); it != versionMap.end(); ++it)
4221 CString versionEntry;
4222 versionEntry.Format(IDS_STATUSLIST_FILESREVERTED, it->second, it->first);
4223 out += versionEntry + _T("\r\n");
4225 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
4226 return 0;
4229 void CGitStatusListCtrl::OpenFile(CTGitPath*filepath,int mode)
4231 CString file;
4232 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
4234 file = g_Git.m_CurrentDir + _T("\\") + filepath->GetWinPath();
4236 else
4238 CString temppath;
4239 GetTempPath(temppath);
4240 TCHAR szTempName[MAX_PATH];
4241 GetTempFileName(temppath, filepath->GetBaseFilename(), 0, szTempName);
4242 CString temp(szTempName);
4243 DeleteFile(szTempName);
4244 CreateDirectory(szTempName, NULL);
4245 file.Format(_T("%s\\%s_%s%s"),
4246 temp,
4247 filepath->GetBaseFilename(),
4248 m_CurrentVersion.Left(g_Git.GetShortHASHLength()),
4249 filepath->GetFileExtension());
4250 CString cmd,out;
4251 if(g_Git.GetOneFile(m_CurrentVersion, *filepath, file))
4253 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, filepath->GetGitPathString(), m_CurrentVersion, file);
4254 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
4255 return;
4257 SetFileAttributes(file, FILE_ATTRIBUTE_READONLY);
4259 if(mode == ALTERNATIVEEDITOR)
4261 CAppUtils::LaunchAlternativeEditor(file);
4262 return;
4264 int ret = HINSTANCE_ERROR;
4266 if(mode == OPEN )
4268 ret = (int)ShellExecute(this->m_hWnd, NULL,file, NULL, NULL, SW_SHOW);
4270 if (ret > HINSTANCE_ERROR)
4272 return;
4277 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
4278 cmd += file;
4279 CAppUtils::LaunchApplication(cmd, NULL, false);