1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2014 - TortoiseGit
4 // Copyright (C) 2003-2008, 2013 - TortoiseSVN
5 // Copyright (C) 2010-2012 Sven Strickroth <email@cs-ware.de>
7 // This program is free software; you can redistribute it and/or
8 // modify it under the terms of the GNU General Public License
9 // as published by the Free Software Foundation; either version 2
10 // of the License, or (at your option) any later version.
12 // This program is distributed in the hope that it will be useful,
13 // but WITHOUT ANY WARRANTY; without even the implied warranty of
14 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 // GNU General Public License for more details.
17 // You should have received a copy of the GNU General Public License
18 // along with this program; if not, write to the Free Software Foundation,
19 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
24 #include "..\\TortoiseShell\resource.h"
25 #include "GitStatusListCtrl.h"
26 #include "MessageBox.h"
28 #include "UnicodeUtils.h"
30 #include "PathUtils.h"
32 #include "StringUtils.h"
33 #include "DirFileEnum.h"
34 #include "GitConfig.h"
35 #include "LoglistUtils.h"
38 #include "GitProgressDlg.h"
39 #include "SysImageList.h"
42 #include "GitStatus.h"
44 #include "ShellUpdater.h"
45 #include "GitAdminDir.h"
46 #include "DropFiles.h"
48 #include "FormatMessageWrapper.h"
49 #include "BrowseFolder.h"
51 const UINT
CGitStatusListCtrl::GITSLNM_ITEMCOUNTCHANGED
52 = ::RegisterWindowMessage(_T("GITSLNM_ITEMCOUNTCHANGED"));
53 const UINT
CGitStatusListCtrl::GITSLNM_NEEDSREFRESH
54 = ::RegisterWindowMessage(_T("GITSLNM_NEEDSREFRESH"));
55 const UINT
CGitStatusListCtrl::GITSLNM_ADDFILE
56 = ::RegisterWindowMessage(_T("GITSLNM_ADDFILE"));
57 const UINT
CGitStatusListCtrl::GITSLNM_CHECKCHANGED
58 = ::RegisterWindowMessage(_T("GITSLNM_CHECKCHANGED"));
59 const UINT
CGitStatusListCtrl::GITSLNM_ITEMCHANGED
60 = ::RegisterWindowMessage(_T("GITSLNM_ITEMCHANGED"));
65 BEGIN_MESSAGE_MAP(CGitStatusListCtrl
, CListCtrl
)
66 ON_NOTIFY(HDN_ITEMCLICKA
, 0, OnHdnItemclick
)
67 ON_NOTIFY(HDN_ITEMCLICKW
, 0, OnHdnItemclick
)
68 ON_NOTIFY(HDN_ENDTRACK
, 0, OnColumnResized
)
69 ON_NOTIFY(HDN_ENDDRAG
, 0, OnColumnMoved
)
70 ON_NOTIFY_REFLECT_EX(LVN_ITEMCHANGED
, OnLvnItemchanged
)
72 ON_NOTIFY_REFLECT(NM_DBLCLK
, OnNMDblclk
)
73 ON_NOTIFY_REFLECT(LVN_GETINFOTIP
, OnLvnGetInfoTip
)
74 ON_NOTIFY_REFLECT(NM_CUSTOMDRAW
, OnNMCustomdraw
)
77 ON_NOTIFY_REFLECT(NM_RETURN
, OnNMReturn
)
80 ON_NOTIFY(HDN_BEGINTRACKA
, 0, &CGitStatusListCtrl::OnHdnBegintrack
)
81 ON_NOTIFY(HDN_BEGINTRACKW
, 0, &CGitStatusListCtrl::OnHdnBegintrack
)
82 ON_NOTIFY(HDN_ITEMCHANGINGA
, 0, &CGitStatusListCtrl::OnHdnItemchanging
)
83 ON_NOTIFY(HDN_ITEMCHANGINGW
, 0, &CGitStatusListCtrl::OnHdnItemchanging
)
85 ON_NOTIFY_REFLECT(LVN_BEGINDRAG
, OnBeginDrag
)
86 ON_NOTIFY_REFLECT(LVN_ITEMCHANGING
, &CGitStatusListCtrl::OnLvnItemchanging
)
91 CGitStatusListCtrl::CGitStatusListCtrl() : CListCtrl()
92 //, m_HeadRev(GitRev::REV_HEAD)
95 , m_pSelectButton(NULL
)
96 , m_pConfirmButton(NULL
)
99 , m_bShowIgnores(false)
100 , m_pDropTarget(NULL
)
101 , m_bIgnoreRemoveOnly(false)
102 , m_bCheckChildrenWithParent(false)
103 , m_bUnversionedLast(true)
104 , m_bHasChangeLists(false)
108 , m_bHasCheckboxes(false)
109 , m_bCheckIfGroupsExist(true)
110 , m_bFileDropsEnabled(false)
112 , m_dwDefaultColumns(0)
113 , m_ColumnManager(this)
114 , m_bAscending(false)
115 , m_nSortedColumn(-1)
116 , m_bHasExternalsFromDifferentRepos(false)
117 , m_sNoPropValueText(MAKEINTRESOURCE(IDS_STATUSLIST_NOPROPVALUE
))
119 , m_bDoNotAutoselectSubmodules(false)
121 , m_hwndLogicalParent(NULL
)
122 , m_bHasUnversionedItems(FALSE
)
124 , m_bHasExternals(false)
125 , m_bHasIgnoreGroup(false)
135 , m_nShownUnversioned(0)
136 , m_nShownModified(0)
139 , m_nShownConflicted(0)
141 , m_nShownSubmodules(0)
143 , m_bShowFolders(false)
145 , m_dwContextMenus(0)
150 m_dwDefaultColumns
= 0;
152 m_bIsRevertTheirMy
= false;
153 this->m_nLineAdded
=this->m_nLineDeleted
=0;
156 CGitStatusListCtrl::~CGitStatusListCtrl()
158 // if (m_pDropTarget)
159 // delete m_pDropTarget;
163 void CGitStatusListCtrl::ClearStatusArray()
166 Locker
lock(m_critSec
);
167 for (size_t i
= 0; i
< m_arStatusArray
.size(); ++i
)
169 delete m_arStatusArray
[i
];
171 m_arStatusArray
.clear();
175 void CGitStatusListCtrl::Init(DWORD dwColumns
, const CString
& sColumnInfoContainer
, unsigned __int64 dwContextMenus
/* = GitSLC_POPALL */, bool bHasCheckboxes
/* = true */, bool bHasWC
/* = true */, DWORD allowedColumns
/* = 0xffffffff */)
177 Locker
lock(m_critSec
);
179 m_dwDefaultColumns
= dwColumns
| 1;
180 m_dwContextMenus
= dwContextMenus
;
181 m_bHasCheckboxes
= bHasCheckboxes
;
184 // set the extended style of the listcontrol
185 // 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.
186 CRegDWORD
regFullRowSelect(_T("Software\\TortoiseGit\\FullRowSelect"), TRUE
);
187 DWORD exStyle
= LVS_EX_HEADERDRAGDROP
| LVS_EX_DOUBLEBUFFER
| LVS_EX_INFOTIP
| LVS_EX_SUBITEMIMAGES
;
188 if (DWORD(regFullRowSelect
))
189 exStyle
|= LVS_EX_FULLROWSELECT
;
190 exStyle
|= (bHasCheckboxes
? LVS_EX_CHECKBOXES
: 0);
192 SetExtendedStyle(exStyle
);
194 SetWindowTheme(m_hWnd
, L
"Explorer", NULL
);
196 m_nIconFolder
= SYS_IMAGE_LIST().GetDirIconIndex();
197 m_nRestoreOvl
= SYS_IMAGE_LIST().AddIcon((HICON
)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_RESTOREOVL
), IMAGE_ICON
, 0, 0, LR_DEFAULTSIZE
));
198 SYS_IMAGE_LIST().SetOverlayImage(m_nRestoreOvl
, OVL_RESTORE
);
199 SetImageList(&SYS_IMAGE_LIST(), LVSIL_SMALL
);
201 // keep CSorter::operator() in sync!!
202 static UINT standardColumnNames
[GITSLC_NUMCOLUMNS
]
203 = { IDS_STATUSLIST_COLFILE
204 , IDS_STATUSLIST_COLFILENAME
205 , IDS_STATUSLIST_COLEXT
206 , IDS_STATUSLIST_COLSTATUS
207 , IDS_STATUSLIST_COLADD
208 , IDS_STATUSLIST_COLDEL
209 , IDS_STATUSLIST_COLLASTMODIFIED
210 , IDS_STATUSLIST_COLSIZE
213 m_ColumnManager
.SetNames(standardColumnNames
,GITSLC_NUMCOLUMNS
);
214 m_ColumnManager
.ReadSettings(m_dwDefaultColumns
, 0xffffffff & ~(allowedColumns
| m_dwDefaultColumns
), sColumnInfoContainer
, GITSLC_NUMCOLUMNS
);
218 if (m_pDropTarget
== NULL
)
220 m_pDropTarget
= new CGitStatusListCtrlDropTarget(this);
221 RegisterDragDrop(m_hWnd
,m_pDropTarget
);
222 // create the supported formats:
224 ftetc
.dwAspect
= DVASPECT_CONTENT
;
226 ftetc
.tymed
= TYMED_HGLOBAL
;
227 ftetc
.cfFormat
=CF_HDROP
;
228 m_pDropTarget
->AddSuportedFormat(ftetc
);
235 bool CGitStatusListCtrl::SetBackgroundImage(UINT nID
)
237 return CAppUtils::SetListCtrlBackgroundImage(GetSafeHwnd(), nID
);
240 BOOL
CGitStatusListCtrl::GetStatus ( const CTGitPathList
* pathList
241 , bool bUpdate
/* = FALSE */
242 , bool bShowIgnores
/* = false */
243 , bool bShowUnRev
/* = false */
244 , bool bShowLocalChangesIgnored
/* = false */)
246 Locker
lock(m_critSec
);
247 int mask
= CGitStatusListCtrl::FILELIST_MODIFY
;
249 mask
|= CGitStatusListCtrl::FILELIST_IGNORE
;
251 mask
|= CGitStatusListCtrl::FILELIST_UNVER
;
252 if (bShowLocalChangesIgnored
)
253 mask
|= CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED
;
254 this->UpdateFileList(mask
,bUpdate
,(CTGitPathList
*)pathList
);
256 if (pathList
&& m_mapDirectFiles
.empty())
258 // remember files which are selected by users so that those can be preselected
259 for (int i
= 0; i
< pathList
->GetCount(); ++i
)
260 if (!(*pathList
)[i
].IsDirectory())
261 m_mapDirectFiles
[(*pathList
)[i
].GetGitPathString()] = true;
265 int refetchcounter
= 0;
268 // force the cursor to change
271 SetCursorPos(pt
.x
, pt
.y
);
273 m_mapFilenameToChecked
.clear();
274 //m_StatusUrlList.Clear();
275 bool bHasChangelists
= (m_changelists
.size() > 1 || (!m_changelists
.empty() && !m_bHasIgnoreGroup
));
276 m_changelists
.clear();
277 for (size_t i
=0; i
< m_arStatusArray
.size(); i
++)
279 FileEntry
* entry
= m_arStatusArray
[i
];
280 if ( bHasChangelists
&& entry
->checked
)
282 // If change lists are present, remember all checked entries
283 CString path
= entry
->GetPath().GetGitPathString();
284 m_mapFilenameToChecked
[path
] = true;
286 if ( (entry
->status
==git_wc_status_unversioned
|| entry
->status
==git_wc_status_missing
) && entry
->checked
)
288 // The user manually selected an unversioned or missing file. We remember
289 // this so that the selection can be restored when refreshing.
290 CString path
= entry
->GetPath().GetGitPathString();
291 m_mapFilenameToChecked
[path
] = true;
293 else if ( entry
->status
> git_wc_status_normal
&& !entry
->checked
)
295 // The user manually deselected a versioned file. We remember
296 // this so that the deselection can be restored when refreshing.
297 CString path
= entry
->GetPath().GetGitPathString();
298 m_mapFilenameToChecked
[path
] = false;
302 // use a sorted path list to make sure we fetch the status of
303 // parent items first, *then* the child items (if any)
304 CTGitPathList sortedPathList
= pathList
;
305 sortedPathList
.SortByPathname();
310 m_bHasExternalsFromDifferentRepos
= FALSE
;
311 m_bHasExternals
= FALSE
;
312 m_bHasUnversionedItems
= FALSE
;
314 m_bHasChangeLists
= false;
315 m_bShowIgnores
= bShowIgnores
;
322 // first clear possible status data left from
323 // previous GetStatus() calls
326 m_StatusFileList
= sortedPathList
;
328 // Since Git_client_status() returns all files, even those in
329 // folders included with Git:externals we need to check if all
330 // files we get here belongs to the same repository.
331 // It is possible to commit changes in an external folder, as long
332 // as the folder belongs to the same repository (but another path),
333 // but it is not possible to commit all files if the externals are
334 // from a different repository.
336 // To check if all files belong to the same repository, we compare the
337 // UUID's - if they're identical then the files belong to the same
338 // repository and can be committed. But if they're different, then
339 // tell the user to commit all changes in the external folders
341 CStringA sUUID
; // holds the repo UUID
342 CTGitPathList arExtPaths
; // list of Git:external paths
348 m_nTargetCount
= sortedPathList
.GetCount();
350 GitStatus
status(m_pbCanceled
);
351 if(m_nTargetCount
> 1 && sortedPathList
.AreAllPathsFilesInOneDirectory())
353 // This is a special case, where we've been given a list of files
354 // all from one folder
355 // We handle them by setting a status filter, then requesting the Git status of
356 // all the files in the directory, filtering for the ones we're interested in
357 status
.SetFilter(sortedPathList
);
359 // if all selected entries are files, we don't do a recursive status
360 // fetching. But if only one is a directory, we have to recurse.
361 git_depth_t depth
= git_depth_files
;
362 // We have set a filter. If all selected items were files or we fetch
363 // the status not recursively, then we have to include
364 // ignored items too - the user has selected them
365 bool bShowIgnoresRight
= true;
366 for (int fcindex
=0; fcindex
<sortedPathList
.GetCount(); ++fcindex
)
368 if (sortedPathList
[fcindex
].IsDirectory())
370 depth
= git_depth_infinity
;
371 bShowIgnoresRight
= false;
375 if(!FetchStatusForSingleTarget(config
, status
, sortedPathList
.GetCommonDirectory(), bUpdate
, sUUID
, arExtPaths
, true, depth
, bShowIgnoresRight
))
382 for(int nTarget
= 0; nTarget
< m_nTargetCount
; nTarget
++)
384 // check whether the path we want the status for is already fetched due to status-fetching
386 // this check is only done for file paths, because folder paths could be included already
387 // but not recursively
388 if (sortedPathList
[nTarget
].IsDirectory() || GetListEntry(sortedPathList
[nTarget
]) == NULL
)
390 if(!FetchStatusForSingleTarget(config
, status
, sortedPathList
[nTarget
], bUpdate
, sUUID
,
391 arExtPaths
, false, git_depth_infinity
, bShowIgnores
))
399 // remove the 'helper' files of conflicted items from the list.
400 // otherwise they would appear as unversioned files.
401 for (INT_PTR cind
= 0; cind
< m_ConflictFileList
.GetCount(); ++cind
)
403 for (size_t i
=0; i
< m_arStatusArray
.size(); i
++)
405 if (m_arStatusArray
[i
]->GetPath().IsEquivalentTo(m_ConflictFileList
[cind
]))
407 delete m_arStatusArray
[i
];
408 m_arStatusArray
.erase(m_arStatusArray
.begin()+i
);
414 } while(!BuildStatistics() && (refetchcounter
< 2) && (*m_pbCanceled
==false));
419 SetCursorPos(pt
.x
, pt
.y
);
426 // Get the show-flags bitmap value which corresponds to a particular Git status
427 DWORD
CGitStatusListCtrl::GetShowFlagsFromGitStatus(git_wc_status_kind status
)
431 case git_wc_status_none
:
432 case git_wc_status_unversioned
:
433 return GITSLC_SHOWUNVERSIONED
;
434 case git_wc_status_ignored
:
436 return GITSLC_SHOWDIRECTS
;
437 return GITSLC_SHOWDIRECTS
|GITSLC_SHOWIGNORED
;
438 case git_wc_status_incomplete
:
439 return GITSLC_SHOWINCOMPLETE
;
440 case git_wc_status_normal
:
441 return GITSLC_SHOWNORMAL
;
442 case git_wc_status_external
:
443 return GITSLC_SHOWEXTERNAL
;
444 case git_wc_status_added
:
445 return GITSLC_SHOWADDED
;
446 case git_wc_status_missing
:
447 return GITSLC_SHOWMISSING
;
448 case git_wc_status_deleted
:
449 return GITSLC_SHOWREMOVED
;
450 case git_wc_status_replaced
:
451 return GITSLC_SHOWREPLACED
;
452 case git_wc_status_modified
:
453 return GITSLC_SHOWMODIFIED
;
454 case git_wc_status_merged
:
455 return GITSLC_SHOWMERGED
;
456 case git_wc_status_conflicted
:
457 return GITSLC_SHOWCONFLICTED
;
458 case git_wc_status_obstructed
:
459 return GITSLC_SHOWOBSTRUCTED
;
461 // we should NEVER get here!
468 void CGitStatusListCtrl::Show(unsigned int dwShow
, unsigned int dwCheck
/*=0*/, bool /*bShowFolders*/ /* = true */,BOOL UpdateStatusList
,bool UseStoredCheckStatus
)
470 CWinApp
* pApp
= AfxGetApp();
472 pApp
->DoWaitCursor(1);
474 Locker
lock(m_critSec
);
475 WORD langID
= (WORD
)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
477 //SetItemCount(listIndex);
482 m_nShownUnversioned
= 0;
483 m_nShownModified
= 0;
486 m_nShownConflicted
= 0;
488 m_nShownSubmodules
= 0;
492 m_arStatusArray
.clear();
493 for (int i
= 0; i
< m_StatusFileList
.GetCount(); ++i
)
495 m_arStatusArray
.push_back((CTGitPath
*)&m_StatusFileList
[i
]);
498 for (int i
= 0; i
< m_UnRevFileList
.GetCount(); ++i
)
500 m_arStatusArray
.push_back((CTGitPath
*)&m_UnRevFileList
[i
]);
503 for (int i
= 0; i
< m_IgnoreFileList
.GetCount(); ++i
)
505 m_arStatusArray
.push_back((CTGitPath
*)&m_IgnoreFileList
[i
]);
509 if (m_nSortedColumn
>= 0)
511 CSorter
predicate (&m_ColumnManager
, m_nSortedColumn
, m_bAscending
);
512 std::sort(m_arStatusArray
.begin(), m_arStatusArray
.end(), predicate
);
516 for (size_t i
= 0; i
< m_arStatusArray
.size(); ++i
)
518 //set default checkbox status
519 CTGitPath
* entry
= ((CTGitPath
*)m_arStatusArray
[i
]);
520 CString path
= entry
->GetGitPathString();
521 if (!m_mapFilenameToChecked
.empty() && m_mapFilenameToChecked
.find(path
) != m_mapFilenameToChecked
.end())
523 entry
->m_Checked
=m_mapFilenameToChecked
[path
];
525 else if (!UseStoredCheckStatus
)
527 bool autoSelectSubmodules
= !(entry
->IsDirectory() && m_bDoNotAutoselectSubmodules
);
528 if ((entry
->m_Action
& dwCheck
|| dwShow
& GITSLC_SHOWDIRECTFILES
&& m_mapDirectFiles
.find(path
) != m_mapDirectFiles
.end()) && autoSelectSubmodules
)
529 entry
->m_Checked
=true;
531 entry
->m_Checked
=false;
532 m_mapFilenameToChecked
[path
] = entry
->m_Checked
;
535 if(entry
->m_Action
& dwShow
)
537 AddEntry(entry
,langID
,index
);
542 int maxcol
= ((CHeaderCtrl
*)(GetDlgItem(0)))->GetItemCount()-1;
543 for (int col
= 0; col
<= maxcol
; col
++)
544 SetColumnWidth (col
, m_ColumnManager
.GetWidth (col
, true));
547 GetStatisticsString();
549 CHeaderCtrl
* pHeader
= GetHeaderCtrl();
550 HDITEM HeaderItem
= {0};
551 HeaderItem
.mask
= HDI_FORMAT
;
552 for (int i
=0; i
<pHeader
->GetItemCount(); ++i
)
554 pHeader
->GetItem(i
, &HeaderItem
);
555 HeaderItem
.fmt
&= ~(HDF_SORTDOWN
| HDF_SORTUP
);
556 pHeader
->SetItem(i
, &HeaderItem
);
558 if (m_nSortedColumn
>= 0)
560 pHeader
->GetItem(m_nSortedColumn
, &HeaderItem
);
561 HeaderItem
.fmt
|= (m_bAscending
? HDF_SORTUP
: HDF_SORTDOWN
);
562 pHeader
->SetItem(m_nSortedColumn
, &HeaderItem
);
568 SetItemState(nSelectedEntry
, LVIS_SELECTED
, LVIS_SELECTED
);
569 EnsureVisible(nSelectedEntry
, false);
573 // Restore the item at the top of the list.
574 for (int i
=0;GetTopIndex() != nTopIndex
;i
++)
576 if ( !EnsureVisible(nTopIndex
+i
,false) )
584 pApp
->DoWaitCursor(-1);
590 this->BuildStatistics();
594 CWinApp
* pApp
= AfxGetApp();
596 pApp
->DoWaitCursor(1);
598 m_bShowFolders
= bShowFolders
;
600 int nTopIndex
= GetTopIndex();
601 POSITION posSelectedEntry
= GetFirstSelectedItemPosition();
602 int nSelectedEntry
= 0;
603 if (posSelectedEntry
)
604 nSelectedEntry
= GetNextSelectedItem(posSelectedEntry
);
610 m_arListArray
.clear();
612 m_arListArray
.reserve(m_arStatusArray
.size());
613 SetItemCount (static_cast<int>(m_arStatusArray
.size()));
616 for (size_t i
=0; i
< m_arStatusArray
.size(); ++i
)
618 FileEntry
* entry
= m_arStatusArray
[i
];
619 if ((entry
->inexternal
) && (!(dwShow
& SVNSLC_SHOWINEXTERNALS
)))
621 if ((entry
->differentrepo
|| entry
->isNested
) && (! (dwShow
& SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO
)))
623 if (entry
->IsFolder() && (!bShowFolders
))
624 continue; // don't show folders if they're not wanted.
627 git_wc_status_kind status
= GitStatus::GetMoreImportant(entry
->status
, entry
->remotestatus
);
628 DWORD showFlags
= GetShowFlagsFromGitStatus(status
);
629 if (entry
->IsLocked())
630 showFlags
|= SVNSLC_SHOWLOCKS
;
632 showFlags
|= SVNSLC_SHOWSWITCHED
;
633 if (!entry
->changelist
.IsEmpty())
634 showFlags
|= SVNSLC_SHOWINCHANGELIST
;
636 bool bAllowCheck
= ((entry
->changelist
.Compare(GITSLC_IGNORECHANGELIST
) != 0)
637 && (m_bCheckIfGroupsExist
|| (m_changelists
.empty() || (m_changelists
.size() == 1 && m_bHasIgnoreGroup
))));
639 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
641 if (status
!= Git_wc_status_ignored
|| (entry
->direct
) || (dwShow
& GitSLC_SHOWIGNORED
))
643 if ((!entry
->IsFolder()) && (status
== Git_wc_status_deleted
) && (dwShow
& SVNSLC_SHOWREMOVEDANDPRESENT
))
645 if (PathFileExists(entry
->GetPath().GetWinPath()))
647 m_arListArray
.push_back(i
);
648 if ((dwCheck
& SVNSLC_SHOWREMOVEDANDPRESENT
)||((dwCheck
& SVNSLC_SHOWDIRECTS
)&&(entry
->direct
)))
651 entry
->checked
= true;
653 AddEntry(entry
, langID
, listIndex
++);
656 else if ((dwShow
& showFlags
)||((dwShow
& SVNSLC_SHOWDIRECTFILES
)&&(entry
->direct
)&&(!entry
->IsFolder())))
658 m_arListArray
.push_back(i
);
659 if ((dwCheck
& showFlags
)||((dwCheck
& SVNSLC_SHOWDIRECTS
)&&(entry
->direct
)))
662 entry
->checked
= true;
664 AddEntry(entry
, langID
, listIndex
++);
666 else if ((dwShow
& showFlags
)||((dwShow
& SVNSLC_SHOWDIRECTFOLDER
)&&(entry
->direct
)&&entry
->IsFolder()))
668 m_arListArray
.push_back(i
);
669 if ((dwCheck
& showFlags
)||((dwCheck
& SVNSLC_SHOWDIRECTS
)&&(entry
->direct
)))
672 entry
->checked
= true;
674 AddEntry(entry
, langID
, listIndex
++);
680 SetItemCount(listIndex
);
682 m_ColumnManager
.UpdateRelevance (m_arStatusArray
, m_arListArray
);
684 int maxcol
= ((CHeaderCtrl
*)(GetDlgItem(0)))->GetItemCount()-1;
685 for (int col
= 0; col
<= maxcol
; col
++)
686 SetColumnWidth (col
, m_ColumnManager
.GetWidth (col
, true));
689 GetStatisticsString();
691 CHeaderCtrl
* pHeader
= GetHeaderCtrl();
692 HDITEM HeaderItem
= {0};
693 HeaderItem
.mask
= HDI_FORMAT
;
694 for (int i
=0; i
<pHeader
->GetItemCount(); ++i
)
696 pHeader
->GetItem(i
, &HeaderItem
);
697 HeaderItem
.fmt
&= ~(HDF_SORTDOWN
| HDF_SORTUP
);
698 pHeader
->SetItem(i
, &HeaderItem
);
702 pHeader
->GetItem(m_nSortedColumn
, &HeaderItem
);
703 HeaderItem
.fmt
|= (m_bAscending
? HDF_SORTUP
: HDF_SORTDOWN
);
704 pHeader
->SetItem(m_nSortedColumn
, &HeaderItem
);
709 SetItemState(nSelectedEntry
, LVIS_SELECTED
, LVIS_SELECTED
);
710 EnsureVisible(nSelectedEntry
, false);
714 // Restore the item at the top of the list.
715 for (int i
=0;GetTopIndex() != nTopIndex
;i
++)
717 if ( !EnsureVisible(nTopIndex
+i
,false) )
725 pApp
->DoWaitCursor(-1);
727 m_bEmpty
= (GetItemCount() == 0);
733 void CGitStatusListCtrl::Show(unsigned int /*dwShow*/, const CTGitPathList
& checkedList
, bool /*bShowFolders*/ /* = true */)
736 for (int i
= 0; i
< checkedList
.GetCount(); ++i
)
737 this->AddEntry((CTGitPath
*)&checkedList
[i
],0,i
);
741 Locker
lock(m_critSec
);
742 WORD langID
= (WORD
)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
744 CWinApp
* pApp
= AfxGetApp();
746 pApp
->DoWaitCursor(1);
748 m_bShowFolders
= bShowFolders
;
750 int nTopIndex
= GetTopIndex();
751 POSITION posSelectedEntry
= GetFirstSelectedItemPosition();
752 int nSelectedEntry
= 0;
753 if (posSelectedEntry
)
754 nSelectedEntry
= GetNextSelectedItem(posSelectedEntry
);
760 m_arListArray
.clear();
762 m_arListArray
.reserve(m_arStatusArray
.size());
763 SetItemCount (static_cast<int>(m_arStatusArray
.size()));
766 for (size_t i
=0; i
< m_arStatusArray
.size(); ++i
)
768 FileEntry
* entry
= m_arStatusArray
[i
];
769 if ((entry
->inexternal
) && (!(dwShow
& SVNSLC_SHOWINEXTERNALS
)))
771 if ((entry
->differentrepo
|| entry
->isNested
) && (! (dwShow
& SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO
)))
773 if (entry
->IsFolder() && (!bShowFolders
))
774 continue; // don't show folders if they're not wanted.
776 git_wc_status_kind status
= SVNStatus::GetMoreImportant(entry
->status
, entry
->remotestatus
);
777 DWORD showFlags
= GetShowFlagsFromSVNStatus(status
);
778 if (entry
->IsLocked())
779 showFlags
|= SVNSLC_SHOWLOCKS
;
780 if (!entry
->changelist
.IsEmpty())
781 showFlags
|= SVNSLC_SHOWINCHANGELIST
;
783 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
784 if (status
!= git_wc_status_ignored
|| (entry
->direct
) || (dwShow
& SVNSLC_SHOWIGNORED
))
786 for (int npath
= 0; npath
< checkedList
.GetCount(); ++npath
)
788 if (entry
->GetPath().IsEquivalentTo(checkedList
[npath
]))
790 entry
->checked
= true;
794 if ((!entry
->IsFolder()) && (status
== git_wc_status_deleted
) && (dwShow
& SVNSLC_SHOWREMOVEDANDPRESENT
))
796 if (PathFileExists(entry
->GetPath().GetWinPath()))
798 m_arListArray
.push_back(i
);
799 AddEntry(entry
, langID
, listIndex
++);
802 else if ((dwShow
& showFlags
)||((dwShow
& SVNSLC_SHOWDIRECTFILES
)&&(entry
->direct
)&&(!entry
->IsFolder())))
804 m_arListArray
.push_back(i
);
805 AddEntry(entry
, langID
, listIndex
++);
807 else if ((dwShow
& showFlags
)||((dwShow
& SVNSLC_SHOWDIRECTFOLDER
)&&(entry
->direct
)&&entry
->IsFolder()))
809 m_arListArray
.push_back(i
);
810 AddEntry(entry
, langID
, listIndex
++);
812 else if (entry
->switched
)
814 m_arListArray
.push_back(i
);
815 AddEntry(entry
, langID
, listIndex
++);
821 SetItemCount(listIndex
);
823 int maxcol
= ((CHeaderCtrl
*)(GetDlgItem(0)))->GetItemCount()-1;
824 for (int col
= 0; col
<= maxcol
; col
++)
825 SetColumnWidth (col
, m_ColumnManager
.GetWidth (col
, true));
828 GetStatisticsString();
830 CHeaderCtrl
* pHeader
= GetHeaderCtrl();
831 HDITEM HeaderItem
= {0};
832 HeaderItem
.mask
= HDI_FORMAT
;
833 for (int i
=0; i
<pHeader
->GetItemCount(); ++i
)
835 pHeader
->GetItem(i
, &HeaderItem
);
836 HeaderItem
.fmt
&= ~(HDF_SORTDOWN
| HDF_SORTUP
);
837 pHeader
->SetItem(i
, &HeaderItem
);
841 pHeader
->GetItem(m_nSortedColumn
, &HeaderItem
);
842 HeaderItem
.fmt
|= (m_bAscending
? HDF_SORTUP
: HDF_SORTDOWN
);
843 pHeader
->SetItem(m_nSortedColumn
, &HeaderItem
);
848 SetItemState(nSelectedEntry
, LVIS_SELECTED
, LVIS_SELECTED
);
849 EnsureVisible(nSelectedEntry
, false);
853 // Restore the item at the top of the list.
854 for (int i
=0;GetTopIndex() != nTopIndex
;i
++)
856 if ( !EnsureVisible(nTopIndex
+i
,false) )
864 pApp
->DoWaitCursor(-1);
866 m_bEmpty
= (GetItemCount() == 0);
871 int CGitStatusListCtrl::GetColumnIndex(int mask
)
873 for (int i
= 0; i
< 32; ++i
)
880 void CGitStatusListCtrl::AddEntry(CTGitPath
* GitPath
, WORD
/*langID*/, int listIndex
)
882 static CString
from(MAKEINTRESOURCE(IDS_STATUSLIST_FROM
));
883 static HINSTANCE
hResourceHandle(AfxGetResourceHandle());
884 static bool abbreviateRenamings(((DWORD
)CRegDWORD(_T("Software\\TortoiseGit\\AbbreviateRenamings"), FALSE
)) == TRUE
);
885 static bool relativeTimes
= (CRegDWORD(_T("Software\\TortoiseGit\\RelativeTimes"), FALSE
) != FALSE
);
887 CString path
= GitPath
->GetGitPathString();
890 int index
= listIndex
;
892 CString entryname
= GitPath
->GetGitPathString();
894 if (GitPath
->IsDirectory())
896 icon_idx
= m_nIconFolder
;
897 m_nShownSubmodules
++;
901 icon_idx
= SYS_IMAGE_LIST().GetPathIconIndex(*GitPath
);
904 switch (GitPath
->m_Action
)
906 case CTGitPath::LOGACTIONS_ADDED
:
907 case CTGitPath::LOGACTIONS_COPY
:
910 case CTGitPath::LOGACTIONS_DELETED
:
913 case CTGitPath::LOGACTIONS_REPLACED
:
914 case CTGitPath::LOGACTIONS_MODIFIED
:
915 case CTGitPath::LOGACTIONS_MERGED
:
918 case CTGitPath::LOGACTIONS_UNMERGED
:
919 m_nShownConflicted
++;
921 case CTGitPath::LOGACTIONS_UNVER
:
922 m_nShownUnversioned
++;
925 m_nShownUnversioned
++;
928 if(GitPath
->m_Action
& (CTGitPath::LOGACTIONS_REPLACED
|CTGitPath::LOGACTIONS_COPY
) && !GitPath
->GetGitOldPathString().IsEmpty())
930 if (!abbreviateRenamings
)
934 rename
.Format(from
, GitPath
->GetGitOldPathString());
935 entryname
+= _T(" ") + rename
;
940 tgpl
.AddPath(*GitPath
);
941 CTGitPath
old(GitPath
->GetGitOldPathString());
943 CString commonRoot
= tgpl
.GetCommonRoot().GetGitPathString();
944 if (!commonRoot
.IsEmpty())
945 commonRoot
+= _T("/");
946 if (old
.GetFileOrDirectoryName() == GitPath
->GetFileOrDirectoryName() && old
.GetContainingDirectory().GetGitPathString() != "" && GitPath
->GetContainingDirectory().GetGitPathString())
948 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();
950 else if (!commonRoot
.IsEmpty())
952 entryname
= commonRoot
+ _T("{") + GitPath
->GetGitOldPathString().Mid(commonRoot
.GetLength()) + _T(" => ") + GitPath
->GetGitPathString().Mid(commonRoot
.GetLength()) + _T("}");
956 entryname
= GitPath
->GetGitOldPathString().Mid(commonRoot
.GetLength()) + _T(" => ") + GitPath
->GetGitPathString().Mid(commonRoot
.GetLength());
961 InsertItem(index
, entryname
, icon_idx
);
962 if (m_restorepaths
.find(GitPath
->GetWinPathString()) != m_restorepaths
.end())
963 SetItemState(index
, INDEXTOOVERLAYMASK(OVL_RESTORE
), TVIS_OVERLAYMASK
);
965 this->SetItemData(index
, (DWORD_PTR
)GitPath
);
966 // SVNSLC_COLFILENAME
967 SetItemText(index
, nCol
++, GitPath
->GetFileOrDirectoryName());
969 SetItemText(index
, nCol
++, GitPath
->GetFileExtension());
971 SetItemText(index
, nCol
++, GitPath
->GetActionName());
973 SetItemText(index
, GetColumnIndex(GITSLC_COLADD
),GitPath
->m_StatAdd
);
974 SetItemText(index
, GetColumnIndex(GITSLC_COLDEL
),GitPath
->m_StatDel
);
977 CString modificationDate
;
978 __int64 filetime
= GitPath
->GetLastWriteTime();
979 if (filetime
&& (GitPath
->m_Action
!= CTGitPath::LOGACTIONS_DELETED
))
981 FILETIME
* f
= (FILETIME
*)(__int64
*)&filetime
;
982 modificationDate
= CLoglistUtils::FormatDateAndTime(CTime(g_Git
.filetime_to_time_t(f
)), DATE_SHORTDATE
, true, relativeTimes
);
984 SetItemText(index
, GetColumnIndex(GITSLC_COLMODIFICATIONDATE
), modificationDate
);
987 if (GitPath
->IsDirectory())
988 SetItemText(index
, GetColumnIndex(GITSLC_COLSIZE
), _T(""));
991 TCHAR buf
[100] = { 0 };
992 StrFormatByteSize64(GitPath
->GetFileSize(), buf
, 100);
993 SetItemText(index
, GetColumnIndex(GITSLC_COLSIZE
), buf
);
996 SetCheck(index
, GitPath
->m_Checked
);
997 if (GitPath
->m_Checked
)
1000 if ((GitPath
->m_Action
& CTGitPath::LOGACTIONS_SKIPWORKTREE
) || (GitPath
->m_Action
& CTGitPath::LOGACTIONS_ASSUMEVALID
))
1001 SetItemGroup(index
, 3);
1002 else if (GitPath
->m_Action
& CTGitPath::LOGACTIONS_IGNORE
)
1003 SetItemGroup(index
, 2);
1004 else if( GitPath
->m_Action
& CTGitPath::LOGACTIONS_UNVER
)
1005 SetItemGroup(index
,1);
1008 SetItemGroup(index
, GitPath
->m_ParentNo
&(PARENT_MASK
|MERGE_MASK
));
1016 bool CGitStatusListCtrl::SetItemGroup(int item
, int groupindex
)
1018 // if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS) == NULL)
1023 i
.mask
= LVIF_GROUPID
;
1026 i
.iGroupId
= groupindex
;
1028 return !!SetItem(&i
);
1031 void CGitStatusListCtrl::OnHdnItemclick(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1033 LPNMHEADER phdr
= reinterpret_cast<LPNMHEADER
>(pNMHDR
);
1035 if (m_bBlock
|| m_arStatusArray
.empty())
1038 if (m_nSortedColumn
== phdr
->iItem
)
1039 m_bAscending
= !m_bAscending
;
1041 m_bAscending
= TRUE
;
1042 m_nSortedColumn
= phdr
->iItem
;
1043 Show(m_dwShow
, 0, m_bShowFolders
,false,true);
1048 void CGitStatusListCtrl::OnLvnItemchanging(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1050 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1053 #define ISCHECKED(x) ((x) ? ((((x)&LVIS_STATEIMAGEMASK)>>12)-1) : FALSE)
1054 if ((m_bBlock
)&&(m_bBlockUI
))
1056 // if we're blocked, prevent changing of the check state
1057 if ((!ISCHECKED(pNMLV
->uOldState
) && ISCHECKED(pNMLV
->uNewState
))||
1058 (ISCHECKED(pNMLV
->uOldState
) && !ISCHECKED(pNMLV
->uNewState
)))
1063 BOOL
CGitStatusListCtrl::OnLvnItemchanged(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1065 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1067 CWnd
* pParent
= GetLogicalParent();
1068 if (NULL
!= pParent
&& NULL
!= pParent
->GetSafeHwnd())
1070 pParent
->SendMessage(GITSLNM_ITEMCHANGED
, pNMLV
->iItem
);
1073 if ((pNMLV
->uNewState
==0)||(pNMLV
->uNewState
& LVIS_SELECTED
)||(pNMLV
->uNewState
& LVIS_FOCUSED
))
1079 bool bSelected
= !!(ListView_GetItemState(m_hWnd
, pNMLV
->iItem
, LVIS_SELECTED
) & LVIS_SELECTED
);
1080 int nListItems
= GetItemCount();
1083 // was the item checked?
1085 //CTGitPath *gitpath=(CTGitPath*)GetItemData(pNMLV->iItem);
1086 //gitpath->m_Checked=GetCheck(pNMLV->iItem);
1088 if (GetCheck(pNMLV
->iItem
))
1090 CheckEntry(pNMLV
->iItem
, nListItems
);
1093 POSITION pos
= GetFirstSelectedItemPosition();
1095 while ((index
= GetNextSelectedItem(pos
)) >= 0)
1097 if (index
!= pNMLV
->iItem
)
1098 CheckEntry(index
, nListItems
);
1104 UncheckEntry(pNMLV
->iItem
, nListItems
);
1107 POSITION pos
= GetFirstSelectedItemPosition();
1109 while ((index
= GetNextSelectedItem(pos
)) >= 0)
1111 if (index
!= pNMLV
->iItem
)
1112 UncheckEntry(index
, nListItems
);
1117 GetStatisticsString();
1124 void CGitStatusListCtrl::OnColumnResized(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1126 m_ColumnManager
.OnColumnResized(pNMHDR
,pResult
);
1131 void CGitStatusListCtrl::OnColumnMoved(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1133 m_ColumnManager
.OnColumnMoved(pNMHDR
, pResult
);
1138 void CGitStatusListCtrl::CheckEntry(int index
, int /*nListItems*/)
1140 Locker
lock(m_critSec
);
1141 //FileEntry * entry = GetListEntry(index);
1142 CTGitPath
*path
=(CTGitPath
*)GetItemData(index
);
1143 ASSERT(path
!= NULL
);
1146 m_mapFilenameToChecked
[path
->GetGitPathString()] = true;
1147 SetCheck(index
, TRUE
);
1148 //entry = GetListEntry(index);
1149 // if an unversioned item was checked, then we need to check if
1150 // the parent folders are unversioned too. If the parent folders actually
1151 // are unversioned, then check those too.
1153 if (entry
->status
== git_wc_status_unversioned
)
1155 // we need to check the parent folder too
1156 const CTGitPath
& folderpath
= entry
->path
;
1157 for (int i
=0; i
< nListItems
; ++i
)
1159 FileEntry
* testEntry
= GetListEntry(i
);
1160 ASSERT(testEntry
!= NULL
);
1161 if (testEntry
== NULL
)
1163 if (!testEntry
->checked
)
1165 if (testEntry
->path
.IsAncestorOf(folderpath
) && (!testEntry
->path
.IsEquivalentTo(folderpath
)))
1167 SetEntryCheck(testEntry
,i
,true);
1173 bool bShift
= !!(GetAsyncKeyState(VK_SHIFT
) & 0x8000);
1174 if ( (entry
->status
== git_wc_status_deleted
) || (m_bCheckChildrenWithParent
) || (bShift
) )
1176 // if a deleted folder gets checked, we have to check all
1177 // children of that folder too.
1178 if (entry
->path
.IsDirectory())
1180 SetCheckOnAllDescendentsOf(entry
, true);
1183 // if a deleted file or folder gets checked, we have to
1184 // check all parents of this item too.
1185 for (int i
=0; i
<nListItems
; ++i
)
1187 FileEntry
* testEntry
= GetListEntry(i
);
1188 ASSERT(testEntry
!= NULL
);
1189 if (testEntry
== NULL
)
1191 if (!testEntry
->checked
)
1193 if (testEntry
->path
.IsAncestorOf(entry
->path
) && (!testEntry
->path
.IsEquivalentTo(entry
->path
)))
1195 if ((testEntry
->status
== git_wc_status_deleted
)||(m_bCheckChildrenWithParent
))
1197 SetEntryCheck(testEntry
,i
,true);
1199 // now we need to check all children of this parent folder
1200 SetCheckOnAllDescendentsOf(testEntry
, true);
1207 if ( !path
->m_Checked
)
1209 path
->m_Checked
= TRUE
;
1214 void CGitStatusListCtrl::UncheckEntry(int index
, int /*nListItems*/)
1216 Locker
lock(m_critSec
);
1217 CTGitPath
*path
=(CTGitPath
*)GetItemData(index
);
1218 ASSERT(path
!= NULL
);
1221 SetCheck(index
, FALSE
);
1222 m_mapFilenameToChecked
[path
->GetGitPathString()] = false;
1223 //entry = GetListEntry(index);
1224 // item was unchecked
1226 if (entry
->path
.IsDirectory())
1228 // disable all files within an unselected folder, except when unchecking a folder with property changes
1229 bool bShift
= !!(GetAsyncKeyState(VK_SHIFT
) & 0x8000);
1230 if ( (entry
->status
!= git_wc_status_modified
) || (bShift
) )
1232 SetCheckOnAllDescendentsOf(entry
, false);
1235 else if (entry
->status
== git_wc_status_deleted
)
1237 // a "deleted" file was unchecked, so uncheck all parent folders
1238 // and all children of those parents
1239 for (int i
=0; i
<nListItems
; i
++)
1241 FileEntry
* testEntry
= GetListEntry(i
);
1242 ASSERT(testEntry
!= NULL
);
1243 if (testEntry
== NULL
)
1245 if (testEntry
->checked
)
1247 if (testEntry
->path
.IsAncestorOf(entry
->path
))
1249 if (testEntry
->status
== git_wc_status_deleted
)
1251 SetEntryCheck(testEntry
,i
,false);
1254 SetCheckOnAllDescendentsOf(testEntry
, false);
1261 if ( path
->m_Checked
)
1263 path
->m_Checked
= FALSE
;
1267 bool CGitStatusListCtrl::BuildStatistics()
1270 bool bRefetchStatus
= false;
1272 // now gather some statistics
1285 for (size_t i
= 0; i
< m_arStatusArray
.size(); ++i
)
1287 int status
=((CTGitPath
*)m_arStatusArray
[i
])->m_Action
;
1289 m_nLineAdded
+= _tstol(((CTGitPath
*)m_arStatusArray
[i
])->m_StatAdd
);
1290 m_nLineDeleted
+= _tstol(((CTGitPath
*)m_arStatusArray
[i
])->m_StatDel
);
1292 if(status
&(CTGitPath::LOGACTIONS_ADDED
|CTGitPath::LOGACTIONS_COPY
))
1295 if(status
&CTGitPath::LOGACTIONS_DELETED
)
1298 if(status
&(CTGitPath::LOGACTIONS_REPLACED
|CTGitPath::LOGACTIONS_MODIFIED
))
1301 if(status
&CTGitPath::LOGACTIONS_UNMERGED
)
1304 if(status
&(CTGitPath::LOGACTIONS_IGNORE
|CTGitPath::LOGACTIONS_UNVER
))
1307 if(status
&(CTGitPath::LOGACTIONS_REPLACED
))
1310 if(((CTGitPath
*)m_arStatusArray
[i
])->m_Checked
)
1313 return !bRefetchStatus
;
1317 int CGitStatusListCtrl::GetGroupFromPoint(POINT
* ppt
)
1319 // the point must be relative to the upper left corner of the control
1323 if (!IsGroupViewEnabled())
1332 while (((flags
& LVHT_BELOW
) == 0)&&(pt
.y
< rc
.bottom
))
1334 nItem
= HitTest(pt
, &flags
);
1335 if ((flags
& LVHT_ONITEM
)||(flags
& LVHT_EX_GROUP_HEADER
))
1337 // the first item below the point
1339 // check if the point is too much right (i.e. if the point
1340 // is farther to the right than the width of the item)
1342 GetItemRect(nItem
, &r
, LVIR_LABEL
);
1343 if (ppt
->x
> r
.right
)
1347 lv
.mask
= LVIF_GROUPID
;
1350 int groupID
= lv
.iGroupId
;
1351 // now we search upwards and check if the item above this one
1352 // belongs to another group. If it belongs to the same group,
1353 // we're not over a group header
1357 nItem
= HitTest(pt
, &flags
);
1358 if ((flags
& LVHT_ONITEM
)&&(nItem
>= 0))
1360 // the first item below the point
1362 lv
.mask
= LVIF_GROUPID
;
1365 if (lv
.iGroupId
!= groupID
)
1380 void CGitStatusListCtrl::OnContextMenuGroup(CWnd
* /*pWnd*/, CPoint point
)
1382 POINT clientpoint
= point
;
1383 ScreenToClient(&clientpoint
);
1384 if ((IsGroupViewEnabled())&&(GetGroupFromPoint(&clientpoint
) >= 0))
1387 if (popup
.CreatePopupMenu())
1390 temp
.LoadString(IDS_STATUSLIST_CHECKGROUP
);
1391 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, IDGITLC_CHECKGROUP
, temp
);
1392 temp
.LoadString(IDS_STATUSLIST_UNCHECKGROUP
);
1393 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, IDGITLC_UNCHECKGROUP
, temp
);
1394 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1395 bool bCheck
= false;
1398 case IDGITLC_CHECKGROUP
:
1400 // fall through here
1401 case IDGITLC_UNCHECKGROUP
:
1403 int group
= GetGroupFromPoint(&clientpoint
);
1404 // go through all items and check/uncheck those assigned to the group
1405 // but block the OnLvnItemChanged handler
1408 for (int i
=0; i
<GetItemCount(); ++i
)
1410 SecureZeroMemory(&lv
, sizeof(LVITEM
));
1411 lv
.mask
= LVIF_GROUPID
;
1415 if (lv
.iGroupId
== group
)
1417 CTGitPath
* entry
= (CTGitPath
*)GetItemData(i
);
1420 bool bOldCheck
= entry
->m_Checked
;
1421 SetEntryCheck(entry
, i
, bCheck
);
1422 if (bCheck
!= bOldCheck
)
1433 GetStatisticsString();
1443 void CGitStatusListCtrl::OnContextMenuList(CWnd
* pWnd
, CPoint point
)
1446 //WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
1448 //bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1449 CTGitPath
* filepath
;
1451 int selIndex
= GetSelectionMark();
1452 if ((point
.x
== -1) && (point
.y
== -1))
1455 GetItemRect(selIndex
, &rect
, LVIR_LABEL
);
1456 ClientToScreen(&rect
);
1457 point
= rect
.CenterPoint();
1459 if ((GetSelectedCount() == 0) && (m_bHasCheckboxes
))
1461 // nothing selected could mean the context menu is requested for
1463 OnContextMenuGroup(pWnd
, point
);
1465 else if (selIndex
>= 0)
1467 //FileEntry * entry = GetListEntry(selIndex);
1469 filepath
= (CTGitPath
* )GetItemData(selIndex
);
1471 ASSERT(filepath
!= NULL
);
1472 if (filepath
== NULL
)
1475 //const CTGitPath& filepath = entry->path;
1476 int wcStatus
= filepath
->m_Action
;
1477 // entry is selected, now show the popup menu
1478 Locker
lock(m_critSec
);
1480 CMenu changelistSubMenu
;
1481 CMenu ignoreSubMenu
;
1482 if (popup
.CreatePopupMenu())
1484 //Add Menu for version controlled file
1486 if (GetSelectedCount() > 0 && wcStatus
& CTGitPath::LOGACTIONS_UNMERGED
)
1488 if (GetSelectedCount() == 1 && (m_dwContextMenus
& GITSLC_POPCONFLICT
)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1490 popup
.AppendMenuIcon(IDGITLC_EDITCONFLICT
, IDS_MENUCONFLICT
, IDI_CONFLICT
);
1492 if (m_dwContextMenus
& GITSLC_POPRESOLVE
)
1494 popup
.AppendMenuIcon(IDGITLC_RESOLVECONFLICT
, IDS_STATUSLIST_CONTEXT_RESOLVED
, IDI_RESOLVE
);
1496 if ((m_dwContextMenus
& GITSLC_POPRESOLVE
)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1498 popup
.AppendMenuIcon(IDGITLC_RESOLVETHEIRS
, IDS_SVNPROGRESS_MENUUSETHEIRS
, IDI_RESOLVE
);
1499 popup
.AppendMenuIcon(IDGITLC_RESOLVEMINE
, IDS_SVNPROGRESS_MENUUSEMINE
, IDI_RESOLVE
);
1501 if ((m_dwContextMenus
& GITSLC_POPCONFLICT
)||(m_dwContextMenus
& GITSLC_POPRESOLVE
))
1502 popup
.AppendMenu(MF_SEPARATOR
);
1505 if (GetSelectedCount() > 0)
1507 if (wcStatus
& (CTGitPath::LOGACTIONS_UNVER
| CTGitPath::LOGACTIONS_IGNORE
))
1509 if (m_dwContextMenus
& GITSLC_POPADD
)
1511 //if ( entry->IsFolder() )
1513 // popup.AppendMenuIcon(IDSVNLC_ADD_RECURSIVE, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE, IDI_ADD);
1517 popup
.AppendMenuIcon(IDGITLC_ADD
, IDS_STATUSLIST_CONTEXT_ADD
, IDI_ADD
);
1520 if (m_dwContextMenus
& GITSLC_POPCOMMIT
)
1522 popup
.AppendMenuIcon(IDGITLC_COMMIT
, IDS_STATUSLIST_CONTEXT_COMMIT
, IDI_COMMIT
);
1527 if (!(wcStatus
& (CTGitPath::LOGACTIONS_UNVER
| CTGitPath::LOGACTIONS_IGNORE
)) && GetSelectedCount() > 0)
1529 bool bEntryAdded
= false;
1530 if (m_dwContextMenus
& GITSLC_POPCOMPAREWITHBASE
)
1532 if(filepath
->m_ParentNo
& MERGE_MASK
)
1533 popup
.AppendMenuIcon(IDGITLC_COMPARE
, IDS_TREE_DIFF
, IDI_DIFF
);
1535 popup
.AppendMenuIcon(IDGITLC_COMPARE
, IDS_LOG_COMPAREWITHBASE
, IDI_DIFF
);
1537 popup
.SetDefaultItem(IDGITLC_COMPARE
, FALSE
);
1541 if (!g_Git
.IsInitRepos() && (m_dwContextMenus
& GITSLC_POPGNUDIFF
))
1543 popup
.AppendMenuIcon(IDGITLC_GNUDIFF1
, IDS_LOG_POPUP_GNUDIFF
, IDI_DIFF
);
1547 if ((m_dwContextMenus
& this->GetContextMenuBit(IDGITLC_COMPAREWC
)) && m_bHasWC
)
1549 if ((!m_CurrentVersion
.IsEmpty()) && m_CurrentVersion
!= GIT_REV_ZERO
)
1551 popup
.AppendMenuIcon(IDGITLC_COMPAREWC
, IDS_LOG_POPUP_COMPARE
, IDI_DIFF
);
1557 popup
.AppendMenu(MF_SEPARATOR
);
1560 if( (!this->m_Rev1
.IsEmpty()) || (!this->m_Rev1
.IsEmpty()) )
1562 if(GetSelectedCount() == 1)
1564 if (m_dwContextMenus
& this->GetContextMenuBit(IDGITLC_COMPARETWO
))
1566 popup
.AppendMenuIcon(IDGITLC_COMPARETWO
, IDS_LOG_POPUP_COMPARETWO
, IDI_DIFF
);
1567 popup
.SetDefaultItem(IDGITLC_COMPARETWO
, FALSE
);
1569 if (m_dwContextMenus
& this->GetContextMenuBit(IDGITLC_GNUDIFF2
))
1571 popup
.AppendMenuIcon(IDGITLC_GNUDIFF2
, IDS_LOG_POPUP_GNUDIFF
, IDI_DIFF
);
1577 if (GetSelectedCount() > 0)
1579 if ((GetSelectedCount() == 2) && (m_dwContextMenus
& GITSLC_POPCOMPARETWOFILES
) && (this->m_CurrentVersion
.IsEmpty() || this->m_CurrentVersion
== GIT_REV_ZERO
))
1581 POSITION pos
= GetFirstSelectedItemPosition();
1582 int index
= GetNextSelectedItem(pos
);
1585 CTGitPath
* entry2
= NULL
;
1586 bool bothItemsAreExistingFiles
= true;
1587 entry2
= (CTGitPath
* )GetItemData(index
);
1589 bothItemsAreExistingFiles
= !entry2
->IsDirectory() && entry2
->Exists();
1590 index
= GetNextSelectedItem(pos
);
1593 entry2
= (CTGitPath
* )GetItemData(index
);
1595 bothItemsAreExistingFiles
= bothItemsAreExistingFiles
&& !entry2
->IsDirectory() && entry2
->Exists();
1596 if (bothItemsAreExistingFiles
)
1597 popup
.AppendMenuIcon(IDGITLC_COMPARETWOFILES
, IDS_STATUSLIST_CONTEXT_COMPARETWOFILES
, IDI_DIFF
);
1603 if ( (GetSelectedCount() >0 ) && (!(wcStatus
& (CTGitPath::LOGACTIONS_UNVER
| CTGitPath::LOGACTIONS_IGNORE
))) && m_bHasWC
)
1605 if ((m_dwContextMenus
& GITSLC_POPCOMMIT
) && (this->m_CurrentVersion
.IsEmpty() || this->m_CurrentVersion
== GIT_REV_ZERO
) && !(wcStatus
& (CTGitPath::LOGACTIONS_SKIPWORKTREE
| CTGitPath::LOGACTIONS_ASSUMEVALID
)))
1607 popup
.AppendMenuIcon(IDGITLC_COMMIT
, IDS_STATUSLIST_CONTEXT_COMMIT
, IDI_COMMIT
);
1610 if ((m_dwContextMenus
& GITSLC_POPREVERT
) && (this->m_CurrentVersion
.IsEmpty() || this->m_CurrentVersion
== GIT_REV_ZERO
))
1612 popup
.AppendMenuIcon(IDGITLC_REVERT
, IDS_MENUREVERT
, IDI_REVERT
);
1615 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())
1617 popup
.AppendMenuIcon(IDGITLC_SKIPWORKTREE
, IDS_STATUSLIST_SKIPWORKTREE
);
1620 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())
1622 popup
.AppendMenuIcon(IDGITLC_ASSUMEVALID
, IDS_MENUASSUMEVALID
);
1625 if ((m_dwContextMenus
& GITLC_POPUNSETIGNORELOCALCHANGES
) && (this->m_CurrentVersion
.IsEmpty() || this->m_CurrentVersion
== GIT_REV_ZERO
) && (wcStatus
& (CTGitPath::LOGACTIONS_SKIPWORKTREE
| CTGitPath::LOGACTIONS_ASSUMEVALID
)) && !filepath
->IsDirectory())
1627 popup
.AppendMenuIcon(IDGITLC_UNSETIGNORELOCALCHANGES
, IDS_STATUSLIST_UNSETIGNORELOCALCHANGES
);
1630 if (m_dwContextMenus
& GITSLC_POPRESTORE
&& !filepath
->IsDirectory())
1632 if (m_restorepaths
.find(filepath
->GetWinPathString()) == m_restorepaths
.end())
1633 popup
.AppendMenuIcon(IDGITLC_CREATERESTORE
, IDS_MENUCREATERESTORE
, IDI_RESTORE
);
1635 popup
.AppendMenuIcon(IDGITLC_RESTOREPATH
, IDS_MENURESTORE
, IDI_RESTORE
);
1638 if ((m_dwContextMenus
& GetContextMenuBit(IDGITLC_REVERTTOREV
)) && ( !this->m_CurrentVersion
.IsEmpty() )
1639 && this->m_CurrentVersion
!= GIT_REV_ZERO
&& !(wcStatus
& CTGitPath::LOGACTIONS_DELETED
))
1641 popup
.AppendMenuIcon(IDGITLC_REVERTTOREV
, IDS_LOG_POPUP_REVERTTOREV
, IDI_REVERT
);
1644 if ((m_dwContextMenus
& GetContextMenuBit(IDGITLC_REVERTTOPARENT
)) && ( !this->m_CurrentVersion
.IsEmpty() )
1645 && this->m_CurrentVersion
!= GIT_REV_ZERO
&& !(wcStatus
& CTGitPath::LOGACTIONS_ADDED
))
1647 popup
.AppendMenuIcon(IDGITLC_REVERTTOPARENT
, IDS_LOG_POPUP_REVERTTOPARENT
, IDI_REVERT
);
1651 if ((GetSelectedCount() == 1)&&(!(wcStatus
& CTGitPath::LOGACTIONS_UNVER
))
1652 &&(!(wcStatus
& CTGitPath::LOGACTIONS_IGNORE
)))
1654 if (m_dwContextMenus
& GITSLC_POPSHOWLOG
)
1656 popup
.AppendMenuIcon(IDGITLC_LOG
, IDS_REPOBROWSE_SHOWLOG
, IDI_LOG
);
1658 if (m_dwContextMenus
& GITSLC_POPSHOWLOGSUBMODULE
&& filepath
->IsDirectory())
1660 popup
.AppendMenuIcon(IDGITLC_LOGSUBMODULE
, IDS_LOG_SUBMODULE
, IDI_LOG
);
1662 if (m_dwContextMenus
& GITSLC_POPSHOWLOGOLDNAME
&& (wcStatus
& (CTGitPath::LOGACTIONS_REPLACED
|CTGitPath::LOGACTIONS_COPY
) && !filepath
->GetGitOldPathString().IsEmpty()))
1664 popup
.AppendMenuIcon(IDGITLC_LOGOLDNAME
, IDS_STATUSLIST_SHOWLOGOLDNAME
, IDI_LOG
);
1666 if (m_dwContextMenus
& GITSLC_POPBLAME
&& ! filepath
->IsDirectory() && !(wcStatus
& CTGitPath::LOGACTIONS_DELETED
) && m_bHasWC
)
1668 popup
.AppendMenuIcon(IDGITLC_BLAME
, IDS_MENUBLAME
, IDI_BLAME
);
1672 if (GetSelectedCount() > 0)
1674 if ((m_dwContextMenus
& GetContextMenuBit(IDGITLC_EXPORT
)) && !(wcStatus
& CTGitPath::LOGACTIONS_DELETED
))
1675 popup
.AppendMenuIcon(IDGITLC_EXPORT
, IDS_LOG_POPUP_EXPORT
, IDI_EXPORT
);
1678 // if ((wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing) && (GetSelectedCount() == 1))
1679 if ( (GetSelectedCount() == 1) )
1681 if (m_dwContextMenus
& this->GetContextMenuBit(IDGITLC_SAVEAS
) && ! filepath
->IsDirectory() && !(wcStatus
& CTGitPath::LOGACTIONS_DELETED
))
1683 popup
.AppendMenuIcon(IDGITLC_SAVEAS
, IDS_LOG_POPUP_SAVE
, IDI_SAVEAS
);
1686 if (m_dwContextMenus
& GITSLC_POPOPEN
&& ! filepath
->IsDirectory() && !(wcStatus
& CTGitPath::LOGACTIONS_DELETED
))
1688 popup
.AppendMenuIcon(IDGITLC_VIEWREV
, IDS_LOG_POPUP_VIEWREV
);
1689 popup
.AppendMenuIcon(IDGITLC_OPEN
, IDS_REPOBROWSE_OPEN
, IDI_OPEN
);
1690 popup
.AppendMenuIcon(IDGITLC_OPENWITH
, IDS_LOG_POPUP_OPENWITH
, IDI_OPEN
);
1691 if (wcStatus
& (CTGitPath::LOGACTIONS_UNVER
| CTGitPath::LOGACTIONS_IGNORE
)) {
1692 popup
.SetDefaultItem(IDGITLC_OPEN
, FALSE
);
1696 if (m_dwContextMenus
& GITSLC_POPEXPLORE
&& !(wcStatus
& CTGitPath::LOGACTIONS_DELETED
) && m_bHasWC
)
1698 popup
.AppendMenuIcon(IDGITLC_EXPLORE
, IDS_STATUSLIST_CONTEXT_EXPLORE
, IDI_EXPLORER
);
1702 if (GetSelectedCount() > 0)
1704 // if (((wcStatus == git_wc_status_unversioned)||(wcStatus == git_wc_status_ignored))&&(m_dwContextMenus & SVNSLC_POPDELETE))
1706 // popup.AppendMenuIcon(IDSVNLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
1708 // 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))
1711 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVEKEEP, IDI_DELETE);
1713 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVE, IDI_DELETE);
1715 if ((wcStatus
& (CTGitPath::LOGACTIONS_UNVER
| CTGitPath::LOGACTIONS_IGNORE
))/*||(wcStatus == git_wc_status_deleted)*/)
1717 if (m_dwContextMenus
& GITSLC_POPDELETE
)
1719 popup
.AppendMenuIcon(IDGITLC_DELETE
, IDS_MENUREMOVE
, IDI_DELETE
);
1722 if ( (wcStatus
& CTGitPath::LOGACTIONS_UNVER
|| wcStatus
& CTGitPath::LOGACTIONS_DELETED
) )
1724 if (m_dwContextMenus
& GITSLC_POPIGNORE
)
1727 CTGitPathList ignorelist
;
1728 FillListOfSelectedItemPaths(ignorelist
);
1729 //check if all selected entries have the same extension
1730 bool bSameExt
= true;
1732 for (int i
=0; i
<ignorelist
.GetCount(); ++i
)
1734 if (sExt
.IsEmpty() && (i
==0))
1735 sExt
= ignorelist
[i
].GetFileExtension();
1736 else if (sExt
.CompareNoCase(ignorelist
[i
].GetFileExtension())!=0)
1741 if (ignoreSubMenu
.CreateMenu())
1744 if (ignorelist
.GetCount()==1)
1745 ignorepath
= ignorelist
[0].GetFileOrDirectoryName();
1747 ignorepath
.Format(IDS_MENUIGNOREMULTIPLE
, ignorelist
.GetCount());
1748 ignoreSubMenu
.AppendMenu(MF_STRING
| MF_ENABLED
, IDGITLC_IGNORE
, ignorepath
);
1749 ignorepath
= _T("*")+sExt
;
1750 ignoreSubMenu
.AppendMenu(MF_STRING
| MF_ENABLED
, IDGITLC_IGNOREMASK
, ignorepath
);
1751 if (ignorelist
.GetCount() == 1 && !ignorelist
[0].GetContainingDirectory().GetGitPathString().IsEmpty())
1752 ignoreSubMenu
.AppendMenu(MF_STRING
| MF_ENABLED
, IDGITLC_IGNOREFOLDER
, ignorelist
[0].GetContainingDirectory().GetGitPathString());
1754 temp
.LoadString(IDS_MENUIGNORE
);
1755 popup
.InsertMenu((UINT
)-1, MF_BYPOSITION
| MF_POPUP
, (UINT_PTR
)ignoreSubMenu
.m_hMenu
, temp
);
1761 if (ignorelist
.GetCount()==1)
1763 temp
.LoadString(IDS_MENUIGNORE
);
1767 temp
.Format(IDS_MENUIGNOREMULTIPLE
, ignorelist
.GetCount());
1769 popup
.AppendMenuIcon(IDGITLC_IGNORE
, temp
, IDI_IGNORE
);
1770 temp
.Format(IDS_MENUIGNOREMULTIPLEMASK
, ignorelist
.GetCount());
1771 popup
.AppendMenuIcon(IDGITLC_IGNOREMASK
, temp
, IDI_IGNORE
);
1779 if (GetSelectedCount() > 0)
1781 popup
.AppendMenu(MF_SEPARATOR
);
1782 popup
.AppendMenuIcon(IDGITLC_COPY
, IDS_STATUSLIST_CONTEXT_COPY
, IDI_COPYCLIP
);
1783 popup
.AppendMenuIcon(IDGITLC_COPYEXT
, IDS_STATUSLIST_CONTEXT_COPYEXT
, IDI_COPYCLIP
);
1785 if ((m_dwContextMenus
& SVNSLC_POPCHANGELISTS
))
1786 &&(wcStatus
!= git_wc_status_unversioned
)&&(wcStatus
!= git_wc_status_none
))
1788 popup
.AppendMenu(MF_SEPARATOR
);
1789 // changelist commands
1790 size_t numChangelists
= GetNumberOfChangelistsInSelection();
1791 if (numChangelists
> 0)
1793 popup
.AppendMenuIcon(IDSVNLC_REMOVEFROMCS
, IDS_STATUSLIST_CONTEXT_REMOVEFROMCS
);
1795 if ((!entry
->IsFolder())&&(changelistSubMenu
.CreateMenu()))
1798 temp
.LoadString(IDS_STATUSLIST_CONTEXT_CREATECS
);
1799 changelistSubMenu
.AppendMenu(MF_STRING
| MF_ENABLED
, IDSVNLC_CREATECS
, temp
);
1801 if (entry
->changelist
.Compare(SVNSLC_IGNORECHANGELIST
))
1803 changelistSubMenu
.AppendMenu(MF_SEPARATOR
);
1804 changelistSubMenu
.AppendMenu(MF_STRING
| MF_ENABLED
, IDSVNLC_CREATEIGNORECS
, SVNSLC_IGNORECHANGELIST
);
1807 if (!m_changelists
.empty())
1809 // find the changelist names
1810 bool bNeedSeparator
= true;
1811 int cmdID
= IDSVNLC_MOVETOCS
;
1812 for (std::map
<CString
, int>::const_iterator it
= m_changelists
.begin(); it
!= m_changelists
.end(); ++it
)
1814 if ((entry
->changelist
.Compare(it
->first
))&&(it
->first
.Compare(SVNSLC_IGNORECHANGELIST
)))
1818 changelistSubMenu
.AppendMenu(MF_SEPARATOR
);
1819 bNeedSeparator
= false;
1821 changelistSubMenu
.AppendMenu(MF_STRING
| MF_ENABLED
, cmdID
, it
->first
);
1826 temp
.LoadString(IDS_STATUSLIST_CONTEXT_MOVETOCS
);
1827 popup
.AppendMenu(MF_POPUP
|MF_STRING
, (UINT_PTR
)changelistSubMenu
.GetSafeHmenu(), temp
);
1833 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1836 AfxGetApp()->DoWaitCursor(1);
1837 //int iItemCountBeforeMenuCmd = GetItemCount();
1838 //bool bForce = false;
1841 case IDGITLC_VIEWREV
:
1842 OpenFile(filepath
, ALTERNATIVEEDITOR
);
1846 OpenFile(filepath
,OPEN
);
1849 case IDGITLC_OPENWITH
:
1850 OpenFile(filepath
,OPEN_WITH
);
1853 case IDGITLC_EXPLORE
:
1855 ShellExecute(this->m_hWnd
, _T("explore"), filepath
->GetDirectory().GetWinPath(), NULL
, NULL
, SW_SHOW
);
1859 case IDGITLC_CREATERESTORE
:
1861 POSITION pos
= GetFirstSelectedItemPosition();
1864 int index
= GetNextSelectedItem(pos
);
1865 CTGitPath
* entry2
= (CTGitPath
* )GetItemData(index
);
1866 ASSERT(entry2
!= NULL
);
1867 if (entry2
== NULL
|| entry2
->IsDirectory())
1869 if (m_restorepaths
.find(entry2
->GetWinPathString()) != m_restorepaths
.end())
1871 CTGitPath tempFile
= CTempFiles::Instance().GetTempFilePath(false);
1872 // delete the temp file: the temp file has the FILE_ATTRIBUTE_TEMPORARY flag set
1873 // and copying the real file over it would leave that temp flag.
1874 DeleteFile(tempFile
.GetWinPath());
1875 if (CopyFile(g_Git
.m_CurrentDir
+ _T("\\") + entry2
->GetWinPathString(), tempFile
.GetWinPath(), FALSE
))
1877 m_restorepaths
[entry2
->GetWinPathString()] = tempFile
.GetWinPathString();
1878 SetItemState(index
, INDEXTOOVERLAYMASK(OVL_RESTORE
), LVIS_OVERLAYMASK
);
1885 case IDGITLC_RESTOREPATH
:
1887 if (CMessageBox::Show(m_hWnd
, IDS_STATUSLIST_RESTOREPATH
, IDS_APPNAME
, 2, IDI_QUESTION
, IDS_RESTOREBUTTON
, IDS_ABORTBUTTON
) == 2)
1889 POSITION pos
= GetFirstSelectedItemPosition();
1892 int index
= GetNextSelectedItem(pos
);
1893 CTGitPath
* entry2
= (CTGitPath
* )GetItemData(index
);
1894 ASSERT(entry2
!= NULL
);
1897 if (m_restorepaths
.find(entry2
->GetWinPathString()) == m_restorepaths
.end())
1899 if (CopyFile(m_restorepaths
[entry2
->GetWinPathString()], g_Git
.m_CurrentDir
+ _T("\\") + entry2
->GetWinPathString(), FALSE
))
1901 m_restorepaths
.erase(entry2
->GetWinPathString());
1902 SetItemState(index
, 0, LVIS_OVERLAYMASK
);
1909 // Compare current version and work copy.
1910 case IDGITLC_COMPAREWC
:
1912 if (!CheckMultipleDiffs())
1914 POSITION pos
= GetFirstSelectedItemPosition();
1917 int index
= GetNextSelectedItem(pos
);
1923 // Compare with base version. when current version is zero, compare workcopy and HEAD.
1924 case IDGITLC_COMPARE
:
1926 if (!CheckMultipleDiffs())
1928 POSITION pos
= GetFirstSelectedItemPosition();
1931 int index
= GetNextSelectedItem(pos
);
1937 case IDGITLC_COMPARETWO
:
1939 POSITION pos
= GetFirstSelectedItemPosition();
1942 int index
= GetNextSelectedItem(pos
);
1943 StartDiffTwo(index
);
1948 case IDGITLC_COMPARETWOFILES
:
1950 POSITION pos
= GetFirstSelectedItemPosition();
1951 CTGitPath
* firstfilepath
= NULL
, * secondfilepath
= NULL
;
1954 firstfilepath
= (CTGitPath
* )GetItemData(GetNextSelectedItem(pos
));
1955 ASSERT(firstfilepath
!= NULL
);
1956 if (firstfilepath
== NULL
)
1959 secondfilepath
= (CTGitPath
* )GetItemData(GetNextSelectedItem(pos
));
1960 ASSERT(secondfilepath
!= NULL
);
1961 if (secondfilepath
== NULL
)
1965 sCmd
.Format(_T("/command:diff /path:\"%s\" /path2:\"%s\" /hwnd:%p"), firstfilepath
->GetWinPath(), secondfilepath
->GetWinPath(), (void*)m_hWnd
);
1966 CAppUtils::RunTortoiseGitProc(sCmd
);
1971 case IDGITLC_GNUDIFF1
:
1973 POSITION pos
= GetFirstSelectedItemPosition();
1976 CTGitPath
* selectedFilepath
= (CTGitPath
* )GetItemData(GetNextSelectedItem(pos
));
1977 if (m_CurrentVersion
.IsEmpty() || m_CurrentVersion
== GIT_REV_ZERO
)
1981 fromwhere
= _T("~1");
1982 CAppUtils::StartShowUnifiedDiff(m_hWnd
, *selectedFilepath
, GitRev::GetHead() + fromwhere
, *selectedFilepath
, GitRev::GetWorkingCopy());
1986 if ((selectedFilepath
->m_ParentNo
& (PARENT_MASK
| MERGE_MASK
)) == 0)
1987 CAppUtils::StartShowUnifiedDiff(m_hWnd
, *selectedFilepath
, m_CurrentVersion
+ _T("~1"), *selectedFilepath
, m_CurrentVersion
);
1991 if (!(selectedFilepath
->m_ParentNo
& MERGE_MASK
))
1992 str
.Format(_T("%s^%d"), m_CurrentVersion
, (selectedFilepath
->m_ParentNo
& PARENT_MASK
) + 1);
1994 CAppUtils::StartShowUnifiedDiff(m_hWnd
, *selectedFilepath
, str
, *selectedFilepath
, m_CurrentVersion
, false, false, false, false, !!(selectedFilepath
->m_ParentNo
& MERGE_MASK
));
2001 case IDGITLC_GNUDIFF2
:
2003 CAppUtils::StartShowUnifiedDiff(m_hWnd
, *filepath
, m_Rev2
, *filepath
, m_Rev1
);
2009 CTGitPathList paths
;
2010 FillListOfSelectedItemPaths(paths
, true);
2012 CGitProgressDlg progDlg
;
2013 progDlg
.SetCommand(CGitProgressList::GitProgress_Add
);
2014 progDlg
.SetPathList(paths
);
2015 progDlg
.SetItemCount(paths
.GetCount());
2018 // reset unchecked status
2019 POSITION pos
= GetFirstSelectedItemPosition();
2021 while ((index
= GetNextSelectedItem(pos
)) >= 0)
2023 m_mapFilenameToChecked
.erase(((CTGitPath
*)GetItemData(index
))->GetGitPathString());
2026 if (NULL
!= GetLogicalParent() && NULL
!= GetLogicalParent()->GetSafeHwnd())
2027 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH
);
2033 case IDGITLC_DELETE
:
2034 DeleteSelectedFiles();
2039 CAppUtils::LaunchTortoiseBlame(g_Git
.m_CurrentDir
+_T("\\")+filepath
->GetWinPath(), m_CurrentVersion
);
2044 case IDGITLC_LOGSUBMODULE
:
2047 sCmd
.Format(_T("/command:log /path:\"%s\""), g_Git
.m_CurrentDir
+ _T("\\") + filepath
->GetWinPath());
2048 if (cmd
== IDGITLC_LOG
&& filepath
->IsDirectory())
2049 sCmd
+= _T(" /submodule");
2050 CAppUtils::RunTortoiseGitProc(sCmd
, false, !(cmd
== IDGITLC_LOGSUBMODULE
));
2054 case IDGITLC_LOGOLDNAME
:
2056 CTGitPath
oldName(filepath
->GetGitOldPathString());
2058 sCmd
.Format(_T("/command:log /path:\"%s\""), g_Git
.m_CurrentDir
+ _T("\\") + oldName
.GetWinPath());
2059 CAppUtils::RunTortoiseGitProc(sCmd
);
2063 case IDGITLC_EDITCONFLICT
:
2065 if (CAppUtils::ConflictEdit(*filepath
, false, this->m_bIsRevertTheirMy
))
2067 CString conflictedFile
= g_Git
.m_CurrentDir
+ _T("\\") + filepath
->GetWinPathString();
2068 if (!PathFileExists(conflictedFile
) && NULL
!= GetLogicalParent() && NULL
!= GetLogicalParent()->GetSafeHwnd())
2069 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH
);
2074 case IDGITLC_RESOLVETHEIRS
: //follow up
2075 case IDGITLC_RESOLVEMINE
: //follow up
2076 case IDGITLC_RESOLVECONFLICT
:
2078 if (CMessageBox::Show(m_hWnd
, IDS_PROC_RESOLVE
, IDS_APPNAME
, MB_ICONQUESTION
| MB_YESNO
)==IDYES
)
2080 POSITION pos
= GetFirstSelectedItemPosition();
2084 index
= GetNextSelectedItem(pos
);
2085 CTGitPath
* fentry
=(CTGitPath
*) this->GetItemData(index
);
2089 bool b_local
= false, b_remote
= false;
2093 cmd
.Format(_T("git.exe ls-files -u -t -z -- \"%s\""), fentry
->GetGitPathString());
2094 if (g_Git
.Run(cmd
, &vector
))
2096 CMessageBox::Show(NULL
, _T("git ls-files failed!"), _T("TortoiseGit"), MB_OK
);
2101 if (list
.ParserFromLsFile(vector
))
2103 CMessageBox::Show(NULL
, _T("Parse ls-files failed!"), _T("TortoiseGit"), MB_OK
);
2109 for (int i
= 0; i
< list
.GetCount(); ++i
)
2111 if (list
[i
].m_Stage
== 2)
2113 if (list
[i
].m_Stage
== 3)
2118 CString gitcmd
,output
;
2121 if ( ((!this->m_bIsRevertTheirMy
)&&cmd
== IDGITLC_RESOLVETHEIRS
) ||
2122 ((this->m_bIsRevertTheirMy
)&&cmd
== IDGITLC_RESOLVEMINE
) )
2124 if (b_local
&& b_remote
)
2125 gitcmd
.Format(_T("git.exe checkout-index -f --stage=3 -- \"%s\""), fentry
->GetGitPathString());
2127 gitcmd
.Format(_T("git.exe add -f -- \"%s\""), fentry
->GetGitPathString());
2129 gitcmd
.Format(_T("git.exe rm -f -- \"%s\""), fentry
->GetGitPathString());
2130 if (g_Git
.Run(gitcmd
, &output
,CP_UTF8
))
2132 CMessageBox::Show(m_hWnd
, output
, _T("TortoiseGit"), MB_ICONERROR
);
2137 if ( ((!this->m_bIsRevertTheirMy
)&&cmd
== IDGITLC_RESOLVEMINE
) ||
2138 ((this->m_bIsRevertTheirMy
)&&cmd
== IDGITLC_RESOLVETHEIRS
) )
2140 if (b_local
&& b_remote
)
2141 gitcmd
.Format(_T("git.exe checkout-index -f --stage=2 -- \"%s\""),fentry
->GetGitPathString());
2143 gitcmd
.Format(_T("git.exe add -f -- \"%s\""), fentry
->GetGitPathString());
2145 gitcmd
.Format(_T("git.exe rm -f -- \"%s\""), fentry
->GetGitPathString());
2146 if (g_Git
.Run(gitcmd
, &output
,CP_UTF8
))
2148 CMessageBox::Show(m_hWnd
, output
, _T("TortoiseGit"), MB_ICONERROR
);
2154 if (b_local
&& b_remote
&& fentry
->m_Action
& CTGitPath::LOGACTIONS_UNMERGED
)
2156 gitcmd
.Format(_T("git.exe add -f -- \"%s\""),fentry
->GetGitPathString());
2157 if (g_Git
.Run(gitcmd
, &output
,CP_UTF8
))
2159 CMessageBox::Show(m_hWnd
, output
, _T("TortoiseGit"), MB_ICONERROR
);
2163 fentry
->m_Action
|= CTGitPath::LOGACTIONS_MODIFIED
;
2164 fentry
->m_Action
&=~CTGitPath::LOGACTIONS_UNMERGED
;
2168 CAppUtils::RemoveTempMergeFile(*fentry
);
2171 Show(m_dwShow
, 0, m_bShowFolders
,0,true);
2176 case IDGITLC_IGNORE
:
2178 CTGitPathList ignorelist
;
2179 //std::vector<CString> toremove;
2180 FillListOfSelectedItemPaths(ignorelist
, true);
2182 if(!CAppUtils::IgnoreFile(ignorelist
,false))
2186 CWnd
* pParent
= GetLogicalParent();
2187 if (NULL
!= pParent
&& NULL
!= pParent
->GetSafeHwnd())
2189 pParent
->SendMessage(GITSLNM_NEEDSREFRESH
);
2195 case IDGITLC_IGNOREMASK
:
2198 CString ext
=filepath
->GetFileExtension();
2199 CTGitPathList ignorelist
;
2200 FillListOfSelectedItemPaths(ignorelist
, true);
2202 if (!CAppUtils::IgnoreFile(ignorelist
,true))
2206 CWnd
* pParent
= GetLogicalParent();
2207 if (NULL
!= pParent
&& NULL
!= pParent
->GetSafeHwnd())
2209 pParent
->SendMessage(GITSLNM_NEEDSREFRESH
);
2216 case IDGITLC_IGNOREFOLDER
:
2218 CTGitPathList ignorelist
;
2219 ignorelist
.AddPath(filepath
->GetContainingDirectory());
2221 if (!CAppUtils::IgnoreFile(ignorelist
, false))
2225 CWnd
*pParent
= GetLogicalParent();
2226 if (NULL
!= pParent
&& NULL
!= pParent
->GetSafeHwnd())
2227 pParent
->SendMessage(GITSLNM_NEEDSREFRESH
);
2232 case IDGITLC_COMMIT
:
2234 CTGitPathList targetList
;
2235 FillListOfSelectedItemPaths(targetList
);
2236 CTGitPath tempFile
= CTempFiles::Instance().GetTempFilePath(false);
2237 VERIFY(targetList
.WriteToFile(tempFile
.GetWinPathString()));
2238 CString commandline
= _T("/command:commit /pathfile:\"");
2239 commandline
+= tempFile
.GetWinPathString();
2240 commandline
+= _T("\"");
2241 commandline
+= _T(" /deletepathfile");
2242 CAppUtils::RunTortoiseGitProc(commandline
);
2245 case IDGITLC_REVERT
:
2247 // If at least one item is not in the status "added"
2248 // we ask for a confirmation
2249 BOOL bConfirm
= FALSE
;
2250 POSITION pos
= GetFirstSelectedItemPosition();
2252 while ((index
= GetNextSelectedItem(pos
)) >= 0)
2254 //FileEntry * fentry = GetListEntry(index);
2255 CTGitPath
*fentry
=(CTGitPath
*)GetItemData(index
);
2256 if(fentry
&& fentry
->m_Action
&CTGitPath::LOGACTIONS_MODIFIED
&& !fentry
->IsDirectory())
2264 str
.Format(IDS_PROC_WARNREVERT
,GetSelectedCount());
2266 if (!bConfirm
|| CMessageBox::Show(this->m_hWnd
, str
, _T("TortoiseGit"), MB_YESNO
| MB_ICONQUESTION
)==IDYES
)
2268 CTGitPathList targetList
;
2269 FillListOfSelectedItemPaths(targetList
);
2271 // make sure that the list is reverse sorted, so that
2272 // children are removed before any parents
2273 targetList
.SortByPathname(true);
2275 // put all reverted files in the trashbin, except the ones with 'added'
2276 // status because they are not restored by the revert.
2277 CTGitPathList delList
;
2278 POSITION pos
= GetFirstSelectedItemPosition();
2280 while ((index
= GetNextSelectedItem(pos
)) >= 0)
2282 CTGitPath
*entry
=(CTGitPath
*)GetItemData(index
);
2283 if (entry
&&(!(entry
->m_Action
& CTGitPath::LOGACTIONS_ADDED
))
2284 && (!(entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
)) && !entry
->IsDirectory())
2287 fullpath
.SetFromWin(g_Git
.m_CurrentDir
+_T("\\")+entry
->GetWinPath());
2288 delList
.AddPath(fullpath
);
2291 if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE
)))
2292 delList
.DeleteAllFiles(true);
2294 CString revertToCommit
= _T("HEAD");
2296 revertToCommit
= _T("HEAD~1");
2297 if (g_Git
.Revert(revertToCommit
, targetList
))
2299 CMessageBox::Show(this->m_hWnd
, _T("Revert Fail"), _T("TortoiseGit"), MB_ICONERROR
);
2303 bool updateStatusList
= false;
2304 for (int i
= 0 ; i
< targetList
.GetCount(); ++i
)
2306 int nListboxEntries
= GetItemCount();
2307 for (int nItem
=0; nItem
<nListboxEntries
; ++nItem
)
2309 CTGitPath
*path
=(CTGitPath
*)GetItemData(nItem
);
2310 if (path
->GetGitPathString()==targetList
[i
].GetGitPathString() && !path
->IsDirectory())
2312 if(path
->m_Action
& CTGitPath::LOGACTIONS_ADDED
)
2314 path
->m_Action
= CTGitPath::LOGACTIONS_UNVER
;
2315 SetEntryCheck(path
,nItem
,false);
2316 updateStatusList
= true;
2317 #if 0 // revert an added file and some entry will be cloned (part 1/2)
2318 SetItemGroup(nItem
,1);
2319 this->m_StatusFileList
.RemoveItem(*path
);
2320 this->m_UnRevFileList
.AddPath(*path
);
2321 //this->m_IgnoreFileList.RemoveItem(*path);
2326 RemoveListEntry(nItem
);
2330 else if (path
->GetGitPathString()==targetList
[i
].GetGitPathString() && path
->IsDirectory() && path
->IsWCRoot())
2333 sCmd
.Format(_T("/command:revert /path:\"%s\""), path
->GetGitPathString());
2334 CCommonAppUtils::RunTortoiseGitProc(sCmd
);
2340 #if 0 // revert an added file and some entry will be cloned (part 2/2)
2341 Show(m_dwShow
, 0, m_bShowFolders
,updateStatusList
,true);
2344 if (updateStatusList
&& nullptr != GetLogicalParent() && nullptr != GetLogicalParent()->GetSafeHwnd())
2345 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH
);
2352 case IDGITLC_ASSUMEVALID
:
2353 SetGitIndexFlagsForSelectedFiles(IDS_PROC_MARK_ASSUMEVALID
, BST_CHECKED
, BST_INDETERMINATE
);
2355 case IDGITLC_SKIPWORKTREE
:
2356 SetGitIndexFlagsForSelectedFiles(IDS_PROC_MARK_SKIPWORKTREE
, BST_INDETERMINATE
, BST_CHECKED
);
2358 case IDGITLC_UNSETIGNORELOCALCHANGES
:
2359 SetGitIndexFlagsForSelectedFiles(IDS_PROC_UNSET_IGNORELOCALCHANGES
, BST_UNCHECKED
, BST_UNCHECKED
);
2362 CopySelectedEntriesToClipboard(0);
2364 case IDGITLC_COPYEXT
:
2365 CopySelectedEntriesToClipboard((DWORD
)-1);
2367 case IDGITLC_EXPORT
:
2370 case IDGITLC_SAVEAS
:
2371 FileSaveAs(filepath
);
2374 case IDGITLC_REVERTTOREV
:
2375 RevertSelectedItemToVersion();
2377 case IDGITLC_REVERTTOPARENT
:
2378 RevertSelectedItemToVersion(true);
2381 case IDSVNLC_COMMIT
:
2383 CTSVNPathList targetList
;
2384 FillListOfSelectedItemPaths(targetList
);
2385 CTSVNPath tempFile
= CTempFiles::Instance().GetTempFilePath(false);
2386 VERIFY(targetList
.WriteToFile(tempFile
.GetWinPathString()));
2387 CString commandline
= CPathUtils::GetAppDirectory();
2388 commandline
+= _T("TortoiseGitProc.exe /command:commit /pathfile:\"");
2389 commandline
+= tempFile
.GetWinPathString();
2390 commandline
+= _T("\"");
2391 commandline
+= _T(" /deletepathfile");
2392 CAppUtils::LaunchApplication(commandline
, NULL
, false);
2395 case IDSVNLC_CREATEIGNORECS
:
2396 CreateChangeList(SVNSLC_IGNORECHANGELIST
);
2398 case IDSVNLC_CREATECS
:
2400 CCreateChangelistDlg dlg
;
2401 if (dlg
.DoModal() == IDOK
)
2403 CreateChangeList(dlg
.m_sName
);
2409 if (cmd
< IDSVNLC_MOVETOCS
)
2411 CTSVNPathList changelistItems
;
2412 FillListOfSelectedItemPaths(changelistItems
);
2414 // find the changelist name
2415 CString sChangelist
;
2416 int cmdID
= IDSVNLC_MOVETOCS
;
2418 for (std::map
<CString
, int>::const_iterator it
= m_changelists
.begin(); it
!= m_changelists
.end(); ++it
)
2420 if ((it
->first
.Compare(SVNSLC_IGNORECHANGELIST
))&&(entry
->changelist
.Compare(it
->first
)))
2424 sChangelist
= it
->first
;
2429 if (!sChangelist
.IsEmpty())
2432 if (git
.AddToChangeList(changelistItems
, sChangelist
, git_depth_empty
))
2434 // The changelists were moved, but we now need to run through the selected items again
2435 // and update their changelist
2436 POSITION pos
= GetFirstSelectedItemPosition();
2438 while ((index
= GetNextSelectedItem(pos
)) >= 0)
2440 FileEntry
* e
= GetListEntry(index
);
2441 e
->changelist
= sChangelist
;
2444 if (m_changelists
.find(e
->changelist
)!=m_changelists
.end())
2445 SetItemGroup(index
, m_changelists
[e
->changelist
]);
2447 SetItemGroup(index
, 0);
2453 CMessageBox::Show(m_hWnd
, git
.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR
);
2463 AfxGetApp()->DoWaitCursor(-1);
2464 GetStatisticsString();
2465 //int iItemCountAfterMenuCmd = GetItemCount();
2466 //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)
2468 // CWnd* pParent = GetParent();
2469 // if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2471 // pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);
2474 } // if (popup.CreatePopupMenu())
2475 } // if (selIndex >= 0)
2479 void CGitStatusListCtrl::SetGitIndexFlagsForSelectedFiles(UINT message
, BOOL assumevalid
, BOOL skipworktree
)
2481 if (CMessageBox::Show(GetSafeHwnd(), message
, IDS_APPNAME
, MB_YESNO
| MB_DEFBUTTON2
| MB_ICONQUESTION
) == IDNO
)
2484 CStringA gitdir
= CUnicodeUtils::GetMulti(g_Git
.m_CurrentDir
, CP_UTF8
);
2486 git_repository
*repository
= nullptr;
2487 if (git_repository_open(&repository
, gitdir
.GetBuffer()))
2489 CMessageBox::Show(m_hWnd
, g_Git
.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR
);
2493 git_index
*gitindex
= nullptr;
2494 if (git_repository_index(&gitindex
, repository
))
2496 CMessageBox::Show(m_hWnd
, g_Git
.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR
);
2497 git_repository_free(repository
);
2501 POSITION pos
= GetFirstSelectedItemPosition();
2503 while ((index
= GetNextSelectedItem(pos
)) >= 0)
2505 CTGitPath
* path
= (CTGitPath
*)GetItemData(index
);
2507 if (path
== nullptr)
2511 if (!git_index_find(&idx
, gitindex
, CUnicodeUtils::GetMulti(path
->GetGitPathString(), CP_UTF8
)))
2513 git_index_entry
*e
= const_cast<git_index_entry
*>(git_index_get_byindex(gitindex
, idx
)); // HACK
2514 if (assumevalid
== BST_UNCHECKED
)
2515 e
->flags
&= ~GIT_IDXENTRY_VALID
;
2516 else if (assumevalid
== BST_CHECKED
)
2517 e
->flags
|= GIT_IDXENTRY_VALID
;
2518 if (skipworktree
== BST_UNCHECKED
)
2519 e
->flags_extended
&= ~GIT_IDXENTRY_SKIP_WORKTREE
;
2520 else if (skipworktree
== BST_CHECKED
)
2521 e
->flags_extended
|= GIT_IDXENTRY_SKIP_WORKTREE
;
2522 git_index_add(gitindex
, e
);
2525 CMessageBox::Show(m_hWnd
, g_Git
.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR
);
2528 if (git_index_write(gitindex
))
2530 CMessageBox::Show(m_hWnd
, g_Git
.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR
);
2531 git_index_free(gitindex
);
2532 git_repository_free(repository
);
2536 git_repository_free(repository
);
2538 if (nullptr != GetLogicalParent() && nullptr != GetLogicalParent()->GetSafeHwnd())
2539 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH
);
2544 void CGitStatusListCtrl::OnContextMenuHeader(CWnd
* pWnd
, CPoint point
)
2546 Locker
lock(m_critSec
);
2547 m_ColumnManager
.OnContextMenuHeader(pWnd
,point
,!!IsGroupViewEnabled());
2550 void CGitStatusListCtrl::OnContextMenu(CWnd
* pWnd
, CPoint point
)
2555 OnContextMenuList(pWnd
, point
);
2556 } // if (pWnd == this)
2557 else if (pWnd
== GetHeaderCtrl())
2559 OnContextMenuHeader(pWnd
, point
);
2563 void CGitStatusListCtrl::OnNMDblclk(NMHDR
*pNMHDR
, LRESULT
*pResult
)
2566 Locker
lock(m_critSec
);
2567 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
2572 if (pNMLV
->iItem
< 0)
2574 if (!IsGroupViewEnabled())
2577 DWORD ptW
= GetMessagePos();
2578 pt
.x
= GET_X_LPARAM(ptW
);
2579 pt
.y
= GET_Y_LPARAM(ptW
);
2580 ScreenToClient(&pt
);
2581 int group
= GetGroupFromPoint(&pt
);
2584 // check/uncheck the whole group depending on the check-state
2585 // of the first item in the group
2587 bool bCheck
= false;
2588 bool bFirst
= false;
2590 for (int i
=0; i
<GetItemCount(); ++i
)
2592 SecureZeroMemory(&lv
, sizeof(LVITEM
));
2593 lv
.mask
= LVIF_GROUPID
;
2596 if (lv
.iGroupId
== group
)
2598 CTGitPath
*entry
=(CTGitPath
*)GetItemData(i
);
2602 bCheck
= !GetCheck(i
);
2607 bool bOldCheck
= !!GetCheck(i
);
2608 SetEntryCheck(entry
, i
, bCheck
);
2609 if (bCheck
!= bOldCheck
)
2619 GetStatisticsString();
2625 CTGitPath
*file
=(CTGitPath
*)GetItemData(pNMLV
->iItem
);
2627 if (file
->m_Action
& (CTGitPath::LOGACTIONS_UNVER
| CTGitPath::LOGACTIONS_IGNORE
)) {
2628 OpenFile(file
, OPEN
);
2631 if( file
->m_Action
&CTGitPath::LOGACTIONS_UNMERGED
)
2633 if (CAppUtils::ConflictEdit(*file
, false, m_bIsRevertTheirMy
))
2635 CString conflictedFile
= g_Git
.m_CurrentDir
+ _T("\\") + file
->GetWinPathString();
2636 if (!PathFileExists(conflictedFile
) && NULL
!= GetLogicalParent() && NULL
!= GetLogicalParent()->GetSafeHwnd())
2637 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH
);
2642 if( (!m_Rev1
.IsEmpty()) || (!m_Rev1
.IsEmpty())) // m_Rev1 twice???
2643 StartDiffTwo(pNMLV
->iItem
);
2645 StartDiff(pNMLV
->iItem
);
2649 void CGitStatusListCtrl::StartDiffTwo(int fileindex
)
2654 auto ptr
= (CTGitPath
*)GetItemData(fileindex
);
2657 CTGitPath file1
= *ptr
;
2659 CGitDiff::Diff(&file1
,&file1
,
2664 void CGitStatusListCtrl::StartDiffWC(int fileindex
)
2670 if(this->m_CurrentVersion
.IsEmpty() || m_CurrentVersion
== GIT_REV_ZERO
)
2673 auto ptr
= (CTGitPath
*)GetItemData(fileindex
);
2676 CTGitPath file1
= *ptr
;
2677 file1
.m_Action
= 0; // reset action, so that diff is not started as added/deleted file; see issue #1757
2679 CGitDiff::Diff(&file1
,&file1
, GIT_REV_ZERO
, m_CurrentVersion
);
2683 void CGitStatusListCtrl::StartDiff(int fileindex
)
2688 auto ptr
= (CTGitPath
*)GetItemData(fileindex
);
2691 CTGitPath file1
= *ptr
;
2693 if(file1
.m_Action
& (CTGitPath::LOGACTIONS_REPLACED
|CTGitPath::LOGACTIONS_COPY
))
2695 file2
.SetFromGit(file1
.GetGitOldPathString());
2702 if(this->m_CurrentVersion
.IsEmpty() || m_CurrentVersion
== GIT_REV_ZERO
)
2705 if(m_amend
&& (file1
.m_Action
& CTGitPath::LOGACTIONS_ADDED
) == 0)
2706 fromwhere
= _T("~1");
2707 if( g_Git
.IsInitRepos())
2708 CGitDiff::DiffNull((CTGitPath
*)GetItemData(fileindex
),
2710 else if( file1
.m_Action
&CTGitPath::LOGACTIONS_ADDED
)
2711 CGitDiff::DiffNull((CTGitPath
*)GetItemData(fileindex
),
2712 m_CurrentVersion
+fromwhere
,true);
2713 else if( file1
.m_Action
&CTGitPath::LOGACTIONS_DELETED
)
2714 CGitDiff::DiffNull((CTGitPath
*)GetItemData(fileindex
),
2715 GitRev::GetHead()+fromwhere
,false);
2717 CGitDiff::Diff(&file1
,&file2
,
2718 CString(GIT_REV_ZERO
),
2719 GitRev::GetHead()+fromwhere
);
2724 CString fromwhere
= m_CurrentVersion
+_T("~1");
2726 fromwhere
= m_CurrentVersion
+_T("~2");
2727 bool revfail
= false;
2730 revfail
= !!rev
.GetCommit(fromwhere
);
2732 catch (const char *msg
)
2735 CMessageBox::Show(NULL
, _T("Could not get commit ") + fromwhere
+ _T("\nlibgit reports:\n") + CString(msg
), _T("TortoiseGit"), MB_ICONERROR
);
2737 if (revfail
|| (file1
.m_Action
& file1
.LOGACTIONS_ADDED
))
2739 CGitDiff::DiffNull(&file1
,m_CurrentVersion
,true);
2742 else if (file1
.m_Action
& file1
.LOGACTIONS_DELETED
)
2744 if (file1
.m_ParentNo
> 0)
2745 fromwhere
.Format(_T("%s^%d"), m_CurrentVersion
, file1
.m_ParentNo
+ 1);
2747 CGitDiff::DiffNull(&file1
,fromwhere
,false);
2751 if( file1
.m_ParentNo
& MERGE_MASK
)
2754 CTGitPath base
, theirs
, mine
, merge
;
2757 GetTempPath(temppath
);
2758 temppath
.TrimRight(_T("\\"));
2760 mine
.SetFromGit(temppath
+ _T("\\") + file1
.GetFileOrDirectoryName() + _T(".LOCAL") + file1
.GetFileExtension());
2761 theirs
.SetFromGit(temppath
+ _T("\\") + file1
.GetFileOrDirectoryName() + _T(".REMOTE") + file1
.GetFileExtension());
2762 base
.SetFromGit(temppath
+ _T("\\") + file1
.GetFileOrDirectoryName() + _T(".BASE") + file1
.GetFileExtension());
2765 //create a empty file, incase stage is not three
2766 tempfile
.Open(mine
.GetWinPathString(),CFile::modeCreate
|CFile::modeReadWrite
);
2768 tempfile
.Open(theirs
.GetWinPathString(),CFile::modeCreate
|CFile::modeReadWrite
);
2770 tempfile
.Open(base
.GetWinPathString(),CFile::modeCreate
|CFile::modeReadWrite
);
2773 merge
.SetFromGit(temppath
+ _T("\\") + file1
.GetFileOrDirectoryName() + _T(".Merged") + file1
.GetFileExtension());
2775 int parent1
=-1, parent2
=-1;
2776 for (size_t i
= 0; i
< m_arStatusArray
.size(); ++i
)
2778 if(m_arStatusArray
[i
]->GetGitPathString() == file1
.GetGitPathString())
2780 if(m_arStatusArray
[i
]->m_ParentNo
& MERGE_MASK
)
2787 parent1
= m_arStatusArray
[i
]->m_ParentNo
& PARENT_MASK
;
2789 else if (parent2
<0)
2791 parent2
= m_arStatusArray
[i
]->m_ParentNo
& PARENT_MASK
;
2797 if(g_Git
.GetOneFile(m_CurrentVersion
, file1
, (CString
&)merge
.GetWinPathString()))
2799 CMessageBox::Show(NULL
, IDS_STATUSLIST_FAILEDGETMERGEFILE
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
2805 str
.Format(_T("%s^%d"),this->m_CurrentVersion
, parent1
+1);
2807 if(g_Git
.GetOneFile(str
, file1
, (CString
&)mine
.GetWinPathString()))
2809 CMessageBox::Show(NULL
, IDS_STATUSLIST_FAILEDGETMERGEFILE
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
2816 str
.Format(_T("%s^%d"),this->m_CurrentVersion
, parent2
+1);
2818 if(g_Git
.GetOneFile(str
, file1
, (CString
&)theirs
.GetWinPathString()))
2820 CMessageBox::Show(NULL
, IDS_STATUSLIST_FAILEDGETMERGEFILE
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
2824 if(parent1
>=0 && parent2
>=0)
2826 CString cmd
, output
;
2827 cmd
.Format(_T("git.exe merge-base %s^%d %s^%d"), this->m_CurrentVersion
, parent1
+1,
2828 this->m_CurrentVersion
,parent2
+1);
2830 if (g_Git
.Run(cmd
, &output
, NULL
, CP_UTF8
))
2835 if(g_Git
.GetOneFile(output
.Left(40), file1
, (CString
&)base
.GetWinPathString()))
2837 CMessageBox::Show(NULL
, IDS_STATUSLIST_FAILEDGETBASEFILE
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
2841 CAppUtils::StartExtMerge(base
, theirs
, mine
, merge
,_T("BASE"),_T("REMOTE"),_T("LOCAL"));
2847 if( (file1
.m_ParentNo
&PARENT_MASK
) == 0)
2853 str
.Format(_T("^%d"), (file1
.m_ParentNo
&PARENT_MASK
)+1);
2855 CGitDiff::Diff(&file1
,&file2
,
2857 m_CurrentVersion
+str
);
2863 CString
CGitStatusListCtrl::GetStatisticsString(bool simple
)
2866 CString sNormal
, sAdded
, sDeleted
, sModified
, sConflicted
, sUnversioned
, sRenamed
;
2867 WORD langID
= (WORD
)(DWORD
)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
2868 TCHAR buf
[MAX_STATUS_STRING_LENGTH
] = { 0 };
2869 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_normal
, buf
, _countof(buf
), langID
);
2871 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_added
, buf
, _countof(buf
), langID
);
2873 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_deleted
, buf
, _countof(buf
), langID
);
2875 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_modified
, buf
, _countof(buf
), langID
);
2877 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_conflicted
, buf
, _countof(buf
), langID
);
2879 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_unversioned
, buf
, _countof(buf
), langID
);
2881 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_replaced
, buf
, _countof(buf
), langID
);
2886 sToolTip
.Format(IDS_STATUSLIST_STATUSLINE1
,
2887 this->m_nLineAdded
,this->m_nLineDeleted
,
2888 (LPCTSTR
)sModified
, m_nModified
,
2889 (LPCTSTR
)sAdded
, m_nAdded
,
2890 (LPCTSTR
)sDeleted
, m_nDeleted
,
2891 (LPCTSTR
)sRenamed
, m_nRenamed
2896 sToolTip
.Format(IDS_STATUSLIST_STATUSLINE2
,
2897 this->m_nLineAdded
,this->m_nLineDeleted
,
2898 (LPCTSTR
)sNormal
, m_nNormal
,
2899 (LPCTSTR
)sUnversioned
, m_nUnversioned
,
2900 (LPCTSTR
)sModified
, m_nModified
,
2901 (LPCTSTR
)sAdded
, m_nAdded
,
2902 (LPCTSTR
)sDeleted
, m_nDeleted
,
2903 (LPCTSTR
)sConflicted
, m_nConflicted
2907 sStats
.Format(IDS_COMMITDLG_STATISTICSFORMAT
, m_nSelected
, GetItemCount());
2910 m_pStatLabel
->SetWindowText(sStats
);
2913 if (m_pSelectButton
)
2915 if (m_nSelected
== 0)
2916 m_pSelectButton
->SetCheck(BST_UNCHECKED
);
2917 else if (m_nSelected
!= GetItemCount())
2918 m_pSelectButton
->SetCheck(BST_INDETERMINATE
);
2920 m_pSelectButton
->SetCheck(BST_CHECKED
);
2923 if (m_pConfirmButton
)
2925 m_pConfirmButton
->EnableWindow(m_nSelected
>0);
2933 CString
CGitStatusListCtrl::GetCommonDirectory(bool bStrict
)
2937 // not strict means that the selected folder has priority
2938 if (!m_StatusFileList
.GetCommonDirectory().IsEmpty())
2939 return m_StatusFileList
.GetCommonDirectory().GetWinPath();
2942 CTGitPath commonBaseDirectory
;
2943 int nListItems
= GetItemCount();
2944 for (int i
=0; i
<nListItems
; ++i
)
2946 CTGitPath baseDirectory
,*p
= (CTGitPath
*)this->GetItemData(i
);
2950 baseDirectory
= p
->GetDirectory();
2952 if(commonBaseDirectory
.IsEmpty())
2954 commonBaseDirectory
= baseDirectory
;
2958 if (commonBaseDirectory
.GetWinPathString().GetLength() > baseDirectory
.GetWinPathString().GetLength())
2960 if (baseDirectory
.IsAncestorOf(commonBaseDirectory
))
2961 commonBaseDirectory
= baseDirectory
;
2965 return g_Git
.m_CurrentDir
+CString(_T("\\"))+commonBaseDirectory
.GetWinPath();
2969 void CGitStatusListCtrl::SelectAll(bool bSelect
, bool /*bIncludeNoCommits*/)
2971 CWaitCursor waitCursor
;
2972 // block here so the LVN_ITEMCHANGED messages
2977 int nListItems
= GetItemCount();
2979 m_nSelected
= nListItems
;
2983 for (int i
=0; i
<nListItems
; ++i
)
2985 //FileEntry * entry = GetListEntry(i);
2986 //ASSERT(entry != NULL);
2987 CTGitPath
*path
= (CTGitPath
*) GetItemData(i
);
2990 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))
2991 SetEntryCheck(path
,i
,bSelect
);
2994 // unblock before redrawing
2997 GetStatisticsString();
3001 void CGitStatusListCtrl::Check(DWORD dwCheck
, bool check
)
3003 CWaitCursor waitCursor
;
3004 // block here so the LVN_ITEMCHANGED messages
3009 int nListItems
= GetItemCount();
3011 for (int i
= 0; i
< nListItems
; ++i
)
3013 CTGitPath
*entry
= (CTGitPath
*) GetItemData(i
);
3017 DWORD showFlags
= entry
->m_Action
;
3018 if (entry
->IsDirectory())
3019 showFlags
|= GITSLC_SHOWSUBMODULES
;
3021 showFlags
|= GITSLC_SHOWFILES
;
3023 if (check
&& (showFlags
& dwCheck
) && !GetCheck(i
) && !(entry
->IsDirectory() && m_bDoNotAutoselectSubmodules
&& !(dwCheck
& GITSLC_SHOWSUBMODULES
)))
3025 SetEntryCheck(entry
, i
, true);
3028 else if (!check
&& (showFlags
& dwCheck
) && GetCheck(i
))
3030 SetEntryCheck(entry
, i
, false);
3034 // unblock before redrawing
3037 GetStatisticsString();
3041 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR
*pNMHDR
, LRESULT
*pResult
)
3043 LPNMLVGETINFOTIP pGetInfoTip
= reinterpret_cast<LPNMLVGETINFOTIP
>(pNMHDR
);
3048 CTGitPath
*entry
=(CTGitPath
*)GetItemData(pGetInfoTip
->iItem
);
3051 if (pGetInfoTip
->cchTextMax
> entry
->GetGitPathString().GetLength() + g_Git
.m_CurrentDir
.GetLength())
3054 str
+= g_Git
.m_CurrentDir
;
3056 str
+= entry
->GetWinPathString();
3058 _tcsncpy_s(pGetInfoTip
->pszText
, pGetInfoTip
->cchTextMax
, str
.GetBuffer(), str
.GetLength());
3062 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR
*pNMHDR
, LRESULT
*pResult
)
3064 NMLVCUSTOMDRAW
* pLVCD
= reinterpret_cast<NMLVCUSTOMDRAW
*>( pNMHDR
);
3066 // Take the default processing unless we set this to something else below.
3067 *pResult
= CDRF_DODEFAULT
;
3069 // First thing - check the draw stage. If it's the control's prepaint
3070 // stage, then tell Windows we want messages for every item.
3072 switch (pLVCD
->nmcd
.dwDrawStage
)
3075 *pResult
= CDRF_NOTIFYITEMDRAW
;
3077 case CDDS_ITEMPREPAINT
:
3079 // This is the prepaint stage for an item. Here's where we set the
3080 // item's text color. Our return value will tell Windows to draw the
3081 // item itself, but it will use the new color we set here.
3083 // Tell Windows to paint the control itself.
3084 *pResult
= CDRF_DODEFAULT
;
3088 COLORREF crText
= GetSysColor(COLOR_WINDOWTEXT
);
3090 if (m_arStatusArray
.size() > (DWORD_PTR
)pLVCD
->nmcd
.dwItemSpec
)
3093 //FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);
3094 CTGitPath
*entry
=(CTGitPath
*)GetItemData((int)pLVCD
->nmcd
.dwItemSpec
);
3100 // black : unversioned, normal
3103 // brown : missing, deleted, replaced
3104 // green : merged (or potential merges)
3105 // red : conflicts or sure conflicts
3106 if(entry
->m_Action
& CTGitPath::LOGACTIONS_GRAY
)
3108 crText
= RGB(128,128,128);
3111 else if(entry
->m_Action
& CTGitPath::LOGACTIONS_UNMERGED
)
3113 crText
= m_Colors
.GetColor(CColors::Conflict
);
3116 else if(entry
->m_Action
& (CTGitPath::LOGACTIONS_MODIFIED
))
3118 crText
= m_Colors
.GetColor(CColors::Modified
);
3121 else if(entry
->m_Action
& (CTGitPath::LOGACTIONS_ADDED
|CTGitPath::LOGACTIONS_COPY
))
3123 crText
= m_Colors
.GetColor(CColors::Added
);
3125 else if(entry
->m_Action
& CTGitPath::LOGACTIONS_DELETED
)
3127 crText
= m_Colors
.GetColor(CColors::Deleted
);
3129 else if(entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
)
3131 crText
= m_Colors
.GetColor(CColors::Renamed
);
3133 else if(entry
->m_Action
& CTGitPath::LOGACTIONS_MERGED
)
3135 crText
= m_Colors
.GetColor(CColors::Merged
);
3139 crText
= GetSysColor(COLOR_WINDOWTEXT
);
3141 // Store the color back in the NMLVCUSTOMDRAW struct.
3142 pLVCD
->clrText
= crText
;
3149 BOOL
CGitStatusListCtrl::OnSetCursor(CWnd
* pWnd
, UINT nHitTest
, UINT message
)
3152 return CListCtrl::OnSetCursor(pWnd
, nHitTest
, message
);
3155 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_ARROW
));
3157 return CListCtrl::OnSetCursor(pWnd
, nHitTest
, message
);
3159 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_WAIT
));
3164 void CGitStatusListCtrl::RemoveListEntry(int index
)
3167 Locker
lock(m_critSec
);
3170 m_arStatusArray
.erase(m_arStatusArray
.begin()+index
);
3173 delete m_arStatusArray
[m_arListArray
[index
]];
3174 m_arStatusArray
.erase(m_arStatusArray
.begin()+m_arListArray
[index
]);
3175 m_arListArray
.erase(m_arListArray
.begin()+index
);
3176 for (int i
=index
; i
< (int)m_arListArray
.size(); ++i
)
3183 ///< Set a checkbox on an entry in the listbox
3184 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync
3185 void CGitStatusListCtrl::SetEntryCheck(CTGitPath
* pEntry
, int listboxIndex
, bool bCheck
)
3187 pEntry
->m_Checked
= bCheck
;
3188 m_mapFilenameToChecked
[pEntry
->GetGitPathString()] = bCheck
;
3189 SetCheck(listboxIndex
, bCheck
);
3193 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry
* parentEntry
, bool bCheck
)
3196 int nListItems
= GetItemCount();
3197 for (int j
=0; j
< nListItems
; ++j
)
3199 FileEntry
* childEntry
= GetListEntry(j
);
3200 ASSERT(childEntry
!= NULL
);
3201 if (childEntry
== NULL
|| childEntry
== parentEntry
)
3203 if (childEntry
->checked
!= bCheck
)
3205 if (parentEntry
->path
.IsAncestorOf(childEntry
->path
))
3207 SetEntryCheck(childEntry
,j
,bCheck
);
3223 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList
& pathList
)
3227 int nListItems
= GetItemCount();
3228 for (int i
= 0; i
< nListItems
; ++i
)
3230 CTGitPath
* entry
= (CTGitPath
*)GetItemData(i
);
3231 ASSERT(entry
!= NULL
);
3232 if (entry
->m_Checked
)
3234 pathList
.AddPath(*entry
);
3237 pathList
.SortByPathname();
3242 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)
3243 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList
& pathList
, bool /*bNoIgnored*/)
3247 POSITION pos
= GetFirstSelectedItemPosition();
3249 while ((index
= GetNextSelectedItem(pos
)) >= 0)
3251 CTGitPath
* entry
= (CTGitPath
*)GetItemData(index
);
3252 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))
3254 pathList
.AddPath(*entry
);
3258 UINT
CGitStatusListCtrl::OnGetDlgCode()
3260 // we want to process the return key and not have that one
3261 // routed to the default pushbutton
3262 return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS
;
3265 void CGitStatusListCtrl::OnNMReturn(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
3270 if (!CheckMultipleDiffs())
3272 POSITION pos
= GetFirstSelectedItemPosition();
3275 int index
= GetNextSelectedItem(pos
);
3276 CTGitPath
*file
=(CTGitPath
*)GetItemData(index
);
3277 if (file
->m_Action
& (CTGitPath::LOGACTIONS_UNVER
| CTGitPath::LOGACTIONS_IGNORE
))
3279 OpenFile(file
, OPEN
);
3283 if( (!m_Rev1
.IsEmpty()) || (!m_Rev1
.IsEmpty())) // m_Rev1 twice???
3284 StartDiffTwo(index
);
3291 void CGitStatusListCtrl::OnKeyDown(UINT nChar
, UINT nRepCnt
, UINT nFlags
)
3293 // Since we catch all keystrokes (to have the enter key processed here instead
3294 // of routed to the default pushbutton) we have to make sure that other
3295 // keys like Tab and Esc still do what they're supposed to do
3296 // Tab = change focus to next/previous control
3297 // Esc = quit the dialog
3302 ::PostMessage(GetLogicalParent()->GetSafeHwnd(), WM_NEXTDLGCTL
, GetKeyState(VK_SHIFT
)&0x8000, 0);
3308 ::SendMessage(GetLogicalParent()->GetSafeHwnd(), WM_CLOSE
, 0, 0);
3313 CListCtrl::OnKeyDown(nChar
, nRepCnt
, nFlags
);
3316 void CGitStatusListCtrl::PreSubclassWindow()
3318 CListCtrl::PreSubclassWindow();
3319 EnableToolTips(TRUE
);
3320 SetWindowTheme(GetSafeHwnd(), L
"Explorer", NULL
);
3323 void CGitStatusListCtrl::OnPaint()
3325 LRESULT defres
= Default();
3326 if ((m_bBusy
)||(m_bEmpty
))
3331 if (m_sBusy
.IsEmpty())
3332 str
.LoadString(IDS_STATUSLIST_BUSYMSG
);
3338 if (m_sEmpty
.IsEmpty())
3339 str
.LoadString(IDS_STATUSLIST_EMPTYMSG
);
3343 COLORREF clrText
= ::GetSysColor(COLOR_WINDOWTEXT
);
3345 if (IsWindowEnabled())
3346 clrTextBk
= ::GetSysColor(COLOR_WINDOW
);
3348 clrTextBk
= ::GetSysColor(COLOR_3DFACE
);
3353 pHC
= GetHeaderCtrl();
3357 pHC
->GetItemRect(0, &rcH
);
3358 rc
.top
+= rcH
.bottom
;
3362 CMyMemDC
memDC(pDC
, &rc
);
3364 memDC
.SetTextColor(clrText
);
3365 memDC
.SetBkColor(clrTextBk
);
3366 memDC
.FillSolidRect(rc
, clrTextBk
);
3368 CGdiObject
* oldfont
= memDC
.SelectStockObject(DEFAULT_GUI_FONT
);
3369 memDC
.DrawText(str
, rc
, DT_CENTER
| DT_VCENTER
|
3370 DT_WORDBREAK
| DT_NOPREFIX
| DT_NOCLIP
);
3371 memDC
.SelectObject(oldfont
);
3377 // the Default() call did not process the WM_PAINT message!
3378 // Validate the update region ourselves to avoid
3379 // an endless loop repainting
3381 GetUpdateRect(&rc
, FALSE
);
3382 if (!rc
.IsRectEmpty())
3387 // prevent users from extending our hidden (size 0) columns
3388 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR
*pNMHDR
, LRESULT
*pResult
)
3390 m_ColumnManager
.OnHdnBegintrack(pNMHDR
, pResult
);
3393 // prevent any function from extending our hidden (size 0) columns
3394 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR
*pNMHDR
, LRESULT
*pResult
)
3396 if(!m_ColumnManager
.OnHdnItemchanging(pNMHDR
, pResult
))
3400 void CGitStatusListCtrl::OnDestroy()
3402 SaveColumnWidths(true);
3403 CListCtrl::OnDestroy();
3406 void CGitStatusListCtrl::OnBeginDrag(NMHDR
* /*pNMHDR*/, LRESULT
* pResult
)
3408 Locker
lock(m_critSec
);
3409 CDropFiles dropFiles
; // class for creating DROPFILES struct
3412 POSITION pos
= GetFirstSelectedItemPosition();
3416 bool bTempDirCreated
= false;
3418 while ( (index
= GetNextSelectedItem(pos
)) >= 0 )
3420 CTGitPath
*path
= (CTGitPath
*)GetItemData(index
); // m_arStatusArray[index] does not work with SyncDlg
3421 if (path
->IsDirectory())
3425 if (!this->m_CurrentVersion
.IsEmpty() && this->m_CurrentVersion
!= GIT_REV_ZERO
)
3427 if (path
->m_Action
& CTGitPath::LOGACTIONS_DELETED
)
3428 version
.Format(_T("%s^%d"), m_CurrentVersion
, (path
->m_ParentNo
+ 1) & PARENT_MASK
);
3430 version
= m_CurrentVersion
;
3434 if (path
->m_Action
& CTGitPath::LOGACTIONS_DELETED
)
3435 version
= _T("HEAD");
3439 if (version
.IsEmpty())
3441 TCHAR abspath
[MAX_PATH
] = {0};
3442 PathCombine(abspath
, g_Git
.m_CurrentDir
, path
->GetWinPath());
3447 if (!bTempDirCreated
)
3449 tempDir
= GetTempFile();
3450 ::DeleteFile(tempDir
);
3451 ::CreateDirectory(tempDir
, NULL
);
3452 bTempDirCreated
= true;
3454 tempFile
= tempDir
+ _T("\\") + path
->GetWinPathString();
3455 CString tempSubDir
= tempDir
+ _T("\\") + path
->GetContainingDirectory().GetWinPathString();
3456 CPathUtils::MakeSureDirectoryPathExists(tempSubDir
);
3457 if (g_Git
.GetOneFile(version
, *path
, tempFile
))
3460 out
.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED
, path
->GetGitPathString(), version
, tempFile
);
3461 CMessageBox::Show(NULL
, out
, _T("TortoiseGit"), MB_OK
);
3465 dropFiles
.AddFile(tempFile
);
3468 if (!dropFiles
.IsEmpty())
3471 dropFiles
.CreateStructure();
3477 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry
/* = false */)
3479 int maxcol
= ((CHeaderCtrl
*)(GetDlgItem(0)))->GetItemCount()-1;
3480 for (int col
= 0; col
<= maxcol
; col
++)
3481 if (m_ColumnManager
.IsVisible (col
))
3482 m_ColumnManager
.ColumnResized (col
);
3484 if (bSaveToRegistry
)
3485 m_ColumnManager
.WriteSettings();
3488 bool CGitStatusListCtrl::EnableFileDrop()
3490 m_bFileDropsEnabled
= true;
3494 bool CGitStatusListCtrl::HasPath(const CTGitPath
& path
)
3496 for (size_t i
=0; i
< m_arStatusArray
.size(); ++i
)
3498 if (m_arStatusArray
[i
]->IsEquivalentTo(path
))
3505 BOOL
CGitStatusListCtrl::PreTranslateMessage(MSG
* pMsg
)
3507 if (pMsg
->message
== WM_KEYDOWN
)
3509 switch (pMsg
->wParam
)
3513 if (GetAsyncKeyState(VK_CONTROL
)&0x8000)
3515 // select all entries
3516 for (int i
=0; i
<GetItemCount(); ++i
)
3518 SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
3527 if (GetAsyncKeyState(VK_CONTROL
)&0x8000)
3529 // copy all selected paths to the clipboard
3530 if (GetAsyncKeyState(VK_SHIFT
)&0x8000)
3531 CopySelectedEntriesToClipboard(GITSLC_COLSTATUS
);
3533 CopySelectedEntriesToClipboard(0);
3540 if ((GetSelectedCount() > 0) && (m_dwContextMenus
& GITSLC_POPDELETE
))
3543 CTGitPath
* filepath
= (CTGitPath
*)GetItemData(GetSelectionMark());
3544 if (filepath
!= nullptr && (filepath
->m_Action
& (CTGitPath::LOGACTIONS_UNVER
| CTGitPath::LOGACTIONS_IGNORE
)))
3545 DeleteSelectedFiles();
3553 return CListCtrl::PreTranslateMessage(pMsg
);
3556 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols
)
3559 static HINSTANCE
hResourceHandle(AfxGetResourceHandle());
3560 // WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
3565 if (GetSelectedCount() == 0)
3568 // first add the column titles as the first line
3569 // We needn't head when only path copy
3570 //temp.LoadString(IDS_STATUSLIST_COLFILE);
3571 //sClipboard = temp;
3573 DWORD selection
= 0;
3574 for (int i
= 0, count
= m_ColumnManager
.GetColumnCount(); i
< count
; ++i
)
3575 if ( ((dwCols
== -1) && m_ColumnManager
.IsVisible (i
))
3576 || ((dwCols
!= 1) && (i
< 32) && ((dwCols
& (1 << i
)) != 0)))
3578 sClipboard
+= _T("\t") + m_ColumnManager
.GetName(i
);
3581 selection
+= 1 << i
;
3585 sClipboard
+= _T("\r\n");
3587 POSITION pos
= GetFirstSelectedItemPosition();
3589 while ((index
= GetNextSelectedItem(pos
)) >= 0)
3591 CTGitPath
* entry
= (CTGitPath
*)GetItemData(index
);
3595 sClipboard
+= entry
->GetWinPathString();
3596 if (selection
& GITSLC_COLFILENAME
)
3598 sClipboard
+= _T("\t")+entry
->GetFileOrDirectoryName();
3600 if (selection
& GITSLC_COLEXT
)
3602 sClipboard
+= _T("\t")+entry
->GetFileExtension();
3605 if (selection
& GITSLC_COLSTATUS
)
3607 sClipboard
+= _T("\t")+entry
->GetActionName();
3610 if (selection
& SVNSLC_COLDATE
)
3612 TCHAR datebuf
[SVN_DATE_BUFFER
];
3613 apr_time_t date
= entry
->last_commit_date
;
3614 SVN::formatDate(datebuf
, date
, true);
3619 sClipboard
+= _T("\t")+temp
;
3621 for ( int i
= SVNSLC_NUMCOLUMNS
, count
= m_ColumnManager
.GetColumnCount()
3625 if ((dwCols
== -1) && m_ColumnManager
.IsVisible (i
))
3628 = entry
->present_props
[m_ColumnManager
.GetName(i
)];
3629 sClipboard
+= _T("\t") + value
;
3633 if (selection
& GITSLC_COLADD
)
3635 sClipboard
+= _T("\t")+entry
->m_StatAdd
;
3637 if (selection
& GITSLC_COLDEL
)
3639 sClipboard
+= _T("\t")+entry
->m_StatDel
;
3642 sClipboard
+= _T("\r\n");
3645 return CStringUtils::WriteAsciiStringToClipboard(sClipboard
);
3648 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()
3651 std::set
<CString
> changelists
;
3652 POSITION pos
= GetFirstSelectedItemPosition();
3654 while ((index
= GetNextSelectedItem(pos
)) >= 0)
3656 FileEntry
* entry
= GetListEntry(index
);
3657 if (!entry
->changelist
.IsEmpty())
3658 changelists
.insert(entry
->changelist
);
3660 return changelists
.size();
3665 bool CGitStatusListCtrl::PrepareGroups(bool bForce
/* = false */)
3668 bool bHasGroups
=false;
3671 for (size_t i
= 0; i
< m_arStatusArray
.size(); ++i
)
3673 int ParentNo
= m_arStatusArray
[i
]->m_ParentNo
&PARENT_MASK
;
3675 max
=m_arStatusArray
[i
]->m_ParentNo
&PARENT_MASK
;
3678 if (!m_UnRevFileList
.IsEmpty() ||
3679 !m_IgnoreFileList
.IsEmpty() ||
3680 !m_LocalChangesIgnoredFileList
.IsEmpty() ||
3687 EnableGroupView(bHasGroups
);
3689 TCHAR groupname
[1024] = { 0 };
3695 grp
.cbSize
= sizeof(LVGROUP
);
3696 grp
.mask
= LVGF_ALIGN
| LVGF_GROUPID
| LVGF_HEADER
;
3699 //if(m_UnRevFileList.GetCount()>0)
3702 _tcsncpy_s(groupname
, 1024, (LPCTSTR
)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MERGEDFILES
)), 1023);
3703 grp
.pszHeader
= groupname
;
3704 grp
.iGroupId
= MERGE_MASK
;
3705 grp
.uAlign
= LVGA_HEADER_LEFT
;
3706 InsertGroup(0, &grp
);
3708 for (int i
= 0; i
<= max
; ++i
)
3711 str
.Format(IDS_STATUSLIST_GROUP_DIFFWITHPARENT
, i
+1);
3712 grp
.pszHeader
= str
.GetBuffer();
3713 str
.ReleaseBuffer();
3715 grp
.uAlign
= LVGA_HEADER_LEFT
;
3716 InsertGroup(i
+1, &grp
);
3721 _tcsncpy_s(groupname
, 1024, (LPCTSTR
)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MODIFIEDFILES
)), 1023);
3722 grp
.pszHeader
= groupname
;
3723 grp
.iGroupId
= groupindex
;
3724 grp
.uAlign
= LVGA_HEADER_LEFT
;
3725 InsertGroup(groupindex
++, &grp
);
3729 _tcsncpy_s(groupname
, 1024, (LPCTSTR
)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_NOTVERSIONEDFILES
)), 1023);
3730 grp
.pszHeader
= groupname
;
3731 grp
.iGroupId
= groupindex
;
3732 grp
.uAlign
= LVGA_HEADER_LEFT
;
3733 InsertGroup(groupindex
++, &grp
);
3736 //if(m_IgnoreFileList.GetCount()>0)
3738 _tcsncpy_s(groupname
, 1024, (LPCTSTR
)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_IGNOREDFILES
)), 1023);
3739 grp
.pszHeader
= groupname
;
3740 grp
.iGroupId
= groupindex
;
3741 grp
.uAlign
= LVGA_HEADER_LEFT
;
3742 InsertGroup(groupindex
++, &grp
);
3746 _tcsncpy_s(groupname
, 1024, (LPCTSTR
)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_IGNORELOCALCHANGES
)), 1023);
3747 grp
.pszHeader
= groupname
;
3748 grp
.iGroupId
= groupindex
;
3749 grp
.uAlign
= LVGA_HEADER_LEFT
;
3750 InsertGroup(groupindex
++, &grp
);
3756 m_bHasIgnoreGroup
= false;
3758 // now add the items which don't belong to a group
3760 grp
.cbSize
= sizeof(LVGROUP
);
3761 grp
.mask
= LVGF_ALIGN
| LVGF_GROUPID
| LVGF_HEADER
;
3762 CString
sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET
));
3763 _tcsncpy_s(groupname
, 1024, (LPCTSTR
)sUnassignedName
, 1023);
3764 grp
.pszHeader
= groupname
;
3765 grp
.iGroupId
= groupindex
;
3766 grp
.uAlign
= LVGA_HEADER_LEFT
;
3767 InsertGroup(groupindex
++, &grp
);
3769 for (std::map
<CString
,int>::iterator it
= m_changelists
.begin(); it
!= m_changelists
.end(); ++it
)
3771 if (it
->first
.Compare(SVNSLC_IGNORECHANGELIST
)!=0)
3774 grp
.cbSize
= sizeof(LVGROUP
);
3775 grp
.mask
= LVGF_ALIGN
| LVGF_GROUPID
| LVGF_HEADER
;
3776 _tcsncpy_s(groupname
, 1024, it
->first
, 1023);
3777 grp
.pszHeader
= groupname
;
3778 grp
.iGroupId
= groupindex
;
3779 grp
.uAlign
= LVGA_HEADER_LEFT
;
3780 it
->second
= InsertGroup(groupindex
++, &grp
);
3783 m_bHasIgnoreGroup
= true;
3786 if (m_bHasIgnoreGroup
)
3788 // and now add the group 'ignore-on-commit'
3789 std::map
<CString
,int>::iterator it
= m_changelists
.find(SVNSLC_IGNORECHANGELIST
);
3790 if (it
!= m_changelists
.end())
3792 grp
.cbSize
= sizeof(LVGROUP
);
3793 grp
.mask
= LVGF_ALIGN
| LVGF_GROUPID
| LVGF_HEADER
;
3794 _tcsncpy_s(groupname
, 1024, SVNSLC_IGNORECHANGELIST
, 1023);
3795 grp
.pszHeader
= groupname
;
3796 grp
.iGroupId
= groupindex
;
3797 grp
.uAlign
= LVGA_HEADER_LEFT
;
3798 it
->second
= InsertGroup(groupindex
, &grp
);
3805 void CGitStatusListCtrl::NotifyCheck()
3807 CWnd
* pParent
= GetLogicalParent();
3808 if (NULL
!= pParent
&& NULL
!= pParent
->GetSafeHwnd())
3810 pParent
->SendMessage(GITSLNM_CHECKCHANGED
, m_nSelected
);
3814 int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash
,CTGitPathList
*list
)
3819 m_CurrentVersion
=hash
;
3825 count
= list
->GetCount();
3827 CString head
= _T("HEAD");
3829 head
= _T("HEAD~1");
3831 if(hash
== GIT_REV_ZERO
)
3833 for (int i
= 0; i
< count
; ++i
)
3838 if(!g_Git
.IsInitRepos())
3840 // also list staged files which will be in the commit
3841 cmd
=(_T("git.exe diff-index --cached --raw ") + head
+ _T(" --numstat -C -M -z --"));
3842 cmdList
+= cmd
+ _T("\n");
3843 g_Git
.Run(cmd
, &cmdout
);
3846 cmd
=(_T("git.exe diff-index --raw ") + head
+ _T(" --numstat -C -M -z --"));
3848 cmd
.Format(_T("git.exe diff-index --raw ") + head
+ _T(" --numstat -C -M -z -- \"%s\""),(*list
)[i
].GetGitPathString());
3849 cmdList
+= cmd
+ _T("\n");
3852 if(g_Git
.Run(cmd
, &cmdout
, &cmdErr
))
3854 int last
= cmdErr
.RevertFind(0,-1);
3856 g_Git
.StringAppend(&str
, &cmdErr
[last
+ 1], CP_UTF8
, (int)cmdErr
.size() - last
-1);
3857 CMessageBox::Show(NULL
, str
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
3860 out
.append(cmdout
, 0);
3862 else // Init Repository
3864 //We will list all added file for init repository because commit will comit these
3866 cmd
=_T("git.exe ls-files -s -t -z");
3867 cmdList
+= cmd
+ _T("\n");
3869 // cmd.Format(_T("git.exe ls-files -s -t -z -- \"%s\""),(*list)[i].GetGitPathString());
3871 g_Git
.Run(cmd
, &cmdout
);
3873 out
.append(cmdout
,0);
3879 if(g_Git
.IsInitRepos())
3881 if (m_StatusFileList
.ParserFromLsFile(out
))
3883 CString tempFile1
= GetTempFile();
3884 CFile
file1(tempFile1
, CFile::modeWrite
| CFile::typeBinary
);
3885 file1
.Write(out
.data(), (UINT
)out
.size());
3887 CString tempFile2
= GetTempFile();
3888 CFile
file2(tempFile2
, CFile::modeWrite
);
3889 file2
.Write(cmdList
, sizeof(TCHAR
) * cmdList
.GetLength());
3891 CMessageBox::Show(NULL
, _T("Parse ls-files failed!\nPlease inspect ") + tempFile1
+ _T("\nand ") + tempFile2
, _T("TortoiseGit"), MB_OK
);
3893 for (int i
= 0; i
< m_StatusFileList
.GetCount(); ++i
)
3894 ((CTGitPath
&)(m_StatusFileList
[i
])).m_Action
=CTGitPath::LOGACTIONS_ADDED
;
3897 this->m_StatusFileList
.ParserFromLog(out
);
3899 //handle delete conflict case, when remote : modified, local : deleted.
3900 for (int i
= 0; i
< count
; ++i
)
3906 cmd
=_T("git.exe ls-files -u -t -z");
3908 cmd
.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),(*list
)[i
].GetGitPathString());
3910 g_Git
.Run(cmd
, &cmdout
);
3912 CTGitPathList conflictlist
;
3913 conflictlist
.ParserFromLog(cmdout
);
3914 for (int i
= 0; i
< conflictlist
.GetCount(); ++i
)
3916 CTGitPath
*p
=m_StatusFileList
.LookForGitPath(conflictlist
[i
].GetGitPathString());
3918 p
->m_Action
|=CTGitPath::LOGACTIONS_UNMERGED
;
3920 m_StatusFileList
.AddPath(conflictlist
[i
]);
3924 // handle source files of file renames/moves (issue #860)
3925 // if a file gets renamed and the new file "git add"ed, diff-index doesn't list the source file anymore
3926 for (int i
= 0; i
< count
; ++i
)
3932 cmd
= _T("git.exe ls-files -d -z");
3934 cmd
.Format(_T("git.exe ls-files -d -z -- \"%s\""),(*list
)[i
].GetGitPathString());
3936 g_Git
.Run(cmd
, &cmdout
);
3938 CTGitPathList deletelist
;
3939 deletelist
.ParserFromLog(cmdout
, true);
3940 BOOL bDeleteChecked
= FALSE
;
3941 int deleteFromIndex
= 0;
3942 for (int i
= 0; i
< deletelist
.GetCount(); ++i
)
3944 CTGitPath
*p
= m_StatusFileList
.LookForGitPath(deletelist
[i
].GetGitPathString());
3946 m_StatusFileList
.AddPath(deletelist
[i
]);
3947 else if ((p
->m_Action
== CTGitPath::LOGACTIONS_ADDED
|| p
->m_Action
== CTGitPath::LOGACTIONS_REPLACED
) && !p
->Exists())
3949 if (!bDeleteChecked
)
3952 message
.Format(IDS_ASK_REMOVE_FROM_INDEX
, p
->GetWinPathString());
3953 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
);
3955 if (deleteFromIndex
== 1)
3957 g_Git
.Run(_T("git.exe rm -f --cache -- \"") + p
->GetWinPathString() + _T("\""), &cmdout
);
3958 m_StatusFileList
.RemoveItem(*p
);
3970 count
= list
->GetCount();
3972 for (int i
= 0; i
< count
; ++i
)
3977 cmd
.Format(_T("git.exe diff-tree --raw --numstat -C -M -z %s --"), hash
);
3979 cmd
.Format(_T("git.exe diff-tree --raw --numstat -C -M %s -z -- \"%s\""),hash
,(*list
)[i
].GetGitPathString());
3981 g_Git
.Run(cmd
, &cmdout
, NULL
);
3985 this->m_StatusFileList
.ParserFromLog(out
);
3989 for (int i
= 0; i
< m_StatusFileList
.GetCount(); ++i
)
3991 CTGitPath
* gitpatch
=(CTGitPath
*)&m_StatusFileList
[i
];
3992 gitpatch
->m_Checked
= TRUE
;
3993 m_arStatusArray
.push_back((CTGitPath
*)&m_StatusFileList
[i
]);
3996 this->m_bBusy
=FALSE
;
4000 int CGitStatusListCtrl::UpdateWithGitPathList(CTGitPathList
&list
)
4002 m_arStatusArray
.clear();
4003 for (int i
= 0; i
< list
.GetCount(); ++i
)
4005 CTGitPath
* gitpath
=(CTGitPath
*)&list
[i
];
4007 if(gitpath
->m_Action
& CTGitPath::LOGACTIONS_HIDE
)
4010 gitpath
->m_Checked
= TRUE
;
4011 m_arStatusArray
.push_back((CTGitPath
*)&list
[i
]);
4016 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList
&list
)
4018 m_UnRevFileList
= list
;
4019 for (int i
= 0; i
< m_UnRevFileList
.GetCount(); ++i
)
4021 CTGitPath
* gitpatch
=(CTGitPath
*)&m_UnRevFileList
[i
];
4022 gitpatch
->m_Checked
= FALSE
;
4023 m_arStatusArray
.push_back((CTGitPath
*)&m_UnRevFileList
[i
]);
4028 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList
*List
)
4031 if (m_UnRevFileList
.FillUnRev(CTGitPath::LOGACTIONS_UNVER
, List
, &err
))
4033 CMessageBox::Show(NULL
, _T("Failed to get UnRev file list\n") + err
, _T("TortoiseGit"), MB_OK
);
4037 for (int i
= 0; i
< m_UnRevFileList
.GetCount(); ++i
)
4039 CTGitPath
* gitpatch
=(CTGitPath
*)&m_UnRevFileList
[i
];
4040 gitpatch
->m_Checked
= FALSE
;
4041 m_arStatusArray
.push_back((CTGitPath
*)&m_UnRevFileList
[i
]);
4046 int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList
*List
)
4049 if (m_IgnoreFileList
.FillUnRev(CTGitPath::LOGACTIONS_IGNORE
, List
, &err
))
4051 CMessageBox::Show(NULL
, _T("Failed to get Ignore file list\n") + err
, _T("TortoiseGit"), MB_OK
);
4055 for (int i
= 0; i
< m_IgnoreFileList
.GetCount(); ++i
)
4057 CTGitPath
* gitpatch
=(CTGitPath
*)&m_IgnoreFileList
[i
];
4058 gitpatch
->m_Checked
= FALSE
;
4059 m_arStatusArray
.push_back((CTGitPath
*)&m_IgnoreFileList
[i
]);
4064 int CGitStatusListCtrl::UpdateLocalChangesIgnoredFileList(CTGitPathList
*list
)
4066 m_LocalChangesIgnoredFileList
.FillBasedOnIndexFlags(GIT_IDXENTRY_VALID
| GIT_IDXENTRY_SKIP_WORKTREE
, list
);
4067 for (int i
= 0; i
< m_LocalChangesIgnoredFileList
.GetCount(); ++i
)
4069 CTGitPath
* gitpatch
= (CTGitPath
*)&m_LocalChangesIgnoredFileList
[i
];
4070 gitpatch
->m_Checked
= FALSE
;
4071 m_arStatusArray
.push_back((CTGitPath
*)&m_LocalChangesIgnoredFileList
[i
]);
4076 int CGitStatusListCtrl::UpdateFileList(int mask
,bool once
,CTGitPathList
*List
)
4078 if(mask
&CGitStatusListCtrl::FILELIST_MODIFY
)
4080 if(once
|| (!(m_FileLoaded
&CGitStatusListCtrl::FILELIST_MODIFY
)))
4082 UpdateFileList(git_revnum_t(GIT_REV_ZERO
),List
);
4083 m_FileLoaded
|=CGitStatusListCtrl::FILELIST_MODIFY
;
4086 if (mask
& CGitStatusListCtrl::FILELIST_UNVER
|| mask
& CGitStatusListCtrl::FILELIST_IGNORE
)
4088 if(once
|| (!(m_FileLoaded
&CGitStatusListCtrl::FILELIST_UNVER
)))
4090 UpdateUnRevFileList(List
);
4091 m_FileLoaded
|=CGitStatusListCtrl::FILELIST_UNVER
;
4093 if(mask
&CGitStatusListCtrl::FILELIST_IGNORE
&& (once
|| (!(m_FileLoaded
&CGitStatusListCtrl::FILELIST_IGNORE
))))
4095 UpdateIgnoreFileList(List
);
4096 m_FileLoaded
|= CGitStatusListCtrl::FILELIST_IGNORE
;
4099 if (mask
& CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED
&& (once
|| (!(m_FileLoaded
& CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED
))))
4101 UpdateLocalChangesIgnoredFileList(List
);
4102 m_FileLoaded
|= CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED
;
4107 void CGitStatusListCtrl::Clear()
4110 this->DeleteAllItems();
4111 this->m_arListArray
.clear();
4112 this->m_arStatusArray
.clear();
4113 this->m_changelists
.clear();
4116 bool CGitStatusListCtrl::CheckMultipleDiffs()
4118 UINT selCount
= GetSelectedCount();
4119 if (selCount
> max(3, (DWORD
)CRegDWORD(_T("Software\\TortoiseGit\\NumDiffWarning"), 10)))
4122 message
.Format(CString(MAKEINTRESOURCE(IDS_STATUSLIST_WARN_MAXDIFF
)), selCount
);
4123 return ::MessageBox(GetSafeHwnd(), message
, _T("TortoiseGit"), MB_YESNO
| MB_ICONQUESTION
) == IDYES
;
4127 //////////////////////////////////////////////////////////////////////////
4129 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC
* pFmtEtc
, STGMEDIUM
& medium
, DWORD
* /*pdwEffect*/, POINTL pt
)
4131 if(pFmtEtc
->cfFormat
== CF_HDROP
&& medium
.tymed
== TYMED_HGLOBAL
)
4133 HDROP hDrop
= (HDROP
)GlobalLock(medium
.hGlobal
);
4136 TCHAR szFileName
[MAX_PATH
] = {0};
4138 UINT cFiles
= DragQueryFile(hDrop
, 0xFFFFFFFF, NULL
, 0);
4141 clientpoint
.x
= pt
.x
;
4142 clientpoint
.y
= pt
.y
;
4143 ScreenToClient(m_hTargetWnd
, &clientpoint
);
4144 if ((m_pSVNStatusListCtrl
->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl
->GetGroupFromPoint(&clientpoint
) >= 0))
4146 CTSVNPathList changelistItems
;
4147 for(UINT i
= 0; i
< cFiles
; ++i
)
4149 DragQueryFile(hDrop
, i
, szFileName
, sizeof(szFileName
));
4150 changelistItems
.AddPath(CTSVNPath(szFileName
));
4152 // find the changelist name
4153 CString sChangelist
;
4154 LONG_PTR nGroup
= m_pSVNStatusListCtrl
->GetGroupFromPoint(&clientpoint
);
4155 for (std::map
<CString
, int>::iterator it
= m_pSVNStatusListCtrl
->m_changelists
.begin(); it
!= m_pSVNStatusListCtrl
->m_changelists
.end(); ++it
)
4156 if (it
->second
== nGroup
)
4157 sChangelist
= it
->first
;
4158 if (!sChangelist
.IsEmpty())
4161 if (git
.AddToChangeList(changelistItems
, sChangelist
, git_depth_empty
))
4163 for (int l
=0; l
<changelistItems
.GetCount(); ++l
)
4165 int index
= m_pSVNStatusListCtrl
->GetIndex(changelistItems
[l
]);
4168 CSVNStatusListCtrl::FileEntry
* e
= m_pSVNStatusListCtrl
->GetListEntry(index
);
4171 e
->changelist
= sChangelist
;
4174 if (m_pSVNStatusListCtrl
->m_changelists
.find(e
->changelist
)!=m_pSVNStatusListCtrl
->m_changelists
.end())
4175 m_pSVNStatusListCtrl
->SetItemGroup(index
, m_pSVNStatusListCtrl
->m_changelists
[e
->changelist
]);
4177 m_pSVNStatusListCtrl
->SetItemGroup(index
, 0);
4183 HWND hParentWnd
= GetParent(m_hTargetWnd
);
4184 if (hParentWnd
!= NULL
)
4185 ::SendMessage(hParentWnd
, CSVNStatusListCtrl::SVNSLNM_ADDFILE
, 0, (LPARAM
)changelistItems
[l
].GetWinPath());
4191 CMessageBox::Show(m_pSVNStatusListCtrl
->m_hWnd
, git
.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR
);
4197 if (git
.RemoveFromChangeList(changelistItems
, CStringArray(), git_depth_empty
))
4199 for (int l
=0; l
<changelistItems
.GetCount(); ++l
)
4201 int index
= m_pSVNStatusListCtrl
->GetIndex(changelistItems
[l
]);
4204 CSVNStatusListCtrl::FileEntry
* e
= m_pSVNStatusListCtrl
->GetListEntry(index
);
4207 e
->changelist
= sChangelist
;
4208 m_pSVNStatusListCtrl
->SetItemGroup(index
, 0);
4213 HWND hParentWnd
= GetParent(m_hTargetWnd
);
4214 if (hParentWnd
!= NULL
)
4215 ::SendMessage(hParentWnd
, CSVNStatusListCtrl::SVNSLNM_ADDFILE
, 0, (LPARAM
)changelistItems
[l
].GetWinPath());
4221 CMessageBox::Show(m_pSVNStatusListCtrl
->m_hWnd
, git
.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR
);
4227 for(UINT i
= 0; i
< cFiles
; ++i
)
4229 DragQueryFile(hDrop
, i
, szFileName
, sizeof(szFileName
));
4230 HWND hParentWnd
= GetParent(m_hTargetWnd
);
4231 if (hParentWnd
!= NULL
)
4232 ::SendMessage(hParentWnd
, CSVNStatusListCtrl::SVNSLNM_ADDFILE
, 0, (LPARAM
)szFileName
);
4236 GlobalUnlock(medium
.hGlobal
);
4238 return true; //let base free the medium
4240 HRESULT STDMETHODCALLTYPE
CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState
, POINTL pt
, DWORD __RPC_FAR
*pdwEffect
)
4242 CIDropTarget::DragOver(grfKeyState
, pt
, pdwEffect
);
4243 *pdwEffect
= DROPEFFECT_COPY
;
4244 if (m_pSVNStatusListCtrl
)
4247 clientpoint
.x
= pt
.x
;
4248 clientpoint
.y
= pt
.y
;
4249 ScreenToClient(m_hTargetWnd
, &clientpoint
);
4250 if ((m_pSVNStatusListCtrl
->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl
->GetGroupFromPoint(&clientpoint
) >= 0))
4252 *pdwEffect
= DROPEFFECT_MOVE
;
4254 else if ((!m_pSVNStatusListCtrl
->m_bFileDropsEnabled
)||(m_pSVNStatusListCtrl
->m_bOwnDrag
))
4256 *pdwEffect
= DROPEFFECT_NONE
;
4264 void CGitStatusListCtrl::FilesExport()
4267 // export all changed files to a folder
4268 CBrowseFolder browseFolder
;
4269 browseFolder
.m_style
= BIF_EDITBOX
| BIF_NEWDIALOGSTYLE
| BIF_RETURNFSANCESTORS
| BIF_RETURNONLYFSDIRS
;
4270 if (browseFolder
.Show(GetSafeHwnd(), exportDir
) != CBrowseFolder::OK
)
4273 POSITION pos
= GetFirstSelectedItemPosition();
4275 while ((index
= GetNextSelectedItem(pos
)) >= 0)
4277 CTGitPath
*fd
= (CTGitPath
*)GetItemData(index
);
4278 // we cannot export directories or folders
4279 if (fd
->m_Action
== CTGitPath::LOGACTIONS_DELETED
|| fd
->IsDirectory())
4282 CAppUtils::CreateMultipleDirectory(exportDir
+ _T("\\") + fd
->GetContainingDirectory().GetWinPathString());
4283 CString filename
= exportDir
+ _T("\\") + fd
->GetWinPathString();
4284 if (m_CurrentVersion
== GIT_REV_ZERO
)
4286 if (!CopyFile(g_Git
.m_CurrentDir
+ _T("\\") + fd
->GetWinPath(), filename
, false))
4288 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
4294 if (g_Git
.GetOneFile(m_CurrentVersion
, *fd
, filename
))
4297 out
.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED
, fd
->GetGitPathString(), m_CurrentVersion
, filename
);
4298 if (CMessageBox::Show(NULL
, out
, _T("TortoiseGit"), 2, IDI_WARNING
, CString(MAKEINTRESOURCE(IDS_IGNOREBUTTON
)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON
))) == 2)
4305 void CGitStatusListCtrl::FileSaveAs(CTGitPath
*path
)
4308 filename
.Format(_T("%s-%s%s"), path
->GetBaseFilename(), this->m_CurrentVersion
.Left(g_Git
.GetShortHASHLength()), path
->GetFileExtension());
4309 CFileDialog
dlg(FALSE
,NULL
,
4311 OFN_HIDEREADONLY
| OFN_OVERWRITEPROMPT
,
4313 CString currentpath
;
4314 currentpath
= g_Git
.m_CurrentDir
+ _T("\\") + path
->GetContainingDirectory().GetWinPath();
4316 dlg
.m_ofn
.lpstrInitialDir
=currentpath
.GetBuffer();
4319 INT_PTR ret
= dlg
.DoModal();
4320 SetCurrentDirectory(g_Git
.m_CurrentDir
);
4323 filename
= dlg
.GetPathName();
4324 if(m_CurrentVersion
== GIT_REV_ZERO
)
4326 if(!CopyFile(g_Git
.m_CurrentDir
+_T("\\") + path
->GetWinPath(),filename
,false))
4328 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
4335 if(g_Git
.GetOneFile(m_CurrentVersion
,*path
,filename
))
4337 out
.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED
, path
->GetGitPathString(), m_CurrentVersion
, filename
);
4338 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
4346 int CGitStatusListCtrl::RevertSelectedItemToVersion(bool parent
)
4348 if(this->m_CurrentVersion
.IsEmpty())
4350 if(this->m_CurrentVersion
== GIT_REV_ZERO
)
4353 POSITION pos
= GetFirstSelectedItemPosition();
4356 std::map
<CString
, int> versionMap
;
4357 while ((index
= GetNextSelectedItem(pos
)) >= 0)
4359 CTGitPath
*fentry
=(CTGitPath
*)GetItemData(index
);
4363 int parentNo
= fentry
->m_ParentNo
& PARENT_MASK
;
4365 ref
.Format(_T("%s^%d"), m_CurrentVersion
, parentNo
+ 1);
4367 if (g_Git
.GetHash(hash
, ref
))
4369 MessageBox(g_Git
.GetGitLastErr(_T("Could not get hash of ref \"") + ref
+ _T("\".")), _T("TortoiseGit"), MB_ICONERROR
);
4373 version
= hash
.ToString();
4376 version
= m_CurrentVersion
;
4378 cmd
.Format(_T("git.exe checkout %s -- \"%s\""), version
, fentry
->GetGitPathString());
4380 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
4382 if (MessageBox(out
, _T("TortoiseGit"), MB_ICONEXCLAMATION
| MB_OKCANCEL
) == IDCANCEL
)
4386 versionMap
[version
]++;
4390 for (auto it
= versionMap
.begin(); it
!= versionMap
.end(); ++it
)
4392 CString versionEntry
;
4393 versionEntry
.Format(IDS_STATUSLIST_FILESREVERTED
, it
->second
, it
->first
);
4394 out
+= versionEntry
+ _T("\r\n");
4396 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
4400 void CGitStatusListCtrl::OpenFile(CTGitPath
*filepath
,int mode
)
4403 if(this->m_CurrentVersion
.IsEmpty() || m_CurrentVersion
== GIT_REV_ZERO
)
4405 file
= g_Git
.m_CurrentDir
+ _T("\\") + filepath
->GetWinPath();
4410 GetTempPath(temppath
);
4411 TCHAR szTempName
[MAX_PATH
] = {0};
4412 GetTempFileName(temppath
, filepath
->GetBaseFilename(), 0, szTempName
);
4413 CString
temp(szTempName
);
4414 DeleteFile(szTempName
);
4415 CreateDirectory(szTempName
, NULL
);
4416 file
.Format(_T("%s\\%s_%s%s"),
4418 filepath
->GetBaseFilename(),
4419 m_CurrentVersion
.Left(g_Git
.GetShortHASHLength()),
4420 filepath
->GetFileExtension());
4422 if(g_Git
.GetOneFile(m_CurrentVersion
, *filepath
, file
))
4424 out
.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED
, filepath
->GetGitPathString(), m_CurrentVersion
, file
);
4425 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
4428 SetFileAttributes(file
, FILE_ATTRIBUTE_READONLY
);
4430 if(mode
== ALTERNATIVEEDITOR
)
4432 CAppUtils::LaunchAlternativeEditor(file
);
4435 int ret
= HINSTANCE_ERROR
;
4439 ret
= (int)ShellExecute(this->m_hWnd
, NULL
,file
, NULL
, NULL
, SW_SHOW
);
4441 if (ret
> HINSTANCE_ERROR
)
4448 CString cmd
= _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
4450 CAppUtils::LaunchApplication(cmd
, NULL
, false);
4454 void CGitStatusListCtrl::DeleteSelectedFiles()
4457 std::vector
<int> selectIndex
;
4459 POSITION pos
= GetFirstSelectedItemPosition();
4461 while ((index
= GetNextSelectedItem(pos
)) >= 0)
4463 selectIndex
.push_back(index
);
4466 //Create file-list ('\0' separated) for SHFileOperation
4468 for (size_t i
= 0; i
< selectIndex
.size(); ++i
)
4470 index
= selectIndex
[i
];
4472 CTGitPath
* path
=(CTGitPath
*)GetItemData(index
);
4474 if (path
== nullptr)
4477 filelist
+= path
->GetWinPathString();
4478 filelist
+= _T("|");
4480 filelist
+= _T("|");
4481 int len
= filelist
.GetLength();
4482 std::unique_ptr
<TCHAR
[]> buf(new TCHAR
[len
+ 2]);
4483 _tcscpy_s(buf
.get(), len
+ 2, filelist
);
4484 CStringUtils::PipesToNulls(buf
.get(), len
+ 2);
4485 SHFILEOPSTRUCT fileop
;
4486 fileop
.hwnd
= this->m_hWnd
;
4487 fileop
.wFunc
= FO_DELETE
;
4488 fileop
.pFrom
= buf
.get();
4490 fileop
.fFlags
= FOF_NO_CONNECTED_ELEMENTS
| ((GetAsyncKeyState(VK_SHIFT
) & 0x8000) ? 0 : FOF_ALLOWUNDO
);
4491 fileop
.lpszProgressTitle
= _T("deleting file");
4492 int result
= SHFileOperation(&fileop
);
4494 if ((result
== 0) && (!fileop
.fAnyOperationsAborted
))
4497 POSITION pos
= NULL
;
4498 while ((pos
= GetFirstSelectedItemPosition()) != 0)
4500 int index
= GetNextSelectedItem(pos
);
4501 if (GetCheck(index
))
4505 RemoveListEntry(index
);