Use AppendFormat and prevent usage of temporary strings
[TortoiseGit.git] / src / Git / GitStatusListCtrl.cpp
blob0bc242aa433f5d0e2869704fc7f8947e5970f6d4
1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2016 - TortoiseGit
4 // Copyright (C) 2003-2008, 2013-2015 - TortoiseSVN
6 // This program is free software; you can redistribute it and/or
7 // modify it under the terms of the GNU General Public License
8 // as published by the Free Software Foundation; either version 2
9 // of the License, or (at your option) any later version.
11 // This program is distributed in the hope that it will be useful,
12 // but WITHOUT ANY WARRANTY; without even the implied warranty of
13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
14 // GNU General Public License for more details.
16 // You should have received a copy of the GNU General Public License
17 // along with this program; if not, write to the Free Software Foundation,
18 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
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"
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"));
58 struct icompare
60 bool operator() (const std::wstring& lhs, const std::wstring& rhs) const
62 // no logical comparison here: we need this sorted strictly
63 return _wcsicmp(lhs.c_str(), rhs.c_str()) < 0;
67 class CIShellFolderHook : public IShellFolder
69 public:
70 CIShellFolderHook(LPSHELLFOLDER sf, const CTGitPathList& pathlist)
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()));
81 ~CIShellFolderHook() { m_iSF->Release(); }
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(); }
88 // IShellFolder methods ----
89 virtual HRESULT STDMETHODCALLTYPE GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT *rgfReserved, void **ppv);
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); }
101 protected:
102 LPSHELLFOLDER m_iSF;
103 std::set<std::wstring, icompare> sortedpaths;
106 HRESULT STDMETHODCALLTYPE CIShellFolderHook::GetUIObjectOf(HWND hwndOwner, UINT cidl, PCUITEMID_CHILD_ARRAY apidl, REFIID riid, UINT *rgfReserved, void **ppv)
108 if (InlineIsEqualGUID(riid, IID_IDataObject))
110 HRESULT hres = m_iSF->GetUIObjectOf(hwndOwner, cidl, apidl, IID_IDataObject, nullptr, ppv);
111 if (FAILED(hres))
112 return hres;
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)
120 nLength += (int)it->size();
121 nLength += 1; // '\0' separator
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;
132 for (auto it = sortedpaths.cbegin(); it != sortedpaths.cend(); ++it)
134 wcscpy_s(pCurrentFilename, it->size() + 1, it->c_str());
135 pCurrentFilename += it->size();
136 *pCurrentFilename = '\0'; // separator between file names
137 pCurrentFilename++;
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)
147 LPVOID pMem = ::GlobalLock(medium.hGlobal);
148 if (pMem)
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;
162 return E_OUTOFMEMORY;
164 else
166 // just pass it on to the base object
167 return m_iSF->GetUIObjectOf(hwndOwner, cidl, apidl, riid, rgfReserved, ppv);
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;
178 #define SHELL_MIN_CMD 10000
179 #define SHELL_MAX_CMD 20000
181 HRESULT CALLBACK dfmCallback(IShellFolder * /*psf*/, HWND /*hwnd*/, IDataObject * /*pdtobj*/, UINT uMsg, WPARAM /*wParam*/, LPARAM /*lParam*/)
183 switch (uMsg)
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;
192 return E_NOTIMPL;
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()
221 CGitStatusListCtrl::CGitStatusListCtrl() : CListCtrl()
222 //, m_HeadRev(GitRev::REV_HEAD)
223 , m_pbCanceled(nullptr)
224 , m_pStatLabel(nullptr)
225 , m_pSelectButton(nullptr)
226 , m_pConfirmButton(nullptr)
227 , m_bBusy(false)
228 , m_bEmpty(false)
229 , m_bShowIgnores(false)
230 , m_pDropTarget(nullptr)
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(nullptr)
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)
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;
290 CGitStatusListCtrl::~CGitStatusListCtrl()
292 // if (m_pDropTarget)
293 // delete m_pDropTarget;
294 ClearStatusArray();
297 void CGitStatusListCtrl::ClearStatusArray()
299 #if 0
300 Locker lock(m_critSec);
301 for (size_t i = 0; i < m_arStatusArray.size(); ++i)
303 delete m_arStatusArray[i];
305 m_arStatusArray.clear();
306 #endif
309 void CGitStatusListCtrl::Init(DWORD dwColumns, const CString& sColumnInfoContainer, unsigned __int64 dwContextMenus /* = GitSLC_POPALL */, bool bHasCheckboxes /* = true */, bool bHasWC /* = true */, DWORD allowedColumns /* = 0xffffffff */)
311 Locker lock(m_critSec);
313 m_dwDefaultColumns = dwColumns | 1;
314 m_dwContextMenus = dwContextMenus;
315 m_bHasCheckboxes = bHasCheckboxes;
316 m_bHasWC = bHasWC;
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);
328 SetWindowTheme(m_hWnd, L"Explorer", nullptr);
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);
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
347 m_ColumnManager.SetNames(standardColumnNames,GITSLC_NUMCOLUMNS);
348 m_ColumnManager.ReadSettings(m_dwDefaultColumns, 0xffffffff & ~(allowedColumns | m_dwDefaultColumns), sColumnInfoContainer, GITSLC_NUMCOLUMNS);
350 // enable file drops
351 #if 0
352 if (!m_pDropTarget)
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);
364 #endif
366 SetRedraw(true);
369 bool CGitStatusListCtrl::SetBackgroundImage(UINT nID)
371 return CAppUtils::SetListCtrlBackgroundImage(GetSafeHwnd(), nID);
374 BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList* pathList
375 , bool bUpdate /* = FALSE */
376 , bool bShowIgnores /* = false */
377 , bool bShowUnRev /* = false */
378 , bool bShowLocalChangesIgnored /* = false */)
380 m_bBusy = true;
381 m_bEmpty = false;
382 Invalidate();
384 m_bIsRevertTheirMy = g_Git.IsRebaseRunning() > 0;
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);
396 if (pathList && m_mapDirectFiles.empty())
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;
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);
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++)
419 FileEntry * entry = m_arStatusArray[i];
420 if ( bHasChangelists && entry->checked)
422 // If change lists are present, remember all checked entries
423 CString path = entry->GetPath().GetGitPathString();
424 m_mapFilenameToChecked[path] = true;
426 if ( (entry->status==git_wc_status_unversioned || entry->status==git_wc_status_missing ) && entry->checked )
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;
433 else if ( entry->status > git_wc_status_normal && !entry->checked )
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;
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();
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();
462 // first clear possible status data left from
463 // previous GetStatus() calls
464 ClearStatusArray();
466 m_StatusFileList = sortedPathList;
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.
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
484 GitConfig config;
486 m_sURL.Empty();
488 m_nTargetCount = sortedPathList.GetCount();
490 GitStatus status(m_pbCanceled);
491 if(m_nTargetCount > 1 && sortedPathList.AreAllPathsFilesInOneDirectory())
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);
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)
508 if (sortedPathList[fcindex].IsDirectory())
510 depth = git_depth_infinity;
511 bShowIgnoresRight = false;
512 break;
515 if(!FetchStatusForSingleTarget(config, status, sortedPathList.GetCommonDirectory(), bUpdate, sUUID, arExtPaths, true, depth, bShowIgnoresRight))
516 bRet = FALSE;
518 else
520 for(int nTarget = 0; nTarget < m_nTargetCount; nTarget++)
522 // check whether the path we want the status for is already fetched due to status-fetching
523 // of a parent path.
524 // this check is only done for file paths, because folder paths could be included already
525 // but not recursively
526 if (sortedPathList[nTarget].IsDirectory() || !GetListEntry(sortedPathList[nTarget]))
528 if(!FetchStatusForSingleTarget(config, status, sortedPathList[nTarget], bUpdate, sUUID,
529 arExtPaths, false, git_depth_infinity, bShowIgnores))
531 bRet = FALSE;
537 // remove the 'helper' files of conflicted items from the list.
538 // otherwise they would appear as unversioned files.
539 for (INT_PTR cind = 0; cind < m_ConflictFileList.GetCount(); ++cind)
541 for (size_t i=0; i < m_arStatusArray.size(); i++)
543 if (m_arStatusArray[i]->GetPath().IsEquivalentTo(m_ConflictFileList[cind]))
545 delete m_arStatusArray[i];
546 m_arStatusArray.erase(m_arStatusArray.cbegin() + i);
547 break;
551 refetchcounter++;
552 } while(!BuildStatistics() && (refetchcounter < 2) && (*m_pbCanceled==false));
554 m_bBlock = FALSE;
555 m_bBusy = false;
556 GetCursorPos(&pt);
557 SetCursorPos(pt.x, pt.y);
558 return bRet;
559 #endif
560 BuildStatistics();
561 return TRUE;
564 // Get the show-flags bitmap value which corresponds to a particular Git status
565 DWORD CGitStatusListCtrl::GetShowFlagsFromGitStatus(git_wc_status_kind status)
567 switch (status)
569 case git_wc_status_none:
570 case git_wc_status_unversioned:
571 return GITSLC_SHOWUNVERSIONED;
572 case git_wc_status_ignored:
573 if (!m_bShowIgnores)
574 return GITSLC_SHOWDIRECTS;
575 return GITSLC_SHOWDIRECTS|GITSLC_SHOWIGNORED;
576 case git_wc_status_incomplete:
577 return GITSLC_SHOWINCOMPLETE;
578 case git_wc_status_normal:
579 return GITSLC_SHOWNORMAL;
580 case git_wc_status_external:
581 return GITSLC_SHOWEXTERNAL;
582 case git_wc_status_added:
583 return GITSLC_SHOWADDED;
584 case git_wc_status_missing:
585 return GITSLC_SHOWMISSING;
586 case git_wc_status_deleted:
587 return GITSLC_SHOWREMOVED;
588 case git_wc_status_replaced:
589 return GITSLC_SHOWREPLACED;
590 case git_wc_status_modified:
591 return GITSLC_SHOWMODIFIED;
592 case git_wc_status_merged:
593 return GITSLC_SHOWMERGED;
594 case git_wc_status_conflicted:
595 return GITSLC_SHOWCONFLICTED;
596 case git_wc_status_obstructed:
597 return GITSLC_SHOWOBSTRUCTED;
598 default:
599 // we should NEVER get here!
600 ASSERT(FALSE);
601 break;
603 return 0;
606 void CGitStatusListCtrl::Show(unsigned int dwShow, unsigned int dwCheck /*=0*/, bool /*bShowFolders*/ /* = true */,BOOL UpdateStatusList,bool UseStoredCheckStatus)
608 m_bBusy = true;
609 m_bEmpty = false;
610 Invalidate();
612 CWinApp * pApp = AfxGetApp();
613 if (pApp)
614 pApp->DoWaitCursor(1);
616 Locker lock(m_critSec);
617 WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
619 //SetItemCount(listIndex);
620 SetRedraw(FALSE);
621 DeleteAllItems();
622 m_nSelected = 0;
624 m_nShownUnversioned = 0;
625 m_nShownModified = 0;
626 m_nShownAdded = 0;
627 m_nShownDeleted = 0;
628 m_nShownConflicted = 0;
629 m_nShownFiles = 0;
630 m_nShownSubmodules = 0;
632 m_dwShow = dwShow;
634 if(UpdateStatusList)
636 m_arStatusArray.clear();
637 for (int i = 0; i < m_StatusFileList.GetCount(); ++i)
638 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
640 for (int i = 0; i < m_UnRevFileList.GetCount(); ++i)
641 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
643 for (int i = 0; i < m_IgnoreFileList.GetCount(); ++i)
644 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
646 PrepareGroups();
647 if (m_nSortedColumn >= 0)
649 CSorter predicate (&m_ColumnManager, m_nSortedColumn, m_bAscending);
650 std::sort(m_arStatusArray.begin(), m_arStatusArray.end(), predicate);
653 int index =0;
654 for (size_t i = 0; i < m_arStatusArray.size(); ++i)
656 //set default checkbox status
657 CTGitPath* entry = ((CTGitPath*)m_arStatusArray[i]);
658 CString path = entry->GetGitPathString();
659 if (!m_mapFilenameToChecked.empty() && m_mapFilenameToChecked.find(path) != m_mapFilenameToChecked.end())
660 entry->m_Checked=m_mapFilenameToChecked[path];
661 else if (!UseStoredCheckStatus)
663 bool autoSelectSubmodules = !(entry->IsDirectory() && m_bDoNotAutoselectSubmodules);
664 if (((entry->m_Action & dwCheck) && !(m_bNoAutoselectMissing && entry->m_Action & CTGitPath::LOGACTIONS_MISSING) || dwShow & GITSLC_SHOWDIRECTFILES && m_mapDirectFiles.find(path) != m_mapDirectFiles.end()) && autoSelectSubmodules)
665 entry->m_Checked=true;
666 else
667 entry->m_Checked=false;
668 m_mapFilenameToChecked[path] = entry->m_Checked;
671 if(entry->m_Action & dwShow)
673 AddEntry(entry,langID,index);
674 index++;
678 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
679 for (int col = 0; col <= maxcol; col++)
680 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
682 SetRedraw(TRUE);
683 GetStatisticsString();
685 CHeaderCtrl * pHeader = GetHeaderCtrl();
686 HDITEM HeaderItem = {0};
687 HeaderItem.mask = HDI_FORMAT;
688 for (int i=0; i<pHeader->GetItemCount(); ++i)
690 pHeader->GetItem(i, &HeaderItem);
691 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
692 pHeader->SetItem(i, &HeaderItem);
694 if (m_nSortedColumn >= 0)
696 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
697 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
698 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
701 #if 0
702 if (nSelectedEntry)
704 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
705 EnsureVisible(nSelectedEntry, false);
707 else
709 // Restore the item at the top of the list.
710 for (int i=0;GetTopIndex() != nTopIndex;i++)
712 if ( !EnsureVisible(nTopIndex+i,false) )
713 break;
716 #endif
717 if (pApp)
718 pApp->DoWaitCursor(-1);
720 m_bBusy = false;
721 m_bEmpty = (GetItemCount() == 0);
722 Invalidate();
724 this->BuildStatistics();
726 #if 0
728 CWinApp * pApp = AfxGetApp();
729 if (pApp)
730 pApp->DoWaitCursor(1);
732 m_bShowFolders = bShowFolders;
734 int nTopIndex = GetTopIndex();
735 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
736 int nSelectedEntry = 0;
737 if (posSelectedEntry)
738 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
739 SetRedraw(FALSE);
740 DeleteAllItems();
742 PrepareGroups();
744 m_arListArray.clear();
746 m_arListArray.reserve(m_arStatusArray.size());
747 SetItemCount (static_cast<int>(m_arStatusArray.size()));
749 int listIndex = 0;
750 for (size_t i=0; i < m_arStatusArray.size(); ++i)
752 FileEntry * entry = m_arStatusArray[i];
753 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
754 continue;
755 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
756 continue;
757 if (entry->IsFolder() && (!bShowFolders))
758 continue; // don't show folders if they're not wanted.
760 #if 0
761 git_wc_status_kind status = GitStatus::GetMoreImportant(entry->status, entry->remotestatus);
762 DWORD showFlags = GetShowFlagsFromGitStatus(status);
763 if (entry->IsLocked())
764 showFlags |= SVNSLC_SHOWLOCKS;
765 if (entry->switched)
766 showFlags |= SVNSLC_SHOWSWITCHED;
767 if (!entry->changelist.IsEmpty())
768 showFlags |= SVNSLC_SHOWINCHANGELIST;
769 #endif
770 bool bAllowCheck = ((entry->changelist.Compare(GITSLC_IGNORECHANGELIST) != 0)
771 && (m_bCheckIfGroupsExist || (m_changelists.empty() || (m_changelists.size() == 1 && m_bHasIgnoreGroup))));
773 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
774 #if 0
775 if (status != Git_wc_status_ignored || (entry->direct) || (dwShow & GitSLC_SHOWIGNORED))
777 if ((!entry->IsFolder()) && (status == Git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
779 if (PathFileExists(entry->GetPath().GetWinPath()))
781 m_arListArray.push_back(i);
782 if ((dwCheck & SVNSLC_SHOWREMOVEDANDPRESENT)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
784 if (bAllowCheck)
785 entry->checked = true;
787 AddEntry(entry, langID, listIndex++);
790 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
792 m_arListArray.push_back(i);
793 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
795 if (bAllowCheck)
796 entry->checked = true;
798 AddEntry(entry, langID, listIndex++);
800 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
802 m_arListArray.push_back(i);
803 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
805 if (bAllowCheck)
806 entry->checked = true;
808 AddEntry(entry, langID, listIndex++);
811 #endif
814 SetItemCount(listIndex);
816 m_ColumnManager.UpdateRelevance (m_arStatusArray, m_arListArray);
818 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
819 for (int col = 0; col <= maxcol; col++)
820 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
822 SetRedraw(TRUE);
823 GetStatisticsString();
825 CHeaderCtrl * pHeader = GetHeaderCtrl();
826 HDITEM HeaderItem = {0};
827 HeaderItem.mask = HDI_FORMAT;
828 for (int i=0; i<pHeader->GetItemCount(); ++i)
830 pHeader->GetItem(i, &HeaderItem);
831 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
832 pHeader->SetItem(i, &HeaderItem);
834 if (m_nSortedColumn)
836 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
837 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
838 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
841 if (nSelectedEntry)
843 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
844 EnsureVisible(nSelectedEntry, false);
846 else
848 // Restore the item at the top of the list.
849 for (int i=0;GetTopIndex() != nTopIndex;i++)
851 if ( !EnsureVisible(nTopIndex+i,false) )
852 break;
856 if (pApp)
857 pApp->DoWaitCursor(-1);
859 m_bEmpty = (GetItemCount() == 0);
860 Invalidate();
861 #endif
864 void CGitStatusListCtrl::Show(unsigned int /*dwShow*/, const CTGitPathList& checkedList, bool /*bShowFolders*/ /* = true */)
866 DeleteAllItems();
867 for (int i = 0; i < checkedList.GetCount(); ++i)
868 this->AddEntry((CTGitPath *)&checkedList[i],0,i);
869 return ;
870 #if 0
872 Locker lock(m_critSec);
873 WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
875 CWinApp * pApp = AfxGetApp();
876 if (pApp)
877 pApp->DoWaitCursor(1);
878 m_dwShow = dwShow;
879 m_bShowFolders = bShowFolders;
880 m_nSelected = 0;
881 int nTopIndex = GetTopIndex();
882 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
883 int nSelectedEntry = 0;
884 if (posSelectedEntry)
885 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
886 SetRedraw(FALSE);
887 DeleteAllItems();
889 PrepareGroups();
891 m_arListArray.clear();
893 m_arListArray.reserve(m_arStatusArray.size());
894 SetItemCount (static_cast<int>(m_arStatusArray.size()));
896 int listIndex = 0;
897 for (size_t i=0; i < m_arStatusArray.size(); ++i)
899 FileEntry * entry = m_arStatusArray[i];
900 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
901 continue;
902 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
903 continue;
904 if (entry->IsFolder() && (!bShowFolders))
905 continue; // don't show folders if they're not wanted.
906 #if 0
907 git_wc_status_kind status = SVNStatus::GetMoreImportant(entry->status, entry->remotestatus);
908 DWORD showFlags = GetShowFlagsFromSVNStatus(status);
909 if (entry->IsLocked())
910 showFlags |= SVNSLC_SHOWLOCKS;
911 if (!entry->changelist.IsEmpty())
912 showFlags |= SVNSLC_SHOWINCHANGELIST;
914 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
915 if (status != git_wc_status_ignored || (entry->direct) || (dwShow & SVNSLC_SHOWIGNORED))
917 for (int npath = 0; npath < checkedList.GetCount(); ++npath)
919 if (entry->GetPath().IsEquivalentTo(checkedList[npath]))
921 entry->checked = true;
922 break;
925 if ((!entry->IsFolder()) && (status == git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
927 if (PathFileExists(entry->GetPath().GetWinPath()))
929 m_arListArray.push_back(i);
930 AddEntry(entry, langID, listIndex++);
933 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
935 m_arListArray.push_back(i);
936 AddEntry(entry, langID, listIndex++);
938 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
940 m_arListArray.push_back(i);
941 AddEntry(entry, langID, listIndex++);
943 else if (entry->switched)
945 m_arListArray.push_back(i);
946 AddEntry(entry, langID, listIndex++);
949 #endif
952 SetItemCount(listIndex);
954 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
955 for (int col = 0; col <= maxcol; col++)
956 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
958 SetRedraw(TRUE);
959 GetStatisticsString();
961 CHeaderCtrl * pHeader = GetHeaderCtrl();
962 HDITEM HeaderItem = {0};
963 HeaderItem.mask = HDI_FORMAT;
964 for (int i=0; i<pHeader->GetItemCount(); ++i)
966 pHeader->GetItem(i, &HeaderItem);
967 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
968 pHeader->SetItem(i, &HeaderItem);
970 if (m_nSortedColumn)
972 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
973 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
974 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
977 if (nSelectedEntry)
979 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
980 EnsureVisible(nSelectedEntry, false);
982 else
984 // Restore the item at the top of the list.
985 for (int i=0;GetTopIndex() != nTopIndex;i++)
987 if ( !EnsureVisible(nTopIndex+i,false) )
988 break;
992 if (pApp)
993 pApp->DoWaitCursor(-1);
995 m_bEmpty = (GetItemCount() == 0);
996 Invalidate();
997 #endif
999 int CGitStatusListCtrl::GetColumnIndex(int mask)
1001 for (int i = 0; i < 32; ++i)
1002 if(mask&0x1)
1003 return i;
1004 else
1005 mask=mask>>1;
1006 return -1;
1008 void CGitStatusListCtrl::AddEntry(CTGitPath * GitPath, WORD /*langID*/, int listIndex)
1010 static CString from(MAKEINTRESOURCE(IDS_STATUSLIST_FROM));
1011 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
1012 static bool abbreviateRenamings(((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\AbbreviateRenamings"), FALSE)) == TRUE);
1013 static bool relativeTimes = (CRegDWORD(_T("Software\\TortoiseGit\\RelativeTimes"), FALSE) != FALSE);
1015 CString path = GitPath->GetGitPathString();
1017 m_bBlock = TRUE;
1018 int index = listIndex;
1019 int nCol = 1;
1020 CString entryname = GitPath->GetGitPathString();
1021 int icon_idx = 0;
1022 if (GitPath->IsDirectory())
1024 icon_idx = m_nIconFolder;
1025 m_nShownSubmodules++;
1027 else
1029 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(*GitPath);
1030 m_nShownFiles++;
1032 switch (GitPath->m_Action)
1034 case CTGitPath::LOGACTIONS_ADDED:
1035 case CTGitPath::LOGACTIONS_COPY:
1036 m_nShownAdded++;
1037 break;
1038 case CTGitPath::LOGACTIONS_DELETED:
1039 case CTGitPath::LOGACTIONS_MISSING:
1040 case CTGitPath::LOGACTIONS_DELETED | CTGitPath::LOGACTIONS_MISSING:
1041 m_nShownDeleted++;
1042 break;
1043 case CTGitPath::LOGACTIONS_REPLACED:
1044 case CTGitPath::LOGACTIONS_MODIFIED:
1045 case CTGitPath::LOGACTIONS_MERGED:
1046 m_nShownModified++;
1047 break;
1048 case CTGitPath::LOGACTIONS_UNMERGED:
1049 m_nShownConflicted++;
1050 break;
1051 case CTGitPath::LOGACTIONS_UNVER:
1052 m_nShownUnversioned++;
1053 break;
1054 default:
1055 m_nShownUnversioned++;
1056 break;
1058 if(GitPath->m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY) && !GitPath->GetGitOldPathString().IsEmpty())
1060 if (!abbreviateRenamings)
1062 entryname += L' ';
1063 // relative path
1064 entryname.AppendFormat(from, (LPCTSTR)GitPath->GetGitOldPathString());
1066 else
1068 CTGitPathList tgpl;
1069 tgpl.AddPath(*GitPath);
1070 CTGitPath old(GitPath->GetGitOldPathString());
1071 tgpl.AddPath(old);
1072 CString commonRoot = tgpl.GetCommonRoot().GetGitPathString();
1073 if (!commonRoot.IsEmpty())
1074 commonRoot += _T("/");
1075 if (old.GetFileOrDirectoryName() == GitPath->GetFileOrDirectoryName() && old.GetContainingDirectory().GetGitPathString() != "" && GitPath->GetContainingDirectory().GetGitPathString())
1076 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();
1077 else if (!commonRoot.IsEmpty())
1078 entryname = commonRoot + _T("{") + GitPath->GetGitOldPathString().Mid(commonRoot.GetLength()) + _T(" => ") + GitPath->GetGitPathString().Mid(commonRoot.GetLength()) + _T("}");
1079 else
1080 entryname = GitPath->GetGitOldPathString().Mid(commonRoot.GetLength()) + _T(" => ") + GitPath->GetGitPathString().Mid(commonRoot.GetLength());
1084 InsertItem(index, entryname, icon_idx);
1085 if (m_restorepaths.find(GitPath->GetWinPathString()) != m_restorepaths.end())
1086 SetItemState(index, INDEXTOOVERLAYMASK(OVL_RESTORE), TVIS_OVERLAYMASK);
1088 this->SetItemData(index, (DWORD_PTR)GitPath);
1089 // SVNSLC_COLFILENAME
1090 SetItemText(index, nCol++, GitPath->GetFileOrDirectoryName());
1091 // SVNSLC_COLEXT
1092 SetItemText(index, nCol++, GitPath->GetFileExtension());
1093 // SVNSLC_COLSTATUS
1094 SetItemText(index, nCol++, GitPath->GetActionName());
1096 SetItemText(index, GetColumnIndex(GITSLC_COLADD),GitPath->m_StatAdd);
1097 SetItemText(index, GetColumnIndex(GITSLC_COLDEL),GitPath->m_StatDel);
1100 CString modificationDate;
1101 __int64 filetime = GitPath->GetLastWriteTime();
1102 if (filetime && !(GitPath->m_Action & CTGitPath::LOGACTIONS_DELETED))
1104 FILETIME* f = (FILETIME*)(__int64*)&filetime;
1105 modificationDate = CLoglistUtils::FormatDateAndTime(CTime(CGit::filetime_to_time_t(f)), DATE_SHORTDATE, true, relativeTimes);
1107 SetItemText(index, GetColumnIndex(GITSLC_COLMODIFICATIONDATE), modificationDate);
1109 // SVNSLC_COLSIZE
1110 if (GitPath->IsDirectory())
1111 SetItemText(index, GetColumnIndex(GITSLC_COLSIZE), _T(""));
1112 else
1114 TCHAR buf[100] = { 0 };
1115 StrFormatByteSize64(GitPath->GetFileSize(), buf, 100);
1116 SetItemText(index, GetColumnIndex(GITSLC_COLSIZE), buf);
1119 SetCheck(index, GitPath->m_Checked);
1120 if (GitPath->m_Checked)
1121 m_nSelected++;
1123 if ((GitPath->m_Action & CTGitPath::LOGACTIONS_SKIPWORKTREE) || (GitPath->m_Action & CTGitPath::LOGACTIONS_ASSUMEVALID))
1124 SetItemGroup(index, 3);
1125 else if (GitPath->m_Action & CTGitPath::LOGACTIONS_IGNORE)
1126 SetItemGroup(index, 2);
1127 else if( GitPath->m_Action & CTGitPath::LOGACTIONS_UNVER)
1128 SetItemGroup(index,1);
1129 else
1130 SetItemGroup(index, GitPath->m_ParentNo&(PARENT_MASK|MERGE_MASK));
1132 m_bBlock = FALSE;
1135 bool CGitStatusListCtrl::SetItemGroup(int item, int groupindex)
1137 // if (!(m_dwContextMenus & SVNSLC_POPCHANGELISTS))
1138 // return false;
1139 if (groupindex < 0)
1140 return false;
1141 LVITEM i = {0};
1142 i.mask = LVIF_GROUPID;
1143 i.iItem = item;
1144 i.iSubItem = 0;
1145 i.iGroupId = groupindex;
1147 return !!SetItem(&i);
1150 void CGitStatusListCtrl::OnHdnItemclick(NMHDR *pNMHDR, LRESULT *pResult)
1152 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
1153 *pResult = 0;
1154 if (m_bBlock || m_arStatusArray.empty())
1155 return;
1156 m_bBlock = TRUE;
1157 if (m_nSortedColumn == phdr->iItem)
1158 m_bAscending = !m_bAscending;
1159 else
1160 m_bAscending = TRUE;
1161 m_nSortedColumn = phdr->iItem;
1162 Show(m_dwShow, 0, m_bShowFolders,false,true);
1164 m_bBlock = FALSE;
1167 void CGitStatusListCtrl::OnLvnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
1169 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1170 *pResult = 0;
1172 #define ISCHECKED(x) ((x) ? ((((x)&LVIS_STATEIMAGEMASK)>>12)-1) : FALSE)
1173 if ((m_bBlock)&&(m_bBlockUI))
1175 // if we're blocked, prevent changing of the check state
1176 if ((!ISCHECKED(pNMLV->uOldState) && ISCHECKED(pNMLV->uNewState))||
1177 (ISCHECKED(pNMLV->uOldState) && !ISCHECKED(pNMLV->uNewState)))
1178 *pResult = TRUE;
1182 BOOL CGitStatusListCtrl::OnLvnItemchanged(NMHDR *pNMHDR, LRESULT *pResult)
1184 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1185 *pResult = 0;
1186 CWnd* pParent = GetLogicalParent();
1187 if (pParent && pParent->GetSafeHwnd())
1188 pParent->SendMessage(GITSLNM_ITEMCHANGED, pNMLV->iItem);
1190 if ((pNMLV->uNewState==0)||(pNMLV->uNewState & LVIS_SELECTED)||(pNMLV->uNewState & LVIS_FOCUSED))
1191 return FALSE;
1193 if (m_bBlock)
1194 return FALSE;
1196 bool bSelected = !!(ListView_GetItemState(m_hWnd, pNMLV->iItem, LVIS_SELECTED) & LVIS_SELECTED);
1197 int nListItems = GetItemCount();
1199 m_bBlock = TRUE;
1200 // was the item checked?
1202 //CTGitPath *gitpath=(CTGitPath*)GetItemData(pNMLV->iItem);
1203 //gitpath->m_Checked=GetCheck(pNMLV->iItem);
1205 if (GetCheck(pNMLV->iItem))
1207 CheckEntry(pNMLV->iItem, nListItems);
1208 if (bSelected)
1210 POSITION pos = GetFirstSelectedItemPosition();
1211 int index;
1212 while ((index = GetNextSelectedItem(pos)) >= 0)
1214 if (index != pNMLV->iItem)
1215 CheckEntry(index, nListItems);
1219 else
1221 UncheckEntry(pNMLV->iItem, nListItems);
1222 if (bSelected)
1224 POSITION pos = GetFirstSelectedItemPosition();
1225 int index;
1226 while ((index = GetNextSelectedItem(pos)) >= 0)
1228 if (index != pNMLV->iItem)
1229 UncheckEntry(index, nListItems);
1234 GetStatisticsString();
1235 m_bBlock = FALSE;
1236 NotifyCheck();
1238 return FALSE;
1241 void CGitStatusListCtrl::OnColumnResized(NMHDR *pNMHDR, LRESULT *pResult)
1243 m_ColumnManager.OnColumnResized(pNMHDR,pResult);
1245 *pResult = FALSE;
1248 void CGitStatusListCtrl::OnColumnMoved(NMHDR *pNMHDR, LRESULT *pResult)
1250 m_ColumnManager.OnColumnMoved(pNMHDR, pResult);
1252 Invalidate(FALSE);
1255 void CGitStatusListCtrl::CheckEntry(int index, int /*nListItems*/)
1257 Locker lock(m_critSec);
1258 //FileEntry * entry = GetListEntry(index);
1259 CTGitPath *path=(CTGitPath*)GetItemData(index);
1260 ASSERT(path);
1261 if (!path)
1262 return;
1263 m_mapFilenameToChecked[path->GetGitPathString()] = true;
1264 SetCheck(index, TRUE);
1265 //entry = GetListEntry(index);
1266 // if an unversioned item was checked, then we need to check if
1267 // the parent folders are unversioned too. If the parent folders actually
1268 // are unversioned, then check those too.
1269 #if 0
1270 if (entry->status == git_wc_status_unversioned)
1272 // we need to check the parent folder too
1273 const CTGitPath& folderpath = entry->path;
1274 for (int i=0; i< nListItems; ++i)
1276 FileEntry * testEntry = GetListEntry(i);
1277 ASSERT(testEntry);
1278 if (!testEntry)
1279 continue;
1280 if (!testEntry->checked)
1282 if (testEntry->path.IsAncestorOf(folderpath) && (!testEntry->path.IsEquivalentTo(folderpath)))
1284 SetEntryCheck(testEntry,i,true);
1285 m_nSelected++;
1290 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1291 if ( (entry->status == git_wc_status_deleted) || (m_bCheckChildrenWithParent) || (bShift) )
1293 // if a deleted folder gets checked, we have to check all
1294 // children of that folder too.
1295 if (entry->path.IsDirectory())
1296 SetCheckOnAllDescendentsOf(entry, true);
1298 // if a deleted file or folder gets checked, we have to
1299 // check all parents of this item too.
1300 for (int i=0; i<nListItems; ++i)
1302 FileEntry * testEntry = GetListEntry(i);
1303 ASSERT(testEntry);
1304 if (!testEntry)
1305 continue;
1306 if (!testEntry->checked)
1308 if (testEntry->path.IsAncestorOf(entry->path) && (!testEntry->path.IsEquivalentTo(entry->path)))
1310 if ((testEntry->status == git_wc_status_deleted)||(m_bCheckChildrenWithParent))
1312 SetEntryCheck(testEntry,i,true);
1313 m_nSelected++;
1314 // now we need to check all children of this parent folder
1315 SetCheckOnAllDescendentsOf(testEntry, true);
1321 #endif
1322 if ( !path->m_Checked )
1324 path->m_Checked = TRUE;
1325 m_nSelected++;
1329 void CGitStatusListCtrl::UncheckEntry(int index, int /*nListItems*/)
1331 Locker lock(m_critSec);
1332 CTGitPath *path=(CTGitPath*)GetItemData(index);
1333 ASSERT(path);
1334 if (!path)
1335 return;
1336 SetCheck(index, FALSE);
1337 m_mapFilenameToChecked[path->GetGitPathString()] = false;
1338 //entry = GetListEntry(index);
1339 // item was unchecked
1340 #if 0
1341 if (entry->path.IsDirectory())
1343 // disable all files within an unselected folder, except when unchecking a folder with property changes
1344 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1345 if ( (entry->status != git_wc_status_modified) || (bShift) )
1347 SetCheckOnAllDescendentsOf(entry, false);
1350 else if (entry->status == git_wc_status_deleted)
1352 // a "deleted" file was unchecked, so uncheck all parent folders
1353 // and all children of those parents
1354 for (int i=0; i<nListItems; i++)
1356 FileEntry * testEntry = GetListEntry(i);
1357 ASSERT(testEntry);
1358 if (!testEntry)
1359 continue;
1360 if (testEntry->checked)
1362 if (testEntry->path.IsAncestorOf(entry->path))
1364 if (testEntry->status == git_wc_status_deleted)
1366 SetEntryCheck(testEntry,i,false);
1367 m_nSelected--;
1369 SetCheckOnAllDescendentsOf(testEntry, false);
1375 #endif
1376 if ( path->m_Checked )
1378 path->m_Checked = FALSE;
1379 m_nSelected--;
1382 bool CGitStatusListCtrl::BuildStatistics()
1384 bool bRefetchStatus = false;
1386 // now gather some statistics
1387 m_nUnversioned = 0;
1388 m_nNormal = 0;
1389 m_nModified = 0;
1390 m_nAdded = 0;
1391 m_nDeleted = 0;
1392 m_nConflicted = 0;
1393 m_nTotal = 0;
1394 m_nSelected = 0;
1395 m_nLineAdded = 0;
1396 m_nLineDeleted = 0;
1397 m_nRenamed = 0;
1399 for (size_t i = 0; i < m_arStatusArray.size(); ++i)
1401 int status=((CTGitPath*)m_arStatusArray[i])->m_Action;
1403 m_nLineAdded += _tstol(((CTGitPath*)m_arStatusArray[i])->m_StatAdd);
1404 m_nLineDeleted += _tstol(((CTGitPath*)m_arStatusArray[i])->m_StatDel);
1406 if(status&(CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))
1407 m_nAdded++;
1409 if(status&CTGitPath::LOGACTIONS_DELETED)
1410 m_nDeleted++;
1412 if(status&(CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_MODIFIED))
1413 m_nModified++;
1415 if(status&CTGitPath::LOGACTIONS_UNMERGED)
1416 m_nConflicted++;
1418 if(status&(CTGitPath::LOGACTIONS_IGNORE|CTGitPath::LOGACTIONS_UNVER))
1419 m_nUnversioned++;
1421 if(status&(CTGitPath::LOGACTIONS_REPLACED))
1422 m_nRenamed++;
1424 if(((CTGitPath*)m_arStatusArray[i])->m_Checked)
1425 m_nSelected++;
1427 return !bRefetchStatus;
1431 int CGitStatusListCtrl::GetGroupFromPoint(POINT * ppt)
1433 // the point must be relative to the upper left corner of the control
1435 if (!ppt)
1436 return -1;
1437 if (!IsGroupViewEnabled())
1438 return -1;
1440 POINT pt = *ppt;
1441 pt.x = 10;
1442 UINT flags = 0;
1443 int nItem = -1;
1444 RECT rc;
1445 GetWindowRect(&rc);
1446 while (((flags & LVHT_BELOW) == 0)&&(pt.y < rc.bottom))
1448 nItem = HitTest(pt, &flags);
1449 if ((flags & LVHT_ONITEM)||(flags & LVHT_EX_GROUP_HEADER))
1451 // the first item below the point
1453 // check if the point is too much right (i.e. if the point
1454 // is farther to the right than the width of the item)
1455 RECT r;
1456 GetItemRect(nItem, &r, LVIR_LABEL);
1457 if (ppt->x > r.right)
1458 return -1;
1460 LVITEM lv = {0};
1461 lv.mask = LVIF_GROUPID;
1462 lv.iItem = nItem;
1463 GetItem(&lv);
1464 int groupID = lv.iGroupId;
1465 // now we search upwards and check if the item above this one
1466 // belongs to another group. If it belongs to the same group,
1467 // we're not over a group header
1468 while (pt.y >= 0)
1470 pt.y -= 2;
1471 nItem = HitTest(pt, &flags);
1472 if ((flags & LVHT_ONITEM)&&(nItem >= 0))
1474 // the first item below the point
1475 LVITEM lv2 = {0};
1476 lv2.mask = LVIF_GROUPID;
1477 lv2.iItem = nItem;
1478 GetItem(&lv2);
1479 if (lv2.iGroupId != groupID)
1480 return groupID;
1481 else
1482 return -1;
1485 if (pt.y < 0)
1486 return groupID;
1487 return -1;
1489 pt.y += 2;
1491 return -1;
1494 void CGitStatusListCtrl::OnContextMenuGroup(CWnd * /*pWnd*/, CPoint point)
1496 POINT clientpoint = point;
1497 ScreenToClient(&clientpoint);
1498 if ((IsGroupViewEnabled())&&(GetGroupFromPoint(&clientpoint) >= 0))
1500 CMenu popup;
1501 if (popup.CreatePopupMenu())
1503 CString temp;
1504 temp.LoadString(IDS_STATUSLIST_CHECKGROUP);
1505 popup.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_CHECKGROUP, temp);
1506 temp.LoadString(IDS_STATUSLIST_UNCHECKGROUP);
1507 popup.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_UNCHECKGROUP, temp);
1508 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1509 bool bCheck = false;
1510 switch (cmd)
1512 case IDGITLC_CHECKGROUP:
1513 bCheck = true;
1514 // fall through here
1515 case IDGITLC_UNCHECKGROUP:
1517 int group = GetGroupFromPoint(&clientpoint);
1518 // go through all items and check/uncheck those assigned to the group
1519 // but block the OnLvnItemChanged handler
1520 m_bBlock = true;
1521 for (int i=0; i<GetItemCount(); ++i)
1523 LVITEM lv = { 0 };
1524 lv.mask = LVIF_GROUPID;
1525 lv.iItem = i;
1526 GetItem(&lv);
1528 if (lv.iGroupId == group)
1530 CTGitPath * entry = (CTGitPath*)GetItemData(i);
1531 if (entry)
1533 bool bOldCheck = entry->m_Checked;
1534 SetEntryCheck(entry, i, bCheck);
1535 if (bCheck != bOldCheck)
1537 if (bCheck)
1538 m_nSelected++;
1539 else
1540 m_nSelected--;
1546 GetStatisticsString();
1547 NotifyCheck();
1548 m_bBlock = false;
1550 break;
1556 void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
1558 //WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
1560 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1561 CTGitPath * filepath;
1563 int selIndex = GetSelectionMark();
1564 if ((point.x == -1) && (point.y == -1))
1566 CRect rect;
1567 GetItemRect(selIndex, &rect, LVIR_LABEL);
1568 ClientToScreen(&rect);
1569 point = rect.CenterPoint();
1571 if ((GetSelectedCount() == 0) && (m_bHasCheckboxes))
1573 // nothing selected could mean the context menu is requested for
1574 // a group header
1575 OnContextMenuGroup(pWnd, point);
1577 else if (selIndex >= 0)
1579 //FileEntry * entry = GetListEntry(selIndex);
1581 filepath = (CTGitPath * )GetItemData(selIndex);
1583 ASSERT(filepath);
1584 if (!filepath)
1585 return;
1587 //const CTGitPath& filepath = entry->path;
1588 int wcStatus = filepath->m_Action;
1589 // entry is selected, now show the popup menu
1590 Locker lock(m_critSec);
1591 CIconMenu popup;
1592 CMenu changelistSubMenu;
1593 CMenu ignoreSubMenu;
1594 CMenu shellMenu;
1595 if (popup.CreatePopupMenu())
1597 //Add Menu for version controlled file
1599 if (GetSelectedCount() > 0 && wcStatus & CTGitPath::LOGACTIONS_UNMERGED)
1601 if (GetSelectedCount() == 1 && (m_dwContextMenus & GITSLC_POPCONFLICT)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1603 popup.AppendMenuIcon(IDGITLC_EDITCONFLICT, IDS_MENUCONFLICT, IDI_CONFLICT);
1604 popup.SetDefaultItem(IDGITLC_EDITCONFLICT, FALSE);
1606 if (m_dwContextMenus & GITSLC_POPRESOLVE)
1607 popup.AppendMenuIcon(IDGITLC_RESOLVECONFLICT, IDS_STATUSLIST_CONTEXT_RESOLVED, IDI_RESOLVE);
1608 if ((m_dwContextMenus & GITSLC_POPRESOLVE)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1610 popup.AppendMenuIcon(IDGITLC_RESOLVETHEIRS, IDS_SVNPROGRESS_MENUUSETHEIRS, IDI_RESOLVE);
1611 popup.AppendMenuIcon(IDGITLC_RESOLVEMINE, IDS_SVNPROGRESS_MENUUSEMINE, IDI_RESOLVE);
1613 if ((m_dwContextMenus & GITSLC_POPCONFLICT)||(m_dwContextMenus & GITSLC_POPRESOLVE))
1614 popup.AppendMenu(MF_SEPARATOR);
1617 if (GetSelectedCount() > 0)
1619 if (wcStatus & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE))
1621 if (m_dwContextMenus & GITSLC_POPADD)
1623 //if ( entry->IsFolder() )
1625 // popup.AppendMenuIcon(IDSVNLC_ADD_RECURSIVE, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE, IDI_ADD);
1627 //else
1629 popup.AppendMenuIcon(IDGITLC_ADD, IDS_STATUSLIST_CONTEXT_ADD, IDI_ADD);
1632 if (m_dwContextMenus & GITSLC_POPCOMMIT)
1633 popup.AppendMenuIcon(IDGITLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);
1637 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)
1639 bool bEntryAdded = false;
1640 if (m_dwContextMenus & GITSLC_POPCOMPAREWITHBASE)
1642 if(filepath->m_ParentNo & MERGE_MASK)
1643 popup.AppendMenuIcon(IDGITLC_COMPARE, IDS_TREE_DIFF, IDI_DIFF);
1644 else
1645 popup.AppendMenuIcon(IDGITLC_COMPARE, IDS_LOG_COMPAREWITHBASE, IDI_DIFF);
1647 if (!(wcStatus & (CTGitPath::LOGACTIONS_UNMERGED)) || GetSelectedCount() != 1)
1648 popup.SetDefaultItem(IDGITLC_COMPARE, FALSE);
1649 bEntryAdded = true;
1652 if (!g_Git.IsInitRepos() && (m_dwContextMenus & GITSLC_POPGNUDIFF))
1654 popup.AppendMenuIcon(IDGITLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1655 bEntryAdded = true;
1658 if ((m_dwContextMenus & this->GetContextMenuBit(IDGITLC_COMPAREWC)) && m_bHasWC)
1660 if ((!m_CurrentVersion.IsEmpty()) && m_CurrentVersion != GIT_REV_ZERO)
1662 popup.AppendMenuIcon(IDGITLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
1663 bEntryAdded = true;
1667 if (bEntryAdded)
1668 popup.AppendMenu(MF_SEPARATOR);
1671 if (!m_Rev1.IsEmpty() && !m_Rev2.IsEmpty())
1673 if(GetSelectedCount() == 1)
1675 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_COMPARETWOREVISIONS))
1677 popup.AppendMenuIcon(IDGITLC_COMPARETWOREVISIONS, IDS_LOG_POPUP_COMPARETWO, IDI_DIFF);
1678 popup.SetDefaultItem(IDGITLC_COMPARETWOREVISIONS, FALSE);
1680 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_GNUDIFF2REVISIONS))
1681 popup.AppendMenuIcon(IDGITLC_GNUDIFF2REVISIONS, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1685 //Select Multi item
1686 if (GetSelectedCount() > 0)
1688 if ((GetSelectedCount() == 2) && (m_dwContextMenus & GITSLC_POPCOMPARETWOFILES) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO))
1690 POSITION pos = GetFirstSelectedItemPosition();
1691 int index = GetNextSelectedItem(pos);
1692 if (index >= 0)
1694 CTGitPath* entry2 = nullptr;
1695 entry2 = (CTGitPath*)GetItemData(index);
1696 bool firstEntryExistsAndIsFile = entry2 && !entry2->IsDirectory();
1697 index = GetNextSelectedItem(pos);
1698 if (index >= 0)
1700 entry2 = (CTGitPath * )GetItemData(index);
1701 if (firstEntryExistsAndIsFile && entry2 && !entry2->IsDirectory())
1702 popup.AppendMenuIcon(IDGITLC_COMPARETWOFILES, IDS_STATUSLIST_CONTEXT_COMPARETWOFILES, IDI_DIFF);
1708 if ( (GetSelectedCount() >0 ) && (!(wcStatus & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE))) && m_bHasWC)
1710 if ((m_dwContextMenus & GITSLC_POPCOMMIT) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO) && !(wcStatus & (CTGitPath::LOGACTIONS_SKIPWORKTREE | CTGitPath::LOGACTIONS_ASSUMEVALID)))
1711 popup.AppendMenuIcon(IDGITLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);
1713 if ((m_dwContextMenus & GITSLC_POPREVERT) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO))
1714 popup.AppendMenuIcon(IDGITLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
1716 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)))
1717 popup.AppendMenuIcon(IDGITLC_SKIPWORKTREE, IDS_STATUSLIST_SKIPWORKTREE);
1719 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)))
1720 popup.AppendMenuIcon(IDGITLC_ASSUMEVALID, IDS_MENUASSUMEVALID);
1722 if ((m_dwContextMenus & GITLC_POPUNSETIGNORELOCALCHANGES) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO) && (wcStatus & (CTGitPath::LOGACTIONS_SKIPWORKTREE | CTGitPath::LOGACTIONS_ASSUMEVALID)))
1723 popup.AppendMenuIcon(IDGITLC_UNSETIGNORELOCALCHANGES, IDS_STATUSLIST_UNSETIGNORELOCALCHANGES);
1725 if (m_dwContextMenus & GITSLC_POPRESTORE && !filepath->IsDirectory())
1727 if (m_restorepaths.find(filepath->GetWinPathString()) == m_restorepaths.end())
1728 popup.AppendMenuIcon(IDGITLC_CREATERESTORE, IDS_MENUCREATERESTORE, IDI_RESTORE);
1729 else
1730 popup.AppendMenuIcon(IDGITLC_RESTOREPATH, IDS_MENURESTORE, IDI_RESTORE);
1733 if ((m_dwContextMenus & GetContextMenuBit(IDGITLC_REVERTTOREV)) && ( !this->m_CurrentVersion.IsEmpty() )
1734 && this->m_CurrentVersion != GIT_REV_ZERO && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1736 popup.AppendMenuIcon(IDGITLC_REVERTTOREV, IDS_LOG_POPUP_REVERTTOREV, IDI_REVERT);
1739 if ((m_dwContextMenus & GetContextMenuBit(IDGITLC_REVERTTOPARENT)) && ( !this->m_CurrentVersion.IsEmpty() )
1740 && this->m_CurrentVersion != GIT_REV_ZERO && !(wcStatus & CTGitPath::LOGACTIONS_ADDED))
1742 popup.AppendMenuIcon(IDGITLC_REVERTTOPARENT, IDS_LOG_POPUP_REVERTTOPARENT, IDI_REVERT);
1746 if ((GetSelectedCount() == 1)&&(!(wcStatus & CTGitPath::LOGACTIONS_UNVER))
1747 &&(!(wcStatus & CTGitPath::LOGACTIONS_IGNORE)))
1749 if (m_dwContextMenus & GITSLC_POPSHOWLOG)
1750 popup.AppendMenuIcon(IDGITLC_LOG, IDS_REPOBROWSE_SHOWLOG, IDI_LOG);
1751 if (m_dwContextMenus & GITSLC_POPSHOWLOGSUBMODULE && filepath->IsDirectory())
1752 popup.AppendMenuIcon(IDGITLC_LOGSUBMODULE, IDS_LOG_SUBMODULE, IDI_LOG);
1753 if (m_dwContextMenus & GITSLC_POPSHOWLOGOLDNAME && (wcStatus & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY) && !filepath->GetGitOldPathString().IsEmpty()))
1754 popup.AppendMenuIcon(IDGITLC_LOGOLDNAME, IDS_STATUSLIST_SHOWLOGOLDNAME, IDI_LOG);
1755 if (m_dwContextMenus & GITSLC_POPBLAME && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED) && m_bHasWC)
1756 popup.AppendMenuIcon(IDGITLC_BLAME, IDS_MENUBLAME, IDI_BLAME);
1759 if (GetSelectedCount() > 0)
1761 if ((m_dwContextMenus & GetContextMenuBit(IDGITLC_EXPORT)) && !(wcStatus & (CTGitPath::LOGACTIONS_DELETED | CTGitPath::LOGACTIONS_MISSING)))
1762 popup.AppendMenuIcon(IDGITLC_EXPORT, IDS_LOG_POPUP_EXPORT, IDI_EXPORT);
1765 // if ((wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing) && (GetSelectedCount() == 1))
1766 if ( (GetSelectedCount() == 1) )
1768 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_SAVEAS) && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1769 popup.AppendMenuIcon(IDGITLC_SAVEAS, IDS_LOG_POPUP_SAVE, IDI_SAVEAS);
1771 if (m_dwContextMenus & GITSLC_POPOPEN && !filepath->IsDirectory() && !(wcStatus & (CTGitPath::LOGACTIONS_DELETED | CTGitPath::LOGACTIONS_MISSING)))
1773 popup.AppendMenuIcon(IDGITLC_VIEWREV, IDS_LOG_POPUP_VIEWREV);
1774 popup.AppendMenuIcon(IDGITLC_OPEN, IDS_REPOBROWSE_OPEN, IDI_OPEN);
1775 popup.AppendMenuIcon(IDGITLC_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
1776 if (wcStatus & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE)) {
1777 popup.SetDefaultItem(IDGITLC_OPEN, FALSE);
1781 if (m_dwContextMenus & GITSLC_POPEXPLORE && !(wcStatus & CTGitPath::LOGACTIONS_DELETED) && m_bHasWC)
1782 popup.AppendMenuIcon(IDGITLC_EXPLORE, IDS_STATUSLIST_CONTEXT_EXPLORE, IDI_EXPLORER);
1784 if (m_dwContextMenus & GITSLC_PREPAREDIFF && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1786 popup.AppendMenu(MF_SEPARATOR);
1787 popup.AppendMenuIcon(IDGITLC_PREPAREDIFF, IDS_PREPAREDIFF, IDI_DIFF);
1788 if (!m_sMarkForDiffFilename.IsEmpty())
1790 CString diffWith;
1791 if (filepath->GetGitPathString() == m_sMarkForDiffFilename)
1792 diffWith = m_sMarkForDiffVersion;
1793 else
1795 PathCompactPathEx(CStrBuf(diffWith, 40), m_sMarkForDiffFilename, 40, 0);
1796 diffWith += _T(":") + m_sMarkForDiffVersion.Left(g_Git.GetShortHASHLength());
1798 CString menuEntry;
1799 menuEntry.Format(IDS_MENUDIFFNOW, (LPCTSTR)diffWith);
1800 popup.AppendMenuIcon(IDGITLC_PREPAREDIFF_COMPARE, menuEntry, IDI_DIFF);
1804 if (GetSelectedCount() > 0)
1806 // if (((wcStatus == git_wc_status_unversioned)||(wcStatus == git_wc_status_ignored))&&(m_dwContextMenus & SVNSLC_POPDELETE))
1807 // popup.AppendMenuIcon(IDSVNLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
1808 // 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))
1809 // {
1810 // if (bShift)
1811 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVEKEEP, IDI_DELETE);
1812 // else
1813 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVE, IDI_DELETE);
1814 // }
1815 if ((wcStatus & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE | CTGitPath::LOGACTIONS_MISSING))/*||(wcStatus == git_wc_status_deleted)*/)
1817 if (m_dwContextMenus & GITSLC_POPDELETE)
1818 popup.AppendMenuIcon(IDGITLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
1820 if ( (wcStatus & CTGitPath::LOGACTIONS_UNVER || wcStatus & CTGitPath::LOGACTIONS_DELETED) )
1822 if (m_dwContextMenus & GITSLC_POPIGNORE)
1824 CTGitPathList ignorelist;
1825 FillListOfSelectedItemPaths(ignorelist);
1826 //check if all selected entries have the same extension
1827 bool bSameExt = true;
1828 CString sExt;
1829 for (int i=0; i<ignorelist.GetCount(); ++i)
1831 if (sExt.IsEmpty() && (i==0))
1832 sExt = ignorelist[i].GetFileExtension();
1833 else if (sExt.CompareNoCase(ignorelist[i].GetFileExtension())!=0)
1834 bSameExt = false;
1836 if (bSameExt)
1838 if (ignoreSubMenu.CreateMenu())
1840 CString ignorepath;
1841 if (ignorelist.GetCount()==1)
1842 ignorepath = ignorelist[0].GetFileOrDirectoryName();
1843 else
1844 ignorepath.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
1845 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_IGNORE, ignorepath);
1846 ignorepath = _T("*")+sExt;
1847 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_IGNOREMASK, ignorepath);
1848 if (ignorelist.GetCount() == 1 && !ignorelist[0].GetContainingDirectory().GetGitPathString().IsEmpty())
1849 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_IGNOREFOLDER, ignorelist[0].GetContainingDirectory().GetGitPathString());
1850 CString temp;
1851 temp.LoadString(IDS_MENUIGNORE);
1852 popup.InsertMenu((UINT)-1, MF_BYPOSITION | MF_POPUP, (UINT_PTR)ignoreSubMenu.m_hMenu, temp);
1855 else
1857 CString temp;
1858 if (ignorelist.GetCount()==1)
1859 temp.LoadString(IDS_MENUIGNORE);
1860 else
1861 temp.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
1862 popup.AppendMenuIcon(IDGITLC_IGNORE, temp, IDI_IGNORE);
1863 temp.Format(IDS_MENUIGNOREMULTIPLEMASK, ignorelist.GetCount());
1864 popup.AppendMenuIcon(IDGITLC_IGNOREMASK, temp, IDI_IGNORE);
1872 if (GetSelectedCount() > 0)
1874 popup.AppendMenu(MF_SEPARATOR);
1875 popup.AppendMenuIcon(IDGITLC_COPY, IDS_STATUSLIST_CONTEXT_COPY, IDI_COPYCLIP);
1876 popup.AppendMenuIcon(IDGITLC_COPYEXT, IDS_STATUSLIST_CONTEXT_COPYEXT, IDI_COPYCLIP);
1877 #if 0
1878 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS))
1879 &&(wcStatus != git_wc_status_unversioned)&&(wcStatus != git_wc_status_none))
1881 popup.AppendMenu(MF_SEPARATOR);
1882 // changelist commands
1883 size_t numChangelists = GetNumberOfChangelistsInSelection();
1884 if (numChangelists > 0)
1885 popup.AppendMenuIcon(IDSVNLC_REMOVEFROMCS, IDS_STATUSLIST_CONTEXT_REMOVEFROMCS);
1886 if ((!entry->IsFolder())&&(changelistSubMenu.CreateMenu()))
1888 CString temp;
1889 temp.LoadString(IDS_STATUSLIST_CONTEXT_CREATECS);
1890 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATECS, temp);
1892 if (entry->changelist.Compare(SVNSLC_IGNORECHANGELIST))
1894 changelistSubMenu.AppendMenu(MF_SEPARATOR);
1895 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATEIGNORECS, SVNSLC_IGNORECHANGELIST);
1898 if (!m_changelists.empty())
1900 // find the changelist names
1901 bool bNeedSeparator = true;
1902 int cmdID = IDSVNLC_MOVETOCS;
1903 for (auto it = m_changelists.cbegin(); it != m_changelists.cend(); ++it)
1905 if ((entry->changelist.Compare(it->first))&&(it->first.Compare(SVNSLC_IGNORECHANGELIST)))
1907 if (bNeedSeparator)
1909 changelistSubMenu.AppendMenu(MF_SEPARATOR);
1910 bNeedSeparator = false;
1912 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, cmdID, it->first);
1913 cmdID++;
1917 temp.LoadString(IDS_STATUSLIST_CONTEXT_MOVETOCS);
1918 popup.AppendMenu(MF_POPUP|MF_STRING, (UINT_PTR)changelistSubMenu.GetSafeHmenu(), temp);
1921 #endif
1924 m_hShellMenu = nullptr;
1925 if (GetSelectedCount() > 0 && !(wcStatus & (CTGitPath::LOGACTIONS_DELETED | CTGitPath::LOGACTIONS_MISSING)) && m_bHasWC && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO) && shellMenu.CreatePopupMenu())
1927 // insert the shell context menu
1928 popup.AppendMenu(MF_SEPARATOR);
1929 popup.InsertMenu((UINT)-1, MF_BYPOSITION | MF_POPUP, (UINT_PTR)shellMenu.m_hMenu, CString(MAKEINTRESOURCE(IDS_STATUSLIST_CONTEXT_SHELL)));
1930 m_hShellMenu = shellMenu.m_hMenu;
1933 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_RIGHTBUTTON, point.x, point.y, this, 0);
1934 g_IContext2 = nullptr;
1935 g_IContext3 = nullptr;
1936 if (m_pContextMenu)
1938 if (cmd >= SHELL_MIN_CMD && cmd <= SHELL_MAX_CMD) // see if returned idCommand belongs to shell menu entries)
1940 CMINVOKECOMMANDINFOEX cmi = { 0 };
1941 cmi.cbSize = sizeof(CMINVOKECOMMANDINFOEX);
1942 cmi.fMask = CMIC_MASK_UNICODE | CMIC_MASK_PTINVOKE;
1943 if (GetKeyState(VK_CONTROL) < 0)
1944 cmi.fMask |= CMIC_MASK_CONTROL_DOWN;
1945 if (bShift)
1946 cmi.fMask |= CMIC_MASK_SHIFT_DOWN;
1947 cmi.hwnd = m_hWnd;
1948 cmi.lpVerb = MAKEINTRESOURCEA(cmd - SHELL_MIN_CMD);
1949 cmi.lpVerbW = MAKEINTRESOURCEW(cmd - SHELL_MIN_CMD);
1950 cmi.nShow = SW_SHOWNORMAL;
1951 cmi.ptInvoke = point;
1953 m_pContextMenu->InvokeCommand((LPCMINVOKECOMMANDINFO)&cmi);
1955 cmd = 0;
1957 m_pContextMenu->Release();
1958 m_pContextMenu = nullptr;
1960 if (g_pFolderhook)
1962 delete g_pFolderhook;
1963 g_pFolderhook = nullptr;
1965 if (g_psfDesktopFolder)
1967 g_psfDesktopFolder->Release();
1968 g_psfDesktopFolder = nullptr;
1970 for (int i = 0; i < g_pidlArrayItems; i++)
1972 if (g_pidlArray[i])
1973 CoTaskMemFree(g_pidlArray[i]);
1975 if (g_pidlArray)
1976 CoTaskMemFree(g_pidlArray);
1977 g_pidlArray = nullptr;
1978 g_pidlArrayItems = 0;
1980 m_bBlock = TRUE;
1981 AfxGetApp()->DoWaitCursor(1);
1982 //int iItemCountBeforeMenuCmd = GetItemCount();
1983 //bool bForce = false;
1984 switch (cmd)
1986 case IDGITLC_VIEWREV:
1987 OpenFile(filepath, ALTERNATIVEEDITOR);
1988 break;
1990 case IDGITLC_OPEN:
1991 OpenFile(filepath,OPEN);
1992 break;
1994 case IDGITLC_OPENWITH:
1995 OpenFile(filepath,OPEN_WITH);
1996 break;
1998 case IDGITLC_EXPLORE:
1999 CAppUtils::ExploreTo(GetSafeHwnd(), g_Git.CombinePath(filepath));
2000 break;
2002 case IDGITLC_PREPAREDIFF:
2003 m_sMarkForDiffFilename = filepath->GetGitPathString();
2004 m_sMarkForDiffVersion = m_CurrentVersion;
2005 break;
2007 case IDGITLC_PREPAREDIFF_COMPARE:
2009 CTGitPath savedFile(m_sMarkForDiffFilename);
2010 CGitDiff::Diff(filepath, &savedFile, m_CurrentVersion, m_sMarkForDiffVersion);
2012 break;
2014 case IDGITLC_CREATERESTORE:
2016 POSITION pos = GetFirstSelectedItemPosition();
2017 while (pos)
2019 int index = GetNextSelectedItem(pos);
2020 CTGitPath * entry2 = (CTGitPath * )GetItemData(index);
2021 ASSERT(entry2);
2022 if (!entry2 || entry2->IsDirectory())
2023 continue;
2024 if (m_restorepaths.find(entry2->GetWinPathString()) != m_restorepaths.end())
2025 continue;
2026 CTGitPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
2027 // delete the temp file: the temp file has the FILE_ATTRIBUTE_TEMPORARY flag set
2028 // and copying the real file over it would leave that temp flag.
2029 DeleteFile(tempFile.GetWinPath());
2030 if (CopyFile(g_Git.CombinePath(entry2), tempFile.GetWinPath(), FALSE))
2032 m_restorepaths[entry2->GetWinPathString()] = tempFile.GetWinPathString();
2033 SetItemState(index, INDEXTOOVERLAYMASK(OVL_RESTORE), LVIS_OVERLAYMASK);
2036 Invalidate();
2038 break;
2040 case IDGITLC_RESTOREPATH:
2042 if (CMessageBox::Show(m_hWnd, IDS_STATUSLIST_RESTOREPATH, IDS_APPNAME, 2, IDI_QUESTION, IDS_RESTOREBUTTON, IDS_ABORTBUTTON) == 2)
2043 break;
2044 POSITION pos = GetFirstSelectedItemPosition();
2045 while (pos)
2047 int index = GetNextSelectedItem(pos);
2048 CTGitPath * entry2 = (CTGitPath * )GetItemData(index);
2049 ASSERT(entry2);
2050 if (!entry2)
2051 continue;
2052 if (m_restorepaths.find(entry2->GetWinPathString()) == m_restorepaths.end())
2053 continue;
2054 if (CopyFile(m_restorepaths[entry2->GetWinPathString()], g_Git.CombinePath(entry2), FALSE))
2056 m_restorepaths.erase(entry2->GetWinPathString());
2057 SetItemState(index, 0, LVIS_OVERLAYMASK);
2060 Invalidate();
2062 break;
2064 // Compare current version and work copy.
2065 case IDGITLC_COMPAREWC:
2067 if (!CheckMultipleDiffs())
2068 break;
2069 POSITION pos = GetFirstSelectedItemPosition();
2070 while ( pos )
2072 int index = GetNextSelectedItem(pos);
2073 StartDiffWC(index);
2076 break;
2078 // Compare with base version. when current version is zero, compare workcopy and HEAD.
2079 case IDGITLC_COMPARE:
2081 if (!CheckMultipleDiffs())
2082 break;
2083 POSITION pos = GetFirstSelectedItemPosition();
2084 while ( pos )
2086 int index = GetNextSelectedItem(pos);
2087 StartDiff(index);
2090 break;
2092 case IDGITLC_COMPARETWOREVISIONS:
2094 if (!CheckMultipleDiffs())
2095 break;
2096 POSITION pos = GetFirstSelectedItemPosition();
2097 while ( pos )
2099 int index = GetNextSelectedItem(pos);
2100 StartDiffTwo(index);
2103 break;
2105 case IDGITLC_COMPARETWOFILES:
2107 POSITION pos = GetFirstSelectedItemPosition();
2108 CTGitPath* firstfilepath = nullptr, *secondfilepath = nullptr;
2109 if (pos)
2111 firstfilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
2112 ASSERT(firstfilepath);
2113 if (!firstfilepath)
2114 break;
2116 secondfilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
2117 ASSERT(secondfilepath);
2118 if (!secondfilepath)
2119 break;
2121 CString sCmd;
2122 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);
2123 CAppUtils::RunTortoiseGitProc(sCmd);
2126 break;
2128 case IDGITLC_GNUDIFF1:
2130 if (!CheckMultipleDiffs())
2131 break;
2132 POSITION pos = GetFirstSelectedItemPosition();
2133 while (pos)
2135 CTGitPath * selectedFilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
2136 if (m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
2138 CString fromwhere;
2139 if (m_amend)
2140 fromwhere = _T("~1");
2141 CAppUtils::StartShowUnifiedDiff(m_hWnd, *selectedFilepath, GitRev::GetHead() + fromwhere, *selectedFilepath, GitRev::GetWorkingCopy());
2143 else
2145 if ((selectedFilepath->m_ParentNo & (PARENT_MASK | MERGE_MASK)) == 0)
2146 CAppUtils::StartShowUnifiedDiff(m_hWnd, *selectedFilepath, m_CurrentVersion + _T("~1"), *selectedFilepath, m_CurrentVersion);
2147 else
2149 CString str;
2150 if (!(selectedFilepath->m_ParentNo & MERGE_MASK))
2151 str.Format(_T("%s^%d"), (LPCTSTR)m_CurrentVersion, (selectedFilepath->m_ParentNo & PARENT_MASK) + 1);
2153 CAppUtils::StartShowUnifiedDiff(m_hWnd, *selectedFilepath, str, *selectedFilepath, m_CurrentVersion, false, false, false, false, !!(selectedFilepath->m_ParentNo & MERGE_MASK));
2158 break;
2160 case IDGITLC_GNUDIFF2REVISIONS:
2162 CAppUtils::StartShowUnifiedDiff(m_hWnd, *filepath, m_Rev2, *filepath, m_Rev1);
2164 break;
2166 case IDGITLC_ADD:
2168 CTGitPathList paths;
2169 FillListOfSelectedItemPaths(paths, true);
2171 CGitProgressDlg progDlg;
2172 AddProgressCommand addCommand;
2173 progDlg.SetCommand(&addCommand);
2174 addCommand.SetShowCommitButtonAfterAdd((m_dwContextMenus & GITSLC_POPCOMMIT) != 0);
2175 addCommand.SetPathList(paths);
2176 progDlg.SetItemCount(paths.GetCount());
2177 progDlg.DoModal();
2179 // reset unchecked status
2180 POSITION pos = GetFirstSelectedItemPosition();
2181 int index;
2182 while ((index = GetNextSelectedItem(pos)) >= 0)
2183 m_mapFilenameToChecked.erase(((CTGitPath*)GetItemData(index))->GetGitPathString());
2185 if (GetLogicalParent() && GetLogicalParent()->GetSafeHwnd())
2186 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2188 SetRedraw(TRUE);
2190 break;
2192 case IDGITLC_DELETE:
2193 DeleteSelectedFiles();
2194 break;
2196 case IDGITLC_BLAME:
2198 CAppUtils::LaunchTortoiseBlame(g_Git.CombinePath(filepath), m_CurrentVersion);
2200 break;
2202 case IDGITLC_LOG:
2203 case IDGITLC_LOGSUBMODULE:
2205 CString sCmd;
2206 sCmd.Format(_T("/command:log /path:\"%s\""), (LPCTSTR)g_Git.CombinePath(filepath));
2207 if (cmd == IDGITLC_LOG && filepath->IsDirectory())
2208 sCmd += _T(" /submodule");
2209 if (!m_sDisplayedBranch.IsEmpty())
2210 sCmd += _T(" /range:\"") + m_sDisplayedBranch + _T("\"");
2211 CAppUtils::RunTortoiseGitProc(sCmd, false, !(cmd == IDGITLC_LOGSUBMODULE));
2213 break;
2215 case IDGITLC_LOGOLDNAME:
2217 CTGitPath oldName(filepath->GetGitOldPathString());
2218 CString sCmd;
2219 sCmd.Format(_T("/command:log /path:\"%s\""), (LPCTSTR)g_Git.CombinePath(oldName));
2220 if (!m_sDisplayedBranch.IsEmpty())
2221 sCmd += _T(" /range:\"") + m_sDisplayedBranch + _T("\"");
2222 CAppUtils::RunTortoiseGitProc(sCmd);
2224 break;
2226 case IDGITLC_EDITCONFLICT:
2228 if (CAppUtils::ConflictEdit(*filepath, false, m_bIsRevertTheirMy, GetLogicalParent() ? GetLogicalParent()->GetSafeHwnd() : nullptr))
2230 CString conflictedFile = g_Git.CombinePath(filepath);
2231 if (!PathFileExists(conflictedFile) && GetLogicalParent() && GetLogicalParent()->GetSafeHwnd())
2232 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2235 break;
2237 case IDGITLC_RESOLVETHEIRS: //follow up
2238 case IDGITLC_RESOLVEMINE: //follow up
2239 case IDGITLC_RESOLVECONFLICT:
2241 if (CMessageBox::Show(m_hWnd, IDS_PROC_RESOLVE, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO)==IDYES)
2243 bool needsFullRefresh = false;
2244 POSITION pos = GetFirstSelectedItemPosition();
2245 while (pos != 0)
2247 int index;
2248 index = GetNextSelectedItem(pos);
2249 CTGitPath * fentry =(CTGitPath*) this->GetItemData(index);
2250 if (!fentry)
2251 continue;
2253 CAppUtils::resolve_with resolveWith = CAppUtils::RESOLVE_WITH_CURRENT;
2254 if (((!this->m_bIsRevertTheirMy) && cmd == IDGITLC_RESOLVETHEIRS) || ((this->m_bIsRevertTheirMy) && cmd == IDGITLC_RESOLVEMINE))
2255 resolveWith = CAppUtils::RESOLVE_WITH_THEIRS;
2256 else if (((!this->m_bIsRevertTheirMy) && cmd == IDGITLC_RESOLVEMINE) || ((this->m_bIsRevertTheirMy) && cmd == IDGITLC_RESOLVETHEIRS))
2257 resolveWith = CAppUtils::RESOLVE_WITH_MINE;
2258 if (CAppUtils::ResolveConflict(*fentry, resolveWith) == 0 && fentry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
2259 needsFullRefresh = true;
2261 if (needsFullRefresh && CRegDWORD(_T("Software\\TortoiseGit\\RefreshFileListAfterResolvingConflict"), TRUE) == TRUE)
2263 CWnd* pParent = GetLogicalParent();
2264 if (pParent && pParent->GetSafeHwnd())
2265 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2266 SetRedraw(TRUE);
2267 break;
2269 Show(m_dwShow, 0, m_bShowFolders,0,true);
2272 break;
2274 case IDGITLC_IGNORE:
2276 CTGitPathList ignorelist;
2277 //std::vector<CString> toremove;
2278 FillListOfSelectedItemPaths(ignorelist, true);
2280 if(!CAppUtils::IgnoreFile(ignorelist,false))
2281 break;
2283 SetRedraw(FALSE);
2284 CWnd* pParent = GetLogicalParent();
2285 if (pParent && pParent->GetSafeHwnd())
2287 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2289 SetRedraw(TRUE);
2291 break;
2293 case IDGITLC_IGNOREMASK:
2295 CString common;
2296 CString ext=filepath->GetFileExtension();
2297 CTGitPathList ignorelist;
2298 FillListOfSelectedItemPaths(ignorelist, true);
2300 if (!CAppUtils::IgnoreFile(ignorelist,true))
2301 break;
2303 SetRedraw(FALSE);
2304 CWnd* pParent = GetLogicalParent();
2305 if (pParent && pParent->GetSafeHwnd())
2307 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2310 SetRedraw(TRUE);
2312 break;
2314 case IDGITLC_IGNOREFOLDER:
2316 CTGitPathList ignorelist;
2317 ignorelist.AddPath(filepath->GetContainingDirectory());
2319 if (!CAppUtils::IgnoreFile(ignorelist, false))
2320 break;
2322 SetRedraw(FALSE);
2323 CWnd *pParent = GetLogicalParent();
2324 if (pParent && pParent->GetSafeHwnd())
2325 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2327 SetRedraw(TRUE);
2329 break;
2330 case IDGITLC_COMMIT:
2332 CTGitPathList targetList;
2333 FillListOfSelectedItemPaths(targetList);
2334 CTGitPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
2335 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
2336 CString commandline = _T("/command:commit /pathfile:\"");
2337 commandline += tempFile.GetWinPathString();
2338 commandline += _T("\"");
2339 commandline += _T(" /deletepathfile");
2340 CAppUtils::RunTortoiseGitProc(commandline);
2342 break;
2343 case IDGITLC_REVERT:
2345 // If at least one item is not in the status "added"
2346 // we ask for a confirmation
2347 BOOL bConfirm = FALSE;
2348 POSITION pos = GetFirstSelectedItemPosition();
2349 int index;
2350 while ((index = GetNextSelectedItem(pos)) >= 0)
2352 //FileEntry * fentry = GetListEntry(index);
2353 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
2354 if(fentry && fentry->m_Action &CTGitPath::LOGACTIONS_MODIFIED && !fentry->IsDirectory())
2356 bConfirm = TRUE;
2357 break;
2361 CString str;
2362 str.Format(IDS_PROC_WARNREVERT,GetSelectedCount());
2364 if (!bConfirm || CMessageBox::Show(this->m_hWnd, str, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION)==IDYES)
2366 CTGitPathList targetList;
2367 FillListOfSelectedItemPaths(targetList);
2369 // make sure that the list is reverse sorted, so that
2370 // children are removed before any parents
2371 targetList.SortByPathname(true);
2373 // put all reverted files in the trashbin, except the ones with 'added'
2374 // status because they are not restored by the revert.
2375 CTGitPathList delList;
2376 POSITION pos2 = GetFirstSelectedItemPosition();
2377 int index2;
2378 while ((index2 = GetNextSelectedItem(pos2)) >= 0)
2380 CTGitPath *entry=(CTGitPath *)GetItemData(index2);
2381 if (entry&&(!(entry->m_Action& CTGitPath::LOGACTIONS_ADDED))
2382 && (!(entry->m_Action& CTGitPath::LOGACTIONS_REPLACED)) && !entry->IsDirectory())
2384 CTGitPath fullpath;
2385 fullpath.SetFromWin(g_Git.CombinePath(entry));
2386 delList.AddPath(fullpath);
2389 if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))
2390 delList.DeleteAllFiles(true);
2392 CString revertToCommit = _T("HEAD");
2393 if (m_amend)
2394 revertToCommit = _T("HEAD~1");
2395 CString err;
2396 if (g_Git.Revert(revertToCommit, targetList, err))
2397 CMessageBox::Show(this->m_hWnd, _T("Revert failed:\n") + err, _T("TortoiseGit"), MB_ICONERROR);
2398 else
2400 bool updateStatusList = false;
2401 for (int i = 0 ; i < targetList.GetCount(); ++i)
2403 int nListboxEntries = GetItemCount();
2404 for (int nItem=0; nItem<nListboxEntries; ++nItem)
2406 CTGitPath *path=(CTGitPath*)GetItemData(nItem);
2407 if (path->GetGitPathString()==targetList[i].GetGitPathString() && !path->IsDirectory())
2409 if(path->m_Action & CTGitPath::LOGACTIONS_ADDED)
2411 path->m_Action = CTGitPath::LOGACTIONS_UNVER;
2412 SetEntryCheck(path,nItem,false);
2413 updateStatusList = true;
2414 #if 0 // revert an added file and some entry will be cloned (part 1/2)
2415 SetItemGroup(nItem,1);
2416 this->m_StatusFileList.RemoveItem(*path);
2417 this->m_UnRevFileList.AddPath(*path);
2418 //this->m_IgnoreFileList.RemoveItem(*path);
2419 #endif
2421 else
2423 if (GetCheck(nItem))
2424 m_nSelected--;
2425 RemoveListEntry(nItem);
2427 break;
2429 else if (path->GetGitPathString()==targetList[i].GetGitPathString() && path->IsDirectory() && path->IsWCRoot())
2431 CString sCmd;
2432 sCmd.Format(_T("/command:revert /path:\"%s\""), (LPCTSTR)path->GetGitPathString());
2433 CCommonAppUtils::RunTortoiseGitProc(sCmd);
2437 SetRedraw(TRUE);
2438 SaveColumnWidths();
2439 #if 0 // revert an added file and some entry will be cloned (part 2/2)
2440 Show(m_dwShow, 0, m_bShowFolders,updateStatusList,true);
2441 NotifyCheck();
2442 #else
2443 if (updateStatusList && GetLogicalParent() && GetLogicalParent()->GetSafeHwnd())
2444 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2445 #endif
2449 break;
2451 case IDGITLC_ASSUMEVALID:
2452 SetGitIndexFlagsForSelectedFiles(IDS_PROC_MARK_ASSUMEVALID, BST_CHECKED, BST_INDETERMINATE);
2453 break;
2454 case IDGITLC_SKIPWORKTREE:
2455 SetGitIndexFlagsForSelectedFiles(IDS_PROC_MARK_SKIPWORKTREE, BST_INDETERMINATE, BST_CHECKED);
2456 break;
2457 case IDGITLC_UNSETIGNORELOCALCHANGES:
2458 SetGitIndexFlagsForSelectedFiles(IDS_PROC_UNSET_IGNORELOCALCHANGES, BST_UNCHECKED, BST_UNCHECKED);
2459 break;
2460 case IDGITLC_COPY:
2461 CopySelectedEntriesToClipboard(0);
2462 break;
2463 case IDGITLC_COPYEXT:
2464 CopySelectedEntriesToClipboard((DWORD)-1);
2465 break;
2466 case IDGITLC_EXPORT:
2467 FilesExport();
2468 break;
2469 case IDGITLC_SAVEAS:
2470 FileSaveAs(filepath);
2471 break;
2473 case IDGITLC_REVERTTOREV:
2474 RevertSelectedItemToVersion();
2475 break;
2476 case IDGITLC_REVERTTOPARENT:
2477 RevertSelectedItemToVersion(true);
2478 break;
2479 #if 0
2480 case IDSVNLC_COMMIT:
2482 CTSVNPathList targetList;
2483 FillListOfSelectedItemPaths(targetList);
2484 CTSVNPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
2485 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
2486 CString commandline = CPathUtils::GetAppDirectory();
2487 commandline += _T("TortoiseGitProc.exe /command:commit /pathfile:\"");
2488 commandline += tempFile.GetWinPathString();
2489 commandline += _T("\"");
2490 commandline += _T(" /deletepathfile");
2491 CAppUtils::LaunchApplication(commandline, nullptr, false);
2493 break;
2494 case IDSVNLC_CREATEIGNORECS:
2495 CreateChangeList(SVNSLC_IGNORECHANGELIST);
2496 break;
2497 case IDSVNLC_CREATECS:
2499 CCreateChangelistDlg dlg;
2500 if (dlg.DoModal() == IDOK)
2501 CreateChangeList(dlg.m_sName);
2503 break;
2504 default:
2506 if (cmd < IDSVNLC_MOVETOCS)
2507 break;
2508 CTSVNPathList changelistItems;
2509 FillListOfSelectedItemPaths(changelistItems);
2511 // find the changelist name
2512 CString sChangelist;
2513 int cmdID = IDSVNLC_MOVETOCS;
2514 SetRedraw(FALSE);
2515 for (auto it = m_changelists.cbegin(); it != m_changelists.cend(); ++it)
2517 if ((it->first.Compare(SVNSLC_IGNORECHANGELIST))&&(entry->changelist.Compare(it->first)))
2519 if (cmd == cmdID)
2520 sChangelist = it->first;
2521 cmdID++;
2524 if (!sChangelist.IsEmpty())
2526 SVN git;
2527 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
2529 // The changelists were moved, but we now need to run through the selected items again
2530 // and update their changelist
2531 POSITION pos = GetFirstSelectedItemPosition();
2532 int index;
2533 while ((index = GetNextSelectedItem(pos)) >= 0)
2535 FileEntry * e = GetListEntry(index);
2536 e->changelist = sChangelist;
2537 if (!e->IsFolder())
2539 if (m_changelists.find(e->changelist)!=m_changelists.end())
2540 SetItemGroup(index, m_changelists[e->changelist]);
2541 else
2542 SetItemGroup(index, 0);
2546 else
2547 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
2549 SetRedraw(TRUE);
2551 break;
2552 #endif
2554 } // switch (cmd)
2555 m_bBlock = FALSE;
2556 AfxGetApp()->DoWaitCursor(-1);
2557 GetStatisticsString();
2558 //int iItemCountAfterMenuCmd = GetItemCount();
2559 //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)
2561 // CWnd* pParent = GetParent();
2562 // if (pParent && pParent->GetSafeHwnd())
2563 // {
2564 // pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);
2565 // }
2567 } // if (popup.CreatePopupMenu())
2568 } // if (selIndex >= 0)
2571 void CGitStatusListCtrl::SetGitIndexFlagsForSelectedFiles(UINT message, BOOL assumevalid, BOOL skipworktree)
2573 if (CMessageBox::Show(GetSafeHwnd(), message, IDS_APPNAME, MB_YESNO | MB_DEFBUTTON2 | MB_ICONQUESTION) != IDYES)
2574 return;
2576 CAutoRepository repository(g_Git.GetGitRepository());
2577 if (!repository)
2579 CMessageBox::Show(m_hWnd, g_Git.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR);
2580 return;
2583 CAutoIndex gitindex;
2584 if (git_repository_index(gitindex.GetPointer(), repository))
2586 CMessageBox::Show(m_hWnd, g_Git.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR);
2587 return;
2590 POSITION pos = GetFirstSelectedItemPosition();
2591 int index = -1;
2592 while ((index = GetNextSelectedItem(pos)) >= 0)
2594 CTGitPath * path = (CTGitPath *)GetItemData(index);
2595 ASSERT(path);
2596 if (path == nullptr)
2597 continue;
2599 size_t idx;
2600 if (!git_index_find(&idx, gitindex, CUnicodeUtils::GetMulti(path->GetGitPathString(), CP_UTF8)))
2602 git_index_entry *e = const_cast<git_index_entry *>(git_index_get_byindex(gitindex, idx)); // HACK
2603 if (assumevalid == BST_UNCHECKED)
2604 e->flags &= ~GIT_IDXENTRY_VALID;
2605 else if (assumevalid == BST_CHECKED)
2606 e->flags |= GIT_IDXENTRY_VALID;
2607 if (skipworktree == BST_UNCHECKED)
2608 e->flags_extended &= ~GIT_IDXENTRY_SKIP_WORKTREE;
2609 else if (skipworktree == BST_CHECKED)
2610 e->flags_extended |= GIT_IDXENTRY_SKIP_WORKTREE;
2611 git_index_add(gitindex, e);
2613 else
2614 CMessageBox::Show(m_hWnd, g_Git.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR);
2617 if (git_index_write(gitindex))
2619 CMessageBox::Show(m_hWnd, g_Git.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR);
2620 return;
2623 if (nullptr != GetLogicalParent() && nullptr != GetLogicalParent()->GetSafeHwnd())
2624 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2626 SetRedraw(TRUE);
2629 void CGitStatusListCtrl::OnContextMenuHeader(CWnd * pWnd, CPoint point)
2631 Locker lock(m_critSec);
2632 m_ColumnManager.OnContextMenuHeader(pWnd,point,!!IsGroupViewEnabled());
2635 void CGitStatusListCtrl::OnContextMenu(CWnd* pWnd, CPoint point)
2637 if (pWnd == this)
2639 OnContextMenuList(pWnd, point);
2640 } // if (pWnd == this)
2641 else if (pWnd == GetHeaderCtrl())
2642 OnContextMenuHeader(pWnd, point);
2645 void CGitStatusListCtrl::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
2647 Locker lock(m_critSec);
2648 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
2649 *pResult = 0;
2650 if (m_bBlock)
2651 return;
2653 if (pNMLV->iItem < 0)
2654 return;
2656 CTGitPath *file=(CTGitPath*)GetItemData(pNMLV->iItem);
2658 if (file->m_Action & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE)) {
2659 OpenFile(file, OPEN);
2660 return;
2662 if( file->m_Action&CTGitPath::LOGACTIONS_UNMERGED )
2664 if (CAppUtils::ConflictEdit(*file, false, m_bIsRevertTheirMy, GetLogicalParent() ? GetLogicalParent()->GetSafeHwnd() : nullptr))
2666 CString conflictedFile = g_Git.CombinePath(file);
2667 if (!PathFileExists(conflictedFile) && GetLogicalParent() && GetLogicalParent()->GetSafeHwnd())
2668 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2671 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))
2672 return;
2673 else
2675 if (!m_Rev1.IsEmpty() && !m_Rev2.IsEmpty())
2676 StartDiffTwo(pNMLV->iItem);
2677 else
2678 StartDiff(pNMLV->iItem);
2681 void CGitStatusListCtrl::StartDiffTwo(int fileindex)
2683 if(fileindex<0)
2684 return;
2686 auto ptr = (CTGitPath*)GetItemData(fileindex);
2687 if (!ptr)
2688 return;
2689 CTGitPath file1 = *ptr;
2691 if (file1.m_Action & CTGitPath::LOGACTIONS_ADDED)
2692 CGitDiff::DiffNull(&file1, m_Rev1, true);
2693 else if (file1.m_Action & CTGitPath::LOGACTIONS_DELETED)
2694 CGitDiff::DiffNull(&file1, m_Rev2, false);
2695 else
2696 CGitDiff::Diff(&file1, &file1, m_Rev1, m_Rev2);
2699 void CGitStatusListCtrl::StartDiffWC(int fileindex)
2701 if(fileindex<0)
2702 return;
2704 CString Ver;
2705 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
2706 return;
2708 auto ptr = (CTGitPath*)GetItemData(fileindex);
2709 if (!ptr)
2710 return;
2711 CTGitPath file1 = *ptr;
2712 file1.m_Action = 0; // reset action, so that diff is not started as added/deleted file; see issue #1757
2714 CGitDiff::Diff(&file1,&file1, GIT_REV_ZERO, m_CurrentVersion);
2717 void CGitStatusListCtrl::StartDiff(int fileindex)
2719 if(fileindex<0)
2720 return;
2722 auto ptr = (CTGitPath*)GetItemData(fileindex);
2723 if (!ptr)
2724 return;
2725 CTGitPath file1 = *ptr;
2726 CTGitPath file2;
2727 if(file1.m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY))
2728 file2.SetFromGit(file1.GetGitOldPathString());
2729 else
2730 file2=file1;
2732 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
2734 CString fromwhere;
2735 if(m_amend && (file1.m_Action & CTGitPath::LOGACTIONS_ADDED) == 0)
2736 fromwhere = _T("~1");
2737 if( g_Git.IsInitRepos())
2738 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2739 GIT_REV_ZERO);
2740 else if( file1.m_Action&CTGitPath::LOGACTIONS_ADDED )
2741 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2742 m_CurrentVersion+fromwhere,true);
2743 else if( file1.m_Action&CTGitPath::LOGACTIONS_DELETED )
2744 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2745 GitRev::GetHead()+fromwhere,false);
2746 else
2747 CGitDiff::Diff(&file1,&file2,
2748 CString(GIT_REV_ZERO),
2749 GitRev::GetHead()+fromwhere);
2751 else
2753 CGitHash hash;
2754 CString fromwhere = m_CurrentVersion+_T("~1");
2755 if(m_amend)
2756 fromwhere = m_CurrentVersion+_T("~2");
2757 bool revfail = !!g_Git.GetHash(hash, fromwhere);
2758 if (revfail || (file1.m_Action & file1.LOGACTIONS_ADDED))
2759 CGitDiff::DiffNull(&file1,m_CurrentVersion,true);
2760 else if (file1.m_Action & file1.LOGACTIONS_DELETED)
2762 if (file1.m_ParentNo > 0)
2763 fromwhere.Format(_T("%s^%d"), (LPCTSTR)m_CurrentVersion, file1.m_ParentNo + 1);
2765 CGitDiff::DiffNull(&file1,fromwhere,false);
2767 else
2769 if( file1.m_ParentNo & MERGE_MASK)
2771 CTGitPath base, theirs, mine, merge;
2773 CString temppath;
2774 GetTempPath(temppath);
2775 temppath.TrimRight(_T("\\"));
2777 mine.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".LOCAL") + file1.GetFileExtension());
2778 theirs.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".REMOTE") + file1.GetFileExtension());
2779 base.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".BASE") + file1.GetFileExtension());
2781 CFile tempfile;
2782 //create a empty file, incase stage is not three
2783 tempfile.Open(mine.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2784 tempfile.Close();
2785 tempfile.Open(theirs.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2786 tempfile.Close();
2787 tempfile.Open(base.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2788 tempfile.Close();
2790 merge.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".Merged") + file1.GetFileExtension());
2792 int parent1=-1, parent2 =-1;
2793 for (size_t i = 0; i < m_arStatusArray.size(); ++i)
2795 if(m_arStatusArray[i]->GetGitPathString() == file1.GetGitPathString())
2797 if(m_arStatusArray[i]->m_ParentNo & MERGE_MASK)
2800 else
2802 if(parent1<0)
2803 parent1 = m_arStatusArray[i]->m_ParentNo & PARENT_MASK;
2804 else if (parent2 <0)
2805 parent2 = m_arStatusArray[i]->m_ParentNo & PARENT_MASK;
2810 if(g_Git.GetOneFile(m_CurrentVersion, file1, (CString&)merge.GetWinPathString()))
2811 CMessageBox::Show(GetSafeHwnd(), IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2813 if(parent1>=0)
2815 CString str;
2816 str.Format(_T("%s^%d"), (LPCTSTR)this->m_CurrentVersion, parent1 + 1);
2818 if(g_Git.GetOneFile(str, file1, (CString&)mine.GetWinPathString()))
2819 CMessageBox::Show(GetSafeHwnd(), IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2822 if(parent2>=0)
2824 CString str;
2825 str.Format(_T("%s^%d"), (LPCTSTR)this->m_CurrentVersion, parent2 + 1);
2827 if(g_Git.GetOneFile(str, file1, (CString&)theirs.GetWinPathString()))
2828 CMessageBox::Show(GetSafeHwnd(), IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2831 if(parent1>=0 && parent2>=0)
2833 CString cmd, output;
2834 cmd.Format(_T("git.exe merge-base %s^%d %s^%d"), (LPCTSTR)this->m_CurrentVersion, parent1 + 1,
2835 this->m_CurrentVersion,parent2+1);
2837 if (!g_Git.Run(cmd, &output, nullptr, CP_UTF8))
2839 if(g_Git.GetOneFile(output.Left(40), file1, (CString&)base.GetWinPathString()))
2840 CMessageBox::Show(GetSafeHwnd(), IDS_STATUSLIST_FAILEDGETBASEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2843 CAppUtils::StartExtMerge(base, theirs, mine, merge,_T("BASE"),_T("REMOTE"),_T("LOCAL"));
2845 else
2847 CString str;
2848 if( (file1.m_ParentNo&PARENT_MASK) == 0)
2849 str = _T("~1");
2850 else
2851 str.Format(_T("^%d"), (file1.m_ParentNo&PARENT_MASK)+1);
2852 CGitDiff::Diff(&file1,&file2,
2853 m_CurrentVersion,
2854 m_CurrentVersion+str);
2860 CString CGitStatusListCtrl::GetStatisticsString(bool simple)
2862 CString sNormal = CString(MAKEINTRESOURCE(IDS_STATUSNORMAL));
2863 CString sAdded = CString(MAKEINTRESOURCE(IDS_STATUSADDED));
2864 CString sDeleted = CString(MAKEINTRESOURCE(IDS_STATUSDELETED));
2865 CString sModified = CString(MAKEINTRESOURCE(IDS_STATUSMODIFIED));
2866 CString sConflicted = CString(MAKEINTRESOURCE(IDS_STATUSCONFLICTED));
2867 CString sUnversioned = CString(MAKEINTRESOURCE(IDS_STATUSUNVERSIONED));
2868 CString sRenamed = CString(MAKEINTRESOURCE(IDS_STATUSREPLACED));
2869 CString sToolTip;
2870 if(simple)
2872 sToolTip.Format(IDS_STATUSLIST_STATUSLINE1,
2873 this->m_nLineAdded,this->m_nLineDeleted,
2874 (LPCTSTR)sModified, m_nModified,
2875 (LPCTSTR)sAdded, m_nAdded,
2876 (LPCTSTR)sDeleted, m_nDeleted,
2877 (LPCTSTR)sRenamed, m_nRenamed
2880 else
2882 sToolTip.Format(IDS_STATUSLIST_STATUSLINE2,
2883 this->m_nLineAdded,this->m_nLineDeleted,
2884 (LPCTSTR)sNormal, m_nNormal,
2885 (LPCTSTR)sUnversioned, m_nUnversioned,
2886 (LPCTSTR)sModified, m_nModified,
2887 (LPCTSTR)sAdded, m_nAdded,
2888 (LPCTSTR)sDeleted, m_nDeleted,
2889 (LPCTSTR)sConflicted, m_nConflicted
2892 CString sStats;
2893 sStats.Format(IDS_COMMITDLG_STATISTICSFORMAT, m_nSelected, GetItemCount());
2894 if (m_pStatLabel)
2895 m_pStatLabel->SetWindowText(sStats);
2897 if (m_pSelectButton)
2899 if (m_nSelected == 0)
2900 m_pSelectButton->SetCheck(BST_UNCHECKED);
2901 else if (m_nSelected != GetItemCount())
2902 m_pSelectButton->SetCheck(BST_INDETERMINATE);
2903 else
2904 m_pSelectButton->SetCheck(BST_CHECKED);
2907 if (m_pConfirmButton)
2908 m_pConfirmButton->EnableWindow(m_nSelected>0);
2910 return sToolTip;
2913 CString CGitStatusListCtrl::GetCommonDirectory(bool bStrict)
2915 if (!bStrict)
2917 // not strict means that the selected folder has priority
2918 if (!m_StatusFileList.GetCommonDirectory().IsEmpty())
2919 return m_StatusFileList.GetCommonDirectory().GetWinPath();
2922 CTGitPath commonBaseDirectory;
2923 int nListItems = GetItemCount();
2924 for (int i=0; i<nListItems; ++i)
2926 CTGitPath baseDirectory,*p= (CTGitPath*)this->GetItemData(i);
2927 ASSERT(p);
2928 if (!p)
2929 continue;
2930 baseDirectory = p->GetDirectory();
2932 if(commonBaseDirectory.IsEmpty())
2933 commonBaseDirectory = baseDirectory;
2934 else
2936 if (commonBaseDirectory.GetWinPathString().GetLength() > baseDirectory.GetWinPathString().GetLength())
2938 if (baseDirectory.IsAncestorOf(commonBaseDirectory))
2939 commonBaseDirectory = baseDirectory;
2943 return g_Git.CombinePath(commonBaseDirectory);
2946 void CGitStatusListCtrl::SelectAll(bool bSelect, bool /*bIncludeNoCommits*/)
2948 CWaitCursor waitCursor;
2949 // block here so the LVN_ITEMCHANGED messages
2950 // get ignored
2951 m_bBlock = TRUE;
2952 SetRedraw(FALSE);
2954 int nListItems = GetItemCount();
2955 if (bSelect)
2956 m_nSelected = nListItems;
2957 else
2958 m_nSelected = 0;
2960 for (int i=0; i<nListItems; ++i)
2962 //FileEntry * entry = GetListEntry(i);
2963 //ASSERT(entry);
2964 CTGitPath *path = (CTGitPath *) GetItemData(i);
2965 if (!path)
2966 continue;
2967 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))
2968 SetEntryCheck(path,i,bSelect);
2971 // unblock before redrawing
2972 m_bBlock = FALSE;
2973 SetRedraw(TRUE);
2974 GetStatisticsString();
2975 NotifyCheck();
2978 void CGitStatusListCtrl::Check(DWORD dwCheck, bool check)
2980 CWaitCursor waitCursor;
2981 // block here so the LVN_ITEMCHANGED messages
2982 // get ignored
2983 m_bBlock = TRUE;
2984 SetRedraw(FALSE);
2986 int nListItems = GetItemCount();
2988 for (int i = 0; i < nListItems; ++i)
2990 CTGitPath *entry = (CTGitPath *) GetItemData(i);
2991 if (!entry)
2992 continue;
2994 DWORD showFlags = entry->m_Action;
2995 if (entry->IsDirectory())
2996 showFlags |= GITSLC_SHOWSUBMODULES;
2997 else
2998 showFlags |= GITSLC_SHOWFILES;
3000 if (check && (showFlags & dwCheck) && !GetCheck(i) && !(entry->IsDirectory() && m_bDoNotAutoselectSubmodules && !(dwCheck & GITSLC_SHOWSUBMODULES)))
3002 SetEntryCheck(entry, i, true);
3003 m_nSelected++;
3005 else if (!check && (showFlags & dwCheck) && GetCheck(i))
3007 SetEntryCheck(entry, i, false);
3008 m_nSelected--;
3011 // unblock before redrawing
3012 m_bBlock = FALSE;
3013 SetRedraw(TRUE);
3014 GetStatisticsString();
3015 NotifyCheck();
3018 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR *pNMHDR, LRESULT *pResult)
3020 LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast<LPNMLVGETINFOTIP>(pNMHDR);
3021 *pResult = 0;
3022 if (m_bBlock)
3023 return;
3025 CTGitPath *entry=(CTGitPath *)GetItemData(pGetInfoTip->iItem);
3027 if (entry)
3028 if (pGetInfoTip->cchTextMax > entry->GetGitPathString().GetLength() + g_Git.m_CurrentDir.GetLength())
3030 CString str = g_Git.CombinePath(entry->GetWinPathString());
3031 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, str.GetBuffer(), pGetInfoTip->cchTextMax - 1);
3035 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult)
3037 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
3039 // Take the default processing unless we set this to something else below.
3040 *pResult = CDRF_DODEFAULT;
3042 // First thing - check the draw stage. If it's the control's prepaint
3043 // stage, then tell Windows we want messages for every item.
3045 switch (pLVCD->nmcd.dwDrawStage)
3047 case CDDS_PREPAINT:
3048 *pResult = CDRF_NOTIFYITEMDRAW;
3049 break;
3050 case CDDS_ITEMPREPAINT:
3052 // This is the prepaint stage for an item. Here's where we set the
3053 // item's text color. Our return value will tell Windows to draw the
3054 // item itself, but it will use the new color we set here.
3056 // Tell Windows to paint the control itself.
3057 *pResult = CDRF_DODEFAULT;
3058 if (m_bBlock)
3059 return;
3061 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
3063 if (m_arStatusArray.size() > (DWORD_PTR)pLVCD->nmcd.dwItemSpec)
3065 //FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);
3066 CTGitPath *entry=(CTGitPath *)GetItemData((int)pLVCD->nmcd.dwItemSpec);
3067 if (!entry)
3068 return;
3070 // coloring
3071 // ========
3072 // black : unversioned, normal
3073 // purple : added
3074 // blue : modified
3075 // brown : missing, deleted, replaced
3076 // green : merged (or potential merges)
3077 // red : conflicts or sure conflicts
3078 if(entry->m_Action & CTGitPath::LOGACTIONS_GRAY)
3079 crText = RGB(128,128,128);
3080 else if(entry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
3081 crText = m_Colors.GetColor(CColors::Conflict);
3082 else if(entry->m_Action & (CTGitPath::LOGACTIONS_MODIFIED))
3083 crText = m_Colors.GetColor(CColors::Modified);
3084 else if(entry->m_Action & (CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))
3085 crText = m_Colors.GetColor(CColors::Added);
3086 else if(entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
3087 crText = m_Colors.GetColor(CColors::Deleted);
3088 else if(entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
3089 crText = m_Colors.GetColor(CColors::Renamed);
3090 else if(entry->m_Action & CTGitPath::LOGACTIONS_MERGED)
3091 crText = m_Colors.GetColor(CColors::Merged);
3092 else
3093 crText = GetSysColor(COLOR_WINDOWTEXT);
3094 // Store the color back in the NMLVCUSTOMDRAW struct.
3095 pLVCD->clrText = crText;
3098 break;
3102 BOOL CGitStatusListCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
3104 if (pWnd != this)
3105 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
3106 if (!m_bBlock)
3108 HCURSOR hCur = LoadCursor(nullptr, IDC_ARROW);
3109 SetCursor(hCur);
3110 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
3112 HCURSOR hCur = LoadCursor(nullptr, IDC_WAIT);
3113 SetCursor(hCur);
3114 return TRUE;
3117 void CGitStatusListCtrl::RemoveListEntry(int index)
3119 Locker lock(m_critSec);
3120 DeleteItem(index);
3122 m_arStatusArray.erase(m_arStatusArray.cbegin() + index);
3124 #if 0
3125 delete m_arStatusArray[m_arListArray[index]];
3126 m_arStatusArray.erase(m_arStatusArray.begin()+m_arListArray[index]);
3127 m_arListArray.erase(m_arListArray.begin()+index);
3128 for (int i=index; i< (int)m_arListArray.size(); ++i)
3130 m_arListArray[i]--;
3132 #endif
3135 ///< Set a checkbox on an entry in the listbox
3136 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync
3137 void CGitStatusListCtrl::SetEntryCheck(CTGitPath* pEntry, int listboxIndex, bool bCheck)
3139 pEntry->m_Checked = bCheck;
3140 m_mapFilenameToChecked[pEntry->GetGitPathString()] = bCheck;
3141 SetCheck(listboxIndex, bCheck);
3144 #if 0
3145 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry* parentEntry, bool bCheck)
3147 int nListItems = GetItemCount();
3148 for (int j=0; j< nListItems ; ++j)
3150 FileEntry * childEntry = GetListEntry(j);
3151 ASSERT(childEntry);
3152 if (!childEntry || childEntry == parentEntry)
3153 continue;
3154 if (childEntry->checked != bCheck)
3156 if (parentEntry->path.IsAncestorOf(childEntry->path))
3158 SetEntryCheck(childEntry,j,bCheck);
3159 if(bCheck)
3160 m_nSelected++;
3161 else
3162 m_nSelected--;
3167 #endif
3169 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList& pathList)
3171 pathList.Clear();
3172 int nListItems = GetItemCount();
3173 for (int i = 0; i< nListItems; ++i)
3175 CTGitPath * entry = (CTGitPath*)GetItemData(i);
3176 ASSERT(entry);
3177 if (entry->m_Checked)
3178 pathList.AddPath(*entry);
3180 pathList.SortByPathname();
3184 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)
3185 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList& pathList, bool /*bNoIgnored*/)
3187 pathList.Clear();
3189 POSITION pos = GetFirstSelectedItemPosition();
3190 int index;
3191 while ((index = GetNextSelectedItem(pos)) >= 0)
3193 CTGitPath * entry = (CTGitPath*)GetItemData(index);
3194 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))
3195 // continue;
3196 pathList.AddPath(*entry);
3200 UINT CGitStatusListCtrl::OnGetDlgCode()
3202 // we want to process the return key and not have that one
3203 // routed to the default pushbutton
3204 return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS;
3207 void CGitStatusListCtrl::OnNMReturn(NMHDR * /*pNMHDR*/, LRESULT *pResult)
3209 *pResult = 0;
3210 if (m_bBlock)
3211 return;
3212 if (!CheckMultipleDiffs())
3213 return;
3214 bool needsRefresh = false;
3215 POSITION pos = GetFirstSelectedItemPosition();
3216 while ( pos )
3218 int index = GetNextSelectedItem(pos);
3219 if (index < 0)
3220 return;
3221 CTGitPath *file=(CTGitPath*)GetItemData(index);
3222 if (file == nullptr)
3223 return;
3224 if (file->m_Action & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE))
3225 OpenFile(file, OPEN);
3226 else if ((file->m_Action & CTGitPath::LOGACTIONS_UNMERGED))
3228 if (CAppUtils::ConflictEdit(*file, false, m_bIsRevertTheirMy, GetLogicalParent() ? GetLogicalParent()->GetSafeHwnd() : nullptr))
3230 CString conflictedFile = g_Git.CombinePath(file);
3231 needsRefresh = needsRefresh || !PathFileExists(conflictedFile);
3234 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))
3235 continue;
3236 else
3238 if (!m_Rev1.IsEmpty() && !m_Rev2.IsEmpty())
3239 StartDiffTwo(index);
3240 else
3241 StartDiff(index);
3244 if (needsRefresh && GetLogicalParent() && GetLogicalParent()->GetSafeHwnd())
3245 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
3248 void CGitStatusListCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
3250 // Since we catch all keystrokes (to have the enter key processed here instead
3251 // of routed to the default pushbutton) we have to make sure that other
3252 // keys like Tab and Esc still do what they're supposed to do
3253 // Tab = change focus to next/previous control
3254 // Esc = quit the dialog
3255 switch (nChar)
3257 case (VK_TAB):
3259 ::PostMessage(GetLogicalParent()->GetSafeHwnd(), WM_NEXTDLGCTL, GetKeyState(VK_SHIFT)&0x8000, 0);
3260 return;
3262 break;
3263 case (VK_ESCAPE):
3265 ::SendMessage(GetLogicalParent()->GetSafeHwnd(), WM_CLOSE, 0, 0);
3267 break;
3270 CListCtrl::OnKeyDown(nChar, nRepCnt, nFlags);
3273 void CGitStatusListCtrl::PreSubclassWindow()
3275 CListCtrl::PreSubclassWindow();
3276 EnableToolTips(TRUE);
3277 SetWindowTheme(GetSafeHwnd(), L"Explorer", nullptr);
3280 void CGitStatusListCtrl::OnPaint()
3282 LRESULT defres = Default();
3283 if ((m_bBusy) || (m_bEmpty))
3285 CString str;
3286 if (m_bBusy)
3288 if (m_sBusy.IsEmpty())
3289 str.LoadString(IDS_STATUSLIST_BUSYMSG);
3290 else
3291 str = m_sBusy;
3293 else
3295 if (m_sEmpty.IsEmpty())
3296 str.LoadString(IDS_STATUSLIST_EMPTYMSG);
3297 else
3298 str = m_sEmpty;
3300 COLORREF clrText = ::GetSysColor(COLOR_WINDOWTEXT);
3301 COLORREF clrTextBk;
3302 if (IsWindowEnabled())
3303 clrTextBk = ::GetSysColor(COLOR_WINDOW);
3304 else
3305 clrTextBk = ::GetSysColor(COLOR_3DFACE);
3307 CRect rc;
3308 GetClientRect(&rc);
3309 CHeaderCtrl* pHC = GetHeaderCtrl();
3310 if (pHC)
3312 CRect rcH;
3313 pHC->GetItemRect(0, &rcH);
3314 rc.top += rcH.bottom;
3316 CDC* pDC = GetDC();
3318 CMyMemDC memDC(pDC, &rc);
3320 memDC.SetTextColor(clrText);
3321 memDC.SetBkColor(clrTextBk);
3322 memDC.BitBlt(rc.left, rc.top, rc.Width(), rc.Height(), pDC, rc.left, rc.top, SRCCOPY);
3323 rc.top += 10;
3324 CGdiObject * oldfont = memDC.SelectStockObject(DEFAULT_GUI_FONT);
3325 memDC.DrawText(str, rc, DT_CENTER | DT_VCENTER |
3326 DT_WORDBREAK | DT_NOPREFIX | DT_NOCLIP);
3327 memDC.SelectObject(oldfont);
3329 ReleaseDC(pDC);
3331 if (defres)
3333 // the Default() call did not process the WM_PAINT message!
3334 // Validate the update region ourselves to avoid
3335 // an endless loop repainting
3336 CRect rc;
3337 GetUpdateRect(&rc, FALSE);
3338 if (!rc.IsRectEmpty())
3339 ValidateRect(rc);
3343 // prevent users from extending our hidden (size 0) columns
3344 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR *pNMHDR, LRESULT *pResult)
3346 m_ColumnManager.OnHdnBegintrack(pNMHDR, pResult);
3349 // prevent any function from extending our hidden (size 0) columns
3350 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
3352 if(!m_ColumnManager.OnHdnItemchanging(pNMHDR, pResult))
3353 Default();
3356 void CGitStatusListCtrl::OnDestroy()
3358 SaveColumnWidths(true);
3359 CListCtrl::OnDestroy();
3362 void CGitStatusListCtrl::OnBeginDrag(NMHDR* /*pNMHDR*/, LRESULT* pResult)
3364 Locker lock(m_critSec);
3365 CDropFiles dropFiles; // class for creating DROPFILES struct
3367 int index;
3368 POSITION pos = GetFirstSelectedItemPosition();
3369 if (!pos)
3370 return;
3372 bool bTempDirCreated = false;
3373 CString tempDir;
3374 while ( (index = GetNextSelectedItem(pos)) >= 0 )
3376 CTGitPath *path = (CTGitPath *)GetItemData(index); // m_arStatusArray[index] does not work with SyncDlg
3377 if (path->IsDirectory())
3378 continue;
3380 CString version;
3381 if (!this->m_CurrentVersion.IsEmpty() && this->m_CurrentVersion != GIT_REV_ZERO)
3383 if (path->m_Action & CTGitPath::LOGACTIONS_DELETED)
3384 version.Format(_T("%s^%d"), (LPCTSTR)m_CurrentVersion, (path->m_ParentNo + 1) & PARENT_MASK);
3385 else
3386 version = m_CurrentVersion;
3388 else
3390 if (path->m_Action & CTGitPath::LOGACTIONS_DELETED)
3391 version = _T("HEAD");
3394 CString tempFile;
3395 if (version.IsEmpty())
3397 TCHAR abspath[MAX_PATH] = {0};
3398 PathCombine(abspath, g_Git.m_CurrentDir, path->GetWinPath());
3399 tempFile = abspath;
3401 else
3403 if (!bTempDirCreated)
3405 tempDir = GetTempFile();
3406 ::DeleteFile(tempDir);
3407 ::CreateDirectory(tempDir, nullptr);
3408 bTempDirCreated = true;
3410 tempFile = tempDir + _T("\\") + path->GetWinPathString();
3411 CString tempSubDir = tempDir + _T("\\") + path->GetContainingDirectory().GetWinPathString();
3412 CPathUtils::MakeSureDirectoryPathExists(tempSubDir);
3413 if (g_Git.GetOneFile(version, *path, tempFile))
3415 CString out;
3416 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, (LPCTSTR)path->GetGitPathString(), (LPCTSTR)version, (LPCTSTR)tempFile);
3417 MessageBox(g_Git.GetGitLastErr(out, CGit::GIT_CMD_GETONEFILE), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
3418 return;
3421 dropFiles.AddFile(tempFile);
3424 if (!dropFiles.IsEmpty())
3426 m_bOwnDrag = true;
3427 dropFiles.CreateStructure();
3428 m_bOwnDrag = false;
3430 *pResult = 0;
3433 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry /* = false */)
3435 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
3436 for (int col = 0; col <= maxcol; col++)
3437 if (m_ColumnManager.IsVisible (col))
3438 m_ColumnManager.ColumnResized (col);
3440 if (bSaveToRegistry)
3441 m_ColumnManager.WriteSettings();
3444 bool CGitStatusListCtrl::EnableFileDrop()
3446 m_bFileDropsEnabled = true;
3447 return true;
3450 bool CGitStatusListCtrl::HasPath(const CTGitPath& path)
3452 for (size_t i=0; i < m_arStatusArray.size(); ++i)
3454 if (m_arStatusArray[i]->IsEquivalentTo(path))
3455 return true;
3458 return false;
3461 BOOL CGitStatusListCtrl::PreTranslateMessage(MSG* pMsg)
3463 if (pMsg->message == WM_KEYDOWN)
3465 switch (pMsg->wParam)
3467 case 'A':
3469 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
3471 // select all entries
3472 for (int i=0; i<GetItemCount(); ++i)
3473 SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
3474 return TRUE;
3477 break;
3478 case 'C':
3479 case VK_INSERT:
3481 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
3483 // copy all selected paths to the clipboard
3484 if (GetAsyncKeyState(VK_SHIFT)&0x8000)
3485 CopySelectedEntriesToClipboard(GITSLC_COLSTATUS);
3486 else
3487 CopySelectedEntriesToClipboard(0);
3488 return TRUE;
3491 break;
3492 case VK_DELETE:
3494 if ((GetSelectedCount() > 0) && (m_dwContextMenus & GITSLC_POPDELETE))
3496 m_bBlock = TRUE;
3497 CTGitPath * filepath = (CTGitPath *)GetItemData(GetSelectionMark());
3498 if (filepath != nullptr && (filepath->m_Action & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE)))
3499 DeleteSelectedFiles();
3500 m_bBlock = FALSE;
3503 break;
3507 return CListCtrl::PreTranslateMessage(pMsg);
3510 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols)
3512 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
3513 // WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
3515 CString sClipboard;
3516 CString temp;
3517 //TCHAR buf[100];
3518 if (GetSelectedCount() == 0)
3519 return false;
3521 // first add the column titles as the first line
3522 // We needn't head when only path copy
3523 //temp.LoadString(IDS_STATUSLIST_COLFILE);
3524 //sClipboard = temp;
3526 DWORD selection = 0;
3527 for (int i = 0, count = m_ColumnManager.GetColumnCount(); i < count; ++i)
3528 if ( ((dwCols == -1) && m_ColumnManager.IsVisible (i))
3529 || ((dwCols != 1) && (i < 32) && ((dwCols & (1 << i)) != 0)))
3531 sClipboard += _T("\t") + m_ColumnManager.GetName(i);
3533 if (i < 32)
3534 selection += 1 << i;
3537 if(dwCols)
3538 sClipboard += _T("\r\n");
3540 POSITION pos = GetFirstSelectedItemPosition();
3541 int index;
3542 while ((index = GetNextSelectedItem(pos)) >= 0)
3544 CTGitPath * entry = (CTGitPath*)GetItemData(index);
3545 if (!entry)
3546 continue;
3548 sClipboard += entry->GetWinPathString();
3549 if (selection & GITSLC_COLFILENAME)
3550 sClipboard += _T("\t")+entry->GetFileOrDirectoryName();
3551 if (selection & GITSLC_COLEXT)
3552 sClipboard += _T("\t")+entry->GetFileExtension();
3554 if (selection & GITSLC_COLSTATUS)
3555 sClipboard += _T("\t")+entry->GetActionName();
3556 #if 0
3557 if (selection & SVNSLC_COLDATE)
3559 TCHAR datebuf[SVN_DATE_BUFFER];
3560 apr_time_t date = entry->last_commit_date;
3561 SVN::formatDate(datebuf, date, true);
3562 if (date)
3563 temp = datebuf;
3564 else
3565 temp.Empty();
3566 sClipboard += _T("\t")+temp;
3568 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
3569 ; i < count
3570 ; ++i)
3572 if ((dwCols == -1) && m_ColumnManager.IsVisible (i))
3574 CString value
3575 = entry->present_props[m_ColumnManager.GetName(i)];
3576 sClipboard += _T("\t") + value;
3579 #endif
3580 if (selection & GITSLC_COLADD)
3581 sClipboard += _T("\t")+entry->m_StatAdd;
3582 if (selection & GITSLC_COLDEL)
3583 sClipboard += _T("\t")+entry->m_StatDel;
3585 sClipboard += _T("\r\n");
3588 return CStringUtils::WriteAsciiStringToClipboard(sClipboard);
3591 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()
3593 #if 0
3594 std::set<CString> changelists;
3595 POSITION pos = GetFirstSelectedItemPosition();
3596 int index;
3597 while ((index = GetNextSelectedItem(pos)) >= 0)
3599 FileEntry * entry = GetListEntry(index);
3600 if (!entry->changelist.IsEmpty())
3601 changelists.insert(entry->changelist);
3603 return changelists.size();
3604 #endif
3605 return 0;
3608 bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
3610 bool bHasGroups=false;
3611 int max =0;
3613 for (size_t i = 0; i < m_arStatusArray.size(); ++i)
3615 int ParentNo = m_arStatusArray[i]->m_ParentNo&PARENT_MASK;
3616 if( ParentNo > max)
3617 max=m_arStatusArray[i]->m_ParentNo&PARENT_MASK;
3620 if (((m_dwShow & GITSLC_SHOWUNVERSIONED) && !m_UnRevFileList.IsEmpty()) ||
3621 ((m_dwShow & GITSLC_SHOWIGNORED) && !m_IgnoreFileList.IsEmpty()) ||
3622 (m_dwShow & (GITSLC_SHOWASSUMEVALID | GITSLC_SHOWSKIPWORKTREE) && !m_LocalChangesIgnoredFileList.IsEmpty()) ||
3623 max>0 || bForce)
3625 bHasGroups = true;
3628 RemoveAllGroups();
3629 EnableGroupView(bHasGroups);
3631 TCHAR groupname[1024] = { 0 };
3632 int groupindex = 0;
3634 if(bHasGroups)
3636 LVGROUP grp = {0};
3637 grp.cbSize = sizeof(LVGROUP);
3638 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3639 groupindex=0;
3641 //if(m_UnRevFileList.GetCount()>0)
3642 if(max >0)
3644 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MERGEDFILES)), 1023);
3645 grp.pszHeader = groupname;
3646 grp.iGroupId = MERGE_MASK;
3647 grp.uAlign = LVGA_HEADER_LEFT;
3648 InsertGroup(0, &grp);
3650 CAutoRepository repository(g_Git.GetGitRepository());
3651 if (!repository)
3652 CMessageBox::Show(m_hWnd, CGit::GetLibGit2LastErr(_T("Could not open repository.")), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
3653 for (int i = 0; i <= max; ++i)
3655 CString str;
3656 str.Format(IDS_STATUSLIST_GROUP_DIFFWITHPARENT, i+1);
3657 if (repository)
3659 CString rev;
3660 rev.Format(_T("%s^%d"), (LPCTSTR)m_CurrentVersion, i + 1);
3661 CGitHash hash;
3662 if (!CGit::GetHash(repository, hash, rev))
3663 str += _T(": ") + hash.ToString().Left(g_Git.GetShortHASHLength());
3665 grp.pszHeader = str.GetBuffer();
3666 str.ReleaseBuffer();
3667 grp.iGroupId = i;
3668 grp.uAlign = LVGA_HEADER_LEFT;
3669 InsertGroup(i+1, &grp);
3672 else
3674 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MODIFIEDFILES)), 1023);
3675 grp.pszHeader = groupname;
3676 grp.iGroupId = groupindex;
3677 grp.uAlign = LVGA_HEADER_LEFT;
3678 InsertGroup(groupindex++, &grp);
3681 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_NOTVERSIONEDFILES)), 1023);
3682 grp.pszHeader = groupname;
3683 grp.iGroupId = groupindex;
3684 grp.uAlign = LVGA_HEADER_LEFT;
3685 InsertGroup(groupindex++, &grp);
3688 //if(m_IgnoreFileList.GetCount()>0)
3690 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_IGNOREDFILES)), 1023);
3691 grp.pszHeader = groupname;
3692 grp.iGroupId = groupindex;
3693 grp.uAlign = LVGA_HEADER_LEFT;
3694 InsertGroup(groupindex++, &grp);
3698 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_IGNORELOCALCHANGES)), 1023);
3699 grp.pszHeader = groupname;
3700 grp.iGroupId = groupindex;
3701 grp.uAlign = LVGA_HEADER_LEFT;
3702 InsertGroup(groupindex++, &grp);
3707 #if 0
3708 m_bHasIgnoreGroup = false;
3710 // now add the items which don't belong to a group
3711 LVGROUP grp = {0};
3712 grp.cbSize = sizeof(LVGROUP);
3713 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3714 CString sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET));
3715 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
3716 grp.pszHeader = groupname;
3717 grp.iGroupId = groupindex;
3718 grp.uAlign = LVGA_HEADER_LEFT;
3719 InsertGroup(groupindex++, &grp);
3721 for (auto it = m_changelists.cbegin(); it != m_changelists.cend(); ++it)
3723 if (it->first.Compare(SVNSLC_IGNORECHANGELIST)!=0)
3725 LVGROUP grp = {0};
3726 grp.cbSize = sizeof(LVGROUP);
3727 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3728 _tcsncpy_s(groupname, 1024, it->first, 1023);
3729 grp.pszHeader = groupname;
3730 grp.iGroupId = groupindex;
3731 grp.uAlign = LVGA_HEADER_LEFT;
3732 it->second = InsertGroup(groupindex++, &grp);
3734 else
3735 m_bHasIgnoreGroup = true;
3738 if (m_bHasIgnoreGroup)
3740 // and now add the group 'ignore-on-commit'
3741 std::map<CString,int>::iterator it = m_changelists.find(SVNSLC_IGNORECHANGELIST);
3742 if (it != m_changelists.end())
3744 grp.cbSize = sizeof(LVGROUP);
3745 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3746 _tcsncpy_s(groupname, 1024, SVNSLC_IGNORECHANGELIST, 1023);
3747 grp.pszHeader = groupname;
3748 grp.iGroupId = groupindex;
3749 grp.uAlign = LVGA_HEADER_LEFT;
3750 it->second = InsertGroup(groupindex, &grp);
3753 #endif
3754 return bHasGroups;
3757 void CGitStatusListCtrl::NotifyCheck()
3759 CWnd* pParent = GetLogicalParent();
3760 if (pParent && pParent->GetSafeHwnd())
3762 pParent->SendMessage(GITSLNM_CHECKCHANGED, m_nSelected);
3766 int CGitStatusListCtrl::UpdateFileList(CTGitPathList *list)
3768 m_CurrentVersion = GIT_REV_ZERO;
3770 g_Git.GetWorkingTreeChanges(m_StatusFileList, m_amend, list);
3772 BOOL bDeleteChecked = FALSE;
3773 int deleteFromIndex = 0;
3774 bool needsRefresh = false;
3775 for (int i = 0; i < m_StatusFileList.GetCount(); ++i)
3777 CTGitPath * gitpatch=(CTGitPath*)&m_StatusFileList[i];
3778 gitpatch->m_Checked = TRUE;
3780 if ((gitpatch->m_Action & (CTGitPath::LOGACTIONS_ADDED | CTGitPath::LOGACTIONS_REPLACED | CTGitPath::LOGACTIONS_MODIFIED)) && !gitpatch->Exists())
3782 if (!bDeleteChecked)
3784 CString message;
3785 message.Format(IDS_ASK_REMOVE_FROM_INDEX, gitpatch->GetWinPath());
3786 deleteFromIndex = CMessageBox::ShowCheck(GetSafeHwnd(), message, _T("TortoiseGit"), 1, IDI_EXCLAMATION, CString(MAKEINTRESOURCE(IDS_RESTORE_FROM_INDEX)), CString(MAKEINTRESOURCE(IDS_REMOVE_FROM_INDEX)), CString(MAKEINTRESOURCE(IDS_IGNOREBUTTON)), nullptr, CString(MAKEINTRESOURCE(IDS_DO_SAME_FOR_REST)), &bDeleteChecked);
3788 if (deleteFromIndex == 1)
3790 CString err;
3791 if (g_Git.Run(_T("git.exe checkout -- \"") + gitpatch->GetWinPathString() + _T("\""), &err, CP_UTF8))
3792 MessageBox(_T("Restoring from index failed:\n") + err, _T("TortoiseGit"), MB_ICONERROR);
3793 else
3794 needsRefresh = true;
3796 else if (deleteFromIndex == 2)
3798 CString err;
3799 if (g_Git.Run(_T("git.exe rm -f --cache -- \"") + gitpatch->GetWinPathString() + _T("\""), &err, CP_UTF8))
3800 MessageBox(_T("Removing from index failed:\n") + err, _T("TortoiseGit"), MB_ICONERROR);
3801 else
3802 needsRefresh = true;
3806 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
3809 if (needsRefresh)
3810 MessageBox(_T("Due to changes to the index, please refresh the dialog (e.g., by pressing F5)."), _T("TortoiseGit"), MB_ICONINFORMATION);
3812 return 0;
3815 int CGitStatusListCtrl::UpdateWithGitPathList(CTGitPathList &list)
3817 m_arStatusArray.clear();
3818 for (int i = 0; i < list.GetCount(); ++i)
3820 CTGitPath * gitpath=(CTGitPath*)&list[i];
3822 if(gitpath ->m_Action & CTGitPath::LOGACTIONS_HIDE)
3823 continue;
3825 gitpath->m_Checked = TRUE;
3826 m_arStatusArray.push_back((CTGitPath*)&list[i]);
3828 return 0;
3831 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList &list)
3833 m_UnRevFileList = list;
3834 for (int i = 0; i < m_UnRevFileList.GetCount(); ++i)
3836 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
3837 gitpatch->m_Checked = FALSE;
3838 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
3840 return 0;
3843 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList *List)
3845 CString err;
3846 if (m_UnRevFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER, List, &err))
3848 CMessageBox::Show(GetSafeHwnd(), _T("Failed to get UnRev file list\n") + err, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
3849 return -1;
3852 for (int i = 0; i < m_UnRevFileList.GetCount(); ++i)
3854 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
3855 gitpatch->m_Checked = FALSE;
3856 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
3858 return 0;
3861 int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList *List)
3863 CString err;
3864 if (m_IgnoreFileList.FillUnRev(CTGitPath::LOGACTIONS_IGNORE, List, &err))
3866 CMessageBox::Show(GetSafeHwnd(), _T("Failed to get Ignore file list\n") + err, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
3867 return -1;
3870 for (int i = 0; i < m_IgnoreFileList.GetCount(); ++i)
3872 CTGitPath * gitpatch=(CTGitPath*)&m_IgnoreFileList[i];
3873 gitpatch->m_Checked = FALSE;
3874 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
3876 return 0;
3879 int CGitStatusListCtrl::UpdateLocalChangesIgnoredFileList(CTGitPathList *list)
3881 m_LocalChangesIgnoredFileList.FillBasedOnIndexFlags(GIT_IDXENTRY_VALID, GIT_IDXENTRY_SKIP_WORKTREE, list);
3882 for (int i = 0; i < m_LocalChangesIgnoredFileList.GetCount(); ++i)
3884 CTGitPath * gitpatch = (CTGitPath*)&m_LocalChangesIgnoredFileList[i];
3885 gitpatch->m_Checked = FALSE;
3886 m_arStatusArray.push_back((CTGitPath*)&m_LocalChangesIgnoredFileList[i]);
3888 return 0;
3891 int CGitStatusListCtrl::UpdateFileList(int mask,bool once,CTGitPathList *List)
3893 if(mask&CGitStatusListCtrl::FILELIST_MODIFY)
3895 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_MODIFY)))
3897 UpdateFileList(List);
3898 m_FileLoaded|=CGitStatusListCtrl::FILELIST_MODIFY;
3901 if (mask & CGitStatusListCtrl::FILELIST_UNVER || mask & CGitStatusListCtrl::FILELIST_IGNORE)
3903 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_UNVER)))
3905 UpdateUnRevFileList(List);
3906 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
3908 if(mask&CGitStatusListCtrl::FILELIST_IGNORE && (once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_IGNORE))))
3910 UpdateIgnoreFileList(List);
3911 m_FileLoaded |= CGitStatusListCtrl::FILELIST_IGNORE;
3914 if (mask & CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED && (once || (!(m_FileLoaded & CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED))))
3916 UpdateLocalChangesIgnoredFileList(List);
3917 m_FileLoaded |= CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED;
3919 return 0;
3922 void CGitStatusListCtrl::Clear()
3924 m_FileLoaded=0;
3925 this->DeleteAllItems();
3926 this->m_arListArray.clear();
3927 this->m_arStatusArray.clear();
3928 this->m_changelists.clear();
3931 bool CGitStatusListCtrl::CheckMultipleDiffs()
3933 UINT selCount = GetSelectedCount();
3934 if (selCount > max(3, (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\NumDiffWarning"), 10)))
3936 CString message;
3937 message.Format(IDS_STATUSLIST_WARN_MAXDIFF, selCount);
3938 return ::MessageBox(GetSafeHwnd(), message, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION) == IDYES;
3940 return true;
3943 //////////////////////////////////////////////////////////////////////////
3944 #if 0
3945 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium, DWORD * /*pdwEffect*/, POINTL pt)
3947 if(pFmtEtc->cfFormat == CF_HDROP && medium.tymed == TYMED_HGLOBAL)
3949 HDROP hDrop = (HDROP)GlobalLock(medium.hGlobal);
3950 if (hDrop)
3952 TCHAR szFileName[MAX_PATH] = {0};
3954 UINT cFiles = DragQueryFile(hDrop, 0xFFFFFFFF, nullptr, 0);
3956 POINT clientpoint;
3957 clientpoint.x = pt.x;
3958 clientpoint.y = pt.y;
3959 ScreenToClient(m_hTargetWnd, &clientpoint);
3960 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
3962 CTSVNPathList changelistItems;
3963 for(UINT i = 0; i < cFiles; ++i)
3965 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
3966 changelistItems.AddPath(CTSVNPath(szFileName));
3968 // find the changelist name
3969 CString sChangelist;
3970 LONG_PTR nGroup = m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint);
3971 for (std::map<CString, int>::iterator it = m_pSVNStatusListCtrl->m_changelists.begin(); it != m_pSVNStatusListCtrl->m_changelists.end(); ++it)
3972 if (it->second == nGroup)
3973 sChangelist = it->first;
3974 if (!sChangelist.IsEmpty())
3976 SVN git;
3977 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
3979 for (int l=0; l<changelistItems.GetCount(); ++l)
3981 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
3982 if (index >= 0)
3984 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
3985 if (e)
3987 e->changelist = sChangelist;
3988 if (!e->IsFolder())
3990 if (m_pSVNStatusListCtrl->m_changelists.find(e->changelist)!=m_pSVNStatusListCtrl->m_changelists.end())
3991 m_pSVNStatusListCtrl->SetItemGroup(index, m_pSVNStatusListCtrl->m_changelists[e->changelist]);
3992 else
3993 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
3997 else
3999 HWND hParentWnd = GetParent(m_hTargetWnd);
4000 if (hParentWnd)
4001 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
4005 else
4006 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
4008 else
4010 SVN git;
4011 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
4013 for (int l=0; l<changelistItems.GetCount(); ++l)
4015 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
4016 if (index >= 0)
4018 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
4019 if (e)
4021 e->changelist = sChangelist;
4022 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
4025 else
4027 HWND hParentWnd = GetParent(m_hTargetWnd);
4028 if (hParentWnd)
4029 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
4033 else
4034 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
4037 else
4039 for(UINT i = 0; i < cFiles; ++i)
4041 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
4042 HWND hParentWnd = GetParent(m_hTargetWnd);
4043 if (hParentWnd)
4044 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)szFileName);
4048 GlobalUnlock(medium.hGlobal);
4050 return true; //let base free the medium
4053 HRESULT STDMETHODCALLTYPE CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect)
4055 CIDropTarget::DragOver(grfKeyState, pt, pdwEffect);
4056 *pdwEffect = DROPEFFECT_COPY;
4057 if (m_pSVNStatusListCtrl)
4059 POINT clientpoint;
4060 clientpoint.x = pt.x;
4061 clientpoint.y = pt.y;
4062 ScreenToClient(m_hTargetWnd, &clientpoint);
4063 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
4064 *pdwEffect = DROPEFFECT_MOVE;
4065 else if ((!m_pSVNStatusListCtrl->m_bFileDropsEnabled)||(m_pSVNStatusListCtrl->m_bOwnDrag))
4066 *pdwEffect = DROPEFFECT_NONE;
4068 return S_OK;
4071 #endif
4073 void CGitStatusListCtrl::FilesExport()
4075 CString exportDir;
4076 // export all changed files to a folder
4077 CBrowseFolder browseFolder;
4078 browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
4079 if (browseFolder.Show(GetSafeHwnd(), exportDir) != CBrowseFolder::OK)
4080 return;
4082 POSITION pos = GetFirstSelectedItemPosition();
4083 int index;
4084 while ((index = GetNextSelectedItem(pos)) >= 0)
4086 CTGitPath *fd = (CTGitPath*)GetItemData(index);
4087 // we cannot export directories or folders
4088 if ((fd->m_Action & CTGitPath::LOGACTIONS_DELETED) || fd->IsDirectory())
4089 continue;
4091 CPathUtils::MakeSureDirectoryPathExists(exportDir + _T("\\") + fd->GetContainingDirectory().GetWinPathString());
4092 CString filename = exportDir + _T("\\") + fd->GetWinPathString();
4093 if (m_CurrentVersion == GIT_REV_ZERO)
4095 if (!CopyFile(g_Git.CombinePath(fd), filename, false))
4097 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
4098 return;
4101 else
4103 if (g_Git.GetOneFile(m_CurrentVersion, *fd, filename))
4105 CString out;
4106 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, (LPCTSTR)fd->GetGitPathString(), (LPCTSTR)m_CurrentVersion, (LPCTSTR)filename);
4107 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)
4108 return;
4114 void CGitStatusListCtrl::FileSaveAs(CTGitPath *path)
4116 CString filename;
4117 filename.Format(_T("%s-%s%s"), (LPCTSTR)path->GetBaseFilename(), (LPCTSTR)this->m_CurrentVersion.Left(g_Git.GetShortHASHLength()), (LPCTSTR)path->GetFileExtension());
4118 CFileDialog dlg(FALSE, nullptr, filename, OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT, nullptr);
4120 CString currentpath = g_Git.CombinePath(path->GetContainingDirectory());
4121 dlg.m_ofn.lpstrInitialDir = currentpath;
4123 CString cmd,out;
4124 INT_PTR ret = dlg.DoModal();
4125 SetCurrentDirectory(g_Git.m_CurrentDir);
4126 if (ret == IDOK)
4128 filename = dlg.GetPathName();
4129 if(m_CurrentVersion == GIT_REV_ZERO)
4131 if(!CopyFile(g_Git.CombinePath(path), filename, false))
4133 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
4134 return;
4137 else
4139 if(g_Git.GetOneFile(m_CurrentVersion,*path,filename))
4141 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, (LPCTSTR)path->GetGitPathString(), (LPCTSTR)m_CurrentVersion, (LPCTSTR)filename);
4142 CMessageBox::Show(nullptr, g_Git.GetGitLastErr(out, CGit::GIT_CMD_GETONEFILE), _T("TortoiseGit"), MB_OK);
4143 return;
4149 int CGitStatusListCtrl::RevertSelectedItemToVersion(bool parent)
4151 if(this->m_CurrentVersion.IsEmpty())
4152 return 0;
4153 if(this->m_CurrentVersion == GIT_REV_ZERO)
4154 return 0;
4156 POSITION pos = GetFirstSelectedItemPosition();
4157 int index;
4158 CString cmd,out;
4159 std::map<CString, int> versionMap;
4160 while ((index = GetNextSelectedItem(pos)) >= 0)
4162 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
4163 CString version;
4164 if (parent)
4166 int parentNo = fentry->m_ParentNo & PARENT_MASK;
4167 CString ref;
4168 ref.Format(_T("%s^%d"), (LPCTSTR)m_CurrentVersion, parentNo + 1);
4169 CGitHash hash;
4170 if (g_Git.GetHash(hash, ref))
4172 MessageBox(g_Git.GetGitLastErr(_T("Could not get hash of ref \"") + ref + _T("\".")), _T("TortoiseGit"), MB_ICONERROR);
4173 continue;
4176 version = hash.ToString();
4178 else
4179 version = m_CurrentVersion;
4181 CString filename = fentry->GetGitPathString();
4182 if (!fentry->GetGitOldPathString().IsEmpty())
4183 filename = fentry->GetGitOldPathString();
4184 cmd.Format(_T("git.exe checkout %s -- \"%s\""), (LPCTSTR)version, (LPCTSTR)filename);
4185 out.Empty();
4186 if (g_Git.Run(cmd, &out, CP_UTF8))
4188 if (MessageBox(out, _T("TortoiseGit"), MB_ICONEXCLAMATION | MB_OKCANCEL) == IDCANCEL)
4189 continue;
4191 else
4192 versionMap[version]++;
4195 out.Empty();
4196 for (auto it = versionMap.cbegin(); it != versionMap.cend(); ++it)
4198 CString versionEntry;
4199 versionEntry.Format(IDS_STATUSLIST_FILESREVERTED, it->second, (LPCTSTR)it->first);
4200 out += versionEntry + _T("\r\n");
4202 if (!out.IsEmpty())
4203 CMessageBox::Show(nullptr, out, _T("TortoiseGit"), MB_OK);
4204 return 0;
4207 void CGitStatusListCtrl::OpenFile(CTGitPath*filepath,int mode)
4209 CString file;
4210 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
4211 file = g_Git.CombinePath(filepath);
4212 else
4214 CString temppath;
4215 GetTempPath(temppath);
4216 TCHAR szTempName[MAX_PATH] = {0};
4217 GetTempFileName(temppath, filepath->GetBaseFilename(), 0, szTempName);
4218 CString temp(szTempName);
4219 DeleteFile(szTempName);
4220 CreateDirectory(szTempName, nullptr);
4221 file.Format(_T("%s\\%s_%s%s"),
4222 (LPCTSTR)temp,
4223 (LPCTSTR)filepath->GetBaseFilename(),
4224 (LPCTSTR)m_CurrentVersion.Left(g_Git.GetShortHASHLength()),
4225 (LPCTSTR)filepath->GetFileExtension());
4226 CString cmd,out;
4227 if(g_Git.GetOneFile(m_CurrentVersion, *filepath, file))
4229 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, (LPCTSTR)filepath->GetGitPathString(), (LPCTSTR)m_CurrentVersion, (LPCTSTR)file);
4230 CMessageBox::Show(nullptr, g_Git.GetGitLastErr(out, CGit::GIT_CMD_GETONEFILE), _T("TortoiseGit"), MB_OK);
4231 return;
4233 SetFileAttributes(file, FILE_ATTRIBUTE_READONLY);
4235 if(mode == ALTERNATIVEEDITOR)
4237 CAppUtils::LaunchAlternativeEditor(file);
4238 return;
4241 if (mode == OPEN)
4242 CAppUtils::ShellOpen(file, GetSafeHwnd());
4243 else
4244 CAppUtils::ShowOpenWithDialog(file, GetSafeHwnd());
4247 void CGitStatusListCtrl::DeleteSelectedFiles()
4249 //Collect paths
4250 std::vector<int> selectIndex;
4252 POSITION pos = GetFirstSelectedItemPosition();
4253 int index;
4254 while ((index = GetNextSelectedItem(pos)) >= 0)
4255 selectIndex.push_back(index);
4257 CAutoRepository repo = g_Git.GetGitRepository();
4258 if (!repo)
4260 MessageBox(g_Git.GetLibGit2LastErr(_T("Could not open repository.")), _T("TortoiseGit"), MB_OK);
4261 return;
4263 CAutoIndex gitIndex;
4264 if (git_repository_index(gitIndex.GetPointer(), repo))
4266 g_Git.GetLibGit2LastErr(_T("Could not open index."));
4267 return;
4269 int needWriteIndex = 0;
4271 //Create file-list ('\0' separated) for SHFileOperation
4272 CString filelist;
4273 for (size_t i = 0; i < selectIndex.size(); ++i)
4275 index = selectIndex[i];
4277 CTGitPath * path=(CTGitPath*)GetItemData(index);
4278 ASSERT(path);
4279 if (path == nullptr)
4280 continue;
4282 // do not report errors as we could remove an unversioned file
4283 needWriteIndex += git_index_remove_bypath(gitIndex, CUnicodeUtils::GetUTF8(path->GetGitPathString())) == 0 ? 1 : 0;
4285 if (!path->Exists())
4286 continue;
4288 filelist += path->GetWinPathString();
4289 filelist += _T("|");
4291 filelist += _T("|");
4292 int len = filelist.GetLength();
4293 auto buf = std::make_unique<TCHAR[]>(len + 2);
4294 _tcscpy_s(buf.get(), len + 2, filelist);
4295 CStringUtils::PipesToNulls(buf.get(), len + 2);
4296 SHFILEOPSTRUCT fileop;
4297 fileop.hwnd = this->m_hWnd;
4298 fileop.wFunc = FO_DELETE;
4299 fileop.pFrom = buf.get();
4300 fileop.pTo = nullptr;
4301 fileop.fFlags = FOF_NO_CONNECTED_ELEMENTS | ((GetAsyncKeyState(VK_SHIFT) & 0x8000) ? 0 : FOF_ALLOWUNDO);
4302 fileop.lpszProgressTitle = _T("deleting file");
4303 int result = SHFileOperation(&fileop);
4305 if ((result == 0 || len == 1) && (!fileop.fAnyOperationsAborted))
4307 if (needWriteIndex && git_index_write(gitIndex))
4308 MessageBox(g_Git.GetLibGit2LastErr(_T("Could not write index.")), _T("TortoiseGit"), MB_OK);
4310 if (needWriteIndex)
4312 CWnd* pParent = GetLogicalParent();
4313 if (pParent && pParent->GetSafeHwnd())
4314 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
4315 SetRedraw(TRUE);
4316 return;
4319 SetRedraw(FALSE);
4320 POSITION pos2 = nullptr;
4321 while ((pos2 = GetFirstSelectedItemPosition()) != nullptr)
4323 int index2 = GetNextSelectedItem(pos2);
4324 if (GetCheck(index2))
4325 m_nSelected--;
4326 m_nTotal--;
4328 RemoveListEntry(index2);
4330 SetRedraw(TRUE);
4334 BOOL CGitStatusListCtrl::OnWndMsg(UINT message, WPARAM wParam, LPARAM lParam, LRESULT* pResult)
4336 switch (message)
4338 case WM_MENUCHAR: // only supported by IContextMenu3
4339 if (g_IContext3)
4341 g_IContext3->HandleMenuMsg2(message, wParam, lParam, pResult);
4342 return TRUE;
4344 break;
4346 case WM_DRAWITEM:
4347 case WM_MEASUREITEM:
4348 if (wParam)
4349 break; // if wParam != 0 then the message is not menu-related
4351 case WM_INITMENU:
4352 case WM_INITMENUPOPUP:
4354 HMENU hMenu = (HMENU)wParam;
4355 if ((hMenu == m_hShellMenu) && (GetMenuItemCount(hMenu) == 0))
4357 // the shell submenu is populated only on request, i.e. right
4358 // before the submenu is shown
4359 if (g_pFolderhook)
4361 delete g_pFolderhook;
4362 g_pFolderhook = nullptr;
4364 CTGitPathList targetList;
4365 FillListOfSelectedItemPaths(targetList);
4366 if (!targetList.IsEmpty())
4368 // get IShellFolder interface of Desktop (root of shell namespace)
4369 if (g_psfDesktopFolder)
4370 g_psfDesktopFolder->Release();
4371 SHGetDesktopFolder(&g_psfDesktopFolder); // needed to obtain full qualified pidl
4373 // ParseDisplayName creates a PIDL from a file system path relative to the IShellFolder interface
4374 // but since we use the Desktop as our interface and the Desktop is the namespace root
4375 // that means that it's a fully qualified PIDL, which is what we need
4377 if (g_pidlArray)
4379 for (int i = 0; i < g_pidlArrayItems; i++)
4381 if (g_pidlArray[i])
4382 CoTaskMemFree(g_pidlArray[i]);
4384 CoTaskMemFree(g_pidlArray);
4385 g_pidlArray = nullptr;
4386 g_pidlArrayItems = 0;
4388 int nItems = targetList.GetCount();
4389 g_pidlArray = (LPITEMIDLIST *)CoTaskMemAlloc((nItems + 10) * sizeof(LPITEMIDLIST));
4390 SecureZeroMemory(g_pidlArray, (nItems + 10) * sizeof(LPITEMIDLIST));
4391 int succeededItems = 0;
4392 PIDLIST_RELATIVE pidl = nullptr;
4394 int bufsize = 1024;
4395 auto filepath = std::make_unique<WCHAR[]>(bufsize);
4396 for (int i = 0; i < nItems; i++)
4398 CString fullPath = g_Git.CombinePath(targetList[i].GetWinPath());
4399 if (bufsize < fullPath.GetLength())
4401 bufsize = fullPath.GetLength() + 3;
4402 filepath = std::make_unique<WCHAR[]>(bufsize);
4404 wcscpy_s(filepath.get(), bufsize, fullPath);
4405 if (SUCCEEDED(g_psfDesktopFolder->ParseDisplayName(nullptr, 0, filepath.get(), nullptr, &pidl, nullptr)))
4406 g_pidlArray[succeededItems++] = pidl; // copy pidl to pidlArray
4408 if (succeededItems == 0)
4410 CoTaskMemFree(g_pidlArray);
4411 g_pidlArray = nullptr;
4414 g_pidlArrayItems = succeededItems;
4416 if (g_pidlArrayItems)
4418 CString ext = targetList[0].GetFileExtension();
4420 ASSOCIATIONELEMENT const rgAssocItem[] =
4422 { ASSOCCLASS_PROGID_STR, nullptr, ext },
4423 { ASSOCCLASS_SYSTEM_STR, nullptr, ext },
4424 { ASSOCCLASS_APP_STR, nullptr, ext },
4425 { ASSOCCLASS_STAR, nullptr, nullptr },
4426 { ASSOCCLASS_FOLDER, nullptr, nullptr },
4428 IQueryAssociations* pIQueryAssociations = nullptr;
4429 if (FAILED(AssocCreateForClasses(rgAssocItem, ARRAYSIZE(rgAssocItem), IID_IQueryAssociations, (void**)&pIQueryAssociations)))
4430 pIQueryAssociations = nullptr; // not a problem, it works without this
4432 g_pFolderhook = new CIShellFolderHook(g_psfDesktopFolder, targetList);
4433 LPCONTEXTMENU icm1 = nullptr;
4435 DEFCONTEXTMENU dcm = { 0 };
4436 dcm.hwnd = m_hWnd;
4437 dcm.psf = g_pFolderhook;
4438 dcm.cidl = g_pidlArrayItems;
4439 dcm.apidl = (PCUITEMID_CHILD_ARRAY)g_pidlArray;
4440 dcm.punkAssociationInfo = pIQueryAssociations;
4441 if (SUCCEEDED(SHCreateDefaultContextMenu(&dcm, IID_IContextMenu, (void**)&icm1)))
4443 int iMenuType = 0; // to know which version of IContextMenu is supported
4444 if (icm1)
4445 { // since we got an IContextMenu interface we can now obtain the higher version interfaces via that
4446 if (icm1->QueryInterface(IID_IContextMenu3, (void**)&m_pContextMenu) == S_OK)
4447 iMenuType = 3;
4448 else if (icm1->QueryInterface(IID_IContextMenu2, (void**)&m_pContextMenu) == S_OK)
4449 iMenuType = 2;
4451 if (m_pContextMenu)
4452 icm1->Release(); // we can now release version 1 interface, cause we got a higher one
4453 else
4455 // since no higher versions were found
4456 // redirect ppContextMenu to version 1 interface
4457 iMenuType = 1;
4458 m_pContextMenu = icm1;
4461 if (m_pContextMenu)
4463 // lets fill the our popup menu
4464 UINT flags = CMF_NORMAL;
4465 flags |= (GetKeyState(VK_SHIFT) & 0x8000) != 0 ? CMF_EXTENDEDVERBS : 0;
4466 m_pContextMenu->QueryContextMenu(hMenu, 0, SHELL_MIN_CMD, SHELL_MAX_CMD, flags);
4469 // subclass window to handle menu related messages in CShellContextMenu
4470 if (iMenuType > 1) // only subclass if its version 2 or 3
4472 if (iMenuType == 2)
4473 g_IContext2 = (LPCONTEXTMENU2)m_pContextMenu;
4474 else // version 3
4475 g_IContext3 = (LPCONTEXTMENU3)m_pContextMenu;
4479 if (pIQueryAssociations)
4480 pIQueryAssociations->Release();
4483 if (g_IContext3)
4484 g_IContext3->HandleMenuMsg2(message, wParam, lParam, pResult);
4485 else if (g_IContext2)
4486 g_IContext2->HandleMenuMsg(message, wParam, lParam);
4487 return TRUE;
4491 break;
4492 default:
4493 break;
4496 return CListCtrl::OnWndMsg(message, wParam, lParam, pResult);