1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2014 - TortoiseGit
4 // Copyright (C) 2003-2008, 2013 - TortoiseSVN
6 // This program is free software; you can redistribute it and/or
7 // modify it under the terms of the GNU General Public License
8 // as published by the Free Software Foundation; either version 2
9 // of the License, or (at your option) any later version.
11 // This program is distributed in the hope that it will be useful,
12 // but WITHOUT ANY WARRANTY; without even the implied warranty of
13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 // GNU General Public License for more details.
16 // You should have received a copy of the GNU General Public License
17 // along with this program; if not, write to the Free Software Foundation,
18 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
23 #include "..\\TortoiseShell\resource.h"
24 #include "GitStatusListCtrl.h"
25 #include "MessageBox.h"
27 #include "UnicodeUtils.h"
29 #include "PathUtils.h"
31 #include "StringUtils.h"
32 #include "DirFileEnum.h"
33 #include "LoglistUtils.h"
36 #include "GitProgressDlg.h"
37 #include "SysImageList.h"
40 #include "GitStatus.h"
42 #include "ShellUpdater.h"
43 #include "GitAdminDir.h"
44 #include "DropFiles.h"
46 #include "FormatMessageWrapper.h"
47 #include "BrowseFolder.h"
49 const UINT
CGitStatusListCtrl::GITSLNM_ITEMCOUNTCHANGED
50 = ::RegisterWindowMessage(_T("GITSLNM_ITEMCOUNTCHANGED"));
51 const UINT
CGitStatusListCtrl::GITSLNM_NEEDSREFRESH
52 = ::RegisterWindowMessage(_T("GITSLNM_NEEDSREFRESH"));
53 const UINT
CGitStatusListCtrl::GITSLNM_ADDFILE
54 = ::RegisterWindowMessage(_T("GITSLNM_ADDFILE"));
55 const UINT
CGitStatusListCtrl::GITSLNM_CHECKCHANGED
56 = ::RegisterWindowMessage(_T("GITSLNM_CHECKCHANGED"));
57 const UINT
CGitStatusListCtrl::GITSLNM_ITEMCHANGED
58 = ::RegisterWindowMessage(_T("GITSLNM_ITEMCHANGED"));
63 BEGIN_MESSAGE_MAP(CGitStatusListCtrl
, CListCtrl
)
64 ON_NOTIFY(HDN_ITEMCLICKA
, 0, OnHdnItemclick
)
65 ON_NOTIFY(HDN_ITEMCLICKW
, 0, OnHdnItemclick
)
66 ON_NOTIFY(HDN_ENDTRACK
, 0, OnColumnResized
)
67 ON_NOTIFY(HDN_ENDDRAG
, 0, OnColumnMoved
)
68 ON_NOTIFY_REFLECT_EX(LVN_ITEMCHANGED
, OnLvnItemchanged
)
70 ON_NOTIFY_REFLECT(NM_DBLCLK
, OnNMDblclk
)
71 ON_NOTIFY_REFLECT(LVN_GETINFOTIP
, OnLvnGetInfoTip
)
72 ON_NOTIFY_REFLECT(NM_CUSTOMDRAW
, OnNMCustomdraw
)
75 ON_NOTIFY_REFLECT(NM_RETURN
, OnNMReturn
)
78 ON_NOTIFY(HDN_BEGINTRACKA
, 0, &CGitStatusListCtrl::OnHdnBegintrack
)
79 ON_NOTIFY(HDN_BEGINTRACKW
, 0, &CGitStatusListCtrl::OnHdnBegintrack
)
80 ON_NOTIFY(HDN_ITEMCHANGINGA
, 0, &CGitStatusListCtrl::OnHdnItemchanging
)
81 ON_NOTIFY(HDN_ITEMCHANGINGW
, 0, &CGitStatusListCtrl::OnHdnItemchanging
)
83 ON_NOTIFY_REFLECT(LVN_BEGINDRAG
, OnBeginDrag
)
84 ON_NOTIFY_REFLECT(LVN_ITEMCHANGING
, &CGitStatusListCtrl::OnLvnItemchanging
)
89 CGitStatusListCtrl::CGitStatusListCtrl() : CListCtrl()
90 //, m_HeadRev(GitRev::REV_HEAD)
93 , m_pSelectButton(NULL
)
94 , m_pConfirmButton(NULL
)
97 , m_bShowIgnores(false)
99 , m_bIgnoreRemoveOnly(false)
100 , m_bCheckChildrenWithParent(false)
101 , m_bUnversionedLast(true)
102 , m_bHasChangeLists(false)
106 , m_bHasCheckboxes(false)
107 , m_bCheckIfGroupsExist(true)
108 , m_bFileDropsEnabled(false)
110 , m_dwDefaultColumns(0)
111 , m_ColumnManager(this)
112 , m_bAscending(false)
113 , m_nSortedColumn(-1)
114 , m_bHasExternalsFromDifferentRepos(false)
115 , m_sNoPropValueText(MAKEINTRESOURCE(IDS_STATUSLIST_NOPROPVALUE
))
117 , m_bDoNotAutoselectSubmodules(false)
119 , m_hwndLogicalParent(NULL
)
120 , m_bHasUnversionedItems(FALSE
)
122 , m_bHasExternals(false)
123 , m_bHasIgnoreGroup(false)
133 , m_nShownUnversioned(0)
134 , m_nShownModified(0)
137 , m_nShownConflicted(0)
139 , m_nShownSubmodules(0)
141 , m_bShowFolders(false)
143 , m_dwContextMenus(0)
148 m_dwDefaultColumns
= 0;
150 m_bIsRevertTheirMy
= false;
151 this->m_nLineAdded
=this->m_nLineDeleted
=0;
154 CGitStatusListCtrl::~CGitStatusListCtrl()
156 // if (m_pDropTarget)
157 // delete m_pDropTarget;
161 void CGitStatusListCtrl::ClearStatusArray()
164 Locker
lock(m_critSec
);
165 for (size_t i
= 0; i
< m_arStatusArray
.size(); ++i
)
167 delete m_arStatusArray
[i
];
169 m_arStatusArray
.clear();
173 void CGitStatusListCtrl::Init(DWORD dwColumns
, const CString
& sColumnInfoContainer
, unsigned __int64 dwContextMenus
/* = GitSLC_POPALL */, bool bHasCheckboxes
/* = true */, bool bHasWC
/* = true */, DWORD allowedColumns
/* = 0xffffffff */)
175 Locker
lock(m_critSec
);
177 m_dwDefaultColumns
= dwColumns
| 1;
178 m_dwContextMenus
= dwContextMenus
;
179 m_bHasCheckboxes
= bHasCheckboxes
;
182 // set the extended style of the listcontrol
183 // 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.
184 CRegDWORD
regFullRowSelect(_T("Software\\TortoiseGit\\FullRowSelect"), TRUE
);
185 DWORD exStyle
= LVS_EX_HEADERDRAGDROP
| LVS_EX_DOUBLEBUFFER
| LVS_EX_INFOTIP
| LVS_EX_SUBITEMIMAGES
;
186 if (DWORD(regFullRowSelect
))
187 exStyle
|= LVS_EX_FULLROWSELECT
;
188 exStyle
|= (bHasCheckboxes
? LVS_EX_CHECKBOXES
: 0);
190 SetExtendedStyle(exStyle
);
192 SetWindowTheme(m_hWnd
, L
"Explorer", NULL
);
194 m_nIconFolder
= SYS_IMAGE_LIST().GetDirIconIndex();
195 m_nRestoreOvl
= SYS_IMAGE_LIST().AddIcon((HICON
)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_RESTOREOVL
), IMAGE_ICON
, 0, 0, LR_DEFAULTSIZE
));
196 SYS_IMAGE_LIST().SetOverlayImage(m_nRestoreOvl
, OVL_RESTORE
);
197 SetImageList(&SYS_IMAGE_LIST(), LVSIL_SMALL
);
199 // keep CSorter::operator() in sync!!
200 static UINT standardColumnNames
[GITSLC_NUMCOLUMNS
]
201 = { IDS_STATUSLIST_COLFILE
202 , IDS_STATUSLIST_COLFILENAME
203 , IDS_STATUSLIST_COLEXT
204 , IDS_STATUSLIST_COLSTATUS
205 , IDS_STATUSLIST_COLADD
206 , IDS_STATUSLIST_COLDEL
207 , IDS_STATUSLIST_COLLASTMODIFIED
208 , IDS_STATUSLIST_COLSIZE
211 m_ColumnManager
.SetNames(standardColumnNames
,GITSLC_NUMCOLUMNS
);
212 m_ColumnManager
.ReadSettings(m_dwDefaultColumns
, 0xffffffff & ~(allowedColumns
| m_dwDefaultColumns
), sColumnInfoContainer
, GITSLC_NUMCOLUMNS
);
216 if (m_pDropTarget
== NULL
)
218 m_pDropTarget
= new CGitStatusListCtrlDropTarget(this);
219 RegisterDragDrop(m_hWnd
,m_pDropTarget
);
220 // create the supported formats:
222 ftetc
.dwAspect
= DVASPECT_CONTENT
;
224 ftetc
.tymed
= TYMED_HGLOBAL
;
225 ftetc
.cfFormat
=CF_HDROP
;
226 m_pDropTarget
->AddSuportedFormat(ftetc
);
233 bool CGitStatusListCtrl::SetBackgroundImage(UINT nID
)
235 return CAppUtils::SetListCtrlBackgroundImage(GetSafeHwnd(), nID
);
238 BOOL
CGitStatusListCtrl::GetStatus ( const CTGitPathList
* pathList
239 , bool bUpdate
/* = FALSE */
240 , bool bShowIgnores
/* = false */
241 , bool bShowUnRev
/* = false */
242 , bool bShowLocalChangesIgnored
/* = false */)
244 Locker
lock(m_critSec
);
245 int mask
= CGitStatusListCtrl::FILELIST_MODIFY
;
247 mask
|= CGitStatusListCtrl::FILELIST_IGNORE
;
249 mask
|= CGitStatusListCtrl::FILELIST_UNVER
;
250 if (bShowLocalChangesIgnored
)
251 mask
|= CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED
;
252 this->UpdateFileList(mask
,bUpdate
,(CTGitPathList
*)pathList
);
254 if (pathList
&& m_mapDirectFiles
.empty())
256 // remember files which are selected by users so that those can be preselected
257 for (int i
= 0; i
< pathList
->GetCount(); ++i
)
258 if (!(*pathList
)[i
].IsDirectory())
259 m_mapDirectFiles
[(*pathList
)[i
].GetGitPathString()] = true;
263 int refetchcounter
= 0;
266 // force the cursor to change
269 SetCursorPos(pt
.x
, pt
.y
);
271 m_mapFilenameToChecked
.clear();
272 //m_StatusUrlList.Clear();
273 bool bHasChangelists
= (m_changelists
.size() > 1 || (!m_changelists
.empty() && !m_bHasIgnoreGroup
));
274 m_changelists
.clear();
275 for (size_t i
=0; i
< m_arStatusArray
.size(); i
++)
277 FileEntry
* entry
= m_arStatusArray
[i
];
278 if ( bHasChangelists
&& entry
->checked
)
280 // If change lists are present, remember all checked entries
281 CString path
= entry
->GetPath().GetGitPathString();
282 m_mapFilenameToChecked
[path
] = true;
284 if ( (entry
->status
==git_wc_status_unversioned
|| entry
->status
==git_wc_status_missing
) && entry
->checked
)
286 // The user manually selected an unversioned or missing file. We remember
287 // this so that the selection can be restored when refreshing.
288 CString path
= entry
->GetPath().GetGitPathString();
289 m_mapFilenameToChecked
[path
] = true;
291 else if ( entry
->status
> git_wc_status_normal
&& !entry
->checked
)
293 // The user manually deselected a versioned file. We remember
294 // this so that the deselection can be restored when refreshing.
295 CString path
= entry
->GetPath().GetGitPathString();
296 m_mapFilenameToChecked
[path
] = false;
300 // use a sorted path list to make sure we fetch the status of
301 // parent items first, *then* the child items (if any)
302 CTGitPathList sortedPathList
= pathList
;
303 sortedPathList
.SortByPathname();
308 m_bHasExternalsFromDifferentRepos
= FALSE
;
309 m_bHasExternals
= FALSE
;
310 m_bHasUnversionedItems
= FALSE
;
312 m_bHasChangeLists
= false;
313 m_bShowIgnores
= bShowIgnores
;
320 // first clear possible status data left from
321 // previous GetStatus() calls
324 m_StatusFileList
= sortedPathList
;
326 // Since Git_client_status() returns all files, even those in
327 // folders included with Git:externals we need to check if all
328 // files we get here belongs to the same repository.
329 // It is possible to commit changes in an external folder, as long
330 // as the folder belongs to the same repository (but another path),
331 // but it is not possible to commit all files if the externals are
332 // from a different repository.
334 // To check if all files belong to the same repository, we compare the
335 // UUID's - if they're identical then the files belong to the same
336 // repository and can be committed. But if they're different, then
337 // tell the user to commit all changes in the external folders
339 CStringA sUUID
; // holds the repo UUID
340 CTGitPathList arExtPaths
; // list of Git:external paths
346 m_nTargetCount
= sortedPathList
.GetCount();
348 GitStatus
status(m_pbCanceled
);
349 if(m_nTargetCount
> 1 && sortedPathList
.AreAllPathsFilesInOneDirectory())
351 // This is a special case, where we've been given a list of files
352 // all from one folder
353 // We handle them by setting a status filter, then requesting the Git status of
354 // all the files in the directory, filtering for the ones we're interested in
355 status
.SetFilter(sortedPathList
);
357 // if all selected entries are files, we don't do a recursive status
358 // fetching. But if only one is a directory, we have to recurse.
359 git_depth_t depth
= git_depth_files
;
360 // We have set a filter. If all selected items were files or we fetch
361 // the status not recursively, then we have to include
362 // ignored items too - the user has selected them
363 bool bShowIgnoresRight
= true;
364 for (int fcindex
=0; fcindex
<sortedPathList
.GetCount(); ++fcindex
)
366 if (sortedPathList
[fcindex
].IsDirectory())
368 depth
= git_depth_infinity
;
369 bShowIgnoresRight
= false;
373 if(!FetchStatusForSingleTarget(config
, status
, sortedPathList
.GetCommonDirectory(), bUpdate
, sUUID
, arExtPaths
, true, depth
, bShowIgnoresRight
))
380 for(int nTarget
= 0; nTarget
< m_nTargetCount
; nTarget
++)
382 // check whether the path we want the status for is already fetched due to status-fetching
384 // this check is only done for file paths, because folder paths could be included already
385 // but not recursively
386 if (sortedPathList
[nTarget
].IsDirectory() || GetListEntry(sortedPathList
[nTarget
]) == NULL
)
388 if(!FetchStatusForSingleTarget(config
, status
, sortedPathList
[nTarget
], bUpdate
, sUUID
,
389 arExtPaths
, false, git_depth_infinity
, bShowIgnores
))
397 // remove the 'helper' files of conflicted items from the list.
398 // otherwise they would appear as unversioned files.
399 for (INT_PTR cind
= 0; cind
< m_ConflictFileList
.GetCount(); ++cind
)
401 for (size_t i
=0; i
< m_arStatusArray
.size(); i
++)
403 if (m_arStatusArray
[i
]->GetPath().IsEquivalentTo(m_ConflictFileList
[cind
]))
405 delete m_arStatusArray
[i
];
406 m_arStatusArray
.erase(m_arStatusArray
.begin()+i
);
412 } while(!BuildStatistics() && (refetchcounter
< 2) && (*m_pbCanceled
==false));
417 SetCursorPos(pt
.x
, pt
.y
);
424 // Get the show-flags bitmap value which corresponds to a particular Git status
425 DWORD
CGitStatusListCtrl::GetShowFlagsFromGitStatus(git_wc_status_kind status
)
429 case git_wc_status_none
:
430 case git_wc_status_unversioned
:
431 return GITSLC_SHOWUNVERSIONED
;
432 case git_wc_status_ignored
:
434 return GITSLC_SHOWDIRECTS
;
435 return GITSLC_SHOWDIRECTS
|GITSLC_SHOWIGNORED
;
436 case git_wc_status_incomplete
:
437 return GITSLC_SHOWINCOMPLETE
;
438 case git_wc_status_normal
:
439 return GITSLC_SHOWNORMAL
;
440 case git_wc_status_external
:
441 return GITSLC_SHOWEXTERNAL
;
442 case git_wc_status_added
:
443 return GITSLC_SHOWADDED
;
444 case git_wc_status_missing
:
445 return GITSLC_SHOWMISSING
;
446 case git_wc_status_deleted
:
447 return GITSLC_SHOWREMOVED
;
448 case git_wc_status_replaced
:
449 return GITSLC_SHOWREPLACED
;
450 case git_wc_status_modified
:
451 return GITSLC_SHOWMODIFIED
;
452 case git_wc_status_merged
:
453 return GITSLC_SHOWMERGED
;
454 case git_wc_status_conflicted
:
455 return GITSLC_SHOWCONFLICTED
;
456 case git_wc_status_obstructed
:
457 return GITSLC_SHOWOBSTRUCTED
;
459 // we should NEVER get here!
466 void CGitStatusListCtrl::Show(unsigned int dwShow
, unsigned int dwCheck
/*=0*/, bool /*bShowFolders*/ /* = true */,BOOL UpdateStatusList
,bool UseStoredCheckStatus
)
468 CWinApp
* pApp
= AfxGetApp();
470 pApp
->DoWaitCursor(1);
472 Locker
lock(m_critSec
);
473 WORD langID
= (WORD
)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
475 //SetItemCount(listIndex);
480 m_nShownUnversioned
= 0;
481 m_nShownModified
= 0;
484 m_nShownConflicted
= 0;
486 m_nShownSubmodules
= 0;
490 m_arStatusArray
.clear();
491 for (int i
= 0; i
< m_StatusFileList
.GetCount(); ++i
)
493 m_arStatusArray
.push_back((CTGitPath
*)&m_StatusFileList
[i
]);
496 for (int i
= 0; i
< m_UnRevFileList
.GetCount(); ++i
)
498 m_arStatusArray
.push_back((CTGitPath
*)&m_UnRevFileList
[i
]);
501 for (int i
= 0; i
< m_IgnoreFileList
.GetCount(); ++i
)
503 m_arStatusArray
.push_back((CTGitPath
*)&m_IgnoreFileList
[i
]);
507 if (m_nSortedColumn
>= 0)
509 CSorter
predicate (&m_ColumnManager
, m_nSortedColumn
, m_bAscending
);
510 std::sort(m_arStatusArray
.begin(), m_arStatusArray
.end(), predicate
);
514 for (size_t i
= 0; i
< m_arStatusArray
.size(); ++i
)
516 //set default checkbox status
517 CTGitPath
* entry
= ((CTGitPath
*)m_arStatusArray
[i
]);
518 CString path
= entry
->GetGitPathString();
519 if (!m_mapFilenameToChecked
.empty() && m_mapFilenameToChecked
.find(path
) != m_mapFilenameToChecked
.end())
521 entry
->m_Checked
=m_mapFilenameToChecked
[path
];
523 else if (!UseStoredCheckStatus
)
525 bool autoSelectSubmodules
= !(entry
->IsDirectory() && m_bDoNotAutoselectSubmodules
);
526 if ((entry
->m_Action
& dwCheck
|| dwShow
& GITSLC_SHOWDIRECTFILES
&& m_mapDirectFiles
.find(path
) != m_mapDirectFiles
.end()) && autoSelectSubmodules
)
527 entry
->m_Checked
=true;
529 entry
->m_Checked
=false;
530 m_mapFilenameToChecked
[path
] = entry
->m_Checked
;
533 if(entry
->m_Action
& dwShow
)
535 AddEntry(entry
,langID
,index
);
540 int maxcol
= ((CHeaderCtrl
*)(GetDlgItem(0)))->GetItemCount()-1;
541 for (int col
= 0; col
<= maxcol
; col
++)
542 SetColumnWidth (col
, m_ColumnManager
.GetWidth (col
, true));
545 GetStatisticsString();
547 CHeaderCtrl
* pHeader
= GetHeaderCtrl();
548 HDITEM HeaderItem
= {0};
549 HeaderItem
.mask
= HDI_FORMAT
;
550 for (int i
=0; i
<pHeader
->GetItemCount(); ++i
)
552 pHeader
->GetItem(i
, &HeaderItem
);
553 HeaderItem
.fmt
&= ~(HDF_SORTDOWN
| HDF_SORTUP
);
554 pHeader
->SetItem(i
, &HeaderItem
);
556 if (m_nSortedColumn
>= 0)
558 pHeader
->GetItem(m_nSortedColumn
, &HeaderItem
);
559 HeaderItem
.fmt
|= (m_bAscending
? HDF_SORTUP
: HDF_SORTDOWN
);
560 pHeader
->SetItem(m_nSortedColumn
, &HeaderItem
);
566 SetItemState(nSelectedEntry
, LVIS_SELECTED
, LVIS_SELECTED
);
567 EnsureVisible(nSelectedEntry
, false);
571 // Restore the item at the top of the list.
572 for (int i
=0;GetTopIndex() != nTopIndex
;i
++)
574 if ( !EnsureVisible(nTopIndex
+i
,false) )
582 pApp
->DoWaitCursor(-1);
588 this->BuildStatistics();
592 CWinApp
* pApp
= AfxGetApp();
594 pApp
->DoWaitCursor(1);
596 m_bShowFolders
= bShowFolders
;
598 int nTopIndex
= GetTopIndex();
599 POSITION posSelectedEntry
= GetFirstSelectedItemPosition();
600 int nSelectedEntry
= 0;
601 if (posSelectedEntry
)
602 nSelectedEntry
= GetNextSelectedItem(posSelectedEntry
);
608 m_arListArray
.clear();
610 m_arListArray
.reserve(m_arStatusArray
.size());
611 SetItemCount (static_cast<int>(m_arStatusArray
.size()));
614 for (size_t i
=0; i
< m_arStatusArray
.size(); ++i
)
616 FileEntry
* entry
= m_arStatusArray
[i
];
617 if ((entry
->inexternal
) && (!(dwShow
& SVNSLC_SHOWINEXTERNALS
)))
619 if ((entry
->differentrepo
|| entry
->isNested
) && (! (dwShow
& SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO
)))
621 if (entry
->IsFolder() && (!bShowFolders
))
622 continue; // don't show folders if they're not wanted.
625 git_wc_status_kind status
= GitStatus::GetMoreImportant(entry
->status
, entry
->remotestatus
);
626 DWORD showFlags
= GetShowFlagsFromGitStatus(status
);
627 if (entry
->IsLocked())
628 showFlags
|= SVNSLC_SHOWLOCKS
;
630 showFlags
|= SVNSLC_SHOWSWITCHED
;
631 if (!entry
->changelist
.IsEmpty())
632 showFlags
|= SVNSLC_SHOWINCHANGELIST
;
634 bool bAllowCheck
= ((entry
->changelist
.Compare(GITSLC_IGNORECHANGELIST
) != 0)
635 && (m_bCheckIfGroupsExist
|| (m_changelists
.empty() || (m_changelists
.size() == 1 && m_bHasIgnoreGroup
))));
637 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
639 if (status
!= Git_wc_status_ignored
|| (entry
->direct
) || (dwShow
& GitSLC_SHOWIGNORED
))
641 if ((!entry
->IsFolder()) && (status
== Git_wc_status_deleted
) && (dwShow
& SVNSLC_SHOWREMOVEDANDPRESENT
))
643 if (PathFileExists(entry
->GetPath().GetWinPath()))
645 m_arListArray
.push_back(i
);
646 if ((dwCheck
& SVNSLC_SHOWREMOVEDANDPRESENT
)||((dwCheck
& SVNSLC_SHOWDIRECTS
)&&(entry
->direct
)))
649 entry
->checked
= true;
651 AddEntry(entry
, langID
, listIndex
++);
654 else if ((dwShow
& showFlags
)||((dwShow
& SVNSLC_SHOWDIRECTFILES
)&&(entry
->direct
)&&(!entry
->IsFolder())))
656 m_arListArray
.push_back(i
);
657 if ((dwCheck
& showFlags
)||((dwCheck
& SVNSLC_SHOWDIRECTS
)&&(entry
->direct
)))
660 entry
->checked
= true;
662 AddEntry(entry
, langID
, listIndex
++);
664 else if ((dwShow
& showFlags
)||((dwShow
& SVNSLC_SHOWDIRECTFOLDER
)&&(entry
->direct
)&&entry
->IsFolder()))
666 m_arListArray
.push_back(i
);
667 if ((dwCheck
& showFlags
)||((dwCheck
& SVNSLC_SHOWDIRECTS
)&&(entry
->direct
)))
670 entry
->checked
= true;
672 AddEntry(entry
, langID
, listIndex
++);
678 SetItemCount(listIndex
);
680 m_ColumnManager
.UpdateRelevance (m_arStatusArray
, m_arListArray
);
682 int maxcol
= ((CHeaderCtrl
*)(GetDlgItem(0)))->GetItemCount()-1;
683 for (int col
= 0; col
<= maxcol
; col
++)
684 SetColumnWidth (col
, m_ColumnManager
.GetWidth (col
, true));
687 GetStatisticsString();
689 CHeaderCtrl
* pHeader
= GetHeaderCtrl();
690 HDITEM HeaderItem
= {0};
691 HeaderItem
.mask
= HDI_FORMAT
;
692 for (int i
=0; i
<pHeader
->GetItemCount(); ++i
)
694 pHeader
->GetItem(i
, &HeaderItem
);
695 HeaderItem
.fmt
&= ~(HDF_SORTDOWN
| HDF_SORTUP
);
696 pHeader
->SetItem(i
, &HeaderItem
);
700 pHeader
->GetItem(m_nSortedColumn
, &HeaderItem
);
701 HeaderItem
.fmt
|= (m_bAscending
? HDF_SORTUP
: HDF_SORTDOWN
);
702 pHeader
->SetItem(m_nSortedColumn
, &HeaderItem
);
707 SetItemState(nSelectedEntry
, LVIS_SELECTED
, LVIS_SELECTED
);
708 EnsureVisible(nSelectedEntry
, false);
712 // Restore the item at the top of the list.
713 for (int i
=0;GetTopIndex() != nTopIndex
;i
++)
715 if ( !EnsureVisible(nTopIndex
+i
,false) )
723 pApp
->DoWaitCursor(-1);
725 m_bEmpty
= (GetItemCount() == 0);
731 void CGitStatusListCtrl::Show(unsigned int /*dwShow*/, const CTGitPathList
& checkedList
, bool /*bShowFolders*/ /* = true */)
734 for (int i
= 0; i
< checkedList
.GetCount(); ++i
)
735 this->AddEntry((CTGitPath
*)&checkedList
[i
],0,i
);
739 Locker
lock(m_critSec
);
740 WORD langID
= (WORD
)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
742 CWinApp
* pApp
= AfxGetApp();
744 pApp
->DoWaitCursor(1);
746 m_bShowFolders
= bShowFolders
;
748 int nTopIndex
= GetTopIndex();
749 POSITION posSelectedEntry
= GetFirstSelectedItemPosition();
750 int nSelectedEntry
= 0;
751 if (posSelectedEntry
)
752 nSelectedEntry
= GetNextSelectedItem(posSelectedEntry
);
758 m_arListArray
.clear();
760 m_arListArray
.reserve(m_arStatusArray
.size());
761 SetItemCount (static_cast<int>(m_arStatusArray
.size()));
764 for (size_t i
=0; i
< m_arStatusArray
.size(); ++i
)
766 FileEntry
* entry
= m_arStatusArray
[i
];
767 if ((entry
->inexternal
) && (!(dwShow
& SVNSLC_SHOWINEXTERNALS
)))
769 if ((entry
->differentrepo
|| entry
->isNested
) && (! (dwShow
& SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO
)))
771 if (entry
->IsFolder() && (!bShowFolders
))
772 continue; // don't show folders if they're not wanted.
774 git_wc_status_kind status
= SVNStatus::GetMoreImportant(entry
->status
, entry
->remotestatus
);
775 DWORD showFlags
= GetShowFlagsFromSVNStatus(status
);
776 if (entry
->IsLocked())
777 showFlags
|= SVNSLC_SHOWLOCKS
;
778 if (!entry
->changelist
.IsEmpty())
779 showFlags
|= SVNSLC_SHOWINCHANGELIST
;
781 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
782 if (status
!= git_wc_status_ignored
|| (entry
->direct
) || (dwShow
& SVNSLC_SHOWIGNORED
))
784 for (int npath
= 0; npath
< checkedList
.GetCount(); ++npath
)
786 if (entry
->GetPath().IsEquivalentTo(checkedList
[npath
]))
788 entry
->checked
= true;
792 if ((!entry
->IsFolder()) && (status
== git_wc_status_deleted
) && (dwShow
& SVNSLC_SHOWREMOVEDANDPRESENT
))
794 if (PathFileExists(entry
->GetPath().GetWinPath()))
796 m_arListArray
.push_back(i
);
797 AddEntry(entry
, langID
, listIndex
++);
800 else if ((dwShow
& showFlags
)||((dwShow
& SVNSLC_SHOWDIRECTFILES
)&&(entry
->direct
)&&(!entry
->IsFolder())))
802 m_arListArray
.push_back(i
);
803 AddEntry(entry
, langID
, listIndex
++);
805 else if ((dwShow
& showFlags
)||((dwShow
& SVNSLC_SHOWDIRECTFOLDER
)&&(entry
->direct
)&&entry
->IsFolder()))
807 m_arListArray
.push_back(i
);
808 AddEntry(entry
, langID
, listIndex
++);
810 else if (entry
->switched
)
812 m_arListArray
.push_back(i
);
813 AddEntry(entry
, langID
, listIndex
++);
819 SetItemCount(listIndex
);
821 int maxcol
= ((CHeaderCtrl
*)(GetDlgItem(0)))->GetItemCount()-1;
822 for (int col
= 0; col
<= maxcol
; col
++)
823 SetColumnWidth (col
, m_ColumnManager
.GetWidth (col
, true));
826 GetStatisticsString();
828 CHeaderCtrl
* pHeader
= GetHeaderCtrl();
829 HDITEM HeaderItem
= {0};
830 HeaderItem
.mask
= HDI_FORMAT
;
831 for (int i
=0; i
<pHeader
->GetItemCount(); ++i
)
833 pHeader
->GetItem(i
, &HeaderItem
);
834 HeaderItem
.fmt
&= ~(HDF_SORTDOWN
| HDF_SORTUP
);
835 pHeader
->SetItem(i
, &HeaderItem
);
839 pHeader
->GetItem(m_nSortedColumn
, &HeaderItem
);
840 HeaderItem
.fmt
|= (m_bAscending
? HDF_SORTUP
: HDF_SORTDOWN
);
841 pHeader
->SetItem(m_nSortedColumn
, &HeaderItem
);
846 SetItemState(nSelectedEntry
, LVIS_SELECTED
, LVIS_SELECTED
);
847 EnsureVisible(nSelectedEntry
, false);
851 // Restore the item at the top of the list.
852 for (int i
=0;GetTopIndex() != nTopIndex
;i
++)
854 if ( !EnsureVisible(nTopIndex
+i
,false) )
862 pApp
->DoWaitCursor(-1);
864 m_bEmpty
= (GetItemCount() == 0);
869 int CGitStatusListCtrl::GetColumnIndex(int mask
)
871 for (int i
= 0; i
< 32; ++i
)
878 void CGitStatusListCtrl::AddEntry(CTGitPath
* GitPath
, WORD
/*langID*/, int listIndex
)
880 static CString
from(MAKEINTRESOURCE(IDS_STATUSLIST_FROM
));
881 static HINSTANCE
hResourceHandle(AfxGetResourceHandle());
882 static bool abbreviateRenamings(((DWORD
)CRegDWORD(_T("Software\\TortoiseGit\\AbbreviateRenamings"), FALSE
)) == TRUE
);
883 static bool relativeTimes
= (CRegDWORD(_T("Software\\TortoiseGit\\RelativeTimes"), FALSE
) != FALSE
);
885 CString path
= GitPath
->GetGitPathString();
888 int index
= listIndex
;
890 CString entryname
= GitPath
->GetGitPathString();
892 if (GitPath
->IsDirectory())
894 icon_idx
= m_nIconFolder
;
895 m_nShownSubmodules
++;
899 icon_idx
= SYS_IMAGE_LIST().GetPathIconIndex(*GitPath
);
902 switch (GitPath
->m_Action
)
904 case CTGitPath::LOGACTIONS_ADDED
:
905 case CTGitPath::LOGACTIONS_COPY
:
908 case CTGitPath::LOGACTIONS_DELETED
:
911 case CTGitPath::LOGACTIONS_REPLACED
:
912 case CTGitPath::LOGACTIONS_MODIFIED
:
913 case CTGitPath::LOGACTIONS_MERGED
:
916 case CTGitPath::LOGACTIONS_UNMERGED
:
917 m_nShownConflicted
++;
919 case CTGitPath::LOGACTIONS_UNVER
:
920 m_nShownUnversioned
++;
923 m_nShownUnversioned
++;
926 if(GitPath
->m_Action
& (CTGitPath::LOGACTIONS_REPLACED
|CTGitPath::LOGACTIONS_COPY
) && !GitPath
->GetGitOldPathString().IsEmpty())
928 if (!abbreviateRenamings
)
932 rename
.Format(from
, GitPath
->GetGitOldPathString());
933 entryname
+= _T(" ") + rename
;
938 tgpl
.AddPath(*GitPath
);
939 CTGitPath
old(GitPath
->GetGitOldPathString());
941 CString commonRoot
= tgpl
.GetCommonRoot().GetGitPathString();
942 if (!commonRoot
.IsEmpty())
943 commonRoot
+= _T("/");
944 if (old
.GetFileOrDirectoryName() == GitPath
->GetFileOrDirectoryName() && old
.GetContainingDirectory().GetGitPathString() != "" && GitPath
->GetContainingDirectory().GetGitPathString())
946 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();
948 else if (!commonRoot
.IsEmpty())
950 entryname
= commonRoot
+ _T("{") + GitPath
->GetGitOldPathString().Mid(commonRoot
.GetLength()) + _T(" => ") + GitPath
->GetGitPathString().Mid(commonRoot
.GetLength()) + _T("}");
954 entryname
= GitPath
->GetGitOldPathString().Mid(commonRoot
.GetLength()) + _T(" => ") + GitPath
->GetGitPathString().Mid(commonRoot
.GetLength());
959 InsertItem(index
, entryname
, icon_idx
);
960 if (m_restorepaths
.find(GitPath
->GetWinPathString()) != m_restorepaths
.end())
961 SetItemState(index
, INDEXTOOVERLAYMASK(OVL_RESTORE
), TVIS_OVERLAYMASK
);
963 this->SetItemData(index
, (DWORD_PTR
)GitPath
);
964 // SVNSLC_COLFILENAME
965 SetItemText(index
, nCol
++, GitPath
->GetFileOrDirectoryName());
967 SetItemText(index
, nCol
++, GitPath
->GetFileExtension());
969 SetItemText(index
, nCol
++, GitPath
->GetActionName());
971 SetItemText(index
, GetColumnIndex(GITSLC_COLADD
),GitPath
->m_StatAdd
);
972 SetItemText(index
, GetColumnIndex(GITSLC_COLDEL
),GitPath
->m_StatDel
);
975 CString modificationDate
;
976 __int64 filetime
= GitPath
->GetLastWriteTime();
977 if (filetime
&& (GitPath
->m_Action
!= CTGitPath::LOGACTIONS_DELETED
))
979 FILETIME
* f
= (FILETIME
*)(__int64
*)&filetime
;
980 modificationDate
= CLoglistUtils::FormatDateAndTime(CTime(g_Git
.filetime_to_time_t(f
)), DATE_SHORTDATE
, true, relativeTimes
);
982 SetItemText(index
, GetColumnIndex(GITSLC_COLMODIFICATIONDATE
), modificationDate
);
985 if (GitPath
->IsDirectory())
986 SetItemText(index
, GetColumnIndex(GITSLC_COLSIZE
), _T(""));
989 TCHAR buf
[100] = { 0 };
990 StrFormatByteSize64(GitPath
->GetFileSize(), buf
, 100);
991 SetItemText(index
, GetColumnIndex(GITSLC_COLSIZE
), buf
);
994 SetCheck(index
, GitPath
->m_Checked
);
995 if (GitPath
->m_Checked
)
998 if ((GitPath
->m_Action
& CTGitPath::LOGACTIONS_SKIPWORKTREE
) || (GitPath
->m_Action
& CTGitPath::LOGACTIONS_ASSUMEVALID
))
999 SetItemGroup(index
, 3);
1000 else if (GitPath
->m_Action
& CTGitPath::LOGACTIONS_IGNORE
)
1001 SetItemGroup(index
, 2);
1002 else if( GitPath
->m_Action
& CTGitPath::LOGACTIONS_UNVER
)
1003 SetItemGroup(index
,1);
1006 SetItemGroup(index
, GitPath
->m_ParentNo
&(PARENT_MASK
|MERGE_MASK
));
1014 bool CGitStatusListCtrl::SetItemGroup(int item
, int groupindex
)
1016 // if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS) == NULL)
1021 i
.mask
= LVIF_GROUPID
;
1024 i
.iGroupId
= groupindex
;
1026 return !!SetItem(&i
);
1029 void CGitStatusListCtrl::OnHdnItemclick(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1031 LPNMHEADER phdr
= reinterpret_cast<LPNMHEADER
>(pNMHDR
);
1033 if (m_bBlock
|| m_arStatusArray
.empty())
1036 if (m_nSortedColumn
== phdr
->iItem
)
1037 m_bAscending
= !m_bAscending
;
1039 m_bAscending
= TRUE
;
1040 m_nSortedColumn
= phdr
->iItem
;
1041 Show(m_dwShow
, 0, m_bShowFolders
,false,true);
1046 void CGitStatusListCtrl::OnLvnItemchanging(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1048 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1051 #define ISCHECKED(x) ((x) ? ((((x)&LVIS_STATEIMAGEMASK)>>12)-1) : FALSE)
1052 if ((m_bBlock
)&&(m_bBlockUI
))
1054 // if we're blocked, prevent changing of the check state
1055 if ((!ISCHECKED(pNMLV
->uOldState
) && ISCHECKED(pNMLV
->uNewState
))||
1056 (ISCHECKED(pNMLV
->uOldState
) && !ISCHECKED(pNMLV
->uNewState
)))
1061 BOOL
CGitStatusListCtrl::OnLvnItemchanged(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1063 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1065 CWnd
* pParent
= GetLogicalParent();
1066 if (NULL
!= pParent
&& NULL
!= pParent
->GetSafeHwnd())
1068 pParent
->SendMessage(GITSLNM_ITEMCHANGED
, pNMLV
->iItem
);
1071 if ((pNMLV
->uNewState
==0)||(pNMLV
->uNewState
& LVIS_SELECTED
)||(pNMLV
->uNewState
& LVIS_FOCUSED
))
1077 bool bSelected
= !!(ListView_GetItemState(m_hWnd
, pNMLV
->iItem
, LVIS_SELECTED
) & LVIS_SELECTED
);
1078 int nListItems
= GetItemCount();
1081 // was the item checked?
1083 //CTGitPath *gitpath=(CTGitPath*)GetItemData(pNMLV->iItem);
1084 //gitpath->m_Checked=GetCheck(pNMLV->iItem);
1086 if (GetCheck(pNMLV
->iItem
))
1088 CheckEntry(pNMLV
->iItem
, nListItems
);
1091 POSITION pos
= GetFirstSelectedItemPosition();
1093 while ((index
= GetNextSelectedItem(pos
)) >= 0)
1095 if (index
!= pNMLV
->iItem
)
1096 CheckEntry(index
, nListItems
);
1102 UncheckEntry(pNMLV
->iItem
, nListItems
);
1105 POSITION pos
= GetFirstSelectedItemPosition();
1107 while ((index
= GetNextSelectedItem(pos
)) >= 0)
1109 if (index
!= pNMLV
->iItem
)
1110 UncheckEntry(index
, nListItems
);
1115 GetStatisticsString();
1122 void CGitStatusListCtrl::OnColumnResized(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1124 m_ColumnManager
.OnColumnResized(pNMHDR
,pResult
);
1129 void CGitStatusListCtrl::OnColumnMoved(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1131 m_ColumnManager
.OnColumnMoved(pNMHDR
, pResult
);
1136 void CGitStatusListCtrl::CheckEntry(int index
, int /*nListItems*/)
1138 Locker
lock(m_critSec
);
1139 //FileEntry * entry = GetListEntry(index);
1140 CTGitPath
*path
=(CTGitPath
*)GetItemData(index
);
1141 ASSERT(path
!= NULL
);
1144 m_mapFilenameToChecked
[path
->GetGitPathString()] = true;
1145 SetCheck(index
, TRUE
);
1146 //entry = GetListEntry(index);
1147 // if an unversioned item was checked, then we need to check if
1148 // the parent folders are unversioned too. If the parent folders actually
1149 // are unversioned, then check those too.
1151 if (entry
->status
== git_wc_status_unversioned
)
1153 // we need to check the parent folder too
1154 const CTGitPath
& folderpath
= entry
->path
;
1155 for (int i
=0; i
< nListItems
; ++i
)
1157 FileEntry
* testEntry
= GetListEntry(i
);
1158 ASSERT(testEntry
!= NULL
);
1159 if (testEntry
== NULL
)
1161 if (!testEntry
->checked
)
1163 if (testEntry
->path
.IsAncestorOf(folderpath
) && (!testEntry
->path
.IsEquivalentTo(folderpath
)))
1165 SetEntryCheck(testEntry
,i
,true);
1171 bool bShift
= !!(GetAsyncKeyState(VK_SHIFT
) & 0x8000);
1172 if ( (entry
->status
== git_wc_status_deleted
) || (m_bCheckChildrenWithParent
) || (bShift
) )
1174 // if a deleted folder gets checked, we have to check all
1175 // children of that folder too.
1176 if (entry
->path
.IsDirectory())
1178 SetCheckOnAllDescendentsOf(entry
, true);
1181 // if a deleted file or folder gets checked, we have to
1182 // check all parents of this item too.
1183 for (int i
=0; i
<nListItems
; ++i
)
1185 FileEntry
* testEntry
= GetListEntry(i
);
1186 ASSERT(testEntry
!= NULL
);
1187 if (testEntry
== NULL
)
1189 if (!testEntry
->checked
)
1191 if (testEntry
->path
.IsAncestorOf(entry
->path
) && (!testEntry
->path
.IsEquivalentTo(entry
->path
)))
1193 if ((testEntry
->status
== git_wc_status_deleted
)||(m_bCheckChildrenWithParent
))
1195 SetEntryCheck(testEntry
,i
,true);
1197 // now we need to check all children of this parent folder
1198 SetCheckOnAllDescendentsOf(testEntry
, true);
1205 if ( !path
->m_Checked
)
1207 path
->m_Checked
= TRUE
;
1212 void CGitStatusListCtrl::UncheckEntry(int index
, int /*nListItems*/)
1214 Locker
lock(m_critSec
);
1215 CTGitPath
*path
=(CTGitPath
*)GetItemData(index
);
1216 ASSERT(path
!= NULL
);
1219 SetCheck(index
, FALSE
);
1220 m_mapFilenameToChecked
[path
->GetGitPathString()] = false;
1221 //entry = GetListEntry(index);
1222 // item was unchecked
1224 if (entry
->path
.IsDirectory())
1226 // disable all files within an unselected folder, except when unchecking a folder with property changes
1227 bool bShift
= !!(GetAsyncKeyState(VK_SHIFT
) & 0x8000);
1228 if ( (entry
->status
!= git_wc_status_modified
) || (bShift
) )
1230 SetCheckOnAllDescendentsOf(entry
, false);
1233 else if (entry
->status
== git_wc_status_deleted
)
1235 // a "deleted" file was unchecked, so uncheck all parent folders
1236 // and all children of those parents
1237 for (int i
=0; i
<nListItems
; i
++)
1239 FileEntry
* testEntry
= GetListEntry(i
);
1240 ASSERT(testEntry
!= NULL
);
1241 if (testEntry
== NULL
)
1243 if (testEntry
->checked
)
1245 if (testEntry
->path
.IsAncestorOf(entry
->path
))
1247 if (testEntry
->status
== git_wc_status_deleted
)
1249 SetEntryCheck(testEntry
,i
,false);
1252 SetCheckOnAllDescendentsOf(testEntry
, false);
1259 if ( path
->m_Checked
)
1261 path
->m_Checked
= FALSE
;
1265 bool CGitStatusListCtrl::BuildStatistics()
1268 bool bRefetchStatus
= false;
1270 // now gather some statistics
1283 for (size_t i
= 0; i
< m_arStatusArray
.size(); ++i
)
1285 int status
=((CTGitPath
*)m_arStatusArray
[i
])->m_Action
;
1287 m_nLineAdded
+= _tstol(((CTGitPath
*)m_arStatusArray
[i
])->m_StatAdd
);
1288 m_nLineDeleted
+= _tstol(((CTGitPath
*)m_arStatusArray
[i
])->m_StatDel
);
1290 if(status
&(CTGitPath::LOGACTIONS_ADDED
|CTGitPath::LOGACTIONS_COPY
))
1293 if(status
&CTGitPath::LOGACTIONS_DELETED
)
1296 if(status
&(CTGitPath::LOGACTIONS_REPLACED
|CTGitPath::LOGACTIONS_MODIFIED
))
1299 if(status
&CTGitPath::LOGACTIONS_UNMERGED
)
1302 if(status
&(CTGitPath::LOGACTIONS_IGNORE
|CTGitPath::LOGACTIONS_UNVER
))
1305 if(status
&(CTGitPath::LOGACTIONS_REPLACED
))
1308 if(((CTGitPath
*)m_arStatusArray
[i
])->m_Checked
)
1311 return !bRefetchStatus
;
1315 int CGitStatusListCtrl::GetGroupFromPoint(POINT
* ppt
)
1317 // the point must be relative to the upper left corner of the control
1321 if (!IsGroupViewEnabled())
1330 while (((flags
& LVHT_BELOW
) == 0)&&(pt
.y
< rc
.bottom
))
1332 nItem
= HitTest(pt
, &flags
);
1333 if ((flags
& LVHT_ONITEM
)||(flags
& LVHT_EX_GROUP_HEADER
))
1335 // the first item below the point
1337 // check if the point is too much right (i.e. if the point
1338 // is farther to the right than the width of the item)
1340 GetItemRect(nItem
, &r
, LVIR_LABEL
);
1341 if (ppt
->x
> r
.right
)
1345 lv
.mask
= LVIF_GROUPID
;
1348 int groupID
= lv
.iGroupId
;
1349 // now we search upwards and check if the item above this one
1350 // belongs to another group. If it belongs to the same group,
1351 // we're not over a group header
1355 nItem
= HitTest(pt
, &flags
);
1356 if ((flags
& LVHT_ONITEM
)&&(nItem
>= 0))
1358 // the first item below the point
1360 lv
.mask
= LVIF_GROUPID
;
1363 if (lv
.iGroupId
!= groupID
)
1378 void CGitStatusListCtrl::OnContextMenuGroup(CWnd
* /*pWnd*/, CPoint point
)
1380 POINT clientpoint
= point
;
1381 ScreenToClient(&clientpoint
);
1382 if ((IsGroupViewEnabled())&&(GetGroupFromPoint(&clientpoint
) >= 0))
1385 if (popup
.CreatePopupMenu())
1388 temp
.LoadString(IDS_STATUSLIST_CHECKGROUP
);
1389 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, IDGITLC_CHECKGROUP
, temp
);
1390 temp
.LoadString(IDS_STATUSLIST_UNCHECKGROUP
);
1391 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, IDGITLC_UNCHECKGROUP
, temp
);
1392 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1393 bool bCheck
= false;
1396 case IDGITLC_CHECKGROUP
:
1398 // fall through here
1399 case IDGITLC_UNCHECKGROUP
:
1401 int group
= GetGroupFromPoint(&clientpoint
);
1402 // go through all items and check/uncheck those assigned to the group
1403 // but block the OnLvnItemChanged handler
1406 for (int i
=0; i
<GetItemCount(); ++i
)
1408 SecureZeroMemory(&lv
, sizeof(LVITEM
));
1409 lv
.mask
= LVIF_GROUPID
;
1413 if (lv
.iGroupId
== group
)
1415 CTGitPath
* entry
= (CTGitPath
*)GetItemData(i
);
1418 bool bOldCheck
= entry
->m_Checked
;
1419 SetEntryCheck(entry
, i
, bCheck
);
1420 if (bCheck
!= bOldCheck
)
1431 GetStatisticsString();
1441 void CGitStatusListCtrl::OnContextMenuList(CWnd
* pWnd
, CPoint point
)
1444 //WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
1446 //bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1447 CTGitPath
* filepath
;
1449 int selIndex
= GetSelectionMark();
1450 if ((point
.x
== -1) && (point
.y
== -1))
1453 GetItemRect(selIndex
, &rect
, LVIR_LABEL
);
1454 ClientToScreen(&rect
);
1455 point
= rect
.CenterPoint();
1457 if ((GetSelectedCount() == 0) && (m_bHasCheckboxes
))
1459 // nothing selected could mean the context menu is requested for
1461 OnContextMenuGroup(pWnd
, point
);
1463 else if (selIndex
>= 0)
1465 //FileEntry * entry = GetListEntry(selIndex);
1467 filepath
= (CTGitPath
* )GetItemData(selIndex
);
1469 ASSERT(filepath
!= NULL
);
1470 if (filepath
== NULL
)
1473 //const CTGitPath& filepath = entry->path;
1474 int wcStatus
= filepath
->m_Action
;
1475 // entry is selected, now show the popup menu
1476 Locker
lock(m_critSec
);
1478 CMenu changelistSubMenu
;
1479 CMenu ignoreSubMenu
;
1480 if (popup
.CreatePopupMenu())
1482 //Add Menu for version controlled file
1484 if (GetSelectedCount() > 0 && wcStatus
& CTGitPath::LOGACTIONS_UNMERGED
)
1486 if (GetSelectedCount() == 1 && (m_dwContextMenus
& GITSLC_POPCONFLICT
)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1488 popup
.AppendMenuIcon(IDGITLC_EDITCONFLICT
, IDS_MENUCONFLICT
, IDI_CONFLICT
);
1490 if (m_dwContextMenus
& GITSLC_POPRESOLVE
)
1492 popup
.AppendMenuIcon(IDGITLC_RESOLVECONFLICT
, IDS_STATUSLIST_CONTEXT_RESOLVED
, IDI_RESOLVE
);
1494 if ((m_dwContextMenus
& GITSLC_POPRESOLVE
)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1496 popup
.AppendMenuIcon(IDGITLC_RESOLVETHEIRS
, IDS_SVNPROGRESS_MENUUSETHEIRS
, IDI_RESOLVE
);
1497 popup
.AppendMenuIcon(IDGITLC_RESOLVEMINE
, IDS_SVNPROGRESS_MENUUSEMINE
, IDI_RESOLVE
);
1499 if ((m_dwContextMenus
& GITSLC_POPCONFLICT
)||(m_dwContextMenus
& GITSLC_POPRESOLVE
))
1500 popup
.AppendMenu(MF_SEPARATOR
);
1503 if (GetSelectedCount() > 0)
1505 if (wcStatus
& (CTGitPath::LOGACTIONS_UNVER
| CTGitPath::LOGACTIONS_IGNORE
))
1507 if (m_dwContextMenus
& GITSLC_POPADD
)
1509 //if ( entry->IsFolder() )
1511 // popup.AppendMenuIcon(IDSVNLC_ADD_RECURSIVE, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE, IDI_ADD);
1515 popup
.AppendMenuIcon(IDGITLC_ADD
, IDS_STATUSLIST_CONTEXT_ADD
, IDI_ADD
);
1518 if (m_dwContextMenus
& GITSLC_POPCOMMIT
)
1520 popup
.AppendMenuIcon(IDGITLC_COMMIT
, IDS_STATUSLIST_CONTEXT_COMMIT
, IDI_COMMIT
);
1525 if (!(wcStatus
& (CTGitPath::LOGACTIONS_UNVER
| CTGitPath::LOGACTIONS_IGNORE
)) && GetSelectedCount() > 0)
1527 bool bEntryAdded
= false;
1528 if (m_dwContextMenus
& GITSLC_POPCOMPAREWITHBASE
)
1530 if(filepath
->m_ParentNo
& MERGE_MASK
)
1531 popup
.AppendMenuIcon(IDGITLC_COMPARE
, IDS_TREE_DIFF
, IDI_DIFF
);
1533 popup
.AppendMenuIcon(IDGITLC_COMPARE
, IDS_LOG_COMPAREWITHBASE
, IDI_DIFF
);
1535 popup
.SetDefaultItem(IDGITLC_COMPARE
, FALSE
);
1539 if (!g_Git
.IsInitRepos() && (m_dwContextMenus
& GITSLC_POPGNUDIFF
))
1541 popup
.AppendMenuIcon(IDGITLC_GNUDIFF1
, IDS_LOG_POPUP_GNUDIFF
, IDI_DIFF
);
1545 if ((m_dwContextMenus
& this->GetContextMenuBit(IDGITLC_COMPAREWC
)) && m_bHasWC
)
1547 if ((!m_CurrentVersion
.IsEmpty()) && m_CurrentVersion
!= GIT_REV_ZERO
)
1549 popup
.AppendMenuIcon(IDGITLC_COMPAREWC
, IDS_LOG_POPUP_COMPARE
, IDI_DIFF
);
1555 popup
.AppendMenu(MF_SEPARATOR
);
1558 if (!m_Rev1
.IsEmpty() && !m_Rev2
.IsEmpty())
1560 if(GetSelectedCount() == 1)
1562 if (m_dwContextMenus
& this->GetContextMenuBit(IDGITLC_COMPARETWOREVISIONS
))
1564 popup
.AppendMenuIcon(IDGITLC_COMPARETWOREVISIONS
, IDS_LOG_POPUP_COMPARETWO
, IDI_DIFF
);
1565 popup
.SetDefaultItem(IDGITLC_COMPARETWOREVISIONS
, FALSE
);
1567 if (m_dwContextMenus
& this->GetContextMenuBit(IDGITLC_GNUDIFF2REVISIONS
))
1569 popup
.AppendMenuIcon(IDGITLC_GNUDIFF2REVISIONS
, IDS_LOG_POPUP_GNUDIFF
, IDI_DIFF
);
1575 if (GetSelectedCount() > 0)
1577 if ((GetSelectedCount() == 2) && (m_dwContextMenus
& GITSLC_POPCOMPARETWOFILES
) && (this->m_CurrentVersion
.IsEmpty() || this->m_CurrentVersion
== GIT_REV_ZERO
))
1579 POSITION pos
= GetFirstSelectedItemPosition();
1580 int index
= GetNextSelectedItem(pos
);
1583 CTGitPath
* entry2
= NULL
;
1584 bool bothItemsAreExistingFiles
= true;
1585 entry2
= (CTGitPath
* )GetItemData(index
);
1587 bothItemsAreExistingFiles
= !entry2
->IsDirectory() && entry2
->Exists();
1588 index
= GetNextSelectedItem(pos
);
1591 entry2
= (CTGitPath
* )GetItemData(index
);
1593 bothItemsAreExistingFiles
= bothItemsAreExistingFiles
&& !entry2
->IsDirectory() && entry2
->Exists();
1594 if (bothItemsAreExistingFiles
)
1595 popup
.AppendMenuIcon(IDGITLC_COMPARETWOFILES
, IDS_STATUSLIST_CONTEXT_COMPARETWOFILES
, IDI_DIFF
);
1601 if ( (GetSelectedCount() >0 ) && (!(wcStatus
& (CTGitPath::LOGACTIONS_UNVER
| CTGitPath::LOGACTIONS_IGNORE
))) && m_bHasWC
)
1603 if ((m_dwContextMenus
& GITSLC_POPCOMMIT
) && (this->m_CurrentVersion
.IsEmpty() || this->m_CurrentVersion
== GIT_REV_ZERO
) && !(wcStatus
& (CTGitPath::LOGACTIONS_SKIPWORKTREE
| CTGitPath::LOGACTIONS_ASSUMEVALID
)))
1605 popup
.AppendMenuIcon(IDGITLC_COMMIT
, IDS_STATUSLIST_CONTEXT_COMMIT
, IDI_COMMIT
);
1608 if ((m_dwContextMenus
& GITSLC_POPREVERT
) && (this->m_CurrentVersion
.IsEmpty() || this->m_CurrentVersion
== GIT_REV_ZERO
))
1610 popup
.AppendMenuIcon(IDGITLC_REVERT
, IDS_MENUREVERT
, IDI_REVERT
);
1613 if ((m_dwContextMenus
& GITSLC_POPSKIPWORKTREE
) && (this->m_CurrentVersion
.IsEmpty() || this->m_CurrentVersion
== GIT_REV_ZERO
) && !(wcStatus
& (CTGitPath::LOGACTIONS_ADDED
| CTGitPath::LOGACTIONS_UNMERGED
| CTGitPath::LOGACTIONS_SKIPWORKTREE
)) && !filepath
->IsDirectory())
1615 popup
.AppendMenuIcon(IDGITLC_SKIPWORKTREE
, IDS_STATUSLIST_SKIPWORKTREE
);
1618 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
| CTGitPath::LOGACTIONS_ASSUMEVALID
)) && !filepath
->IsDirectory())
1620 popup
.AppendMenuIcon(IDGITLC_ASSUMEVALID
, IDS_MENUASSUMEVALID
);
1623 if ((m_dwContextMenus
& GITLC_POPUNSETIGNORELOCALCHANGES
) && (this->m_CurrentVersion
.IsEmpty() || this->m_CurrentVersion
== GIT_REV_ZERO
) && (wcStatus
& (CTGitPath::LOGACTIONS_SKIPWORKTREE
| CTGitPath::LOGACTIONS_ASSUMEVALID
)) && !filepath
->IsDirectory())
1625 popup
.AppendMenuIcon(IDGITLC_UNSETIGNORELOCALCHANGES
, IDS_STATUSLIST_UNSETIGNORELOCALCHANGES
);
1628 if (m_dwContextMenus
& GITSLC_POPRESTORE
&& !filepath
->IsDirectory())
1630 if (m_restorepaths
.find(filepath
->GetWinPathString()) == m_restorepaths
.end())
1631 popup
.AppendMenuIcon(IDGITLC_CREATERESTORE
, IDS_MENUCREATERESTORE
, IDI_RESTORE
);
1633 popup
.AppendMenuIcon(IDGITLC_RESTOREPATH
, IDS_MENURESTORE
, IDI_RESTORE
);
1636 if ((m_dwContextMenus
& GetContextMenuBit(IDGITLC_REVERTTOREV
)) && ( !this->m_CurrentVersion
.IsEmpty() )
1637 && this->m_CurrentVersion
!= GIT_REV_ZERO
&& !(wcStatus
& CTGitPath::LOGACTIONS_DELETED
))
1639 popup
.AppendMenuIcon(IDGITLC_REVERTTOREV
, IDS_LOG_POPUP_REVERTTOREV
, IDI_REVERT
);
1642 if ((m_dwContextMenus
& GetContextMenuBit(IDGITLC_REVERTTOPARENT
)) && ( !this->m_CurrentVersion
.IsEmpty() )
1643 && this->m_CurrentVersion
!= GIT_REV_ZERO
&& !(wcStatus
& CTGitPath::LOGACTIONS_ADDED
))
1645 popup
.AppendMenuIcon(IDGITLC_REVERTTOPARENT
, IDS_LOG_POPUP_REVERTTOPARENT
, IDI_REVERT
);
1649 if ((GetSelectedCount() == 1)&&(!(wcStatus
& CTGitPath::LOGACTIONS_UNVER
))
1650 &&(!(wcStatus
& CTGitPath::LOGACTIONS_IGNORE
)))
1652 if (m_dwContextMenus
& GITSLC_POPSHOWLOG
)
1654 popup
.AppendMenuIcon(IDGITLC_LOG
, IDS_REPOBROWSE_SHOWLOG
, IDI_LOG
);
1656 if (m_dwContextMenus
& GITSLC_POPSHOWLOGSUBMODULE
&& filepath
->IsDirectory())
1658 popup
.AppendMenuIcon(IDGITLC_LOGSUBMODULE
, IDS_LOG_SUBMODULE
, IDI_LOG
);
1660 if (m_dwContextMenus
& GITSLC_POPSHOWLOGOLDNAME
&& (wcStatus
& (CTGitPath::LOGACTIONS_REPLACED
|CTGitPath::LOGACTIONS_COPY
) && !filepath
->GetGitOldPathString().IsEmpty()))
1662 popup
.AppendMenuIcon(IDGITLC_LOGOLDNAME
, IDS_STATUSLIST_SHOWLOGOLDNAME
, IDI_LOG
);
1664 if (m_dwContextMenus
& GITSLC_POPBLAME
&& ! filepath
->IsDirectory() && !(wcStatus
& CTGitPath::LOGACTIONS_DELETED
) && m_bHasWC
)
1666 popup
.AppendMenuIcon(IDGITLC_BLAME
, IDS_MENUBLAME
, IDI_BLAME
);
1670 if (GetSelectedCount() > 0)
1672 if ((m_dwContextMenus
& GetContextMenuBit(IDGITLC_EXPORT
)) && !(wcStatus
& CTGitPath::LOGACTIONS_DELETED
))
1673 popup
.AppendMenuIcon(IDGITLC_EXPORT
, IDS_LOG_POPUP_EXPORT
, IDI_EXPORT
);
1676 // if ((wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing) && (GetSelectedCount() == 1))
1677 if ( (GetSelectedCount() == 1) )
1679 if (m_dwContextMenus
& this->GetContextMenuBit(IDGITLC_SAVEAS
) && ! filepath
->IsDirectory() && !(wcStatus
& CTGitPath::LOGACTIONS_DELETED
))
1681 popup
.AppendMenuIcon(IDGITLC_SAVEAS
, IDS_LOG_POPUP_SAVE
, IDI_SAVEAS
);
1684 if (m_dwContextMenus
& GITSLC_POPOPEN
&& ! filepath
->IsDirectory() && !(wcStatus
& CTGitPath::LOGACTIONS_DELETED
))
1686 popup
.AppendMenuIcon(IDGITLC_VIEWREV
, IDS_LOG_POPUP_VIEWREV
);
1687 popup
.AppendMenuIcon(IDGITLC_OPEN
, IDS_REPOBROWSE_OPEN
, IDI_OPEN
);
1688 popup
.AppendMenuIcon(IDGITLC_OPENWITH
, IDS_LOG_POPUP_OPENWITH
, IDI_OPEN
);
1689 if (wcStatus
& (CTGitPath::LOGACTIONS_UNVER
| CTGitPath::LOGACTIONS_IGNORE
)) {
1690 popup
.SetDefaultItem(IDGITLC_OPEN
, FALSE
);
1694 if (m_dwContextMenus
& GITSLC_POPEXPLORE
&& !(wcStatus
& CTGitPath::LOGACTIONS_DELETED
) && m_bHasWC
)
1696 popup
.AppendMenuIcon(IDGITLC_EXPLORE
, IDS_STATUSLIST_CONTEXT_EXPLORE
, IDI_EXPLORER
);
1700 if (GetSelectedCount() > 0)
1702 // if (((wcStatus == git_wc_status_unversioned)||(wcStatus == git_wc_status_ignored))&&(m_dwContextMenus & SVNSLC_POPDELETE))
1704 // popup.AppendMenuIcon(IDSVNLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
1706 // 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))
1709 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVEKEEP, IDI_DELETE);
1711 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVE, IDI_DELETE);
1713 if ((wcStatus
& (CTGitPath::LOGACTIONS_UNVER
| CTGitPath::LOGACTIONS_IGNORE
))/*||(wcStatus == git_wc_status_deleted)*/)
1715 if (m_dwContextMenus
& GITSLC_POPDELETE
)
1717 popup
.AppendMenuIcon(IDGITLC_DELETE
, IDS_MENUREMOVE
, IDI_DELETE
);
1720 if ( (wcStatus
& CTGitPath::LOGACTIONS_UNVER
|| wcStatus
& CTGitPath::LOGACTIONS_DELETED
) )
1722 if (m_dwContextMenus
& GITSLC_POPIGNORE
)
1725 CTGitPathList ignorelist
;
1726 FillListOfSelectedItemPaths(ignorelist
);
1727 //check if all selected entries have the same extension
1728 bool bSameExt
= true;
1730 for (int i
=0; i
<ignorelist
.GetCount(); ++i
)
1732 if (sExt
.IsEmpty() && (i
==0))
1733 sExt
= ignorelist
[i
].GetFileExtension();
1734 else if (sExt
.CompareNoCase(ignorelist
[i
].GetFileExtension())!=0)
1739 if (ignoreSubMenu
.CreateMenu())
1742 if (ignorelist
.GetCount()==1)
1743 ignorepath
= ignorelist
[0].GetFileOrDirectoryName();
1745 ignorepath
.Format(IDS_MENUIGNOREMULTIPLE
, ignorelist
.GetCount());
1746 ignoreSubMenu
.AppendMenu(MF_STRING
| MF_ENABLED
, IDGITLC_IGNORE
, ignorepath
);
1747 ignorepath
= _T("*")+sExt
;
1748 ignoreSubMenu
.AppendMenu(MF_STRING
| MF_ENABLED
, IDGITLC_IGNOREMASK
, ignorepath
);
1749 if (ignorelist
.GetCount() == 1 && !ignorelist
[0].GetContainingDirectory().GetGitPathString().IsEmpty())
1750 ignoreSubMenu
.AppendMenu(MF_STRING
| MF_ENABLED
, IDGITLC_IGNOREFOLDER
, ignorelist
[0].GetContainingDirectory().GetGitPathString());
1752 temp
.LoadString(IDS_MENUIGNORE
);
1753 popup
.InsertMenu((UINT
)-1, MF_BYPOSITION
| MF_POPUP
, (UINT_PTR
)ignoreSubMenu
.m_hMenu
, temp
);
1759 if (ignorelist
.GetCount()==1)
1761 temp
.LoadString(IDS_MENUIGNORE
);
1765 temp
.Format(IDS_MENUIGNOREMULTIPLE
, ignorelist
.GetCount());
1767 popup
.AppendMenuIcon(IDGITLC_IGNORE
, temp
, IDI_IGNORE
);
1768 temp
.Format(IDS_MENUIGNOREMULTIPLEMASK
, ignorelist
.GetCount());
1769 popup
.AppendMenuIcon(IDGITLC_IGNOREMASK
, temp
, IDI_IGNORE
);
1777 if (GetSelectedCount() > 0)
1779 popup
.AppendMenu(MF_SEPARATOR
);
1780 popup
.AppendMenuIcon(IDGITLC_COPY
, IDS_STATUSLIST_CONTEXT_COPY
, IDI_COPYCLIP
);
1781 popup
.AppendMenuIcon(IDGITLC_COPYEXT
, IDS_STATUSLIST_CONTEXT_COPYEXT
, IDI_COPYCLIP
);
1783 if ((m_dwContextMenus
& SVNSLC_POPCHANGELISTS
))
1784 &&(wcStatus
!= git_wc_status_unversioned
)&&(wcStatus
!= git_wc_status_none
))
1786 popup
.AppendMenu(MF_SEPARATOR
);
1787 // changelist commands
1788 size_t numChangelists
= GetNumberOfChangelistsInSelection();
1789 if (numChangelists
> 0)
1791 popup
.AppendMenuIcon(IDSVNLC_REMOVEFROMCS
, IDS_STATUSLIST_CONTEXT_REMOVEFROMCS
);
1793 if ((!entry
->IsFolder())&&(changelistSubMenu
.CreateMenu()))
1796 temp
.LoadString(IDS_STATUSLIST_CONTEXT_CREATECS
);
1797 changelistSubMenu
.AppendMenu(MF_STRING
| MF_ENABLED
, IDSVNLC_CREATECS
, temp
);
1799 if (entry
->changelist
.Compare(SVNSLC_IGNORECHANGELIST
))
1801 changelistSubMenu
.AppendMenu(MF_SEPARATOR
);
1802 changelistSubMenu
.AppendMenu(MF_STRING
| MF_ENABLED
, IDSVNLC_CREATEIGNORECS
, SVNSLC_IGNORECHANGELIST
);
1805 if (!m_changelists
.empty())
1807 // find the changelist names
1808 bool bNeedSeparator
= true;
1809 int cmdID
= IDSVNLC_MOVETOCS
;
1810 for (std::map
<CString
, int>::const_iterator it
= m_changelists
.begin(); it
!= m_changelists
.end(); ++it
)
1812 if ((entry
->changelist
.Compare(it
->first
))&&(it
->first
.Compare(SVNSLC_IGNORECHANGELIST
)))
1816 changelistSubMenu
.AppendMenu(MF_SEPARATOR
);
1817 bNeedSeparator
= false;
1819 changelistSubMenu
.AppendMenu(MF_STRING
| MF_ENABLED
, cmdID
, it
->first
);
1824 temp
.LoadString(IDS_STATUSLIST_CONTEXT_MOVETOCS
);
1825 popup
.AppendMenu(MF_POPUP
|MF_STRING
, (UINT_PTR
)changelistSubMenu
.GetSafeHmenu(), temp
);
1831 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1834 AfxGetApp()->DoWaitCursor(1);
1835 //int iItemCountBeforeMenuCmd = GetItemCount();
1836 //bool bForce = false;
1839 case IDGITLC_VIEWREV
:
1840 OpenFile(filepath
, ALTERNATIVEEDITOR
);
1844 OpenFile(filepath
,OPEN
);
1847 case IDGITLC_OPENWITH
:
1848 OpenFile(filepath
,OPEN_WITH
);
1851 case IDGITLC_EXPLORE
:
1853 CString p
= g_Git
.CombinePath(filepath
);
1854 if (PathFileExists(p
))
1856 ITEMIDLIST __unaligned
* pidl
= ILCreateFromPath(p
);
1859 SHOpenFolderAndSelectItems(pidl
, 0, 0, 0);
1864 // if filepath does not exist any more, navigate to closest matching folder
1867 int pos
= p
.ReverseFind(_T('\\'));
1871 } while (!PathFileExists(p
));
1872 ShellExecute(GetSafeHwnd(), _T("explore"), p
, nullptr, nullptr, SW_SHOW
);
1876 case IDGITLC_CREATERESTORE
:
1878 POSITION pos
= GetFirstSelectedItemPosition();
1881 int index
= GetNextSelectedItem(pos
);
1882 CTGitPath
* entry2
= (CTGitPath
* )GetItemData(index
);
1883 ASSERT(entry2
!= NULL
);
1884 if (entry2
== NULL
|| entry2
->IsDirectory())
1886 if (m_restorepaths
.find(entry2
->GetWinPathString()) != m_restorepaths
.end())
1888 CTGitPath tempFile
= CTempFiles::Instance().GetTempFilePath(false);
1889 // delete the temp file: the temp file has the FILE_ATTRIBUTE_TEMPORARY flag set
1890 // and copying the real file over it would leave that temp flag.
1891 DeleteFile(tempFile
.GetWinPath());
1892 if (CopyFile(g_Git
.CombinePath(entry2
), tempFile
.GetWinPath(), FALSE
))
1894 m_restorepaths
[entry2
->GetWinPathString()] = tempFile
.GetWinPathString();
1895 SetItemState(index
, INDEXTOOVERLAYMASK(OVL_RESTORE
), LVIS_OVERLAYMASK
);
1902 case IDGITLC_RESTOREPATH
:
1904 if (CMessageBox::Show(m_hWnd
, IDS_STATUSLIST_RESTOREPATH
, IDS_APPNAME
, 2, IDI_QUESTION
, IDS_RESTOREBUTTON
, IDS_ABORTBUTTON
) == 2)
1906 POSITION pos
= GetFirstSelectedItemPosition();
1909 int index
= GetNextSelectedItem(pos
);
1910 CTGitPath
* entry2
= (CTGitPath
* )GetItemData(index
);
1911 ASSERT(entry2
!= NULL
);
1914 if (m_restorepaths
.find(entry2
->GetWinPathString()) == m_restorepaths
.end())
1916 if (CopyFile(m_restorepaths
[entry2
->GetWinPathString()], g_Git
.CombinePath(entry2
), FALSE
))
1918 m_restorepaths
.erase(entry2
->GetWinPathString());
1919 SetItemState(index
, 0, LVIS_OVERLAYMASK
);
1926 // Compare current version and work copy.
1927 case IDGITLC_COMPAREWC
:
1929 if (!CheckMultipleDiffs())
1931 POSITION pos
= GetFirstSelectedItemPosition();
1934 int index
= GetNextSelectedItem(pos
);
1940 // Compare with base version. when current version is zero, compare workcopy and HEAD.
1941 case IDGITLC_COMPARE
:
1943 if (!CheckMultipleDiffs())
1945 POSITION pos
= GetFirstSelectedItemPosition();
1948 int index
= GetNextSelectedItem(pos
);
1954 case IDGITLC_COMPARETWOREVISIONS
:
1956 POSITION pos
= GetFirstSelectedItemPosition();
1959 int index
= GetNextSelectedItem(pos
);
1960 StartDiffTwo(index
);
1965 case IDGITLC_COMPARETWOFILES
:
1967 POSITION pos
= GetFirstSelectedItemPosition();
1968 CTGitPath
* firstfilepath
= NULL
, * secondfilepath
= NULL
;
1971 firstfilepath
= (CTGitPath
* )GetItemData(GetNextSelectedItem(pos
));
1972 ASSERT(firstfilepath
!= NULL
);
1973 if (firstfilepath
== NULL
)
1976 secondfilepath
= (CTGitPath
* )GetItemData(GetNextSelectedItem(pos
));
1977 ASSERT(secondfilepath
!= NULL
);
1978 if (secondfilepath
== NULL
)
1982 sCmd
.Format(_T("/command:diff /path:\"%s\" /path2:\"%s\" /hwnd:%p"), firstfilepath
->GetWinPath(), secondfilepath
->GetWinPath(), (void*)m_hWnd
);
1983 CAppUtils::RunTortoiseGitProc(sCmd
);
1988 case IDGITLC_GNUDIFF1
:
1990 POSITION pos
= GetFirstSelectedItemPosition();
1993 CTGitPath
* selectedFilepath
= (CTGitPath
* )GetItemData(GetNextSelectedItem(pos
));
1994 if (m_CurrentVersion
.IsEmpty() || m_CurrentVersion
== GIT_REV_ZERO
)
1998 fromwhere
= _T("~1");
1999 CAppUtils::StartShowUnifiedDiff(m_hWnd
, *selectedFilepath
, GitRev::GetHead() + fromwhere
, *selectedFilepath
, GitRev::GetWorkingCopy());
2003 if ((selectedFilepath
->m_ParentNo
& (PARENT_MASK
| MERGE_MASK
)) == 0)
2004 CAppUtils::StartShowUnifiedDiff(m_hWnd
, *selectedFilepath
, m_CurrentVersion
+ _T("~1"), *selectedFilepath
, m_CurrentVersion
);
2008 if (!(selectedFilepath
->m_ParentNo
& MERGE_MASK
))
2009 str
.Format(_T("%s^%d"), m_CurrentVersion
, (selectedFilepath
->m_ParentNo
& PARENT_MASK
) + 1);
2011 CAppUtils::StartShowUnifiedDiff(m_hWnd
, *selectedFilepath
, str
, *selectedFilepath
, m_CurrentVersion
, false, false, false, false, !!(selectedFilepath
->m_ParentNo
& MERGE_MASK
));
2018 case IDGITLC_GNUDIFF2REVISIONS
:
2020 CAppUtils::StartShowUnifiedDiff(m_hWnd
, *filepath
, m_Rev2
, *filepath
, m_Rev1
);
2026 CTGitPathList paths
;
2027 FillListOfSelectedItemPaths(paths
, true);
2029 CGitProgressDlg progDlg
;
2030 progDlg
.SetCommand(CGitProgressList::GitProgress_Add
);
2031 progDlg
.SetPathList(paths
);
2032 progDlg
.SetItemCount(paths
.GetCount());
2035 // reset unchecked status
2036 POSITION pos
= GetFirstSelectedItemPosition();
2038 while ((index
= GetNextSelectedItem(pos
)) >= 0)
2040 m_mapFilenameToChecked
.erase(((CTGitPath
*)GetItemData(index
))->GetGitPathString());
2043 if (NULL
!= GetLogicalParent() && NULL
!= GetLogicalParent()->GetSafeHwnd())
2044 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH
);
2050 case IDGITLC_DELETE
:
2051 DeleteSelectedFiles();
2056 CAppUtils::LaunchTortoiseBlame(g_Git
.m_CurrentDir
+_T("\\")+filepath
->GetWinPath(), m_CurrentVersion
);
2061 case IDGITLC_LOGSUBMODULE
:
2064 sCmd
.Format(_T("/command:log /path:\"%s\""), g_Git
.CombinePath(filepath
));
2065 if (cmd
== IDGITLC_LOG
&& filepath
->IsDirectory())
2066 sCmd
+= _T(" /submodule");
2067 if (!m_sDisplayedBranch
.IsEmpty())
2068 sCmd
+= _T(" /range:\"") + m_sDisplayedBranch
+ _T("\"");
2069 CAppUtils::RunTortoiseGitProc(sCmd
, false, !(cmd
== IDGITLC_LOGSUBMODULE
));
2073 case IDGITLC_LOGOLDNAME
:
2075 CTGitPath
oldName(filepath
->GetGitOldPathString());
2077 sCmd
.Format(_T("/command:log /path:\"%s\""), g_Git
.CombinePath(oldName
));
2078 if (!m_sDisplayedBranch
.IsEmpty())
2079 sCmd
+= _T(" /range:\"") + m_sDisplayedBranch
+ _T("\"");
2080 CAppUtils::RunTortoiseGitProc(sCmd
);
2084 case IDGITLC_EDITCONFLICT
:
2086 if (CAppUtils::ConflictEdit(*filepath
, false, m_bIsRevertTheirMy
, GetLogicalParent() ? GetLogicalParent()->GetSafeHwnd() : nullptr))
2088 CString conflictedFile
= g_Git
.CombinePath(filepath
);
2089 if (!PathFileExists(conflictedFile
) && NULL
!= GetLogicalParent() && NULL
!= GetLogicalParent()->GetSafeHwnd())
2090 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH
);
2095 case IDGITLC_RESOLVETHEIRS
: //follow up
2096 case IDGITLC_RESOLVEMINE
: //follow up
2097 case IDGITLC_RESOLVECONFLICT
:
2099 if (CMessageBox::Show(m_hWnd
, IDS_PROC_RESOLVE
, IDS_APPNAME
, MB_ICONQUESTION
| MB_YESNO
)==IDYES
)
2101 POSITION pos
= GetFirstSelectedItemPosition();
2105 index
= GetNextSelectedItem(pos
);
2106 CTGitPath
* fentry
=(CTGitPath
*) this->GetItemData(index
);
2110 bool b_local
= false, b_remote
= false;
2114 cmd
.Format(_T("git.exe ls-files -u -t -z -- \"%s\""), fentry
->GetGitPathString());
2115 if (g_Git
.Run(cmd
, &vector
))
2117 CMessageBox::Show(NULL
, _T("git ls-files failed!"), _T("TortoiseGit"), MB_OK
);
2122 if (list
.ParserFromLsFile(vector
))
2124 CMessageBox::Show(NULL
, _T("Parse ls-files failed!"), _T("TortoiseGit"), MB_OK
);
2130 for (int i
= 0; i
< list
.GetCount(); ++i
)
2132 if (list
[i
].m_Stage
== 2)
2134 if (list
[i
].m_Stage
== 3)
2139 CString gitcmd
,output
;
2142 if ( ((!this->m_bIsRevertTheirMy
)&&cmd
== IDGITLC_RESOLVETHEIRS
) ||
2143 ((this->m_bIsRevertTheirMy
)&&cmd
== IDGITLC_RESOLVEMINE
) )
2145 if (b_local
&& b_remote
)
2146 gitcmd
.Format(_T("git.exe checkout-index -f --stage=3 -- \"%s\""), fentry
->GetGitPathString());
2148 gitcmd
.Format(_T("git.exe add -f -- \"%s\""), fentry
->GetGitPathString());
2150 gitcmd
.Format(_T("git.exe rm -f -- \"%s\""), fentry
->GetGitPathString());
2151 if (g_Git
.Run(gitcmd
, &output
,CP_UTF8
))
2153 CMessageBox::Show(m_hWnd
, output
, _T("TortoiseGit"), MB_ICONERROR
);
2158 if ( ((!this->m_bIsRevertTheirMy
)&&cmd
== IDGITLC_RESOLVEMINE
) ||
2159 ((this->m_bIsRevertTheirMy
)&&cmd
== IDGITLC_RESOLVETHEIRS
) )
2161 if (b_local
&& b_remote
)
2162 gitcmd
.Format(_T("git.exe checkout-index -f --stage=2 -- \"%s\""),fentry
->GetGitPathString());
2164 gitcmd
.Format(_T("git.exe add -f -- \"%s\""), fentry
->GetGitPathString());
2166 gitcmd
.Format(_T("git.exe rm -f -- \"%s\""), fentry
->GetGitPathString());
2167 if (g_Git
.Run(gitcmd
, &output
,CP_UTF8
))
2169 CMessageBox::Show(m_hWnd
, output
, _T("TortoiseGit"), MB_ICONERROR
);
2175 if (b_local
&& b_remote
&& fentry
->m_Action
& CTGitPath::LOGACTIONS_UNMERGED
)
2177 gitcmd
.Format(_T("git.exe add -f -- \"%s\""),fentry
->GetGitPathString());
2178 if (g_Git
.Run(gitcmd
, &output
,CP_UTF8
))
2180 CMessageBox::Show(m_hWnd
, output
, _T("TortoiseGit"), MB_ICONERROR
);
2184 fentry
->m_Action
|= CTGitPath::LOGACTIONS_MODIFIED
;
2185 fentry
->m_Action
&=~CTGitPath::LOGACTIONS_UNMERGED
;
2189 CAppUtils::RemoveTempMergeFile(*fentry
);
2192 Show(m_dwShow
, 0, m_bShowFolders
,0,true);
2197 case IDGITLC_IGNORE
:
2199 CTGitPathList ignorelist
;
2200 //std::vector<CString> toremove;
2201 FillListOfSelectedItemPaths(ignorelist
, true);
2203 if(!CAppUtils::IgnoreFile(ignorelist
,false))
2207 CWnd
* pParent
= GetLogicalParent();
2208 if (NULL
!= pParent
&& NULL
!= pParent
->GetSafeHwnd())
2210 pParent
->SendMessage(GITSLNM_NEEDSREFRESH
);
2216 case IDGITLC_IGNOREMASK
:
2219 CString ext
=filepath
->GetFileExtension();
2220 CTGitPathList ignorelist
;
2221 FillListOfSelectedItemPaths(ignorelist
, true);
2223 if (!CAppUtils::IgnoreFile(ignorelist
,true))
2227 CWnd
* pParent
= GetLogicalParent();
2228 if (NULL
!= pParent
&& NULL
!= pParent
->GetSafeHwnd())
2230 pParent
->SendMessage(GITSLNM_NEEDSREFRESH
);
2237 case IDGITLC_IGNOREFOLDER
:
2239 CTGitPathList ignorelist
;
2240 ignorelist
.AddPath(filepath
->GetContainingDirectory());
2242 if (!CAppUtils::IgnoreFile(ignorelist
, false))
2246 CWnd
*pParent
= GetLogicalParent();
2247 if (NULL
!= pParent
&& NULL
!= pParent
->GetSafeHwnd())
2248 pParent
->SendMessage(GITSLNM_NEEDSREFRESH
);
2253 case IDGITLC_COMMIT
:
2255 CTGitPathList targetList
;
2256 FillListOfSelectedItemPaths(targetList
);
2257 CTGitPath tempFile
= CTempFiles::Instance().GetTempFilePath(false);
2258 VERIFY(targetList
.WriteToFile(tempFile
.GetWinPathString()));
2259 CString commandline
= _T("/command:commit /pathfile:\"");
2260 commandline
+= tempFile
.GetWinPathString();
2261 commandline
+= _T("\"");
2262 commandline
+= _T(" /deletepathfile");
2263 CAppUtils::RunTortoiseGitProc(commandline
);
2266 case IDGITLC_REVERT
:
2268 // If at least one item is not in the status "added"
2269 // we ask for a confirmation
2270 BOOL bConfirm
= FALSE
;
2271 POSITION pos
= GetFirstSelectedItemPosition();
2273 while ((index
= GetNextSelectedItem(pos
)) >= 0)
2275 //FileEntry * fentry = GetListEntry(index);
2276 CTGitPath
*fentry
=(CTGitPath
*)GetItemData(index
);
2277 if(fentry
&& fentry
->m_Action
&CTGitPath::LOGACTIONS_MODIFIED
&& !fentry
->IsDirectory())
2285 str
.Format(IDS_PROC_WARNREVERT
,GetSelectedCount());
2287 if (!bConfirm
|| CMessageBox::Show(this->m_hWnd
, str
, _T("TortoiseGit"), MB_YESNO
| MB_ICONQUESTION
)==IDYES
)
2289 CTGitPathList targetList
;
2290 FillListOfSelectedItemPaths(targetList
);
2292 // make sure that the list is reverse sorted, so that
2293 // children are removed before any parents
2294 targetList
.SortByPathname(true);
2296 // put all reverted files in the trashbin, except the ones with 'added'
2297 // status because they are not restored by the revert.
2298 CTGitPathList delList
;
2299 POSITION pos
= GetFirstSelectedItemPosition();
2301 while ((index
= GetNextSelectedItem(pos
)) >= 0)
2303 CTGitPath
*entry
=(CTGitPath
*)GetItemData(index
);
2304 if (entry
&&(!(entry
->m_Action
& CTGitPath::LOGACTIONS_ADDED
))
2305 && (!(entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
)) && !entry
->IsDirectory())
2308 fullpath
.SetFromWin(g_Git
.m_CurrentDir
+_T("\\")+entry
->GetWinPath());
2309 delList
.AddPath(fullpath
);
2312 if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE
)))
2313 delList
.DeleteAllFiles(true);
2315 CString revertToCommit
= _T("HEAD");
2317 revertToCommit
= _T("HEAD~1");
2318 if (g_Git
.Revert(revertToCommit
, targetList
))
2320 CMessageBox::Show(this->m_hWnd
, _T("Revert Fail"), _T("TortoiseGit"), MB_ICONERROR
);
2324 bool updateStatusList
= false;
2325 for (int i
= 0 ; i
< targetList
.GetCount(); ++i
)
2327 int nListboxEntries
= GetItemCount();
2328 for (int nItem
=0; nItem
<nListboxEntries
; ++nItem
)
2330 CTGitPath
*path
=(CTGitPath
*)GetItemData(nItem
);
2331 if (path
->GetGitPathString()==targetList
[i
].GetGitPathString() && !path
->IsDirectory())
2333 if(path
->m_Action
& CTGitPath::LOGACTIONS_ADDED
)
2335 path
->m_Action
= CTGitPath::LOGACTIONS_UNVER
;
2336 SetEntryCheck(path
,nItem
,false);
2337 updateStatusList
= true;
2338 #if 0 // revert an added file and some entry will be cloned (part 1/2)
2339 SetItemGroup(nItem
,1);
2340 this->m_StatusFileList
.RemoveItem(*path
);
2341 this->m_UnRevFileList
.AddPath(*path
);
2342 //this->m_IgnoreFileList.RemoveItem(*path);
2347 RemoveListEntry(nItem
);
2351 else if (path
->GetGitPathString()==targetList
[i
].GetGitPathString() && path
->IsDirectory() && path
->IsWCRoot())
2354 sCmd
.Format(_T("/command:revert /path:\"%s\""), path
->GetGitPathString());
2355 CCommonAppUtils::RunTortoiseGitProc(sCmd
);
2361 #if 0 // revert an added file and some entry will be cloned (part 2/2)
2362 Show(m_dwShow
, 0, m_bShowFolders
,updateStatusList
,true);
2365 if (updateStatusList
&& nullptr != GetLogicalParent() && nullptr != GetLogicalParent()->GetSafeHwnd())
2366 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH
);
2373 case IDGITLC_ASSUMEVALID
:
2374 SetGitIndexFlagsForSelectedFiles(IDS_PROC_MARK_ASSUMEVALID
, BST_CHECKED
, BST_INDETERMINATE
);
2376 case IDGITLC_SKIPWORKTREE
:
2377 SetGitIndexFlagsForSelectedFiles(IDS_PROC_MARK_SKIPWORKTREE
, BST_INDETERMINATE
, BST_CHECKED
);
2379 case IDGITLC_UNSETIGNORELOCALCHANGES
:
2380 SetGitIndexFlagsForSelectedFiles(IDS_PROC_UNSET_IGNORELOCALCHANGES
, BST_UNCHECKED
, BST_UNCHECKED
);
2383 CopySelectedEntriesToClipboard(0);
2385 case IDGITLC_COPYEXT
:
2386 CopySelectedEntriesToClipboard((DWORD
)-1);
2388 case IDGITLC_EXPORT
:
2391 case IDGITLC_SAVEAS
:
2392 FileSaveAs(filepath
);
2395 case IDGITLC_REVERTTOREV
:
2396 RevertSelectedItemToVersion();
2398 case IDGITLC_REVERTTOPARENT
:
2399 RevertSelectedItemToVersion(true);
2402 case IDSVNLC_COMMIT
:
2404 CTSVNPathList targetList
;
2405 FillListOfSelectedItemPaths(targetList
);
2406 CTSVNPath tempFile
= CTempFiles::Instance().GetTempFilePath(false);
2407 VERIFY(targetList
.WriteToFile(tempFile
.GetWinPathString()));
2408 CString commandline
= CPathUtils::GetAppDirectory();
2409 commandline
+= _T("TortoiseGitProc.exe /command:commit /pathfile:\"");
2410 commandline
+= tempFile
.GetWinPathString();
2411 commandline
+= _T("\"");
2412 commandline
+= _T(" /deletepathfile");
2413 CAppUtils::LaunchApplication(commandline
, NULL
, false);
2416 case IDSVNLC_CREATEIGNORECS
:
2417 CreateChangeList(SVNSLC_IGNORECHANGELIST
);
2419 case IDSVNLC_CREATECS
:
2421 CCreateChangelistDlg dlg
;
2422 if (dlg
.DoModal() == IDOK
)
2424 CreateChangeList(dlg
.m_sName
);
2430 if (cmd
< IDSVNLC_MOVETOCS
)
2432 CTSVNPathList changelistItems
;
2433 FillListOfSelectedItemPaths(changelistItems
);
2435 // find the changelist name
2436 CString sChangelist
;
2437 int cmdID
= IDSVNLC_MOVETOCS
;
2439 for (std::map
<CString
, int>::const_iterator it
= m_changelists
.begin(); it
!= m_changelists
.end(); ++it
)
2441 if ((it
->first
.Compare(SVNSLC_IGNORECHANGELIST
))&&(entry
->changelist
.Compare(it
->first
)))
2445 sChangelist
= it
->first
;
2450 if (!sChangelist
.IsEmpty())
2453 if (git
.AddToChangeList(changelistItems
, sChangelist
, git_depth_empty
))
2455 // The changelists were moved, but we now need to run through the selected items again
2456 // and update their changelist
2457 POSITION pos
= GetFirstSelectedItemPosition();
2459 while ((index
= GetNextSelectedItem(pos
)) >= 0)
2461 FileEntry
* e
= GetListEntry(index
);
2462 e
->changelist
= sChangelist
;
2465 if (m_changelists
.find(e
->changelist
)!=m_changelists
.end())
2466 SetItemGroup(index
, m_changelists
[e
->changelist
]);
2468 SetItemGroup(index
, 0);
2474 CMessageBox::Show(m_hWnd
, git
.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR
);
2484 AfxGetApp()->DoWaitCursor(-1);
2485 GetStatisticsString();
2486 //int iItemCountAfterMenuCmd = GetItemCount();
2487 //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)
2489 // CWnd* pParent = GetParent();
2490 // if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2492 // pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);
2495 } // if (popup.CreatePopupMenu())
2496 } // if (selIndex >= 0)
2500 void CGitStatusListCtrl::SetGitIndexFlagsForSelectedFiles(UINT message
, BOOL assumevalid
, BOOL skipworktree
)
2502 if (CMessageBox::Show(GetSafeHwnd(), message
, IDS_APPNAME
, MB_YESNO
| MB_DEFBUTTON2
| MB_ICONQUESTION
) == IDNO
)
2505 CAutoRepository
repository(g_Git
.GetGitRepository());
2508 CMessageBox::Show(m_hWnd
, g_Git
.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR
);
2512 CAutoIndex gitindex
;
2513 if (git_repository_index(gitindex
.GetPointer(), repository
))
2515 CMessageBox::Show(m_hWnd
, g_Git
.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR
);
2519 POSITION pos
= GetFirstSelectedItemPosition();
2521 while ((index
= GetNextSelectedItem(pos
)) >= 0)
2523 CTGitPath
* path
= (CTGitPath
*)GetItemData(index
);
2525 if (path
== nullptr)
2529 if (!git_index_find(&idx
, gitindex
, CUnicodeUtils::GetMulti(path
->GetGitPathString(), CP_UTF8
)))
2531 git_index_entry
*e
= const_cast<git_index_entry
*>(git_index_get_byindex(gitindex
, idx
)); // HACK
2532 if (assumevalid
== BST_UNCHECKED
)
2533 e
->flags
&= ~GIT_IDXENTRY_VALID
;
2534 else if (assumevalid
== BST_CHECKED
)
2535 e
->flags
|= GIT_IDXENTRY_VALID
;
2536 if (skipworktree
== BST_UNCHECKED
)
2537 e
->flags_extended
&= ~GIT_IDXENTRY_SKIP_WORKTREE
;
2538 else if (skipworktree
== BST_CHECKED
)
2539 e
->flags_extended
|= GIT_IDXENTRY_SKIP_WORKTREE
;
2540 git_index_add(gitindex
, e
);
2543 CMessageBox::Show(m_hWnd
, g_Git
.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR
);
2546 if (git_index_write(gitindex
))
2548 CMessageBox::Show(m_hWnd
, g_Git
.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR
);
2552 if (nullptr != GetLogicalParent() && nullptr != GetLogicalParent()->GetSafeHwnd())
2553 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH
);
2558 void CGitStatusListCtrl::OnContextMenuHeader(CWnd
* pWnd
, CPoint point
)
2560 Locker
lock(m_critSec
);
2561 m_ColumnManager
.OnContextMenuHeader(pWnd
,point
,!!IsGroupViewEnabled());
2564 void CGitStatusListCtrl::OnContextMenu(CWnd
* pWnd
, CPoint point
)
2569 OnContextMenuList(pWnd
, point
);
2570 } // if (pWnd == this)
2571 else if (pWnd
== GetHeaderCtrl())
2573 OnContextMenuHeader(pWnd
, point
);
2577 void CGitStatusListCtrl::OnNMDblclk(NMHDR
*pNMHDR
, LRESULT
*pResult
)
2580 Locker
lock(m_critSec
);
2581 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
2586 if (pNMLV
->iItem
< 0)
2588 if (!IsGroupViewEnabled())
2591 DWORD ptW
= GetMessagePos();
2592 pt
.x
= GET_X_LPARAM(ptW
);
2593 pt
.y
= GET_Y_LPARAM(ptW
);
2594 ScreenToClient(&pt
);
2595 int group
= GetGroupFromPoint(&pt
);
2598 // check/uncheck the whole group depending on the check-state
2599 // of the first item in the group
2601 bool bCheck
= false;
2602 bool bFirst
= false;
2604 for (int i
=0; i
<GetItemCount(); ++i
)
2606 SecureZeroMemory(&lv
, sizeof(LVITEM
));
2607 lv
.mask
= LVIF_GROUPID
;
2610 if (lv
.iGroupId
== group
)
2612 CTGitPath
*entry
=(CTGitPath
*)GetItemData(i
);
2616 bCheck
= !GetCheck(i
);
2621 bool bOldCheck
= !!GetCheck(i
);
2622 SetEntryCheck(entry
, i
, bCheck
);
2623 if (bCheck
!= bOldCheck
)
2633 GetStatisticsString();
2639 CTGitPath
*file
=(CTGitPath
*)GetItemData(pNMLV
->iItem
);
2641 if (file
->m_Action
& (CTGitPath::LOGACTIONS_UNVER
| CTGitPath::LOGACTIONS_IGNORE
)) {
2642 OpenFile(file
, OPEN
);
2645 if( file
->m_Action
&CTGitPath::LOGACTIONS_UNMERGED
)
2647 if (CAppUtils::ConflictEdit(*file
, false, m_bIsRevertTheirMy
, GetLogicalParent() ? GetLogicalParent()->GetSafeHwnd() : nullptr))
2649 CString conflictedFile
= g_Git
.CombinePath(file
);
2650 if (!PathFileExists(conflictedFile
) && NULL
!= GetLogicalParent() && NULL
!= GetLogicalParent()->GetSafeHwnd())
2651 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH
);
2656 if (!m_Rev1
.IsEmpty() && !m_Rev2
.IsEmpty())
2657 StartDiffTwo(pNMLV
->iItem
);
2659 StartDiff(pNMLV
->iItem
);
2663 void CGitStatusListCtrl::StartDiffTwo(int fileindex
)
2668 auto ptr
= (CTGitPath
*)GetItemData(fileindex
);
2671 CTGitPath file1
= *ptr
;
2673 if (file1
.m_Action
& CTGitPath::LOGACTIONS_ADDED
)
2674 CGitDiff::DiffNull(&file1
, m_Rev1
, true);
2675 else if (file1
.m_Action
& CTGitPath::LOGACTIONS_DELETED
)
2676 CGitDiff::DiffNull(&file1
, m_Rev2
, false);
2678 CGitDiff::Diff(&file1
, &file1
, m_Rev1
, m_Rev2
);
2681 void CGitStatusListCtrl::StartDiffWC(int fileindex
)
2687 if(this->m_CurrentVersion
.IsEmpty() || m_CurrentVersion
== GIT_REV_ZERO
)
2690 auto ptr
= (CTGitPath
*)GetItemData(fileindex
);
2693 CTGitPath file1
= *ptr
;
2694 file1
.m_Action
= 0; // reset action, so that diff is not started as added/deleted file; see issue #1757
2696 CGitDiff::Diff(&file1
,&file1
, GIT_REV_ZERO
, m_CurrentVersion
);
2700 void CGitStatusListCtrl::StartDiff(int fileindex
)
2705 auto ptr
= (CTGitPath
*)GetItemData(fileindex
);
2708 CTGitPath file1
= *ptr
;
2710 if(file1
.m_Action
& (CTGitPath::LOGACTIONS_REPLACED
|CTGitPath::LOGACTIONS_COPY
))
2712 file2
.SetFromGit(file1
.GetGitOldPathString());
2719 if(this->m_CurrentVersion
.IsEmpty() || m_CurrentVersion
== GIT_REV_ZERO
)
2722 if(m_amend
&& (file1
.m_Action
& CTGitPath::LOGACTIONS_ADDED
) == 0)
2723 fromwhere
= _T("~1");
2724 if( g_Git
.IsInitRepos())
2725 CGitDiff::DiffNull((CTGitPath
*)GetItemData(fileindex
),
2727 else if( file1
.m_Action
&CTGitPath::LOGACTIONS_ADDED
)
2728 CGitDiff::DiffNull((CTGitPath
*)GetItemData(fileindex
),
2729 m_CurrentVersion
+fromwhere
,true);
2730 else if( file1
.m_Action
&CTGitPath::LOGACTIONS_DELETED
)
2731 CGitDiff::DiffNull((CTGitPath
*)GetItemData(fileindex
),
2732 GitRev::GetHead()+fromwhere
,false);
2734 CGitDiff::Diff(&file1
,&file2
,
2735 CString(GIT_REV_ZERO
),
2736 GitRev::GetHead()+fromwhere
);
2741 CString fromwhere
= m_CurrentVersion
+_T("~1");
2743 fromwhere
= m_CurrentVersion
+_T("~2");
2744 bool revfail
= !!g_Git
.GetHash(hash
, fromwhere
);
2745 if (revfail
|| (file1
.m_Action
& file1
.LOGACTIONS_ADDED
))
2747 CGitDiff::DiffNull(&file1
,m_CurrentVersion
,true);
2750 else if (file1
.m_Action
& file1
.LOGACTIONS_DELETED
)
2752 if (file1
.m_ParentNo
> 0)
2753 fromwhere
.Format(_T("%s^%d"), m_CurrentVersion
, file1
.m_ParentNo
+ 1);
2755 CGitDiff::DiffNull(&file1
,fromwhere
,false);
2759 if( file1
.m_ParentNo
& MERGE_MASK
)
2762 CTGitPath base
, theirs
, mine
, merge
;
2765 GetTempPath(temppath
);
2766 temppath
.TrimRight(_T("\\"));
2768 mine
.SetFromGit(temppath
+ _T("\\") + file1
.GetFileOrDirectoryName() + _T(".LOCAL") + file1
.GetFileExtension());
2769 theirs
.SetFromGit(temppath
+ _T("\\") + file1
.GetFileOrDirectoryName() + _T(".REMOTE") + file1
.GetFileExtension());
2770 base
.SetFromGit(temppath
+ _T("\\") + file1
.GetFileOrDirectoryName() + _T(".BASE") + file1
.GetFileExtension());
2773 //create a empty file, incase stage is not three
2774 tempfile
.Open(mine
.GetWinPathString(),CFile::modeCreate
|CFile::modeReadWrite
);
2776 tempfile
.Open(theirs
.GetWinPathString(),CFile::modeCreate
|CFile::modeReadWrite
);
2778 tempfile
.Open(base
.GetWinPathString(),CFile::modeCreate
|CFile::modeReadWrite
);
2781 merge
.SetFromGit(temppath
+ _T("\\") + file1
.GetFileOrDirectoryName() + _T(".Merged") + file1
.GetFileExtension());
2783 int parent1
=-1, parent2
=-1;
2784 for (size_t i
= 0; i
< m_arStatusArray
.size(); ++i
)
2786 if(m_arStatusArray
[i
]->GetGitPathString() == file1
.GetGitPathString())
2788 if(m_arStatusArray
[i
]->m_ParentNo
& MERGE_MASK
)
2795 parent1
= m_arStatusArray
[i
]->m_ParentNo
& PARENT_MASK
;
2797 else if (parent2
<0)
2799 parent2
= m_arStatusArray
[i
]->m_ParentNo
& PARENT_MASK
;
2805 if(g_Git
.GetOneFile(m_CurrentVersion
, file1
, (CString
&)merge
.GetWinPathString()))
2807 CMessageBox::Show(NULL
, IDS_STATUSLIST_FAILEDGETMERGEFILE
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
2813 str
.Format(_T("%s^%d"),this->m_CurrentVersion
, parent1
+1);
2815 if(g_Git
.GetOneFile(str
, file1
, (CString
&)mine
.GetWinPathString()))
2817 CMessageBox::Show(NULL
, IDS_STATUSLIST_FAILEDGETMERGEFILE
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
2824 str
.Format(_T("%s^%d"),this->m_CurrentVersion
, parent2
+1);
2826 if(g_Git
.GetOneFile(str
, file1
, (CString
&)theirs
.GetWinPathString()))
2828 CMessageBox::Show(NULL
, IDS_STATUSLIST_FAILEDGETMERGEFILE
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
2832 if(parent1
>=0 && parent2
>=0)
2834 CString cmd
, output
;
2835 cmd
.Format(_T("git.exe merge-base %s^%d %s^%d"), this->m_CurrentVersion
, parent1
+1,
2836 this->m_CurrentVersion
,parent2
+1);
2838 if (g_Git
.Run(cmd
, &output
, NULL
, CP_UTF8
))
2843 if(g_Git
.GetOneFile(output
.Left(40), file1
, (CString
&)base
.GetWinPathString()))
2845 CMessageBox::Show(NULL
, IDS_STATUSLIST_FAILEDGETBASEFILE
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
2849 CAppUtils::StartExtMerge(base
, theirs
, mine
, merge
,_T("BASE"),_T("REMOTE"),_T("LOCAL"));
2855 if( (file1
.m_ParentNo
&PARENT_MASK
) == 0)
2861 str
.Format(_T("^%d"), (file1
.m_ParentNo
&PARENT_MASK
)+1);
2863 CGitDiff::Diff(&file1
,&file2
,
2865 m_CurrentVersion
+str
);
2871 CString
CGitStatusListCtrl::GetStatisticsString(bool simple
)
2874 CString sNormal
, sAdded
, sDeleted
, sModified
, sConflicted
, sUnversioned
, sRenamed
;
2875 WORD langID
= (WORD
)(DWORD
)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
2876 TCHAR buf
[MAX_STATUS_STRING_LENGTH
] = { 0 };
2877 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_normal
, buf
, _countof(buf
), langID
);
2879 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_added
, buf
, _countof(buf
), langID
);
2881 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_deleted
, buf
, _countof(buf
), langID
);
2883 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_modified
, buf
, _countof(buf
), langID
);
2885 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_conflicted
, buf
, _countof(buf
), langID
);
2887 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_unversioned
, buf
, _countof(buf
), langID
);
2889 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_replaced
, buf
, _countof(buf
), langID
);
2894 sToolTip
.Format(IDS_STATUSLIST_STATUSLINE1
,
2895 this->m_nLineAdded
,this->m_nLineDeleted
,
2896 (LPCTSTR
)sModified
, m_nModified
,
2897 (LPCTSTR
)sAdded
, m_nAdded
,
2898 (LPCTSTR
)sDeleted
, m_nDeleted
,
2899 (LPCTSTR
)sRenamed
, m_nRenamed
2904 sToolTip
.Format(IDS_STATUSLIST_STATUSLINE2
,
2905 this->m_nLineAdded
,this->m_nLineDeleted
,
2906 (LPCTSTR
)sNormal
, m_nNormal
,
2907 (LPCTSTR
)sUnversioned
, m_nUnversioned
,
2908 (LPCTSTR
)sModified
, m_nModified
,
2909 (LPCTSTR
)sAdded
, m_nAdded
,
2910 (LPCTSTR
)sDeleted
, m_nDeleted
,
2911 (LPCTSTR
)sConflicted
, m_nConflicted
2915 sStats
.Format(IDS_COMMITDLG_STATISTICSFORMAT
, m_nSelected
, GetItemCount());
2918 m_pStatLabel
->SetWindowText(sStats
);
2921 if (m_pSelectButton
)
2923 if (m_nSelected
== 0)
2924 m_pSelectButton
->SetCheck(BST_UNCHECKED
);
2925 else if (m_nSelected
!= GetItemCount())
2926 m_pSelectButton
->SetCheck(BST_INDETERMINATE
);
2928 m_pSelectButton
->SetCheck(BST_CHECKED
);
2931 if (m_pConfirmButton
)
2933 m_pConfirmButton
->EnableWindow(m_nSelected
>0);
2941 CString
CGitStatusListCtrl::GetCommonDirectory(bool bStrict
)
2945 // not strict means that the selected folder has priority
2946 if (!m_StatusFileList
.GetCommonDirectory().IsEmpty())
2947 return m_StatusFileList
.GetCommonDirectory().GetWinPath();
2950 CTGitPath commonBaseDirectory
;
2951 int nListItems
= GetItemCount();
2952 for (int i
=0; i
<nListItems
; ++i
)
2954 CTGitPath baseDirectory
,*p
= (CTGitPath
*)this->GetItemData(i
);
2958 baseDirectory
= p
->GetDirectory();
2960 if(commonBaseDirectory
.IsEmpty())
2962 commonBaseDirectory
= baseDirectory
;
2966 if (commonBaseDirectory
.GetWinPathString().GetLength() > baseDirectory
.GetWinPathString().GetLength())
2968 if (baseDirectory
.IsAncestorOf(commonBaseDirectory
))
2969 commonBaseDirectory
= baseDirectory
;
2973 return g_Git
.m_CurrentDir
+CString(_T("\\"))+commonBaseDirectory
.GetWinPath();
2977 void CGitStatusListCtrl::SelectAll(bool bSelect
, bool /*bIncludeNoCommits*/)
2979 CWaitCursor waitCursor
;
2980 // block here so the LVN_ITEMCHANGED messages
2985 int nListItems
= GetItemCount();
2987 m_nSelected
= nListItems
;
2991 for (int i
=0; i
<nListItems
; ++i
)
2993 //FileEntry * entry = GetListEntry(i);
2994 //ASSERT(entry != NULL);
2995 CTGitPath
*path
= (CTGitPath
*) GetItemData(i
);
2998 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))
2999 SetEntryCheck(path
,i
,bSelect
);
3002 // unblock before redrawing
3005 GetStatisticsString();
3009 void CGitStatusListCtrl::Check(DWORD dwCheck
, bool check
)
3011 CWaitCursor waitCursor
;
3012 // block here so the LVN_ITEMCHANGED messages
3017 int nListItems
= GetItemCount();
3019 for (int i
= 0; i
< nListItems
; ++i
)
3021 CTGitPath
*entry
= (CTGitPath
*) GetItemData(i
);
3025 DWORD showFlags
= entry
->m_Action
;
3026 if (entry
->IsDirectory())
3027 showFlags
|= GITSLC_SHOWSUBMODULES
;
3029 showFlags
|= GITSLC_SHOWFILES
;
3031 if (check
&& (showFlags
& dwCheck
) && !GetCheck(i
) && !(entry
->IsDirectory() && m_bDoNotAutoselectSubmodules
&& !(dwCheck
& GITSLC_SHOWSUBMODULES
)))
3033 SetEntryCheck(entry
, i
, true);
3036 else if (!check
&& (showFlags
& dwCheck
) && GetCheck(i
))
3038 SetEntryCheck(entry
, i
, false);
3042 // unblock before redrawing
3045 GetStatisticsString();
3049 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR
*pNMHDR
, LRESULT
*pResult
)
3051 LPNMLVGETINFOTIP pGetInfoTip
= reinterpret_cast<LPNMLVGETINFOTIP
>(pNMHDR
);
3056 CTGitPath
*entry
=(CTGitPath
*)GetItemData(pGetInfoTip
->iItem
);
3059 if (pGetInfoTip
->cchTextMax
> entry
->GetGitPathString().GetLength() + g_Git
.m_CurrentDir
.GetLength())
3062 str
+= g_Git
.m_CurrentDir
;
3064 str
+= entry
->GetWinPathString();
3066 _tcsncpy_s(pGetInfoTip
->pszText
, pGetInfoTip
->cchTextMax
, str
.GetBuffer(), str
.GetLength());
3070 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR
*pNMHDR
, LRESULT
*pResult
)
3072 NMLVCUSTOMDRAW
* pLVCD
= reinterpret_cast<NMLVCUSTOMDRAW
*>( pNMHDR
);
3074 // Take the default processing unless we set this to something else below.
3075 *pResult
= CDRF_DODEFAULT
;
3077 // First thing - check the draw stage. If it's the control's prepaint
3078 // stage, then tell Windows we want messages for every item.
3080 switch (pLVCD
->nmcd
.dwDrawStage
)
3083 *pResult
= CDRF_NOTIFYITEMDRAW
;
3085 case CDDS_ITEMPREPAINT
:
3087 // This is the prepaint stage for an item. Here's where we set the
3088 // item's text color. Our return value will tell Windows to draw the
3089 // item itself, but it will use the new color we set here.
3091 // Tell Windows to paint the control itself.
3092 *pResult
= CDRF_DODEFAULT
;
3096 COLORREF crText
= GetSysColor(COLOR_WINDOWTEXT
);
3098 if (m_arStatusArray
.size() > (DWORD_PTR
)pLVCD
->nmcd
.dwItemSpec
)
3101 //FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);
3102 CTGitPath
*entry
=(CTGitPath
*)GetItemData((int)pLVCD
->nmcd
.dwItemSpec
);
3108 // black : unversioned, normal
3111 // brown : missing, deleted, replaced
3112 // green : merged (or potential merges)
3113 // red : conflicts or sure conflicts
3114 if(entry
->m_Action
& CTGitPath::LOGACTIONS_GRAY
)
3116 crText
= RGB(128,128,128);
3119 else if(entry
->m_Action
& CTGitPath::LOGACTIONS_UNMERGED
)
3121 crText
= m_Colors
.GetColor(CColors::Conflict
);
3124 else if(entry
->m_Action
& (CTGitPath::LOGACTIONS_MODIFIED
))
3126 crText
= m_Colors
.GetColor(CColors::Modified
);
3129 else if(entry
->m_Action
& (CTGitPath::LOGACTIONS_ADDED
|CTGitPath::LOGACTIONS_COPY
))
3131 crText
= m_Colors
.GetColor(CColors::Added
);
3133 else if(entry
->m_Action
& CTGitPath::LOGACTIONS_DELETED
)
3135 crText
= m_Colors
.GetColor(CColors::Deleted
);
3137 else if(entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
)
3139 crText
= m_Colors
.GetColor(CColors::Renamed
);
3141 else if(entry
->m_Action
& CTGitPath::LOGACTIONS_MERGED
)
3143 crText
= m_Colors
.GetColor(CColors::Merged
);
3147 crText
= GetSysColor(COLOR_WINDOWTEXT
);
3149 // Store the color back in the NMLVCUSTOMDRAW struct.
3150 pLVCD
->clrText
= crText
;
3157 BOOL
CGitStatusListCtrl::OnSetCursor(CWnd
* pWnd
, UINT nHitTest
, UINT message
)
3160 return CListCtrl::OnSetCursor(pWnd
, nHitTest
, message
);
3163 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_ARROW
));
3165 return CListCtrl::OnSetCursor(pWnd
, nHitTest
, message
);
3167 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_WAIT
));
3172 void CGitStatusListCtrl::RemoveListEntry(int index
)
3175 Locker
lock(m_critSec
);
3178 m_arStatusArray
.erase(m_arStatusArray
.begin()+index
);
3181 delete m_arStatusArray
[m_arListArray
[index
]];
3182 m_arStatusArray
.erase(m_arStatusArray
.begin()+m_arListArray
[index
]);
3183 m_arListArray
.erase(m_arListArray
.begin()+index
);
3184 for (int i
=index
; i
< (int)m_arListArray
.size(); ++i
)
3191 ///< Set a checkbox on an entry in the listbox
3192 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync
3193 void CGitStatusListCtrl::SetEntryCheck(CTGitPath
* pEntry
, int listboxIndex
, bool bCheck
)
3195 pEntry
->m_Checked
= bCheck
;
3196 m_mapFilenameToChecked
[pEntry
->GetGitPathString()] = bCheck
;
3197 SetCheck(listboxIndex
, bCheck
);
3201 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry
* parentEntry
, bool bCheck
)
3204 int nListItems
= GetItemCount();
3205 for (int j
=0; j
< nListItems
; ++j
)
3207 FileEntry
* childEntry
= GetListEntry(j
);
3208 ASSERT(childEntry
!= NULL
);
3209 if (childEntry
== NULL
|| childEntry
== parentEntry
)
3211 if (childEntry
->checked
!= bCheck
)
3213 if (parentEntry
->path
.IsAncestorOf(childEntry
->path
))
3215 SetEntryCheck(childEntry
,j
,bCheck
);
3231 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList
& pathList
)
3235 int nListItems
= GetItemCount();
3236 for (int i
= 0; i
< nListItems
; ++i
)
3238 CTGitPath
* entry
= (CTGitPath
*)GetItemData(i
);
3239 ASSERT(entry
!= NULL
);
3240 if (entry
->m_Checked
)
3242 pathList
.AddPath(*entry
);
3245 pathList
.SortByPathname();
3250 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)
3251 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList
& pathList
, bool /*bNoIgnored*/)
3255 POSITION pos
= GetFirstSelectedItemPosition();
3257 while ((index
= GetNextSelectedItem(pos
)) >= 0)
3259 CTGitPath
* entry
= (CTGitPath
*)GetItemData(index
);
3260 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))
3262 pathList
.AddPath(*entry
);
3266 UINT
CGitStatusListCtrl::OnGetDlgCode()
3268 // we want to process the return key and not have that one
3269 // routed to the default pushbutton
3270 return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS
;
3273 void CGitStatusListCtrl::OnNMReturn(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
3278 if (!CheckMultipleDiffs())
3280 POSITION pos
= GetFirstSelectedItemPosition();
3283 int index
= GetNextSelectedItem(pos
);
3284 CTGitPath
*file
=(CTGitPath
*)GetItemData(index
);
3285 if (file
->m_Action
& (CTGitPath::LOGACTIONS_UNVER
| CTGitPath::LOGACTIONS_IGNORE
))
3287 OpenFile(file
, OPEN
);
3291 if (!m_Rev1
.IsEmpty() && !m_Rev2
.IsEmpty())
3292 StartDiffTwo(index
);
3299 void CGitStatusListCtrl::OnKeyDown(UINT nChar
, UINT nRepCnt
, UINT nFlags
)
3301 // Since we catch all keystrokes (to have the enter key processed here instead
3302 // of routed to the default pushbutton) we have to make sure that other
3303 // keys like Tab and Esc still do what they're supposed to do
3304 // Tab = change focus to next/previous control
3305 // Esc = quit the dialog
3310 ::PostMessage(GetLogicalParent()->GetSafeHwnd(), WM_NEXTDLGCTL
, GetKeyState(VK_SHIFT
)&0x8000, 0);
3316 ::SendMessage(GetLogicalParent()->GetSafeHwnd(), WM_CLOSE
, 0, 0);
3321 CListCtrl::OnKeyDown(nChar
, nRepCnt
, nFlags
);
3324 void CGitStatusListCtrl::PreSubclassWindow()
3326 CListCtrl::PreSubclassWindow();
3327 EnableToolTips(TRUE
);
3328 SetWindowTheme(GetSafeHwnd(), L
"Explorer", NULL
);
3331 void CGitStatusListCtrl::OnPaint()
3333 LRESULT defres
= Default();
3334 if ((m_bBusy
)||(m_bEmpty
))
3339 if (m_sBusy
.IsEmpty())
3340 str
.LoadString(IDS_STATUSLIST_BUSYMSG
);
3346 if (m_sEmpty
.IsEmpty())
3347 str
.LoadString(IDS_STATUSLIST_EMPTYMSG
);
3351 COLORREF clrText
= ::GetSysColor(COLOR_WINDOWTEXT
);
3353 if (IsWindowEnabled())
3354 clrTextBk
= ::GetSysColor(COLOR_WINDOW
);
3356 clrTextBk
= ::GetSysColor(COLOR_3DFACE
);
3361 pHC
= GetHeaderCtrl();
3365 pHC
->GetItemRect(0, &rcH
);
3366 rc
.top
+= rcH
.bottom
;
3370 CMyMemDC
memDC(pDC
, &rc
);
3372 memDC
.SetTextColor(clrText
);
3373 memDC
.SetBkColor(clrTextBk
);
3374 memDC
.FillSolidRect(rc
, clrTextBk
);
3376 CGdiObject
* oldfont
= memDC
.SelectStockObject(DEFAULT_GUI_FONT
);
3377 memDC
.DrawText(str
, rc
, DT_CENTER
| DT_VCENTER
|
3378 DT_WORDBREAK
| DT_NOPREFIX
| DT_NOCLIP
);
3379 memDC
.SelectObject(oldfont
);
3385 // the Default() call did not process the WM_PAINT message!
3386 // Validate the update region ourselves to avoid
3387 // an endless loop repainting
3389 GetUpdateRect(&rc
, FALSE
);
3390 if (!rc
.IsRectEmpty())
3395 // prevent users from extending our hidden (size 0) columns
3396 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR
*pNMHDR
, LRESULT
*pResult
)
3398 m_ColumnManager
.OnHdnBegintrack(pNMHDR
, pResult
);
3401 // prevent any function from extending our hidden (size 0) columns
3402 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR
*pNMHDR
, LRESULT
*pResult
)
3404 if(!m_ColumnManager
.OnHdnItemchanging(pNMHDR
, pResult
))
3408 void CGitStatusListCtrl::OnDestroy()
3410 SaveColumnWidths(true);
3411 CListCtrl::OnDestroy();
3414 void CGitStatusListCtrl::OnBeginDrag(NMHDR
* /*pNMHDR*/, LRESULT
* pResult
)
3416 Locker
lock(m_critSec
);
3417 CDropFiles dropFiles
; // class for creating DROPFILES struct
3420 POSITION pos
= GetFirstSelectedItemPosition();
3424 bool bTempDirCreated
= false;
3426 while ( (index
= GetNextSelectedItem(pos
)) >= 0 )
3428 CTGitPath
*path
= (CTGitPath
*)GetItemData(index
); // m_arStatusArray[index] does not work with SyncDlg
3429 if (path
->IsDirectory())
3433 if (!this->m_CurrentVersion
.IsEmpty() && this->m_CurrentVersion
!= GIT_REV_ZERO
)
3435 if (path
->m_Action
& CTGitPath::LOGACTIONS_DELETED
)
3436 version
.Format(_T("%s^%d"), m_CurrentVersion
, (path
->m_ParentNo
+ 1) & PARENT_MASK
);
3438 version
= m_CurrentVersion
;
3442 if (path
->m_Action
& CTGitPath::LOGACTIONS_DELETED
)
3443 version
= _T("HEAD");
3447 if (version
.IsEmpty())
3449 TCHAR abspath
[MAX_PATH
] = {0};
3450 PathCombine(abspath
, g_Git
.m_CurrentDir
, path
->GetWinPath());
3455 if (!bTempDirCreated
)
3457 tempDir
= GetTempFile();
3458 ::DeleteFile(tempDir
);
3459 ::CreateDirectory(tempDir
, NULL
);
3460 bTempDirCreated
= true;
3462 tempFile
= tempDir
+ _T("\\") + path
->GetWinPathString();
3463 CString tempSubDir
= tempDir
+ _T("\\") + path
->GetContainingDirectory().GetWinPathString();
3464 CPathUtils::MakeSureDirectoryPathExists(tempSubDir
);
3465 if (g_Git
.GetOneFile(version
, *path
, tempFile
))
3468 out
.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED
, path
->GetGitPathString(), version
, tempFile
);
3469 CMessageBox::Show(nullptr, g_Git
.GetGitLastErr(out
, CGit::GIT_CMD_GETONEFILE
), _T("TortoiseGit"), MB_OK
);
3473 dropFiles
.AddFile(tempFile
);
3476 if (!dropFiles
.IsEmpty())
3479 dropFiles
.CreateStructure();
3485 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry
/* = false */)
3487 int maxcol
= ((CHeaderCtrl
*)(GetDlgItem(0)))->GetItemCount()-1;
3488 for (int col
= 0; col
<= maxcol
; col
++)
3489 if (m_ColumnManager
.IsVisible (col
))
3490 m_ColumnManager
.ColumnResized (col
);
3492 if (bSaveToRegistry
)
3493 m_ColumnManager
.WriteSettings();
3496 bool CGitStatusListCtrl::EnableFileDrop()
3498 m_bFileDropsEnabled
= true;
3502 bool CGitStatusListCtrl::HasPath(const CTGitPath
& path
)
3504 for (size_t i
=0; i
< m_arStatusArray
.size(); ++i
)
3506 if (m_arStatusArray
[i
]->IsEquivalentTo(path
))
3513 BOOL
CGitStatusListCtrl::PreTranslateMessage(MSG
* pMsg
)
3515 if (pMsg
->message
== WM_KEYDOWN
)
3517 switch (pMsg
->wParam
)
3521 if (GetAsyncKeyState(VK_CONTROL
)&0x8000)
3523 // select all entries
3524 for (int i
=0; i
<GetItemCount(); ++i
)
3526 SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
3535 if (GetAsyncKeyState(VK_CONTROL
)&0x8000)
3537 // copy all selected paths to the clipboard
3538 if (GetAsyncKeyState(VK_SHIFT
)&0x8000)
3539 CopySelectedEntriesToClipboard(GITSLC_COLSTATUS
);
3541 CopySelectedEntriesToClipboard(0);
3548 if ((GetSelectedCount() > 0) && (m_dwContextMenus
& GITSLC_POPDELETE
))
3551 CTGitPath
* filepath
= (CTGitPath
*)GetItemData(GetSelectionMark());
3552 if (filepath
!= nullptr && (filepath
->m_Action
& (CTGitPath::LOGACTIONS_UNVER
| CTGitPath::LOGACTIONS_IGNORE
)))
3553 DeleteSelectedFiles();
3561 return CListCtrl::PreTranslateMessage(pMsg
);
3564 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols
)
3567 static HINSTANCE
hResourceHandle(AfxGetResourceHandle());
3568 // WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
3573 if (GetSelectedCount() == 0)
3576 // first add the column titles as the first line
3577 // We needn't head when only path copy
3578 //temp.LoadString(IDS_STATUSLIST_COLFILE);
3579 //sClipboard = temp;
3581 DWORD selection
= 0;
3582 for (int i
= 0, count
= m_ColumnManager
.GetColumnCount(); i
< count
; ++i
)
3583 if ( ((dwCols
== -1) && m_ColumnManager
.IsVisible (i
))
3584 || ((dwCols
!= 1) && (i
< 32) && ((dwCols
& (1 << i
)) != 0)))
3586 sClipboard
+= _T("\t") + m_ColumnManager
.GetName(i
);
3589 selection
+= 1 << i
;
3593 sClipboard
+= _T("\r\n");
3595 POSITION pos
= GetFirstSelectedItemPosition();
3597 while ((index
= GetNextSelectedItem(pos
)) >= 0)
3599 CTGitPath
* entry
= (CTGitPath
*)GetItemData(index
);
3603 sClipboard
+= entry
->GetWinPathString();
3604 if (selection
& GITSLC_COLFILENAME
)
3606 sClipboard
+= _T("\t")+entry
->GetFileOrDirectoryName();
3608 if (selection
& GITSLC_COLEXT
)
3610 sClipboard
+= _T("\t")+entry
->GetFileExtension();
3613 if (selection
& GITSLC_COLSTATUS
)
3615 sClipboard
+= _T("\t")+entry
->GetActionName();
3618 if (selection
& SVNSLC_COLDATE
)
3620 TCHAR datebuf
[SVN_DATE_BUFFER
];
3621 apr_time_t date
= entry
->last_commit_date
;
3622 SVN::formatDate(datebuf
, date
, true);
3627 sClipboard
+= _T("\t")+temp
;
3629 for ( int i
= SVNSLC_NUMCOLUMNS
, count
= m_ColumnManager
.GetColumnCount()
3633 if ((dwCols
== -1) && m_ColumnManager
.IsVisible (i
))
3636 = entry
->present_props
[m_ColumnManager
.GetName(i
)];
3637 sClipboard
+= _T("\t") + value
;
3641 if (selection
& GITSLC_COLADD
)
3643 sClipboard
+= _T("\t")+entry
->m_StatAdd
;
3645 if (selection
& GITSLC_COLDEL
)
3647 sClipboard
+= _T("\t")+entry
->m_StatDel
;
3650 sClipboard
+= _T("\r\n");
3653 return CStringUtils::WriteAsciiStringToClipboard(sClipboard
);
3656 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()
3659 std::set
<CString
> changelists
;
3660 POSITION pos
= GetFirstSelectedItemPosition();
3662 while ((index
= GetNextSelectedItem(pos
)) >= 0)
3664 FileEntry
* entry
= GetListEntry(index
);
3665 if (!entry
->changelist
.IsEmpty())
3666 changelists
.insert(entry
->changelist
);
3668 return changelists
.size();
3673 bool CGitStatusListCtrl::PrepareGroups(bool bForce
/* = false */)
3676 bool bHasGroups
=false;
3679 for (size_t i
= 0; i
< m_arStatusArray
.size(); ++i
)
3681 int ParentNo
= m_arStatusArray
[i
]->m_ParentNo
&PARENT_MASK
;
3683 max
=m_arStatusArray
[i
]->m_ParentNo
&PARENT_MASK
;
3686 if (!m_UnRevFileList
.IsEmpty() ||
3687 !m_IgnoreFileList
.IsEmpty() ||
3688 !m_LocalChangesIgnoredFileList
.IsEmpty() ||
3695 EnableGroupView(bHasGroups
);
3697 TCHAR groupname
[1024] = { 0 };
3703 grp
.cbSize
= sizeof(LVGROUP
);
3704 grp
.mask
= LVGF_ALIGN
| LVGF_GROUPID
| LVGF_HEADER
;
3707 //if(m_UnRevFileList.GetCount()>0)
3710 _tcsncpy_s(groupname
, 1024, (LPCTSTR
)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MERGEDFILES
)), 1023);
3711 grp
.pszHeader
= groupname
;
3712 grp
.iGroupId
= MERGE_MASK
;
3713 grp
.uAlign
= LVGA_HEADER_LEFT
;
3714 InsertGroup(0, &grp
);
3716 CAutoRepository
repository(g_Git
.GetGitRepository());
3718 CMessageBox::Show(m_hWnd
, CGit::GetLibGit2LastErr(_T("Could not open repository.")), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
3719 for (int i
= 0; i
<= max
; ++i
)
3722 str
.Format(IDS_STATUSLIST_GROUP_DIFFWITHPARENT
, i
+1);
3726 rev
.Format(_T("%s^%d"), m_CurrentVersion
, i
+ 1);
3728 if (!CGit::GetHash(repository
, hash
, rev
))
3729 str
+= _T(": ") + hash
.ToString().Left(g_Git
.GetShortHASHLength());
3731 grp
.pszHeader
= str
.GetBuffer();
3732 str
.ReleaseBuffer();
3734 grp
.uAlign
= LVGA_HEADER_LEFT
;
3735 InsertGroup(i
+1, &grp
);
3740 _tcsncpy_s(groupname
, 1024, (LPCTSTR
)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MODIFIEDFILES
)), 1023);
3741 grp
.pszHeader
= groupname
;
3742 grp
.iGroupId
= groupindex
;
3743 grp
.uAlign
= LVGA_HEADER_LEFT
;
3744 InsertGroup(groupindex
++, &grp
);
3748 _tcsncpy_s(groupname
, 1024, (LPCTSTR
)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_NOTVERSIONEDFILES
)), 1023);
3749 grp
.pszHeader
= groupname
;
3750 grp
.iGroupId
= groupindex
;
3751 grp
.uAlign
= LVGA_HEADER_LEFT
;
3752 InsertGroup(groupindex
++, &grp
);
3755 //if(m_IgnoreFileList.GetCount()>0)
3757 _tcsncpy_s(groupname
, 1024, (LPCTSTR
)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_IGNOREDFILES
)), 1023);
3758 grp
.pszHeader
= groupname
;
3759 grp
.iGroupId
= groupindex
;
3760 grp
.uAlign
= LVGA_HEADER_LEFT
;
3761 InsertGroup(groupindex
++, &grp
);
3765 _tcsncpy_s(groupname
, 1024, (LPCTSTR
)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_IGNORELOCALCHANGES
)), 1023);
3766 grp
.pszHeader
= groupname
;
3767 grp
.iGroupId
= groupindex
;
3768 grp
.uAlign
= LVGA_HEADER_LEFT
;
3769 InsertGroup(groupindex
++, &grp
);
3775 m_bHasIgnoreGroup
= false;
3777 // now add the items which don't belong to a group
3779 grp
.cbSize
= sizeof(LVGROUP
);
3780 grp
.mask
= LVGF_ALIGN
| LVGF_GROUPID
| LVGF_HEADER
;
3781 CString
sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET
));
3782 _tcsncpy_s(groupname
, 1024, (LPCTSTR
)sUnassignedName
, 1023);
3783 grp
.pszHeader
= groupname
;
3784 grp
.iGroupId
= groupindex
;
3785 grp
.uAlign
= LVGA_HEADER_LEFT
;
3786 InsertGroup(groupindex
++, &grp
);
3788 for (std::map
<CString
,int>::iterator it
= m_changelists
.begin(); it
!= m_changelists
.end(); ++it
)
3790 if (it
->first
.Compare(SVNSLC_IGNORECHANGELIST
)!=0)
3793 grp
.cbSize
= sizeof(LVGROUP
);
3794 grp
.mask
= LVGF_ALIGN
| LVGF_GROUPID
| LVGF_HEADER
;
3795 _tcsncpy_s(groupname
, 1024, it
->first
, 1023);
3796 grp
.pszHeader
= groupname
;
3797 grp
.iGroupId
= groupindex
;
3798 grp
.uAlign
= LVGA_HEADER_LEFT
;
3799 it
->second
= InsertGroup(groupindex
++, &grp
);
3802 m_bHasIgnoreGroup
= true;
3805 if (m_bHasIgnoreGroup
)
3807 // and now add the group 'ignore-on-commit'
3808 std::map
<CString
,int>::iterator it
= m_changelists
.find(SVNSLC_IGNORECHANGELIST
);
3809 if (it
!= m_changelists
.end())
3811 grp
.cbSize
= sizeof(LVGROUP
);
3812 grp
.mask
= LVGF_ALIGN
| LVGF_GROUPID
| LVGF_HEADER
;
3813 _tcsncpy_s(groupname
, 1024, SVNSLC_IGNORECHANGELIST
, 1023);
3814 grp
.pszHeader
= groupname
;
3815 grp
.iGroupId
= groupindex
;
3816 grp
.uAlign
= LVGA_HEADER_LEFT
;
3817 it
->second
= InsertGroup(groupindex
, &grp
);
3824 void CGitStatusListCtrl::NotifyCheck()
3826 CWnd
* pParent
= GetLogicalParent();
3827 if (NULL
!= pParent
&& NULL
!= pParent
->GetSafeHwnd())
3829 pParent
->SendMessage(GITSLNM_CHECKCHANGED
, m_nSelected
);
3833 int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash
,CTGitPathList
*list
)
3838 m_CurrentVersion
=hash
;
3844 count
= list
->GetCount();
3846 CString head
= _T("HEAD");
3848 head
= _T("HEAD~1");
3850 if(hash
== GIT_REV_ZERO
)
3852 for (int i
= 0; i
< count
; ++i
)
3857 if(!g_Git
.IsInitRepos())
3859 // also list staged files which will be in the commit
3860 cmd
=(_T("git.exe diff-index --cached --raw ") + head
+ _T(" --numstat -C -M -z --"));
3861 cmdList
+= cmd
+ _T("\n");
3862 g_Git
.Run(cmd
, &cmdout
);
3865 cmd
=(_T("git.exe diff-index --raw ") + head
+ _T(" --numstat -C -M -z --"));
3867 cmd
.Format(_T("git.exe diff-index --raw ") + head
+ _T(" --numstat -C -M -z -- \"%s\""),(*list
)[i
].GetGitPathString());
3868 cmdList
+= cmd
+ _T("\n");
3871 if(g_Git
.Run(cmd
, &cmdout
, &cmdErr
))
3873 int last
= cmdErr
.RevertFind(0,-1);
3875 g_Git
.StringAppend(&str
, &cmdErr
[last
+ 1], CP_UTF8
, (int)cmdErr
.size() - last
-1);
3876 CMessageBox::Show(NULL
, str
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
3879 out
.append(cmdout
, 0);
3881 else // Init Repository
3883 //We will list all added file for init repository because commit will comit these
3885 cmd
=_T("git.exe ls-files -s -t -z");
3886 cmdList
+= cmd
+ _T("\n");
3888 // cmd.Format(_T("git.exe ls-files -s -t -z -- \"%s\""),(*list)[i].GetGitPathString());
3890 g_Git
.Run(cmd
, &cmdout
);
3892 out
.append(cmdout
,0);
3898 if(g_Git
.IsInitRepos())
3900 if (m_StatusFileList
.ParserFromLsFile(out
))
3902 CString tempFile1
= GetTempFile();
3903 CFile
file1(tempFile1
, CFile::modeWrite
| CFile::typeBinary
);
3904 file1
.Write(out
.data(), (UINT
)out
.size());
3906 CString tempFile2
= GetTempFile();
3907 CFile
file2(tempFile2
, CFile::modeWrite
);
3908 file2
.Write(cmdList
, sizeof(TCHAR
) * cmdList
.GetLength());
3910 CMessageBox::Show(NULL
, _T("Parse ls-files failed!\nPlease inspect ") + tempFile1
+ _T("\nand ") + tempFile2
, _T("TortoiseGit"), MB_OK
);
3912 for (int i
= 0; i
< m_StatusFileList
.GetCount(); ++i
)
3913 ((CTGitPath
&)(m_StatusFileList
[i
])).m_Action
=CTGitPath::LOGACTIONS_ADDED
;
3916 this->m_StatusFileList
.ParserFromLog(out
);
3918 //handle delete conflict case, when remote : modified, local : deleted.
3919 for (int i
= 0; i
< count
; ++i
)
3925 cmd
=_T("git.exe ls-files -u -t -z");
3927 cmd
.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),(*list
)[i
].GetGitPathString());
3929 g_Git
.Run(cmd
, &cmdout
);
3931 CTGitPathList conflictlist
;
3932 conflictlist
.ParserFromLog(cmdout
);
3933 for (int i
= 0; i
< conflictlist
.GetCount(); ++i
)
3935 CTGitPath
*p
=m_StatusFileList
.LookForGitPath(conflictlist
[i
].GetGitPathString());
3937 p
->m_Action
|=CTGitPath::LOGACTIONS_UNMERGED
;
3939 m_StatusFileList
.AddPath(conflictlist
[i
]);
3943 // handle source files of file renames/moves (issue #860)
3944 // if a file gets renamed and the new file "git add"ed, diff-index doesn't list the source file anymore
3945 for (int i
= 0; i
< count
; ++i
)
3951 cmd
= _T("git.exe ls-files -d -z");
3953 cmd
.Format(_T("git.exe ls-files -d -z -- \"%s\""),(*list
)[i
].GetGitPathString());
3955 g_Git
.Run(cmd
, &cmdout
);
3957 CTGitPathList deletelist
;
3958 deletelist
.ParserFromLog(cmdout
, true);
3959 BOOL bDeleteChecked
= FALSE
;
3960 int deleteFromIndex
= 0;
3961 for (int i
= 0; i
< deletelist
.GetCount(); ++i
)
3963 CTGitPath
*p
= m_StatusFileList
.LookForGitPath(deletelist
[i
].GetGitPathString());
3965 m_StatusFileList
.AddPath(deletelist
[i
]);
3966 else if ((p
->m_Action
== CTGitPath::LOGACTIONS_ADDED
|| p
->m_Action
== CTGitPath::LOGACTIONS_REPLACED
) && !p
->Exists())
3968 if (!bDeleteChecked
)
3971 message
.Format(IDS_ASK_REMOVE_FROM_INDEX
, p
->GetWinPathString());
3972 deleteFromIndex
= CMessageBox::ShowCheck(m_hWnd
, message
, _T("TortoiseGit"), 1, IDI_EXCLAMATION
, CString(MAKEINTRESOURCE(IDS_REMOVE_FROM_INDEX
)), CString(MAKEINTRESOURCE(IDS_IGNOREBUTTON
)), NULL
, NULL
, CString(MAKEINTRESOURCE(IDS_DO_SAME_FOR_REST
)), &bDeleteChecked
);
3974 if (deleteFromIndex
== 1)
3976 g_Git
.Run(_T("git.exe rm -f --cache -- \"") + p
->GetWinPathString() + _T("\""), &cmdout
);
3977 m_StatusFileList
.RemoveItem(*p
);
3989 count
= list
->GetCount();
3991 for (int i
= 0; i
< count
; ++i
)
3996 cmd
.Format(_T("git.exe diff-tree --raw --numstat -C -M -z %s --"), hash
);
3998 cmd
.Format(_T("git.exe diff-tree --raw --numstat -C -M %s -z -- \"%s\""),hash
,(*list
)[i
].GetGitPathString());
4000 g_Git
.Run(cmd
, &cmdout
, NULL
);
4004 this->m_StatusFileList
.ParserFromLog(out
);
4008 for (int i
= 0; i
< m_StatusFileList
.GetCount(); ++i
)
4010 CTGitPath
* gitpatch
=(CTGitPath
*)&m_StatusFileList
[i
];
4011 gitpatch
->m_Checked
= TRUE
;
4012 m_arStatusArray
.push_back((CTGitPath
*)&m_StatusFileList
[i
]);
4015 this->m_bBusy
=FALSE
;
4019 int CGitStatusListCtrl::UpdateWithGitPathList(CTGitPathList
&list
)
4021 m_arStatusArray
.clear();
4022 for (int i
= 0; i
< list
.GetCount(); ++i
)
4024 CTGitPath
* gitpath
=(CTGitPath
*)&list
[i
];
4026 if(gitpath
->m_Action
& CTGitPath::LOGACTIONS_HIDE
)
4029 gitpath
->m_Checked
= TRUE
;
4030 m_arStatusArray
.push_back((CTGitPath
*)&list
[i
]);
4035 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList
&list
)
4037 m_UnRevFileList
= list
;
4038 for (int i
= 0; i
< m_UnRevFileList
.GetCount(); ++i
)
4040 CTGitPath
* gitpatch
=(CTGitPath
*)&m_UnRevFileList
[i
];
4041 gitpatch
->m_Checked
= FALSE
;
4042 m_arStatusArray
.push_back((CTGitPath
*)&m_UnRevFileList
[i
]);
4047 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList
*List
)
4050 if (m_UnRevFileList
.FillUnRev(CTGitPath::LOGACTIONS_UNVER
, List
, &err
))
4052 CMessageBox::Show(NULL
, _T("Failed to get UnRev file list\n") + err
, _T("TortoiseGit"), MB_OK
);
4056 for (int i
= 0; i
< m_UnRevFileList
.GetCount(); ++i
)
4058 CTGitPath
* gitpatch
=(CTGitPath
*)&m_UnRevFileList
[i
];
4059 gitpatch
->m_Checked
= FALSE
;
4060 m_arStatusArray
.push_back((CTGitPath
*)&m_UnRevFileList
[i
]);
4065 int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList
*List
)
4068 if (m_IgnoreFileList
.FillUnRev(CTGitPath::LOGACTIONS_IGNORE
, List
, &err
))
4070 CMessageBox::Show(NULL
, _T("Failed to get Ignore file list\n") + err
, _T("TortoiseGit"), MB_OK
);
4074 for (int i
= 0; i
< m_IgnoreFileList
.GetCount(); ++i
)
4076 CTGitPath
* gitpatch
=(CTGitPath
*)&m_IgnoreFileList
[i
];
4077 gitpatch
->m_Checked
= FALSE
;
4078 m_arStatusArray
.push_back((CTGitPath
*)&m_IgnoreFileList
[i
]);
4083 int CGitStatusListCtrl::UpdateLocalChangesIgnoredFileList(CTGitPathList
*list
)
4085 m_LocalChangesIgnoredFileList
.FillBasedOnIndexFlags(GIT_IDXENTRY_VALID
| GIT_IDXENTRY_SKIP_WORKTREE
, list
);
4086 for (int i
= 0; i
< m_LocalChangesIgnoredFileList
.GetCount(); ++i
)
4088 CTGitPath
* gitpatch
= (CTGitPath
*)&m_LocalChangesIgnoredFileList
[i
];
4089 gitpatch
->m_Checked
= FALSE
;
4090 m_arStatusArray
.push_back((CTGitPath
*)&m_LocalChangesIgnoredFileList
[i
]);
4095 int CGitStatusListCtrl::UpdateFileList(int mask
,bool once
,CTGitPathList
*List
)
4097 if(mask
&CGitStatusListCtrl::FILELIST_MODIFY
)
4099 if(once
|| (!(m_FileLoaded
&CGitStatusListCtrl::FILELIST_MODIFY
)))
4101 UpdateFileList(git_revnum_t(GIT_REV_ZERO
),List
);
4102 m_FileLoaded
|=CGitStatusListCtrl::FILELIST_MODIFY
;
4105 if (mask
& CGitStatusListCtrl::FILELIST_UNVER
|| mask
& CGitStatusListCtrl::FILELIST_IGNORE
)
4107 if(once
|| (!(m_FileLoaded
&CGitStatusListCtrl::FILELIST_UNVER
)))
4109 UpdateUnRevFileList(List
);
4110 m_FileLoaded
|=CGitStatusListCtrl::FILELIST_UNVER
;
4112 if(mask
&CGitStatusListCtrl::FILELIST_IGNORE
&& (once
|| (!(m_FileLoaded
&CGitStatusListCtrl::FILELIST_IGNORE
))))
4114 UpdateIgnoreFileList(List
);
4115 m_FileLoaded
|= CGitStatusListCtrl::FILELIST_IGNORE
;
4118 if (mask
& CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED
&& (once
|| (!(m_FileLoaded
& CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED
))))
4120 UpdateLocalChangesIgnoredFileList(List
);
4121 m_FileLoaded
|= CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED
;
4126 void CGitStatusListCtrl::Clear()
4129 this->DeleteAllItems();
4130 this->m_arListArray
.clear();
4131 this->m_arStatusArray
.clear();
4132 this->m_changelists
.clear();
4135 bool CGitStatusListCtrl::CheckMultipleDiffs()
4137 UINT selCount
= GetSelectedCount();
4138 if (selCount
> max(3, (DWORD
)CRegDWORD(_T("Software\\TortoiseGit\\NumDiffWarning"), 10)))
4141 message
.Format(CString(MAKEINTRESOURCE(IDS_STATUSLIST_WARN_MAXDIFF
)), selCount
);
4142 return ::MessageBox(GetSafeHwnd(), message
, _T("TortoiseGit"), MB_YESNO
| MB_ICONQUESTION
) == IDYES
;
4146 //////////////////////////////////////////////////////////////////////////
4148 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC
* pFmtEtc
, STGMEDIUM
& medium
, DWORD
* /*pdwEffect*/, POINTL pt
)
4150 if(pFmtEtc
->cfFormat
== CF_HDROP
&& medium
.tymed
== TYMED_HGLOBAL
)
4152 HDROP hDrop
= (HDROP
)GlobalLock(medium
.hGlobal
);
4155 TCHAR szFileName
[MAX_PATH
] = {0};
4157 UINT cFiles
= DragQueryFile(hDrop
, 0xFFFFFFFF, NULL
, 0);
4160 clientpoint
.x
= pt
.x
;
4161 clientpoint
.y
= pt
.y
;
4162 ScreenToClient(m_hTargetWnd
, &clientpoint
);
4163 if ((m_pSVNStatusListCtrl
->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl
->GetGroupFromPoint(&clientpoint
) >= 0))
4165 CTSVNPathList changelistItems
;
4166 for(UINT i
= 0; i
< cFiles
; ++i
)
4168 DragQueryFile(hDrop
, i
, szFileName
, sizeof(szFileName
));
4169 changelistItems
.AddPath(CTSVNPath(szFileName
));
4171 // find the changelist name
4172 CString sChangelist
;
4173 LONG_PTR nGroup
= m_pSVNStatusListCtrl
->GetGroupFromPoint(&clientpoint
);
4174 for (std::map
<CString
, int>::iterator it
= m_pSVNStatusListCtrl
->m_changelists
.begin(); it
!= m_pSVNStatusListCtrl
->m_changelists
.end(); ++it
)
4175 if (it
->second
== nGroup
)
4176 sChangelist
= it
->first
;
4177 if (!sChangelist
.IsEmpty())
4180 if (git
.AddToChangeList(changelistItems
, sChangelist
, git_depth_empty
))
4182 for (int l
=0; l
<changelistItems
.GetCount(); ++l
)
4184 int index
= m_pSVNStatusListCtrl
->GetIndex(changelistItems
[l
]);
4187 CSVNStatusListCtrl::FileEntry
* e
= m_pSVNStatusListCtrl
->GetListEntry(index
);
4190 e
->changelist
= sChangelist
;
4193 if (m_pSVNStatusListCtrl
->m_changelists
.find(e
->changelist
)!=m_pSVNStatusListCtrl
->m_changelists
.end())
4194 m_pSVNStatusListCtrl
->SetItemGroup(index
, m_pSVNStatusListCtrl
->m_changelists
[e
->changelist
]);
4196 m_pSVNStatusListCtrl
->SetItemGroup(index
, 0);
4202 HWND hParentWnd
= GetParent(m_hTargetWnd
);
4203 if (hParentWnd
!= NULL
)
4204 ::SendMessage(hParentWnd
, CSVNStatusListCtrl::SVNSLNM_ADDFILE
, 0, (LPARAM
)changelistItems
[l
].GetWinPath());
4210 CMessageBox::Show(m_pSVNStatusListCtrl
->m_hWnd
, git
.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR
);
4216 if (git
.RemoveFromChangeList(changelistItems
, CStringArray(), git_depth_empty
))
4218 for (int l
=0; l
<changelistItems
.GetCount(); ++l
)
4220 int index
= m_pSVNStatusListCtrl
->GetIndex(changelistItems
[l
]);
4223 CSVNStatusListCtrl::FileEntry
* e
= m_pSVNStatusListCtrl
->GetListEntry(index
);
4226 e
->changelist
= sChangelist
;
4227 m_pSVNStatusListCtrl
->SetItemGroup(index
, 0);
4232 HWND hParentWnd
= GetParent(m_hTargetWnd
);
4233 if (hParentWnd
!= NULL
)
4234 ::SendMessage(hParentWnd
, CSVNStatusListCtrl::SVNSLNM_ADDFILE
, 0, (LPARAM
)changelistItems
[l
].GetWinPath());
4240 CMessageBox::Show(m_pSVNStatusListCtrl
->m_hWnd
, git
.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR
);
4246 for(UINT i
= 0; i
< cFiles
; ++i
)
4248 DragQueryFile(hDrop
, i
, szFileName
, sizeof(szFileName
));
4249 HWND hParentWnd
= GetParent(m_hTargetWnd
);
4250 if (hParentWnd
!= NULL
)
4251 ::SendMessage(hParentWnd
, CSVNStatusListCtrl::SVNSLNM_ADDFILE
, 0, (LPARAM
)szFileName
);
4255 GlobalUnlock(medium
.hGlobal
);
4257 return true; //let base free the medium
4259 HRESULT STDMETHODCALLTYPE
CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState
, POINTL pt
, DWORD __RPC_FAR
*pdwEffect
)
4261 CIDropTarget::DragOver(grfKeyState
, pt
, pdwEffect
);
4262 *pdwEffect
= DROPEFFECT_COPY
;
4263 if (m_pSVNStatusListCtrl
)
4266 clientpoint
.x
= pt
.x
;
4267 clientpoint
.y
= pt
.y
;
4268 ScreenToClient(m_hTargetWnd
, &clientpoint
);
4269 if ((m_pSVNStatusListCtrl
->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl
->GetGroupFromPoint(&clientpoint
) >= 0))
4271 *pdwEffect
= DROPEFFECT_MOVE
;
4273 else if ((!m_pSVNStatusListCtrl
->m_bFileDropsEnabled
)||(m_pSVNStatusListCtrl
->m_bOwnDrag
))
4275 *pdwEffect
= DROPEFFECT_NONE
;
4283 void CGitStatusListCtrl::FilesExport()
4286 // export all changed files to a folder
4287 CBrowseFolder browseFolder
;
4288 browseFolder
.m_style
= BIF_EDITBOX
| BIF_NEWDIALOGSTYLE
| BIF_RETURNFSANCESTORS
| BIF_RETURNONLYFSDIRS
;
4289 if (browseFolder
.Show(GetSafeHwnd(), exportDir
) != CBrowseFolder::OK
)
4292 POSITION pos
= GetFirstSelectedItemPosition();
4294 while ((index
= GetNextSelectedItem(pos
)) >= 0)
4296 CTGitPath
*fd
= (CTGitPath
*)GetItemData(index
);
4297 // we cannot export directories or folders
4298 if (fd
->m_Action
== CTGitPath::LOGACTIONS_DELETED
|| fd
->IsDirectory())
4301 CAppUtils::CreateMultipleDirectory(exportDir
+ _T("\\") + fd
->GetContainingDirectory().GetWinPathString());
4302 CString filename
= exportDir
+ _T("\\") + fd
->GetWinPathString();
4303 if (m_CurrentVersion
== GIT_REV_ZERO
)
4305 if (!CopyFile(g_Git
.CombinePath(fd
), filename
, false))
4307 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
4313 if (g_Git
.GetOneFile(m_CurrentVersion
, *fd
, filename
))
4316 out
.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED
, fd
->GetGitPathString(), m_CurrentVersion
, filename
);
4317 if (CMessageBox::Show(nullptr, g_Git
.GetGitLastErr(out
, CGit::GIT_CMD_GETONEFILE
), _T("TortoiseGit"), 2, IDI_WARNING
, CString(MAKEINTRESOURCE(IDS_IGNOREBUTTON
)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON
))) == 2)
4324 void CGitStatusListCtrl::FileSaveAs(CTGitPath
*path
)
4327 filename
.Format(_T("%s-%s%s"), path
->GetBaseFilename(), this->m_CurrentVersion
.Left(g_Git
.GetShortHASHLength()), path
->GetFileExtension());
4328 CFileDialog
dlg(FALSE
,NULL
,
4330 OFN_HIDEREADONLY
| OFN_OVERWRITEPROMPT
,
4332 CString currentpath
;
4333 currentpath
= g_Git
.CombinePath(path
->GetContainingDirectory());
4335 dlg
.m_ofn
.lpstrInitialDir
=currentpath
.GetBuffer();
4338 INT_PTR ret
= dlg
.DoModal();
4339 SetCurrentDirectory(g_Git
.m_CurrentDir
);
4342 filename
= dlg
.GetPathName();
4343 if(m_CurrentVersion
== GIT_REV_ZERO
)
4345 if(!CopyFile(g_Git
.m_CurrentDir
+_T("\\") + path
->GetWinPath(),filename
,false))
4347 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
4354 if(g_Git
.GetOneFile(m_CurrentVersion
,*path
,filename
))
4356 out
.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED
, path
->GetGitPathString(), m_CurrentVersion
, filename
);
4357 CMessageBox::Show(nullptr, g_Git
.GetGitLastErr(out
, CGit::GIT_CMD_GETONEFILE
), _T("TortoiseGit"), MB_OK
);
4365 int CGitStatusListCtrl::RevertSelectedItemToVersion(bool parent
)
4367 if(this->m_CurrentVersion
.IsEmpty())
4369 if(this->m_CurrentVersion
== GIT_REV_ZERO
)
4372 POSITION pos
= GetFirstSelectedItemPosition();
4375 std::map
<CString
, int> versionMap
;
4376 while ((index
= GetNextSelectedItem(pos
)) >= 0)
4378 CTGitPath
*fentry
=(CTGitPath
*)GetItemData(index
);
4382 int parentNo
= fentry
->m_ParentNo
& PARENT_MASK
;
4384 ref
.Format(_T("%s^%d"), m_CurrentVersion
, parentNo
+ 1);
4386 if (g_Git
.GetHash(hash
, ref
))
4388 MessageBox(g_Git
.GetGitLastErr(_T("Could not get hash of ref \"") + ref
+ _T("\".")), _T("TortoiseGit"), MB_ICONERROR
);
4392 version
= hash
.ToString();
4395 version
= m_CurrentVersion
;
4397 cmd
.Format(_T("git.exe checkout %s -- \"%s\""), version
, fentry
->GetGitPathString());
4399 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
4401 if (MessageBox(out
, _T("TortoiseGit"), MB_ICONEXCLAMATION
| MB_OKCANCEL
) == IDCANCEL
)
4405 versionMap
[version
]++;
4409 for (auto it
= versionMap
.begin(); it
!= versionMap
.end(); ++it
)
4411 CString versionEntry
;
4412 versionEntry
.Format(IDS_STATUSLIST_FILESREVERTED
, it
->second
, it
->first
);
4413 out
+= versionEntry
+ _T("\r\n");
4415 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
4419 void CGitStatusListCtrl::OpenFile(CTGitPath
*filepath
,int mode
)
4422 if(this->m_CurrentVersion
.IsEmpty() || m_CurrentVersion
== GIT_REV_ZERO
)
4424 file
= g_Git
.CombinePath(filepath
);
4429 GetTempPath(temppath
);
4430 TCHAR szTempName
[MAX_PATH
] = {0};
4431 GetTempFileName(temppath
, filepath
->GetBaseFilename(), 0, szTempName
);
4432 CString
temp(szTempName
);
4433 DeleteFile(szTempName
);
4434 CreateDirectory(szTempName
, NULL
);
4435 file
.Format(_T("%s\\%s_%s%s"),
4437 filepath
->GetBaseFilename(),
4438 m_CurrentVersion
.Left(g_Git
.GetShortHASHLength()),
4439 filepath
->GetFileExtension());
4441 if(g_Git
.GetOneFile(m_CurrentVersion
, *filepath
, file
))
4443 out
.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED
, filepath
->GetGitPathString(), m_CurrentVersion
, file
);
4444 CMessageBox::Show(nullptr, g_Git
.GetGitLastErr(out
, CGit::GIT_CMD_GETONEFILE
), _T("TortoiseGit"), MB_OK
);
4447 SetFileAttributes(file
, FILE_ATTRIBUTE_READONLY
);
4449 if(mode
== ALTERNATIVEEDITOR
)
4451 CAppUtils::LaunchAlternativeEditor(file
);
4454 int ret
= HINSTANCE_ERROR
;
4458 ret
= (int)ShellExecute(this->m_hWnd
, NULL
,file
, NULL
, NULL
, SW_SHOW
);
4460 if (ret
> HINSTANCE_ERROR
)
4467 CString cmd
= _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
4469 CAppUtils::LaunchApplication(cmd
, NULL
, false);
4473 void CGitStatusListCtrl::DeleteSelectedFiles()
4476 std::vector
<int> selectIndex
;
4478 POSITION pos
= GetFirstSelectedItemPosition();
4480 while ((index
= GetNextSelectedItem(pos
)) >= 0)
4482 selectIndex
.push_back(index
);
4485 //Create file-list ('\0' separated) for SHFileOperation
4487 for (size_t i
= 0; i
< selectIndex
.size(); ++i
)
4489 index
= selectIndex
[i
];
4491 CTGitPath
* path
=(CTGitPath
*)GetItemData(index
);
4493 if (path
== nullptr)
4496 filelist
+= path
->GetWinPathString();
4497 filelist
+= _T("|");
4499 filelist
+= _T("|");
4500 int len
= filelist
.GetLength();
4501 std::unique_ptr
<TCHAR
[]> buf(new TCHAR
[len
+ 2]);
4502 _tcscpy_s(buf
.get(), len
+ 2, filelist
);
4503 CStringUtils::PipesToNulls(buf
.get(), len
+ 2);
4504 SHFILEOPSTRUCT fileop
;
4505 fileop
.hwnd
= this->m_hWnd
;
4506 fileop
.wFunc
= FO_DELETE
;
4507 fileop
.pFrom
= buf
.get();
4509 fileop
.fFlags
= FOF_NO_CONNECTED_ELEMENTS
| ((GetAsyncKeyState(VK_SHIFT
) & 0x8000) ? 0 : FOF_ALLOWUNDO
);
4510 fileop
.lpszProgressTitle
= _T("deleting file");
4511 int result
= SHFileOperation(&fileop
);
4513 if ((result
== 0) && (!fileop
.fAnyOperationsAborted
))
4516 POSITION pos
= NULL
;
4517 while ((pos
= GetFirstSelectedItemPosition()) != 0)
4519 int index
= GetNextSelectedItem(pos
);
4520 if (GetCheck(index
))
4524 RemoveListEntry(index
);