?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Fix possible problems with "intend to add" staged files
[TortoiseGit.git] / src / Git / GitStatusListCtrl.cpp
blob61a275200372348006095d713138455f10f3fb02
1 // TortoiseGit - a Windows shell extension for easy version control
2
3 // Copyright (C) 2008-2016 - TortoiseGit
4 // Copyright (C) 2003-2008, 2013-2015 - TortoiseSVN
5
6 // This program is free software; you can redistribute it and/or
7 // modify it under the terms of the GNU General Public License
8 // as published by the Free Software Foundation; either version 2
9 // of the License, or (at your option) any later version.
10
11 // This program is distributed in the hope that it will be useful,
12 // but WITHOUT ANY WARRANTY; without even the implied warranty of
13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 // GNU General Public License for more details.
15
16 // You should have received a copy of the GNU General Public License
17 // along with this program; if not, write to the Free Software Foundation,
18 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19 //
20
21 #include "stdafx.h"
22 #include "resource.h"
23 #include "..\\TortoiseShell\resource.h"
24 #include "GitStatusListCtrl.h"
25 #include "MessageBox.h"
26 #include "MyMemDC.h"
27 #include "UnicodeUtils.h"
28 #include "AppUtils.h"
29 #include "PathUtils.h"
30 #include "TempFile.h"
31 #include "StringUtils.h"
32 #include "LoglistUtils.h"
33 #include "Git.h"
34 #include "GitDiff.h"
35 #include "GitProgressDlg.h"
36 #include "SysImageList.h"
37 #include "TGitPath.h"
38 #include "registry.h"
39 #include "InputDlg.h"
40 #include "GitAdminDir.h"
41 #include "DropFiles.h"
42 #include "ProgressCommands/AddProgressCommand.h"
43 #include "IconMenu.h"
44 #include "FormatMessageWrapper.h"
45 #include "BrowseFolder.h"
46
47 const UINT CGitStatusListCtrl::GITSLNM_ITEMCOUNTCHANGED
48 = ::RegisterWindowMessage(_T("GITSLNM_ITEMCOUNTCHANGED"));
49 const UINT CGitStatusListCtrl::GITSLNM_NEEDSREFRESH
50 = ::RegisterWindowMessage(_T("GITSLNM_NEEDSREFRESH"));
51 const UINT CGitStatusListCtrl::GITSLNM_ADDFILE
52 = ::RegisterWindowMessage(_T("GITSLNM_ADDFILE"));
53 const UINT CGitStatusListCtrl::GITSLNM_CHECKCHANGED
54 = ::RegisterWindowMessage(_T("GITSLNM_CHECKCHANGED"));
55 const UINT CGitStatusListCtrl::GITSLNM_ITEMCHANGED
56 = ::RegisterWindowMessage(_T("GITSLNM_ITEMCHANGED"));
57
58 struct icompare
59 {
60 bool operator() (const std::wstring& lhs, const std::wstring& rhs) const
61 {
62 // no logical comparison here: we need this sorted strictly
63 return _wcsicmp(lhs.c_str(), rhs.c_str()) < 0;
64 }
65 };
66
67 class CIShellFolderHook : public IShellFolder
68 {
69 public:
70 CIShellFolderHook(LPSHELLFOLDER sf, const CTGitPathList& pathlist)
71 {
72 sf->AddRef();
73 m_iSF = sf;
74 // it seems the paths in the HDROP need to be sorted, otherwise
75 // it might not work properly or even crash.
76 // to get the items sorted, we just add them to a set
77 for (int i = 0; i < pathlist.GetCount(); ++i)
78 sortedpaths.insert((LPCTSTR)g_Git.CombinePath(pathlist[i].GetWinPath()));
79 }
80
81 ~CIShellFolderHook() { m_iSF->Release(); }
82
83 // IUnknown methods --------
84 virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID riid, __RPC__deref_out void **ppvObject) { return m_iSF->QueryInterface(riid, ppvObject); }
85 virtual ULONG STDMETHODCALLTYPE AddRef(void) { return m_iSF->AddRef(); }
86 virtual ULONG STDMETHODCALLTYPE Release(void) { return m_iSF->Release(); }
87
88 // IShellFolder methods ----
89 virtual HRESULT STDMETHODCALLTYPE GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT *rgfReserved, void **ppv);
90
91 virtual HRESULT STDMETHODCALLTYPE CompareIDs(LPARAM lParam, __RPC__in PCUIDLIST_RELATIVE pidl1, __RPC__in PCUIDLIST_RELATIVE pidl2) { return m_iSF->CompareIDs(lParam, pidl1, pidl2); }
92 virtual HRESULT STDMETHODCALLTYPE GetDisplayNameOf(__RPC__in_opt PCUITEMID_CHILD pidl, SHGDNF uFlags, __RPC__out STRRET *pName) { return m_iSF->GetDisplayNameOf(pidl, uFlags, pName); }
93 virtual HRESULT STDMETHODCALLTYPE CreateViewObject(__RPC__in_opt HWND hwndOwner, __RPC__in REFIID riid, __RPC__deref_out_opt void **ppv) { return m_iSF->CreateViewObject(hwndOwner, riid, ppv); }
94 virtual HRESULT STDMETHODCALLTYPE EnumObjects(__RPC__in_opt HWND hwndOwner, SHCONTF grfFlags, __RPC__deref_out_opt IEnumIDList **ppenumIDList) { return m_iSF->EnumObjects(hwndOwner, grfFlags, ppenumIDList); }
95 virtual HRESULT STDMETHODCALLTYPE BindToObject(__RPC__in PCUIDLIST_RELATIVE pidl, __RPC__in_opt IBindCtx *pbc, __RPC__in REFIID riid, __RPC__deref_out_opt void **ppv) { return m_iSF->BindToObject(pidl, pbc, riid, ppv); }
96 virtual HRESULT STDMETHODCALLTYPE ParseDisplayName(__RPC__in_opt HWND hwnd, __RPC__in_opt IBindCtx *pbc, __RPC__in_string LPWSTR pszDisplayName, __reserved ULONG *pchEaten, __RPC__deref_out_opt PIDLIST_RELATIVE *ppidl, __RPC__inout_opt ULONG *pdwAttributes) { return m_iSF->ParseDisplayName(hwnd, pbc, pszDisplayName, pchEaten, ppidl, pdwAttributes); }
97 virtual HRESULT STDMETHODCALLTYPE GetAttributesOf(UINT cidl, __RPC__in_ecount_full_opt(cidl) PCUITEMID_CHILD_ARRAY apidl, __RPC__inout SFGAOF *rgfInOut) { return m_iSF->GetAttributesOf(cidl, apidl, rgfInOut); }
98 virtual HRESULT STDMETHODCALLTYPE BindToStorage(__RPC__in PCUIDLIST_RELATIVE pidl, __RPC__in_opt IBindCtx *pbc, __RPC__in REFIID riid, __RPC__deref_out_opt void **ppv) { return m_iSF->BindToStorage(pidl, pbc, riid, ppv); }
99 virtual HRESULT STDMETHODCALLTYPE SetNameOf(__in_opt HWND hwnd, __in PCUITEMID_CHILD pidl, __in LPCWSTR pszName, __in SHGDNF uFlags, __deref_opt_out PITEMID_CHILD *ppidlOut) { return m_iSF->SetNameOf(hwnd, pidl, pszName, uFlags, ppidlOut); }
100
101 protected:
102 LPSHELLFOLDER m_iSF;
103 std::set<std::wstring, icompare> sortedpaths;
104 };
105
106 HRESULT STDMETHODCALLTYPE CIShellFolderHook::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT *rgfReserved, void **ppv)
107 {
108 if (InlineIsEqualGUID(riid, IID_IDataObject))
109 {
110 HRESULT hres = m_iSF->GetUIObjectOf(hwndOwner, cidl, apidl, IID_IDataObject, NULL, ppv);
111 if (FAILED(hres))
112 return hres;
113
114 IDataObject * idata = (LPDATAOBJECT)(*ppv);
115 // the IDataObject returned here doesn't have a HDROP, so we create one ourselves and add it to the IDataObject
116 // the HDROP is necessary for most context menu handlers
117 int nLength = 0;
118 for (auto it = sortedpaths.cbegin(); it != sortedpaths.cend(); ++it)
119 {
120 nLength += (int)it->size();
121 nLength += 1; // '\0' separator
122 }
123 int nBufferSize = sizeof(DROPFILES) + ((nLength + 5)*sizeof(TCHAR));
124 auto pBuffer = std::make_unique<char[]>(nBufferSize);
125 SecureZeroMemory(pBuffer.get(), nBufferSize);
126 DROPFILES* df = (DROPFILES*)pBuffer.get();
127 df->pFiles = sizeof(DROPFILES);
128 df->fWide = 1;
129 TCHAR* pFilenames = (TCHAR*)((BYTE*)(pBuffer.get()) + sizeof(DROPFILES));
130 TCHAR* pCurrentFilename = pFilenames;
131
132 for (auto it = sortedpaths.cbegin(); it != sortedpaths.cend(); ++it)
133 {
134 wcscpy_s(pCurrentFilename, it->size() + 1, it->c_str());
135 pCurrentFilename += it->size();
136 *pCurrentFilename = '\0'; // separator between file names
137 pCurrentFilename++;
138 }
139 *pCurrentFilename = '\0'; // terminate array
140 pCurrentFilename++;
141 *pCurrentFilename = '\0'; // terminate array
142 STGMEDIUM medium = { 0 };
143 medium.tymed = TYMED_HGLOBAL;
144 medium.hGlobal = GlobalAlloc(GMEM_ZEROINIT | GMEM_MOVEABLE, nBufferSize + 20);
145 if (medium.hGlobal)
146 {
147 LPVOID pMem = ::GlobalLock(medium.hGlobal);
148 if (pMem)
149 {
150 memcpy(pMem, pBuffer.get(), nBufferSize);
151 GlobalUnlock(medium.hGlobal);
152 FORMATETC formatetc = { 0 };
153 formatetc.cfFormat = CF_HDROP;
154 formatetc.dwAspect = DVASPECT_CONTENT;
155 formatetc.lindex = -1;
156 formatetc.tymed = TYMED_HGLOBAL;
157 medium.pUnkForRelease = nullptr;
158 hres = idata->SetData(&formatetc, &medium, TRUE);
159 return hres;
160 }
161 }
162 return E_OUTOFMEMORY;
163 }
164 else
165 {
166 // just pass it on to the base object
167 return m_iSF->GetUIObjectOf(hwndOwner, cidl, apidl, riid, rgfReserved, ppv);
168 }
169 }
170
171 IContextMenu2 * g_IContext2 = nullptr;
172 IContextMenu3 * g_IContext3 = nullptr;
173 CIShellFolderHook * g_pFolderhook = nullptr;
174 IShellFolder * g_psfDesktopFolder = nullptr;
175 LPITEMIDLIST * g_pidlArray = nullptr;
176 int g_pidlArrayItems = 0;
177
178 #define SHELL_MIN_CMD 10000
179 #define SHELL_MAX_CMD 20000
180
181 HRESULT CALLBACK dfmCallback(IShellFolder * /*psf*/, HWND /*hwnd*/, IDataObject * /*pdtobj*/, UINT uMsg, WPARAM /*wParam*/, LPARAM /*lParam*/)
182 {
183 switch (uMsg)
184 {
185 case DFM_MERGECONTEXTMENU:
186 return S_OK;
187 case DFM_INVOKECOMMAND:
188 case DFM_INVOKECOMMANDEX:
189 case DFM_GETDEFSTATICID: // Required for Windows 7 to pick a default
190 return S_FALSE;
191 }
192 return E_NOTIMPL;
193 }
194
195 BEGIN_MESSAGE_MAP(CGitStatusListCtrl, CListCtrl)
196 ON_NOTIFY(HDN_ITEMCLICKA, 0, OnHdnItemclick)
197 ON_NOTIFY(HDN_ITEMCLICKW, 0, OnHdnItemclick)
198 ON_NOTIFY(HDN_ENDTRACK, 0, OnColumnResized)
199 ON_NOTIFY(HDN_ENDDRAG, 0, OnColumnMoved)
200 ON_NOTIFY_REFLECT_EX(LVN_ITEMCHANGED, OnLvnItemchanged)
201 ON_WM_CONTEXTMENU()
202 ON_NOTIFY_REFLECT(NM_DBLCLK, OnNMDblclk)
203 ON_NOTIFY_REFLECT(LVN_GETINFOTIP, OnLvnGetInfoTip)
204 ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, OnNMCustomdraw)
205 ON_WM_SETCURSOR()
206 ON_WM_GETDLGCODE()
207 ON_NOTIFY_REFLECT(NM_RETURN, OnNMReturn)
208 ON_WM_KEYDOWN()
209 ON_WM_PAINT()
210 ON_NOTIFY(HDN_BEGINTRACKA, 0, &CGitStatusListCtrl::OnHdnBegintrack)
211 ON_NOTIFY(HDN_BEGINTRACKW, 0, &CGitStatusListCtrl::OnHdnBegintrack)
212 ON_NOTIFY(HDN_ITEMCHANGINGA, 0, &CGitStatusListCtrl::OnHdnItemchanging)
213 ON_NOTIFY(HDN_ITEMCHANGINGW, 0, &CGitStatusListCtrl::OnHdnItemchanging)
214 ON_WM_DESTROY()
215 ON_NOTIFY_REFLECT(LVN_BEGINDRAG, OnBeginDrag)
216 ON_NOTIFY_REFLECT(LVN_ITEMCHANGING, &CGitStatusListCtrl::OnLvnItemchanging)
217 END_MESSAGE_MAP()
218
219
220
221 CGitStatusListCtrl::CGitStatusListCtrl() : CListCtrl()
222 //, m_HeadRev(GitRev::REV_HEAD)
223 , m_pbCanceled(NULL)
224 , m_pStatLabel(NULL)
225 , m_pSelectButton(NULL)
226 , m_pConfirmButton(NULL)
227 , m_bBusy(false)
228 , m_bEmpty(false)
229 , m_bShowIgnores(false)
230 , m_pDropTarget(NULL)
231 , m_bIgnoreRemoveOnly(false)
232 , m_bCheckChildrenWithParent(false)
233 , m_bUnversionedLast(true)
234 , m_bHasChangeLists(false)
235 , m_bHasLocks(false)
236 , m_bBlock(false)
237 , m_bBlockUI(false)
238 , m_bHasCheckboxes(false)
239 , m_bCheckIfGroupsExist(true)
240 , m_bFileDropsEnabled(false)
241 , m_bOwnDrag(false)
242 , m_dwDefaultColumns(0)
243 , m_ColumnManager(this)
244 , m_bAscending(false)
245 , m_nSortedColumn(-1)
246 , m_bHasExternalsFromDifferentRepos(false)
247 , m_sNoPropValueText(MAKEINTRESOURCE(IDS_STATUSLIST_NOPROPVALUE))
248 , m_amend(false)
249 , m_bDoNotAutoselectSubmodules(false)
250 , m_bNoAutoselectMissing(false)
251 , m_bHasWC(true)
252 , m_hwndLogicalParent(NULL)
253 , m_bHasUnversionedItems(FALSE)
254 , m_nTargetCount(0)
255 , m_bHasExternals(false)
256 , m_bHasIgnoreGroup(false)
257 , m_nUnversioned(0)
258 , m_nNormal(0)
259 , m_nModified(0)
260 , m_nAdded(0)
261 , m_nDeleted(0)
262 , m_nConflicted(0)
263 , m_nTotal(0)
264 , m_nSelected(0)
265 , m_nRenamed(0)
266 , m_nShownUnversioned(0)
267 , m_nShownModified(0)
268 , m_nShownAdded(0)
269 , m_nShownDeleted(0)
270 , m_nShownConflicted(0)
271 , m_nShownFiles(0)
272 , m_nShownSubmodules(0)
273 , m_dwShow(0)
274 , m_bShowFolders(false)
275 , m_bUpdate(false)
276 , m_dwContextMenus(0)
277 , m_nIconFolder(0)
278 , m_nRestoreOvl(0)
279 , m_pContextMenu(nullptr)
280 , m_hShellMenu(nullptr)
281 {
282 m_FileLoaded=0;
283 m_dwDefaultColumns = 0;
284 m_critSec.Init();
285 m_bIsRevertTheirMy = false;
286 m_bNoAutoselectMissing = CRegDWORD(L"Software\\TortoiseGit\\AutoselectMissingFiles", FALSE) == TRUE;
287 this->m_nLineAdded =this->m_nLineDeleted =0;
288 }
289
290 CGitStatusListCtrl::~CGitStatusListCtrl()
291 {
292 // if (m_pDropTarget)
293 // delete m_pDropTarget;
294 ClearStatusArray();
295 }
296
297 void CGitStatusListCtrl::ClearStatusArray()
298 {
299 #if 0
300 Locker lock(m_critSec);
301 for (size_t i = 0; i < m_arStatusArray.size(); ++i)
302 {
303 delete m_arStatusArray[i];
304 }
305 m_arStatusArray.clear();
306 #endif
307 }
308
309 void CGitStatusListCtrl::Init(DWORD dwColumns, const CString& sColumnInfoContainer, unsigned __int64 dwContextMenus /* = GitSLC_POPALL */, bool bHasCheckboxes /* = true */, bool bHasWC /* = true */, DWORD allowedColumns /* = 0xffffffff */)
310 {
311 Locker lock(m_critSec);
312
313 m_dwDefaultColumns = dwColumns | 1;
314 m_dwContextMenus = dwContextMenus;
315 m_bHasCheckboxes = bHasCheckboxes;
316 m_bHasWC = bHasWC;
317
318 // set the extended style of the listcontrol
319 // 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.
320 CRegDWORD regFullRowSelect(_T("Software\\TortoiseGit\\FullRowSelect"), TRUE);
321 DWORD exStyle = LVS_EX_HEADERDRAGDROP | LVS_EX_DOUBLEBUFFER | LVS_EX_INFOTIP | LVS_EX_SUBITEMIMAGES;
322 if (DWORD(regFullRowSelect))
323 exStyle |= LVS_EX_FULLROWSELECT;
324 exStyle |= (bHasCheckboxes ? LVS_EX_CHECKBOXES : 0);
325 SetRedraw(false);
326 SetExtendedStyle(exStyle);
327
328 SetWindowTheme(m_hWnd, L"Explorer", NULL);
329
330 m_nIconFolder = SYS_IMAGE_LIST().GetDirIconIndex();
331 m_nRestoreOvl = SYS_IMAGE_LIST().AddIcon((HICON)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_RESTOREOVL), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE));
332 SYS_IMAGE_LIST().SetOverlayImage(m_nRestoreOvl, OVL_RESTORE);
333 SetImageList(&SYS_IMAGE_LIST(), LVSIL_SMALL);
334
335 // keep CSorter::operator() in sync!!
336 static UINT standardColumnNames[GITSLC_NUMCOLUMNS]
337 = { IDS_STATUSLIST_COLFILE
338 , IDS_STATUSLIST_COLFILENAME
339 , IDS_STATUSLIST_COLEXT
340 , IDS_STATUSLIST_COLSTATUS
341 , IDS_STATUSLIST_COLADD
342 , IDS_STATUSLIST_COLDEL
343 , IDS_STATUSLIST_COLLASTMODIFIED
344 , IDS_STATUSLIST_COLSIZE
345 };
346
347 m_ColumnManager.SetNames(standardColumnNames,GITSLC_NUMCOLUMNS);
348 m_ColumnManager.ReadSettings(m_dwDefaultColumns, 0xffffffff & ~(allowedColumns | m_dwDefaultColumns), sColumnInfoContainer, GITSLC_NUMCOLUMNS);
349
350 // enable file drops
351 #if 0
352 if (m_pDropTarget == NULL)
353 {
354 m_pDropTarget = new CGitStatusListCtrlDropTarget(this);
355 RegisterDragDrop(m_hWnd,m_pDropTarget);
356 // create the supported formats:
357 FORMATETC ftetc={0};
358 ftetc.dwAspect = DVASPECT_CONTENT;
359 ftetc.lindex = -1;
360 ftetc.tymed = TYMED_HGLOBAL;
361 ftetc.cfFormat=CF_HDROP;
362 m_pDropTarget->AddSuportedFormat(ftetc);
363 }
364 #endif
365
366 SetRedraw(true);
367 }
368
369 bool CGitStatusListCtrl::SetBackgroundImage(UINT nID)
370 {
371 return CAppUtils::SetListCtrlBackgroundImage(GetSafeHwnd(), nID);
372 }
373
374 BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList* pathList
375 , bool bUpdate /* = FALSE */
376 , bool bShowIgnores /* = false */
377 , bool bShowUnRev /* = false */
378 , bool bShowLocalChangesIgnored /* = false */)
379 {
380 m_bBusy = true;
381 m_bEmpty = false;
382 Invalidate();
383
384 m_bIsRevertTheirMy = g_Git.IsRebaseRunning() > 0;
385
386 Locker lock(m_critSec);
387 int mask= CGitStatusListCtrl::FILELIST_MODIFY;
388 if(bShowIgnores)
389 mask|= CGitStatusListCtrl::FILELIST_IGNORE;
390 if(bShowUnRev)
391 mask|= CGitStatusListCtrl::FILELIST_UNVER;
392 if (bShowLocalChangesIgnored)
393 mask |= CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED;
394 this->UpdateFileList(mask,bUpdate,(CTGitPathList*)pathList);
395
396 if (pathList && m_mapDirectFiles.empty())
397 {
398 // remember files which are selected by users so that those can be preselected
399 for (int i = 0; i < pathList->GetCount(); ++i)
400 if (!(*pathList)[i].IsDirectory())
401 m_mapDirectFiles[(*pathList)[i].GetGitPathString()] = true;
402 }
403
404 #if 0
405 int refetchcounter = 0;
406 BOOL bRet = TRUE;
407 Invalidate();
408 // force the cursor to change
409 POINT pt;
410 GetCursorPos(&pt);
411 SetCursorPos(pt.x, pt.y);
412
413 m_mapFilenameToChecked.clear();
414 //m_StatusUrlList.Clear();
415 bool bHasChangelists = (m_changelists.size() > 1 || (!m_changelists.empty() && !m_bHasIgnoreGroup));
416 m_changelists.clear();
417 for (size_t i=0; i < m_arStatusArray.size(); i++)
418 {
419 FileEntry * entry = m_arStatusArray[i];
420 if ( bHasChangelists && entry->checked)
421 {
422 // If change lists are present, remember all checked entries
423 CString path = entry->GetPath().GetGitPathString();
424 m_mapFilenameToChecked[path] = true;
425 }
426 if ( (entry->status==git_wc_status_unversioned || entry->status==git_wc_status_missing ) && entry->checked )
427 {
428 // The user manually selected an unversioned or missing file. We remember
429 // this so that the selection can be restored when refreshing.
430 CString path = entry->GetPath().GetGitPathString();
431 m_mapFilenameToChecked[path] = true;
432 }
433 else if ( entry->status > git_wc_status_normal && !entry->checked )
434 {
435 // The user manually deselected a versioned file. We remember
436 // this so that the deselection can be restored when refreshing.
437 CString path = entry->GetPath().GetGitPathString();
438 m_mapFilenameToChecked[path] = false;
439 }
440 }
441
442 // use a sorted path list to make sure we fetch the status of
443 // parent items first, *then* the child items (if any)
444 CTGitPathList sortedPathList = pathList;
445 sortedPathList.SortByPathname();
446 do
447 {
448 bRet = TRUE;
449 m_nTargetCount = 0;
450 m_bHasExternalsFromDifferentRepos = FALSE;
451 m_bHasExternals = FALSE;
452 m_bHasUnversionedItems = FALSE;
453 m_bHasLocks = false;
454 m_bHasChangeLists = false;
455 m_bShowIgnores = bShowIgnores;
456 m_nSortedColumn = 0;
457 m_bBlock = TRUE;
458 m_bBusy = true;
459 m_bEmpty = false;
460 Invalidate();
461
462 // first clear possible status data left from
463 // previous GetStatus() calls
464 ClearStatusArray();
465
466 m_StatusFileList = sortedPathList;
467
468 // Since Git_client_status() returns all files, even those in
469 // folders included with Git:externals we need to check if all
470 // files we get here belongs to the same repository.
471 // It is possible to commit changes in an external folder, as long
472 // as the folder belongs to the same repository (but another path),
473 // but it is not possible to commit all files if the externals are
474 // from a different repository.
475 //
476 // To check if all files belong to the same repository, we compare the
477 // UUID's - if they're identical then the files belong to the same
478 // repository and can be committed. But if they're different, then
479 // tell the user to commit all changes in the external folders
480 // first and exit.
481 CStringA sUUID; // holds the repo UUID
482 CTGitPathList arExtPaths; // list of Git:external paths
483
484 GitConfig config;
485
486 m_sURL.Empty();
487
488 m_nTargetCount = sortedPathList.GetCount();
489
490 GitStatus status(m_pbCanceled);
491 if(m_nTargetCount > 1 && sortedPathList.AreAllPathsFilesInOneDirectory())
492 {
493 // This is a special case, where we've been given a list of files
494 // all from one folder
495 // We handle them by setting a status filter, then requesting the Git status of
496 // all the files in the directory, filtering for the ones we're interested in
497 status.SetFilter(sortedPathList);
498
499 // if all selected entries are files, we don't do a recursive status
500 // fetching. But if only one is a directory, we have to recurse.
501 git_depth_t depth = git_depth_files;
502 // We have set a filter. If all selected items were files or we fetch
503 // the status not recursively, then we have to include
504 // ignored items too - the user has selected them
505 bool bShowIgnoresRight = true;
506 for (int fcindex=0; fcindex<sortedPathList.GetCount(); ++fcindex)
507 {
508 if (sortedPathList[fcindex].IsDirectory())
509 {
510 depth = git_depth_infinity;
511 bShowIgnoresRight = false;
512 break;
513 }
514 }
515 if(!FetchStatusForSingleTarget(config, status, sortedPathList.GetCommonDirectory(), bUpdate, sUUID, arExtPaths, true, depth, bShowIgnoresRight))
516 {
517 bRet = FALSE;
518 }
519 }
520 else
521 {
522 for(int nTarget = 0; nTarget < m_nTargetCount; nTarget++)
523 {
524 // check whether the path we want the status for is already fetched due to status-fetching
525 // of a parent path.
526 // this check is only done for file paths, because folder paths could be included already
527 // but not recursively
528 if (sortedPathList[nTarget].IsDirectory() || GetListEntry(sortedPathList[nTarget]) == NULL)
529 {
530 if(!FetchStatusForSingleTarget(config, status, sortedPathList[nTarget], bUpdate, sUUID,
531 arExtPaths, false, git_depth_infinity, bShowIgnores))
532 {
533 bRet = FALSE;
534 }
535 }
536 }
537 }
538
539 // remove the 'helper' files of conflicted items from the list.
540 // otherwise they would appear as unversioned files.
541 for (INT_PTR cind = 0; cind < m_ConflictFileList.GetCount(); ++cind)
542 {
543 for (size_t i=0; i < m_arStatusArray.size(); i++)
544 {
545 if (m_arStatusArray[i]->GetPath().IsEquivalentTo(m_ConflictFileList[cind]))
546 {
547 delete m_arStatusArray[i];
548 m_arStatusArray.erase(m_arStatusArray.cbegin() + i);
549 break;
550 }
551 }
552 }
553 refetchcounter++;
554 } while(!BuildStatistics() && (refetchcounter < 2) && (*m_pbCanceled==false));
555
556 m_bBlock = FALSE;
557 m_bBusy = false;
558 GetCursorPos(&pt);
559 SetCursorPos(pt.x, pt.y);
560 return bRet;
561 #endif
562 BuildStatistics();
563 return TRUE;
564 }
565
566 // Get the show-flags bitmap value which corresponds to a particular Git status
567 DWORD CGitStatusListCtrl::GetShowFlagsFromGitStatus(git_wc_status_kind status)
568 {
569 switch (status)
570 {
571 case git_wc_status_none:
572 case git_wc_status_unversioned:
573 return GITSLC_SHOWUNVERSIONED;
574 case git_wc_status_ignored:
575 if (!m_bShowIgnores)
576 return GITSLC_SHOWDIRECTS;
577 return GITSLC_SHOWDIRECTS|GITSLC_SHOWIGNORED;
578 case git_wc_status_incomplete:
579 return GITSLC_SHOWINCOMPLETE;
580 case git_wc_status_normal:
581 return GITSLC_SHOWNORMAL;
582 case git_wc_status_external:
583 return GITSLC_SHOWEXTERNAL;
584 case git_wc_status_added:
585 return GITSLC_SHOWADDED;
586 case git_wc_status_missing:
587 return GITSLC_SHOWMISSING;
588 case git_wc_status_deleted:
589 return GITSLC_SHOWREMOVED;
590 case git_wc_status_replaced:
591 return GITSLC_SHOWREPLACED;
592 case git_wc_status_modified:
593 return GITSLC_SHOWMODIFIED;
594 case git_wc_status_merged:
595 return GITSLC_SHOWMERGED;
596 case git_wc_status_conflicted:
597 return GITSLC_SHOWCONFLICTED;
598 case git_wc_status_obstructed:
599 return GITSLC_SHOWOBSTRUCTED;
600 default:
601 // we should NEVER get here!
602 ASSERT(FALSE);
603 break;
604 }
605 return 0;
606 }
607
608 void CGitStatusListCtrl::Show(unsigned int dwShow, unsigned int dwCheck /*=0*/, bool /*bShowFolders*/ /* = true */,BOOL UpdateStatusList,bool UseStoredCheckStatus)
609 {
610 m_bBusy = true;
611 m_bEmpty = false;
612 Invalidate();
613
614 CWinApp * pApp = AfxGetApp();
615 if (pApp)
616 pApp->DoWaitCursor(1);
617
618 Locker lock(m_critSec);
619 WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
620
621 //SetItemCount(listIndex);
622 SetRedraw(FALSE);
623 DeleteAllItems();
624 m_nSelected = 0;
625
626 m_nShownUnversioned = 0;
627 m_nShownModified = 0;
628 m_nShownAdded = 0;
629 m_nShownDeleted = 0;
630 m_nShownConflicted = 0;
631 m_nShownFiles = 0;
632 m_nShownSubmodules = 0;
633
634 m_dwShow = dwShow;
635
636 if(UpdateStatusList)
637 {
638 m_arStatusArray.clear();
639 for (int i = 0; i < m_StatusFileList.GetCount(); ++i)
640 {
641 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
642 }
643
644 for (int i = 0; i < m_UnRevFileList.GetCount(); ++i)
645 {
646 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
647 }
648
649 for (int i = 0; i < m_IgnoreFileList.GetCount(); ++i)
650 {
651 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
652 }
653 }
654 PrepareGroups();
655 if (m_nSortedColumn >= 0)
656 {
657 CSorter predicate (&m_ColumnManager, m_nSortedColumn, m_bAscending);
658 std::sort(m_arStatusArray.begin(), m_arStatusArray.end(), predicate);
659 }
660
661 int index =0;
662 for (size_t i = 0; i < m_arStatusArray.size(); ++i)
663 {
664 //set default checkbox status
665 CTGitPath* entry = ((CTGitPath*)m_arStatusArray[i]);
666 CString path = entry->GetGitPathString();
667 if (!m_mapFilenameToChecked.empty() && m_mapFilenameToChecked.find(path) != m_mapFilenameToChecked.end())
668 {
669 entry->m_Checked=m_mapFilenameToChecked[path];
670 }
671 else if (!UseStoredCheckStatus)
672 {
673 bool autoSelectSubmodules = !(entry->IsDirectory() && m_bDoNotAutoselectSubmodules);
674 if (((entry->m_Action & dwCheck) && !(m_bNoAutoselectMissing && entry->m_Action & CTGitPath::LOGACTIONS_MISSING) || dwShow & GITSLC_SHOWDIRECTFILES && m_mapDirectFiles.find(path) != m_mapDirectFiles.end()) && autoSelectSubmodules)
675 entry->m_Checked=true;
676 else
677 entry->m_Checked=false;
678 m_mapFilenameToChecked[path] = entry->m_Checked;
679 }
680
681 if(entry->m_Action & dwShow)
682 {
683 AddEntry(entry,langID,index);
684 index++;
685 }
686 }
687
688 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
689 for (int col = 0; col <= maxcol; col++)
690 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
691
692 SetRedraw(TRUE);
693 GetStatisticsString();
694
695 CHeaderCtrl * pHeader = GetHeaderCtrl();
696 HDITEM HeaderItem = {0};
697 HeaderItem.mask = HDI_FORMAT;
698 for (int i=0; i<pHeader->GetItemCount(); ++i)
699 {
700 pHeader->GetItem(i, &HeaderItem);
701 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
702 pHeader->SetItem(i, &HeaderItem);
703 }
704 if (m_nSortedColumn >= 0)
705 {
706 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
707 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
708 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
709 }
710
711 #if 0
712 if (nSelectedEntry)
713 {
714 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
715 EnsureVisible(nSelectedEntry, false);
716 }
717 else
718 {
719 // Restore the item at the top of the list.
720 for (int i=0;GetTopIndex() != nTopIndex;i++)
721 {
722 if ( !EnsureVisible(nTopIndex+i,false) )
723 {
724 break;
725 }
726 }
727 }
728 #endif
729 if (pApp)
730 pApp->DoWaitCursor(-1);
731
732 m_bBusy = false;
733 m_bEmpty = (GetItemCount() == 0);
734 Invalidate();
735
736 this->BuildStatistics();
737
738 #if 0
739
740 CWinApp * pApp = AfxGetApp();
741 if (pApp)
742 pApp->DoWaitCursor(1);
743
744 m_bShowFolders = bShowFolders;
745
746 int nTopIndex = GetTopIndex();
747 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
748 int nSelectedEntry = 0;
749 if (posSelectedEntry)
750 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
751 SetRedraw(FALSE);
752 DeleteAllItems();
753
754 PrepareGroups();
755
756 m_arListArray.clear();
757
758 m_arListArray.reserve(m_arStatusArray.size());
759 SetItemCount (static_cast<int>(m_arStatusArray.size()));
760
761 int listIndex = 0;
762 for (size_t i=0; i < m_arStatusArray.size(); ++i)
763 {
764 FileEntry * entry = m_arStatusArray[i];
765 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
766 continue;
767 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
768 continue;
769 if (entry->IsFolder() && (!bShowFolders))
770 continue; // don't show folders if they're not wanted.
771
772 #if 0
773 git_wc_status_kind status = GitStatus::GetMoreImportant(entry->status, entry->remotestatus);
774 DWORD showFlags = GetShowFlagsFromGitStatus(status);
775 if (entry->IsLocked())
776 showFlags |= SVNSLC_SHOWLOCKS;
777 if (entry->switched)
778 showFlags |= SVNSLC_SHOWSWITCHED;
779 if (!entry->changelist.IsEmpty())
780 showFlags |= SVNSLC_SHOWINCHANGELIST;
781 #endif
782 bool bAllowCheck = ((entry->changelist.Compare(GITSLC_IGNORECHANGELIST) != 0)
783 && (m_bCheckIfGroupsExist || (m_changelists.empty() || (m_changelists.size() == 1 && m_bHasIgnoreGroup))));
784
785 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
786 #if 0
787 if (status != Git_wc_status_ignored || (entry->direct) || (dwShow & GitSLC_SHOWIGNORED))
788 {
789 if ((!entry->IsFolder()) && (status == Git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
790 {
791 if (PathFileExists(entry->GetPath().GetWinPath()))
792 {
793 m_arListArray.push_back(i);
794 if ((dwCheck & SVNSLC_SHOWREMOVEDANDPRESENT)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
795 {
796 if (bAllowCheck)
797 entry->checked = true;
798 }
799 AddEntry(entry, langID, listIndex++);
800 }
801 }
802 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
803 {
804 m_arListArray.push_back(i);
805 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
806 {
807 if (bAllowCheck)
808 entry->checked = true;
809 }
810 AddEntry(entry, langID, listIndex++);
811 }
812 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
813 {
814 m_arListArray.push_back(i);
815 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
816 {
817 if (bAllowCheck)
818 entry->checked = true;
819 }
820 AddEntry(entry, langID, listIndex++);
821 }
822 }
823 #endif
824 }
825
826 SetItemCount(listIndex);
827
828 m_ColumnManager.UpdateRelevance (m_arStatusArray, m_arListArray);
829
830 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
831 for (int col = 0; col <= maxcol; col++)
832 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
833
834 SetRedraw(TRUE);
835 GetStatisticsString();
836
837 CHeaderCtrl * pHeader = GetHeaderCtrl();
838 HDITEM HeaderItem = {0};
839 HeaderItem.mask = HDI_FORMAT;
840 for (int i=0; i<pHeader->GetItemCount(); ++i)
841 {
842 pHeader->GetItem(i, &HeaderItem);
843 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
844 pHeader->SetItem(i, &HeaderItem);
845 }
846 if (m_nSortedColumn)
847 {
848 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
849 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
850 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
851 }
852
853 if (nSelectedEntry)
854 {
855 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
856 EnsureVisible(nSelectedEntry, false);
857 }
858 else
859 {
860 // Restore the item at the top of the list.
861 for (int i=0;GetTopIndex() != nTopIndex;i++)
862 {
863 if ( !EnsureVisible(nTopIndex+i,false) )
864 {
865 break;
866 }
867 }
868 }
869
870 if (pApp)
871 pApp->DoWaitCursor(-1);
872
873 m_bEmpty = (GetItemCount() == 0);
874 Invalidate();
875 #endif
876
877 }
878
879 void CGitStatusListCtrl::Show(unsigned int /*dwShow*/, const CTGitPathList& checkedList, bool /*bShowFolders*/ /* = true */)
880 {
881 DeleteAllItems();
882 for (int i = 0; i < checkedList.GetCount(); ++i)
883 this->AddEntry((CTGitPath *)&checkedList[i],0,i);
884 return ;
885 #if 0
886
887 Locker lock(m_critSec);
888 WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
889
890 CWinApp * pApp = AfxGetApp();
891 if (pApp)
892 pApp->DoWaitCursor(1);
893 m_dwShow = dwShow;
894 m_bShowFolders = bShowFolders;
895 m_nSelected = 0;
896 int nTopIndex = GetTopIndex();
897 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
898 int nSelectedEntry = 0;
899 if (posSelectedEntry)
900 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
901 SetRedraw(FALSE);
902 DeleteAllItems();
903
904 PrepareGroups();
905
906 m_arListArray.clear();
907
908 m_arListArray.reserve(m_arStatusArray.size());
909 SetItemCount (static_cast<int>(m_arStatusArray.size()));
910
911 int listIndex = 0;
912 for (size_t i=0; i < m_arStatusArray.size(); ++i)
913 {
914 FileEntry * entry = m_arStatusArray[i];
915 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
916 continue;
917 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
918 continue;
919 if (entry->IsFolder() && (!bShowFolders))
920 continue; // don't show folders if they're not wanted.
921 #if 0
922 git_wc_status_kind status = SVNStatus::GetMoreImportant(entry->status, entry->remotestatus);
923 DWORD showFlags = GetShowFlagsFromSVNStatus(status);
924 if (entry->IsLocked())
925 showFlags |= SVNSLC_SHOWLOCKS;
926 if (!entry->changelist.IsEmpty())
927 showFlags |= SVNSLC_SHOWINCHANGELIST;
928
929 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
930 if (status != git_wc_status_ignored || (entry->direct) || (dwShow & SVNSLC_SHOWIGNORED))
931 {
932 for (int npath = 0; npath < checkedList.GetCount(); ++npath)
933 {
934 if (entry->GetPath().IsEquivalentTo(checkedList[npath]))
935 {
936 entry->checked = true;
937 break;
938 }
939 }
940 if ((!entry->IsFolder()) && (status == git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
941 {
942 if (PathFileExists(entry->GetPath().GetWinPath()))
943 {
944 m_arListArray.push_back(i);
945 AddEntry(entry, langID, listIndex++);
946 }
947 }
948 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
949 {
950 m_arListArray.push_back(i);
951 AddEntry(entry, langID, listIndex++);
952 }
953 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
954 {
955 m_arListArray.push_back(i);
956 AddEntry(entry, langID, listIndex++);
957 }
958 else if (entry->switched)
959 {
960 m_arListArray.push_back(i);
961 AddEntry(entry, langID, listIndex++);
962 }
963 }
964 #endif
965 }
966
967 SetItemCount(listIndex);
968
969 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
970 for (int col = 0; col <= maxcol; col++)
971 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
972
973 SetRedraw(TRUE);
974 GetStatisticsString();
975
976 CHeaderCtrl * pHeader = GetHeaderCtrl();
977 HDITEM HeaderItem = {0};
978 HeaderItem.mask = HDI_FORMAT;
979 for (int i=0; i<pHeader->GetItemCount(); ++i)
980 {
981 pHeader->GetItem(i, &HeaderItem);
982 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
983 pHeader->SetItem(i, &HeaderItem);
984 }
985 if (m_nSortedColumn)
986 {
987 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
988 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
989 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
990 }
991
992 if (nSelectedEntry)
993 {
994 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
995 EnsureVisible(nSelectedEntry, false);
996 }
997 else
998 {
999 // Restore the item at the top of the list.
1000 for (int i=0;GetTopIndex() != nTopIndex;i++)
1001 {
1002 if ( !EnsureVisible(nTopIndex+i,false) )
1003 {
1004 break;
1005 }
1006 }
1007 }
1008
1009 if (pApp)
1010 pApp->DoWaitCursor(-1);
1011
1012 m_bEmpty = (GetItemCount() == 0);
1013 Invalidate();
1014 #endif
1015
1016 }
1017 int CGitStatusListCtrl::GetColumnIndex(int mask)
1018 {
1019 for (int i = 0; i < 32; ++i)
1020 if(mask&0x1)
1021 return i;
1022 else
1023 mask=mask>>1;
1024 return -1;
1025 }
1026 void CGitStatusListCtrl::AddEntry(CTGitPath * GitPath, WORD /*langID*/, int listIndex)
1027 {
1028 static CString from(MAKEINTRESOURCE(IDS_STATUSLIST_FROM));
1029 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
1030 static bool abbreviateRenamings(((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\AbbreviateRenamings"), FALSE)) == TRUE);
1031 static bool relativeTimes = (CRegDWORD(_T("Software\\TortoiseGit\\RelativeTimes"), FALSE) != FALSE);
1032
1033 CString path = GitPath->GetGitPathString();
1034
1035 m_bBlock = TRUE;
1036 int index = listIndex;
1037 int nCol = 1;
1038 CString entryname = GitPath->GetGitPathString();
1039 int icon_idx = 0;
1040 if (GitPath->IsDirectory())
1041 {
1042 icon_idx = m_nIconFolder;
1043 m_nShownSubmodules++;
1044 }
1045 else
1046 {
1047 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(*GitPath);
1048 m_nShownFiles++;
1049 }
1050 switch (GitPath->m_Action)
1051 {
1052 case CTGitPath::LOGACTIONS_ADDED:
1053 case CTGitPath::LOGACTIONS_COPY:
1054 m_nShownAdded++;
1055 break;
1056 case CTGitPath::LOGACTIONS_DELETED:
1057 case CTGitPath::LOGACTIONS_MISSING:
1058 case CTGitPath::LOGACTIONS_DELETED | CTGitPath::LOGACTIONS_MISSING:
1059 m_nShownDeleted++;
1060 break;
1061 case CTGitPath::LOGACTIONS_REPLACED:
1062 case CTGitPath::LOGACTIONS_MODIFIED:
1063 case CTGitPath::LOGACTIONS_MERGED:
1064 m_nShownModified++;
1065 break;
1066 case CTGitPath::LOGACTIONS_UNMERGED:
1067 m_nShownConflicted++;
1068 break;
1069 case CTGitPath::LOGACTIONS_UNVER:
1070 m_nShownUnversioned++;
1071 break;
1072 default:
1073 m_nShownUnversioned++;
1074 break;
1075 }
1076 if(GitPath->m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY) && !GitPath->GetGitOldPathString().IsEmpty())
1077 {
1078 if (!abbreviateRenamings)
1079 {
1080 // relative path
1081 CString rename;
1082 rename.Format(from, (LPCTSTR)GitPath->GetGitOldPathString());
1083 entryname += _T(" ") + rename;
1084 }
1085 else
1086 {
1087 CTGitPathList tgpl;
1088 tgpl.AddPath(*GitPath);
1089 CTGitPath old(GitPath->GetGitOldPathString());
1090 tgpl.AddPath(old);
1091 CString commonRoot = tgpl.GetCommonRoot().GetGitPathString();
1092 if (!commonRoot.IsEmpty())
1093 commonRoot += _T("/");
1094 if (old.GetFileOrDirectoryName() == GitPath->GetFileOrDirectoryName() && old.GetContainingDirectory().GetGitPathString() != "" && GitPath->GetContainingDirectory().GetGitPathString())
1095 {
1096 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();
1097 }
1098 else if (!commonRoot.IsEmpty())
1099 {
1100 entryname = commonRoot + _T("{") + GitPath->GetGitOldPathString().Mid(commonRoot.GetLength()) + _T(" => ") + GitPath->GetGitPathString().Mid(commonRoot.GetLength()) + _T("}");
1101 }
1102 else
1103 {
1104 entryname = GitPath->GetGitOldPathString().Mid(commonRoot.GetLength()) + _T(" => ") + GitPath->GetGitPathString().Mid(commonRoot.GetLength());
1105 }
1106 }
1107 }
1108
1109 InsertItem(index, entryname, icon_idx);
1110 if (m_restorepaths.find(GitPath->GetWinPathString()) != m_restorepaths.end())
1111 SetItemState(index, INDEXTOOVERLAYMASK(OVL_RESTORE), TVIS_OVERLAYMASK);
1112
1113 this->SetItemData(index, (DWORD_PTR)GitPath);
1114 // SVNSLC_COLFILENAME
1115 SetItemText(index, nCol++, GitPath->GetFileOrDirectoryName());
1116 // SVNSLC_COLEXT
1117 SetItemText(index, nCol++, GitPath->GetFileExtension());
1118 // SVNSLC_COLSTATUS
1119 SetItemText(index, nCol++, GitPath->GetActionName());
1120
1121 SetItemText(index, GetColumnIndex(GITSLC_COLADD),GitPath->m_StatAdd);
1122 SetItemText(index, GetColumnIndex(GITSLC_COLDEL),GitPath->m_StatDel);
1123
1124 {
1125 CString modificationDate;
1126 __int64 filetime = GitPath->GetLastWriteTime();
1127 if (filetime && !(GitPath->m_Action & CTGitPath::LOGACTIONS_DELETED))
1128 {
1129 FILETIME* f = (FILETIME*)(__int64*)&filetime;
1130 modificationDate = CLoglistUtils::FormatDateAndTime(CTime(CGit::filetime_to_time_t(f)), DATE_SHORTDATE, true, relativeTimes);
1131 }
1132 SetItemText(index, GetColumnIndex(GITSLC_COLMODIFICATIONDATE), modificationDate);
1133 }
1134 // SVNSLC_COLSIZE
1135 if (GitPath->IsDirectory())
1136 SetItemText(index, GetColumnIndex(GITSLC_COLSIZE), _T(""));
1137 else
1138 {
1139 TCHAR buf[100] = { 0 };
1140 StrFormatByteSize64(GitPath->GetFileSize(), buf, 100);
1141 SetItemText(index, GetColumnIndex(GITSLC_COLSIZE), buf);
1142 }
1143
1144 SetCheck(index, GitPath->m_Checked);
1145 if (GitPath->m_Checked)
1146 m_nSelected++;
1147
1148 if ((GitPath->m_Action & CTGitPath::LOGACTIONS_SKIPWORKTREE) || (GitPath->m_Action & CTGitPath::LOGACTIONS_ASSUMEVALID))
1149 SetItemGroup(index, 3);
1150 else if (GitPath->m_Action & CTGitPath::LOGACTIONS_IGNORE)
1151 SetItemGroup(index, 2);
1152 else if( GitPath->m_Action & CTGitPath::LOGACTIONS_UNVER)
1153 SetItemGroup(index,1);
1154 else
1155 {
1156 SetItemGroup(index, GitPath->m_ParentNo&(PARENT_MASK|MERGE_MASK));
1157 }
1158
1159 m_bBlock = FALSE;
1160
1161
1162 }
1163
1164 bool CGitStatusListCtrl::SetItemGroup(int item, int groupindex)
1165 {
1166 // if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS) == NULL)
1167 // return false;
1168 if (groupindex < 0)
1169 return false;
1170 LVITEM i = {0};
1171 i.mask = LVIF_GROUPID;
1172 i.iItem = item;
1173 i.iSubItem = 0;
1174 i.iGroupId = groupindex;
1175
1176 return !!SetItem(&i);
1177 }
1178
1179 void CGitStatusListCtrl::OnHdnItemclick(NMHDR *pNMHDR, LRESULT *pResult)
1180 {
1181 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
1182 *pResult = 0;
1183 if (m_bBlock || m_arStatusArray.empty())
1184 return;
1185 m_bBlock = TRUE;
1186 if (m_nSortedColumn == phdr->iItem)
1187 m_bAscending = !m_bAscending;
1188 else
1189 m_bAscending = TRUE;
1190 m_nSortedColumn = phdr->iItem;
1191 Show(m_dwShow, 0, m_bShowFolders,false,true);
1192
1193 m_bBlock = FALSE;
1194 }
1195
1196 void CGitStatusListCtrl::OnLvnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
1197 {
1198 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1199 *pResult = 0;
1200
1201 #define ISCHECKED(x) ((x) ? ((((x)&LVIS_STATEIMAGEMASK)>>12)-1) : FALSE)
1202 if ((m_bBlock)&&(m_bBlockUI))
1203 {
1204 // if we're blocked, prevent changing of the check state
1205 if ((!ISCHECKED(pNMLV->uOldState) && ISCHECKED(pNMLV->uNewState))||
1206 (ISCHECKED(pNMLV->uOldState) && !ISCHECKED(pNMLV->uNewState)))
1207 *pResult = TRUE;
1208 }
1209 }
1210
1211 BOOL CGitStatusListCtrl::OnLvnItemchanged(NMHDR *pNMHDR, LRESULT *pResult)
1212 {
1213 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1214 *pResult = 0;
1215 CWnd* pParent = GetLogicalParent();
1216 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
1217 {
1218 pParent->SendMessage(GITSLNM_ITEMCHANGED, pNMLV->iItem);
1219 }
1220
1221 if ((pNMLV->uNewState==0)||(pNMLV->uNewState & LVIS_SELECTED)||(pNMLV->uNewState & LVIS_FOCUSED))
1222 return FALSE;
1223
1224 if (m_bBlock)
1225 return FALSE;
1226
1227 bool bSelected = !!(ListView_GetItemState(m_hWnd, pNMLV->iItem, LVIS_SELECTED) & LVIS_SELECTED);
1228 int nListItems = GetItemCount();
1229
1230 m_bBlock = TRUE;
1231 // was the item checked?
1232
1233 //CTGitPath *gitpath=(CTGitPath*)GetItemData(pNMLV->iItem);
1234 //gitpath->m_Checked=GetCheck(pNMLV->iItem);
1235
1236 if (GetCheck(pNMLV->iItem))
1237 {
1238 CheckEntry(pNMLV->iItem, nListItems);
1239 if (bSelected)
1240 {
1241 POSITION pos = GetFirstSelectedItemPosition();
1242 int index;
1243 while ((index = GetNextSelectedItem(pos)) >= 0)
1244 {
1245 if (index != pNMLV->iItem)
1246 CheckEntry(index, nListItems);
1247 }
1248 }
1249 }
1250 else
1251 {
1252 UncheckEntry(pNMLV->iItem, nListItems);
1253 if (bSelected)
1254 {
1255 POSITION pos = GetFirstSelectedItemPosition();
1256 int index;
1257 while ((index = GetNextSelectedItem(pos)) >= 0)
1258 {
1259 if (index != pNMLV->iItem)
1260 UncheckEntry(index, nListItems);
1261 }
1262 }
1263 }
1264
1265 GetStatisticsString();
1266 m_bBlock = FALSE;
1267 NotifyCheck();
1268
1269 return FALSE;
1270 }
1271
1272 void CGitStatusListCtrl::OnColumnResized(NMHDR *pNMHDR, LRESULT *pResult)
1273 {
1274 m_ColumnManager.OnColumnResized(pNMHDR,pResult);
1275
1276 *pResult = FALSE;
1277 }
1278
1279 void CGitStatusListCtrl::OnColumnMoved(NMHDR *pNMHDR, LRESULT *pResult)
1280 {
1281 m_ColumnManager.OnColumnMoved(pNMHDR, pResult);
1282
1283 Invalidate(FALSE);
1284 }
1285
1286 void CGitStatusListCtrl::CheckEntry(int index, int /*nListItems*/)
1287 {
1288 Locker lock(m_critSec);
1289 //FileEntry * entry = GetListEntry(index);
1290 CTGitPath *path=(CTGitPath*)GetItemData(index);
1291 ASSERT(path != NULL);
1292 if (path == NULL)
1293 return;
1294 m_mapFilenameToChecked[path->GetGitPathString()] = true;
1295 SetCheck(index, TRUE);
1296 //entry = GetListEntry(index);
1297 // if an unversioned item was checked, then we need to check if
1298 // the parent folders are unversioned too. If the parent folders actually
1299 // are unversioned, then check those too.
1300 #if 0
1301 if (entry->status == git_wc_status_unversioned)
1302 {
1303 // we need to check the parent folder too
1304 const CTGitPath& folderpath = entry->path;
1305 for (int i=0; i< nListItems; ++i)
1306 {
1307 FileEntry * testEntry = GetListEntry(i);
1308 ASSERT(testEntry != NULL);
1309 if (testEntry == NULL)
1310 continue;
1311 if (!testEntry->checked)
1312 {
1313 if (testEntry->path.IsAncestorOf(folderpath) && (!testEntry->path.IsEquivalentTo(folderpath)))
1314 {
1315 SetEntryCheck(testEntry,i,true);
1316 m_nSelected++;
1317 }
1318 }
1319 }
1320 }
1321 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1322 if ( (entry->status == git_wc_status_deleted) || (m_bCheckChildrenWithParent) || (bShift) )
1323 {
1324 // if a deleted folder gets checked, we have to check all
1325 // children of that folder too.
1326 if (entry->path.IsDirectory())
1327 {
1328 SetCheckOnAllDescendentsOf(entry, true);
1329 }
1330
1331 // if a deleted file or folder gets checked, we have to
1332 // check all parents of this item too.
1333 for (int i=0; i<nListItems; ++i)
1334 {
1335 FileEntry * testEntry = GetListEntry(i);
1336 ASSERT(testEntry != NULL);
1337 if (testEntry == NULL)
1338 continue;
1339 if (!testEntry->checked)
1340 {
1341 if (testEntry->path.IsAncestorOf(entry->path) && (!testEntry->path.IsEquivalentTo(entry->path)))
1342 {
1343 if ((testEntry->status == git_wc_status_deleted)||(m_bCheckChildrenWithParent))
1344 {
1345 SetEntryCheck(testEntry,i,true);
1346 m_nSelected++;
1347 // now we need to check all children of this parent folder
1348 SetCheckOnAllDescendentsOf(testEntry, true);
1349 }
1350 }
1351 }
1352 }
1353 }
1354 #endif
1355 if ( !path->m_Checked )
1356 {
1357 path->m_Checked = TRUE;
1358 m_nSelected++;
1359 }
1360 }
1361
1362 void CGitStatusListCtrl::UncheckEntry(int index, int /*nListItems*/)
1363 {
1364 Locker lock(m_critSec);
1365 CTGitPath *path=(CTGitPath*)GetItemData(index);
1366 ASSERT(path != NULL);
1367 if (path == NULL)
1368 return;
1369 SetCheck(index, FALSE);
1370 m_mapFilenameToChecked[path->GetGitPathString()] = false;
1371 //entry = GetListEntry(index);
1372 // item was unchecked
1373 #if 0
1374 if (entry->path.IsDirectory())
1375 {
1376 // disable all files within an unselected folder, except when unchecking a folder with property changes
1377 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1378 if ( (entry->status != git_wc_status_modified) || (bShift) )
1379 {
1380 SetCheckOnAllDescendentsOf(entry, false);
1381 }
1382 }
1383 else if (entry->status == git_wc_status_deleted)
1384 {
1385 // a "deleted" file was unchecked, so uncheck all parent folders
1386 // and all children of those parents
1387 for (int i=0; i<nListItems; i++)
1388 {
1389 FileEntry * testEntry = GetListEntry(i);
1390 ASSERT(testEntry != NULL);
1391 if (testEntry == NULL)
1392 continue;
1393 if (testEntry->checked)
1394 {
1395 if (testEntry->path.IsAncestorOf(entry->path))
1396 {
1397 if (testEntry->status == git_wc_status_deleted)
1398 {
1399 SetEntryCheck(testEntry,i,false);
1400 m_nSelected--;
1401
1402 SetCheckOnAllDescendentsOf(testEntry, false);
1403 }
1404 }
1405 }
1406 }
1407 }
1408 #endif
1409 if ( path->m_Checked )
1410 {
1411 path->m_Checked = FALSE;
1412 m_nSelected--;
1413 }
1414 }
1415 bool CGitStatusListCtrl::BuildStatistics()
1416 {
1417
1418 bool bRefetchStatus = false;
1419
1420 // now gather some statistics
1421 m_nUnversioned = 0;
1422 m_nNormal = 0;
1423 m_nModified = 0;
1424 m_nAdded = 0;
1425 m_nDeleted = 0;
1426 m_nConflicted = 0;
1427 m_nTotal = 0;
1428 m_nSelected = 0;
1429 m_nLineAdded = 0;
1430 m_nLineDeleted = 0;
1431 m_nRenamed = 0;
1432
1433 for (size_t i = 0; i < m_arStatusArray.size(); ++i)
1434 {
1435 int status=((CTGitPath*)m_arStatusArray[i])->m_Action;
1436
1437 m_nLineAdded += _tstol(((CTGitPath*)m_arStatusArray[i])->m_StatAdd);
1438 m_nLineDeleted += _tstol(((CTGitPath*)m_arStatusArray[i])->m_StatDel);
1439
1440 if(status&(CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))
1441 m_nAdded++;
1442
1443 if(status&CTGitPath::LOGACTIONS_DELETED)
1444 m_nDeleted++;
1445
1446 if(status&(CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_MODIFIED))
1447 m_nModified++;
1448
1449 if(status&CTGitPath::LOGACTIONS_UNMERGED)
1450 m_nConflicted++;
1451
1452 if(status&(CTGitPath::LOGACTIONS_IGNORE|CTGitPath::LOGACTIONS_UNVER))
1453 m_nUnversioned++;
1454
1455 if(status&(CTGitPath::LOGACTIONS_REPLACED))
1456 m_nRenamed++;
1457
1458 if(((CTGitPath*)m_arStatusArray[i])->m_Checked)
1459 m_nSelected++;
1460 }
1461 return !bRefetchStatus;
1462 }
1463
1464
1465 int CGitStatusListCtrl::GetGroupFromPoint(POINT * ppt)
1466 {
1467 // the point must be relative to the upper left corner of the control
1468
1469 if (ppt == NULL)
1470 return -1;
1471 if (!IsGroupViewEnabled())
1472 return -1;
1473
1474 POINT pt = *ppt;
1475 pt.x = 10;
1476 UINT flags = 0;
1477 int nItem = -1;
1478 RECT rc;
1479 GetWindowRect(&rc);
1480 while (((flags & LVHT_BELOW) == 0)&&(pt.y < rc.bottom))
1481 {
1482 nItem = HitTest(pt, &flags);
1483 if ((flags & LVHT_ONITEM)||(flags & LVHT_EX_GROUP_HEADER))
1484 {
1485 // the first item below the point
1486
1487 // check if the point is too much right (i.e. if the point
1488 // is farther to the right than the width of the item)
1489 RECT r;
1490 GetItemRect(nItem, &r, LVIR_LABEL);
1491 if (ppt->x > r.right)
1492 return -1;
1493
1494 LVITEM lv = {0};
1495 lv.mask = LVIF_GROUPID;
1496 lv.iItem = nItem;
1497 GetItem(&lv);
1498 int groupID = lv.iGroupId;
1499 // now we search upwards and check if the item above this one
1500 // belongs to another group. If it belongs to the same group,
1501 // we're not over a group header
1502 while (pt.y >= 0)
1503 {
1504 pt.y -= 2;
1505 nItem = HitTest(pt, &flags);
1506 if ((flags & LVHT_ONITEM)&&(nItem >= 0))
1507 {
1508 // the first item below the point
1509 LVITEM lv2 = {0};
1510 lv2.mask = LVIF_GROUPID;
1511 lv2.iItem = nItem;
1512 GetItem(&lv2);
1513 if (lv2.iGroupId != groupID)
1514 return groupID;
1515 else
1516 return -1;
1517 }
1518 }
1519 if (pt.y < 0)
1520 return groupID;
1521 return -1;
1522 }
1523 pt.y += 2;
1524 };
1525 return -1;
1526 }
1527
1528 void CGitStatusListCtrl::OnContextMenuGroup(CWnd * /*pWnd*/, CPoint point)
1529 {
1530 POINT clientpoint = point;
1531 ScreenToClient(&clientpoint);
1532 if ((IsGroupViewEnabled())&&(GetGroupFromPoint(&clientpoint) >= 0))
1533 {
1534 CMenu popup;
1535 if (popup.CreatePopupMenu())
1536 {
1537 CString temp;
1538 temp.LoadString(IDS_STATUSLIST_CHECKGROUP);
1539 popup.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_CHECKGROUP, temp);
1540 temp.LoadString(IDS_STATUSLIST_UNCHECKGROUP);
1541 popup.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_UNCHECKGROUP, temp);
1542 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1543 bool bCheck = false;
1544 switch (cmd)
1545 {
1546 case IDGITLC_CHECKGROUP:
1547 bCheck = true;
1548 // fall through here
1549 case IDGITLC_UNCHECKGROUP:
1550 {
1551 int group = GetGroupFromPoint(&clientpoint);
1552 // go through all items and check/uncheck those assigned to the group
1553 // but block the OnLvnItemChanged handler
1554 m_bBlock = true;
1555 for (int i=0; i<GetItemCount(); ++i)
1556 {
1557 LVITEM lv = { 0 };
1558 lv.mask = LVIF_GROUPID;
1559 lv.iItem = i;
1560 GetItem(&lv);
1561
1562 if (lv.iGroupId == group)
1563 {
1564 CTGitPath * entry = (CTGitPath*)GetItemData(i);
1565 if (entry)
1566 {
1567 bool bOldCheck = entry->m_Checked;
1568 SetEntryCheck(entry, i, bCheck);
1569 if (bCheck != bOldCheck)
1570 {
1571 if (bCheck)
1572 m_nSelected++;
1573 else
1574 m_nSelected--;
1575 }
1576 }
1577 }
1578
1579 }
1580 GetStatisticsString();
1581 NotifyCheck();
1582 m_bBlock = false;
1583 }
1584 break;
1585 }
1586 }
1587 }
1588 }
1589
1590 void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
1591 {
1592
1593 //WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
1594
1595 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1596 CTGitPath * filepath;
1597
1598 int selIndex = GetSelectionMark();
1599 if ((point.x == -1) && (point.y == -1))
1600 {
1601 CRect rect;
1602 GetItemRect(selIndex, &rect, LVIR_LABEL);
1603 ClientToScreen(&rect);
1604 point = rect.CenterPoint();
1605 }
1606 if ((GetSelectedCount() == 0) && (m_bHasCheckboxes))
1607 {
1608 // nothing selected could mean the context menu is requested for
1609 // a group header
1610 OnContextMenuGroup(pWnd, point);
1611 }
1612 else if (selIndex >= 0)
1613 {
1614 //FileEntry * entry = GetListEntry(selIndex);
1615
1616 filepath = (CTGitPath * )GetItemData(selIndex);
1617
1618 ASSERT(filepath != NULL);
1619 if (filepath == NULL)
1620 return;
1621
1622 //const CTGitPath& filepath = entry->path;
1623 int wcStatus = filepath->m_Action;
1624 // entry is selected, now show the popup menu
1625 Locker lock(m_critSec);
1626 CIconMenu popup;
1627 CMenu changelistSubMenu;
1628 CMenu ignoreSubMenu;
1629 CMenu shellMenu;
1630 if (popup.CreatePopupMenu())
1631 {
1632 //Add Menu for version controlled file
1633
1634 if (GetSelectedCount() > 0 && wcStatus & CTGitPath::LOGACTIONS_UNMERGED)
1635 {
1636 if (GetSelectedCount() == 1 && (m_dwContextMenus & GITSLC_POPCONFLICT)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1637 {
1638 popup.AppendMenuIcon(IDGITLC_EDITCONFLICT, IDS_MENUCONFLICT, IDI_CONFLICT);
1639 popup.SetDefaultItem(IDGITLC_EDITCONFLICT, FALSE);
1640 }
1641 if (m_dwContextMenus & GITSLC_POPRESOLVE)
1642 {
1643 popup.AppendMenuIcon(IDGITLC_RESOLVECONFLICT, IDS_STATUSLIST_CONTEXT_RESOLVED, IDI_RESOLVE);
1644 }
1645 if ((m_dwContextMenus & GITSLC_POPRESOLVE)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1646 {
1647 popup.AppendMenuIcon(IDGITLC_RESOLVETHEIRS, IDS_SVNPROGRESS_MENUUSETHEIRS, IDI_RESOLVE);
1648 popup.AppendMenuIcon(IDGITLC_RESOLVEMINE, IDS_SVNPROGRESS_MENUUSEMINE, IDI_RESOLVE);
1649 }
1650 if ((m_dwContextMenus & GITSLC_POPCONFLICT)||(m_dwContextMenus & GITSLC_POPRESOLVE))
1651 popup.AppendMenu(MF_SEPARATOR);
1652 }
1653
1654 if (GetSelectedCount() > 0)
1655 {
1656 if (wcStatus & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE))
1657 {
1658 if (m_dwContextMenus & GITSLC_POPADD)
1659 {
1660 //if ( entry->IsFolder() )
1661 //{
1662 // popup.AppendMenuIcon(IDSVNLC_ADD_RECURSIVE, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE, IDI_ADD);
1663 //}
1664 //else
1665 {
1666 popup.AppendMenuIcon(IDGITLC_ADD, IDS_STATUSLIST_CONTEXT_ADD, IDI_ADD);
1667 }
1668 }
1669 if (m_dwContextMenus & GITSLC_POPCOMMIT)
1670 {
1671 popup.AppendMenuIcon(IDGITLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);
1672 }
1673 }
1674 }
1675
1676 if (!(wcStatus & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE)) && !((wcStatus & CTGitPath::LOGACTIONS_MISSING) && wcStatus != (CTGitPath::LOGACTIONS_MISSING | CTGitPath::LOGACTIONS_DELETED) && wcStatus != (CTGitPath::LOGACTIONS_MISSING | CTGitPath::LOGACTIONS_DELETED | CTGitPath::LOGACTIONS_MODIFIED)) && GetSelectedCount() > 0)
1677 {
1678 bool bEntryAdded = false;
1679 if (m_dwContextMenus & GITSLC_POPCOMPAREWITHBASE)
1680 {
1681 if(filepath->m_ParentNo & MERGE_MASK)
1682 popup.AppendMenuIcon(IDGITLC_COMPARE, IDS_TREE_DIFF, IDI_DIFF);
1683 else
1684 popup.AppendMenuIcon(IDGITLC_COMPARE, IDS_LOG_COMPAREWITHBASE, IDI_DIFF);
1685
1686 if (!(wcStatus & (CTGitPath::LOGACTIONS_UNMERGED)) || GetSelectedCount() != 1)
1687 popup.SetDefaultItem(IDGITLC_COMPARE, FALSE);
1688 bEntryAdded = true;
1689 }
1690
1691 if (!g_Git.IsInitRepos() && (m_dwContextMenus & GITSLC_POPGNUDIFF))
1692 {
1693 popup.AppendMenuIcon(IDGITLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1694 bEntryAdded = true;
1695 }
1696
1697 if ((m_dwContextMenus & this->GetContextMenuBit(IDGITLC_COMPAREWC)) && m_bHasWC)
1698 {
1699 if ((!m_CurrentVersion.IsEmpty()) && m_CurrentVersion != GIT_REV_ZERO)
1700 {
1701 popup.AppendMenuIcon(IDGITLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
1702 bEntryAdded = true;
1703 }
1704 }
1705
1706 if (bEntryAdded)
1707 popup.AppendMenu(MF_SEPARATOR);
1708 }
1709
1710 if (!m_Rev1.IsEmpty() && !m_Rev2.IsEmpty())
1711 {
1712 if(GetSelectedCount() == 1)
1713 {
1714 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_COMPARETWOREVISIONS))
1715 {
1716 popup.AppendMenuIcon(IDGITLC_COMPARETWOREVISIONS, IDS_LOG_POPUP_COMPARETWO, IDI_DIFF);
1717 popup.SetDefaultItem(IDGITLC_COMPARETWOREVISIONS, FALSE);
1718 }
1719 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_GNUDIFF2REVISIONS))
1720 {
1721 popup.AppendMenuIcon(IDGITLC_GNUDIFF2REVISIONS, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1722 }
1723 }
1724 }
1725
1726 //Select Multi item
1727 if (GetSelectedCount() > 0)
1728 {
1729 if ((GetSelectedCount() == 2) && (m_dwContextMenus & GITSLC_POPCOMPARETWOFILES) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO))
1730 {
1731 POSITION pos = GetFirstSelectedItemPosition();
1732 int index = GetNextSelectedItem(pos);
1733 if (index >= 0)
1734 {
1735 CTGitPath * entry2 = NULL;
1736 entry2 = (CTGitPath*)GetItemData(index);
1737 bool firstEntryExistsAndIsFile = entry2 && !entry2->IsDirectory();
1738 index = GetNextSelectedItem(pos);
1739 if (index >= 0)
1740 {
1741 entry2 = (CTGitPath * )GetItemData(index);
1742 if (firstEntryExistsAndIsFile && entry2 && !entry2->IsDirectory())
1743 popup.AppendMenuIcon(IDGITLC_COMPARETWOFILES, IDS_STATUSLIST_CONTEXT_COMPARETWOFILES, IDI_DIFF);
1744 }
1745 }
1746 }
1747 }
1748
1749 if ( (GetSelectedCount() >0 ) && (!(wcStatus & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE))) && m_bHasWC)
1750 {
1751 if ((m_dwContextMenus & GITSLC_POPCOMMIT) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO) && !(wcStatus & (CTGitPath::LOGACTIONS_SKIPWORKTREE | CTGitPath::LOGACTIONS_ASSUMEVALID)))
1752 {
1753 popup.AppendMenuIcon(IDGITLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);
1754 }
1755
1756 if ((m_dwContextMenus & GITSLC_POPREVERT) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO))
1757 {
1758 popup.AppendMenuIcon(IDGITLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
1759 }
1760
1761 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)))
1762 {
1763 popup.AppendMenuIcon(IDGITLC_SKIPWORKTREE, IDS_STATUSLIST_SKIPWORKTREE);
1764 }
1765
1766 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)))
1767 {
1768 popup.AppendMenuIcon(IDGITLC_ASSUMEVALID, IDS_MENUASSUMEVALID);
1769 }
1770
1771 if ((m_dwContextMenus & GITLC_POPUNSETIGNORELOCALCHANGES) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO) && (wcStatus & (CTGitPath::LOGACTIONS_SKIPWORKTREE | CTGitPath::LOGACTIONS_ASSUMEVALID)))
1772 {
1773 popup.AppendMenuIcon(IDGITLC_UNSETIGNORELOCALCHANGES, IDS_STATUSLIST_UNSETIGNORELOCALCHANGES);
1774 }
1775
1776 if (m_dwContextMenus & GITSLC_POPRESTORE && !filepath->IsDirectory())
1777 {
1778 if (m_restorepaths.find(filepath->GetWinPathString()) == m_restorepaths.end())
1779 popup.AppendMenuIcon(IDGITLC_CREATERESTORE, IDS_MENUCREATERESTORE, IDI_RESTORE);
1780 else
1781 popup.AppendMenuIcon(IDGITLC_RESTOREPATH, IDS_MENURESTORE, IDI_RESTORE);
1782 }
1783
1784 if ((m_dwContextMenus & GetContextMenuBit(IDGITLC_REVERTTOREV)) && ( !this->m_CurrentVersion.IsEmpty() )
1785 && this->m_CurrentVersion != GIT_REV_ZERO && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1786 {
1787 popup.AppendMenuIcon(IDGITLC_REVERTTOREV, IDS_LOG_POPUP_REVERTTOREV, IDI_REVERT);
1788 }
1789
1790 if ((m_dwContextMenus & GetContextMenuBit(IDGITLC_REVERTTOPARENT)) && ( !this->m_CurrentVersion.IsEmpty() )
1791 && this->m_CurrentVersion != GIT_REV_ZERO && !(wcStatus & CTGitPath::LOGACTIONS_ADDED))
1792 {
1793 popup.AppendMenuIcon(IDGITLC_REVERTTOPARENT, IDS_LOG_POPUP_REVERTTOPARENT, IDI_REVERT);
1794 }
1795 }
1796
1797 if ((GetSelectedCount() == 1)&&(!(wcStatus & CTGitPath::LOGACTIONS_UNVER))
1798 &&(!(wcStatus & CTGitPath::LOGACTIONS_IGNORE)))
1799 {
1800 if (m_dwContextMenus & GITSLC_POPSHOWLOG)
1801 {
1802 popup.AppendMenuIcon(IDGITLC_LOG, IDS_REPOBROWSE_SHOWLOG, IDI_LOG);
1803 }
1804 if (m_dwContextMenus & GITSLC_POPSHOWLOGSUBMODULE && filepath->IsDirectory())
1805 {
1806 popup.AppendMenuIcon(IDGITLC_LOGSUBMODULE, IDS_LOG_SUBMODULE, IDI_LOG);
1807 }
1808 if (m_dwContextMenus & GITSLC_POPSHOWLOGOLDNAME && (wcStatus & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY) && !filepath->GetGitOldPathString().IsEmpty()))
1809 {
1810 popup.AppendMenuIcon(IDGITLC_LOGOLDNAME, IDS_STATUSLIST_SHOWLOGOLDNAME, IDI_LOG);
1811 }
1812 if (m_dwContextMenus & GITSLC_POPBLAME && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED) && m_bHasWC)
1813 {
1814 popup.AppendMenuIcon(IDGITLC_BLAME, IDS_MENUBLAME, IDI_BLAME);
1815 }
1816 }
1817
1818 if (GetSelectedCount() > 0)
1819 {
1820 if ((m_dwContextMenus & GetContextMenuBit(IDGITLC_EXPORT)) && !(wcStatus & (CTGitPath::LOGACTIONS_DELETED | CTGitPath::LOGACTIONS_MISSING)))
1821 popup.AppendMenuIcon(IDGITLC_EXPORT, IDS_LOG_POPUP_EXPORT, IDI_EXPORT);
1822 }
1823
1824 // if ((wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing) && (GetSelectedCount() == 1))
1825 if ( (GetSelectedCount() == 1) )
1826 {
1827 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_SAVEAS) && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1828 {
1829 popup.AppendMenuIcon(IDGITLC_SAVEAS, IDS_LOG_POPUP_SAVE, IDI_SAVEAS);
1830 }
1831
1832 if (m_dwContextMenus & GITSLC_POPOPEN && !filepath->IsDirectory() && !(wcStatus & (CTGitPath::LOGACTIONS_DELETED | CTGitPath::LOGACTIONS_MISSING)))
1833 {
1834 popup.AppendMenuIcon(IDGITLC_VIEWREV, IDS_LOG_POPUP_VIEWREV);
1835 popup.AppendMenuIcon(IDGITLC_OPEN, IDS_REPOBROWSE_OPEN, IDI_OPEN);
1836 popup.AppendMenuIcon(IDGITLC_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
1837 if (wcStatus & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE)) {
1838 popup.SetDefaultItem(IDGITLC_OPEN, FALSE);
1839 }
1840 }
1841
1842 if (m_dwContextMenus & GITSLC_POPEXPLORE && !(wcStatus & CTGitPath::LOGACTIONS_DELETED) && m_bHasWC)
1843 {
1844 popup.AppendMenuIcon(IDGITLC_EXPLORE, IDS_STATUSLIST_CONTEXT_EXPLORE, IDI_EXPLORER);
1845 }
1846
1847 if (m_dwContextMenus & GITSLC_PREPAREDIFF && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1848 {
1849 popup.AppendMenu(MF_SEPARATOR);
1850 popup.AppendMenuIcon(IDGITLC_PREPAREDIFF, IDS_PREPAREDIFF, IDI_DIFF);
1851 if (!m_sMarkForDiffFilename.IsEmpty())
1852 {
1853 CString diffWith;
1854 if (filepath->GetGitPathString() == m_sMarkForDiffFilename)
1855 diffWith = m_sMarkForDiffVersion;
1856 else
1857 {
1858 PathCompactPathEx(CStrBuf(diffWith, 40), m_sMarkForDiffFilename, 40, 0);
1859 diffWith += _T(":") + m_sMarkForDiffVersion.Left(g_Git.GetShortHASHLength());
1860 }
1861 CString menuEntry;
1862 menuEntry.Format(IDS_MENUDIFFNOW, (LPCTSTR)diffWith);
1863 popup.AppendMenuIcon(IDGITLC_PREPAREDIFF_COMPARE, menuEntry, IDI_DIFF);
1864 }
1865 }
1866 }
1867 if (GetSelectedCount() > 0)
1868 {
1869 // if (((wcStatus == git_wc_status_unversioned)||(wcStatus == git_wc_status_ignored))&&(m_dwContextMenus & SVNSLC_POPDELETE))
1870 // {
1871 // popup.AppendMenuIcon(IDSVNLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
1872 // }
1873 // 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))
1874 // {
1875 // if (bShift)
1876 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVEKEEP, IDI_DELETE);
1877 // else
1878 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVE, IDI_DELETE);
1879 // }
1880 if ((wcStatus & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE | CTGitPath::LOGACTIONS_MISSING))/*||(wcStatus == git_wc_status_deleted)*/)
1881 {
1882 if (m_dwContextMenus & GITSLC_POPDELETE)
1883 {
1884 popup.AppendMenuIcon(IDGITLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
1885 }
1886 }
1887 if ( (wcStatus & CTGitPath::LOGACTIONS_UNVER || wcStatus & CTGitPath::LOGACTIONS_DELETED) )
1888 {
1889 if (m_dwContextMenus & GITSLC_POPIGNORE)
1890 {
1891
1892 CTGitPathList ignorelist;
1893 FillListOfSelectedItemPaths(ignorelist);
1894 //check if all selected entries have the same extension
1895 bool bSameExt = true;
1896 CString sExt;
1897 for (int i=0; i<ignorelist.GetCount(); ++i)
1898 {
1899 if (sExt.IsEmpty() && (i==0))
1900 sExt = ignorelist[i].GetFileExtension();
1901 else if (sExt.CompareNoCase(ignorelist[i].GetFileExtension())!=0)
1902 bSameExt = false;
1903 }
1904 if (bSameExt)
1905 {
1906 if (ignoreSubMenu.CreateMenu())
1907 {
1908 CString ignorepath;
1909 if (ignorelist.GetCount()==1)
1910 ignorepath = ignorelist[0].GetFileOrDirectoryName();
1911 else
1912 ignorepath.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
1913 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_IGNORE, ignorepath);
1914 ignorepath = _T("*")+sExt;
1915 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_IGNOREMASK, ignorepath);
1916 if (ignorelist.GetCount() == 1 && !ignorelist[0].GetContainingDirectory().GetGitPathString().IsEmpty())
1917 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_IGNOREFOLDER, ignorelist[0].GetContainingDirectory().GetGitPathString());
1918 CString temp;
1919 temp.LoadString(IDS_MENUIGNORE);
1920 popup.InsertMenu((UINT)-1, MF_BYPOSITION | MF_POPUP, (UINT_PTR)ignoreSubMenu.m_hMenu, temp);
1921 }
1922 }
1923 else
1924 {
1925 CString temp;
1926 if (ignorelist.GetCount()==1)
1927 {
1928 temp.LoadString(IDS_MENUIGNORE);
1929 }
1930 else
1931 {
1932 temp.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
1933 }
1934 popup.AppendMenuIcon(IDGITLC_IGNORE, temp, IDI_IGNORE);
1935 temp.Format(IDS_MENUIGNOREMULTIPLEMASK, ignorelist.GetCount());
1936 popup.AppendMenuIcon(IDGITLC_IGNOREMASK, temp, IDI_IGNORE);
1937 }
1938 }
1939 }
1940 }
1941
1942
1943
1944 if (GetSelectedCount() > 0)
1945 {
1946 popup.AppendMenu(MF_SEPARATOR);
1947 popup.AppendMenuIcon(IDGITLC_COPY, IDS_STATUSLIST_CONTEXT_COPY, IDI_COPYCLIP);
1948 popup.AppendMenuIcon(IDGITLC_COPYEXT, IDS_STATUSLIST_CONTEXT_COPYEXT, IDI_COPYCLIP);
1949 #if 0
1950 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS))
1951 &&(wcStatus != git_wc_status_unversioned)&&(wcStatus != git_wc_status_none))
1952 {
1953 popup.AppendMenu(MF_SEPARATOR);
1954 // changelist commands
1955 size_t numChangelists = GetNumberOfChangelistsInSelection();
1956 if (numChangelists > 0)
1957 {
1958 popup.AppendMenuIcon(IDSVNLC_REMOVEFROMCS, IDS_STATUSLIST_CONTEXT_REMOVEFROMCS);
1959 }
1960 if ((!entry->IsFolder())&&(changelistSubMenu.CreateMenu()))
1961 {
1962 CString temp;
1963 temp.LoadString(IDS_STATUSLIST_CONTEXT_CREATECS);
1964 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATECS, temp);
1965
1966 if (entry->changelist.Compare(SVNSLC_IGNORECHANGELIST))
1967 {
1968 changelistSubMenu.AppendMenu(MF_SEPARATOR);
1969 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATEIGNORECS, SVNSLC_IGNORECHANGELIST);
1970 }
1971
1972 if (!m_changelists.empty())
1973 {
1974 // find the changelist names
1975 bool bNeedSeparator = true;
1976 int cmdID = IDSVNLC_MOVETOCS;
1977 for (auto it = m_changelists.cbegin(); it != m_changelists.cend(); ++it)
1978 {
1979 if ((entry->changelist.Compare(it->first))&&(it->first.Compare(SVNSLC_IGNORECHANGELIST)))
1980 {
1981 if (bNeedSeparator)
1982 {
1983 changelistSubMenu.AppendMenu(MF_SEPARATOR);
1984 bNeedSeparator = false;
1985 }
1986 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, cmdID, it->first);
1987 cmdID++;
1988 }
1989 }
1990 }
1991 temp.LoadString(IDS_STATUSLIST_CONTEXT_MOVETOCS);
1992 popup.AppendMenu(MF_POPUP|MF_STRING, (UINT_PTR)changelistSubMenu.GetSafeHmenu(), temp);
1993 }
1994 }
1995 #endif
1996 }
1997
1998 m_hShellMenu = nullptr;
1999 if (GetSelectedCount() > 0 && !(wcStatus & (CTGitPath::LOGACTIONS_DELETED | CTGitPath::LOGACTIONS_MISSING)) && m_bHasWC && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO) && shellMenu.CreatePopupMenu())
2000 {
2001 // insert the shell context menu
2002 popup.AppendMenu(MF_SEPARATOR);
2003 popup.InsertMenu((UINT)-1, MF_BYPOSITION | MF_POPUP, (UINT_PTR)shellMenu.m_hMenu, CString(MAKEINTRESOURCE(IDS_STATUSLIST_CONTEXT_SHELL)));
2004 m_hShellMenu = shellMenu.m_hMenu;
2005 }
2006
2007 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_RIGHTBUTTON, point.x, point.y, this, 0);
2008 g_IContext2 = nullptr;
2009 g_IContext3 = nullptr;
2010 if (m_pContextMenu)
2011 {
2012 if (cmd >= SHELL_MIN_CMD && cmd <= SHELL_MAX_CMD) // see if returned idCommand belongs to shell menu entries)
2013 {
2014 CMINVOKECOMMANDINFOEX cmi = { 0 };
2015 cmi.cbSize = sizeof(CMINVOKECOMMANDINFOEX);
2016 cmi.fMask = CMIC_MASK_UNICODE | CMIC_MASK_PTINVOKE;
2017 if (GetKeyState(VK_CONTROL) < 0)
2018 cmi.fMask |= CMIC_MASK_CONTROL_DOWN;
2019 if (bShift)
2020 cmi.fMask |= CMIC_MASK_SHIFT_DOWN;
2021 cmi.hwnd = m_hWnd;
2022 cmi.lpVerb = MAKEINTRESOURCEA(cmd - SHELL_MIN_CMD);
2023 cmi.lpVerbW = MAKEINTRESOURCEW(cmd - SHELL_MIN_CMD);
2024 cmi.nShow = SW_SHOWNORMAL;
2025 cmi.ptInvoke = point;
2026
2027 m_pContextMenu->InvokeCommand((LPCMINVOKECOMMANDINFO)&cmi);
2028
2029 cmd = 0;
2030 }
2031 m_pContextMenu->Release();
2032 m_pContextMenu = nullptr;
2033 }
2034 if (g_pFolderhook)
2035 {
2036 delete g_pFolderhook;
2037 g_pFolderhook = nullptr;
2038 }
2039 if (g_psfDesktopFolder)
2040 {
2041 g_psfDesktopFolder->Release();
2042 g_psfDesktopFolder = nullptr;
2043 }
2044 for (int i = 0; i < g_pidlArrayItems; i++)
2045 {
2046 if (g_pidlArray[i])
2047 CoTaskMemFree(g_pidlArray[i]);
2048 }
2049 if (g_pidlArray)
2050 CoTaskMemFree(g_pidlArray);
2051 g_pidlArray = nullptr;
2052 g_pidlArrayItems = 0;
2053
2054 m_bBlock = TRUE;
2055 AfxGetApp()->DoWaitCursor(1);
2056 //int iItemCountBeforeMenuCmd = GetItemCount();
2057 //bool bForce = false;
2058 switch (cmd)
2059 {
2060 case IDGITLC_VIEWREV:
2061 OpenFile(filepath, ALTERNATIVEEDITOR);
2062 break;
2063
2064 case IDGITLC_OPEN:
2065 OpenFile(filepath,OPEN);
2066 break;
2067
2068 case IDGITLC_OPENWITH:
2069 OpenFile(filepath,OPEN_WITH);
2070 break;
2071
2072 case IDGITLC_EXPLORE:
2073 CAppUtils::ExploreTo(GetSafeHwnd(), g_Git.CombinePath(filepath));
2074 break;
2075
2076 case IDGITLC_PREPAREDIFF:
2077 m_sMarkForDiffFilename = filepath->GetGitPathString();
2078 m_sMarkForDiffVersion = m_CurrentVersion;
2079 break;
2080
2081 case IDGITLC_PREPAREDIFF_COMPARE:
2082 {
2083 CTGitPath savedFile(m_sMarkForDiffFilename);
2084 CGitDiff::Diff(filepath, &savedFile, m_CurrentVersion, m_sMarkForDiffVersion);
2085 }
2086 break;
2087
2088 case IDGITLC_CREATERESTORE:
2089 {
2090 POSITION pos = GetFirstSelectedItemPosition();
2091 while (pos)
2092 {
2093 int index = GetNextSelectedItem(pos);
2094 CTGitPath * entry2 = (CTGitPath * )GetItemData(index);
2095 ASSERT(entry2 != NULL);
2096 if (entry2 == NULL || entry2->IsDirectory())
2097 continue;
2098 if (m_restorepaths.find(entry2->GetWinPathString()) != m_restorepaths.end())
2099 continue;
2100 CTGitPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
2101 // delete the temp file: the temp file has the FILE_ATTRIBUTE_TEMPORARY flag set
2102 // and copying the real file over it would leave that temp flag.
2103 DeleteFile(tempFile.GetWinPath());
2104 if (CopyFile(g_Git.CombinePath(entry2), tempFile.GetWinPath(), FALSE))
2105 {
2106 m_restorepaths[entry2->GetWinPathString()] = tempFile.GetWinPathString();
2107 SetItemState(index, INDEXTOOVERLAYMASK(OVL_RESTORE), LVIS_OVERLAYMASK);
2108 }
2109 }
2110 Invalidate();
2111 }
2112 break;
2113
2114 case IDGITLC_RESTOREPATH:
2115 {
2116 if (CMessageBox::Show(m_hWnd, IDS_STATUSLIST_RESTOREPATH, IDS_APPNAME, 2, IDI_QUESTION, IDS_RESTOREBUTTON, IDS_ABORTBUTTON) == 2)
2117 break;
2118 POSITION pos = GetFirstSelectedItemPosition();
2119 while (pos)
2120 {
2121 int index = GetNextSelectedItem(pos);
2122 CTGitPath * entry2 = (CTGitPath * )GetItemData(index);
2123 ASSERT(entry2 != NULL);
2124 if (entry2 == NULL)
2125 continue;
2126 if (m_restorepaths.find(entry2->GetWinPathString()) == m_restorepaths.end())
2127 continue;
2128 if (CopyFile(m_restorepaths[entry2->GetWinPathString()], g_Git.CombinePath(entry2), FALSE))
2129 {
2130 m_restorepaths.erase(entry2->GetWinPathString());
2131 SetItemState(index, 0, LVIS_OVERLAYMASK);
2132 }
2133 }
2134 Invalidate();
2135 }
2136 break;
2137
2138 // Compare current version and work copy.
2139 case IDGITLC_COMPAREWC:
2140 {
2141 if (!CheckMultipleDiffs())
2142 break;
2143 POSITION pos = GetFirstSelectedItemPosition();
2144 while ( pos )
2145 {
2146 int index = GetNextSelectedItem(pos);
2147 StartDiffWC(index);
2148 }
2149 }
2150 break;
2151
2152 // Compare with base version. when current version is zero, compare workcopy and HEAD.
2153 case IDGITLC_COMPARE:
2154 {
2155 if (!CheckMultipleDiffs())
2156 break;
2157 POSITION pos = GetFirstSelectedItemPosition();
2158 while ( pos )
2159 {
2160 int index = GetNextSelectedItem(pos);
2161 StartDiff(index);
2162 }
2163 }
2164 break;
2165
2166 case IDGITLC_COMPARETWOREVISIONS:
2167 {
2168 if (!CheckMultipleDiffs())
2169 break;
2170 POSITION pos = GetFirstSelectedItemPosition();
2171 while ( pos )
2172 {
2173 int index = GetNextSelectedItem(pos);
2174 StartDiffTwo(index);
2175 }
2176 }
2177 break;
2178
2179 case IDGITLC_COMPARETWOFILES:
2180 {
2181 POSITION pos = GetFirstSelectedItemPosition();
2182 CTGitPath * firstfilepath = NULL, * secondfilepath = NULL;
2183 if (pos)
2184 {
2185 firstfilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
2186 ASSERT(firstfilepath != NULL);
2187 if (firstfilepath == NULL)
2188 break;
2189
2190 secondfilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
2191 ASSERT(secondfilepath != NULL);
2192 if (secondfilepath == NULL)
2193 break;
2194
2195 CString sCmd;
2196 sCmd.Format(_T("/command:diff /path:\"%s\" /endrev:%s /path2:\"%s\" /startrev:%s /hwnd:%p"), firstfilepath->GetWinPath(), firstfilepath->Exists() ? GIT_REV_ZERO : _T("HEAD"), secondfilepath->GetWinPath(), secondfilepath->Exists() ? GIT_REV_ZERO : _T("HEAD"), (void*)m_hWnd);
2197 CAppUtils::RunTortoiseGitProc(sCmd);
2198 }
2199 }
2200 break;
2201
2202 case IDGITLC_GNUDIFF1:
2203 {
2204 if (!CheckMultipleDiffs())
2205 break;
2206 POSITION pos = GetFirstSelectedItemPosition();
2207 while (pos)
2208 {
2209 CTGitPath * selectedFilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
2210 if (m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
2211 {
2212 CString fromwhere;
2213 if (m_amend)
2214 fromwhere = _T("~1");
2215 CAppUtils::StartShowUnifiedDiff(m_hWnd, *selectedFilepath, GitRev::GetHead() + fromwhere, *selectedFilepath, GitRev::GetWorkingCopy());
2216 }
2217 else
2218 {
2219 if ((selectedFilepath->m_ParentNo & (PARENT_MASK | MERGE_MASK)) == 0)
2220 CAppUtils::StartShowUnifiedDiff(m_hWnd, *selectedFilepath, m_CurrentVersion + _T("~1"), *selectedFilepath, m_CurrentVersion);
2221 else
2222 {
2223 CString str;
2224 if (!(selectedFilepath->m_ParentNo & MERGE_MASK))
2225 str.Format(_T("%s^%d"), (LPCTSTR)m_CurrentVersion, (selectedFilepath->m_ParentNo & PARENT_MASK) + 1);
2226
2227 CAppUtils::StartShowUnifiedDiff(m_hWnd, *selectedFilepath, str, *selectedFilepath, m_CurrentVersion, false, false, false, false, !!(selectedFilepath->m_ParentNo & MERGE_MASK));
2228 }
2229 }
2230 }
2231 }
2232 break;
2233
2234 case IDGITLC_GNUDIFF2REVISIONS:
2235 {
2236 CAppUtils::StartShowUnifiedDiff(m_hWnd, *filepath, m_Rev2, *filepath, m_Rev1);
2237 }
2238 break;
2239
2240 case IDGITLC_ADD:
2241 {
2242 CTGitPathList paths;
2243 FillListOfSelectedItemPaths(paths, true);
2244
2245 CGitProgressDlg progDlg;
2246 AddProgressCommand addCommand;
2247 progDlg.SetCommand(&addCommand);
2248 addCommand.SetPathList(paths);
2249 progDlg.SetItemCount(paths.GetCount());
2250 progDlg.DoModal();
2251
2252 // reset unchecked status
2253 POSITION pos = GetFirstSelectedItemPosition();
2254 int index;
2255 while ((index = GetNextSelectedItem(pos)) >= 0)
2256 {
2257 m_mapFilenameToChecked.erase(((CTGitPath*)GetItemData(index))->GetGitPathString());
2258 }
2259
2260 if (NULL != GetLogicalParent() && NULL != GetLogicalParent()->GetSafeHwnd())
2261 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2262
2263 SetRedraw(TRUE);
2264 }
2265 break;
2266
2267 case IDGITLC_DELETE:
2268 DeleteSelectedFiles();
2269 break;
2270
2271 case IDGITLC_BLAME:
2272 {
2273 CAppUtils::LaunchTortoiseBlame(g_Git.CombinePath(filepath), m_CurrentVersion);
2274 }
2275 break;
2276
2277 case IDGITLC_LOG:
2278 case IDGITLC_LOGSUBMODULE:
2279 {
2280 CString sCmd;
2281 sCmd.Format(_T("/command:log /path:\"%s\""), (LPCTSTR)g_Git.CombinePath(filepath));
2282 if (cmd == IDGITLC_LOG && filepath->IsDirectory())
2283 sCmd += _T(" /submodule");
2284 if (!m_sDisplayedBranch.IsEmpty())
2285 sCmd += _T(" /range:\"") + m_sDisplayedBranch + _T("\"");
2286 CAppUtils::RunTortoiseGitProc(sCmd, false, !(cmd == IDGITLC_LOGSUBMODULE));
2287 }
2288 break;
2289
2290 case IDGITLC_LOGOLDNAME:
2291 {
2292 CTGitPath oldName(filepath->GetGitOldPathString());
2293 CString sCmd;
2294 sCmd.Format(_T("/command:log /path:\"%s\""), (LPCTSTR)g_Git.CombinePath(oldName));
2295 if (!m_sDisplayedBranch.IsEmpty())
2296 sCmd += _T(" /range:\"") + m_sDisplayedBranch + _T("\"");
2297 CAppUtils::RunTortoiseGitProc(sCmd);
2298 }
2299 break;
2300
2301 case IDGITLC_EDITCONFLICT:
2302 {
2303 if (CAppUtils::ConflictEdit(*filepath, false, m_bIsRevertTheirMy, GetLogicalParent() ? GetLogicalParent()->GetSafeHwnd() : nullptr))
2304 {
2305 CString conflictedFile = g_Git.CombinePath(filepath);
2306 if (!PathFileExists(conflictedFile) && NULL != GetLogicalParent() && NULL != GetLogicalParent()->GetSafeHwnd())
2307 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2308 }
2309 }
2310 break;
2311
2312 case IDGITLC_RESOLVETHEIRS: //follow up
2313 case IDGITLC_RESOLVEMINE: //follow up
2314 case IDGITLC_RESOLVECONFLICT:
2315 {
2316 if (CMessageBox::Show(m_hWnd, IDS_PROC_RESOLVE, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO)==IDYES)
2317 {
2318 bool needsFullRefresh = false;
2319 POSITION pos = GetFirstSelectedItemPosition();
2320 while (pos != 0)
2321 {
2322 int index;
2323 index = GetNextSelectedItem(pos);
2324 CTGitPath * fentry =(CTGitPath*) this->GetItemData(index);
2325 if(fentry == NULL)
2326 continue;
2327
2328 CAppUtils::resolve_with resolveWith = CAppUtils::RESOLVE_WITH_CURRENT;
2329 if (((!this->m_bIsRevertTheirMy) && cmd == IDGITLC_RESOLVETHEIRS) || ((this->m_bIsRevertTheirMy) && cmd == IDGITLC_RESOLVEMINE))
2330 resolveWith = CAppUtils::RESOLVE_WITH_THEIRS;
2331 else if (((!this->m_bIsRevertTheirMy) && cmd == IDGITLC_RESOLVEMINE) || ((this->m_bIsRevertTheirMy) && cmd == IDGITLC_RESOLVETHEIRS))
2332 resolveWith = CAppUtils::RESOLVE_WITH_MINE;
2333 if (CAppUtils::ResolveConflict(*fentry, resolveWith) == 0 && fentry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
2334 needsFullRefresh = true;
2335 }
2336 if (needsFullRefresh && CRegDWORD(_T("Software\\TortoiseGit\\RefreshFileListAfterResolvingConflict"), TRUE) == TRUE)
2337 {
2338 CWnd* pParent = GetLogicalParent();
2339 if (pParent && pParent->GetSafeHwnd())
2340 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2341 SetRedraw(TRUE);
2342 break;
2343 }
2344 Show(m_dwShow, 0, m_bShowFolders,0,true);
2345 }
2346 }
2347 break;
2348
2349 case IDGITLC_IGNORE:
2350 {
2351 CTGitPathList ignorelist;
2352 //std::vector<CString> toremove;
2353 FillListOfSelectedItemPaths(ignorelist, true);
2354
2355 if(!CAppUtils::IgnoreFile(ignorelist,false))
2356 break;
2357
2358 SetRedraw(FALSE);
2359 CWnd* pParent = GetLogicalParent();
2360 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2361 {
2362 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2363 }
2364 SetRedraw(TRUE);
2365 }
2366 break;
2367
2368 case IDGITLC_IGNOREMASK:
2369 {
2370 CString common;
2371 CString ext=filepath->GetFileExtension();
2372 CTGitPathList ignorelist;
2373 FillListOfSelectedItemPaths(ignorelist, true);
2374
2375 if (!CAppUtils::IgnoreFile(ignorelist,true))
2376 break;
2377
2378 SetRedraw(FALSE);
2379 CWnd* pParent = GetLogicalParent();
2380 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2381 {
2382 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2383 }
2384
2385 SetRedraw(TRUE);
2386 }
2387 break;
2388
2389 case IDGITLC_IGNOREFOLDER:
2390 {
2391 CTGitPathList ignorelist;
2392 ignorelist.AddPath(filepath->GetContainingDirectory());
2393
2394 if (!CAppUtils::IgnoreFile(ignorelist, false))
2395 break;
2396
2397 SetRedraw(FALSE);
2398 CWnd *pParent = GetLogicalParent();
2399 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2400 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2401
2402 SetRedraw(TRUE);
2403 }
2404 break;
2405 case IDGITLC_COMMIT:
2406 {
2407 CTGitPathList targetList;
2408 FillListOfSelectedItemPaths(targetList);
2409 CTGitPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
2410 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
2411 CString commandline = _T("/command:commit /pathfile:\"");
2412 commandline += tempFile.GetWinPathString();
2413 commandline += _T("\"");
2414 commandline += _T(" /deletepathfile");
2415 CAppUtils::RunTortoiseGitProc(commandline);
2416 }
2417 break;
2418 case IDGITLC_REVERT:
2419 {
2420 // If at least one item is not in the status "added"
2421 // we ask for a confirmation
2422 BOOL bConfirm = FALSE;
2423 POSITION pos = GetFirstSelectedItemPosition();
2424 int index;
2425 while ((index = GetNextSelectedItem(pos)) >= 0)
2426 {
2427 //FileEntry * fentry = GetListEntry(index);
2428 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
2429 if(fentry && fentry->m_Action &CTGitPath::LOGACTIONS_MODIFIED && !fentry->IsDirectory())
2430 {
2431 bConfirm = TRUE;
2432 break;
2433 }
2434 }
2435
2436 CString str;
2437 str.Format(IDS_PROC_WARNREVERT,GetSelectedCount());
2438
2439 if (!bConfirm || CMessageBox::Show(this->m_hWnd, str, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION)==IDYES)
2440 {
2441 CTGitPathList targetList;
2442 FillListOfSelectedItemPaths(targetList);
2443
2444 // make sure that the list is reverse sorted, so that
2445 // children are removed before any parents
2446 targetList.SortByPathname(true);
2447
2448 // put all reverted files in the trashbin, except the ones with 'added'
2449 // status because they are not restored by the revert.
2450 CTGitPathList delList;
2451 POSITION pos2 = GetFirstSelectedItemPosition();
2452 int index2;
2453 while ((index2 = GetNextSelectedItem(pos2)) >= 0)
2454 {
2455 CTGitPath *entry=(CTGitPath *)GetItemData(index2);
2456 if (entry&&(!(entry->m_Action& CTGitPath::LOGACTIONS_ADDED))
2457 && (!(entry->m_Action& CTGitPath::LOGACTIONS_REPLACED)) && !entry->IsDirectory())
2458 {
2459 CTGitPath fullpath;
2460 fullpath.SetFromWin(g_Git.CombinePath(entry));
2461 delList.AddPath(fullpath);
2462 }
2463 }
2464 if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))
2465 delList.DeleteAllFiles(true);
2466
2467 CString revertToCommit = _T("HEAD");
2468 if (m_amend)
2469 revertToCommit = _T("HEAD~1");
2470 CString err;
2471 if (g_Git.Revert(revertToCommit, targetList, err))
2472 {
2473 CMessageBox::Show(this->m_hWnd, _T("Revert failed:\n") + err, _T("TortoiseGit"), MB_ICONERROR);
2474 }
2475 else
2476 {
2477 bool updateStatusList = false;
2478 for (int i = 0 ; i < targetList.GetCount(); ++i)
2479 {
2480 int nListboxEntries = GetItemCount();
2481 for (int nItem=0; nItem<nListboxEntries; ++nItem)
2482 {
2483 CTGitPath *path=(CTGitPath*)GetItemData(nItem);
2484 if (path->GetGitPathString()==targetList[i].GetGitPathString() && !path->IsDirectory())
2485 {
2486 if(path->m_Action & CTGitPath::LOGACTIONS_ADDED)
2487 {
2488 path->m_Action = CTGitPath::LOGACTIONS_UNVER;
2489 SetEntryCheck(path,nItem,false);
2490 updateStatusList = true;
2491 #if 0 // revert an added file and some entry will be cloned (part 1/2)
2492 SetItemGroup(nItem,1);
2493 this->m_StatusFileList.RemoveItem(*path);
2494 this->m_UnRevFileList.AddPath(*path);
2495 //this->m_IgnoreFileList.RemoveItem(*path);
2496 #endif
2497 }
2498 else
2499 {
2500 if (GetCheck(nItem))
2501 m_nSelected--;
2502 RemoveListEntry(nItem);
2503 }
2504 break;
2505 }
2506 else if (path->GetGitPathString()==targetList[i].GetGitPathString() && path->IsDirectory() && path->IsWCRoot())
2507 {
2508 CString sCmd;
2509 sCmd.Format(_T("/command:revert /path:\"%s\""), (LPCTSTR)path->GetGitPathString());
2510 CCommonAppUtils::RunTortoiseGitProc(sCmd);
2511 }
2512 }
2513 }
2514 SetRedraw(TRUE);
2515 SaveColumnWidths();
2516 #if 0 // revert an added file and some entry will be cloned (part 2/2)
2517 Show(m_dwShow, 0, m_bShowFolders,updateStatusList,true);
2518 NotifyCheck();
2519 #else
2520 if (updateStatusList && nullptr != GetLogicalParent() && nullptr != GetLogicalParent()->GetSafeHwnd())
2521 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2522 #endif
2523 }
2524 }
2525 }
2526 break;
2527
2528 case IDGITLC_ASSUMEVALID:
2529 SetGitIndexFlagsForSelectedFiles(IDS_PROC_MARK_ASSUMEVALID, BST_CHECKED, BST_INDETERMINATE);
2530 break;
2531 case IDGITLC_SKIPWORKTREE:
2532 SetGitIndexFlagsForSelectedFiles(IDS_PROC_MARK_SKIPWORKTREE, BST_INDETERMINATE, BST_CHECKED);
2533 break;
2534 case IDGITLC_UNSETIGNORELOCALCHANGES:
2535 SetGitIndexFlagsForSelectedFiles(IDS_PROC_UNSET_IGNORELOCALCHANGES, BST_UNCHECKED, BST_UNCHECKED);
2536 break;
2537 case IDGITLC_COPY:
2538 CopySelectedEntriesToClipboard(0);
2539 break;
2540 case IDGITLC_COPYEXT:
2541 CopySelectedEntriesToClipboard((DWORD)-1);
2542 break;
2543 case IDGITLC_EXPORT:
2544 FilesExport();
2545 break;
2546 case IDGITLC_SAVEAS:
2547 FileSaveAs(filepath);
2548 break;
2549
2550 case IDGITLC_REVERTTOREV:
2551 RevertSelectedItemToVersion();
2552 break;
2553 case IDGITLC_REVERTTOPARENT:
2554 RevertSelectedItemToVersion(true);
2555 break;
2556 #if 0
2557 case IDSVNLC_COMMIT:
2558 {
2559 CTSVNPathList targetList;
2560 FillListOfSelectedItemPaths(targetList);
2561 CTSVNPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
2562 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
2563 CString commandline = CPathUtils::GetAppDirectory();
2564 commandline += _T("TortoiseGitProc.exe /command:commit /pathfile:\"");
2565 commandline += tempFile.GetWinPathString();
2566 commandline += _T("\"");
2567 commandline += _T(" /deletepathfile");
2568 CAppUtils::LaunchApplication(commandline, NULL, false);
2569 }
2570 break;
2571 case IDSVNLC_CREATEIGNORECS:
2572 CreateChangeList(SVNSLC_IGNORECHANGELIST);
2573 break;
2574 case IDSVNLC_CREATECS:
2575 {
2576 CCreateChangelistDlg dlg;
2577 if (dlg.DoModal() == IDOK)
2578 {
2579 CreateChangeList(dlg.m_sName);
2580 }
2581 }
2582 break;
2583 default:
2584 {
2585 if (cmd < IDSVNLC_MOVETOCS)
2586 break;
2587 CTSVNPathList changelistItems;
2588 FillListOfSelectedItemPaths(changelistItems);
2589
2590 // find the changelist name
2591 CString sChangelist;
2592 int cmdID = IDSVNLC_MOVETOCS;
2593 SetRedraw(FALSE);
2594 for (auto it = m_changelists.cbegin(); it != m_changelists.cend(); ++it)
2595 {
2596 if ((it->first.Compare(SVNSLC_IGNORECHANGELIST))&&(entry->changelist.Compare(it->first)))
2597 {
2598 if (cmd == cmdID)
2599 {
2600 sChangelist = it->first;
2601 }
2602 cmdID++;
2603 }
2604 }
2605 if (!sChangelist.IsEmpty())
2606 {
2607 SVN git;
2608 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
2609 {
2610 // The changelists were moved, but we now need to run through the selected items again
2611 // and update their changelist
2612 POSITION pos = GetFirstSelectedItemPosition();
2613 int index;
2614 while ((index = GetNextSelectedItem(pos)) >= 0)
2615 {
2616 FileEntry * e = GetListEntry(index);
2617 e->changelist = sChangelist;
2618 if (!e->IsFolder())
2619 {
2620 if (m_changelists.find(e->changelist)!=m_changelists.end())
2621 SetItemGroup(index, m_changelists[e->changelist]);
2622 else
2623 SetItemGroup(index, 0);
2624 }
2625 }
2626 }
2627 else
2628 {
2629 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
2630 }
2631 }
2632 SetRedraw(TRUE);
2633 }
2634 break;
2635 #endif
2636
2637 } // switch (cmd)
2638 m_bBlock = FALSE;
2639 AfxGetApp()->DoWaitCursor(-1);
2640 GetStatisticsString();
2641 //int iItemCountAfterMenuCmd = GetItemCount();
2642 //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)
2643 //{
2644 // CWnd* pParent = GetParent();
2645 // if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2646 // {
2647 // pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);
2648 // }
2649 //}
2650 } // if (popup.CreatePopupMenu())
2651 } // if (selIndex >= 0)
2652
2653 }
2654
2655 void CGitStatusListCtrl::SetGitIndexFlagsForSelectedFiles(UINT message, BOOL assumevalid, BOOL skipworktree)
2656 {
2657 if (CMessageBox::Show(GetSafeHwnd(), message, IDS_APPNAME, MB_YESNO | MB_DEFBUTTON2 | MB_ICONQUESTION) != IDYES)
2658 return;
2659
2660 CAutoRepository repository(g_Git.GetGitRepository());
2661 if (!repository)
2662 {
2663 CMessageBox::Show(m_hWnd, g_Git.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR);
2664 return;
2665 }
2666
2667 CAutoIndex gitindex;
2668 if (git_repository_index(gitindex.GetPointer(), repository))
2669 {
2670 CMessageBox::Show(m_hWnd, g_Git.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR);
2671 return;
2672 }
2673
2674 POSITION pos = GetFirstSelectedItemPosition();
2675 int index = -1;
2676 while ((index = GetNextSelectedItem(pos)) >= 0)
2677 {
2678 CTGitPath * path = (CTGitPath *)GetItemData(index);
2679 ASSERT(path);
2680 if (path == nullptr)
2681 continue;
2682
2683 size_t idx;
2684 if (!git_index_find(&idx, gitindex, CUnicodeUtils::GetMulti(path->GetGitPathString(), CP_UTF8)))
2685 {
2686 git_index_entry *e = const_cast<git_index_entry *>(git_index_get_byindex(gitindex, idx)); // HACK
2687 if (assumevalid == BST_UNCHECKED)
2688 e->flags &= ~GIT_IDXENTRY_VALID;
2689 else if (assumevalid == BST_CHECKED)
2690 e->flags |= GIT_IDXENTRY_VALID;
2691 if (skipworktree == BST_UNCHECKED)
2692 e->flags_extended &= ~GIT_IDXENTRY_SKIP_WORKTREE;
2693 else if (skipworktree == BST_CHECKED)
2694 e->flags_extended |= GIT_IDXENTRY_SKIP_WORKTREE;
2695 git_index_add(gitindex, e);
2696 }
2697 else
2698 CMessageBox::Show(m_hWnd, g_Git.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR);
2699 }
2700
2701 if (git_index_write(gitindex))
2702 {
2703 CMessageBox::Show(m_hWnd, g_Git.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR);
2704 return;
2705 }
2706
2707 if (nullptr != GetLogicalParent() && nullptr != GetLogicalParent()->GetSafeHwnd())
2708 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2709
2710 SetRedraw(TRUE);
2711 }
2712
2713 void CGitStatusListCtrl::OnContextMenuHeader(CWnd * pWnd, CPoint point)
2714 {
2715 Locker lock(m_critSec);
2716 m_ColumnManager.OnContextMenuHeader(pWnd,point,!!IsGroupViewEnabled());
2717 }
2718
2719 void CGitStatusListCtrl::OnContextMenu(CWnd* pWnd, CPoint point)
2720 {
2721
2722 if (pWnd == this)
2723 {
2724 OnContextMenuList(pWnd, point);
2725 } // if (pWnd == this)
2726 else if (pWnd == GetHeaderCtrl())
2727 {
2728 OnContextMenuHeader(pWnd, point);
2729 }
2730 }
2731
2732 void CGitStatusListCtrl::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
2733 {
2734
2735 Locker lock(m_critSec);
2736 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
2737 *pResult = 0;
2738 if (m_bBlock)
2739 return;
2740
2741 if (pNMLV->iItem < 0)
2742 return;
2743
2744 CTGitPath *file=(CTGitPath*)GetItemData(pNMLV->iItem);
2745
2746 if (file->m_Action & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE)) {
2747 OpenFile(file, OPEN);
2748 return;
2749 }
2750 if( file->m_Action&CTGitPath::LOGACTIONS_UNMERGED )
2751 {
2752 if (CAppUtils::ConflictEdit(*file, false, m_bIsRevertTheirMy, GetLogicalParent() ? GetLogicalParent()->GetSafeHwnd() : nullptr))
2753 {
2754 CString conflictedFile = g_Git.CombinePath(file);
2755 if (!PathFileExists(conflictedFile) && NULL != GetLogicalParent() && NULL != GetLogicalParent()->GetSafeHwnd())
2756 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2757 }
2758 }
2759 else if ((file->m_Action & CTGitPath::LOGACTIONS_MISSING) && file->m_Action != (CTGitPath::LOGACTIONS_MISSING | CTGitPath::LOGACTIONS_DELETED) && file->m_Action != (CTGitPath::LOGACTIONS_MISSING | CTGitPath::LOGACTIONS_DELETED | CTGitPath::LOGACTIONS_MODIFIED))
2760 return;
2761 else
2762 {
2763 if (!m_Rev1.IsEmpty() && !m_Rev2.IsEmpty())
2764 StartDiffTwo(pNMLV->iItem);
2765 else
2766 StartDiff(pNMLV->iItem);
2767 }
2768
2769 }
2770 void CGitStatusListCtrl::StartDiffTwo(int fileindex)
2771 {
2772 if(fileindex<0)
2773 return;
2774
2775 auto ptr = (CTGitPath*)GetItemData(fileindex);
2776 if (ptr == nullptr)
2777 return;
2778 CTGitPath file1 = *ptr;
2779
2780 if (file1.m_Action & CTGitPath::LOGACTIONS_ADDED)
2781 CGitDiff::DiffNull(&file1, m_Rev1, true);
2782 else if (file1.m_Action & CTGitPath::LOGACTIONS_DELETED)
2783 CGitDiff::DiffNull(&file1, m_Rev2, false);
2784 else
2785 CGitDiff::Diff(&file1, &file1, m_Rev1, m_Rev2);
2786
2787 }
2788 void CGitStatusListCtrl::StartDiffWC(int fileindex)
2789 {
2790 if(fileindex<0)
2791 return;
2792
2793 CString Ver;
2794 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
2795 return;
2796
2797 auto ptr = (CTGitPath*)GetItemData(fileindex);
2798 if (ptr == nullptr)
2799 return;
2800 CTGitPath file1 = *ptr;
2801 file1.m_Action = 0; // reset action, so that diff is not started as added/deleted file; see issue #1757
2802
2803 CGitDiff::Diff(&file1,&file1, GIT_REV_ZERO, m_CurrentVersion);
2804
2805 }
2806
2807 void CGitStatusListCtrl::StartDiff(int fileindex)
2808 {
2809 if(fileindex<0)
2810 return;
2811
2812 auto ptr = (CTGitPath*)GetItemData(fileindex);
2813 if (ptr == nullptr)
2814 return;
2815 CTGitPath file1 = *ptr;
2816 CTGitPath file2;
2817 if(file1.m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY))
2818 {
2819 file2.SetFromGit(file1.GetGitOldPathString());
2820 }
2821 else
2822 {
2823 file2=file1;
2824 }
2825
2826 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
2827 {
2828 CString fromwhere;
2829 if(m_amend && (file1.m_Action & CTGitPath::LOGACTIONS_ADDED) == 0)
2830 fromwhere = _T("~1");
2831 if( g_Git.IsInitRepos())
2832 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2833 GIT_REV_ZERO);
2834 else if( file1.m_Action&CTGitPath::LOGACTIONS_ADDED )
2835 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2836 m_CurrentVersion+fromwhere,true);
2837 else if( file1.m_Action&CTGitPath::LOGACTIONS_DELETED )
2838 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2839 GitRev::GetHead()+fromwhere,false);
2840 else
2841 CGitDiff::Diff(&file1,&file2,
2842 CString(GIT_REV_ZERO),
2843 GitRev::GetHead()+fromwhere);
2844 }
2845 else
2846 {
2847 CGitHash hash;
2848 CString fromwhere = m_CurrentVersion+_T("~1");
2849 if(m_amend)
2850 fromwhere = m_CurrentVersion+_T("~2");
2851 bool revfail = !!g_Git.GetHash(hash, fromwhere);
2852 if (revfail || (file1.m_Action & file1.LOGACTIONS_ADDED))
2853 {
2854 CGitDiff::DiffNull(&file1,m_CurrentVersion,true);
2855
2856 }
2857 else if (file1.m_Action & file1.LOGACTIONS_DELETED)
2858 {
2859 if (file1.m_ParentNo > 0)
2860 fromwhere.Format(_T("%s^%d"), (LPCTSTR)m_CurrentVersion, file1.m_ParentNo + 1);
2861
2862 CGitDiff::DiffNull(&file1,fromwhere,false);
2863 }
2864 else
2865 {
2866 if( file1.m_ParentNo & MERGE_MASK)
2867 {
2868
2869 CTGitPath base, theirs, mine, merge;
2870
2871 CString temppath;
2872 GetTempPath(temppath);
2873 temppath.TrimRight(_T("\\"));
2874
2875 mine.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".LOCAL") + file1.GetFileExtension());
2876 theirs.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".REMOTE") + file1.GetFileExtension());
2877 base.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".BASE") + file1.GetFileExtension());
2878
2879 CFile tempfile;
2880 //create a empty file, incase stage is not three
2881 tempfile.Open(mine.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2882 tempfile.Close();
2883 tempfile.Open(theirs.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2884 tempfile.Close();
2885 tempfile.Open(base.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2886 tempfile.Close();
2887
2888 merge.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".Merged") + file1.GetFileExtension());
2889
2890 int parent1=-1, parent2 =-1;
2891 for (size_t i = 0; i < m_arStatusArray.size(); ++i)
2892 {
2893 if(m_arStatusArray[i]->GetGitPathString() == file1.GetGitPathString())
2894 {
2895 if(m_arStatusArray[i]->m_ParentNo & MERGE_MASK)
2896 {
2897 }
2898 else
2899 {
2900 if(parent1<0)
2901 {
2902 parent1 = m_arStatusArray[i]->m_ParentNo & PARENT_MASK;
2903 }
2904 else if (parent2 <0)
2905 {
2906 parent2 = m_arStatusArray[i]->m_ParentNo & PARENT_MASK;
2907 }
2908 }
2909 }
2910 }
2911
2912 if(g_Git.GetOneFile(m_CurrentVersion, file1, (CString&)merge.GetWinPathString()))
2913 {
2914 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2915 }
2916
2917 if(parent1>=0)
2918 {
2919 CString str;
2920 str.Format(_T("%s^%d"), (LPCTSTR)this->m_CurrentVersion, parent1 + 1);
2921
2922 if(g_Git.GetOneFile(str, file1, (CString&)mine.GetWinPathString()))
2923 {
2924 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2925 }
2926 }
2927
2928 if(parent2>=0)
2929 {
2930 CString str;
2931 str.Format(_T("%s^%d"), (LPCTSTR)this->m_CurrentVersion, parent2 + 1);
2932
2933 if(g_Git.GetOneFile(str, file1, (CString&)theirs.GetWinPathString()))
2934 {
2935 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2936 }
2937 }
2938
2939 if(parent1>=0 && parent2>=0)
2940 {
2941 CString cmd, output;
2942 cmd.Format(_T("git.exe merge-base %s^%d %s^%d"), (LPCTSTR)this->m_CurrentVersion, parent1 + 1,
2943 this->m_CurrentVersion,parent2+1);
2944
2945 if (g_Git.Run(cmd, &output, NULL, CP_UTF8))
2946 {
2947 }
2948 else
2949 {
2950 if(g_Git.GetOneFile(output.Left(40), file1, (CString&)base.GetWinPathString()))
2951 {
2952 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETBASEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2953 }
2954 }
2955 }
2956 CAppUtils::StartExtMerge(base, theirs, mine, merge,_T("BASE"),_T("REMOTE"),_T("LOCAL"));
2957
2958 }
2959 else
2960 {
2961 CString str;
2962 if( (file1.m_ParentNo&PARENT_MASK) == 0)
2963 {
2964 str = _T("~1");
2965 }
2966 else
2967 {
2968 str.Format(_T("^%d"), (file1.m_ParentNo&PARENT_MASK)+1);
2969 }
2970 CGitDiff::Diff(&file1,&file2,
2971 m_CurrentVersion,
2972 m_CurrentVersion+str);
2973 }
2974 }
2975 }
2976 }
2977
2978 CString CGitStatusListCtrl::GetStatisticsString(bool simple)
2979 {
2980 CString sNormal = CString(MAKEINTRESOURCE(IDS_STATUSNORMAL));
2981 CString sAdded = CString(MAKEINTRESOURCE(IDS_STATUSADDED));
2982 CString sDeleted = CString(MAKEINTRESOURCE(IDS_STATUSDELETED));
2983 CString sModified = CString(MAKEINTRESOURCE(IDS_STATUSMODIFIED));
2984 CString sConflicted = CString(MAKEINTRESOURCE(IDS_STATUSCONFLICTED));
2985 CString sUnversioned = CString(MAKEINTRESOURCE(IDS_STATUSUNVERSIONED));
2986 CString sRenamed = CString(MAKEINTRESOURCE(IDS_STATUSREPLACED));
2987 CString sToolTip;
2988 if(simple)
2989 {
2990 sToolTip.Format(IDS_STATUSLIST_STATUSLINE1,
2991 this->m_nLineAdded,this->m_nLineDeleted,
2992 (LPCTSTR)sModified, m_nModified,
2993 (LPCTSTR)sAdded, m_nAdded,
2994 (LPCTSTR)sDeleted, m_nDeleted,
2995 (LPCTSTR)sRenamed, m_nRenamed
2996 );
2997 }
2998 else
2999 {
3000 sToolTip.Format(IDS_STATUSLIST_STATUSLINE2,
3001 this->m_nLineAdded,this->m_nLineDeleted,
3002 (LPCTSTR)sNormal, m_nNormal,
3003 (LPCTSTR)sUnversioned, m_nUnversioned,
3004 (LPCTSTR)sModified, m_nModified,
3005 (LPCTSTR)sAdded, m_nAdded,
3006 (LPCTSTR)sDeleted, m_nDeleted,
3007 (LPCTSTR)sConflicted, m_nConflicted
3008 );
3009 }
3010 CString sStats;
3011 sStats.Format(IDS_COMMITDLG_STATISTICSFORMAT, m_nSelected, GetItemCount());
3012 if (m_pStatLabel)
3013 {
3014 m_pStatLabel->SetWindowText(sStats);
3015 }
3016
3017 if (m_pSelectButton)
3018 {
3019 if (m_nSelected == 0)
3020 m_pSelectButton->SetCheck(BST_UNCHECKED);
3021 else if (m_nSelected != GetItemCount())
3022 m_pSelectButton->SetCheck(BST_INDETERMINATE);
3023 else
3024 m_pSelectButton->SetCheck(BST_CHECKED);
3025 }
3026
3027 if (m_pConfirmButton)
3028 {
3029 m_pConfirmButton->EnableWindow(m_nSelected>0);
3030 }
3031
3032 return sToolTip;
3033
3034
3035 }
3036
3037 CString CGitStatusListCtrl::GetCommonDirectory(bool bStrict)
3038 {
3039 if (!bStrict)
3040 {
3041 // not strict means that the selected folder has priority
3042 if (!m_StatusFileList.GetCommonDirectory().IsEmpty())
3043 return m_StatusFileList.GetCommonDirectory().GetWinPath();
3044 }
3045
3046 CTGitPath commonBaseDirectory;
3047 int nListItems = GetItemCount();
3048 for (int i=0; i<nListItems; ++i)
3049 {
3050 CTGitPath baseDirectory,*p= (CTGitPath*)this->GetItemData(i);
3051 ASSERT(p);
3052 if(p==NULL)
3053 continue;
3054 baseDirectory = p->GetDirectory();
3055
3056 if(commonBaseDirectory.IsEmpty())
3057 {
3058 commonBaseDirectory = baseDirectory;
3059 }
3060 else
3061 {
3062 if (commonBaseDirectory.GetWinPathString().GetLength() > baseDirectory.GetWinPathString().GetLength())
3063 {
3064 if (baseDirectory.IsAncestorOf(commonBaseDirectory))
3065 commonBaseDirectory = baseDirectory;
3066 }
3067 }
3068 }
3069 return g_Git.CombinePath(commonBaseDirectory);
3070 }
3071
3072
3073 void CGitStatusListCtrl::SelectAll(bool bSelect, bool /*bIncludeNoCommits*/)
3074 {
3075 CWaitCursor waitCursor;
3076 // block here so the LVN_ITEMCHANGED messages
3077 // get ignored
3078 m_bBlock = TRUE;
3079 SetRedraw(FALSE);
3080
3081 int nListItems = GetItemCount();
3082 if (bSelect)
3083 m_nSelected = nListItems;
3084 else
3085 m_nSelected = 0;
3086
3087 for (int i=0; i<nListItems; ++i)
3088 {
3089 //FileEntry * entry = GetListEntry(i);
3090 //ASSERT(entry != NULL);
3091 CTGitPath *path = (CTGitPath *) GetItemData(i);
3092 if (path == NULL)
3093 continue;
3094 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))
3095 SetEntryCheck(path,i,bSelect);
3096 }
3097
3098 // unblock before redrawing
3099 m_bBlock = FALSE;
3100 SetRedraw(TRUE);
3101 GetStatisticsString();
3102 NotifyCheck();
3103 }
3104
3105 void CGitStatusListCtrl::Check(DWORD dwCheck, bool check)
3106 {
3107 CWaitCursor waitCursor;
3108 // block here so the LVN_ITEMCHANGED messages
3109 // get ignored
3110 m_bBlock = TRUE;
3111 SetRedraw(FALSE);
3112
3113 int nListItems = GetItemCount();
3114
3115 for (int i = 0; i < nListItems; ++i)
3116 {
3117 CTGitPath *entry = (CTGitPath *) GetItemData(i);
3118 if (entry == NULL)
3119 continue;
3120
3121 DWORD showFlags = entry->m_Action;
3122 if (entry->IsDirectory())
3123 showFlags |= GITSLC_SHOWSUBMODULES;
3124 else
3125 showFlags |= GITSLC_SHOWFILES;
3126
3127 if (check && (showFlags & dwCheck) && !GetCheck(i) && !(entry->IsDirectory() && m_bDoNotAutoselectSubmodules && !(dwCheck & GITSLC_SHOWSUBMODULES)))
3128 {
3129 SetEntryCheck(entry, i, true);
3130 m_nSelected++;
3131 }
3132 else if (!check && (showFlags & dwCheck) && GetCheck(i))
3133 {
3134 SetEntryCheck(entry, i, false);
3135 m_nSelected--;
3136 }
3137 }
3138 // unblock before redrawing
3139 m_bBlock = FALSE;
3140 SetRedraw(TRUE);
3141 GetStatisticsString();
3142 NotifyCheck();
3143 }
3144
3145 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR *pNMHDR, LRESULT *pResult)
3146 {
3147 LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast<LPNMLVGETINFOTIP>(pNMHDR);
3148 *pResult = 0;
3149 if (m_bBlock)
3150 return;
3151
3152 CTGitPath *entry=(CTGitPath *)GetItemData(pGetInfoTip->iItem);
3153
3154 if (entry)
3155 if (pGetInfoTip->cchTextMax > entry->GetGitPathString().GetLength() + g_Git.m_CurrentDir.GetLength())
3156 {
3157 CString str = g_Git.CombinePath(entry->GetWinPathString());
3158 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, str.GetBuffer(), pGetInfoTip->cchTextMax - 1);
3159 }
3160 }
3161
3162 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult)
3163 {
3164 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
3165
3166 // Take the default processing unless we set this to something else below.
3167 *pResult = CDRF_DODEFAULT;
3168
3169 // First thing - check the draw stage. If it's the control's prepaint
3170 // stage, then tell Windows we want messages for every item.
3171
3172 switch (pLVCD->nmcd.dwDrawStage)
3173 {
3174 case CDDS_PREPAINT:
3175 *pResult = CDRF_NOTIFYITEMDRAW;
3176 break;
3177 case CDDS_ITEMPREPAINT:
3178 {
3179 // This is the prepaint stage for an item. Here's where we set the
3180 // item's text color. Our return value will tell Windows to draw the
3181 // item itself, but it will use the new color we set here.
3182
3183 // Tell Windows to paint the control itself.
3184 *pResult = CDRF_DODEFAULT;
3185 if (m_bBlock)
3186 return;
3187
3188 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
3189
3190 if (m_arStatusArray.size() > (DWORD_PTR)pLVCD->nmcd.dwItemSpec)
3191 {
3192
3193 //FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);
3194 CTGitPath *entry=(CTGitPath *)GetItemData((int)pLVCD->nmcd.dwItemSpec);
3195 if (entry == NULL)
3196 return;
3197
3198 // coloring
3199 // ========
3200 // black : unversioned, normal
3201 // purple : added
3202 // blue : modified
3203 // brown : missing, deleted, replaced
3204 // green : merged (or potential merges)
3205 // red : conflicts or sure conflicts
3206 if(entry->m_Action & CTGitPath::LOGACTIONS_GRAY)
3207 {
3208 crText = RGB(128,128,128);
3209
3210 }
3211 else if(entry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
3212 {
3213 crText = m_Colors.GetColor(CColors::Conflict);
3214
3215 }
3216 else if(entry->m_Action & (CTGitPath::LOGACTIONS_MODIFIED))
3217 {
3218 crText = m_Colors.GetColor(CColors::Modified);
3219
3220 }
3221 else if(entry->m_Action & (CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))
3222 {
3223 crText = m_Colors.GetColor(CColors::Added);
3224 }
3225 else if(entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
3226 {
3227 crText = m_Colors.GetColor(CColors::Deleted);
3228 }
3229 else if(entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
3230 {
3231 crText = m_Colors.GetColor(CColors::Renamed);
3232 }
3233 else if(entry->m_Action & CTGitPath::LOGACTIONS_MERGED)
3234 {
3235 crText = m_Colors.GetColor(CColors::Merged);
3236 }
3237 else
3238 {
3239 crText = GetSysColor(COLOR_WINDOWTEXT);
3240 }
3241 // Store the color back in the NMLVCUSTOMDRAW struct.
3242 pLVCD->clrText = crText;
3243 }
3244 }
3245 break;
3246 }
3247 }
3248
3249 BOOL CGitStatusListCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
3250 {
3251 if (pWnd != this)
3252 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
3253 if (!m_bBlock)
3254 {
3255 HCURSOR hCur = LoadCursor(NULL, IDC_ARROW);
3256 SetCursor(hCur);
3257 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
3258 }
3259 HCURSOR hCur = LoadCursor(NULL, IDC_WAIT);
3260 SetCursor(hCur);
3261 return TRUE;
3262 }
3263
3264 void CGitStatusListCtrl::RemoveListEntry(int index)
3265 {
3266
3267 Locker lock(m_critSec);
3268 DeleteItem(index);
3269
3270 m_arStatusArray.erase(m_arStatusArray.cbegin() + index);
3271
3272 #if 0
3273 delete m_arStatusArray[m_arListArray[index]];
3274 m_arStatusArray.erase(m_arStatusArray.begin()+m_arListArray[index]);
3275 m_arListArray.erase(m_arListArray.begin()+index);
3276 for (int i=index; i< (int)m_arListArray.size(); ++i)
3277 {
3278 m_arListArray[i]--;
3279 }
3280 #endif
3281 }
3282
3283 ///< Set a checkbox on an entry in the listbox
3284 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync
3285 void CGitStatusListCtrl::SetEntryCheck(CTGitPath* pEntry, int listboxIndex, bool bCheck)
3286 {
3287 pEntry->m_Checked = bCheck;
3288 m_mapFilenameToChecked[pEntry->GetGitPathString()] = bCheck;
3289 SetCheck(listboxIndex, bCheck);
3290 }
3291
3292 #if 0
3293 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry* parentEntry, bool bCheck)
3294 {
3295
3296 int nListItems = GetItemCount();
3297 for (int j=0; j< nListItems ; ++j)
3298 {
3299 FileEntry * childEntry = GetListEntry(j);
3300 ASSERT(childEntry != NULL);
3301 if (childEntry == NULL || childEntry == parentEntry)
3302 continue;
3303 if (childEntry->checked != bCheck)
3304 {
3305 if (parentEntry->path.IsAncestorOf(childEntry->path))
3306 {
3307 SetEntryCheck(childEntry,j,bCheck);
3308 if(bCheck)
3309 {
3310 m_nSelected++;
3311 }
3312 else
3313 {
3314 m_nSelected--;
3315 }
3316 }
3317 }
3318 }
3319
3320 }
3321 #endif
3322
3323 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList& pathList)
3324 {
3325
3326 pathList.Clear();
3327 int nListItems = GetItemCount();
3328 for (int i = 0; i< nListItems; ++i)
3329 {
3330 CTGitPath * entry = (CTGitPath*)GetItemData(i);
3331 ASSERT(entry != NULL);
3332 if (entry->m_Checked)
3333 {
3334 pathList.AddPath(*entry);
3335 }
3336 }
3337 pathList.SortByPathname();
3338
3339 }
3340
3341
3342 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)
3343 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList& pathList, bool /*bNoIgnored*/)
3344 {
3345 pathList.Clear();
3346
3347 POSITION pos = GetFirstSelectedItemPosition();
3348 int index;
3349 while ((index = GetNextSelectedItem(pos)) >= 0)
3350 {
3351 CTGitPath * entry = (CTGitPath*)GetItemData(index);
3352 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))
3353 // continue;
3354 pathList.AddPath(*entry);
3355 }
3356 }
3357
3358 UINT CGitStatusListCtrl::OnGetDlgCode()
3359 {
3360 // we want to process the return key and not have that one
3361 // routed to the default pushbutton
3362 return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS;
3363 }
3364
3365 void CGitStatusListCtrl::OnNMReturn(NMHDR * /*pNMHDR*/, LRESULT *pResult)
3366 {
3367 *pResult = 0;
3368 if (m_bBlock)
3369 return;
3370 if (!CheckMultipleDiffs())
3371 return;
3372 bool needsRefresh = false;
3373 POSITION pos = GetFirstSelectedItemPosition();
3374 while ( pos )
3375 {
3376 int index = GetNextSelectedItem(pos);
3377 if (index < 0)
3378 return;
3379 CTGitPath *file=(CTGitPath*)GetItemData(index);
3380 if (file == nullptr)
3381 return;
3382 if (file->m_Action & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE))
3383 {
3384 OpenFile(file, OPEN);
3385 }
3386 else if ((file->m_Action & CTGitPath::LOGACTIONS_UNMERGED))
3387 {
3388 if (CAppUtils::ConflictEdit(*file, false, m_bIsRevertTheirMy, GetLogicalParent() ? GetLogicalParent()->GetSafeHwnd() : nullptr))
3389 {
3390 CString conflictedFile = g_Git.CombinePath(file);
3391 needsRefresh = needsRefresh || !PathFileExists(conflictedFile);
3392 }
3393 }
3394 else if ((file->m_Action & CTGitPath::LOGACTIONS_MISSING) && file->m_Action != (CTGitPath::LOGACTIONS_MISSING | CTGitPath::LOGACTIONS_DELETED) && file->m_Action != (CTGitPath::LOGACTIONS_MISSING | CTGitPath::LOGACTIONS_DELETED | CTGitPath::LOGACTIONS_MODIFIED))
3395 continue;
3396 else
3397 {
3398 if (!m_Rev1.IsEmpty() && !m_Rev2.IsEmpty())
3399 StartDiffTwo(index);
3400 else
3401 StartDiff(index);
3402 }
3403 }
3404 if (needsRefresh && NULL != GetLogicalParent() && NULL != GetLogicalParent()->GetSafeHwnd())
3405 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
3406 }
3407
3408 void CGitStatusListCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
3409 {
3410 // Since we catch all keystrokes (to have the enter key processed here instead
3411 // of routed to the default pushbutton) we have to make sure that other
3412 // keys like Tab and Esc still do what they're supposed to do
3413 // Tab = change focus to next/previous control
3414 // Esc = quit the dialog
3415 switch (nChar)
3416 {
3417 case (VK_TAB):
3418 {
3419 ::PostMessage(GetLogicalParent()->GetSafeHwnd(), WM_NEXTDLGCTL, GetKeyState(VK_SHIFT)&0x8000, 0);
3420 return;
3421 }
3422 break;
3423 case (VK_ESCAPE):
3424 {
3425 ::SendMessage(GetLogicalParent()->GetSafeHwnd(), WM_CLOSE, 0, 0);
3426 }
3427 break;
3428 }
3429
3430 CListCtrl::OnKeyDown(nChar, nRepCnt, nFlags);
3431 }
3432
3433 void CGitStatusListCtrl::PreSubclassWindow()
3434 {
3435 CListCtrl::PreSubclassWindow();
3436 EnableToolTips(TRUE);
3437 SetWindowTheme(GetSafeHwnd(), L"Explorer", NULL);
3438 }
3439
3440 void CGitStatusListCtrl::OnPaint()
3441 {
3442 LRESULT defres = Default();
3443 if ((m_bBusy) || (m_bEmpty))
3444 {
3445 CString str;
3446 if (m_bBusy)
3447 {
3448 if (m_sBusy.IsEmpty())
3449 str.LoadString(IDS_STATUSLIST_BUSYMSG);
3450 else
3451 str = m_sBusy;
3452 }
3453 else
3454 {
3455 if (m_sEmpty.IsEmpty())
3456 str.LoadString(IDS_STATUSLIST_EMPTYMSG);
3457 else
3458 str = m_sEmpty;
3459 }
3460 COLORREF clrText = ::GetSysColor(COLOR_WINDOWTEXT);
3461
3462 CRect rc;
3463 GetClientRect(&rc);
3464 CHeaderCtrl* pHC = GetHeaderCtrl();
3465 if (pHC != NULL)
3466 {
3467 CRect rcH;
3468 pHC->GetItemRect(0, &rcH);
3469 rc.top += rcH.bottom;
3470 }
3471 CDC* pDC = GetDC();
3472 {
3473 CMyMemDC memDC(pDC, &rc);
3474
3475 memDC.SetTextColor(clrText);
3476 memDC.SetBkMode(TRANSPARENT);
3477 memDC.BitBlt(rc.left, rc.top, rc.Width(), rc.Height(), pDC, rc.left, rc.top, SRCCOPY);
3478 rc.top += 10;
3479 CGdiObject * oldfont = memDC.SelectStockObject(DEFAULT_GUI_FONT);
3480 memDC.DrawText(str, rc, DT_CENTER | DT_VCENTER |
3481 DT_WORDBREAK | DT_NOPREFIX | DT_NOCLIP);
3482 memDC.SelectObject(oldfont);
3483 }
3484 ReleaseDC(pDC);
3485 }
3486 if (defres)
3487 {
3488 // the Default() call did not process the WM_PAINT message!
3489 // Validate the update region ourselves to avoid
3490 // an endless loop repainting
3491 CRect rc;
3492 GetUpdateRect(&rc, FALSE);
3493 if (!rc.IsRectEmpty())
3494 ValidateRect(rc);
3495 }
3496 }
3497
3498 // prevent users from extending our hidden (size 0) columns
3499 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR *pNMHDR, LRESULT *pResult)
3500 {
3501 m_ColumnManager.OnHdnBegintrack(pNMHDR, pResult);
3502 }
3503
3504 // prevent any function from extending our hidden (size 0) columns
3505 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
3506 {
3507 if(!m_ColumnManager.OnHdnItemchanging(pNMHDR, pResult))
3508 Default();
3509 }
3510
3511 void CGitStatusListCtrl::OnDestroy()
3512 {
3513 SaveColumnWidths(true);
3514 CListCtrl::OnDestroy();
3515 }
3516
3517 void CGitStatusListCtrl::OnBeginDrag(NMHDR* /*pNMHDR*/, LRESULT* pResult)
3518 {
3519 Locker lock(m_critSec);
3520 CDropFiles dropFiles; // class for creating DROPFILES struct
3521
3522 int index;
3523 POSITION pos = GetFirstSelectedItemPosition();
3524 if (!pos)
3525 return;
3526
3527 bool bTempDirCreated = false;
3528 CString tempDir;
3529 while ( (index = GetNextSelectedItem(pos)) >= 0 )
3530 {
3531 CTGitPath *path = (CTGitPath *)GetItemData(index); // m_arStatusArray[index] does not work with SyncDlg
3532 if (path->IsDirectory())
3533 continue;
3534
3535 CString version;
3536 if (!this->m_CurrentVersion.IsEmpty() && this->m_CurrentVersion != GIT_REV_ZERO)
3537 {
3538 if (path->m_Action & CTGitPath::LOGACTIONS_DELETED)
3539 version.Format(_T("%s^%d"), (LPCTSTR)m_CurrentVersion, (path->m_ParentNo + 1) & PARENT_MASK);
3540 else
3541 version = m_CurrentVersion;
3542 }
3543 else
3544 {
3545 if (path->m_Action & CTGitPath::LOGACTIONS_DELETED)
3546 version = _T("HEAD");
3547 }
3548
3549 CString tempFile;
3550 if (version.IsEmpty())
3551 {
3552 TCHAR abspath[MAX_PATH] = {0};
3553 PathCombine(abspath, g_Git.m_CurrentDir, path->GetWinPath());
3554 tempFile = abspath;
3555 }
3556 else
3557 {
3558 if (!bTempDirCreated)
3559 {
3560 tempDir = GetTempFile();
3561 ::DeleteFile(tempDir);
3562 ::CreateDirectory(tempDir, NULL);
3563 bTempDirCreated = true;
3564 }
3565 tempFile = tempDir + _T("\\") + path->GetWinPathString();
3566 CString tempSubDir = tempDir + _T("\\") + path->GetContainingDirectory().GetWinPathString();
3567 CPathUtils::MakeSureDirectoryPathExists(tempSubDir);
3568 if (g_Git.GetOneFile(version, *path, tempFile))
3569 {
3570 CString out;
3571 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, (LPCTSTR)path->GetGitPathString(), (LPCTSTR)version, (LPCTSTR)tempFile);
3572 CMessageBox::Show(nullptr, g_Git.GetGitLastErr(out, CGit::GIT_CMD_GETONEFILE), _T("TortoiseGit"), MB_OK);
3573 return;
3574 }
3575 }
3576 dropFiles.AddFile(tempFile);
3577 }
3578
3579 if (!dropFiles.IsEmpty())
3580 {
3581 m_bOwnDrag = true;
3582 dropFiles.CreateStructure();
3583 m_bOwnDrag = false;
3584 }
3585 *pResult = 0;
3586 }
3587
3588 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry /* = false */)
3589 {
3590 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
3591 for (int col = 0; col <= maxcol; col++)
3592 if (m_ColumnManager.IsVisible (col))
3593 m_ColumnManager.ColumnResized (col);
3594
3595 if (bSaveToRegistry)
3596 m_ColumnManager.WriteSettings();
3597 }
3598
3599 bool CGitStatusListCtrl::EnableFileDrop()
3600 {
3601 m_bFileDropsEnabled = true;
3602 return true;
3603 }
3604
3605 bool CGitStatusListCtrl::HasPath(const CTGitPath& path)
3606 {
3607 for (size_t i=0; i < m_arStatusArray.size(); ++i)
3608 {
3609 if (m_arStatusArray[i]->IsEquivalentTo(path))
3610 return true;
3611 }
3612
3613 return false;
3614 }
3615
3616 BOOL CGitStatusListCtrl::PreTranslateMessage(MSG* pMsg)
3617 {
3618 if (pMsg->message == WM_KEYDOWN)
3619 {
3620 switch (pMsg->wParam)
3621 {
3622 case 'A':
3623 {
3624 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
3625 {
3626 // select all entries
3627 for (int i=0; i<GetItemCount(); ++i)
3628 {
3629 SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
3630 }
3631 return TRUE;
3632 }
3633 }
3634 break;
3635 case 'C':
3636 case VK_INSERT:
3637 {
3638 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
3639 {
3640 // copy all selected paths to the clipboard
3641 if (GetAsyncKeyState(VK_SHIFT)&0x8000)
3642 CopySelectedEntriesToClipboard(GITSLC_COLSTATUS);
3643 else
3644 CopySelectedEntriesToClipboard(0);
3645 return TRUE;
3646 }
3647 }
3648 break;
3649 case VK_DELETE:
3650 {
3651 if ((GetSelectedCount() > 0) && (m_dwContextMenus & GITSLC_POPDELETE))
3652 {
3653 m_bBlock = TRUE;
3654 CTGitPath * filepath = (CTGitPath *)GetItemData(GetSelectionMark());
3655 if (filepath != nullptr && (filepath->m_Action & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE)))
3656 DeleteSelectedFiles();
3657 m_bBlock = FALSE;
3658 }
3659 }
3660 break;
3661 }
3662 }
3663
3664 return CListCtrl::PreTranslateMessage(pMsg);
3665 }
3666
3667 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols)
3668 {
3669
3670 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
3671 // WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
3672
3673 CString sClipboard;
3674 CString temp;
3675 //TCHAR buf[100];
3676 if (GetSelectedCount() == 0)
3677 return false;
3678
3679 // first add the column titles as the first line
3680 // We needn't head when only path copy
3681 //temp.LoadString(IDS_STATUSLIST_COLFILE);
3682 //sClipboard = temp;
3683
3684 DWORD selection = 0;
3685 for (int i = 0, count = m_ColumnManager.GetColumnCount(); i < count; ++i)
3686 if ( ((dwCols == -1) && m_ColumnManager.IsVisible (i))
3687 || ((dwCols != 1) && (i < 32) && ((dwCols & (1 << i)) != 0)))
3688 {
3689 sClipboard += _T("\t") + m_ColumnManager.GetName(i);
3690
3691 if (i < 32)
3692 selection += 1 << i;
3693 }
3694
3695 if(dwCols)
3696 sClipboard += _T("\r\n");
3697
3698 POSITION pos = GetFirstSelectedItemPosition();
3699 int index;
3700 while ((index = GetNextSelectedItem(pos)) >= 0)
3701 {
3702 CTGitPath * entry = (CTGitPath*)GetItemData(index);
3703 if(entry == NULL)
3704 continue;
3705
3706 sClipboard += entry->GetWinPathString();
3707 if (selection & GITSLC_COLFILENAME)
3708 {
3709 sClipboard += _T("\t")+entry->GetFileOrDirectoryName();
3710 }
3711 if (selection & GITSLC_COLEXT)
3712 {
3713 sClipboard += _T("\t")+entry->GetFileExtension();
3714 }
3715
3716 if (selection & GITSLC_COLSTATUS)
3717 {
3718 sClipboard += _T("\t")+entry->GetActionName();
3719 }
3720 #if 0
3721 if (selection & SVNSLC_COLDATE)
3722 {
3723 TCHAR datebuf[SVN_DATE_BUFFER];
3724 apr_time_t date = entry->last_commit_date;
3725 SVN::formatDate(datebuf, date, true);
3726 if (date)
3727 temp = datebuf;
3728 else
3729 temp.Empty();
3730 sClipboard += _T("\t")+temp;
3731 }
3732 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
3733 ; i < count
3734 ; ++i)
3735 {
3736 if ((dwCols == -1) && m_ColumnManager.IsVisible (i))
3737 {
3738 CString value
3739 = entry->present_props[m_ColumnManager.GetName(i)];
3740 sClipboard += _T("\t") + value;
3741 }
3742 }
3743 #endif
3744 if (selection & GITSLC_COLADD)
3745 {
3746 sClipboard += _T("\t")+entry->m_StatAdd;
3747 }
3748 if (selection & GITSLC_COLDEL)
3749 {
3750 sClipboard += _T("\t")+entry->m_StatDel;
3751 }
3752
3753 sClipboard += _T("\r\n");
3754 }
3755
3756 return CStringUtils::WriteAsciiStringToClipboard(sClipboard);
3757 }
3758
3759 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()
3760 {
3761 #if 0
3762 std::set<CString> changelists;
3763 POSITION pos = GetFirstSelectedItemPosition();
3764 int index;
3765 while ((index = GetNextSelectedItem(pos)) >= 0)
3766 {
3767 FileEntry * entry = GetListEntry(index);
3768 if (!entry->changelist.IsEmpty())
3769 changelists.insert(entry->changelist);
3770 }
3771 return changelists.size();
3772 #endif
3773 return 0;
3774 }
3775
3776 bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
3777 {
3778
3779 bool bHasGroups=false;
3780 int max =0;
3781
3782 for (size_t i = 0; i < m_arStatusArray.size(); ++i)
3783 {
3784 int ParentNo = m_arStatusArray[i]->m_ParentNo&PARENT_MASK;
3785 if( ParentNo > max)
3786 max=m_arStatusArray[i]->m_ParentNo&PARENT_MASK;
3787 }
3788
3789 if (((m_dwShow & GITSLC_SHOWUNVERSIONED) && !m_UnRevFileList.IsEmpty()) ||
3790 ((m_dwShow & GITSLC_SHOWIGNORED) && !m_IgnoreFileList.IsEmpty()) ||
3791 (m_dwShow & (GITSLC_SHOWASSUMEVALID | GITSLC_SHOWSKIPWORKTREE) && !m_LocalChangesIgnoredFileList.IsEmpty()) ||
3792 max>0 || bForce)
3793 {
3794 bHasGroups = true;
3795 }
3796
3797 RemoveAllGroups();
3798 EnableGroupView(bHasGroups);
3799
3800 TCHAR groupname[1024] = { 0 };
3801 int groupindex = 0;
3802
3803 if(bHasGroups)
3804 {
3805 LVGROUP grp = {0};
3806 grp.cbSize = sizeof(LVGROUP);
3807 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3808 groupindex=0;
3809
3810 //if(m_UnRevFileList.GetCount()>0)
3811 if(max >0)
3812 {
3813 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MERGEDFILES)), 1023);
3814 grp.pszHeader = groupname;
3815 grp.iGroupId = MERGE_MASK;
3816 grp.uAlign = LVGA_HEADER_LEFT;
3817 InsertGroup(0, &grp);
3818
3819 CAutoRepository repository(g_Git.GetGitRepository());
3820 if (!repository)
3821 CMessageBox::Show(m_hWnd, CGit::GetLibGit2LastErr(_T("Could not open repository.")), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
3822 for (int i = 0; i <= max; ++i)
3823 {
3824 CString str;
3825 str.Format(IDS_STATUSLIST_GROUP_DIFFWITHPARENT, i+1);
3826 if (repository)
3827 {
3828 CString rev;
3829 rev.Format(_T("%s^%d"), (LPCTSTR)m_CurrentVersion, i + 1);
3830 CGitHash hash;
3831 if (!CGit::GetHash(repository, hash, rev))
3832 str += _T(": ") + hash.ToString().Left(g_Git.GetShortHASHLength());
3833 }
3834 grp.pszHeader = str.GetBuffer();
3835 str.ReleaseBuffer();
3836 grp.iGroupId = i;
3837 grp.uAlign = LVGA_HEADER_LEFT;
3838 InsertGroup(i+1, &grp);
3839 }
3840 }
3841 else
3842 {
3843 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MODIFIEDFILES)), 1023);
3844 grp.pszHeader = groupname;
3845 grp.iGroupId = groupindex;
3846 grp.uAlign = LVGA_HEADER_LEFT;
3847 InsertGroup(groupindex++, &grp);
3848
3849
3850 {
3851 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_NOTVERSIONEDFILES)), 1023);
3852 grp.pszHeader = groupname;
3853 grp.iGroupId = groupindex;
3854 grp.uAlign = LVGA_HEADER_LEFT;
3855 InsertGroup(groupindex++, &grp);
3856 }
3857
3858 //if(m_IgnoreFileList.GetCount()>0)
3859 {
3860 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_IGNOREDFILES)), 1023);
3861 grp.pszHeader = groupname;
3862 grp.iGroupId = groupindex;
3863 grp.uAlign = LVGA_HEADER_LEFT;
3864 InsertGroup(groupindex++, &grp);
3865 }
3866
3867 {
3868 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_IGNORELOCALCHANGES)), 1023);
3869 grp.pszHeader = groupname;
3870 grp.iGroupId = groupindex;
3871 grp.uAlign = LVGA_HEADER_LEFT;
3872 InsertGroup(groupindex++, &grp);
3873 }
3874 }
3875 }
3876
3877 #if 0
3878 m_bHasIgnoreGroup = false;
3879
3880 // now add the items which don't belong to a group
3881 LVGROUP grp = {0};
3882 grp.cbSize = sizeof(LVGROUP);
3883 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3884 CString sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET));
3885 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
3886 grp.pszHeader = groupname;
3887 grp.iGroupId = groupindex;
3888 grp.uAlign = LVGA_HEADER_LEFT;
3889 InsertGroup(groupindex++, &grp);
3890
3891 for (auto it = m_changelists.cbegin(); it != m_changelists.cend(); ++it)
3892 {
3893 if (it->first.Compare(SVNSLC_IGNORECHANGELIST)!=0)
3894 {
3895 LVGROUP grp = {0};
3896 grp.cbSize = sizeof(LVGROUP);
3897 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3898 _tcsncpy_s(groupname, 1024, it->first, 1023);
3899 grp.pszHeader = groupname;
3900 grp.iGroupId = groupindex;
3901 grp.uAlign = LVGA_HEADER_LEFT;
3902 it->second = InsertGroup(groupindex++, &grp);
3903 }
3904 else
3905 m_bHasIgnoreGroup = true;
3906 }
3907
3908 if (m_bHasIgnoreGroup)
3909 {
3910 // and now add the group 'ignore-on-commit'
3911 std::map<CString,int>::iterator it = m_changelists.find(SVNSLC_IGNORECHANGELIST);
3912 if (it != m_changelists.end())
3913 {
3914 grp.cbSize = sizeof(LVGROUP);
3915 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3916 _tcsncpy_s(groupname, 1024, SVNSLC_IGNORECHANGELIST, 1023);
3917 grp.pszHeader = groupname;
3918 grp.iGroupId = groupindex;
3919 grp.uAlign = LVGA_HEADER_LEFT;
3920 it->second = InsertGroup(groupindex, &grp);
3921 }
3922 }
3923 #endif
3924 return bHasGroups;
3925 }
3926
3927 void CGitStatusListCtrl::NotifyCheck()
3928 {
3929 CWnd* pParent = GetLogicalParent();
3930 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
3931 {
3932 pParent->SendMessage(GITSLNM_CHECKCHANGED, m_nSelected);
3933 }
3934 }
3935
3936 int CGitStatusListCtrl::UpdateFileList(CTGitPathList *list)
3937 {
3938 m_CurrentVersion = GIT_REV_ZERO;
3939
3940 g_Git.GetWorkingTreeChanges(m_StatusFileList, m_amend, list);
3941
3942 BOOL bDeleteChecked = FALSE;
3943 int deleteFromIndex = 0;
3944 bool needsRefresh = false;
3945 for (int i = 0; i < m_StatusFileList.GetCount(); ++i)
3946 {
3947 CTGitPath * gitpatch=(CTGitPath*)&m_StatusFileList[i];
3948 gitpatch->m_Checked = TRUE;
3949
3950 if ((gitpatch->m_Action & (CTGitPath::LOGACTIONS_ADDED | CTGitPath::LOGACTIONS_REPLACED | CTGitPath::LOGACTIONS_MODIFIED)) && !gitpatch->Exists())
3951 {
3952 if (!bDeleteChecked)
3953 {
3954 CString message;
3955 message.Format(IDS_ASK_REMOVE_FROM_INDEX, gitpatch->GetWinPath());
3956 deleteFromIndex = CMessageBox::ShowCheck(m_hWnd, message, _T("TortoiseGit"), 1, IDI_EXCLAMATION, CString(MAKEINTRESOURCE(IDS_RESTORE_FROM_INDEX)), CString(MAKEINTRESOURCE(IDS_REMOVE_FROM_INDEX)), CString(MAKEINTRESOURCE(IDS_IGNOREBUTTON)), NULL, CString(MAKEINTRESOURCE(IDS_DO_SAME_FOR_REST)), &bDeleteChecked);
3957 }
3958 if (deleteFromIndex == 1)
3959 {
3960 CString err;
3961 if (g_Git.Run(_T("git.exe checkout -- \"") + gitpatch->GetWinPathString() + _T("\""), &err, CP_UTF8))
3962 MessageBox(_T("Restoring from index failed:\n") + err, _T("TortoiseGit"), MB_ICONERROR);
3963 else
3964 needsRefresh = true;
3965 }
3966 else if (deleteFromIndex == 2)
3967 {
3968 CString err;
3969 if (g_Git.Run(_T("git.exe rm -f --cache -- \"") + gitpatch->GetWinPathString() + _T("\""), &err, CP_UTF8))
3970 MessageBox(_T("Removing from index failed:\n") + err, _T("TortoiseGit"), MB_ICONERROR);
3971 else
3972 needsRefresh = true;
3973 }
3974 }
3975
3976 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
3977 }
3978
3979 if (needsRefresh)
3980 MessageBox(_T("Due to changes to the index, please refresh the dialog (e.g., by pressing F5)."), _T("TortoiseGit"), MB_ICONINFORMATION);
3981
3982 return 0;
3983 }
3984
3985 int CGitStatusListCtrl::UpdateWithGitPathList(CTGitPathList &list)
3986 {
3987 m_arStatusArray.clear();
3988 for (int i = 0; i < list.GetCount(); ++i)
3989 {
3990 CTGitPath * gitpath=(CTGitPath*)&list[i];
3991
3992 if(gitpath ->m_Action & CTGitPath::LOGACTIONS_HIDE)
3993 continue;
3994
3995 gitpath->m_Checked = TRUE;
3996 m_arStatusArray.push_back((CTGitPath*)&list[i]);
3997 }
3998 return 0;
3999 }
4000
4001 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList &list)
4002 {
4003 m_UnRevFileList = list;
4004 for (int i = 0; i < m_UnRevFileList.GetCount(); ++i)
4005 {
4006 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
4007 gitpatch->m_Checked = FALSE;
4008 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
4009 }
4010 return 0;
4011 }
4012
4013 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList *List)
4014 {
4015 CString err;
4016 if (m_UnRevFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER, List, &err))
4017 {
4018 CMessageBox::Show(NULL, _T("Failed to get UnRev file list\n") + err, _T("TortoiseGit"), MB_OK);
4019 return -1;
4020 }
4021
4022 for (int i = 0; i < m_UnRevFileList.GetCount(); ++i)
4023 {
4024 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
4025 gitpatch->m_Checked = FALSE;
4026 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
4027 }
4028 return 0;
4029 }
4030
4031 int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList *List)
4032 {
4033 CString err;
4034 if (m_IgnoreFileList.FillUnRev(CTGitPath::LOGACTIONS_IGNORE, List, &err))
4035 {
4036 CMessageBox::Show(NULL, _T("Failed to get Ignore file list\n") + err, _T("TortoiseGit"), MB_OK);
4037 return -1;
4038 }
4039
4040 for (int i = 0; i < m_IgnoreFileList.GetCount(); ++i)
4041 {
4042 CTGitPath * gitpatch=(CTGitPath*)&m_IgnoreFileList[i];
4043 gitpatch->m_Checked = FALSE;
4044 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
4045 }
4046 return 0;
4047 }
4048
4049 int CGitStatusListCtrl::UpdateLocalChangesIgnoredFileList(CTGitPathList *list)
4050 {
4051 m_LocalChangesIgnoredFileList.FillBasedOnIndexFlags(GIT_IDXENTRY_VALID, GIT_IDXENTRY_SKIP_WORKTREE, list);
4052 for (int i = 0; i < m_LocalChangesIgnoredFileList.GetCount(); ++i)
4053 {
4054 CTGitPath * gitpatch = (CTGitPath*)&m_LocalChangesIgnoredFileList[i];
4055 gitpatch->m_Checked = FALSE;
4056 m_arStatusArray.push_back((CTGitPath*)&m_LocalChangesIgnoredFileList[i]);
4057 }
4058 return 0;
4059 }
4060
4061 int CGitStatusListCtrl::UpdateFileList(int mask,bool once,CTGitPathList *List)
4062 {
4063 if(mask&CGitStatusListCtrl::FILELIST_MODIFY)
4064 {
4065 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_MODIFY)))
4066 {
4067 UpdateFileList(List);
4068 m_FileLoaded|=CGitStatusListCtrl::FILELIST_MODIFY;
4069 }
4070 }
4071 if (mask & CGitStatusListCtrl::FILELIST_UNVER || mask & CGitStatusListCtrl::FILELIST_IGNORE)
4072 {
4073 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_UNVER)))
4074 {
4075 UpdateUnRevFileList(List);
4076 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
4077 }
4078 if(mask&CGitStatusListCtrl::FILELIST_IGNORE && (once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_IGNORE))))
4079 {
4080 UpdateIgnoreFileList(List);
4081 m_FileLoaded |= CGitStatusListCtrl::FILELIST_IGNORE;
4082 }
4083 }
4084 if (mask & CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED && (once || (!(m_FileLoaded & CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED))))
4085 {
4086 UpdateLocalChangesIgnoredFileList(List);
4087 m_FileLoaded |= CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED;
4088 }
4089 return 0;
4090 }
4091
4092 void CGitStatusListCtrl::Clear()
4093 {
4094 m_FileLoaded=0;
4095 this->DeleteAllItems();
4096 this->m_arListArray.clear();
4097 this->m_arStatusArray.clear();
4098 this->m_changelists.clear();
4099 }
4100
4101 bool CGitStatusListCtrl::CheckMultipleDiffs()
4102 {
4103 UINT selCount = GetSelectedCount();
4104 if (selCount > max(3, (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\NumDiffWarning"), 10)))
4105 {
4106 CString message;
4107 message.Format(IDS_STATUSLIST_WARN_MAXDIFF, selCount);
4108 return ::MessageBox(GetSafeHwnd(), message, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION) == IDYES;
4109 }
4110 return true;
4111 }
4112 //////////////////////////////////////////////////////////////////////////
4113 #if 0
4114 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium, DWORD * /*pdwEffect*/, POINTL pt)
4115 {
4116 if(pFmtEtc->cfFormat == CF_HDROP && medium.tymed == TYMED_HGLOBAL)
4117 {
4118 HDROP hDrop = (HDROP)GlobalLock(medium.hGlobal);
4119 if(hDrop != NULL)
4120 {
4121 TCHAR szFileName[MAX_PATH] = {0};
4122
4123 UINT cFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
4124
4125 POINT clientpoint;
4126 clientpoint.x = pt.x;
4127 clientpoint.y = pt.y;
4128 ScreenToClient(m_hTargetWnd, &clientpoint);
4129 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
4130 {
4131 CTSVNPathList changelistItems;
4132 for(UINT i = 0; i < cFiles; ++i)
4133 {
4134 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
4135 changelistItems.AddPath(CTSVNPath(szFileName));
4136 }
4137 // find the changelist name
4138 CString sChangelist;
4139 LONG_PTR nGroup = m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint);
4140 for (std::map<CString, int>::iterator it = m_pSVNStatusListCtrl->m_changelists.begin(); it != m_pSVNStatusListCtrl->m_changelists.end(); ++it)
4141 if (it->second == nGroup)
4142 sChangelist = it->first;
4143 if (!sChangelist.IsEmpty())
4144 {
4145 SVN git;
4146 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
4147 {
4148 for (int l=0; l<changelistItems.GetCount(); ++l)
4149 {
4150 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
4151 if (index >= 0)
4152 {
4153 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
4154 if (e)
4155 {
4156 e->changelist = sChangelist;
4157 if (!e->IsFolder())
4158 {
4159 if (m_pSVNStatusListCtrl->m_changelists.find(e->changelist)!=m_pSVNStatusListCtrl->m_changelists.end())
4160 m_pSVNStatusListCtrl->SetItemGroup(index, m_pSVNStatusListCtrl->m_changelists[e->changelist]);
4161 else
4162 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
4163 }
4164 }
4165 }
4166 else
4167 {
4168 HWND hParentWnd = GetParent(m_hTargetWnd);
4169 if (hParentWnd != NULL)
4170 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
4171 }
4172 }
4173 }
4174 else
4175 {
4176 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
4177 }
4178 }
4179 else
4180 {
4181 SVN git;
4182 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
4183 {
4184 for (int l=0; l<changelistItems.GetCount(); ++l)
4185 {
4186 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
4187 if (index >= 0)
4188 {
4189 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
4190 if (e)
4191 {
4192 e->changelist = sChangelist;
4193 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
4194 }
4195 }
4196 else
4197 {
4198 HWND hParentWnd = GetParent(m_hTargetWnd);
4199 if (hParentWnd != NULL)
4200 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
4201 }
4202 }
4203 }
4204 else
4205 {
4206 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
4207 }
4208 }
4209 }
4210 else
4211 {
4212 for(UINT i = 0; i < cFiles; ++i)
4213 {
4214 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
4215 HWND hParentWnd = GetParent(m_hTargetWnd);
4216 if (hParentWnd != NULL)
4217 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)szFileName);
4218 }
4219 }
4220 }
4221 GlobalUnlock(medium.hGlobal);
4222 }
4223 return true; //let base free the medium
4224 }
4225 HRESULT STDMETHODCALLTYPE CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect)
4226 {
4227 CIDropTarget::DragOver(grfKeyState, pt, pdwEffect);
4228 *pdwEffect = DROPEFFECT_COPY;
4229 if (m_pSVNStatusListCtrl)
4230 {
4231 POINT clientpoint;
4232 clientpoint.x = pt.x;
4233 clientpoint.y = pt.y;
4234 ScreenToClient(m_hTargetWnd, &clientpoint);
4235 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
4236 {
4237 *pdwEffect = DROPEFFECT_MOVE;
4238 }
4239 else if ((!m_pSVNStatusListCtrl->m_bFileDropsEnabled)||(m_pSVNStatusListCtrl->m_bOwnDrag))
4240 {
4241 *pdwEffect = DROPEFFECT_NONE;
4242 }
4243 }
4244 return S_OK;
4245 }f
4246
4247 #endif
4248
4249 void CGitStatusListCtrl::FilesExport()
4250 {
4251 CString exportDir;
4252 // export all changed files to a folder
4253 CBrowseFolder browseFolder;
4254 browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
4255 if (browseFolder.Show(GetSafeHwnd(), exportDir) != CBrowseFolder::OK)
4256 return;
4257
4258 POSITION pos = GetFirstSelectedItemPosition();
4259 int index;
4260 while ((index = GetNextSelectedItem(pos)) >= 0)
4261 {
4262 CTGitPath *fd = (CTGitPath*)GetItemData(index);
4263 // we cannot export directories or folders
4264 if ((fd->m_Action & CTGitPath::LOGACTIONS_DELETED) || fd->IsDirectory())
4265 continue;
4266
4267 CPathUtils::MakeSureDirectoryPathExists(exportDir + _T("\\") + fd->GetContainingDirectory().GetWinPathString());
4268 CString filename = exportDir + _T("\\") + fd->GetWinPathString();
4269 if (m_CurrentVersion == GIT_REV_ZERO)
4270 {
4271 if (!CopyFile(g_Git.CombinePath(fd), filename, false))
4272 {
4273 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
4274 return;
4275 }
4276 }
4277 else
4278 {
4279 if (g_Git.GetOneFile(m_CurrentVersion, *fd, filename))
4280 {
4281 CString out;
4282 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, (LPCTSTR)fd->GetGitPathString(), (LPCTSTR)m_CurrentVersion, (LPCTSTR)filename);
4283 if (CMessageBox::Show(nullptr, g_Git.GetGitLastErr(out, CGit::GIT_CMD_GETONEFILE), _T("TortoiseGit"), 2, IDI_WARNING, CString(MAKEINTRESOURCE(IDS_IGNOREBUTTON)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON))) == 2)
4284 return;
4285 }
4286 }
4287 }
4288 }
4289
4290 void CGitStatusListCtrl::FileSaveAs(CTGitPath *path)
4291 {
4292 CString filename;
4293 filename.Format(_T("%s-%s%s"), (LPCTSTR)path->GetBaseFilename(), (LPCTSTR)this->m_CurrentVersion.Left(g_Git.GetShortHASHLength()), (LPCTSTR)path->GetFileExtension());
4294 CFileDialog dlg(FALSE,NULL,
4295 filename,
4296 OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
4297 NULL);
4298
4299 CString currentpath = g_Git.CombinePath(path->GetContainingDirectory());
4300 dlg.m_ofn.lpstrInitialDir = currentpath;
4301
4302 CString cmd,out;
4303 INT_PTR ret = dlg.DoModal();
4304 SetCurrentDirectory(g_Git.m_CurrentDir);
4305 if (ret == IDOK)
4306 {
4307 filename = dlg.GetPathName();
4308 if(m_CurrentVersion == GIT_REV_ZERO)
4309 {
4310 if(!CopyFile(g_Git.CombinePath(path), filename, false))
4311 {
4312 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
4313 return;
4314 }
4315
4316 }
4317 else
4318 {
4319 if(g_Git.GetOneFile(m_CurrentVersion,*path,filename))
4320 {
4321 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, (LPCTSTR)path->GetGitPathString(), (LPCTSTR)m_CurrentVersion, (LPCTSTR)filename);
4322 CMessageBox::Show(nullptr, g_Git.GetGitLastErr(out, CGit::GIT_CMD_GETONEFILE), _T("TortoiseGit"), MB_OK);
4323 return;
4324 }
4325 }
4326 }
4327
4328 }
4329
4330 int CGitStatusListCtrl::RevertSelectedItemToVersion(bool parent)
4331 {
4332 if(this->m_CurrentVersion.IsEmpty())
4333 return 0;
4334 if(this->m_CurrentVersion == GIT_REV_ZERO)
4335 return 0;
4336
4337 POSITION pos = GetFirstSelectedItemPosition();
4338 int index;
4339 CString cmd,out;
4340 std::map<CString, int> versionMap;
4341 while ((index = GetNextSelectedItem(pos)) >= 0)
4342 {
4343 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
4344 CString version;
4345 if (parent)
4346 {
4347 int parentNo = fentry->m_ParentNo & PARENT_MASK;
4348 CString ref;
4349 ref.Format(_T("%s^%d"), (LPCTSTR)m_CurrentVersion, parentNo + 1);
4350 CGitHash hash;
4351 if (g_Git.GetHash(hash, ref))
4352 {
4353 MessageBox(g_Git.GetGitLastErr(_T("Could not get hash of ref \"") + ref + _T("\".")), _T("TortoiseGit"), MB_ICONERROR);
4354 continue;
4355 }
4356
4357 version = hash.ToString();
4358 }
4359 else
4360 version = m_CurrentVersion;
4361
4362 CString filename = fentry->GetGitPathString();
4363 if (!fentry->GetGitOldPathString().IsEmpty())
4364 filename = fentry->GetGitOldPathString();
4365 cmd.Format(_T("git.exe checkout %s -- \"%s\""), (LPCTSTR)version, (LPCTSTR)filename);
4366 out.Empty();
4367 if (g_Git.Run(cmd, &out, CP_UTF8))
4368 {
4369 if (MessageBox(out, _T("TortoiseGit"), MB_ICONEXCLAMATION | MB_OKCANCEL) == IDCANCEL)
4370 continue;
4371 }
4372 else
4373 versionMap[version]++;
4374 }
4375
4376 out.Empty();
4377 for (auto it = versionMap.cbegin(); it != versionMap.cend(); ++it)
4378 {
4379 CString versionEntry;
4380 versionEntry.Format(IDS_STATUSLIST_FILESREVERTED, it->second, (LPCTSTR)it->first);
4381 out += versionEntry + _T("\r\n");
4382 }
4383 if (!out.IsEmpty())
4384 CMessageBox::Show(nullptr, out, _T("TortoiseGit"), MB_OK);
4385 return 0;
4386 }
4387
4388 void CGitStatusListCtrl::OpenFile(CTGitPath*filepath,int mode)
4389 {
4390 CString file;
4391 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
4392 {
4393 file = g_Git.CombinePath(filepath);
4394 }
4395 else
4396 {
4397 CString temppath;
4398 GetTempPath(temppath);
4399 TCHAR szTempName[MAX_PATH] = {0};
4400 GetTempFileName(temppath, filepath->GetBaseFilename(), 0, szTempName);
4401 CString temp(szTempName);
4402 DeleteFile(szTempName);
4403 CreateDirectory(szTempName, NULL);
4404 file.Format(_T("%s\\%s_%s%s"),
4405 (LPCTSTR)temp,
4406 (LPCTSTR)filepath->GetBaseFilename(),
4407 (LPCTSTR)m_CurrentVersion.Left(g_Git.GetShortHASHLength()),
4408 (LPCTSTR)filepath->GetFileExtension());
4409 CString cmd,out;
4410 if(g_Git.GetOneFile(m_CurrentVersion, *filepath, file))
4411 {
4412 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, (LPCTSTR)filepath->GetGitPathString(), (LPCTSTR)m_CurrentVersion, (LPCTSTR)file);
4413 CMessageBox::Show(nullptr, g_Git.GetGitLastErr(out, CGit::GIT_CMD_GETONEFILE), _T("TortoiseGit"), MB_OK);
4414 return;
4415 }
4416 SetFileAttributes(file, FILE_ATTRIBUTE_READONLY);
4417 }
4418 if(mode == ALTERNATIVEEDITOR)
4419 {
4420 CAppUtils::LaunchAlternativeEditor(file);
4421 return;
4422 }
4423
4424 if (mode == OPEN)
4425 CAppUtils::ShellOpen(file, GetSafeHwnd());
4426 else
4427 CAppUtils::ShowOpenWithDialog(file, GetSafeHwnd());
4428 }
4429
4430 void CGitStatusListCtrl::DeleteSelectedFiles()
4431 {
4432 //Collect paths
4433 std::vector<int> selectIndex;
4434
4435 POSITION pos = GetFirstSelectedItemPosition();
4436 int index;
4437 while ((index = GetNextSelectedItem(pos)) >= 0)
4438 {
4439 selectIndex.push_back(index);
4440 }
4441
4442 CAutoRepository repo = g_Git.GetGitRepository();
4443 if (!repo)
4444 {
4445 MessageBox(g_Git.GetLibGit2LastErr(_T("Could not open repository.")), _T("TortoiseGit"), MB_OK);
4446 return;
4447 }
4448 CAutoIndex gitIndex;
4449 if (git_repository_index(gitIndex.GetPointer(), repo))
4450 {
4451 g_Git.GetLibGit2LastErr(_T("Could not open index."));
4452 return;
4453 }
4454 int needWriteIndex = 0;
4455
4456 //Create file-list ('\0' separated) for SHFileOperation
4457 CString filelist;
4458 for (size_t i = 0; i < selectIndex.size(); ++i)
4459 {
4460 index = selectIndex[i];
4461
4462 CTGitPath * path=(CTGitPath*)GetItemData(index);
4463 ASSERT(path);
4464 if (path == nullptr)
4465 continue;
4466
4467 // do not report errors as we could remove an unversioned file
4468 needWriteIndex += git_index_remove_bypath(gitIndex, CUnicodeUtils::GetUTF8(path->GetGitPathString())) == 0 ? 1 : 0;
4469
4470 if (!path->Exists())
4471 continue;
4472
4473 filelist += path->GetWinPathString();
4474 filelist += _T("|");
4475 }
4476 filelist += _T("|");
4477 int len = filelist.GetLength();
4478 auto buf = std::make_unique<TCHAR[]>(len + 2);
4479 _tcscpy_s(buf.get(), len + 2, filelist);
4480 CStringUtils::PipesToNulls(buf.get(), len + 2);
4481 SHFILEOPSTRUCT fileop;
4482 fileop.hwnd = this->m_hWnd;
4483 fileop.wFunc = FO_DELETE;
4484 fileop.pFrom = buf.get();
4485 fileop.pTo = NULL;
4486 fileop.fFlags = FOF_NO_CONNECTED_ELEMENTS | ((GetAsyncKeyState(VK_SHIFT) & 0x8000) ? 0 : FOF_ALLOWUNDO);
4487 fileop.lpszProgressTitle = _T("deleting file");
4488 int result = SHFileOperation(&fileop);
4489
4490 if ((result == 0 || len == 1) && (!fileop.fAnyOperationsAborted))
4491 {
4492 if (needWriteIndex && git_index_write(gitIndex))
4493 MessageBox(g_Git.GetLibGit2LastErr(_T("Could not write index.")), _T("TortoiseGit"), MB_OK);
4494
4495 if (needWriteIndex)
4496 {
4497 CWnd* pParent = GetLogicalParent();
4498 if (pParent && pParent->GetSafeHwnd())
4499 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
4500 SetRedraw(TRUE);
4501 return;
4502 }
4503
4504 SetRedraw(FALSE);
4505 POSITION pos2 = NULL;
4506 while ((pos2 = GetFirstSelectedItemPosition()) != 0)
4507 {
4508 int index2 = GetNextSelectedItem(pos2);
4509 if (GetCheck(index2))
4510 m_nSelected--;
4511 m_nTotal--;
4512
4513 RemoveListEntry(index2);
4514 }
4515 SetRedraw(TRUE);
4516 }
4517 }
4518
4519 BOOL CGitStatusListCtrl::OnWndMsg(UINT message, WPARAM wParam, LPARAM lParam, LRESULT* pResult)
4520 {
4521 switch (message)
4522 {
4523 case WM_MENUCHAR: // only supported by IContextMenu3
4524 if (g_IContext3)
4525 {
4526 g_IContext3->HandleMenuMsg2(message, wParam, lParam, pResult);
4527 return TRUE;
4528 }
4529 break;
4530
4531 case WM_DRAWITEM:
4532 case WM_MEASUREITEM:
4533 if (wParam)
4534 break; // if wParam != 0 then the message is not menu-related
4535
4536 case WM_INITMENU:
4537 case WM_INITMENUPOPUP:
4538 {
4539 HMENU hMenu = (HMENU)wParam;
4540 if ((hMenu == m_hShellMenu) && (GetMenuItemCount(hMenu) == 0))
4541 {
4542 // the shell submenu is populated only on request, i.e. right
4543 // before the submenu is shown
4544 if (g_pFolderhook)
4545 {
4546 delete g_pFolderhook;
4547 g_pFolderhook = nullptr;
4548 }
4549 CTGitPathList targetList;
4550 FillListOfSelectedItemPaths(targetList);
4551 if (targetList.GetCount() > 0)
4552 {
4553 // get IShellFolder interface of Desktop (root of shell namespace)
4554 if (g_psfDesktopFolder)
4555 g_psfDesktopFolder->Release();
4556 SHGetDesktopFolder(&g_psfDesktopFolder); // needed to obtain full qualified pidl
4557
4558 // ParseDisplayName creates a PIDL from a file system path relative to the IShellFolder interface
4559 // but since we use the Desktop as our interface and the Desktop is the namespace root
4560 // that means that it's a fully qualified PIDL, which is what we need
4561
4562 if (g_pidlArray)
4563 {
4564 for (int i = 0; i < g_pidlArrayItems; i++)
4565 {
4566 if (g_pidlArray[i])
4567 CoTaskMemFree(g_pidlArray[i]);
4568 }
4569 CoTaskMemFree(g_pidlArray);
4570 g_pidlArray = nullptr;
4571 g_pidlArrayItems = 0;
4572 }
4573 int nItems = targetList.GetCount();
4574 g_pidlArray = (LPITEMIDLIST *)CoTaskMemAlloc((nItems + 10) * sizeof(LPITEMIDLIST));
4575 SecureZeroMemory(g_pidlArray, (nItems + 10) * sizeof(LPITEMIDLIST));
4576 int succeededItems = 0;
4577 PIDLIST_RELATIVE pidl = nullptr;
4578
4579 int bufsize = 1024;
4580 auto filepath = std::make_unique<WCHAR[]>(bufsize);
4581 for (int i = 0; i < nItems; i++)
4582 {
4583 CString fullPath = g_Git.CombinePath(targetList[i].GetWinPath());
4584 if (bufsize < fullPath.GetLength())
4585 {
4586 bufsize = fullPath.GetLength() + 3;
4587 filepath = std::make_unique<WCHAR[]>(bufsize);
4588 }
4589 wcscpy_s(filepath.get(), bufsize, fullPath);
4590 if (SUCCEEDED(g_psfDesktopFolder->ParseDisplayName(nullptr, 0, filepath.get(), nullptr, &pidl, nullptr)))
4591 g_pidlArray[succeededItems++] = pidl; // copy pidl to pidlArray
4592 }
4593 if (succeededItems == 0)
4594 {
4595 CoTaskMemFree(g_pidlArray);
4596 g_pidlArray = nullptr;
4597 }
4598
4599 g_pidlArrayItems = succeededItems;
4600
4601 if (g_pidlArrayItems)
4602 {
4603 CString ext = targetList[0].GetFileExtension();
4604
4605 ASSOCIATIONELEMENT const rgAssocItem[] =
4606 {
4607 { ASSOCCLASS_PROGID_STR, NULL, ext },
4608 { ASSOCCLASS_SYSTEM_STR, NULL, ext },
4609 { ASSOCCLASS_APP_STR, NULL, ext },
4610 { ASSOCCLASS_STAR, NULL, NULL },
4611 { ASSOCCLASS_FOLDER, NULL, NULL },
4612 };
4613 IQueryAssociations* pIQueryAssociations = nullptr;
4614 if (FAILED(AssocCreateForClasses(rgAssocItem, ARRAYSIZE(rgAssocItem), IID_IQueryAssociations, (void**)&pIQueryAssociations)))
4615 pIQueryAssociations = nullptr; // not a problem, it works without this
4616
4617 g_pFolderhook = new CIShellFolderHook(g_psfDesktopFolder, targetList);
4618 LPCONTEXTMENU icm1 = nullptr;
4619
4620 DEFCONTEXTMENU dcm = { 0 };
4621 dcm.hwnd = m_hWnd;
4622 dcm.psf = g_pFolderhook;
4623 dcm.cidl = g_pidlArrayItems;
4624 dcm.apidl = (PCUITEMID_CHILD_ARRAY)g_pidlArray;
4625 dcm.punkAssociationInfo = pIQueryAssociations;
4626 if (SUCCEEDED(SHCreateDefaultContextMenu(&dcm, IID_IContextMenu, (void**)&icm1)))
4627 {
4628 int iMenuType = 0; // to know which version of IContextMenu is supported
4629 if (icm1)
4630 { // since we got an IContextMenu interface we can now obtain the higher version interfaces via that
4631 if (icm1->QueryInterface(IID_IContextMenu3, (void**)&m_pContextMenu) == S_OK)
4632 iMenuType = 3;
4633 else if (icm1->QueryInterface(IID_IContextMenu2, (void**)&m_pContextMenu) == S_OK)
4634 iMenuType = 2;
4635
4636 if (m_pContextMenu)
4637 icm1->Release(); // we can now release version 1 interface, cause we got a higher one
4638 else
4639 {
4640 // since no higher versions were found
4641 // redirect ppContextMenu to version 1 interface
4642 iMenuType = 1;
4643 m_pContextMenu = icm1;
4644 }
4645 }
4646 if (m_pContextMenu)
4647 {
4648 // lets fill the our popup menu
4649 UINT flags = CMF_NORMAL;
4650 flags |= (GetKeyState(VK_SHIFT) & 0x8000) != 0 ? CMF_EXTENDEDVERBS : 0;
4651 m_pContextMenu->QueryContextMenu(hMenu, 0, SHELL_MIN_CMD, SHELL_MAX_CMD, flags);
4652
4653
4654 // subclass window to handle menu related messages in CShellContextMenu
4655 if (iMenuType > 1) // only subclass if its version 2 or 3
4656 {
4657 if (iMenuType == 2)
4658 g_IContext2 = (LPCONTEXTMENU2)m_pContextMenu;
4659 else // version 3
4660 g_IContext3 = (LPCONTEXTMENU3)m_pContextMenu;
4661 }
4662 }
4663 }
4664 if (pIQueryAssociations)
4665 pIQueryAssociations->Release();
4666 }
4667 }
4668 if (g_IContext3)
4669 g_IContext3->HandleMenuMsg2(message, wParam, lParam, pResult);
4670 else if (g_IContext2)
4671 g_IContext2->HandleMenuMsg(message, wParam, lParam);
4672 return TRUE;
4673 }
4674 }
4675
4676 break;
4677 default:
4678 break;
4679 }
4680
4681 return CListCtrl::OnWndMsg(message, wParam, lParam, pResult);
4682 }
Windows Explorer Extension to Operate Git