SyncDlg: Sorting might clear in/out file lists
[TortoiseGit.git] / src / Git / GitStatusListCtrl.cpp
blob32f427c360cf9878c26220bce1c97ef399d5f290
1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2012 - TortoiseGit
4 // Copyright (C) 2003-2008 - TortoiseSVN
5 // Copyright (C) 2010-2012 Sven Strickroth <email@cs-ware.de>
7 // This program is free software; you can redistribute it and/or
8 // modify it under the terms of the GNU General Public License
9 // as published by the Free Software Foundation; either version 2
10 // of the License, or (at your option) any later version.
12 // This program is distributed in the hope that it will be useful,
13 // but WITHOUT ANY WARRANTY; without even the implied warranty of
14 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 // GNU General Public License for more details.
17 // You should have received a copy of the GNU General Public License
18 // along with this program; if not, write to the Free Software Foundation,
19 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
22 #include "StdAfx.h"
23 #include "resource.h"
24 #include "..\\TortoiseShell\resource.h"
25 #include "GitStatusListCtrl.h"
26 #include "MessageBox.h"
27 #include "MyMemDC.h"
28 #include "UnicodeUtils.h"
29 #include "AppUtils.h"
30 #include "PathUtils.h"
31 #include "TempFile.h"
32 #include "StringUtils.h"
33 #include "DirFileEnum.h"
34 #include "GitConfig.h"
35 #include "LoglistUtils.h"
36 //#include "SVNProperties.h"
37 #include "Git.h"
38 #include "GitDiff.h"
39 //#include "LogDlg.h"
40 #include "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"
57 const UINT CGitStatusListCtrl::GITSLNM_ITEMCOUNTCHANGED
58 = ::RegisterWindowMessage(_T("GITSLNM_ITEMCOUNTCHANGED"));
59 const UINT CGitStatusListCtrl::GITSLNM_NEEDSREFRESH
60 = ::RegisterWindowMessage(_T("GITSLNM_NEEDSREFRESH"));
61 const UINT CGitStatusListCtrl::GITSLNM_ADDFILE
62 = ::RegisterWindowMessage(_T("GITSLNM_ADDFILE"));
63 const UINT CGitStatusListCtrl::GITSLNM_CHECKCHANGED
64 = ::RegisterWindowMessage(_T("GITSLNM_CHECKCHANGED"));
65 const UINT CGitStatusListCtrl::GITSLNM_ITEMCHANGED
66 = ::RegisterWindowMessage(_T("GITSLNM_ITEMCHANGED"));
71 BEGIN_MESSAGE_MAP(CGitStatusListCtrl, CListCtrl)
72 ON_NOTIFY(HDN_ITEMCLICKA, 0, OnHdnItemclick)
73 ON_NOTIFY(HDN_ITEMCLICKW, 0, OnHdnItemclick)
74 ON_NOTIFY(HDN_ENDTRACK, 0, OnColumnResized)
75 ON_NOTIFY(HDN_ENDDRAG, 0, OnColumnMoved)
76 ON_NOTIFY_REFLECT_EX(LVN_ITEMCHANGED, OnLvnItemchanged)
77 ON_WM_CONTEXTMENU()
78 ON_NOTIFY_REFLECT(NM_DBLCLK, OnNMDblclk)
79 ON_NOTIFY_REFLECT(LVN_GETINFOTIP, OnLvnGetInfoTip)
80 ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, OnNMCustomdraw)
81 ON_WM_SETCURSOR()
82 ON_WM_GETDLGCODE()
83 ON_NOTIFY_REFLECT(NM_RETURN, OnNMReturn)
84 ON_WM_KEYDOWN()
85 ON_WM_PAINT()
86 ON_NOTIFY(HDN_BEGINTRACKA, 0, &CGitStatusListCtrl::OnHdnBegintrack)
87 ON_NOTIFY(HDN_BEGINTRACKW, 0, &CGitStatusListCtrl::OnHdnBegintrack)
88 ON_NOTIFY(HDN_ITEMCHANGINGA, 0, &CGitStatusListCtrl::OnHdnItemchanging)
89 ON_NOTIFY(HDN_ITEMCHANGINGW, 0, &CGitStatusListCtrl::OnHdnItemchanging)
90 ON_WM_DESTROY()
91 ON_NOTIFY_REFLECT(LVN_BEGINDRAG, OnBeginDrag)
92 ON_NOTIFY_REFLECT(LVN_ITEMCHANGING, &CGitStatusListCtrl::OnLvnItemchanging)
93 END_MESSAGE_MAP()
97 CGitStatusListCtrl::CGitStatusListCtrl() : CListCtrl()
98 //, m_HeadRev(GitRev::REV_HEAD)
99 , m_pbCanceled(NULL)
100 , m_pStatLabel(NULL)
101 , m_pSelectButton(NULL)
102 , m_pConfirmButton(NULL)
103 , m_bBusy(false)
104 , m_bEmpty(false)
105 , m_bShowIgnores(false)
106 , m_pDropTarget(NULL)
107 , m_bIgnoreRemoveOnly(false)
108 , m_bCheckChildrenWithParent(false)
109 , m_bUnversionedLast(true)
110 , m_bHasChangeLists(false)
111 , m_bHasLocks(false)
112 , m_bBlock(false)
113 , m_bBlockUI(false)
114 , m_bHasCheckboxes(false)
115 , m_bCheckIfGroupsExist(true)
116 , m_bFileDropsEnabled(false)
117 , m_bOwnDrag(false)
118 , m_dwDefaultColumns(0)
119 , m_ColumnManager(this)
120 , m_bAscending(false)
121 , m_nSortedColumn(-1)
122 , m_bHasExternalsFromDifferentRepos(false)
123 , m_sNoPropValueText(MAKEINTRESOURCE(IDS_STATUSLIST_NOPROPVALUE))
124 , m_amend(false)
125 , m_bDoNotAutoselectSubmodules(false)
126 , m_bHasWC(true)
128 m_FileLoaded=0;
129 m_critSec.Init();
130 m_bIsRevertTheirMy = false;
131 this->m_nLineAdded =this->m_nLineDeleted =0;
134 CGitStatusListCtrl::~CGitStatusListCtrl()
136 // if (m_pDropTarget)
137 // delete m_pDropTarget;
138 ClearStatusArray();
141 void CGitStatusListCtrl::ClearStatusArray()
143 #if 0
144 Locker lock(m_critSec);
145 for (size_t i=0; i < m_arStatusArray.size(); i++)
147 delete m_arStatusArray[i];
149 m_arStatusArray.clear();
150 #endif
153 void CGitStatusListCtrl::Init(DWORD dwColumns, const CString& sColumnInfoContainer, unsigned __int64 dwContextMenus /* = GitSLC_POPALL */, bool bHasCheckboxes /* = true */, bool bHasWC /* = true */, DWORD allowedColumns /* = 0xffffffff */)
155 Locker lock(m_critSec);
157 m_dwDefaultColumns = dwColumns | 1;
158 m_dwContextMenus = dwContextMenus;
159 m_bHasCheckboxes = bHasCheckboxes;
160 m_bHasWC = bHasWC;
162 // set the extended style of the listcontrol
163 // 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.
164 CRegDWORD regFullRowSelect(_T("Software\\TortoiseGit\\FullRowSelect"), TRUE);
165 DWORD exStyle = LVS_EX_HEADERDRAGDROP | LVS_EX_DOUBLEBUFFER | LVS_EX_INFOTIP | LVS_EX_SUBITEMIMAGES;
166 if (DWORD(regFullRowSelect))
167 exStyle |= LVS_EX_FULLROWSELECT;
168 exStyle |= (bHasCheckboxes ? LVS_EX_CHECKBOXES : 0);
169 SetRedraw(false);
170 SetExtendedStyle(exStyle);
172 SetWindowTheme(m_hWnd, L"Explorer", NULL);
174 m_nIconFolder = SYS_IMAGE_LIST().GetDirIconIndex();
175 m_nRestoreOvl = SYS_IMAGE_LIST().AddIcon((HICON)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_RESTOREOVL), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE));
176 SYS_IMAGE_LIST().SetOverlayImage(m_nRestoreOvl, OVL_RESTORE);
177 SetImageList(&SYS_IMAGE_LIST(), LVSIL_SMALL);
179 // keep CSorter::operator() in sync!!
180 static UINT standardColumnNames[GITSLC_NUMCOLUMNS]
181 = { IDS_STATUSLIST_COLFILE
182 , IDS_STATUSLIST_COLFILENAME
183 , IDS_STATUSLIST_COLEXT
184 , IDS_STATUSLIST_COLSTATUS
185 , IDS_STATUSLIST_COLADD
186 , IDS_STATUSLIST_COLDEL
187 , IDS_STATUSLIST_COLLASTMODIFIED
188 , IDS_STATUSLIST_COLSIZE
191 m_ColumnManager.SetNames(standardColumnNames,GITSLC_NUMCOLUMNS);
192 m_ColumnManager.ReadSettings(m_dwDefaultColumns, 0xffffffff & ~(allowedColumns | m_dwDefaultColumns), sColumnInfoContainer, GITSLC_NUMCOLUMNS);
194 // enable file drops
195 #if 0
196 if (m_pDropTarget == NULL)
198 m_pDropTarget = new CGitStatusListCtrlDropTarget(this);
199 RegisterDragDrop(m_hWnd,m_pDropTarget);
200 // create the supported formats:
201 FORMATETC ftetc={0};
202 ftetc.dwAspect = DVASPECT_CONTENT;
203 ftetc.lindex = -1;
204 ftetc.tymed = TYMED_HGLOBAL;
205 ftetc.cfFormat=CF_HDROP;
206 m_pDropTarget->AddSuportedFormat(ftetc);
208 #endif
210 SetRedraw(true);
213 bool CGitStatusListCtrl::SetBackgroundImage(UINT nID)
215 return CAppUtils::SetListCtrlBackgroundImage(GetSafeHwnd(), nID);
218 BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList* pathList
219 , bool bUpdate /* = FALSE */
220 , bool bShowIgnores /* = false */
221 , bool bShowUnRev)
223 Locker lock(m_critSec);
224 int mask= CGitStatusListCtrl::FILELIST_MODIFY;
225 if(bShowIgnores)
226 mask|= CGitStatusListCtrl::FILELIST_IGNORE;
227 if(bShowUnRev)
228 mask|= CGitStatusListCtrl::FILELIST_UNVER;
229 this->UpdateFileList(mask,bUpdate,(CTGitPathList*)pathList);
232 #if 0
233 int refetchcounter = 0;
234 BOOL bRet = TRUE;
235 Invalidate();
236 // force the cursor to change
237 POINT pt;
238 GetCursorPos(&pt);
239 SetCursorPos(pt.x, pt.y);
241 m_mapFilenameToChecked.clear();
242 //m_StatusUrlList.Clear();
243 bool bHasChangelists = (m_changelists.size() > 1 || (!m_changelists.empty() && !m_bHasIgnoreGroup));
244 m_changelists.clear();
245 for (size_t i=0; i < m_arStatusArray.size(); i++)
247 FileEntry * entry = m_arStatusArray[i];
248 if ( bHasChangelists && entry->checked)
250 // If change lists are present, remember all checked entries
251 CString path = entry->GetPath().GetGitPathString();
252 m_mapFilenameToChecked[path] = true;
254 if ( (entry->status==git_wc_status_unversioned || entry->status==git_wc_status_missing ) && entry->checked )
256 // The user manually selected an unversioned or missing file. We remember
257 // this so that the selection can be restored when refreshing.
258 CString path = entry->GetPath().GetGitPathString();
259 m_mapFilenameToChecked[path] = true;
261 else if ( entry->status > git_wc_status_normal && !entry->checked )
263 // The user manually deselected a versioned file. We remember
264 // this so that the deselection can be restored when refreshing.
265 CString path = entry->GetPath().GetGitPathString();
266 m_mapFilenameToChecked[path] = false;
270 // use a sorted path list to make sure we fetch the status of
271 // parent items first, *then* the child items (if any)
272 CTGitPathList sortedPathList = pathList;
273 sortedPathList.SortByPathname();
276 bRet = TRUE;
277 m_nTargetCount = 0;
278 m_bHasExternalsFromDifferentRepos = FALSE;
279 m_bHasExternals = FALSE;
280 m_bHasUnversionedItems = FALSE;
281 m_bHasLocks = false;
282 m_bHasChangeLists = false;
283 m_bShowIgnores = bShowIgnores;
284 m_nSortedColumn = 0;
285 m_bBlock = TRUE;
286 m_bBusy = true;
287 m_bEmpty = false;
288 Invalidate();
290 // first clear possible status data left from
291 // previous GetStatus() calls
292 ClearStatusArray();
294 m_StatusFileList = sortedPathList;
296 // Since Git_client_status() returns all files, even those in
297 // folders included with Git:externals we need to check if all
298 // files we get here belongs to the same repository.
299 // It is possible to commit changes in an external folder, as long
300 // as the folder belongs to the same repository (but another path),
301 // but it is not possible to commit all files if the externals are
302 // from a different repository.
304 // To check if all files belong to the same repository, we compare the
305 // UUID's - if they're identical then the files belong to the same
306 // repository and can be committed. But if they're different, then
307 // tell the user to commit all changes in the external folders
308 // first and exit.
309 CStringA sUUID; // holds the repo UUID
310 CTGitPathList arExtPaths; // list of Git:external paths
312 GitConfig config;
314 m_sURL.Empty();
316 m_nTargetCount = sortedPathList.GetCount();
318 GitStatus status(m_pbCanceled);
319 if(m_nTargetCount > 1 && sortedPathList.AreAllPathsFilesInOneDirectory())
321 // This is a special case, where we've been given a list of files
322 // all from one folder
323 // We handle them by setting a status filter, then requesting the Git status of
324 // all the files in the directory, filtering for the ones we're interested in
325 status.SetFilter(sortedPathList);
327 // if all selected entries are files, we don't do a recursive status
328 // fetching. But if only one is a directory, we have to recurse.
329 git_depth_t depth = git_depth_files;
330 // We have set a filter. If all selected items were files or we fetch
331 // the status not recursively, then we have to include
332 // ignored items too - the user has selected them
333 bool bShowIgnoresRight = true;
334 for (int fcindex=0; fcindex<sortedPathList.GetCount(); ++fcindex)
336 if (sortedPathList[fcindex].IsDirectory())
338 depth = git_depth_infinity;
339 bShowIgnoresRight = false;
340 break;
343 if(!FetchStatusForSingleTarget(config, status, sortedPathList.GetCommonDirectory(), bUpdate, sUUID, arExtPaths, true, depth, bShowIgnoresRight))
345 bRet = FALSE;
348 else
350 for(int nTarget = 0; nTarget < m_nTargetCount; nTarget++)
352 // check whether the path we want the status for is already fetched due to status-fetching
353 // of a parent path.
354 // this check is only done for file paths, because folder paths could be included already
355 // but not recursively
356 if (sortedPathList[nTarget].IsDirectory() || GetListEntry(sortedPathList[nTarget]) == NULL)
358 if(!FetchStatusForSingleTarget(config, status, sortedPathList[nTarget], bUpdate, sUUID,
359 arExtPaths, false, git_depth_infinity, bShowIgnores))
361 bRet = FALSE;
367 // remove the 'helper' files of conflicted items from the list.
368 // otherwise they would appear as unversioned files.
369 for (INT_PTR cind = 0; cind < m_ConflictFileList.GetCount(); ++cind)
371 for (size_t i=0; i < m_arStatusArray.size(); i++)
373 if (m_arStatusArray[i]->GetPath().IsEquivalentTo(m_ConflictFileList[cind]))
375 delete m_arStatusArray[i];
376 m_arStatusArray.erase(m_arStatusArray.begin()+i);
377 break;
381 refetchcounter++;
382 } while(!BuildStatistics() && (refetchcounter < 2) && (*m_pbCanceled==false));
384 m_bBlock = FALSE;
385 m_bBusy = false;
386 GetCursorPos(&pt);
387 SetCursorPos(pt.x, pt.y);
388 return bRet;
389 #endif
390 BuildStatistics();
391 return TRUE;
394 // Get the show-flags bitmap value which corresponds to a particular Git status
395 DWORD CGitStatusListCtrl::GetShowFlagsFromGitStatus(git_wc_status_kind status)
397 switch (status)
399 case git_wc_status_none:
400 case git_wc_status_unversioned:
401 return GITSLC_SHOWUNVERSIONED;
402 case git_wc_status_ignored:
403 if (!m_bShowIgnores)
404 return GITSLC_SHOWDIRECTS;
405 return GITSLC_SHOWDIRECTS|GITSLC_SHOWIGNORED;
406 case git_wc_status_incomplete:
407 return GITSLC_SHOWINCOMPLETE;
408 case git_wc_status_normal:
409 return GITSLC_SHOWNORMAL;
410 case git_wc_status_external:
411 return GITSLC_SHOWEXTERNAL;
412 case git_wc_status_added:
413 return GITSLC_SHOWADDED;
414 case git_wc_status_missing:
415 return GITSLC_SHOWMISSING;
416 case git_wc_status_deleted:
417 return GITSLC_SHOWREMOVED;
418 case git_wc_status_replaced:
419 return GITSLC_SHOWREPLACED;
420 case git_wc_status_modified:
421 return GITSLC_SHOWMODIFIED;
422 case git_wc_status_merged:
423 return GITSLC_SHOWMERGED;
424 case git_wc_status_conflicted:
425 return GITSLC_SHOWCONFLICTED;
426 case git_wc_status_obstructed:
427 return GITSLC_SHOWOBSTRUCTED;
428 default:
429 // we should NEVER get here!
430 ASSERT(FALSE);
431 break;
433 return 0;
436 void CGitStatusListCtrl::Show(unsigned int dwShow, unsigned int dwCheck /*=0*/, bool /*bShowFolders*/ /* = true */,BOOL UpdateStatusList,bool UseStoredCheckStatus)
438 CWinApp * pApp = AfxGetApp();
439 if (pApp)
440 pApp->DoWaitCursor(1);
442 Locker lock(m_critSec);
443 WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
445 //SetItemCount(listIndex);
446 SetRedraw(FALSE);
447 DeleteAllItems();
448 m_nSelected = 0;
450 m_nShownUnversioned = 0;
451 m_nShownModified = 0;
452 m_nShownAdded = 0;
453 m_nShownDeleted = 0;
454 m_nShownConflicted = 0;
455 m_nShownFiles = 0;
456 m_nShownSubmodules = 0;
458 if(UpdateStatusList)
460 m_arStatusArray.clear();
461 for(int i=0;i<this->m_StatusFileList.GetCount();i++)
463 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
466 for(int i=0;i<this->m_UnRevFileList.GetCount();i++)
468 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
471 for(int i=0;i<this->m_IgnoreFileList.GetCount();i++)
473 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
476 PrepareGroups();
477 if (m_nSortedColumn >= 0)
479 CSorter predicate (&m_ColumnManager, m_nSortedColumn, m_bAscending);
480 std::sort(m_arStatusArray.begin(), m_arStatusArray.end(), predicate);
483 int index =0;
484 for(int i=0;i<this->m_arStatusArray.size();i++)
486 //set default checkbox status
487 CTGitPath* entry = ((CTGitPath*)m_arStatusArray[i]);
488 CString path = entry->GetGitPathString();
489 if (!m_mapFilenameToChecked.empty() && m_mapFilenameToChecked.find(path) != m_mapFilenameToChecked.end())
491 entry->m_Checked=m_mapFilenameToChecked[path];
493 else if (!UseStoredCheckStatus)
495 bool autoSelectSubmodules = !(entry->IsDirectory() && m_bDoNotAutoselectSubmodules);
496 if(entry->m_Action & dwCheck && autoSelectSubmodules)
497 entry->m_Checked=true;
498 else
499 entry->m_Checked=false;
500 m_mapFilenameToChecked[path] = entry->m_Checked;
503 if(entry->m_Action & dwShow)
505 AddEntry(entry,langID,index);
506 index++;
510 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
511 for (int col = 0; col <= maxcol; col++)
512 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
514 SetRedraw(TRUE);
515 GetStatisticsString();
517 CHeaderCtrl * pHeader = GetHeaderCtrl();
518 HDITEM HeaderItem = {0};
519 HeaderItem.mask = HDI_FORMAT;
520 for (int i=0; i<pHeader->GetItemCount(); ++i)
522 pHeader->GetItem(i, &HeaderItem);
523 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
524 pHeader->SetItem(i, &HeaderItem);
526 if (m_nSortedColumn >= 0)
528 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
529 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
530 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
533 #if 0
534 if (nSelectedEntry)
536 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
537 EnsureVisible(nSelectedEntry, false);
539 else
541 // Restore the item at the top of the list.
542 for (int i=0;GetTopIndex() != nTopIndex;i++)
544 if ( !EnsureVisible(nTopIndex+i,false) )
546 break;
550 #endif
551 if (pApp)
552 pApp->DoWaitCursor(-1);
554 Invalidate();
556 m_dwShow = dwShow;
558 this->BuildStatistics();
560 #if 0
562 CWinApp * pApp = AfxGetApp();
563 if (pApp)
564 pApp->DoWaitCursor(1);
566 m_bShowFolders = bShowFolders;
568 int nTopIndex = GetTopIndex();
569 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
570 int nSelectedEntry = 0;
571 if (posSelectedEntry)
572 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
573 SetRedraw(FALSE);
574 DeleteAllItems();
576 PrepareGroups();
578 m_arListArray.clear();
580 m_arListArray.reserve(m_arStatusArray.size());
581 SetItemCount (static_cast<int>(m_arStatusArray.size()));
583 int listIndex = 0;
584 for (size_t i=0; i < m_arStatusArray.size(); ++i)
586 FileEntry * entry = m_arStatusArray[i];
587 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
588 continue;
589 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
590 continue;
591 if (entry->IsFolder() && (!bShowFolders))
592 continue; // don't show folders if they're not wanted.
594 #if 0
595 git_wc_status_kind status = GitStatus::GetMoreImportant(entry->status, entry->remotestatus);
596 DWORD showFlags = GetShowFlagsFromGitStatus(status);
597 if (entry->IsLocked())
598 showFlags |= SVNSLC_SHOWLOCKS;
599 if (entry->switched)
600 showFlags |= SVNSLC_SHOWSWITCHED;
601 if (!entry->changelist.IsEmpty())
602 showFlags |= SVNSLC_SHOWINCHANGELIST;
603 #endif
604 bool bAllowCheck = ((entry->changelist.Compare(GITSLC_IGNORECHANGELIST) != 0)
605 && (m_bCheckIfGroupsExist || (m_changelists.empty() || (m_changelists.size() == 1 && m_bHasIgnoreGroup))));
607 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
608 #if 0
609 if (status != Git_wc_status_ignored || (entry->direct) || (dwShow & GitSLC_SHOWIGNORED))
611 if ((!entry->IsFolder()) && (status == Git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
613 if (PathFileExists(entry->GetPath().GetWinPath()))
615 m_arListArray.push_back(i);
616 if ((dwCheck & SVNSLC_SHOWREMOVEDANDPRESENT)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
618 if (bAllowCheck)
619 entry->checked = true;
621 AddEntry(entry, langID, listIndex++);
624 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
626 m_arListArray.push_back(i);
627 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
629 if (bAllowCheck)
630 entry->checked = true;
632 AddEntry(entry, langID, listIndex++);
634 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
636 m_arListArray.push_back(i);
637 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
639 if (bAllowCheck)
640 entry->checked = true;
642 AddEntry(entry, langID, listIndex++);
645 #endif
648 SetItemCount(listIndex);
650 m_ColumnManager.UpdateRelevance (m_arStatusArray, m_arListArray);
652 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
653 for (int col = 0; col <= maxcol; col++)
654 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
656 SetRedraw(TRUE);
657 GetStatisticsString();
659 CHeaderCtrl * pHeader = GetHeaderCtrl();
660 HDITEM HeaderItem = {0};
661 HeaderItem.mask = HDI_FORMAT;
662 for (int i=0; i<pHeader->GetItemCount(); ++i)
664 pHeader->GetItem(i, &HeaderItem);
665 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
666 pHeader->SetItem(i, &HeaderItem);
668 if (m_nSortedColumn)
670 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
671 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
672 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
675 if (nSelectedEntry)
677 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
678 EnsureVisible(nSelectedEntry, false);
680 else
682 // Restore the item at the top of the list.
683 for (int i=0;GetTopIndex() != nTopIndex;i++)
685 if ( !EnsureVisible(nTopIndex+i,false) )
687 break;
692 if (pApp)
693 pApp->DoWaitCursor(-1);
695 m_bEmpty = (GetItemCount() == 0);
696 Invalidate();
697 #endif
701 void CGitStatusListCtrl::Show(unsigned int /*dwShow*/, const CTGitPathList& checkedList, bool /*bShowFolders*/ /* = true */)
703 DeleteAllItems();
704 for(int i=0;i<checkedList.GetCount();i++)
705 this->AddEntry((CTGitPath *)&checkedList[i],0,i);
706 return ;
707 #if 0
709 Locker lock(m_critSec);
710 WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
712 CWinApp * pApp = AfxGetApp();
713 if (pApp)
714 pApp->DoWaitCursor(1);
715 m_dwShow = dwShow;
716 m_bShowFolders = bShowFolders;
717 m_nSelected = 0;
718 int nTopIndex = GetTopIndex();
719 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
720 int nSelectedEntry = 0;
721 if (posSelectedEntry)
722 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
723 SetRedraw(FALSE);
724 DeleteAllItems();
726 PrepareGroups();
728 m_arListArray.clear();
730 m_arListArray.reserve(m_arStatusArray.size());
731 SetItemCount (static_cast<int>(m_arStatusArray.size()));
733 int listIndex = 0;
734 for (size_t i=0; i < m_arStatusArray.size(); ++i)
736 FileEntry * entry = m_arStatusArray[i];
737 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
738 continue;
739 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
740 continue;
741 if (entry->IsFolder() && (!bShowFolders))
742 continue; // don't show folders if they're not wanted.
743 #if 0
744 git_wc_status_kind status = SVNStatus::GetMoreImportant(entry->status, entry->remotestatus);
745 DWORD showFlags = GetShowFlagsFromSVNStatus(status);
746 if (entry->IsLocked())
747 showFlags |= SVNSLC_SHOWLOCKS;
748 if (!entry->changelist.IsEmpty())
749 showFlags |= SVNSLC_SHOWINCHANGELIST;
751 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
752 if (status != git_wc_status_ignored || (entry->direct) || (dwShow & SVNSLC_SHOWIGNORED))
754 for (int npath = 0; npath < checkedList.GetCount(); ++npath)
756 if (entry->GetPath().IsEquivalentTo(checkedList[npath]))
758 entry->checked = true;
759 break;
762 if ((!entry->IsFolder()) && (status == git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
764 if (PathFileExists(entry->GetPath().GetWinPath()))
766 m_arListArray.push_back(i);
767 AddEntry(entry, langID, listIndex++);
770 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
772 m_arListArray.push_back(i);
773 AddEntry(entry, langID, listIndex++);
775 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
777 m_arListArray.push_back(i);
778 AddEntry(entry, langID, listIndex++);
780 else if (entry->switched)
782 m_arListArray.push_back(i);
783 AddEntry(entry, langID, listIndex++);
786 #endif
789 SetItemCount(listIndex);
791 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
792 for (int col = 0; col <= maxcol; col++)
793 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
795 SetRedraw(TRUE);
796 GetStatisticsString();
798 CHeaderCtrl * pHeader = GetHeaderCtrl();
799 HDITEM HeaderItem = {0};
800 HeaderItem.mask = HDI_FORMAT;
801 for (int i=0; i<pHeader->GetItemCount(); ++i)
803 pHeader->GetItem(i, &HeaderItem);
804 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
805 pHeader->SetItem(i, &HeaderItem);
807 if (m_nSortedColumn)
809 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
810 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
811 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
814 if (nSelectedEntry)
816 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
817 EnsureVisible(nSelectedEntry, false);
819 else
821 // Restore the item at the top of the list.
822 for (int i=0;GetTopIndex() != nTopIndex;i++)
824 if ( !EnsureVisible(nTopIndex+i,false) )
826 break;
831 if (pApp)
832 pApp->DoWaitCursor(-1);
834 m_bEmpty = (GetItemCount() == 0);
835 Invalidate();
836 #endif
839 int CGitStatusListCtrl::GetColumnIndex(int mask)
841 int i=0;
842 for(i=0;i<32;i++)
843 if(mask&0x1)
844 return i;
845 else
846 mask=mask>>1;
847 return -1;
849 void CGitStatusListCtrl::AddEntry(CTGitPath * GitPath, WORD /*langID*/, int listIndex)
851 static CString from(MAKEINTRESOURCE(IDS_STATUSLIST_FROM));
852 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
853 static bool abbreviateRenamings(((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\AbbreviateRenamings"), FALSE)) == TRUE);
854 static bool relativeTimes = (CRegDWORD(_T("Software\\TortoiseGit\\RelativeTimes"), FALSE) != FALSE);
856 CString path = GitPath->GetGitPathString();
858 m_bBlock = TRUE;
859 int index = listIndex;
860 int nCol = 1;
861 CString entryname = GitPath->GetGitPathString();
862 int icon_idx = 0;
863 if (GitPath->IsDirectory())
865 icon_idx = m_nIconFolder;
866 m_nShownSubmodules++;
868 else
870 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(*GitPath);
871 m_nShownFiles++;
873 switch (GitPath->m_Action)
875 case CTGitPath::LOGACTIONS_ADDED:
876 case CTGitPath::LOGACTIONS_COPY:
877 m_nShownAdded++;
878 break;
879 case CTGitPath::LOGACTIONS_DELETED:
880 m_nShownDeleted++;
881 break;
882 case CTGitPath::LOGACTIONS_REPLACED:
883 case CTGitPath::LOGACTIONS_MODIFIED:
884 case CTGitPath::LOGACTIONS_MERGED:
885 m_nShownModified++;
886 break;
887 case CTGitPath::LOGACTIONS_UNMERGED:
888 m_nShownConflicted++;
889 break;
890 case CTGitPath::LOGACTIONS_UNVER:
891 m_nShownUnversioned++;
892 break;
893 default:
894 m_nShownUnversioned++;
895 break;
897 if(GitPath->m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY) && !GitPath->GetGitOldPathString().IsEmpty())
899 if (!abbreviateRenamings)
901 // relative path
902 CString rename;
903 rename.Format(from, GitPath->GetGitOldPathString());
904 entryname += _T(" ") + rename;
906 else
908 CTGitPathList tgpl;
909 tgpl.AddPath(*GitPath);
910 CTGitPath old(GitPath->GetGitOldPathString());
911 tgpl.AddPath(old);
912 CString commonRoot = tgpl.GetCommonRoot().GetGitPathString();
913 if (!commonRoot.IsEmpty())
914 commonRoot += _T("/");
915 if (old.GetFileOrDirectoryName() == GitPath->GetFileOrDirectoryName() && old.GetContainingDirectory().GetGitPathString() != "" && GitPath->GetContainingDirectory().GetGitPathString())
917 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();
919 else if (!commonRoot.IsEmpty())
921 entryname = commonRoot + _T("{") + GitPath->GetGitOldPathString().Mid(commonRoot.GetLength()) + _T(" => ") + GitPath->GetGitPathString().Mid(commonRoot.GetLength()) + _T("}");
923 else
925 entryname = GitPath->GetGitOldPathString().Mid(commonRoot.GetLength()) + _T(" => ") + GitPath->GetGitPathString().Mid(commonRoot.GetLength());
930 InsertItem(index, entryname, icon_idx);
931 if (m_restorepaths.find(GitPath->GetWinPathString()) != m_restorepaths.end())
932 SetItemState(index, INDEXTOOVERLAYMASK(OVL_RESTORE), TVIS_OVERLAYMASK);
934 this->SetItemData(index, (DWORD_PTR)GitPath);
935 // SVNSLC_COLFILENAME
936 SetItemText(index, nCol++, GitPath->GetFileOrDirectoryName());
937 // SVNSLC_COLEXT
938 SetItemText(index, nCol++, GitPath->GetFileExtension());
939 // SVNSLC_COLSTATUS
940 SetItemText(index, nCol++, GitPath->GetActionName());
942 SetItemText(index, GetColumnIndex(GITSLC_COLADD),GitPath->m_StatAdd);
943 SetItemText(index, GetColumnIndex(GITSLC_COLDEL),GitPath->m_StatDel);
946 CString modificationDate;
947 __int64 filetime = GitPath->GetLastWriteTime();
948 if (filetime && (GitPath->m_Action != CTGitPath::LOGACTIONS_DELETED))
950 FILETIME* f = (FILETIME*)(__int64*)&filetime;
951 modificationDate = CLoglistUtils::FormatDateAndTime(CTime(g_Git.filetime_to_time_t(f)), DATE_SHORTDATE, true, relativeTimes);
953 SetItemText(index, GetColumnIndex(GITSLC_COLMODIFICATIONDATE), modificationDate);
955 // SVNSLC_COLSIZE
956 if (GitPath->IsDirectory())
957 SetItemText(index, GetColumnIndex(GITSLC_COLSIZE), _T(""));
958 else
960 TCHAR buf[100];
961 StrFormatByteSize64(GitPath->GetFileSize(), buf, 100);
962 SetItemText(index, GetColumnIndex(GITSLC_COLSIZE), buf);
965 SetCheck(index, GitPath->m_Checked);
966 if (GitPath->m_Checked)
967 m_nSelected++;
970 if( GitPath->m_Action & CTGitPath::LOGACTIONS_IGNORE)
971 SetItemGroup(index, 2);
972 else if( GitPath->m_Action & CTGitPath::LOGACTIONS_UNVER)
973 SetItemGroup(index,1);
974 else
976 SetItemGroup(index, GitPath->m_ParentNo&(PARENT_MASK|MERGE_MASK));
979 m_bBlock = FALSE;
984 bool CGitStatusListCtrl::SetItemGroup(int item, int groupindex)
986 // if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS) == NULL)
987 // return false;
988 if (groupindex < 0)
989 return false;
990 LVITEM i = {0};
991 i.mask = LVIF_GROUPID;
992 i.iItem = item;
993 i.iSubItem = 0;
994 i.iGroupId = groupindex;
996 return !!SetItem(&i);
999 void CGitStatusListCtrl::OnHdnItemclick(NMHDR *pNMHDR, LRESULT *pResult)
1001 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
1002 *pResult = 0;
1003 if (m_bBlock || m_arStatusArray.empty())
1004 return;
1005 m_bBlock = TRUE;
1006 if (m_nSortedColumn == phdr->iItem)
1007 m_bAscending = !m_bAscending;
1008 else
1009 m_bAscending = TRUE;
1010 m_nSortedColumn = phdr->iItem;
1011 Show(m_dwShow, 0, m_bShowFolders,false,true);
1013 m_bBlock = FALSE;
1016 void CGitStatusListCtrl::OnLvnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
1018 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1019 *pResult = 0;
1021 #define ISCHECKED(x) ((x) ? ((((x)&LVIS_STATEIMAGEMASK)>>12)-1) : FALSE)
1022 if ((m_bBlock)&&(m_bBlockUI))
1024 // if we're blocked, prevent changing of the check state
1025 if ((!ISCHECKED(pNMLV->uOldState) && ISCHECKED(pNMLV->uNewState))||
1026 (ISCHECKED(pNMLV->uOldState) && !ISCHECKED(pNMLV->uNewState)))
1027 *pResult = TRUE;
1031 BOOL CGitStatusListCtrl::OnLvnItemchanged(NMHDR *pNMHDR, LRESULT *pResult)
1033 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1034 *pResult = 0;
1035 CWnd* pParent = GetParent();
1036 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
1038 pParent->SendMessage(GITSLNM_ITEMCHANGED, pNMLV->iItem);
1041 if ((pNMLV->uNewState==0)||(pNMLV->uNewState & LVIS_SELECTED)||(pNMLV->uNewState & LVIS_FOCUSED))
1042 return FALSE;
1044 if (m_bBlock)
1045 return FALSE;
1047 bool bSelected = !!(ListView_GetItemState(m_hWnd, pNMLV->iItem, LVIS_SELECTED) & LVIS_SELECTED);
1048 int nListItems = GetItemCount();
1050 m_bBlock = TRUE;
1051 // was the item checked?
1053 //CTGitPath *gitpath=(CTGitPath*)GetItemData(pNMLV->iItem);
1054 //gitpath->m_Checked=GetCheck(pNMLV->iItem);
1056 if (GetCheck(pNMLV->iItem))
1058 CheckEntry(pNMLV->iItem, nListItems);
1059 if (bSelected)
1061 POSITION pos = GetFirstSelectedItemPosition();
1062 int index;
1063 while ((index = GetNextSelectedItem(pos)) >= 0)
1065 if (index != pNMLV->iItem)
1066 CheckEntry(index, nListItems);
1070 else
1072 UncheckEntry(pNMLV->iItem, nListItems);
1073 if (bSelected)
1075 POSITION pos = GetFirstSelectedItemPosition();
1076 int index;
1077 while ((index = GetNextSelectedItem(pos)) >= 0)
1079 if (index != pNMLV->iItem)
1080 UncheckEntry(index, nListItems);
1085 GetStatisticsString();
1086 m_bBlock = FALSE;
1087 NotifyCheck();
1089 return FALSE;
1092 void CGitStatusListCtrl::OnColumnResized(NMHDR *pNMHDR, LRESULT *pResult)
1094 m_ColumnManager.OnColumnResized(pNMHDR,pResult);
1096 *pResult = FALSE;
1099 void CGitStatusListCtrl::OnColumnMoved(NMHDR *pNMHDR, LRESULT *pResult)
1101 m_ColumnManager.OnColumnMoved(pNMHDR, pResult);
1103 Invalidate(FALSE);
1106 void CGitStatusListCtrl::CheckEntry(int index, int /*nListItems*/)
1108 Locker lock(m_critSec);
1109 //FileEntry * entry = GetListEntry(index);
1110 CTGitPath *path=(CTGitPath*)GetItemData(index);
1111 ASSERT(path != NULL);
1112 if (path == NULL)
1113 return;
1114 m_mapFilenameToChecked[path->GetGitPathString()] = true;
1115 SetCheck(index, TRUE);
1116 //entry = GetListEntry(index);
1117 // if an unversioned item was checked, then we need to check if
1118 // the parent folders are unversioned too. If the parent folders actually
1119 // are unversioned, then check those too.
1120 #if 0
1121 if (entry->status == git_wc_status_unversioned)
1123 // we need to check the parent folder too
1124 const CTGitPath& folderpath = entry->path;
1125 for (int i=0; i< nListItems; ++i)
1127 FileEntry * testEntry = GetListEntry(i);
1128 ASSERT(testEntry != NULL);
1129 if (testEntry == NULL)
1130 continue;
1131 if (!testEntry->checked)
1133 if (testEntry->path.IsAncestorOf(folderpath) && (!testEntry->path.IsEquivalentTo(folderpath)))
1135 SetEntryCheck(testEntry,i,true);
1136 m_nSelected++;
1141 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1142 if ( (entry->status == git_wc_status_deleted) || (m_bCheckChildrenWithParent) || (bShift) )
1144 // if a deleted folder gets checked, we have to check all
1145 // children of that folder too.
1146 if (entry->path.IsDirectory())
1148 SetCheckOnAllDescendentsOf(entry, true);
1151 // if a deleted file or folder gets checked, we have to
1152 // check all parents of this item too.
1153 for (int i=0; i<nListItems; ++i)
1155 FileEntry * testEntry = GetListEntry(i);
1156 ASSERT(testEntry != NULL);
1157 if (testEntry == NULL)
1158 continue;
1159 if (!testEntry->checked)
1161 if (testEntry->path.IsAncestorOf(entry->path) && (!testEntry->path.IsEquivalentTo(entry->path)))
1163 if ((testEntry->status == git_wc_status_deleted)||(m_bCheckChildrenWithParent))
1165 SetEntryCheck(testEntry,i,true);
1166 m_nSelected++;
1167 // now we need to check all children of this parent folder
1168 SetCheckOnAllDescendentsOf(testEntry, true);
1174 #endif
1175 if ( !path->m_Checked )
1177 path->m_Checked = TRUE;
1178 m_nSelected++;
1182 void CGitStatusListCtrl::UncheckEntry(int index, int /*nListItems*/)
1184 Locker lock(m_critSec);
1185 CTGitPath *path=(CTGitPath*)GetItemData(index);
1186 ASSERT(path != NULL);
1187 if (path == NULL)
1188 return;
1189 SetCheck(index, FALSE);
1190 m_mapFilenameToChecked[path->GetGitPathString()] = false;
1191 //entry = GetListEntry(index);
1192 // item was unchecked
1193 #if 0
1194 if (entry->path.IsDirectory())
1196 // disable all files within an unselected folder, except when unchecking a folder with property changes
1197 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1198 if ( (entry->status != git_wc_status_modified) || (bShift) )
1200 SetCheckOnAllDescendentsOf(entry, false);
1203 else if (entry->status == git_wc_status_deleted)
1205 // a "deleted" file was unchecked, so uncheck all parent folders
1206 // and all children of those parents
1207 for (int i=0; i<nListItems; i++)
1209 FileEntry * testEntry = GetListEntry(i);
1210 ASSERT(testEntry != NULL);
1211 if (testEntry == NULL)
1212 continue;
1213 if (testEntry->checked)
1215 if (testEntry->path.IsAncestorOf(entry->path))
1217 if (testEntry->status == git_wc_status_deleted)
1219 SetEntryCheck(testEntry,i,false);
1220 m_nSelected--;
1222 SetCheckOnAllDescendentsOf(testEntry, false);
1228 #endif
1229 if ( path->m_Checked )
1231 path->m_Checked = FALSE;
1232 m_nSelected--;
1235 bool CGitStatusListCtrl::BuildStatistics()
1238 bool bRefetchStatus = false;
1240 // now gather some statistics
1241 m_nUnversioned = 0;
1242 m_nNormal = 0;
1243 m_nModified = 0;
1244 m_nAdded = 0;
1245 m_nDeleted = 0;
1246 m_nConflicted = 0;
1247 m_nTotal = 0;
1248 m_nSelected = 0;
1249 m_nLineAdded = 0;
1250 m_nLineDeleted = 0;
1251 m_nRenamed = 0;
1253 for (int i=0; i < (int)m_arStatusArray.size(); ++i)
1255 int status=((CTGitPath*)m_arStatusArray[i])->m_Action;
1257 m_nLineAdded += _tstol(((CTGitPath*)m_arStatusArray[i])->m_StatAdd);
1258 m_nLineDeleted += _tstol(((CTGitPath*)m_arStatusArray[i])->m_StatDel);
1260 if(status&(CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))
1261 m_nAdded++;
1263 if(status&CTGitPath::LOGACTIONS_DELETED)
1264 m_nDeleted++;
1266 if(status&(CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_MODIFIED))
1267 m_nModified++;
1269 if(status&CTGitPath::LOGACTIONS_UNMERGED)
1270 m_nConflicted++;
1272 if(status&(CTGitPath::LOGACTIONS_IGNORE|CTGitPath::LOGACTIONS_UNVER))
1273 m_nUnversioned++;
1275 if(status&(CTGitPath::LOGACTIONS_REPLACED))
1276 m_nRenamed++;
1278 if(((CTGitPath*)m_arStatusArray[i])->m_Checked)
1279 m_nSelected++;
1281 // } // switch (entry->status)
1282 // } // if (entry)
1283 } // for (int i=0; i < (int)m_arStatusArray.size(); ++i)
1284 return !bRefetchStatus;
1286 return FALSE;
1290 int CGitStatusListCtrl::GetGroupFromPoint(POINT * ppt)
1292 // the point must be relative to the upper left corner of the control
1294 if (ppt == NULL)
1295 return -1;
1296 if (!IsGroupViewEnabled())
1297 return -1;
1299 POINT pt = *ppt;
1300 pt.x = 10;
1301 UINT flags = 0;
1302 int nItem = -1;
1303 RECT rc;
1304 GetWindowRect(&rc);
1305 while (((flags & LVHT_BELOW) == 0)&&(pt.y < rc.bottom))
1307 nItem = HitTest(pt, &flags);
1308 if ((flags & LVHT_ONITEM)||(flags & LVHT_EX_GROUP_HEADER))
1310 // the first item below the point
1312 // check if the point is too much right (i.e. if the point
1313 // is farther to the right than the width of the item)
1314 RECT r;
1315 GetItemRect(nItem, &r, LVIR_LABEL);
1316 if (ppt->x > r.right)
1317 return -1;
1319 LVITEM lv = {0};
1320 lv.mask = LVIF_GROUPID;
1321 lv.iItem = nItem;
1322 GetItem(&lv);
1323 int groupID = lv.iGroupId;
1324 // now we search upwards and check if the item above this one
1325 // belongs to another group. If it belongs to the same group,
1326 // we're not over a group header
1327 while (pt.y >= 0)
1329 pt.y -= 2;
1330 nItem = HitTest(pt, &flags);
1331 if ((flags & LVHT_ONITEM)&&(nItem >= 0))
1333 // the first item below the point
1334 LVITEM lv = {0};
1335 lv.mask = LVIF_GROUPID;
1336 lv.iItem = nItem;
1337 GetItem(&lv);
1338 if (lv.iGroupId != groupID)
1339 return groupID;
1340 else
1341 return -1;
1344 if (pt.y < 0)
1345 return groupID;
1346 return -1;
1348 pt.y += 2;
1350 return -1;
1353 void CGitStatusListCtrl::OnContextMenuGroup(CWnd * /*pWnd*/, CPoint point)
1355 POINT clientpoint = point;
1356 ScreenToClient(&clientpoint);
1357 if ((IsGroupViewEnabled())&&(GetGroupFromPoint(&clientpoint) >= 0))
1359 CMenu popup;
1360 if (popup.CreatePopupMenu())
1362 CString temp;
1363 temp.LoadString(IDS_STATUSLIST_CHECKGROUP);
1364 popup.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_CHECKGROUP, temp);
1365 temp.LoadString(IDS_STATUSLIST_UNCHECKGROUP);
1366 popup.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_UNCHECKGROUP, temp);
1367 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1368 bool bCheck = false;
1369 switch (cmd)
1371 case IDGITLC_CHECKGROUP:
1372 bCheck = true;
1373 // fall through here
1374 case IDGITLC_UNCHECKGROUP:
1376 int group = GetGroupFromPoint(&clientpoint);
1377 // go through all items and check/uncheck those assigned to the group
1378 // but block the OnLvnItemChanged handler
1379 m_bBlock = true;
1380 LVITEM lv;
1381 for (int i=0; i<GetItemCount(); ++i)
1383 SecureZeroMemory(&lv, sizeof(LVITEM));
1384 lv.mask = LVIF_GROUPID;
1385 lv.iItem = i;
1386 GetItem(&lv);
1388 if (lv.iGroupId == group)
1390 CTGitPath * entry = (CTGitPath*)GetItemData(i);
1391 if (entry)
1393 bool bOldCheck = entry->m_Checked;
1394 SetEntryCheck(entry, i, bCheck);
1395 if (bCheck != bOldCheck)
1397 if (bCheck)
1398 m_nSelected++;
1399 else
1400 m_nSelected--;
1406 GetStatisticsString();
1407 NotifyCheck();
1408 m_bBlock = false;
1410 break;
1416 void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
1419 //WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
1421 //bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1422 CTGitPath * filepath;
1424 int selIndex = GetSelectionMark();
1425 if ((point.x == -1) && (point.y == -1))
1427 CRect rect;
1428 GetItemRect(selIndex, &rect, LVIR_LABEL);
1429 ClientToScreen(&rect);
1430 point = rect.CenterPoint();
1432 if ((GetSelectedCount() == 0) && (m_bHasCheckboxes))
1434 // nothing selected could mean the context menu is requested for
1435 // a group header
1436 OnContextMenuGroup(pWnd, point);
1438 else if (selIndex >= 0)
1440 //FileEntry * entry = GetListEntry(selIndex);
1442 filepath = (CTGitPath * )GetItemData(selIndex);
1444 ASSERT(filepath != NULL);
1445 if (filepath == NULL)
1446 return;
1448 //const CTGitPath& filepath = entry->path;
1449 int wcStatus = filepath->m_Action;
1450 // entry is selected, now show the popup menu
1451 Locker lock(m_critSec);
1452 CIconMenu popup;
1453 CMenu changelistSubMenu;
1454 CMenu ignoreSubMenu;
1455 if (popup.CreatePopupMenu())
1457 //Add Menu for version controlled file
1459 if (GetSelectedCount() > 0 && wcStatus & CTGitPath::LOGACTIONS_UNMERGED)
1461 if (GetSelectedCount() == 1 && (m_dwContextMenus & GITSLC_POPCONFLICT)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1463 popup.AppendMenuIcon(IDGITLC_EDITCONFLICT, IDS_MENUCONFLICT, IDI_CONFLICT);
1465 if (m_dwContextMenus & GITSLC_POPRESOLVE)
1467 popup.AppendMenuIcon(IDGITLC_RESOLVECONFLICT, IDS_STATUSLIST_CONTEXT_RESOLVED, IDI_RESOLVE);
1469 if ((m_dwContextMenus & GITSLC_POPRESOLVE)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1471 popup.AppendMenuIcon(IDGITLC_RESOLVETHEIRS, IDS_SVNPROGRESS_MENUUSETHEIRS, IDI_RESOLVE);
1472 popup.AppendMenuIcon(IDGITLC_RESOLVEMINE, IDS_SVNPROGRESS_MENUUSEMINE, IDI_RESOLVE);
1474 if ((m_dwContextMenus & GITSLC_POPCONFLICT)||(m_dwContextMenus & GITSLC_POPRESOLVE))
1475 popup.AppendMenu(MF_SEPARATOR);
1478 if (GetSelectedCount() > 0)
1480 if (wcStatus & CTGitPath::LOGACTIONS_UNVER)
1481 if (m_dwContextMenus & GITSLC_POPADD)
1483 //if ( entry->IsFolder() )
1485 // popup.AppendMenuIcon(IDSVNLC_ADD_RECURSIVE, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE, IDI_ADD);
1487 //else
1489 popup.AppendMenuIcon(IDGITLC_ADD, IDS_STATUSLIST_CONTEXT_ADD, IDI_ADD);
1494 if (!(wcStatus &CTGitPath::LOGACTIONS_UNVER))
1496 bool bEntryAdded = false;
1497 if ( (m_dwContextMenus & GITSLC_POPCOMPAREWITHBASE) && GetSelectedCount()>0)
1499 if(filepath->m_ParentNo & MERGE_MASK)
1500 popup.AppendMenuIcon(IDGITLC_COMPARE, IDS_TREE_DIFF, IDI_DIFF);
1501 else
1502 popup.AppendMenuIcon(IDGITLC_COMPARE, IDS_LOG_COMPAREWITHBASE, IDI_DIFF);
1504 popup.SetDefaultItem(IDGITLC_COMPARE, FALSE);
1505 bEntryAdded = true;
1508 //Select one items
1509 if (GetSelectedCount() == 1)
1511 //if (entry->remotestatus <= git_wc_status_normal)
1513 // if (wcStatus > git_wc_status_normal)
1514 // {
1515 // if ((m_dwContextMenus & SVNSLC_POPGNUDIFF)&&(wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing))
1516 // {
1517 if(!g_Git.IsInitRepos() && (m_dwContextMenus&GITSLC_POPGNUDIFF))
1519 popup.AppendMenuIcon(IDGITLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1520 bEntryAdded = true;
1522 // }
1523 // }
1526 //else if (wcStatus != git_wc_status_deleted)
1528 // if (m_dwContextMenus & SVNSLC_POPCOMPARE)
1529 // {
1530 // popup.AppendMenuIcon(IDSVNLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
1531 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
1532 // bEntryAdded = true;
1533 // }
1534 // if (m_dwContextMenus & SVNSLC_POPGNUDIFF)
1535 // {
1536 // popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1537 // bEntryAdded = true;
1538 // }
1542 if ((m_dwContextMenus & this->GetContextMenuBit(IDGITLC_COMPAREWC)) && GetSelectedCount() > 0 && m_bHasWC)
1544 if ((!m_CurrentVersion.IsEmpty()) && m_CurrentVersion != GIT_REV_ZERO)
1546 popup.AppendMenuIcon(IDGITLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
1547 bEntryAdded = true;
1551 //else if (GetSelectedCount() > 1)
1553 // if (m_dwContextMenus & SVNSLC_POPCOMMIT)
1554 // {
1555 // popup.AppendMenuIcon(IDSVNLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);
1556 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
1557 // }
1560 if (bEntryAdded)
1561 popup.AppendMenu(MF_SEPARATOR);
1564 if( (!this->m_Rev1.IsEmpty()) || (!this->m_Rev1.IsEmpty()) )
1566 if(GetSelectedCount() == 1)
1568 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_COMPARETWO))
1570 popup.AppendMenuIcon(IDGITLC_COMPARETWO, IDS_LOG_POPUP_COMPARETWO, IDI_DIFF);
1571 popup.SetDefaultItem(IDGITLC_COMPARETWO, FALSE);
1573 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_GNUDIFF2))
1575 popup.AppendMenuIcon(IDGITLC_GNUDIFF2, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1580 //Select Multi item
1581 if (GetSelectedCount() > 0)
1583 if ((GetSelectedCount() == 2) && (m_dwContextMenus & GITSLC_POPCOMPARETWOFILES) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO))
1585 POSITION pos = GetFirstSelectedItemPosition();
1586 int index = GetNextSelectedItem(pos);
1587 if (index >= 0)
1589 CTGitPath * entry2 = NULL;
1590 bool bothItemsAreExistingFiles = true;
1591 entry2 = (CTGitPath * )GetItemData(index);
1592 if (entry2)
1593 bothItemsAreExistingFiles = !entry2->IsDirectory() && entry2->Exists();
1594 index = GetNextSelectedItem(pos);
1595 if (index >= 0)
1597 entry2 = (CTGitPath * )GetItemData(index);
1598 if (entry2)
1599 bothItemsAreExistingFiles = bothItemsAreExistingFiles && !entry2->IsDirectory() && entry2->Exists();
1600 if (bothItemsAreExistingFiles)
1601 popup.AppendMenuIcon(IDGITLC_COMPARETWOFILES, IDS_STATUSLIST_CONTEXT_COMPARETWOFILES, IDI_DIFF);
1605 // if ((GetSelectedCount() == 2)&&(m_dwContextMenus & SVNSLC_POPREPAIRMOVE))
1606 // {
1607 // POSITION pos = GetFirstSelectedItemPosition();
1608 // int index = GetNextSelectedItem(pos);
1609 // if (index >= 0)
1610 // {
1611 // FileEntry * entry = GetListEntry(index);
1612 // git_wc_status_kind status1 = git_wc_status_none;
1613 // git_wc_status_kind status2 = git_wc_status_none;
1614 // if (entry)
1615 // status1 = entry->status;
1616 // index = GetNextSelectedItem(pos);
1617 // if (index >= 0)
1618 // {
1619 // entry = GetListEntry(index);
1620 // if (entry)
1621 // status2 = entry->status;
1622 // if ((status1 == git_wc_status_missing && status2 == git_wc_status_unversioned) ||
1623 // (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned))
1624 // {
1625 // popup.AppendMenuIcon(IDSVNLC_REPAIRMOVE, IDS_STATUSLIST_CONTEXT_REPAIRMOVE);
1626 // }
1627 // }
1628 // }
1629 // }
1630 // if (wcStatus > git_wc_status_normal)
1631 // {
1632 // if (m_dwContextMenus & SVNSLC_POPREVERT)
1633 // {
1634 // // reverting missing folders is not possible
1635 // if (!entry->IsFolder() || (wcStatus != git_wc_status_missing))
1636 // {
1637 // popup.AppendMenuIcon(IDSVNLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
1638 // }
1639 // }
1640 // }
1641 // if (entry->remotestatus > git_wc_status_normal)
1642 // {
1643 // if (m_dwContextMenus & SVNSLC_POPUPDATE)
1644 // {
1645 // popup.AppendMenuIcon(IDSVNLC_UPDATE, IDS_MENUUPDATE, IDI_UPDATE);
1646 // }
1647 // }
1650 if ( (GetSelectedCount() >0 ) && (!(wcStatus & CTGitPath::LOGACTIONS_UNVER)) && m_bHasWC)
1652 if ((m_dwContextMenus & GITSLC_POPREVERT) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO))
1654 popup.AppendMenuIcon(IDGITLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
1657 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())
1659 popup.AppendMenuIcon(IDGITLC_SKIPWORKTREE, IDS_STATUSLIST_SKIPWORKTREE);
1662 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())
1664 popup.AppendMenuIcon(IDGITLC_ASSUMEVALID, IDS_MENUASSUMEVALID);
1667 if (m_dwContextMenus & GITSLC_POPRESTORE && !filepath->IsDirectory())
1669 if (m_restorepaths.find(filepath->GetWinPathString()) == m_restorepaths.end())
1670 popup.AppendMenuIcon(IDGITLC_CREATERESTORE, IDS_MENUCREATERESTORE, IDI_RESTORE);
1671 else
1672 popup.AppendMenuIcon(IDGITLC_RESTOREPATH, IDS_MENURESTORE, IDI_RESTORE);
1675 if ((m_dwContextMenus & GetContextMenuBit(IDGITLC_REVERTTOREV)) && ( !this->m_CurrentVersion.IsEmpty() )
1676 && this->m_CurrentVersion != GIT_REV_ZERO && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1678 popup.AppendMenuIcon(IDGITLC_REVERTTOREV, IDS_LOG_POPUP_REVERTTOREV, IDI_REVERT);
1682 if ((GetSelectedCount() == 1)&&(!(wcStatus & CTGitPath::LOGACTIONS_UNVER))
1683 &&(!(wcStatus & CTGitPath::LOGACTIONS_IGNORE)))
1685 if (m_dwContextMenus & GITSLC_POPSHOWLOG)
1687 popup.AppendMenuIcon(IDGITLC_LOG, IDS_REPOBROWSE_SHOWLOG, IDI_LOG);
1689 if (m_dwContextMenus & GITSLC_POPSHOWLOGSUBMODULE && filepath->IsDirectory())
1691 popup.AppendMenuIcon(IDGITLC_LOGSUBMODULE, IDS_LOG_SUBMODULE, IDI_LOG);
1693 if (m_dwContextMenus & GITSLC_POPSHOWLOGOLDNAME && (wcStatus & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY) && !filepath->GetGitOldPathString().IsEmpty()))
1695 popup.AppendMenuIcon(IDGITLC_LOGOLDNAME, IDS_STATUSLIST_SHOWLOGOLDNAME, IDI_LOG);
1697 if (m_dwContextMenus & GITSLC_POPBLAME && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED) && m_bHasWC)
1699 popup.AppendMenuIcon(IDGITLC_BLAME, IDS_MENUBLAME, IDI_BLAME);
1702 // if ((wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing) && (GetSelectedCount() == 1))
1703 if ( (GetSelectedCount() == 1) )
1705 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_SAVEAS) && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1707 popup.AppendMenuIcon(IDGITLC_SAVEAS, IDS_LOG_POPUP_SAVE, IDI_SAVEAS);
1710 if (m_dwContextMenus & GITSLC_POPOPEN && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1712 popup.AppendMenuIcon(IDGITLC_VIEWREV, IDS_LOG_POPUP_VIEWREV);
1713 popup.AppendMenuIcon(IDGITLC_OPEN, IDS_REPOBROWSE_OPEN, IDI_OPEN);
1714 popup.AppendMenuIcon(IDGITLC_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
1715 if (wcStatus &CTGitPath::LOGACTIONS_UNVER) {
1716 popup.SetDefaultItem(IDGITLC_OPEN, FALSE);
1720 if (m_dwContextMenus & GITSLC_POPEXPLORE && !(wcStatus & CTGitPath::LOGACTIONS_DELETED) && m_bHasWC)
1722 popup.AppendMenuIcon(IDGITLC_EXPLORE, IDS_STATUSLIST_CONTEXT_EXPLORE, IDI_EXPLORER);
1726 if (GetSelectedCount() > 0)
1728 // if (((wcStatus == git_wc_status_unversioned)||(wcStatus == git_wc_status_ignored))&&(m_dwContextMenus & SVNSLC_POPDELETE))
1729 // {
1730 // popup.AppendMenuIcon(IDSVNLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
1731 // }
1732 // 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))
1733 // {
1734 // if (bShift)
1735 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVEKEEP, IDI_DELETE);
1736 // else
1737 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVE, IDI_DELETE);
1738 // }
1739 if ((wcStatus & CTGitPath::LOGACTIONS_UNVER)/*||(wcStatus == git_wc_status_deleted)*/)
1741 if (m_dwContextMenus & GITSLC_POPDELETE)
1743 popup.AppendMenuIcon(IDGITLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
1746 if ( (wcStatus & CTGitPath::LOGACTIONS_UNVER || wcStatus & CTGitPath::LOGACTIONS_DELETED) )
1748 if (m_dwContextMenus & GITSLC_POPIGNORE)
1751 CTGitPathList ignorelist;
1752 FillListOfSelectedItemPaths(ignorelist);
1753 //check if all selected entries have the same extension
1754 bool bSameExt = true;
1755 CString sExt;
1756 for (int i=0; i<ignorelist.GetCount(); ++i)
1758 if (sExt.IsEmpty() && (i==0))
1759 sExt = ignorelist[i].GetFileExtension();
1760 else if (sExt.CompareNoCase(ignorelist[i].GetFileExtension())!=0)
1761 bSameExt = false;
1763 if (bSameExt)
1765 if (ignoreSubMenu.CreateMenu())
1767 CString ignorepath;
1768 if (ignorelist.GetCount()==1)
1769 ignorepath = ignorelist[0].GetFileOrDirectoryName();
1770 else
1771 ignorepath.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
1772 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_IGNORE, ignorepath);
1773 ignorepath = _T("*")+sExt;
1774 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_IGNOREMASK, ignorepath);
1775 CString temp;
1776 temp.LoadString(IDS_MENUIGNORE);
1777 popup.InsertMenu((UINT)-1, MF_BYPOSITION | MF_POPUP, (UINT_PTR)ignoreSubMenu.m_hMenu, temp);
1780 else
1782 CString temp;
1783 if (ignorelist.GetCount()==1)
1785 temp.LoadString(IDS_MENUIGNORE);
1787 else
1789 temp.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
1791 popup.AppendMenuIcon(IDGITLC_IGNORE, temp, IDI_IGNORE);
1799 if (GetSelectedCount() > 0)
1801 popup.AppendMenu(MF_SEPARATOR);
1802 popup.AppendMenuIcon(IDGITLC_COPY, IDS_STATUSLIST_CONTEXT_COPY, IDI_COPYCLIP);
1803 popup.AppendMenuIcon(IDGITLC_COPYEXT, IDS_STATUSLIST_CONTEXT_COPYEXT, IDI_COPYCLIP);
1804 #if 0
1805 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS))
1806 &&(wcStatus != git_wc_status_unversioned)&&(wcStatus != git_wc_status_none))
1808 popup.AppendMenu(MF_SEPARATOR);
1809 // changelist commands
1810 size_t numChangelists = GetNumberOfChangelistsInSelection();
1811 if (numChangelists > 0)
1813 popup.AppendMenuIcon(IDSVNLC_REMOVEFROMCS, IDS_STATUSLIST_CONTEXT_REMOVEFROMCS);
1815 if ((!entry->IsFolder())&&(changelistSubMenu.CreateMenu()))
1817 CString temp;
1818 temp.LoadString(IDS_STATUSLIST_CONTEXT_CREATECS);
1819 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATECS, temp);
1821 if (entry->changelist.Compare(SVNSLC_IGNORECHANGELIST))
1823 changelistSubMenu.AppendMenu(MF_SEPARATOR);
1824 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATEIGNORECS, SVNSLC_IGNORECHANGELIST);
1827 if (!m_changelists.empty())
1829 // find the changelist names
1830 bool bNeedSeparator = true;
1831 int cmdID = IDSVNLC_MOVETOCS;
1832 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
1834 if ((entry->changelist.Compare(it->first))&&(it->first.Compare(SVNSLC_IGNORECHANGELIST)))
1836 if (bNeedSeparator)
1838 changelistSubMenu.AppendMenu(MF_SEPARATOR);
1839 bNeedSeparator = false;
1841 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, cmdID, it->first);
1842 cmdID++;
1846 temp.LoadString(IDS_STATUSLIST_CONTEXT_MOVETOCS);
1847 popup.AppendMenu(MF_POPUP|MF_STRING, (UINT_PTR)changelistSubMenu.GetSafeHmenu(), temp);
1850 #endif
1853 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1855 m_bBlock = TRUE;
1856 AfxGetApp()->DoWaitCursor(1);
1857 //int iItemCountBeforeMenuCmd = GetItemCount();
1858 //bool bForce = false;
1859 switch (cmd)
1861 case IDGITLC_VIEWREV:
1862 OpenFile(filepath, ALTERNATIVEEDITOR);
1863 break;
1864 case IDGITLC_OPEN:
1865 OpenFile(filepath,OPEN);
1866 break;
1867 case IDGITLC_OPENWITH:
1868 OpenFile(filepath,OPEN_WITH);
1869 break;
1870 case IDGITLC_EXPLORE:
1872 ShellExecute(this->m_hWnd, _T("explore"), filepath->GetDirectory().GetWinPath(), NULL, NULL, SW_SHOW);
1874 break;
1875 case IDGITLC_CREATERESTORE:
1877 POSITION pos = GetFirstSelectedItemPosition();
1878 while (pos)
1880 int index = GetNextSelectedItem(pos);
1881 CTGitPath * entry2 = (CTGitPath * )GetItemData(index);
1882 ASSERT(entry2 != NULL);
1883 if (entry2 == NULL || entry2->IsDirectory())
1884 continue;
1885 if (m_restorepaths.find(entry2->GetWinPathString()) != m_restorepaths.end())
1886 continue;
1887 CTGitPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
1888 if (CopyFile(g_Git.m_CurrentDir + _T("\\") + entry2->GetWinPathString(), tempFile.GetWinPath(), FALSE))
1890 m_restorepaths[entry2->GetWinPathString()] = tempFile.GetWinPathString();
1891 SetItemState(index, INDEXTOOVERLAYMASK(OVL_RESTORE), LVIS_OVERLAYMASK);
1894 Invalidate();
1896 break;
1897 case IDGITLC_RESTOREPATH:
1899 if (CMessageBox::Show(m_hWnd, IDS_STATUSLIST_RESTOREPATH, IDS_APPNAME, 2, IDI_QUESTION, IDS_RESTOREBUTTON, IDS_ABORTBUTTON) == 2)
1900 break;
1901 POSITION pos = GetFirstSelectedItemPosition();
1902 while (pos)
1904 int index = GetNextSelectedItem(pos);
1905 CTGitPath * entry2 = (CTGitPath * )GetItemData(index);
1906 ASSERT(entry2 != NULL);
1907 if (entry2 == NULL)
1908 continue;
1909 if (m_restorepaths.find(entry2->GetWinPathString()) == m_restorepaths.end())
1910 continue;
1911 if (CopyFile(m_restorepaths[entry2->GetWinPathString()], g_Git.m_CurrentDir + _T("\\") + entry2->GetWinPathString(), FALSE))
1913 m_restorepaths.erase(entry2->GetWinPathString());
1914 SetItemState(index, 0, LVIS_OVERLAYMASK);
1917 Invalidate();
1919 break;
1920 // Compare current version and work copy.
1921 case IDGITLC_COMPAREWC:
1923 POSITION pos = GetFirstSelectedItemPosition();
1924 while ( pos )
1926 int index = GetNextSelectedItem(pos);
1927 StartDiffWC(index);
1930 break;
1931 // Compare with base version. when current version is zero, compare workcopy and HEAD.
1932 case IDGITLC_COMPARE:
1934 POSITION pos = GetFirstSelectedItemPosition();
1935 while ( pos )
1937 int index = GetNextSelectedItem(pos);
1938 StartDiff(index);
1941 break;
1942 case IDGITLC_COMPARETWO:
1944 POSITION pos = GetFirstSelectedItemPosition();
1945 while ( pos )
1947 int index = GetNextSelectedItem(pos);
1948 StartDiffTwo(index);
1951 break;
1952 case IDGITLC_COMPARETWOFILES:
1954 POSITION pos = GetFirstSelectedItemPosition();
1955 CTGitPath * firstfilepath = NULL, * secondfilepath = NULL;
1956 if (pos)
1958 firstfilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
1959 ASSERT(firstfilepath != NULL);
1960 if (firstfilepath == NULL)
1961 break;
1963 secondfilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
1964 ASSERT(secondfilepath != NULL);
1965 if (secondfilepath == NULL)
1966 break;
1968 CString sCmd;
1969 sCmd.Format(_T("/command:diff /path:\"%s\" /path2:\"%s\" /hwnd:%ld"), firstfilepath->GetWinPath(), secondfilepath->GetWinPath(), (unsigned long)m_hWnd);
1970 CAppUtils::RunTortoiseProc(sCmd);
1973 break;
1974 case IDGITLC_GNUDIFF1:
1976 // SVNDiff diff(NULL, this->m_hWnd, true);
1978 // if (entry->remotestatus <= git_wc_status_normal)
1979 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
1980 // else
1981 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
1982 if(m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
1984 CString fromwhere;
1985 if(m_amend)
1986 fromwhere = _T("~1");
1987 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,GitRev::GetHead()+fromwhere,
1988 *filepath,GitRev::GetWorkingCopy());
1990 else
1992 if((filepath->m_ParentNo&(PARENT_MASK|MERGE_MASK)) ==0)
1993 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,m_CurrentVersion+_T("~1"),
1994 *filepath,m_CurrentVersion);
1995 else
1997 CString str;
1998 if(filepath->m_ParentNo & MERGE_MASK)
2001 else
2003 str.Format(_T("%s^%d"),m_CurrentVersion,(filepath->m_ParentNo&PARENT_MASK)+1);
2006 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath, str,
2007 *filepath, m_CurrentVersion, false, false, false,
2008 !!(filepath->m_ParentNo & MERGE_MASK));
2012 break;
2013 case IDGITLC_GNUDIFF2:
2015 CAppUtils::StartShowUnifiedDiff(m_hWnd, *filepath, m_Rev2, *filepath, m_Rev1);
2017 break;
2019 case IDGITLC_ADD:
2021 CTGitPathList paths;
2022 FillListOfSelectedItemPaths(paths, true);
2024 CGitProgressDlg progDlg;
2025 progDlg.SetCommand(CGitProgressDlg::GitProgress_Add);
2026 progDlg.SetPathList(paths);
2027 progDlg.SetItemCount(paths.GetCount());
2028 progDlg.DoModal();
2030 // reset unchecked status
2031 POSITION pos = GetFirstSelectedItemPosition();
2032 int index;
2033 while ((index = GetNextSelectedItem(pos)) >= 0)
2035 m_mapFilenameToChecked.erase(((CTGitPath*)GetItemData(index))->GetGitPathString());
2038 if (NULL != GetParent() && NULL != GetParent()->GetSafeHwnd())
2039 GetParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2041 SetRedraw(TRUE);
2043 break;
2045 case IDGITLC_DELETE:
2047 //Collect paths
2048 std::vector<int> selectIndex;
2050 POSITION pos = GetFirstSelectedItemPosition();
2051 int index;
2052 while ((index = GetNextSelectedItem(pos)) >= 0)
2054 selectIndex.push_back(index);
2057 //Create file-list ('\0' separated) for SHFileOperation
2058 CString filelist;
2059 for(int i=0;i<selectIndex.size();i++)
2061 index=selectIndex[i];
2063 CTGitPath * path=(CTGitPath*)GetItemData(index);
2064 ASSERT(path);
2065 if(path == NULL)
2066 continue;
2068 filelist += path->GetWinPathString();
2069 filelist += _T("|");
2071 filelist += _T("|");
2072 int len = filelist.GetLength();
2073 TCHAR * buf = new TCHAR[len+2];
2074 _tcscpy_s(buf, len+2, filelist);
2075 for (int i=0; i<len; ++i)
2076 if (buf[i] == '|')
2077 buf[i] = 0;
2078 SHFILEOPSTRUCT fileop;
2079 fileop.hwnd = this->m_hWnd;
2080 fileop.wFunc = FO_DELETE;
2081 fileop.pFrom = buf;
2082 fileop.pTo = NULL;
2083 fileop.fFlags = FOF_NO_CONNECTED_ELEMENTS | ((GetAsyncKeyState(VK_SHIFT) & 0x8000) ? 0 : FOF_ALLOWUNDO);
2084 fileop.lpszProgressTitle = _T("deleting file");
2085 int result = SHFileOperation(&fileop);
2086 delete [] buf;
2088 if ( (result==0) && (!fileop.fAnyOperationsAborted) )
2090 SetRedraw(FALSE);
2091 POSITION pos = NULL;
2092 while ((pos = GetFirstSelectedItemPosition()) != 0)
2094 int index = GetNextSelectedItem(pos);
2095 if (GetCheck(index))
2096 m_nSelected--;
2097 m_nTotal--;
2099 RemoveListEntry(index);
2101 SetRedraw(TRUE);
2104 break;
2106 case IDGITLC_BLAME:
2108 CAppUtils::LaunchTortoiseBlame(g_Git.m_CurrentDir+_T("\\")+filepath->GetWinPath(), m_CurrentVersion);
2110 break;
2112 case IDGITLC_LOG:
2113 case IDGITLC_LOGSUBMODULE:
2115 CString sCmd;
2116 sCmd.Format(_T("/command:log /path:\"%s\""), g_Git.m_CurrentDir + _T("\\") + filepath->GetWinPath());
2117 if (cmd == IDGITLC_LOG && filepath->IsDirectory())
2118 sCmd += _T(" /submodule");
2119 CAppUtils::RunTortoiseProc(sCmd);
2121 break;
2123 case IDGITLC_LOGOLDNAME:
2125 CTGitPath oldName(filepath->GetGitOldPathString());
2126 CString sCmd;
2127 sCmd.Format(_T("/command:log /path:\"%s\""), g_Git.m_CurrentDir + _T("\\") + oldName.GetWinPath());
2128 CAppUtils::RunTortoiseProc(sCmd);
2130 break;
2133 case IDGITLC_EDITCONFLICT:
2135 CAppUtils::ConflictEdit(*filepath,false,this->m_bIsRevertTheirMy);
2136 break;
2138 case IDGITLC_RESOLVETHEIRS: //follow up
2139 case IDGITLC_RESOLVEMINE: //follow up
2140 case IDGITLC_RESOLVECONFLICT:
2142 if (CMessageBox::Show(m_hWnd, IDS_PROC_RESOLVE, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO)==IDYES)
2144 POSITION pos = GetFirstSelectedItemPosition();
2145 while (pos != 0)
2147 int index;
2148 index = GetNextSelectedItem(pos);
2149 CTGitPath * fentry =(CTGitPath*) this->GetItemData(index);
2150 if(fentry == NULL)
2151 continue;
2152 CString gitcmd,output;
2153 output.Empty();
2155 if ( ((!this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVETHEIRS) ||
2156 ((this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVEMINE) )
2158 gitcmd.Format(_T("git.exe checkout-index -f --stage=3 -- \"%s\""),fentry->GetGitPathString());
2159 if (g_Git.Run(gitcmd, &output,CP_UTF8))
2161 CMessageBox::Show(m_hWnd, output, _T("TortoiseGit"), MB_ICONERROR);
2162 continue;
2165 output.Empty();
2166 if ( ((!this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVEMINE) ||
2167 ((this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVETHEIRS) )
2169 gitcmd.Format(_T("git.exe checkout-index -f --stage=2 -- \"%s\""),fentry->GetGitPathString());
2170 if (g_Git.Run(gitcmd, &output,CP_UTF8))
2172 CMessageBox::Show(m_hWnd, output, _T("TortoiseGit"), MB_ICONERROR);
2173 continue;
2177 output.Empty();
2178 if ( fentry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
2180 gitcmd.Format(_T("git.exe add -f -- \"%s\""),fentry->GetGitPathString());
2181 if (g_Git.Run(gitcmd, &output,CP_UTF8))
2183 CMessageBox::Show(m_hWnd, output, _T("TortoiseGit"), MB_ICONERROR);
2185 else
2187 fentry->m_Action |= CTGitPath::LOGACTIONS_MODIFIED;
2188 fentry->m_Action &=~CTGitPath::LOGACTIONS_UNMERGED;
2192 CAppUtils::RemoveTempMergeFile(*fentry);
2195 Show(m_dwShow, 0, m_bShowFolders,0,true);
2198 break;
2200 case IDGITLC_IGNORE:
2202 CTGitPathList ignorelist;
2203 //std::vector<CString> toremove;
2204 FillListOfSelectedItemPaths(ignorelist, true);
2205 SetRedraw(FALSE);
2207 if(!CAppUtils::IgnoreFile(ignorelist,false))
2208 break;
2210 CWnd* pParent = GetParent();
2211 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2213 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2215 SetRedraw(TRUE);
2217 break;
2218 case IDGITLC_IGNOREMASK:
2220 CString common;
2221 CString ext=filepath->GetFileExtension();
2222 CTGitPathList ignorelist;
2223 FillListOfSelectedItemPaths(ignorelist, true);
2224 SetRedraw(FALSE);
2226 if (!CAppUtils::IgnoreFile(ignorelist,true))
2227 break;
2229 CWnd* pParent = GetParent();
2230 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2232 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2235 SetRedraw(TRUE);
2237 break;
2239 case IDGITLC_REVERT:
2241 // If at least one item is not in the status "added"
2242 // we ask for a confirmation
2243 BOOL bConfirm = FALSE;
2244 POSITION pos = GetFirstSelectedItemPosition();
2245 int index;
2246 while ((index = GetNextSelectedItem(pos)) >= 0)
2248 //FileEntry * fentry = GetListEntry(index);
2249 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
2250 if(fentry && fentry->m_Action &CTGitPath::LOGACTIONS_MODIFIED && !fentry->IsDirectory())
2252 bConfirm = TRUE;
2253 break;
2257 CString str;
2258 str.Format(IDS_PROC_WARNREVERT,GetSelectedCount());
2260 if (!bConfirm || CMessageBox::Show(this->m_hWnd, str, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION)==IDYES)
2262 CTGitPathList targetList;
2263 FillListOfSelectedItemPaths(targetList);
2265 // make sure that the list is reverse sorted, so that
2266 // children are removed before any parents
2267 targetList.SortByPathname(true);
2269 // put all reverted files in the trashbin, except the ones with 'added'
2270 // status because they are not restored by the revert.
2271 CTGitPathList delList;
2272 POSITION pos = GetFirstSelectedItemPosition();
2273 int index;
2274 while ((index = GetNextSelectedItem(pos)) >= 0)
2276 CTGitPath *entry=(CTGitPath *)GetItemData(index);
2277 if (entry&&(!(entry->m_Action& CTGitPath::LOGACTIONS_ADDED))
2278 && (!(entry->m_Action& CTGitPath::LOGACTIONS_REPLACED)) && !entry->IsDirectory())
2280 CTGitPath fullpath;
2281 fullpath.SetFromWin(g_Git.m_CurrentDir+_T("\\")+entry->GetWinPath());
2282 delList.AddPath(fullpath);
2285 if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))
2286 delList.DeleteAllFiles(true);
2288 CString revertToCommit = _T("HEAD");
2289 if (m_amend)
2290 revertToCommit = _T("HEAD~1");
2291 if (g_Git.Revert(revertToCommit, targetList))
2293 CMessageBox::Show(this->m_hWnd, _T("Revert Fail"), _T("TortoiseGit"), MB_ICONERROR);
2295 else
2297 bool updateStatusList = false;
2298 for(int i=0;i<targetList.GetCount();i++)
2300 int nListboxEntries = GetItemCount();
2301 for (int nItem=0; nItem<nListboxEntries; ++nItem)
2303 CTGitPath *path=(CTGitPath*)GetItemData(nItem);
2304 if (path->GetGitPathString()==targetList[i].GetGitPathString() && !path->IsDirectory())
2306 if(path->m_Action & CTGitPath::LOGACTIONS_ADDED)
2308 path->m_Action = CTGitPath::LOGACTIONS_UNVER;
2309 SetEntryCheck(path,nItem,false);
2310 updateStatusList = true;
2311 SetItemGroup(nItem,1);
2312 this->m_StatusFileList.RemoveItem(*path);
2313 this->m_UnRevFileList.AddPath(*path);
2314 //this->m_IgnoreFileList.RemoveItem(*path);
2317 else
2319 RemoveListEntry(nItem);
2321 break;
2323 else if (path->GetGitPathString()==targetList[i].GetGitPathString() && path->IsDirectory() && path->IsWCRoot())
2325 CString sCmd;
2326 sCmd.Format(_T("/command:revert /path:\"%s\""), path->GetGitPathString());
2327 CCommonAppUtils::RunTortoiseProc(sCmd);
2331 SetRedraw(TRUE);
2332 SaveColumnWidths();
2333 Show(m_dwShow, 0, m_bShowFolders,updateStatusList,true);
2334 NotifyCheck();
2338 break;
2340 case IDGITLC_ASSUMEVALID:
2342 CString cmdTemplate;
2343 cmdTemplate = _T("git.exe update-index --assume-unchanged \"%s\"");
2344 POSITION pos = GetFirstSelectedItemPosition();
2345 int index = -1;
2346 while ((index = GetNextSelectedItem(pos)) >= 0)
2348 CTGitPath * path = (CTGitPath *)GetItemData(index);
2349 ASSERT(path);
2350 if(path == NULL)
2351 continue;
2353 CString cmd, output;
2354 cmd.Format(cmdTemplate, path->GetGitPathString());
2355 if (g_Git.Run(cmd, &output, CP_UTF8))
2357 MessageBox(output, _T("TortoiseGit"), MB_ICONERROR);
2360 if (NULL != GetParent() && NULL != GetParent()->GetSafeHwnd())
2361 GetParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2363 SetRedraw(TRUE);
2365 break;
2366 case IDGITLC_SKIPWORKTREE:
2368 CString cmdTemplate;
2369 cmdTemplate = _T("git.exe update-index --skip-worktree \"%s\"");
2370 POSITION pos = GetFirstSelectedItemPosition();
2371 int index = -1;
2372 while ((index = GetNextSelectedItem(pos)) >= 0)
2374 CTGitPath * path = (CTGitPath *)GetItemData(index);
2375 ASSERT(path);
2376 if(path == NULL)
2377 continue;
2379 CString cmd, output;
2380 cmd.Format(cmdTemplate, path->GetGitPathString());
2381 if (g_Git.Run(cmd, &output, CP_UTF8))
2383 MessageBox(output, _T("TortoiseGit"), MB_ICONERROR);
2386 if (NULL != GetParent() && NULL != GetParent()->GetSafeHwnd())
2387 GetParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2389 SetRedraw(TRUE);
2391 break;
2392 case IDGITLC_COPY:
2393 CopySelectedEntriesToClipboard(0);
2394 break;
2395 case IDGITLC_COPYEXT:
2396 CopySelectedEntriesToClipboard((DWORD)-1);
2397 break;
2399 case IDGITLC_SAVEAS:
2400 FileSaveAs(filepath);
2401 break;
2403 case IDGITLC_REVERTTOREV:
2404 RevertSelectedItemToVersion();
2405 break;
2406 #if 0
2407 case IDSVNLC_COMMIT:
2409 CTSVNPathList targetList;
2410 FillListOfSelectedItemPaths(targetList);
2411 CTSVNPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
2412 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
2413 CString commandline = CPathUtils::GetAppDirectory();
2414 commandline += _T("TortoiseProc.exe /command:commit /pathfile:\"");
2415 commandline += tempFile.GetWinPathString();
2416 commandline += _T("\"");
2417 commandline += _T(" /deletepathfile");
2418 CAppUtils::LaunchApplication(commandline, NULL, false);
2420 break;
2421 case IDSVNLC_CREATEIGNORECS:
2422 CreateChangeList(SVNSLC_IGNORECHANGELIST);
2423 break;
2424 case IDSVNLC_CREATECS:
2426 CCreateChangelistDlg dlg;
2427 if (dlg.DoModal() == IDOK)
2429 CreateChangeList(dlg.m_sName);
2432 break;
2433 default:
2435 if (cmd < IDSVNLC_MOVETOCS)
2436 break;
2437 CTSVNPathList changelistItems;
2438 FillListOfSelectedItemPaths(changelistItems);
2440 // find the changelist name
2441 CString sChangelist;
2442 int cmdID = IDSVNLC_MOVETOCS;
2443 SetRedraw(FALSE);
2444 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
2446 if ((it->first.Compare(SVNSLC_IGNORECHANGELIST))&&(entry->changelist.Compare(it->first)))
2448 if (cmd == cmdID)
2450 sChangelist = it->first;
2452 cmdID++;
2455 if (!sChangelist.IsEmpty())
2457 SVN git;
2458 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
2460 // The changelists were moved, but we now need to run through the selected items again
2461 // and update their changelist
2462 POSITION pos = GetFirstSelectedItemPosition();
2463 int index;
2464 while ((index = GetNextSelectedItem(pos)) >= 0)
2466 FileEntry * e = GetListEntry(index);
2467 e->changelist = sChangelist;
2468 if (!e->IsFolder())
2470 if (m_changelists.find(e->changelist)!=m_changelists.end())
2471 SetItemGroup(index, m_changelists[e->changelist]);
2472 else
2473 SetItemGroup(index, 0);
2477 else
2479 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
2482 SetRedraw(TRUE);
2484 break;
2485 #endif
2487 } // switch (cmd)
2488 m_bBlock = FALSE;
2489 AfxGetApp()->DoWaitCursor(-1);
2490 GetStatisticsString();
2491 //int iItemCountAfterMenuCmd = GetItemCount();
2492 //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)
2494 // CWnd* pParent = GetParent();
2495 // if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2496 // {
2497 // pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);
2498 // }
2500 } // if (popup.CreatePopupMenu())
2501 } // if (selIndex >= 0)
2505 void CGitStatusListCtrl::OnContextMenuHeader(CWnd * pWnd, CPoint point)
2507 Locker lock(m_critSec);
2508 m_ColumnManager.OnContextMenuHeader(pWnd,point,!!IsGroupViewEnabled());
2511 void CGitStatusListCtrl::OnContextMenu(CWnd* pWnd, CPoint point)
2514 if (pWnd == this)
2516 OnContextMenuList(pWnd, point);
2517 } // if (pWnd == this)
2518 else if (pWnd == GetHeaderCtrl())
2520 OnContextMenuHeader(pWnd, point);
2524 void CGitStatusListCtrl::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
2527 Locker lock(m_critSec);
2528 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
2529 *pResult = 0;
2530 if (m_bBlock)
2531 return;
2533 if (pNMLV->iItem < 0)
2535 if (!IsGroupViewEnabled())
2536 return;
2537 POINT pt;
2538 DWORD ptW = GetMessagePos();
2539 pt.x = GET_X_LPARAM(ptW);
2540 pt.y = GET_Y_LPARAM(ptW);
2541 ScreenToClient(&pt);
2542 int group = GetGroupFromPoint(&pt);
2543 if (group < 0)
2544 return;
2545 // check/uncheck the whole group depending on the check-state
2546 // of the first item in the group
2547 m_bBlock = true;
2548 bool bCheck = false;
2549 bool bFirst = false;
2550 LVITEM lv;
2551 for (int i=0; i<GetItemCount(); ++i)
2553 SecureZeroMemory(&lv, sizeof(LVITEM));
2554 lv.mask = LVIF_GROUPID;
2555 lv.iItem = i;
2556 GetItem(&lv);
2557 if (lv.iGroupId == group)
2559 CTGitPath *entry=(CTGitPath*)GetItemData(i);
2561 if (!bFirst)
2563 bCheck = !GetCheck(i);
2564 bFirst = true;
2566 if (entry)
2568 bool bOldCheck = !!GetCheck(i);
2569 SetEntryCheck(entry, i, bCheck);
2570 if (bCheck != bOldCheck)
2572 if (bCheck)
2573 m_nSelected++;
2574 else
2575 m_nSelected--;
2580 GetStatisticsString();
2581 m_bBlock = false;
2582 NotifyCheck();
2583 return;
2586 CTGitPath *file=(CTGitPath*)GetItemData(pNMLV->iItem);
2588 if (file->m_Action == CTGitPath::LOGACTIONS_UNVER) {
2589 OpenFile(file, OPEN);
2590 return;
2592 if( file->m_Action&CTGitPath::LOGACTIONS_UNMERGED )
2594 CAppUtils::ConflictEdit(*file,false,m_bIsRevertTheirMy);
2597 else
2599 if( (!m_Rev1.IsEmpty()) || (!m_Rev1.IsEmpty())) // m_Rev1 twice???
2600 StartDiffTwo(pNMLV->iItem);
2601 else
2602 StartDiff(pNMLV->iItem);
2606 void CGitStatusListCtrl::StartDiffTwo(int fileindex)
2608 if(fileindex<0)
2609 return;
2611 CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);
2613 CGitDiff::Diff(&file1,&file1,
2614 m_Rev1,
2615 m_Rev2);
2618 void CGitStatusListCtrl::StartDiffWC(int fileindex)
2620 if(fileindex<0)
2621 return;
2623 CString Ver;
2624 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
2625 return;
2627 CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);
2629 CGitDiff::Diff(&file1,&file1, GIT_REV_ZERO, m_CurrentVersion);
2633 void CGitStatusListCtrl::StartDiff(int fileindex)
2635 if(fileindex<0)
2636 return;
2638 CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);
2639 CTGitPath file2;
2640 if(file1.m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY))
2642 file2.SetFromGit(file1.GetGitOldPathString());
2644 else
2646 file2=file1;
2649 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
2651 CString fromwhere;
2652 if(m_amend && (file1.m_Action & CTGitPath::LOGACTIONS_ADDED) == 0)
2653 fromwhere = _T("~1");
2654 if( g_Git.IsInitRepos())
2655 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2656 GIT_REV_ZERO);
2657 else if( file1.m_Action&CTGitPath::LOGACTIONS_ADDED )
2658 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2659 m_CurrentVersion+fromwhere,true);
2660 else if( file1.m_Action&CTGitPath::LOGACTIONS_DELETED )
2661 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2662 GitRev::GetHead()+fromwhere,false);
2663 else
2664 CGitDiff::Diff(&file1,&file2,
2665 CString(GIT_REV_ZERO),
2666 GitRev::GetHead()+fromwhere);
2668 else
2670 GitRev rev;
2671 CString fromwhere = m_CurrentVersion+_T("~1");
2672 if(m_amend)
2673 fromwhere = m_CurrentVersion+_T("~2");
2674 if(rev.GetCommit(fromwhere) || (file1.m_Action == file1.LOGACTIONS_ADDED))
2676 CGitDiff::DiffNull(&file1,m_CurrentVersion,true);
2679 else if (file1.m_Action == file1.LOGACTIONS_DELETED)
2681 if (file1.m_ParentNo > 0)
2682 fromwhere.Format(_T("%s^%d"), m_CurrentVersion, file1.m_ParentNo + 1);
2684 CGitDiff::DiffNull(&file1,fromwhere,false);
2686 else
2688 if( file1.m_ParentNo & MERGE_MASK)
2691 CTGitPath base, theirs, mine, merge;
2693 CString temppath;
2694 GetTempPath(temppath);
2695 temppath.TrimRight(_T("\\"));
2697 mine.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".LOCAL") + file1.GetFileExtension());
2698 theirs.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".REMOTE") + file1.GetFileExtension());
2699 base.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".BASE") + file1.GetFileExtension());
2701 CFile tempfile;
2702 //create a empty file, incase stage is not three
2703 tempfile.Open(mine.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2704 tempfile.Close();
2705 tempfile.Open(theirs.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2706 tempfile.Close();
2707 tempfile.Open(base.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2708 tempfile.Close();
2710 merge.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".Merged") + file1.GetFileExtension());
2712 int parent1=-1, parent2 =-1;
2713 for(int i=0;i<this->m_arStatusArray.size();i++)
2715 if(m_arStatusArray[i]->GetGitPathString() == file1.GetGitPathString())
2717 if(m_arStatusArray[i]->m_ParentNo & MERGE_MASK)
2720 else
2722 if(parent1<0)
2724 parent1 = m_arStatusArray[i]->m_ParentNo & PARENT_MASK;
2726 else if (parent2 <0)
2728 parent2 = m_arStatusArray[i]->m_ParentNo & PARENT_MASK;
2734 if(g_Git.GetOneFile(m_CurrentVersion, file1, (CString&)merge.GetWinPathString()))
2736 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2739 if(parent1>=0)
2741 CString str;
2742 str.Format(_T("%s^%d"),this->m_CurrentVersion, parent1+1);
2744 if(g_Git.GetOneFile(str, file1, (CString&)mine.GetWinPathString()))
2746 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2750 if(parent2>=0)
2752 CString str;
2753 str.Format(_T("%s^%d"),this->m_CurrentVersion, parent2+1);
2755 if(g_Git.GetOneFile(str, file1, (CString&)theirs.GetWinPathString()))
2757 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2761 if(parent1>=0 && parent2>=0)
2763 CString cmd, output;
2764 cmd.Format(_T("git.exe merge-base %s^%d %s^%d"), this->m_CurrentVersion, parent1+1,
2765 this->m_CurrentVersion,parent2+1);
2767 if (g_Git.Run(cmd, &output, NULL, CP_UTF8))
2770 else
2772 if(g_Git.GetOneFile(output.Left(40), file1, (CString&)base.GetWinPathString()))
2774 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETBASEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2778 CAppUtils::StartExtMerge(base, theirs, mine, merge,_T("BASE"),_T("REMOTE"),_T("LOCAL"));
2781 else
2783 CString str;
2784 if( (file1.m_ParentNo&PARENT_MASK) == 0)
2786 str = _T("~1");
2788 else
2790 str.Format(_T("^%d"), (file1.m_ParentNo&PARENT_MASK)+1);
2792 CGitDiff::Diff(&file1,&file2,
2793 m_CurrentVersion,
2794 m_CurrentVersion+str);
2800 CString CGitStatusListCtrl::GetStatisticsString(bool simple)
2803 CString sNormal, sAdded, sDeleted, sModified, sConflicted, sUnversioned, sRenamed;
2804 WORD langID = (WORD)(DWORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
2805 TCHAR buf[MAX_STATUS_STRING_LENGTH];
2806 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_normal, buf, _countof(buf), langID);
2807 sNormal = buf;
2808 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_added, buf, _countof(buf), langID);
2809 sAdded = buf;
2810 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_deleted, buf, _countof(buf), langID);
2811 sDeleted = buf;
2812 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_modified, buf, _countof(buf), langID);
2813 sModified = buf;
2814 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_conflicted, buf, _countof(buf), langID);
2815 sConflicted = buf;
2816 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_unversioned, buf, _countof(buf), langID);
2817 sUnversioned = buf;
2818 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_replaced, buf, _countof(buf), langID);
2819 sRenamed = buf;
2820 CString sToolTip;
2821 if(simple)
2823 sToolTip.Format(IDS_STATUSLIST_STATUSLINE1,
2824 this->m_nLineAdded,this->m_nLineDeleted,
2825 (LPCTSTR)sModified, m_nModified,
2826 (LPCTSTR)sAdded, m_nAdded,
2827 (LPCTSTR)sDeleted, m_nDeleted,
2828 (LPCTSTR)sRenamed, m_nRenamed
2831 else
2833 sToolTip.Format(IDS_STATUSLIST_STATUSLINE2,
2834 this->m_nLineAdded,this->m_nLineDeleted,
2835 (LPCTSTR)sNormal, m_nNormal,
2836 (LPCTSTR)sUnversioned, m_nUnversioned,
2837 (LPCTSTR)sModified, m_nModified,
2838 (LPCTSTR)sAdded, m_nAdded,
2839 (LPCTSTR)sDeleted, m_nDeleted,
2840 (LPCTSTR)sConflicted, m_nConflicted
2843 CString sStats;
2844 sStats.Format(IDS_COMMITDLG_STATISTICSFORMAT, m_nSelected, GetItemCount());
2845 if (m_pStatLabel)
2847 m_pStatLabel->SetWindowText(sStats);
2850 if (m_pSelectButton)
2852 if (m_nSelected == 0)
2853 m_pSelectButton->SetCheck(BST_UNCHECKED);
2854 else if (m_nSelected != GetItemCount())
2855 m_pSelectButton->SetCheck(BST_INDETERMINATE);
2856 else
2857 m_pSelectButton->SetCheck(BST_CHECKED);
2860 if (m_pConfirmButton)
2862 m_pConfirmButton->EnableWindow(m_nSelected>0);
2865 return sToolTip;
2870 CString CGitStatusListCtrl::GetCommonDirectory(bool bStrict)
2872 if (!bStrict)
2874 // not strict means that the selected folder has priority
2875 if (!m_StatusFileList.GetCommonDirectory().IsEmpty())
2876 return m_StatusFileList.GetCommonDirectory().GetWinPath();
2879 CTGitPath commonBaseDirectory;
2880 int nListItems = GetItemCount();
2881 for (int i=0; i<nListItems; ++i)
2883 CTGitPath baseDirectory,*p= (CTGitPath*)this->GetItemData(i);
2884 ASSERT(p);
2885 if(p==NULL)
2886 continue;
2887 baseDirectory = p->GetDirectory();
2889 if(commonBaseDirectory.IsEmpty())
2891 commonBaseDirectory = baseDirectory;
2893 else
2895 if (commonBaseDirectory.GetWinPathString().GetLength() > baseDirectory.GetWinPathString().GetLength())
2897 if (baseDirectory.IsAncestorOf(commonBaseDirectory))
2898 commonBaseDirectory = baseDirectory;
2902 return g_Git.m_CurrentDir+CString(_T("\\"))+commonBaseDirectory.GetWinPath();
2906 void CGitStatusListCtrl::SelectAll(bool bSelect, bool /*bIncludeNoCommits*/)
2908 CWaitCursor waitCursor;
2909 // block here so the LVN_ITEMCHANGED messages
2910 // get ignored
2911 m_bBlock = TRUE;
2912 SetRedraw(FALSE);
2914 int nListItems = GetItemCount();
2915 if (bSelect)
2916 m_nSelected = nListItems;
2917 else
2918 m_nSelected = 0;
2920 for (int i=0; i<nListItems; ++i)
2922 //FileEntry * entry = GetListEntry(i);
2923 //ASSERT(entry != NULL);
2924 CTGitPath *path = (CTGitPath *) GetItemData(i);
2925 if (path == NULL)
2926 continue;
2927 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))
2928 SetEntryCheck(path,i,bSelect);
2931 // unblock before redrawing
2932 m_bBlock = FALSE;
2933 SetRedraw(TRUE);
2934 GetStatisticsString();
2935 NotifyCheck();
2938 void CGitStatusListCtrl::Check(DWORD dwCheck, bool check)
2940 CWaitCursor waitCursor;
2941 // block here so the LVN_ITEMCHANGED messages
2942 // get ignored
2943 m_bBlock = TRUE;
2944 SetRedraw(FALSE);
2946 int nListItems = GetItemCount();
2948 for (int i = 0; i < nListItems; ++i)
2950 CTGitPath *entry = (CTGitPath *) GetItemData(i);
2951 if (entry == NULL)
2952 continue;
2954 DWORD showFlags = entry->m_Action;
2955 if (entry->IsDirectory())
2956 showFlags |= GITSLC_SHOWSUBMODULES;
2957 else
2958 showFlags |= GITSLC_SHOWFILES;
2960 if (check && (showFlags & dwCheck) && !GetCheck(i) && !(entry->IsDirectory() && m_bDoNotAutoselectSubmodules && !(dwCheck & GITSLC_SHOWSUBMODULES)))
2962 SetEntryCheck(entry, i, true);
2963 m_nSelected++;
2965 else if (!check && (showFlags & dwCheck) && GetCheck(i))
2967 SetEntryCheck(entry, i, false);
2968 m_nSelected--;
2971 // unblock before redrawing
2972 m_bBlock = FALSE;
2973 SetRedraw(TRUE);
2974 GetStatisticsString();
2975 NotifyCheck();
2978 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR *pNMHDR, LRESULT *pResult)
2980 LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast<LPNMLVGETINFOTIP>(pNMHDR);
2981 *pResult = 0;
2982 if (m_bBlock)
2983 return;
2985 CTGitPath *entry=(CTGitPath *)GetItemData(pGetInfoTip->iItem);
2987 if (entry)
2988 if (pGetInfoTip->cchTextMax > entry->GetGitPathString().GetLength() + g_Git.m_CurrentDir.GetLength())
2990 CString str;
2991 str += g_Git.m_CurrentDir;
2992 str += _T("\\");
2993 str += entry->GetWinPathString();
2995 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, str.GetBuffer(), str.GetLength());
2999 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult)
3001 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
3003 // Take the default processing unless we set this to something else below.
3004 *pResult = CDRF_DODEFAULT;
3006 // First thing - check the draw stage. If it's the control's prepaint
3007 // stage, then tell Windows we want messages for every item.
3009 switch (pLVCD->nmcd.dwDrawStage)
3011 case CDDS_PREPAINT:
3012 *pResult = CDRF_NOTIFYITEMDRAW;
3013 break;
3014 case CDDS_ITEMPREPAINT:
3016 // This is the prepaint stage for an item. Here's where we set the
3017 // item's text color. Our return value will tell Windows to draw the
3018 // item itself, but it will use the new color we set here.
3020 // Tell Windows to paint the control itself.
3021 *pResult = CDRF_DODEFAULT;
3022 if (m_bBlock)
3023 return;
3025 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
3027 if (m_arStatusArray.size() > (DWORD_PTR)pLVCD->nmcd.dwItemSpec)
3030 //FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);
3031 CTGitPath *entry=(CTGitPath *)GetItemData((int)pLVCD->nmcd.dwItemSpec);
3032 if (entry == NULL)
3033 return;
3035 // coloring
3036 // ========
3037 // black : unversioned, normal
3038 // purple : added
3039 // blue : modified
3040 // brown : missing, deleted, replaced
3041 // green : merged (or potential merges)
3042 // red : conflicts or sure conflicts
3043 if(entry->m_Action & CTGitPath::LOGACTIONS_GRAY)
3045 crText = RGB(128,128,128);
3048 else if(entry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
3050 crText = m_Colors.GetColor(CColors::Conflict);
3053 else if(entry->m_Action & (CTGitPath::LOGACTIONS_MODIFIED))
3055 crText = m_Colors.GetColor(CColors::Modified);
3058 else if(entry->m_Action & (CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))
3060 crText = m_Colors.GetColor(CColors::Added);
3062 else if(entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
3064 crText = m_Colors.GetColor(CColors::DeletedNode);
3066 else if(entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
3068 crText = m_Colors.GetColor(CColors::RenamedNode);
3070 else if(entry->m_Action & CTGitPath::LOGACTIONS_MERGED)
3072 crText = m_Colors.GetColor(CColors::Merged);
3074 else
3076 crText = GetSysColor(COLOR_WINDOWTEXT);
3078 // Store the color back in the NMLVCUSTOMDRAW struct.
3079 pLVCD->clrText = crText;
3082 break;
3086 BOOL CGitStatusListCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
3088 if (pWnd != this)
3089 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
3090 if (!m_bBlock)
3092 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
3093 SetCursor(hCur);
3094 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
3096 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
3097 SetCursor(hCur);
3098 return TRUE;
3101 void CGitStatusListCtrl::RemoveListEntry(int index)
3104 Locker lock(m_critSec);
3105 DeleteItem(index);
3107 m_arStatusArray.erase(m_arStatusArray.begin()+index);
3109 #if 0
3110 delete m_arStatusArray[m_arListArray[index]];
3111 m_arStatusArray.erase(m_arStatusArray.begin()+m_arListArray[index]);
3112 m_arListArray.erase(m_arListArray.begin()+index);
3113 for (int i=index; i< (int)m_arListArray.size(); ++i)
3115 m_arListArray[i]--;
3117 #endif
3120 ///< Set a checkbox on an entry in the listbox
3121 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync
3122 void CGitStatusListCtrl::SetEntryCheck(CTGitPath* pEntry, int listboxIndex, bool bCheck)
3124 pEntry->m_Checked = bCheck;
3125 m_mapFilenameToChecked[pEntry->GetGitPathString()] = bCheck;
3126 SetCheck(listboxIndex, bCheck);
3129 #if 0
3130 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry* parentEntry, bool bCheck)
3133 int nListItems = GetItemCount();
3134 for (int j=0; j< nListItems ; ++j)
3136 FileEntry * childEntry = GetListEntry(j);
3137 ASSERT(childEntry != NULL);
3138 if (childEntry == NULL || childEntry == parentEntry)
3139 continue;
3140 if (childEntry->checked != bCheck)
3142 if (parentEntry->path.IsAncestorOf(childEntry->path))
3144 SetEntryCheck(childEntry,j,bCheck);
3145 if(bCheck)
3147 m_nSelected++;
3149 else
3151 m_nSelected--;
3158 #endif
3160 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList& pathList)
3163 pathList.Clear();
3164 int nListItems = GetItemCount();
3165 for (int i=0; i< nListItems; i++)
3167 CTGitPath * entry = (CTGitPath*)GetItemData(i);
3168 ASSERT(entry != NULL);
3169 if (entry->m_Checked)
3171 pathList.AddPath(*entry);
3174 pathList.SortByPathname();
3179 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)
3180 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList& pathList, bool /*bNoIgnored*/)
3182 pathList.Clear();
3184 POSITION pos = GetFirstSelectedItemPosition();
3185 int index;
3186 while ((index = GetNextSelectedItem(pos)) >= 0)
3188 CTGitPath * entry = (CTGitPath*)GetItemData(index);
3189 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))
3190 // continue;
3191 pathList.AddPath(*entry);
3195 UINT CGitStatusListCtrl::OnGetDlgCode()
3197 // we want to process the return key and not have that one
3198 // routed to the default pushbutton
3199 return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS;
3202 void CGitStatusListCtrl::OnNMReturn(NMHDR * /*pNMHDR*/, LRESULT *pResult)
3204 *pResult = 0;
3205 if (m_bBlock)
3206 return;
3207 POSITION pos = GetFirstSelectedItemPosition();
3208 while ( pos )
3210 int index = GetNextSelectedItem(pos);
3211 CTGitPath *file=(CTGitPath*)GetItemData(index);
3212 if (file->m_Action == CTGitPath::LOGACTIONS_UNVER)
3214 OpenFile(file, OPEN);
3216 else
3218 StartDiff(index);
3223 void CGitStatusListCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
3225 // Since we catch all keystrokes (to have the enter key processed here instead
3226 // of routed to the default pushbutton) we have to make sure that other
3227 // keys like Tab and Esc still do what they're supposed to do
3228 // Tab = change focus to next/previous control
3229 // Esc = quit the dialog
3230 switch (nChar)
3232 case (VK_TAB):
3234 ::PostMessage(GetParent()->GetSafeHwnd(), WM_NEXTDLGCTL, GetKeyState(VK_SHIFT)&0x8000, 0);
3235 return;
3237 break;
3238 case (VK_ESCAPE):
3240 ::SendMessage(GetParent()->GetSafeHwnd(), WM_CLOSE, 0, 0);
3242 break;
3245 CListCtrl::OnKeyDown(nChar, nRepCnt, nFlags);
3248 void CGitStatusListCtrl::PreSubclassWindow()
3250 CListCtrl::PreSubclassWindow();
3251 EnableToolTips(TRUE);
3252 SetWindowTheme(GetSafeHwnd(), L"Explorer", NULL);
3255 INT_PTR CGitStatusListCtrl::OnToolHitTest(CPoint point, TOOLINFO* pTI) const
3257 int row, col;
3258 RECT cellrect;
3259 row = CellRectFromPoint(point, &cellrect, &col );
3261 if (row == -1)
3262 return -1;
3265 pTI->hwnd = m_hWnd;
3266 pTI->uId = (UINT)((row<<10)+(col&0x3ff)+1);
3267 pTI->lpszText = LPSTR_TEXTCALLBACK;
3269 pTI->rect = cellrect;
3271 return pTI->uId;
3274 int CGitStatusListCtrl::CellRectFromPoint(CPoint& point, RECT *cellrect, int *col) const
3276 int colnum;
3278 // Make sure that the ListView is in LVS_REPORT
3279 if ((GetWindowLong(m_hWnd, GWL_STYLE) & LVS_TYPEMASK) != LVS_REPORT)
3280 return -1;
3282 // Get the top and bottom row visible
3283 int row = GetTopIndex();
3284 int bottom = row + GetCountPerPage();
3285 if (bottom > GetItemCount())
3286 bottom = GetItemCount();
3288 // Get the number of columns
3289 CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
3290 int nColumnCount = pHeader->GetItemCount();
3292 // Loop through the visible rows
3293 for ( ;row <=bottom;row++)
3295 // Get bounding rect of item and check whether point falls in it.
3296 CRect rect;
3297 GetItemRect(row, &rect, LVIR_BOUNDS);
3298 if (rect.PtInRect(point))
3300 // Now find the column
3301 for (colnum = 0; colnum < nColumnCount; colnum++)
3303 int colwidth = GetColumnWidth(colnum);
3304 if (point.x >= rect.left && point.x <= (rect.left + colwidth))
3306 RECT rectClient;
3307 GetClientRect(&rectClient);
3308 if (col)
3309 *col = colnum;
3310 rect.right = rect.left + colwidth;
3312 // Make sure that the right extent does not exceed
3313 // the client area
3314 if (rect.right > rectClient.right)
3315 rect.right = rectClient.right;
3316 *cellrect = rect;
3317 return row;
3319 rect.left += colwidth;
3323 return -1;
3326 void CGitStatusListCtrl::OnPaint()
3328 Default();
3329 if ((m_bBusy)||(m_bEmpty))
3331 CString str;
3332 if (m_bBusy)
3334 if (m_sBusy.IsEmpty())
3335 str.LoadString(IDS_STATUSLIST_BUSYMSG);
3336 else
3337 str = m_sBusy;
3339 else
3341 if (m_sEmpty.IsEmpty())
3342 str.LoadString(IDS_STATUSLIST_EMPTYMSG);
3343 else
3344 str = m_sEmpty;
3346 COLORREF clrText = ::GetSysColor(COLOR_WINDOWTEXT);
3347 COLORREF clrTextBk;
3348 if (IsWindowEnabled())
3349 clrTextBk = ::GetSysColor(COLOR_WINDOW);
3350 else
3351 clrTextBk = ::GetSysColor(COLOR_3DFACE);
3353 CRect rc;
3354 GetClientRect(&rc);
3355 CHeaderCtrl* pHC;
3356 pHC = GetHeaderCtrl();
3357 if (pHC != NULL)
3359 CRect rcH;
3360 pHC->GetItemRect(0, &rcH);
3361 rc.top += rcH.bottom;
3363 CDC* pDC = GetDC();
3365 CMyMemDC memDC(pDC, &rc);
3367 memDC.SetTextColor(clrText);
3368 memDC.SetBkColor(clrTextBk);
3369 memDC.FillSolidRect(rc, clrTextBk);
3370 rc.top += 10;
3371 CGdiObject * oldfont = memDC.SelectStockObject(DEFAULT_GUI_FONT);
3372 memDC.DrawText(str, rc, DT_CENTER | DT_VCENTER |
3373 DT_WORDBREAK | DT_NOPREFIX | DT_NOCLIP);
3374 memDC.SelectObject(oldfont);
3376 ReleaseDC(pDC);
3380 // prevent users from extending our hidden (size 0) columns
3381 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR *pNMHDR, LRESULT *pResult)
3383 m_ColumnManager.OnHdnBegintrack(pNMHDR, pResult);
3386 // prevent any function from extending our hidden (size 0) columns
3387 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
3389 if(!m_ColumnManager.OnHdnItemchanging(pNMHDR, pResult))
3390 Default();
3393 void CGitStatusListCtrl::OnDestroy()
3395 SaveColumnWidths(true);
3396 CListCtrl::OnDestroy();
3399 void CGitStatusListCtrl::OnBeginDrag(NMHDR* /*pNMHDR*/, LRESULT* pResult)
3401 #if 0
3402 Locker lock(m_critSec);
3403 CDropFiles dropFiles; // class for creating DROPFILES struct
3405 int index;
3406 POSITION pos = GetFirstSelectedItemPosition();
3407 while ( (index = GetNextSelectedItem(pos)) >= 0 )
3409 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
3410 CTGitPath path = fentry->GetPath();
3411 dropFiles.AddFile( path.GetWinPathString() );
3414 if ( dropFiles.GetCount()>0 )
3416 m_bOwnDrag = true;
3417 dropFiles.CreateStructure();
3418 m_bOwnDrag = false;
3420 #endif
3421 *pResult = 0;
3424 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry /* = false */)
3426 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
3427 for (int col = 0; col <= maxcol; col++)
3428 if (m_ColumnManager.IsVisible (col))
3429 m_ColumnManager.ColumnResized (col);
3431 if (bSaveToRegistry)
3432 m_ColumnManager.WriteSettings();
3435 bool CGitStatusListCtrl::EnableFileDrop()
3437 m_bFileDropsEnabled = true;
3438 return true;
3441 bool CGitStatusListCtrl::HasPath(const CTGitPath& path)
3443 for (size_t i=0; i < m_arStatusArray.size(); i++)
3445 if (m_arStatusArray[i]->IsEquivalentTo(path))
3446 return true;
3449 return false;
3452 BOOL CGitStatusListCtrl::PreTranslateMessage(MSG* pMsg)
3454 if (pMsg->message == WM_KEYDOWN)
3456 switch (pMsg->wParam)
3458 case 'A':
3460 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
3462 // select all entries
3463 for (int i=0; i<GetItemCount(); ++i)
3465 SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
3467 return TRUE;
3470 break;
3471 case 'C':
3472 case VK_INSERT:
3474 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
3476 // copy all selected paths to the clipboard
3477 if (GetAsyncKeyState(VK_SHIFT)&0x8000)
3478 CopySelectedEntriesToClipboard(GITSLC_COLSTATUS);
3479 else
3480 CopySelectedEntriesToClipboard(0);
3481 return TRUE;
3484 break;
3488 return CListCtrl::PreTranslateMessage(pMsg);
3491 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols)
3494 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
3495 // WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
3497 CString sClipboard;
3498 CString temp;
3499 //TCHAR buf[100];
3500 if (GetSelectedCount() == 0)
3501 return false;
3503 // first add the column titles as the first line
3504 // We needn't head when only path copy
3505 //temp.LoadString(IDS_STATUSLIST_COLFILE);
3506 //sClipboard = temp;
3508 DWORD selection = 0;
3509 for (int i = 0, count = m_ColumnManager.GetColumnCount(); i < count; ++i)
3510 if ( ((dwCols == -1) && m_ColumnManager.IsVisible (i))
3511 || ((dwCols != 1) && (i < 32) && ((dwCols & (1 << i)) != 0)))
3513 sClipboard += _T("\t") + m_ColumnManager.GetName(i);
3515 if (i < 32)
3516 selection += 1 << i;
3519 if(dwCols)
3520 sClipboard += _T("\r\n");
3522 POSITION pos = GetFirstSelectedItemPosition();
3523 int index;
3524 while ((index = GetNextSelectedItem(pos)) >= 0)
3526 CTGitPath * entry = (CTGitPath*)GetItemData(index);
3527 if(entry == NULL)
3528 continue;
3530 sClipboard += entry->GetWinPathString();
3531 if (selection & GITSLC_COLFILENAME)
3533 sClipboard += _T("\t")+entry->GetFileOrDirectoryName();
3535 if (selection & GITSLC_COLEXT)
3537 sClipboard += _T("\t")+entry->GetFileExtension();
3540 if (selection & GITSLC_COLSTATUS)
3542 sClipboard += _T("\t")+entry->GetActionName();
3544 #if 0
3545 if (selection & SVNSLC_COLDATE)
3547 TCHAR datebuf[SVN_DATE_BUFFER];
3548 apr_time_t date = entry->last_commit_date;
3549 SVN::formatDate(datebuf, date, true);
3550 if (date)
3551 temp = datebuf;
3552 else
3553 temp.Empty();
3554 sClipboard += _T("\t")+temp;
3556 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
3557 ; i < count
3558 ; ++i)
3560 if ((dwCols == -1) && m_ColumnManager.IsVisible (i))
3562 CString value
3563 = entry->present_props[m_ColumnManager.GetName(i)];
3564 sClipboard += _T("\t") + value;
3567 #endif
3568 if (selection & GITSLC_COLADD)
3570 sClipboard += _T("\t")+entry->m_StatAdd;
3572 if (selection & GITSLC_COLDEL)
3574 sClipboard += _T("\t")+entry->m_StatDel;
3577 sClipboard += _T("\r\n");
3580 return CStringUtils::WriteAsciiStringToClipboard(sClipboard);
3582 return TRUE;
3586 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()
3588 #if 0
3589 std::set<CString> changelists;
3590 POSITION pos = GetFirstSelectedItemPosition();
3591 int index;
3592 while ((index = GetNextSelectedItem(pos)) >= 0)
3594 FileEntry * entry = GetListEntry(index);
3595 if (!entry->changelist.IsEmpty())
3596 changelists.insert(entry->changelist);
3598 return changelists.size();
3599 #endif
3600 return 0;
3603 bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
3606 bool bHasGroups=false;
3607 int max =0;
3609 for(int i=0;i< this->m_arStatusArray.size(); i++)
3611 int ParentNo = m_arStatusArray[i]->m_ParentNo&PARENT_MASK;
3612 if( ParentNo > max)
3613 max=m_arStatusArray[i]->m_ParentNo&PARENT_MASK;
3616 if ( this->m_UnRevFileList.GetCount()>0 ||
3617 this->m_IgnoreFileList.GetCount()>0 ||
3618 max>0 || bForce)
3620 bHasGroups = true;
3623 RemoveAllGroups();
3624 EnableGroupView(bHasGroups);
3626 TCHAR groupname[1024];
3627 int groupindex = 0;
3629 if(bHasGroups)
3631 LVGROUP grp = {0};
3632 grp.cbSize = sizeof(LVGROUP);
3633 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3634 groupindex=0;
3636 //if(m_UnRevFileList.GetCount()>0)
3637 if(max >0)
3639 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MERGEDFILES)), 1023);
3640 grp.pszHeader = groupname;
3641 grp.iGroupId = MERGE_MASK;
3642 grp.uAlign = LVGA_HEADER_LEFT;
3643 InsertGroup(0, &grp);
3645 for(int i=0;i<=max;i++)
3647 CString str;
3648 str.Format(IDS_STATUSLIST_GROUP_DIFFWITHPARENT, i+1);
3649 grp.pszHeader = str.GetBuffer();
3650 str.ReleaseBuffer();
3651 grp.iGroupId = i;
3652 grp.uAlign = LVGA_HEADER_LEFT;
3653 InsertGroup(i+1, &grp);
3656 else
3658 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MODIFIEDFILES)), 1023);
3659 grp.pszHeader = groupname;
3660 grp.iGroupId = groupindex;
3661 grp.uAlign = LVGA_HEADER_LEFT;
3662 InsertGroup(groupindex++, &grp);
3666 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_NOTVERSIONEDFILES)), 1023);
3667 grp.pszHeader = groupname;
3668 grp.iGroupId = groupindex;
3669 grp.uAlign = LVGA_HEADER_LEFT;
3670 InsertGroup(groupindex++, &grp);
3673 //if(m_IgnoreFileList.GetCount()>0)
3675 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_IGNOREDFILES)), 1023);
3676 grp.pszHeader = groupname;
3677 grp.iGroupId = groupindex;
3678 grp.uAlign = LVGA_HEADER_LEFT;
3679 InsertGroup(groupindex++, &grp);
3684 #if 0
3685 m_bHasIgnoreGroup = false;
3687 // now add the items which don't belong to a group
3688 LVGROUP grp = {0};
3689 grp.cbSize = sizeof(LVGROUP);
3690 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3691 CString sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET));
3692 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
3693 grp.pszHeader = groupname;
3694 grp.iGroupId = groupindex;
3695 grp.uAlign = LVGA_HEADER_LEFT;
3696 InsertGroup(groupindex++, &grp);
3698 for (std::map<CString,int>::iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
3700 if (it->first.Compare(SVNSLC_IGNORECHANGELIST)!=0)
3702 LVGROUP grp = {0};
3703 grp.cbSize = sizeof(LVGROUP);
3704 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3705 _tcsncpy_s(groupname, 1024, it->first, 1023);
3706 grp.pszHeader = groupname;
3707 grp.iGroupId = groupindex;
3708 grp.uAlign = LVGA_HEADER_LEFT;
3709 it->second = InsertGroup(groupindex++, &grp);
3711 else
3712 m_bHasIgnoreGroup = true;
3715 if (m_bHasIgnoreGroup)
3717 // and now add the group 'ignore-on-commit'
3718 std::map<CString,int>::iterator it = m_changelists.find(SVNSLC_IGNORECHANGELIST);
3719 if (it != m_changelists.end())
3721 grp.cbSize = sizeof(LVGROUP);
3722 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3723 _tcsncpy_s(groupname, 1024, SVNSLC_IGNORECHANGELIST, 1023);
3724 grp.pszHeader = groupname;
3725 grp.iGroupId = groupindex;
3726 grp.uAlign = LVGA_HEADER_LEFT;
3727 it->second = InsertGroup(groupindex, &grp);
3730 #endif
3731 return bHasGroups;
3734 void CGitStatusListCtrl::NotifyCheck()
3736 CWnd* pParent = GetParent();
3737 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
3739 pParent->SendMessage(GITSLNM_CHECKCHANGED, m_nSelected);
3743 int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash,CTGitPathList *list)
3745 BYTE_VECTOR out;
3746 this->m_bBusy=TRUE;
3747 m_CurrentVersion=hash;
3749 int count = 0;
3750 if(list == NULL)
3751 count = 1;
3752 else
3753 count = list->GetCount();
3755 CString head = _T("HEAD");
3756 if(m_amend)
3757 head = _T("HEAD~1");
3759 if(hash == GIT_REV_ZERO)
3761 for(int i=0;i<count;i++)
3763 BYTE_VECTOR cmdout;
3764 cmdout.clear();
3765 CString cmd;
3766 if(!g_Git.IsInitRepos())
3768 // also list staged files which will be in the commit
3769 cmd=(_T("git.exe diff-index --cached --raw ") + head + _T(" --numstat -C -M -z"));
3770 g_Git.Run(cmd, &cmdout);
3772 if(list == NULL)
3773 cmd=(_T("git.exe diff-index --raw ") + head + _T(" --numstat -C -M -z"));
3774 else
3775 cmd.Format(_T("git.exe diff-index --raw ") + head + _T(" --numstat -C -M -z -- \"%s\""),(*list)[i].GetGitPathString());
3777 BYTE_VECTOR cmdErr;
3778 if(g_Git.Run(cmd, &cmdout, &cmdErr))
3780 int last = cmdErr.RevertFind(0,-1);
3781 CString str;
3782 g_Git.StringAppend(&str, &cmdErr[last + 1], CP_UTF8, (int)cmdErr.size() - last -1);
3783 CMessageBox::Show(NULL, str, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
3786 out.append(cmdout, 0);
3788 else // Init Repository
3790 //We will list all added file for init repository because commit will comit these
3791 //if(list == NULL)
3792 cmd=_T("git.exe ls-files -s -t -z");
3793 //else
3794 // cmd.Format(_T("git.exe ls-files -s -t -z -- \"%s\""),(*list)[i].GetGitPathString());
3796 g_Git.Run(cmd, &cmdout);
3797 //out+=cmdout;
3798 out.append(cmdout,0);
3802 if(g_Git.IsInitRepos())
3804 m_StatusFileList.ParserFromLsFile(out);
3805 for(int i=0;i<m_StatusFileList.GetCount();i++)
3806 ((CTGitPath&)(m_StatusFileList[i])).m_Action=CTGitPath::LOGACTIONS_ADDED;
3808 else
3809 this->m_StatusFileList.ParserFromLog(out);
3811 //handle delete conflict case, when remote : modified, local : deleted.
3812 for(int i=0;i<count;i++)
3814 BYTE_VECTOR cmdout;
3815 CString cmd;
3817 if(list == NULL)
3818 cmd=_T("git.exe ls-files -u -t -z");
3819 else
3820 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),(*list)[i].GetGitPathString());
3822 g_Git.Run(cmd, &cmdout);
3824 CTGitPathList conflictlist;
3825 conflictlist.ParserFromLog(cmdout);
3826 for(int i=0;i<conflictlist.GetCount();i++)
3828 CTGitPath *p=m_StatusFileList.LookForGitPath(conflictlist[i].GetGitPathString());
3829 if(p)
3830 p->m_Action|=CTGitPath::LOGACTIONS_UNMERGED;
3831 else
3832 m_StatusFileList.AddPath(conflictlist[i]);
3836 // handle source files of file renames/moves (issue #860)
3837 // if a file gets renamed and the new file "git add"ed, diff-index doesn't list the source file anymore
3838 for(int i = 0; i < count; i++)
3840 BYTE_VECTOR cmdout;
3841 CString cmd;
3843 if(list == NULL)
3844 cmd = _T("git.exe ls-files -d -z");
3845 else
3846 cmd.Format(_T("git.exe ls-files -d -z -- \"%s\""),(*list)[i].GetGitPathString());
3848 g_Git.Run(cmd, &cmdout);
3850 CTGitPathList deletelist;
3851 deletelist.ParserFromLog(cmdout, true);
3852 for(int i = 0; i < deletelist.GetCount(); i++)
3854 CTGitPath *p = m_StatusFileList.LookForGitPath(deletelist[i].GetGitPathString());
3855 if(!p)
3856 m_StatusFileList.AddPath(deletelist[i]);
3857 else if ((p->m_Action == CTGitPath::LOGACTIONS_ADDED || p->m_Action == CTGitPath::LOGACTIONS_REPLACED) && !p->Exists())
3859 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)
3861 g_Git.Run(_T("git.exe rm -f --cache -- \"") + p->GetWinPathString() + _T("\""), &cmdout);
3862 m_StatusFileList.RemoveItem(*p);
3868 else
3870 int count = 0;
3871 if(list == NULL)
3872 count = 1;
3873 else
3874 count = list->GetCount();
3876 for(int i=0;i<count;i++)
3878 BYTE_VECTOR cmdout;
3879 CString cmd;
3880 if(list == NULL)
3881 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M -z %s"),hash);
3882 else
3883 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M %s -z -- \"%s\""),hash,(*list)[i].GetGitPathString());
3885 g_Git.Run(cmd, &cmdout, NULL);
3887 out.append(cmdout);
3889 this->m_StatusFileList.ParserFromLog(out);
3893 for(int i=0;i<m_StatusFileList.GetCount();i++)
3895 CTGitPath * gitpatch=(CTGitPath*)&m_StatusFileList[i];
3896 gitpatch->m_Checked = TRUE;
3897 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
3900 this->m_bBusy=FALSE;
3901 return 0;
3904 int CGitStatusListCtrl::UpdateWithGitPathList(CTGitPathList &list)
3906 m_arStatusArray.clear();
3907 for(int i=0;i<list.GetCount();i++)
3909 CTGitPath * gitpath=(CTGitPath*)&list[i];
3911 if(gitpath ->m_Action & CTGitPath::LOGACTIONS_HIDE)
3912 continue;
3914 gitpath->m_Checked = TRUE;
3915 m_arStatusArray.push_back((CTGitPath*)&list[i]);
3917 return 0;
3920 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList *List)
3922 this->m_UnRevFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER,List);
3923 for(int i=0;i<m_UnRevFileList.GetCount();i++)
3925 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
3926 gitpatch->m_Checked = FALSE;
3927 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
3929 return 0;
3932 int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList *List)
3934 this->m_IgnoreFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER|CTGitPath::LOGACTIONS_IGNORE,List);
3935 for(int i=0;i<m_IgnoreFileList.GetCount();i++)
3937 CTGitPath * gitpatch=(CTGitPath*)&m_IgnoreFileList[i];
3938 gitpatch->m_Checked = FALSE;
3939 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
3941 return 0;
3943 int CGitStatusListCtrl::UpdateFileList(int mask,bool once,CTGitPathList *List)
3945 if(mask&CGitStatusListCtrl::FILELIST_MODIFY)
3947 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_MODIFY)))
3949 UpdateFileList(git_revnum_t(GIT_REV_ZERO),List);
3950 m_FileLoaded|=CGitStatusListCtrl::FILELIST_MODIFY;
3953 if(mask&CGitStatusListCtrl::FILELIST_UNVER)
3955 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_UNVER)))
3957 UpdateUnRevFileList(List);
3958 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
3960 if(mask&CGitStatusListCtrl::FILELIST_IGNORE && (once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_IGNORE))))
3962 UpdateIgnoreFileList(List);
3963 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
3966 return 0;
3969 void CGitStatusListCtrl::Clear()
3971 m_FileLoaded=0;
3972 this->DeleteAllItems();
3973 this->m_arListArray.clear();
3974 this->m_arStatusArray.clear();
3975 this->m_changelists.clear();
3977 //////////////////////////////////////////////////////////////////////////
3978 #if 0
3979 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium, DWORD * /*pdwEffect*/, POINTL pt)
3981 if(pFmtEtc->cfFormat == CF_HDROP && medium.tymed == TYMED_HGLOBAL)
3983 HDROP hDrop = (HDROP)GlobalLock(medium.hGlobal);
3984 if(hDrop != NULL)
3986 TCHAR szFileName[MAX_PATH];
3988 UINT cFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
3990 POINT clientpoint;
3991 clientpoint.x = pt.x;
3992 clientpoint.y = pt.y;
3993 ScreenToClient(m_hTargetWnd, &clientpoint);
3994 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
3996 CTSVNPathList changelistItems;
3997 for(UINT i = 0; i < cFiles; ++i)
3999 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
4000 changelistItems.AddPath(CTSVNPath(szFileName));
4002 // find the changelist name
4003 CString sChangelist;
4004 LONG_PTR nGroup = m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint);
4005 for (std::map<CString, int>::iterator it = m_pSVNStatusListCtrl->m_changelists.begin(); it != m_pSVNStatusListCtrl->m_changelists.end(); ++it)
4006 if (it->second == nGroup)
4007 sChangelist = it->first;
4008 if (!sChangelist.IsEmpty())
4010 SVN git;
4011 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
4013 for (int l=0; l<changelistItems.GetCount(); ++l)
4015 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
4016 if (index >= 0)
4018 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
4019 if (e)
4021 e->changelist = sChangelist;
4022 if (!e->IsFolder())
4024 if (m_pSVNStatusListCtrl->m_changelists.find(e->changelist)!=m_pSVNStatusListCtrl->m_changelists.end())
4025 m_pSVNStatusListCtrl->SetItemGroup(index, m_pSVNStatusListCtrl->m_changelists[e->changelist]);
4026 else
4027 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
4031 else
4033 HWND hParentWnd = GetParent(m_hTargetWnd);
4034 if (hParentWnd != NULL)
4035 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
4039 else
4041 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
4044 else
4046 SVN git;
4047 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
4049 for (int l=0; l<changelistItems.GetCount(); ++l)
4051 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
4052 if (index >= 0)
4054 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
4055 if (e)
4057 e->changelist = sChangelist;
4058 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
4061 else
4063 HWND hParentWnd = GetParent(m_hTargetWnd);
4064 if (hParentWnd != NULL)
4065 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
4069 else
4071 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
4075 else
4077 for(UINT i = 0; i < cFiles; ++i)
4079 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
4080 HWND hParentWnd = GetParent(m_hTargetWnd);
4081 if (hParentWnd != NULL)
4082 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)szFileName);
4086 GlobalUnlock(medium.hGlobal);
4088 return true; //let base free the medium
4090 HRESULT STDMETHODCALLTYPE CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect)
4092 CIDropTarget::DragOver(grfKeyState, pt, pdwEffect);
4093 *pdwEffect = DROPEFFECT_COPY;
4094 if (m_pSVNStatusListCtrl)
4096 POINT clientpoint;
4097 clientpoint.x = pt.x;
4098 clientpoint.y = pt.y;
4099 ScreenToClient(m_hTargetWnd, &clientpoint);
4100 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
4102 *pdwEffect = DROPEFFECT_MOVE;
4104 else if ((!m_pSVNStatusListCtrl->m_bFileDropsEnabled)||(m_pSVNStatusListCtrl->m_bOwnDrag))
4106 *pdwEffect = DROPEFFECT_NONE;
4109 return S_OK;
4112 #endif
4114 void CGitStatusListCtrl::FileSaveAs(CTGitPath *path)
4116 CString filename;
4117 filename.Format(_T("%s-%s%s"), path->GetBaseFilename(), this->m_CurrentVersion.Left(g_Git.GetShortHASHLength()), path->GetFileExtension());
4118 CFileDialog dlg(FALSE,NULL,
4119 filename,
4120 OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
4121 NULL);
4122 CString currentpath;
4123 currentpath=g_Git.m_CurrentDir+_T("\\");
4124 currentpath+=path->GetWinPathString();
4126 dlg.m_ofn.lpstrInitialDir=currentpath.GetBuffer();
4128 CString cmd,out;
4129 if(dlg.DoModal()==IDOK)
4131 filename = dlg.GetPathName();
4132 if(m_CurrentVersion == GIT_REV_ZERO)
4134 if(!CopyFile(g_Git.m_CurrentDir +_T("\\") + path->GetWinPath(),filename,false))
4136 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
4137 return;
4141 else
4143 if(g_Git.GetOneFile(m_CurrentVersion,*path,filename))
4145 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, path->GetGitPathString(), m_CurrentVersion, filename);
4146 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
4147 return;
4154 int CGitStatusListCtrl::RevertSelectedItemToVersion()
4156 if(this->m_CurrentVersion.IsEmpty())
4157 return 0;
4158 if(this->m_CurrentVersion == GIT_REV_ZERO)
4159 return 0;
4161 POSITION pos = GetFirstSelectedItemPosition();
4162 int index;
4163 CString cmd,out;
4164 int count =0;
4165 while ((index = GetNextSelectedItem(pos)) >= 0)
4167 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
4168 cmd.Format(_T("git.exe checkout %s -- \"%s\""),m_CurrentVersion,fentry->GetGitPathString());
4169 out.Empty();
4170 if (g_Git.Run(cmd, &out, CP_UTF8))
4172 if (MessageBox(out, _T("TortoiseGit"), MB_ICONEXCLAMATION | MB_OKCANCEL) == IDCANCEL)
4173 break;
4175 else
4176 count++;
4179 out.Format(IDS_STATUSLIST_FILESREVERTED, count, m_CurrentVersion);
4180 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
4181 return 0;
4184 void CGitStatusListCtrl::OpenFile(CTGitPath*filepath,int mode)
4186 CString file;
4187 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
4189 file = g_Git.m_CurrentDir + _T("\\") + filepath->GetWinPath();
4191 else
4193 CString temppath;
4194 GetTempPath(temppath);
4195 file.Format(_T("%s%s_%s%s"),
4196 temppath,
4197 filepath->GetBaseFilename(),
4198 m_CurrentVersion.Left(g_Git.GetShortHASHLength()),
4199 filepath->GetFileExtension());
4200 CString cmd,out;
4201 if(g_Git.GetOneFile(m_CurrentVersion, *filepath, file))
4203 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, filepath->GetGitPathString(), m_CurrentVersion, file);
4204 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
4205 return;
4207 SetFileAttributes(file, FILE_ATTRIBUTE_READONLY);
4209 if(mode == ALTERNATIVEEDITOR)
4211 CAppUtils::LaunchAlternativeEditor(file);
4212 return;
4214 int ret = HINSTANCE_ERROR;
4216 if(mode == OPEN )
4218 ret = (int)ShellExecute(this->m_hWnd, NULL,file, NULL, NULL, SW_SHOW);
4220 if (ret > HINSTANCE_ERROR)
4222 return;
4227 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
4228 cmd += file;
4229 CAppUtils::LaunchApplication(cmd, NULL, false);