Prefer to use VS2013 for compiling and testing on AppVeyor
[TortoiseGit.git] / src / Git / GitStatusListCtrl.cpp
blob88e7159f8ff9dd1b65202bfcb0cf0280cd205a84
1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2015 - TortoiseGit
4 // Copyright (C) 2003-2008, 2013-2014 - 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, NULL, 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 std::unique_ptr<char[]> pBuffer(new 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(NULL)
224 , m_pStatLabel(NULL)
225 , m_pSelectButton(NULL)
226 , m_pConfirmButton(NULL)
227 , m_bBusy(false)
228 , m_bEmpty(false)
229 , m_bShowIgnores(false)
230 , m_pDropTarget(NULL)
231 , m_bIgnoreRemoveOnly(false)
232 , m_bCheckChildrenWithParent(false)
233 , m_bUnversionedLast(true)
234 , m_bHasChangeLists(false)
235 , m_bHasLocks(false)
236 , m_bBlock(false)
237 , m_bBlockUI(false)
238 , m_bHasCheckboxes(false)
239 , m_bCheckIfGroupsExist(true)
240 , m_bFileDropsEnabled(false)
241 , m_bOwnDrag(false)
242 , m_dwDefaultColumns(0)
243 , m_ColumnManager(this)
244 , m_bAscending(false)
245 , m_nSortedColumn(-1)
246 , m_bHasExternalsFromDifferentRepos(false)
247 , m_sNoPropValueText(MAKEINTRESOURCE(IDS_STATUSLIST_NOPROPVALUE))
248 , m_amend(false)
249 , m_bDoNotAutoselectSubmodules(false)
250 , m_bNoAutoselectMissing(false)
251 , m_bHasWC(true)
252 , m_hwndLogicalParent(NULL)
253 , m_bHasUnversionedItems(FALSE)
254 , m_nTargetCount(0)
255 , m_bHasExternals(false)
256 , m_bHasIgnoreGroup(false)
257 , m_nUnversioned(0)
258 , m_nNormal(0)
259 , m_nModified(0)
260 , m_nAdded(0)
261 , m_nDeleted(0)
262 , m_nConflicted(0)
263 , m_nTotal(0)
264 , m_nSelected(0)
265 , m_nRenamed(0)
266 , m_nShownUnversioned(0)
267 , m_nShownModified(0)
268 , m_nShownAdded(0)
269 , m_nShownDeleted(0)
270 , m_nShownConflicted(0)
271 , m_nShownFiles(0)
272 , m_nShownSubmodules(0)
273 , m_dwShow(0)
274 , m_bShowFolders(false)
275 , m_bUpdate(false)
276 , m_dwContextMenus(0)
277 , m_nIconFolder(0)
278 , m_nRestoreOvl(0)
279 , pfnSHCreateDefaultContextMenu(nullptr)
280 , pfnAssocCreateForClasses(nullptr)
281 , m_pContextMenu(nullptr)
282 , m_hShellMenu(nullptr)
284 m_FileLoaded=0;
285 m_dwDefaultColumns = 0;
286 m_critSec.Init();
287 m_bIsRevertTheirMy = false;
288 m_bNoAutoselectMissing = CRegDWORD(L"Software\\TortoiseGit\\AutoselectMissingFiles", FALSE) == TRUE;
289 this->m_nLineAdded =this->m_nLineDeleted =0;
290 m_ShellDll = AtlLoadSystemLibraryUsingFullPath(_T("Shell32.dll"));
291 if (m_ShellDll)
293 pfnSHCreateDefaultContextMenu = (FNSHCreateDefaultContextMenu)::GetProcAddress(m_ShellDll, "SHCreateDefaultContextMenu");
294 pfnAssocCreateForClasses = (FNAssocCreateForClasses)::GetProcAddress(m_ShellDll, "AssocCreateForClasses");
298 CGitStatusListCtrl::~CGitStatusListCtrl()
300 // if (m_pDropTarget)
301 // delete m_pDropTarget;
302 ClearStatusArray();
305 void CGitStatusListCtrl::ClearStatusArray()
307 #if 0
308 Locker lock(m_critSec);
309 for (size_t i = 0; i < m_arStatusArray.size(); ++i)
311 delete m_arStatusArray[i];
313 m_arStatusArray.clear();
314 #endif
317 void CGitStatusListCtrl::Init(DWORD dwColumns, const CString& sColumnInfoContainer, unsigned __int64 dwContextMenus /* = GitSLC_POPALL */, bool bHasCheckboxes /* = true */, bool bHasWC /* = true */, DWORD allowedColumns /* = 0xffffffff */)
319 Locker lock(m_critSec);
321 m_dwDefaultColumns = dwColumns | 1;
322 m_dwContextMenus = dwContextMenus;
323 m_bHasCheckboxes = bHasCheckboxes;
324 m_bHasWC = bHasWC;
326 // set the extended style of the listcontrol
327 // 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.
328 CRegDWORD regFullRowSelect(_T("Software\\TortoiseGit\\FullRowSelect"), TRUE);
329 DWORD exStyle = LVS_EX_HEADERDRAGDROP | LVS_EX_DOUBLEBUFFER | LVS_EX_INFOTIP | LVS_EX_SUBITEMIMAGES;
330 if (DWORD(regFullRowSelect))
331 exStyle |= LVS_EX_FULLROWSELECT;
332 exStyle |= (bHasCheckboxes ? LVS_EX_CHECKBOXES : 0);
333 SetRedraw(false);
334 SetExtendedStyle(exStyle);
336 SetWindowTheme(m_hWnd, L"Explorer", NULL);
338 m_nIconFolder = SYS_IMAGE_LIST().GetDirIconIndex();
339 m_nRestoreOvl = SYS_IMAGE_LIST().AddIcon((HICON)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_RESTOREOVL), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE));
340 SYS_IMAGE_LIST().SetOverlayImage(m_nRestoreOvl, OVL_RESTORE);
341 SetImageList(&SYS_IMAGE_LIST(), LVSIL_SMALL);
343 // keep CSorter::operator() in sync!!
344 static UINT standardColumnNames[GITSLC_NUMCOLUMNS]
345 = { IDS_STATUSLIST_COLFILE
346 , IDS_STATUSLIST_COLFILENAME
347 , IDS_STATUSLIST_COLEXT
348 , IDS_STATUSLIST_COLSTATUS
349 , IDS_STATUSLIST_COLADD
350 , IDS_STATUSLIST_COLDEL
351 , IDS_STATUSLIST_COLLASTMODIFIED
352 , IDS_STATUSLIST_COLSIZE
355 m_ColumnManager.SetNames(standardColumnNames,GITSLC_NUMCOLUMNS);
356 m_ColumnManager.ReadSettings(m_dwDefaultColumns, 0xffffffff & ~(allowedColumns | m_dwDefaultColumns), sColumnInfoContainer, GITSLC_NUMCOLUMNS);
358 // enable file drops
359 #if 0
360 if (m_pDropTarget == NULL)
362 m_pDropTarget = new CGitStatusListCtrlDropTarget(this);
363 RegisterDragDrop(m_hWnd,m_pDropTarget);
364 // create the supported formats:
365 FORMATETC ftetc={0};
366 ftetc.dwAspect = DVASPECT_CONTENT;
367 ftetc.lindex = -1;
368 ftetc.tymed = TYMED_HGLOBAL;
369 ftetc.cfFormat=CF_HDROP;
370 m_pDropTarget->AddSuportedFormat(ftetc);
372 #endif
374 SetRedraw(true);
377 bool CGitStatusListCtrl::SetBackgroundImage(UINT nID)
379 return CAppUtils::SetListCtrlBackgroundImage(GetSafeHwnd(), nID);
382 BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList* pathList
383 , bool bUpdate /* = FALSE */
384 , bool bShowIgnores /* = false */
385 , bool bShowUnRev /* = false */
386 , bool bShowLocalChangesIgnored /* = false */)
388 m_bBusy = true;
389 m_bEmpty = false;
390 Invalidate();
392 Locker lock(m_critSec);
393 int mask= CGitStatusListCtrl::FILELIST_MODIFY;
394 if(bShowIgnores)
395 mask|= CGitStatusListCtrl::FILELIST_IGNORE;
396 if(bShowUnRev)
397 mask|= CGitStatusListCtrl::FILELIST_UNVER;
398 if (bShowLocalChangesIgnored)
399 mask |= CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED;
400 this->UpdateFileList(mask,bUpdate,(CTGitPathList*)pathList);
402 if (pathList && m_mapDirectFiles.empty())
404 // remember files which are selected by users so that those can be preselected
405 for (int i = 0; i < pathList->GetCount(); ++i)
406 if (!(*pathList)[i].IsDirectory())
407 m_mapDirectFiles[(*pathList)[i].GetGitPathString()] = true;
410 #if 0
411 int refetchcounter = 0;
412 BOOL bRet = TRUE;
413 Invalidate();
414 // force the cursor to change
415 POINT pt;
416 GetCursorPos(&pt);
417 SetCursorPos(pt.x, pt.y);
419 m_mapFilenameToChecked.clear();
420 //m_StatusUrlList.Clear();
421 bool bHasChangelists = (m_changelists.size() > 1 || (!m_changelists.empty() && !m_bHasIgnoreGroup));
422 m_changelists.clear();
423 for (size_t i=0; i < m_arStatusArray.size(); i++)
425 FileEntry * entry = m_arStatusArray[i];
426 if ( bHasChangelists && entry->checked)
428 // If change lists are present, remember all checked entries
429 CString path = entry->GetPath().GetGitPathString();
430 m_mapFilenameToChecked[path] = true;
432 if ( (entry->status==git_wc_status_unversioned || entry->status==git_wc_status_missing ) && entry->checked )
434 // The user manually selected an unversioned or missing file. We remember
435 // this so that the selection can be restored when refreshing.
436 CString path = entry->GetPath().GetGitPathString();
437 m_mapFilenameToChecked[path] = true;
439 else if ( entry->status > git_wc_status_normal && !entry->checked )
441 // The user manually deselected a versioned file. We remember
442 // this so that the deselection can be restored when refreshing.
443 CString path = entry->GetPath().GetGitPathString();
444 m_mapFilenameToChecked[path] = false;
448 // use a sorted path list to make sure we fetch the status of
449 // parent items first, *then* the child items (if any)
450 CTGitPathList sortedPathList = pathList;
451 sortedPathList.SortByPathname();
454 bRet = TRUE;
455 m_nTargetCount = 0;
456 m_bHasExternalsFromDifferentRepos = FALSE;
457 m_bHasExternals = FALSE;
458 m_bHasUnversionedItems = FALSE;
459 m_bHasLocks = false;
460 m_bHasChangeLists = false;
461 m_bShowIgnores = bShowIgnores;
462 m_nSortedColumn = 0;
463 m_bBlock = TRUE;
464 m_bBusy = true;
465 m_bEmpty = false;
466 Invalidate();
468 // first clear possible status data left from
469 // previous GetStatus() calls
470 ClearStatusArray();
472 m_StatusFileList = sortedPathList;
474 // Since Git_client_status() returns all files, even those in
475 // folders included with Git:externals we need to check if all
476 // files we get here belongs to the same repository.
477 // It is possible to commit changes in an external folder, as long
478 // as the folder belongs to the same repository (but another path),
479 // but it is not possible to commit all files if the externals are
480 // from a different repository.
482 // To check if all files belong to the same repository, we compare the
483 // UUID's - if they're identical then the files belong to the same
484 // repository and can be committed. But if they're different, then
485 // tell the user to commit all changes in the external folders
486 // first and exit.
487 CStringA sUUID; // holds the repo UUID
488 CTGitPathList arExtPaths; // list of Git:external paths
490 GitConfig config;
492 m_sURL.Empty();
494 m_nTargetCount = sortedPathList.GetCount();
496 GitStatus status(m_pbCanceled);
497 if(m_nTargetCount > 1 && sortedPathList.AreAllPathsFilesInOneDirectory())
499 // This is a special case, where we've been given a list of files
500 // all from one folder
501 // We handle them by setting a status filter, then requesting the Git status of
502 // all the files in the directory, filtering for the ones we're interested in
503 status.SetFilter(sortedPathList);
505 // if all selected entries are files, we don't do a recursive status
506 // fetching. But if only one is a directory, we have to recurse.
507 git_depth_t depth = git_depth_files;
508 // We have set a filter. If all selected items were files or we fetch
509 // the status not recursively, then we have to include
510 // ignored items too - the user has selected them
511 bool bShowIgnoresRight = true;
512 for (int fcindex=0; fcindex<sortedPathList.GetCount(); ++fcindex)
514 if (sortedPathList[fcindex].IsDirectory())
516 depth = git_depth_infinity;
517 bShowIgnoresRight = false;
518 break;
521 if(!FetchStatusForSingleTarget(config, status, sortedPathList.GetCommonDirectory(), bUpdate, sUUID, arExtPaths, true, depth, bShowIgnoresRight))
523 bRet = FALSE;
526 else
528 for(int nTarget = 0; nTarget < m_nTargetCount; nTarget++)
530 // check whether the path we want the status for is already fetched due to status-fetching
531 // of a parent path.
532 // this check is only done for file paths, because folder paths could be included already
533 // but not recursively
534 if (sortedPathList[nTarget].IsDirectory() || GetListEntry(sortedPathList[nTarget]) == NULL)
536 if(!FetchStatusForSingleTarget(config, status, sortedPathList[nTarget], bUpdate, sUUID,
537 arExtPaths, false, git_depth_infinity, bShowIgnores))
539 bRet = FALSE;
545 // remove the 'helper' files of conflicted items from the list.
546 // otherwise they would appear as unversioned files.
547 for (INT_PTR cind = 0; cind < m_ConflictFileList.GetCount(); ++cind)
549 for (size_t i=0; i < m_arStatusArray.size(); i++)
551 if (m_arStatusArray[i]->GetPath().IsEquivalentTo(m_ConflictFileList[cind]))
553 delete m_arStatusArray[i];
554 m_arStatusArray.erase(m_arStatusArray.begin()+i);
555 break;
559 refetchcounter++;
560 } while(!BuildStatistics() && (refetchcounter < 2) && (*m_pbCanceled==false));
562 m_bBlock = FALSE;
563 m_bBusy = false;
564 GetCursorPos(&pt);
565 SetCursorPos(pt.x, pt.y);
566 return bRet;
567 #endif
568 BuildStatistics();
569 return TRUE;
572 // Get the show-flags bitmap value which corresponds to a particular Git status
573 DWORD CGitStatusListCtrl::GetShowFlagsFromGitStatus(git_wc_status_kind status)
575 switch (status)
577 case git_wc_status_none:
578 case git_wc_status_unversioned:
579 return GITSLC_SHOWUNVERSIONED;
580 case git_wc_status_ignored:
581 if (!m_bShowIgnores)
582 return GITSLC_SHOWDIRECTS;
583 return GITSLC_SHOWDIRECTS|GITSLC_SHOWIGNORED;
584 case git_wc_status_incomplete:
585 return GITSLC_SHOWINCOMPLETE;
586 case git_wc_status_normal:
587 return GITSLC_SHOWNORMAL;
588 case git_wc_status_external:
589 return GITSLC_SHOWEXTERNAL;
590 case git_wc_status_added:
591 return GITSLC_SHOWADDED;
592 case git_wc_status_missing:
593 return GITSLC_SHOWMISSING;
594 case git_wc_status_deleted:
595 return GITSLC_SHOWREMOVED;
596 case git_wc_status_replaced:
597 return GITSLC_SHOWREPLACED;
598 case git_wc_status_modified:
599 return GITSLC_SHOWMODIFIED;
600 case git_wc_status_merged:
601 return GITSLC_SHOWMERGED;
602 case git_wc_status_conflicted:
603 return GITSLC_SHOWCONFLICTED;
604 case git_wc_status_obstructed:
605 return GITSLC_SHOWOBSTRUCTED;
606 default:
607 // we should NEVER get here!
608 ASSERT(FALSE);
609 break;
611 return 0;
614 void CGitStatusListCtrl::Show(unsigned int dwShow, unsigned int dwCheck /*=0*/, bool /*bShowFolders*/ /* = true */,BOOL UpdateStatusList,bool UseStoredCheckStatus)
616 m_bBusy = true;
617 m_bEmpty = false;
618 Invalidate();
620 CWinApp * pApp = AfxGetApp();
621 if (pApp)
622 pApp->DoWaitCursor(1);
624 Locker lock(m_critSec);
625 WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
627 //SetItemCount(listIndex);
628 SetRedraw(FALSE);
629 DeleteAllItems();
630 m_nSelected = 0;
632 m_nShownUnversioned = 0;
633 m_nShownModified = 0;
634 m_nShownAdded = 0;
635 m_nShownDeleted = 0;
636 m_nShownConflicted = 0;
637 m_nShownFiles = 0;
638 m_nShownSubmodules = 0;
640 m_dwShow = dwShow;
642 if(UpdateStatusList)
644 m_arStatusArray.clear();
645 for (int i = 0; i < m_StatusFileList.GetCount(); ++i)
647 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
650 for (int i = 0; i < m_UnRevFileList.GetCount(); ++i)
652 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
655 for (int i = 0; i < m_IgnoreFileList.GetCount(); ++i)
657 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
660 PrepareGroups();
661 if (m_nSortedColumn >= 0)
663 CSorter predicate (&m_ColumnManager, m_nSortedColumn, m_bAscending);
664 std::sort(m_arStatusArray.begin(), m_arStatusArray.end(), predicate);
667 int index =0;
668 for (size_t i = 0; i < m_arStatusArray.size(); ++i)
670 //set default checkbox status
671 CTGitPath* entry = ((CTGitPath*)m_arStatusArray[i]);
672 CString path = entry->GetGitPathString();
673 if (!m_mapFilenameToChecked.empty() && m_mapFilenameToChecked.find(path) != m_mapFilenameToChecked.end())
675 entry->m_Checked=m_mapFilenameToChecked[path];
677 else if (!UseStoredCheckStatus)
679 bool autoSelectSubmodules = !(entry->IsDirectory() && m_bDoNotAutoselectSubmodules);
680 if (((entry->m_Action & dwCheck) && !(m_bNoAutoselectMissing && entry->m_Action & CTGitPath::LOGACTIONS_MISSING) || dwShow & GITSLC_SHOWDIRECTFILES && m_mapDirectFiles.find(path) != m_mapDirectFiles.end()) && autoSelectSubmodules)
681 entry->m_Checked=true;
682 else
683 entry->m_Checked=false;
684 m_mapFilenameToChecked[path] = entry->m_Checked;
687 if(entry->m_Action & dwShow)
689 AddEntry(entry,langID,index);
690 index++;
694 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
695 for (int col = 0; col <= maxcol; col++)
696 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
698 SetRedraw(TRUE);
699 GetStatisticsString();
701 CHeaderCtrl * pHeader = GetHeaderCtrl();
702 HDITEM HeaderItem = {0};
703 HeaderItem.mask = HDI_FORMAT;
704 for (int i=0; i<pHeader->GetItemCount(); ++i)
706 pHeader->GetItem(i, &HeaderItem);
707 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
708 pHeader->SetItem(i, &HeaderItem);
710 if (m_nSortedColumn >= 0)
712 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
713 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
714 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
717 #if 0
718 if (nSelectedEntry)
720 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
721 EnsureVisible(nSelectedEntry, false);
723 else
725 // Restore the item at the top of the list.
726 for (int i=0;GetTopIndex() != nTopIndex;i++)
728 if ( !EnsureVisible(nTopIndex+i,false) )
730 break;
734 #endif
735 if (pApp)
736 pApp->DoWaitCursor(-1);
738 m_bBusy = false;
739 m_bEmpty = (GetItemCount() == 0);
740 Invalidate();
742 this->BuildStatistics();
744 #if 0
746 CWinApp * pApp = AfxGetApp();
747 if (pApp)
748 pApp->DoWaitCursor(1);
750 m_bShowFolders = bShowFolders;
752 int nTopIndex = GetTopIndex();
753 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
754 int nSelectedEntry = 0;
755 if (posSelectedEntry)
756 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
757 SetRedraw(FALSE);
758 DeleteAllItems();
760 PrepareGroups();
762 m_arListArray.clear();
764 m_arListArray.reserve(m_arStatusArray.size());
765 SetItemCount (static_cast<int>(m_arStatusArray.size()));
767 int listIndex = 0;
768 for (size_t i=0; i < m_arStatusArray.size(); ++i)
770 FileEntry * entry = m_arStatusArray[i];
771 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
772 continue;
773 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
774 continue;
775 if (entry->IsFolder() && (!bShowFolders))
776 continue; // don't show folders if they're not wanted.
778 #if 0
779 git_wc_status_kind status = GitStatus::GetMoreImportant(entry->status, entry->remotestatus);
780 DWORD showFlags = GetShowFlagsFromGitStatus(status);
781 if (entry->IsLocked())
782 showFlags |= SVNSLC_SHOWLOCKS;
783 if (entry->switched)
784 showFlags |= SVNSLC_SHOWSWITCHED;
785 if (!entry->changelist.IsEmpty())
786 showFlags |= SVNSLC_SHOWINCHANGELIST;
787 #endif
788 bool bAllowCheck = ((entry->changelist.Compare(GITSLC_IGNORECHANGELIST) != 0)
789 && (m_bCheckIfGroupsExist || (m_changelists.empty() || (m_changelists.size() == 1 && m_bHasIgnoreGroup))));
791 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
792 #if 0
793 if (status != Git_wc_status_ignored || (entry->direct) || (dwShow & GitSLC_SHOWIGNORED))
795 if ((!entry->IsFolder()) && (status == Git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
797 if (PathFileExists(entry->GetPath().GetWinPath()))
799 m_arListArray.push_back(i);
800 if ((dwCheck & SVNSLC_SHOWREMOVEDANDPRESENT)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
802 if (bAllowCheck)
803 entry->checked = true;
805 AddEntry(entry, langID, listIndex++);
808 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
810 m_arListArray.push_back(i);
811 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
813 if (bAllowCheck)
814 entry->checked = true;
816 AddEntry(entry, langID, listIndex++);
818 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
820 m_arListArray.push_back(i);
821 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
823 if (bAllowCheck)
824 entry->checked = true;
826 AddEntry(entry, langID, listIndex++);
829 #endif
832 SetItemCount(listIndex);
834 m_ColumnManager.UpdateRelevance (m_arStatusArray, m_arListArray);
836 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
837 for (int col = 0; col <= maxcol; col++)
838 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
840 SetRedraw(TRUE);
841 GetStatisticsString();
843 CHeaderCtrl * pHeader = GetHeaderCtrl();
844 HDITEM HeaderItem = {0};
845 HeaderItem.mask = HDI_FORMAT;
846 for (int i=0; i<pHeader->GetItemCount(); ++i)
848 pHeader->GetItem(i, &HeaderItem);
849 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
850 pHeader->SetItem(i, &HeaderItem);
852 if (m_nSortedColumn)
854 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
855 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
856 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
859 if (nSelectedEntry)
861 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
862 EnsureVisible(nSelectedEntry, false);
864 else
866 // Restore the item at the top of the list.
867 for (int i=0;GetTopIndex() != nTopIndex;i++)
869 if ( !EnsureVisible(nTopIndex+i,false) )
871 break;
876 if (pApp)
877 pApp->DoWaitCursor(-1);
879 m_bEmpty = (GetItemCount() == 0);
880 Invalidate();
881 #endif
885 void CGitStatusListCtrl::Show(unsigned int /*dwShow*/, const CTGitPathList& checkedList, bool /*bShowFolders*/ /* = true */)
887 DeleteAllItems();
888 for (int i = 0; i < checkedList.GetCount(); ++i)
889 this->AddEntry((CTGitPath *)&checkedList[i],0,i);
890 return ;
891 #if 0
893 Locker lock(m_critSec);
894 WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
896 CWinApp * pApp = AfxGetApp();
897 if (pApp)
898 pApp->DoWaitCursor(1);
899 m_dwShow = dwShow;
900 m_bShowFolders = bShowFolders;
901 m_nSelected = 0;
902 int nTopIndex = GetTopIndex();
903 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
904 int nSelectedEntry = 0;
905 if (posSelectedEntry)
906 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
907 SetRedraw(FALSE);
908 DeleteAllItems();
910 PrepareGroups();
912 m_arListArray.clear();
914 m_arListArray.reserve(m_arStatusArray.size());
915 SetItemCount (static_cast<int>(m_arStatusArray.size()));
917 int listIndex = 0;
918 for (size_t i=0; i < m_arStatusArray.size(); ++i)
920 FileEntry * entry = m_arStatusArray[i];
921 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
922 continue;
923 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
924 continue;
925 if (entry->IsFolder() && (!bShowFolders))
926 continue; // don't show folders if they're not wanted.
927 #if 0
928 git_wc_status_kind status = SVNStatus::GetMoreImportant(entry->status, entry->remotestatus);
929 DWORD showFlags = GetShowFlagsFromSVNStatus(status);
930 if (entry->IsLocked())
931 showFlags |= SVNSLC_SHOWLOCKS;
932 if (!entry->changelist.IsEmpty())
933 showFlags |= SVNSLC_SHOWINCHANGELIST;
935 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
936 if (status != git_wc_status_ignored || (entry->direct) || (dwShow & SVNSLC_SHOWIGNORED))
938 for (int npath = 0; npath < checkedList.GetCount(); ++npath)
940 if (entry->GetPath().IsEquivalentTo(checkedList[npath]))
942 entry->checked = true;
943 break;
946 if ((!entry->IsFolder()) && (status == git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
948 if (PathFileExists(entry->GetPath().GetWinPath()))
950 m_arListArray.push_back(i);
951 AddEntry(entry, langID, listIndex++);
954 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
956 m_arListArray.push_back(i);
957 AddEntry(entry, langID, listIndex++);
959 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
961 m_arListArray.push_back(i);
962 AddEntry(entry, langID, listIndex++);
964 else if (entry->switched)
966 m_arListArray.push_back(i);
967 AddEntry(entry, langID, listIndex++);
970 #endif
973 SetItemCount(listIndex);
975 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
976 for (int col = 0; col <= maxcol; col++)
977 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
979 SetRedraw(TRUE);
980 GetStatisticsString();
982 CHeaderCtrl * pHeader = GetHeaderCtrl();
983 HDITEM HeaderItem = {0};
984 HeaderItem.mask = HDI_FORMAT;
985 for (int i=0; i<pHeader->GetItemCount(); ++i)
987 pHeader->GetItem(i, &HeaderItem);
988 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
989 pHeader->SetItem(i, &HeaderItem);
991 if (m_nSortedColumn)
993 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
994 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
995 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
998 if (nSelectedEntry)
1000 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
1001 EnsureVisible(nSelectedEntry, false);
1003 else
1005 // Restore the item at the top of the list.
1006 for (int i=0;GetTopIndex() != nTopIndex;i++)
1008 if ( !EnsureVisible(nTopIndex+i,false) )
1010 break;
1015 if (pApp)
1016 pApp->DoWaitCursor(-1);
1018 m_bEmpty = (GetItemCount() == 0);
1019 Invalidate();
1020 #endif
1023 int CGitStatusListCtrl::GetColumnIndex(int mask)
1025 for (int i = 0; i < 32; ++i)
1026 if(mask&0x1)
1027 return i;
1028 else
1029 mask=mask>>1;
1030 return -1;
1032 void CGitStatusListCtrl::AddEntry(CTGitPath * GitPath, WORD /*langID*/, int listIndex)
1034 static CString from(MAKEINTRESOURCE(IDS_STATUSLIST_FROM));
1035 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
1036 static bool abbreviateRenamings(((DWORD)CRegDWORD(_T("Software\\TortoiseGit\\AbbreviateRenamings"), FALSE)) == TRUE);
1037 static bool relativeTimes = (CRegDWORD(_T("Software\\TortoiseGit\\RelativeTimes"), FALSE) != FALSE);
1039 CString path = GitPath->GetGitPathString();
1041 m_bBlock = TRUE;
1042 int index = listIndex;
1043 int nCol = 1;
1044 CString entryname = GitPath->GetGitPathString();
1045 int icon_idx = 0;
1046 if (GitPath->IsDirectory())
1048 icon_idx = m_nIconFolder;
1049 m_nShownSubmodules++;
1051 else
1053 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(*GitPath);
1054 m_nShownFiles++;
1056 switch (GitPath->m_Action)
1058 case CTGitPath::LOGACTIONS_ADDED:
1059 case CTGitPath::LOGACTIONS_COPY:
1060 m_nShownAdded++;
1061 break;
1062 case CTGitPath::LOGACTIONS_DELETED:
1063 case CTGitPath::LOGACTIONS_MISSING:
1064 case CTGitPath::LOGACTIONS_DELETED | CTGitPath::LOGACTIONS_MISSING:
1065 m_nShownDeleted++;
1066 break;
1067 case CTGitPath::LOGACTIONS_REPLACED:
1068 case CTGitPath::LOGACTIONS_MODIFIED:
1069 case CTGitPath::LOGACTIONS_MERGED:
1070 m_nShownModified++;
1071 break;
1072 case CTGitPath::LOGACTIONS_UNMERGED:
1073 m_nShownConflicted++;
1074 break;
1075 case CTGitPath::LOGACTIONS_UNVER:
1076 m_nShownUnversioned++;
1077 break;
1078 default:
1079 m_nShownUnversioned++;
1080 break;
1082 if(GitPath->m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY) && !GitPath->GetGitOldPathString().IsEmpty())
1084 if (!abbreviateRenamings)
1086 // relative path
1087 CString rename;
1088 rename.Format(from, (LPCTSTR)GitPath->GetGitOldPathString());
1089 entryname += _T(" ") + rename;
1091 else
1093 CTGitPathList tgpl;
1094 tgpl.AddPath(*GitPath);
1095 CTGitPath old(GitPath->GetGitOldPathString());
1096 tgpl.AddPath(old);
1097 CString commonRoot = tgpl.GetCommonRoot().GetGitPathString();
1098 if (!commonRoot.IsEmpty())
1099 commonRoot += _T("/");
1100 if (old.GetFileOrDirectoryName() == GitPath->GetFileOrDirectoryName() && old.GetContainingDirectory().GetGitPathString() != "" && GitPath->GetContainingDirectory().GetGitPathString())
1102 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();
1104 else if (!commonRoot.IsEmpty())
1106 entryname = commonRoot + _T("{") + GitPath->GetGitOldPathString().Mid(commonRoot.GetLength()) + _T(" => ") + GitPath->GetGitPathString().Mid(commonRoot.GetLength()) + _T("}");
1108 else
1110 entryname = GitPath->GetGitOldPathString().Mid(commonRoot.GetLength()) + _T(" => ") + GitPath->GetGitPathString().Mid(commonRoot.GetLength());
1115 InsertItem(index, entryname, icon_idx);
1116 if (m_restorepaths.find(GitPath->GetWinPathString()) != m_restorepaths.end())
1117 SetItemState(index, INDEXTOOVERLAYMASK(OVL_RESTORE), TVIS_OVERLAYMASK);
1119 this->SetItemData(index, (DWORD_PTR)GitPath);
1120 // SVNSLC_COLFILENAME
1121 SetItemText(index, nCol++, GitPath->GetFileOrDirectoryName());
1122 // SVNSLC_COLEXT
1123 SetItemText(index, nCol++, GitPath->GetFileExtension());
1124 // SVNSLC_COLSTATUS
1125 SetItemText(index, nCol++, GitPath->GetActionName());
1127 SetItemText(index, GetColumnIndex(GITSLC_COLADD),GitPath->m_StatAdd);
1128 SetItemText(index, GetColumnIndex(GITSLC_COLDEL),GitPath->m_StatDel);
1131 CString modificationDate;
1132 __int64 filetime = GitPath->GetLastWriteTime();
1133 if (filetime && !(GitPath->m_Action & CTGitPath::LOGACTIONS_DELETED))
1135 FILETIME* f = (FILETIME*)(__int64*)&filetime;
1136 modificationDate = CLoglistUtils::FormatDateAndTime(CTime(CGit::filetime_to_time_t(f)), DATE_SHORTDATE, true, relativeTimes);
1138 SetItemText(index, GetColumnIndex(GITSLC_COLMODIFICATIONDATE), modificationDate);
1140 // SVNSLC_COLSIZE
1141 if (GitPath->IsDirectory())
1142 SetItemText(index, GetColumnIndex(GITSLC_COLSIZE), _T(""));
1143 else
1145 TCHAR buf[100] = { 0 };
1146 StrFormatByteSize64(GitPath->GetFileSize(), buf, 100);
1147 SetItemText(index, GetColumnIndex(GITSLC_COLSIZE), buf);
1150 SetCheck(index, GitPath->m_Checked);
1151 if (GitPath->m_Checked)
1152 m_nSelected++;
1154 if ((GitPath->m_Action & CTGitPath::LOGACTIONS_SKIPWORKTREE) || (GitPath->m_Action & CTGitPath::LOGACTIONS_ASSUMEVALID))
1155 SetItemGroup(index, 3);
1156 else if (GitPath->m_Action & CTGitPath::LOGACTIONS_IGNORE)
1157 SetItemGroup(index, 2);
1158 else if( GitPath->m_Action & CTGitPath::LOGACTIONS_UNVER)
1159 SetItemGroup(index,1);
1160 else
1162 SetItemGroup(index, GitPath->m_ParentNo&(PARENT_MASK|MERGE_MASK));
1165 m_bBlock = FALSE;
1170 bool CGitStatusListCtrl::SetItemGroup(int item, int groupindex)
1172 // if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS) == NULL)
1173 // return false;
1174 if (groupindex < 0)
1175 return false;
1176 LVITEM i = {0};
1177 i.mask = LVIF_GROUPID;
1178 i.iItem = item;
1179 i.iSubItem = 0;
1180 i.iGroupId = groupindex;
1182 return !!SetItem(&i);
1185 void CGitStatusListCtrl::OnHdnItemclick(NMHDR *pNMHDR, LRESULT *pResult)
1187 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
1188 *pResult = 0;
1189 if (m_bBlock || m_arStatusArray.empty())
1190 return;
1191 m_bBlock = TRUE;
1192 if (m_nSortedColumn == phdr->iItem)
1193 m_bAscending = !m_bAscending;
1194 else
1195 m_bAscending = TRUE;
1196 m_nSortedColumn = phdr->iItem;
1197 Show(m_dwShow, 0, m_bShowFolders,false,true);
1199 m_bBlock = FALSE;
1202 void CGitStatusListCtrl::OnLvnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
1204 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1205 *pResult = 0;
1207 #define ISCHECKED(x) ((x) ? ((((x)&LVIS_STATEIMAGEMASK)>>12)-1) : FALSE)
1208 if ((m_bBlock)&&(m_bBlockUI))
1210 // if we're blocked, prevent changing of the check state
1211 if ((!ISCHECKED(pNMLV->uOldState) && ISCHECKED(pNMLV->uNewState))||
1212 (ISCHECKED(pNMLV->uOldState) && !ISCHECKED(pNMLV->uNewState)))
1213 *pResult = TRUE;
1217 BOOL CGitStatusListCtrl::OnLvnItemchanged(NMHDR *pNMHDR, LRESULT *pResult)
1219 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1220 *pResult = 0;
1221 CWnd* pParent = GetLogicalParent();
1222 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
1224 pParent->SendMessage(GITSLNM_ITEMCHANGED, pNMLV->iItem);
1227 if ((pNMLV->uNewState==0)||(pNMLV->uNewState & LVIS_SELECTED)||(pNMLV->uNewState & LVIS_FOCUSED))
1228 return FALSE;
1230 if (m_bBlock)
1231 return FALSE;
1233 bool bSelected = !!(ListView_GetItemState(m_hWnd, pNMLV->iItem, LVIS_SELECTED) & LVIS_SELECTED);
1234 int nListItems = GetItemCount();
1236 m_bBlock = TRUE;
1237 // was the item checked?
1239 //CTGitPath *gitpath=(CTGitPath*)GetItemData(pNMLV->iItem);
1240 //gitpath->m_Checked=GetCheck(pNMLV->iItem);
1242 if (GetCheck(pNMLV->iItem))
1244 CheckEntry(pNMLV->iItem, nListItems);
1245 if (bSelected)
1247 POSITION pos = GetFirstSelectedItemPosition();
1248 int index;
1249 while ((index = GetNextSelectedItem(pos)) >= 0)
1251 if (index != pNMLV->iItem)
1252 CheckEntry(index, nListItems);
1256 else
1258 UncheckEntry(pNMLV->iItem, nListItems);
1259 if (bSelected)
1261 POSITION pos = GetFirstSelectedItemPosition();
1262 int index;
1263 while ((index = GetNextSelectedItem(pos)) >= 0)
1265 if (index != pNMLV->iItem)
1266 UncheckEntry(index, nListItems);
1271 GetStatisticsString();
1272 m_bBlock = FALSE;
1273 NotifyCheck();
1275 return FALSE;
1278 void CGitStatusListCtrl::OnColumnResized(NMHDR *pNMHDR, LRESULT *pResult)
1280 m_ColumnManager.OnColumnResized(pNMHDR,pResult);
1282 *pResult = FALSE;
1285 void CGitStatusListCtrl::OnColumnMoved(NMHDR *pNMHDR, LRESULT *pResult)
1287 m_ColumnManager.OnColumnMoved(pNMHDR, pResult);
1289 Invalidate(FALSE);
1292 void CGitStatusListCtrl::CheckEntry(int index, int /*nListItems*/)
1294 Locker lock(m_critSec);
1295 //FileEntry * entry = GetListEntry(index);
1296 CTGitPath *path=(CTGitPath*)GetItemData(index);
1297 ASSERT(path != NULL);
1298 if (path == NULL)
1299 return;
1300 m_mapFilenameToChecked[path->GetGitPathString()] = true;
1301 SetCheck(index, TRUE);
1302 //entry = GetListEntry(index);
1303 // if an unversioned item was checked, then we need to check if
1304 // the parent folders are unversioned too. If the parent folders actually
1305 // are unversioned, then check those too.
1306 #if 0
1307 if (entry->status == git_wc_status_unversioned)
1309 // we need to check the parent folder too
1310 const CTGitPath& folderpath = entry->path;
1311 for (int i=0; i< nListItems; ++i)
1313 FileEntry * testEntry = GetListEntry(i);
1314 ASSERT(testEntry != NULL);
1315 if (testEntry == NULL)
1316 continue;
1317 if (!testEntry->checked)
1319 if (testEntry->path.IsAncestorOf(folderpath) && (!testEntry->path.IsEquivalentTo(folderpath)))
1321 SetEntryCheck(testEntry,i,true);
1322 m_nSelected++;
1327 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1328 if ( (entry->status == git_wc_status_deleted) || (m_bCheckChildrenWithParent) || (bShift) )
1330 // if a deleted folder gets checked, we have to check all
1331 // children of that folder too.
1332 if (entry->path.IsDirectory())
1334 SetCheckOnAllDescendentsOf(entry, true);
1337 // if a deleted file or folder gets checked, we have to
1338 // check all parents of this item too.
1339 for (int i=0; i<nListItems; ++i)
1341 FileEntry * testEntry = GetListEntry(i);
1342 ASSERT(testEntry != NULL);
1343 if (testEntry == NULL)
1344 continue;
1345 if (!testEntry->checked)
1347 if (testEntry->path.IsAncestorOf(entry->path) && (!testEntry->path.IsEquivalentTo(entry->path)))
1349 if ((testEntry->status == git_wc_status_deleted)||(m_bCheckChildrenWithParent))
1351 SetEntryCheck(testEntry,i,true);
1352 m_nSelected++;
1353 // now we need to check all children of this parent folder
1354 SetCheckOnAllDescendentsOf(testEntry, true);
1360 #endif
1361 if ( !path->m_Checked )
1363 path->m_Checked = TRUE;
1364 m_nSelected++;
1368 void CGitStatusListCtrl::UncheckEntry(int index, int /*nListItems*/)
1370 Locker lock(m_critSec);
1371 CTGitPath *path=(CTGitPath*)GetItemData(index);
1372 ASSERT(path != NULL);
1373 if (path == NULL)
1374 return;
1375 SetCheck(index, FALSE);
1376 m_mapFilenameToChecked[path->GetGitPathString()] = false;
1377 //entry = GetListEntry(index);
1378 // item was unchecked
1379 #if 0
1380 if (entry->path.IsDirectory())
1382 // disable all files within an unselected folder, except when unchecking a folder with property changes
1383 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1384 if ( (entry->status != git_wc_status_modified) || (bShift) )
1386 SetCheckOnAllDescendentsOf(entry, false);
1389 else if (entry->status == git_wc_status_deleted)
1391 // a "deleted" file was unchecked, so uncheck all parent folders
1392 // and all children of those parents
1393 for (int i=0; i<nListItems; i++)
1395 FileEntry * testEntry = GetListEntry(i);
1396 ASSERT(testEntry != NULL);
1397 if (testEntry == NULL)
1398 continue;
1399 if (testEntry->checked)
1401 if (testEntry->path.IsAncestorOf(entry->path))
1403 if (testEntry->status == git_wc_status_deleted)
1405 SetEntryCheck(testEntry,i,false);
1406 m_nSelected--;
1408 SetCheckOnAllDescendentsOf(testEntry, false);
1414 #endif
1415 if ( path->m_Checked )
1417 path->m_Checked = FALSE;
1418 m_nSelected--;
1421 bool CGitStatusListCtrl::BuildStatistics()
1424 bool bRefetchStatus = false;
1426 // now gather some statistics
1427 m_nUnversioned = 0;
1428 m_nNormal = 0;
1429 m_nModified = 0;
1430 m_nAdded = 0;
1431 m_nDeleted = 0;
1432 m_nConflicted = 0;
1433 m_nTotal = 0;
1434 m_nSelected = 0;
1435 m_nLineAdded = 0;
1436 m_nLineDeleted = 0;
1437 m_nRenamed = 0;
1439 for (size_t i = 0; i < m_arStatusArray.size(); ++i)
1441 int status=((CTGitPath*)m_arStatusArray[i])->m_Action;
1443 m_nLineAdded += _tstol(((CTGitPath*)m_arStatusArray[i])->m_StatAdd);
1444 m_nLineDeleted += _tstol(((CTGitPath*)m_arStatusArray[i])->m_StatDel);
1446 if(status&(CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))
1447 m_nAdded++;
1449 if(status&CTGitPath::LOGACTIONS_DELETED)
1450 m_nDeleted++;
1452 if(status&(CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_MODIFIED))
1453 m_nModified++;
1455 if(status&CTGitPath::LOGACTIONS_UNMERGED)
1456 m_nConflicted++;
1458 if(status&(CTGitPath::LOGACTIONS_IGNORE|CTGitPath::LOGACTIONS_UNVER))
1459 m_nUnversioned++;
1461 if(status&(CTGitPath::LOGACTIONS_REPLACED))
1462 m_nRenamed++;
1464 if(((CTGitPath*)m_arStatusArray[i])->m_Checked)
1465 m_nSelected++;
1467 return !bRefetchStatus;
1471 int CGitStatusListCtrl::GetGroupFromPoint(POINT * ppt)
1473 // the point must be relative to the upper left corner of the control
1475 if (ppt == NULL)
1476 return -1;
1477 if (!IsGroupViewEnabled())
1478 return -1;
1480 POINT pt = *ppt;
1481 pt.x = 10;
1482 UINT flags = 0;
1483 int nItem = -1;
1484 RECT rc;
1485 GetWindowRect(&rc);
1486 while (((flags & LVHT_BELOW) == 0)&&(pt.y < rc.bottom))
1488 nItem = HitTest(pt, &flags);
1489 if ((flags & LVHT_ONITEM)||(flags & LVHT_EX_GROUP_HEADER))
1491 // the first item below the point
1493 // check if the point is too much right (i.e. if the point
1494 // is farther to the right than the width of the item)
1495 RECT r;
1496 GetItemRect(nItem, &r, LVIR_LABEL);
1497 if (ppt->x > r.right)
1498 return -1;
1500 LVITEM lv = {0};
1501 lv.mask = LVIF_GROUPID;
1502 lv.iItem = nItem;
1503 GetItem(&lv);
1504 int groupID = lv.iGroupId;
1505 // now we search upwards and check if the item above this one
1506 // belongs to another group. If it belongs to the same group,
1507 // we're not over a group header
1508 while (pt.y >= 0)
1510 pt.y -= 2;
1511 nItem = HitTest(pt, &flags);
1512 if ((flags & LVHT_ONITEM)&&(nItem >= 0))
1514 // the first item below the point
1515 LVITEM lv2 = {0};
1516 lv2.mask = LVIF_GROUPID;
1517 lv2.iItem = nItem;
1518 GetItem(&lv2);
1519 if (lv2.iGroupId != groupID)
1520 return groupID;
1521 else
1522 return -1;
1525 if (pt.y < 0)
1526 return groupID;
1527 return -1;
1529 pt.y += 2;
1531 return -1;
1534 void CGitStatusListCtrl::OnContextMenuGroup(CWnd * /*pWnd*/, CPoint point)
1536 POINT clientpoint = point;
1537 ScreenToClient(&clientpoint);
1538 if ((IsGroupViewEnabled())&&(GetGroupFromPoint(&clientpoint) >= 0))
1540 CMenu popup;
1541 if (popup.CreatePopupMenu())
1543 CString temp;
1544 temp.LoadString(IDS_STATUSLIST_CHECKGROUP);
1545 popup.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_CHECKGROUP, temp);
1546 temp.LoadString(IDS_STATUSLIST_UNCHECKGROUP);
1547 popup.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_UNCHECKGROUP, temp);
1548 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1549 bool bCheck = false;
1550 switch (cmd)
1552 case IDGITLC_CHECKGROUP:
1553 bCheck = true;
1554 // fall through here
1555 case IDGITLC_UNCHECKGROUP:
1557 int group = GetGroupFromPoint(&clientpoint);
1558 // go through all items and check/uncheck those assigned to the group
1559 // but block the OnLvnItemChanged handler
1560 m_bBlock = true;
1561 LVITEM lv;
1562 for (int i=0; i<GetItemCount(); ++i)
1564 SecureZeroMemory(&lv, sizeof(LVITEM));
1565 lv.mask = LVIF_GROUPID;
1566 lv.iItem = i;
1567 GetItem(&lv);
1569 if (lv.iGroupId == group)
1571 CTGitPath * entry = (CTGitPath*)GetItemData(i);
1572 if (entry)
1574 bool bOldCheck = entry->m_Checked;
1575 SetEntryCheck(entry, i, bCheck);
1576 if (bCheck != bOldCheck)
1578 if (bCheck)
1579 m_nSelected++;
1580 else
1581 m_nSelected--;
1587 GetStatisticsString();
1588 NotifyCheck();
1589 m_bBlock = false;
1591 break;
1597 void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
1600 //WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
1602 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1603 CTGitPath * filepath;
1605 int selIndex = GetSelectionMark();
1606 if ((point.x == -1) && (point.y == -1))
1608 CRect rect;
1609 GetItemRect(selIndex, &rect, LVIR_LABEL);
1610 ClientToScreen(&rect);
1611 point = rect.CenterPoint();
1613 if ((GetSelectedCount() == 0) && (m_bHasCheckboxes))
1615 // nothing selected could mean the context menu is requested for
1616 // a group header
1617 OnContextMenuGroup(pWnd, point);
1619 else if (selIndex >= 0)
1621 //FileEntry * entry = GetListEntry(selIndex);
1623 filepath = (CTGitPath * )GetItemData(selIndex);
1625 ASSERT(filepath != NULL);
1626 if (filepath == NULL)
1627 return;
1629 //const CTGitPath& filepath = entry->path;
1630 int wcStatus = filepath->m_Action;
1631 // entry is selected, now show the popup menu
1632 Locker lock(m_critSec);
1633 CIconMenu popup;
1634 CMenu changelistSubMenu;
1635 CMenu ignoreSubMenu;
1636 CMenu shellMenu;
1637 if (popup.CreatePopupMenu())
1639 //Add Menu for version controlled file
1641 if (GetSelectedCount() > 0 && wcStatus & CTGitPath::LOGACTIONS_UNMERGED)
1643 if (GetSelectedCount() == 1 && (m_dwContextMenus & GITSLC_POPCONFLICT)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1645 popup.AppendMenuIcon(IDGITLC_EDITCONFLICT, IDS_MENUCONFLICT, IDI_CONFLICT);
1647 if (m_dwContextMenus & GITSLC_POPRESOLVE)
1649 popup.AppendMenuIcon(IDGITLC_RESOLVECONFLICT, IDS_STATUSLIST_CONTEXT_RESOLVED, IDI_RESOLVE);
1651 if ((m_dwContextMenus & GITSLC_POPRESOLVE)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1653 popup.AppendMenuIcon(IDGITLC_RESOLVETHEIRS, IDS_SVNPROGRESS_MENUUSETHEIRS, IDI_RESOLVE);
1654 popup.AppendMenuIcon(IDGITLC_RESOLVEMINE, IDS_SVNPROGRESS_MENUUSEMINE, IDI_RESOLVE);
1656 if ((m_dwContextMenus & GITSLC_POPCONFLICT)||(m_dwContextMenus & GITSLC_POPRESOLVE))
1657 popup.AppendMenu(MF_SEPARATOR);
1660 if (GetSelectedCount() > 0)
1662 if (wcStatus & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE))
1664 if (m_dwContextMenus & GITSLC_POPADD)
1666 //if ( entry->IsFolder() )
1668 // popup.AppendMenuIcon(IDSVNLC_ADD_RECURSIVE, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE, IDI_ADD);
1670 //else
1672 popup.AppendMenuIcon(IDGITLC_ADD, IDS_STATUSLIST_CONTEXT_ADD, IDI_ADD);
1675 if (m_dwContextMenus & GITSLC_POPCOMMIT)
1677 popup.AppendMenuIcon(IDGITLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);
1682 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)
1684 bool bEntryAdded = false;
1685 if (m_dwContextMenus & GITSLC_POPCOMPAREWITHBASE)
1687 if(filepath->m_ParentNo & MERGE_MASK)
1688 popup.AppendMenuIcon(IDGITLC_COMPARE, IDS_TREE_DIFF, IDI_DIFF);
1689 else
1690 popup.AppendMenuIcon(IDGITLC_COMPARE, IDS_LOG_COMPAREWITHBASE, IDI_DIFF);
1692 popup.SetDefaultItem(IDGITLC_COMPARE, FALSE);
1693 bEntryAdded = true;
1696 if (!g_Git.IsInitRepos() && (m_dwContextMenus & GITSLC_POPGNUDIFF))
1698 popup.AppendMenuIcon(IDGITLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1699 bEntryAdded = true;
1702 if ((m_dwContextMenus & this->GetContextMenuBit(IDGITLC_COMPAREWC)) && m_bHasWC)
1704 if ((!m_CurrentVersion.IsEmpty()) && m_CurrentVersion != GIT_REV_ZERO)
1706 popup.AppendMenuIcon(IDGITLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
1707 bEntryAdded = true;
1711 if (bEntryAdded)
1712 popup.AppendMenu(MF_SEPARATOR);
1715 if (!m_Rev1.IsEmpty() && !m_Rev2.IsEmpty())
1717 if(GetSelectedCount() == 1)
1719 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_COMPARETWOREVISIONS))
1721 popup.AppendMenuIcon(IDGITLC_COMPARETWOREVISIONS, IDS_LOG_POPUP_COMPARETWO, IDI_DIFF);
1722 popup.SetDefaultItem(IDGITLC_COMPARETWOREVISIONS, FALSE);
1724 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_GNUDIFF2REVISIONS))
1726 popup.AppendMenuIcon(IDGITLC_GNUDIFF2REVISIONS, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1731 //Select Multi item
1732 if (GetSelectedCount() > 0)
1734 if ((GetSelectedCount() == 2) && (m_dwContextMenus & GITSLC_POPCOMPARETWOFILES) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO))
1736 POSITION pos = GetFirstSelectedItemPosition();
1737 int index = GetNextSelectedItem(pos);
1738 if (index >= 0)
1740 CTGitPath * entry2 = NULL;
1741 entry2 = (CTGitPath*)GetItemData(index);
1742 bool firstEntryExistsAndIsFile = entry2 && !entry2->IsDirectory();
1743 index = GetNextSelectedItem(pos);
1744 if (index >= 0)
1746 entry2 = (CTGitPath * )GetItemData(index);
1747 if (firstEntryExistsAndIsFile && entry2 && !entry2->IsDirectory())
1748 popup.AppendMenuIcon(IDGITLC_COMPARETWOFILES, IDS_STATUSLIST_CONTEXT_COMPARETWOFILES, IDI_DIFF);
1754 if ( (GetSelectedCount() >0 ) && (!(wcStatus & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE))) && m_bHasWC)
1756 if ((m_dwContextMenus & GITSLC_POPCOMMIT) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO) && !(wcStatus & (CTGitPath::LOGACTIONS_SKIPWORKTREE | CTGitPath::LOGACTIONS_ASSUMEVALID)))
1758 popup.AppendMenuIcon(IDGITLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);
1761 if ((m_dwContextMenus & GITSLC_POPREVERT) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO))
1763 popup.AppendMenuIcon(IDGITLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
1766 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)))
1768 popup.AppendMenuIcon(IDGITLC_SKIPWORKTREE, IDS_STATUSLIST_SKIPWORKTREE);
1771 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)))
1773 popup.AppendMenuIcon(IDGITLC_ASSUMEVALID, IDS_MENUASSUMEVALID);
1776 if ((m_dwContextMenus & GITLC_POPUNSETIGNORELOCALCHANGES) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO) && (wcStatus & (CTGitPath::LOGACTIONS_SKIPWORKTREE | CTGitPath::LOGACTIONS_ASSUMEVALID)))
1778 popup.AppendMenuIcon(IDGITLC_UNSETIGNORELOCALCHANGES, IDS_STATUSLIST_UNSETIGNORELOCALCHANGES);
1781 if (m_dwContextMenus & GITSLC_POPRESTORE && !filepath->IsDirectory())
1783 if (m_restorepaths.find(filepath->GetWinPathString()) == m_restorepaths.end())
1784 popup.AppendMenuIcon(IDGITLC_CREATERESTORE, IDS_MENUCREATERESTORE, IDI_RESTORE);
1785 else
1786 popup.AppendMenuIcon(IDGITLC_RESTOREPATH, IDS_MENURESTORE, IDI_RESTORE);
1789 if ((m_dwContextMenus & GetContextMenuBit(IDGITLC_REVERTTOREV)) && ( !this->m_CurrentVersion.IsEmpty() )
1790 && this->m_CurrentVersion != GIT_REV_ZERO && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1792 popup.AppendMenuIcon(IDGITLC_REVERTTOREV, IDS_LOG_POPUP_REVERTTOREV, IDI_REVERT);
1795 if ((m_dwContextMenus & GetContextMenuBit(IDGITLC_REVERTTOPARENT)) && ( !this->m_CurrentVersion.IsEmpty() )
1796 && this->m_CurrentVersion != GIT_REV_ZERO && !(wcStatus & CTGitPath::LOGACTIONS_ADDED))
1798 popup.AppendMenuIcon(IDGITLC_REVERTTOPARENT, IDS_LOG_POPUP_REVERTTOPARENT, IDI_REVERT);
1802 if ((GetSelectedCount() == 1)&&(!(wcStatus & CTGitPath::LOGACTIONS_UNVER))
1803 &&(!(wcStatus & CTGitPath::LOGACTIONS_IGNORE)))
1805 if (m_dwContextMenus & GITSLC_POPSHOWLOG)
1807 popup.AppendMenuIcon(IDGITLC_LOG, IDS_REPOBROWSE_SHOWLOG, IDI_LOG);
1809 if (m_dwContextMenus & GITSLC_POPSHOWLOGSUBMODULE && filepath->IsDirectory())
1811 popup.AppendMenuIcon(IDGITLC_LOGSUBMODULE, IDS_LOG_SUBMODULE, IDI_LOG);
1813 if (m_dwContextMenus & GITSLC_POPSHOWLOGOLDNAME && (wcStatus & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY) && !filepath->GetGitOldPathString().IsEmpty()))
1815 popup.AppendMenuIcon(IDGITLC_LOGOLDNAME, IDS_STATUSLIST_SHOWLOGOLDNAME, IDI_LOG);
1817 if (m_dwContextMenus & GITSLC_POPBLAME && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED) && m_bHasWC)
1819 popup.AppendMenuIcon(IDGITLC_BLAME, IDS_MENUBLAME, IDI_BLAME);
1823 if (GetSelectedCount() > 0)
1825 if ((m_dwContextMenus & GetContextMenuBit(IDGITLC_EXPORT)) && !(wcStatus & (CTGitPath::LOGACTIONS_DELETED | CTGitPath::LOGACTIONS_MISSING)))
1826 popup.AppendMenuIcon(IDGITLC_EXPORT, IDS_LOG_POPUP_EXPORT, IDI_EXPORT);
1829 // if ((wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing) && (GetSelectedCount() == 1))
1830 if ( (GetSelectedCount() == 1) )
1832 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_SAVEAS) && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1834 popup.AppendMenuIcon(IDGITLC_SAVEAS, IDS_LOG_POPUP_SAVE, IDI_SAVEAS);
1837 if (m_dwContextMenus & GITSLC_POPOPEN && !filepath->IsDirectory() && !(wcStatus & (CTGitPath::LOGACTIONS_DELETED | CTGitPath::LOGACTIONS_MISSING)))
1839 popup.AppendMenuIcon(IDGITLC_VIEWREV, IDS_LOG_POPUP_VIEWREV);
1840 popup.AppendMenuIcon(IDGITLC_OPEN, IDS_REPOBROWSE_OPEN, IDI_OPEN);
1841 popup.AppendMenuIcon(IDGITLC_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
1842 if (wcStatus & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE)) {
1843 popup.SetDefaultItem(IDGITLC_OPEN, FALSE);
1847 if (m_dwContextMenus & GITSLC_POPEXPLORE && !(wcStatus & CTGitPath::LOGACTIONS_DELETED) && m_bHasWC)
1849 popup.AppendMenuIcon(IDGITLC_EXPLORE, IDS_STATUSLIST_CONTEXT_EXPLORE, IDI_EXPLORER);
1852 if (m_dwContextMenus & GITSLC_PREPAREDIFF && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1854 popup.AppendMenu(MF_SEPARATOR);
1855 popup.AppendMenuIcon(IDGITLC_PREPAREDIFF, IDS_PREPAREDIFF, IDI_DIFF);
1856 if (!m_sMarkForDiffFilename.IsEmpty())
1858 CString diffWith;
1859 if (filepath && filepath->GetGitPathString() == m_sMarkForDiffFilename)
1860 diffWith = m_sMarkForDiffVersion;
1861 else
1863 PathCompactPathEx(CStrBuf(diffWith, 40), m_sMarkForDiffFilename, 40, 0);
1864 diffWith += _T(":") + m_sMarkForDiffVersion.Left(g_Git.GetShortHASHLength());
1866 CString menuEntry;
1867 menuEntry.Format(IDS_MENUDIFFNOW, (LPCTSTR)diffWith);
1868 popup.AppendMenuIcon(IDGITLC_PREPAREDIFF_COMPARE, menuEntry, IDI_DIFF);
1872 if (GetSelectedCount() > 0)
1874 // if (((wcStatus == git_wc_status_unversioned)||(wcStatus == git_wc_status_ignored))&&(m_dwContextMenus & SVNSLC_POPDELETE))
1875 // {
1876 // popup.AppendMenuIcon(IDSVNLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
1877 // }
1878 // 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))
1879 // {
1880 // if (bShift)
1881 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVEKEEP, IDI_DELETE);
1882 // else
1883 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVE, IDI_DELETE);
1884 // }
1885 if ((wcStatus & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE | CTGitPath::LOGACTIONS_MISSING))/*||(wcStatus == git_wc_status_deleted)*/)
1887 if (m_dwContextMenus & GITSLC_POPDELETE)
1889 popup.AppendMenuIcon(IDGITLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
1892 if ( (wcStatus & CTGitPath::LOGACTIONS_UNVER || wcStatus & CTGitPath::LOGACTIONS_DELETED) )
1894 if (m_dwContextMenus & GITSLC_POPIGNORE)
1897 CTGitPathList ignorelist;
1898 FillListOfSelectedItemPaths(ignorelist);
1899 //check if all selected entries have the same extension
1900 bool bSameExt = true;
1901 CString sExt;
1902 for (int i=0; i<ignorelist.GetCount(); ++i)
1904 if (sExt.IsEmpty() && (i==0))
1905 sExt = ignorelist[i].GetFileExtension();
1906 else if (sExt.CompareNoCase(ignorelist[i].GetFileExtension())!=0)
1907 bSameExt = false;
1909 if (bSameExt)
1911 if (ignoreSubMenu.CreateMenu())
1913 CString ignorepath;
1914 if (ignorelist.GetCount()==1)
1915 ignorepath = ignorelist[0].GetFileOrDirectoryName();
1916 else
1917 ignorepath.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
1918 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_IGNORE, ignorepath);
1919 ignorepath = _T("*")+sExt;
1920 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_IGNOREMASK, ignorepath);
1921 if (ignorelist.GetCount() == 1 && !ignorelist[0].GetContainingDirectory().GetGitPathString().IsEmpty())
1922 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_IGNOREFOLDER, ignorelist[0].GetContainingDirectory().GetGitPathString());
1923 CString temp;
1924 temp.LoadString(IDS_MENUIGNORE);
1925 popup.InsertMenu((UINT)-1, MF_BYPOSITION | MF_POPUP, (UINT_PTR)ignoreSubMenu.m_hMenu, temp);
1928 else
1930 CString temp;
1931 if (ignorelist.GetCount()==1)
1933 temp.LoadString(IDS_MENUIGNORE);
1935 else
1937 temp.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
1939 popup.AppendMenuIcon(IDGITLC_IGNORE, temp, IDI_IGNORE);
1940 temp.Format(IDS_MENUIGNOREMULTIPLEMASK, ignorelist.GetCount());
1941 popup.AppendMenuIcon(IDGITLC_IGNOREMASK, temp, IDI_IGNORE);
1949 if (GetSelectedCount() > 0)
1951 popup.AppendMenu(MF_SEPARATOR);
1952 popup.AppendMenuIcon(IDGITLC_COPY, IDS_STATUSLIST_CONTEXT_COPY, IDI_COPYCLIP);
1953 popup.AppendMenuIcon(IDGITLC_COPYEXT, IDS_STATUSLIST_CONTEXT_COPYEXT, IDI_COPYCLIP);
1954 #if 0
1955 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS))
1956 &&(wcStatus != git_wc_status_unversioned)&&(wcStatus != git_wc_status_none))
1958 popup.AppendMenu(MF_SEPARATOR);
1959 // changelist commands
1960 size_t numChangelists = GetNumberOfChangelistsInSelection();
1961 if (numChangelists > 0)
1963 popup.AppendMenuIcon(IDSVNLC_REMOVEFROMCS, IDS_STATUSLIST_CONTEXT_REMOVEFROMCS);
1965 if ((!entry->IsFolder())&&(changelistSubMenu.CreateMenu()))
1967 CString temp;
1968 temp.LoadString(IDS_STATUSLIST_CONTEXT_CREATECS);
1969 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATECS, temp);
1971 if (entry->changelist.Compare(SVNSLC_IGNORECHANGELIST))
1973 changelistSubMenu.AppendMenu(MF_SEPARATOR);
1974 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATEIGNORECS, SVNSLC_IGNORECHANGELIST);
1977 if (!m_changelists.empty())
1979 // find the changelist names
1980 bool bNeedSeparator = true;
1981 int cmdID = IDSVNLC_MOVETOCS;
1982 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
1984 if ((entry->changelist.Compare(it->first))&&(it->first.Compare(SVNSLC_IGNORECHANGELIST)))
1986 if (bNeedSeparator)
1988 changelistSubMenu.AppendMenu(MF_SEPARATOR);
1989 bNeedSeparator = false;
1991 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, cmdID, it->first);
1992 cmdID++;
1996 temp.LoadString(IDS_STATUSLIST_CONTEXT_MOVETOCS);
1997 popup.AppendMenu(MF_POPUP|MF_STRING, (UINT_PTR)changelistSubMenu.GetSafeHmenu(), temp);
2000 #endif
2003 m_hShellMenu = nullptr;
2004 if (pfnSHCreateDefaultContextMenu && pfnAssocCreateForClasses && GetSelectedCount() > 0 && !(wcStatus & (CTGitPath::LOGACTIONS_DELETED | CTGitPath::LOGACTIONS_MISSING)) && m_bHasWC && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO) && shellMenu.CreatePopupMenu())
2006 // insert the shell context menu
2007 popup.AppendMenu(MF_SEPARATOR);
2008 popup.InsertMenu((UINT)-1, MF_BYPOSITION | MF_POPUP, (UINT_PTR)shellMenu.m_hMenu, CString(MAKEINTRESOURCE(IDS_STATUSLIST_CONTEXT_SHELL)));
2009 m_hShellMenu = shellMenu.m_hMenu;
2012 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_RIGHTBUTTON, point.x, point.y, this, 0);
2013 g_IContext2 = nullptr;
2014 g_IContext3 = nullptr;
2015 if (m_pContextMenu)
2017 if (cmd >= SHELL_MIN_CMD && cmd <= SHELL_MAX_CMD) // see if returned idCommand belongs to shell menu entries)
2019 CMINVOKECOMMANDINFOEX cmi = { 0 };
2020 cmi.cbSize = sizeof(CMINVOKECOMMANDINFOEX);
2021 cmi.fMask = CMIC_MASK_UNICODE | CMIC_MASK_PTINVOKE;
2022 if (GetKeyState(VK_CONTROL) < 0)
2023 cmi.fMask |= CMIC_MASK_CONTROL_DOWN;
2024 if (bShift)
2025 cmi.fMask |= CMIC_MASK_SHIFT_DOWN;
2026 cmi.hwnd = m_hWnd;
2027 cmi.lpVerb = MAKEINTRESOURCEA(cmd - SHELL_MIN_CMD);
2028 cmi.lpVerbW = MAKEINTRESOURCEW(cmd - SHELL_MIN_CMD);
2029 cmi.nShow = SW_SHOWNORMAL;
2030 cmi.ptInvoke = point;
2032 m_pContextMenu->InvokeCommand((LPCMINVOKECOMMANDINFO)&cmi);
2034 cmd = 0;
2036 m_pContextMenu->Release();
2037 m_pContextMenu = nullptr;
2039 if (g_pFolderhook)
2041 delete g_pFolderhook;
2042 g_pFolderhook = nullptr;
2044 if (g_psfDesktopFolder)
2046 g_psfDesktopFolder->Release();
2047 g_psfDesktopFolder = nullptr;
2049 for (int i = 0; i < g_pidlArrayItems; i++)
2051 if (g_pidlArray[i])
2052 CoTaskMemFree(g_pidlArray[i]);
2054 if (g_pidlArray)
2055 CoTaskMemFree(g_pidlArray);
2056 g_pidlArray = nullptr;
2057 g_pidlArrayItems = 0;
2059 m_bBlock = TRUE;
2060 AfxGetApp()->DoWaitCursor(1);
2061 //int iItemCountBeforeMenuCmd = GetItemCount();
2062 //bool bForce = false;
2063 switch (cmd)
2065 case IDGITLC_VIEWREV:
2066 OpenFile(filepath, ALTERNATIVEEDITOR);
2067 break;
2069 case IDGITLC_OPEN:
2070 OpenFile(filepath,OPEN);
2071 break;
2073 case IDGITLC_OPENWITH:
2074 OpenFile(filepath,OPEN_WITH);
2075 break;
2077 case IDGITLC_EXPLORE:
2078 CAppUtils::ExploreTo(GetSafeHwnd(), g_Git.CombinePath(filepath));
2079 break;
2081 case IDGITLC_PREPAREDIFF:
2082 if (!filepath)
2083 return;
2084 m_sMarkForDiffFilename = filepath->GetGitPathString();
2085 m_sMarkForDiffVersion = m_CurrentVersion;
2086 break;
2088 case IDGITLC_PREPAREDIFF_COMPARE:
2090 if (!filepath)
2091 return;
2093 CTGitPath savedFile(m_sMarkForDiffFilename);
2094 CGitDiff::Diff(filepath, &savedFile, m_CurrentVersion, m_sMarkForDiffVersion);
2096 break;
2098 case IDGITLC_CREATERESTORE:
2100 POSITION pos = GetFirstSelectedItemPosition();
2101 while (pos)
2103 int index = GetNextSelectedItem(pos);
2104 CTGitPath * entry2 = (CTGitPath * )GetItemData(index);
2105 ASSERT(entry2 != NULL);
2106 if (entry2 == NULL || entry2->IsDirectory())
2107 continue;
2108 if (m_restorepaths.find(entry2->GetWinPathString()) != m_restorepaths.end())
2109 continue;
2110 CTGitPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
2111 // delete the temp file: the temp file has the FILE_ATTRIBUTE_TEMPORARY flag set
2112 // and copying the real file over it would leave that temp flag.
2113 DeleteFile(tempFile.GetWinPath());
2114 if (CopyFile(g_Git.CombinePath(entry2), tempFile.GetWinPath(), FALSE))
2116 m_restorepaths[entry2->GetWinPathString()] = tempFile.GetWinPathString();
2117 SetItemState(index, INDEXTOOVERLAYMASK(OVL_RESTORE), LVIS_OVERLAYMASK);
2120 Invalidate();
2122 break;
2124 case IDGITLC_RESTOREPATH:
2126 if (CMessageBox::Show(m_hWnd, IDS_STATUSLIST_RESTOREPATH, IDS_APPNAME, 2, IDI_QUESTION, IDS_RESTOREBUTTON, IDS_ABORTBUTTON) == 2)
2127 break;
2128 POSITION pos = GetFirstSelectedItemPosition();
2129 while (pos)
2131 int index = GetNextSelectedItem(pos);
2132 CTGitPath * entry2 = (CTGitPath * )GetItemData(index);
2133 ASSERT(entry2 != NULL);
2134 if (entry2 == NULL)
2135 continue;
2136 if (m_restorepaths.find(entry2->GetWinPathString()) == m_restorepaths.end())
2137 continue;
2138 if (CopyFile(m_restorepaths[entry2->GetWinPathString()], g_Git.CombinePath(entry2), FALSE))
2140 m_restorepaths.erase(entry2->GetWinPathString());
2141 SetItemState(index, 0, LVIS_OVERLAYMASK);
2144 Invalidate();
2146 break;
2148 // Compare current version and work copy.
2149 case IDGITLC_COMPAREWC:
2151 if (!CheckMultipleDiffs())
2152 break;
2153 POSITION pos = GetFirstSelectedItemPosition();
2154 while ( pos )
2156 int index = GetNextSelectedItem(pos);
2157 StartDiffWC(index);
2160 break;
2162 // Compare with base version. when current version is zero, compare workcopy and HEAD.
2163 case IDGITLC_COMPARE:
2165 if (!CheckMultipleDiffs())
2166 break;
2167 POSITION pos = GetFirstSelectedItemPosition();
2168 while ( pos )
2170 int index = GetNextSelectedItem(pos);
2171 StartDiff(index);
2174 break;
2176 case IDGITLC_COMPARETWOREVISIONS:
2178 if (!CheckMultipleDiffs())
2179 break;
2180 POSITION pos = GetFirstSelectedItemPosition();
2181 while ( pos )
2183 int index = GetNextSelectedItem(pos);
2184 StartDiffTwo(index);
2187 break;
2189 case IDGITLC_COMPARETWOFILES:
2191 POSITION pos = GetFirstSelectedItemPosition();
2192 CTGitPath * firstfilepath = NULL, * secondfilepath = NULL;
2193 if (pos)
2195 firstfilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
2196 ASSERT(firstfilepath != NULL);
2197 if (firstfilepath == NULL)
2198 break;
2200 secondfilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
2201 ASSERT(secondfilepath != NULL);
2202 if (secondfilepath == NULL)
2203 break;
2205 CString sCmd;
2206 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);
2207 CAppUtils::RunTortoiseGitProc(sCmd);
2210 break;
2212 case IDGITLC_GNUDIFF1:
2214 if (!CheckMultipleDiffs())
2215 break;
2216 POSITION pos = GetFirstSelectedItemPosition();
2217 while (pos)
2219 CTGitPath * selectedFilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
2220 if (m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
2222 CString fromwhere;
2223 if (m_amend)
2224 fromwhere = _T("~1");
2225 CAppUtils::StartShowUnifiedDiff(m_hWnd, *selectedFilepath, GitRev::GetHead() + fromwhere, *selectedFilepath, GitRev::GetWorkingCopy());
2227 else
2229 if ((selectedFilepath->m_ParentNo & (PARENT_MASK | MERGE_MASK)) == 0)
2230 CAppUtils::StartShowUnifiedDiff(m_hWnd, *selectedFilepath, m_CurrentVersion + _T("~1"), *selectedFilepath, m_CurrentVersion);
2231 else
2233 CString str;
2234 if (!(selectedFilepath->m_ParentNo & MERGE_MASK))
2235 str.Format(_T("%s^%d"), (LPCTSTR)m_CurrentVersion, (selectedFilepath->m_ParentNo & PARENT_MASK) + 1);
2237 CAppUtils::StartShowUnifiedDiff(m_hWnd, *selectedFilepath, str, *selectedFilepath, m_CurrentVersion, false, false, false, false, !!(selectedFilepath->m_ParentNo & MERGE_MASK));
2242 break;
2244 case IDGITLC_GNUDIFF2REVISIONS:
2246 CAppUtils::StartShowUnifiedDiff(m_hWnd, *filepath, m_Rev2, *filepath, m_Rev1);
2248 break;
2250 case IDGITLC_ADD:
2252 CTGitPathList paths;
2253 FillListOfSelectedItemPaths(paths, true);
2255 CGitProgressDlg progDlg;
2256 AddProgressCommand addCommand;
2257 progDlg.SetCommand(&addCommand);
2258 addCommand.SetPathList(paths);
2259 progDlg.SetItemCount(paths.GetCount());
2260 progDlg.DoModal();
2262 // reset unchecked status
2263 POSITION pos = GetFirstSelectedItemPosition();
2264 int index;
2265 while ((index = GetNextSelectedItem(pos)) >= 0)
2267 m_mapFilenameToChecked.erase(((CTGitPath*)GetItemData(index))->GetGitPathString());
2270 if (NULL != GetLogicalParent() && NULL != GetLogicalParent()->GetSafeHwnd())
2271 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2273 SetRedraw(TRUE);
2275 break;
2277 case IDGITLC_DELETE:
2278 DeleteSelectedFiles();
2279 break;
2281 case IDGITLC_BLAME:
2283 CAppUtils::LaunchTortoiseBlame(g_Git.CombinePath(filepath), m_CurrentVersion);
2285 break;
2287 case IDGITLC_LOG:
2288 case IDGITLC_LOGSUBMODULE:
2290 CString sCmd;
2291 sCmd.Format(_T("/command:log /path:\"%s\""), (LPCTSTR)g_Git.CombinePath(filepath));
2292 if (cmd == IDGITLC_LOG && filepath->IsDirectory())
2293 sCmd += _T(" /submodule");
2294 if (!m_sDisplayedBranch.IsEmpty())
2295 sCmd += _T(" /range:\"") + m_sDisplayedBranch + _T("\"");
2296 CAppUtils::RunTortoiseGitProc(sCmd, false, !(cmd == IDGITLC_LOGSUBMODULE));
2298 break;
2300 case IDGITLC_LOGOLDNAME:
2302 CTGitPath oldName(filepath->GetGitOldPathString());
2303 CString sCmd;
2304 sCmd.Format(_T("/command:log /path:\"%s\""), (LPCTSTR)g_Git.CombinePath(oldName));
2305 if (!m_sDisplayedBranch.IsEmpty())
2306 sCmd += _T(" /range:\"") + m_sDisplayedBranch + _T("\"");
2307 CAppUtils::RunTortoiseGitProc(sCmd);
2309 break;
2311 case IDGITLC_EDITCONFLICT:
2313 if (CAppUtils::ConflictEdit(*filepath, false, m_bIsRevertTheirMy, GetLogicalParent() ? GetLogicalParent()->GetSafeHwnd() : nullptr))
2315 CString conflictedFile = g_Git.CombinePath(filepath);
2316 if (!PathFileExists(conflictedFile) && NULL != GetLogicalParent() && NULL != GetLogicalParent()->GetSafeHwnd())
2317 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2320 break;
2322 case IDGITLC_RESOLVETHEIRS: //follow up
2323 case IDGITLC_RESOLVEMINE: //follow up
2324 case IDGITLC_RESOLVECONFLICT:
2326 if (CMessageBox::Show(m_hWnd, IDS_PROC_RESOLVE, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO)==IDYES)
2328 POSITION pos = GetFirstSelectedItemPosition();
2329 while (pos != 0)
2331 int index;
2332 index = GetNextSelectedItem(pos);
2333 CTGitPath * fentry =(CTGitPath*) this->GetItemData(index);
2334 if(fentry == NULL)
2335 continue;
2337 CAppUtils::resolve_with resolveWith = CAppUtils::RESOLVE_WITH_CURRENT;
2338 if (((!this->m_bIsRevertTheirMy) && cmd == IDGITLC_RESOLVETHEIRS) || ((this->m_bIsRevertTheirMy) && cmd == IDGITLC_RESOLVEMINE))
2339 resolveWith = CAppUtils::RESOLVE_WITH_THEIRS;
2340 else if (((!this->m_bIsRevertTheirMy) && cmd == IDGITLC_RESOLVEMINE) || ((this->m_bIsRevertTheirMy) && cmd == IDGITLC_RESOLVETHEIRS))
2341 resolveWith = CAppUtils::RESOLVE_WITH_MINE;
2342 if (CAppUtils::ResolveConflict(*fentry, resolveWith) == 0 && fentry->m_Action & CTGitPath::LOGACTIONS_UNMERGED && CRegDWORD(_T("Software\\TortoiseGit\\RefreshFileListAfterResolvingConflict"), TRUE) == TRUE)
2344 CWnd* pParent = GetLogicalParent();
2345 if (pParent && pParent->GetSafeHwnd())
2346 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2347 SetRedraw(TRUE);
2348 break;
2351 Show(m_dwShow, 0, m_bShowFolders,0,true);
2354 break;
2356 case IDGITLC_IGNORE:
2358 CTGitPathList ignorelist;
2359 //std::vector<CString> toremove;
2360 FillListOfSelectedItemPaths(ignorelist, true);
2362 if(!CAppUtils::IgnoreFile(ignorelist,false))
2363 break;
2365 SetRedraw(FALSE);
2366 CWnd* pParent = GetLogicalParent();
2367 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2369 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2371 SetRedraw(TRUE);
2373 break;
2375 case IDGITLC_IGNOREMASK:
2377 CString common;
2378 CString ext=filepath->GetFileExtension();
2379 CTGitPathList ignorelist;
2380 FillListOfSelectedItemPaths(ignorelist, true);
2382 if (!CAppUtils::IgnoreFile(ignorelist,true))
2383 break;
2385 SetRedraw(FALSE);
2386 CWnd* pParent = GetLogicalParent();
2387 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2389 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2392 SetRedraw(TRUE);
2394 break;
2396 case IDGITLC_IGNOREFOLDER:
2398 CTGitPathList ignorelist;
2399 ignorelist.AddPath(filepath->GetContainingDirectory());
2401 if (!CAppUtils::IgnoreFile(ignorelist, false))
2402 break;
2404 SetRedraw(FALSE);
2405 CWnd *pParent = GetLogicalParent();
2406 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2407 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2409 SetRedraw(TRUE);
2411 break;
2412 case IDGITLC_COMMIT:
2414 CTGitPathList targetList;
2415 FillListOfSelectedItemPaths(targetList);
2416 CTGitPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
2417 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
2418 CString commandline = _T("/command:commit /pathfile:\"");
2419 commandline += tempFile.GetWinPathString();
2420 commandline += _T("\"");
2421 commandline += _T(" /deletepathfile");
2422 CAppUtils::RunTortoiseGitProc(commandline);
2424 break;
2425 case IDGITLC_REVERT:
2427 // If at least one item is not in the status "added"
2428 // we ask for a confirmation
2429 BOOL bConfirm = FALSE;
2430 POSITION pos = GetFirstSelectedItemPosition();
2431 int index;
2432 while ((index = GetNextSelectedItem(pos)) >= 0)
2434 //FileEntry * fentry = GetListEntry(index);
2435 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
2436 if(fentry && fentry->m_Action &CTGitPath::LOGACTIONS_MODIFIED && !fentry->IsDirectory())
2438 bConfirm = TRUE;
2439 break;
2443 CString str;
2444 str.Format(IDS_PROC_WARNREVERT,GetSelectedCount());
2446 if (!bConfirm || CMessageBox::Show(this->m_hWnd, str, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION)==IDYES)
2448 CTGitPathList targetList;
2449 FillListOfSelectedItemPaths(targetList);
2451 // make sure that the list is reverse sorted, so that
2452 // children are removed before any parents
2453 targetList.SortByPathname(true);
2455 // put all reverted files in the trashbin, except the ones with 'added'
2456 // status because they are not restored by the revert.
2457 CTGitPathList delList;
2458 POSITION pos2 = GetFirstSelectedItemPosition();
2459 int index2;
2460 while ((index2 = GetNextSelectedItem(pos2)) >= 0)
2462 CTGitPath *entry=(CTGitPath *)GetItemData(index2);
2463 if (entry&&(!(entry->m_Action& CTGitPath::LOGACTIONS_ADDED))
2464 && (!(entry->m_Action& CTGitPath::LOGACTIONS_REPLACED)) && !entry->IsDirectory())
2466 CTGitPath fullpath;
2467 fullpath.SetFromWin(g_Git.CombinePath(entry));
2468 delList.AddPath(fullpath);
2471 if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))
2472 delList.DeleteAllFiles(true);
2474 CString revertToCommit = _T("HEAD");
2475 if (m_amend)
2476 revertToCommit = _T("HEAD~1");
2477 CString err;
2478 if (g_Git.Revert(revertToCommit, targetList, err))
2480 CMessageBox::Show(this->m_hWnd, _T("Revert failed:\n") + err, _T("TortoiseGit"), MB_ICONERROR);
2482 else
2484 bool updateStatusList = false;
2485 for (int i = 0 ; i < targetList.GetCount(); ++i)
2487 int nListboxEntries = GetItemCount();
2488 for (int nItem=0; nItem<nListboxEntries; ++nItem)
2490 CTGitPath *path=(CTGitPath*)GetItemData(nItem);
2491 if (path->GetGitPathString()==targetList[i].GetGitPathString() && !path->IsDirectory())
2493 if(path->m_Action & CTGitPath::LOGACTIONS_ADDED)
2495 path->m_Action = CTGitPath::LOGACTIONS_UNVER;
2496 SetEntryCheck(path,nItem,false);
2497 updateStatusList = true;
2498 #if 0 // revert an added file and some entry will be cloned (part 1/2)
2499 SetItemGroup(nItem,1);
2500 this->m_StatusFileList.RemoveItem(*path);
2501 this->m_UnRevFileList.AddPath(*path);
2502 //this->m_IgnoreFileList.RemoveItem(*path);
2503 #endif
2505 else
2507 if (GetCheck(nItem))
2508 m_nSelected--;
2509 RemoveListEntry(nItem);
2511 break;
2513 else if (path->GetGitPathString()==targetList[i].GetGitPathString() && path->IsDirectory() && path->IsWCRoot())
2515 CString sCmd;
2516 sCmd.Format(_T("/command:revert /path:\"%s\""), (LPCTSTR)path->GetGitPathString());
2517 CCommonAppUtils::RunTortoiseGitProc(sCmd);
2521 SetRedraw(TRUE);
2522 SaveColumnWidths();
2523 #if 0 // revert an added file and some entry will be cloned (part 2/2)
2524 Show(m_dwShow, 0, m_bShowFolders,updateStatusList,true);
2525 NotifyCheck();
2526 #else
2527 if (updateStatusList && nullptr != GetLogicalParent() && nullptr != GetLogicalParent()->GetSafeHwnd())
2528 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2529 #endif
2533 break;
2535 case IDGITLC_ASSUMEVALID:
2536 SetGitIndexFlagsForSelectedFiles(IDS_PROC_MARK_ASSUMEVALID, BST_CHECKED, BST_INDETERMINATE);
2537 break;
2538 case IDGITLC_SKIPWORKTREE:
2539 SetGitIndexFlagsForSelectedFiles(IDS_PROC_MARK_SKIPWORKTREE, BST_INDETERMINATE, BST_CHECKED);
2540 break;
2541 case IDGITLC_UNSETIGNORELOCALCHANGES:
2542 SetGitIndexFlagsForSelectedFiles(IDS_PROC_UNSET_IGNORELOCALCHANGES, BST_UNCHECKED, BST_UNCHECKED);
2543 break;
2544 case IDGITLC_COPY:
2545 CopySelectedEntriesToClipboard(0);
2546 break;
2547 case IDGITLC_COPYEXT:
2548 CopySelectedEntriesToClipboard((DWORD)-1);
2549 break;
2550 case IDGITLC_EXPORT:
2551 FilesExport();
2552 break;
2553 case IDGITLC_SAVEAS:
2554 FileSaveAs(filepath);
2555 break;
2557 case IDGITLC_REVERTTOREV:
2558 RevertSelectedItemToVersion();
2559 break;
2560 case IDGITLC_REVERTTOPARENT:
2561 RevertSelectedItemToVersion(true);
2562 break;
2563 #if 0
2564 case IDSVNLC_COMMIT:
2566 CTSVNPathList targetList;
2567 FillListOfSelectedItemPaths(targetList);
2568 CTSVNPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
2569 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
2570 CString commandline = CPathUtils::GetAppDirectory();
2571 commandline += _T("TortoiseGitProc.exe /command:commit /pathfile:\"");
2572 commandline += tempFile.GetWinPathString();
2573 commandline += _T("\"");
2574 commandline += _T(" /deletepathfile");
2575 CAppUtils::LaunchApplication(commandline, NULL, false);
2577 break;
2578 case IDSVNLC_CREATEIGNORECS:
2579 CreateChangeList(SVNSLC_IGNORECHANGELIST);
2580 break;
2581 case IDSVNLC_CREATECS:
2583 CCreateChangelistDlg dlg;
2584 if (dlg.DoModal() == IDOK)
2586 CreateChangeList(dlg.m_sName);
2589 break;
2590 default:
2592 if (cmd < IDSVNLC_MOVETOCS)
2593 break;
2594 CTSVNPathList changelistItems;
2595 FillListOfSelectedItemPaths(changelistItems);
2597 // find the changelist name
2598 CString sChangelist;
2599 int cmdID = IDSVNLC_MOVETOCS;
2600 SetRedraw(FALSE);
2601 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
2603 if ((it->first.Compare(SVNSLC_IGNORECHANGELIST))&&(entry->changelist.Compare(it->first)))
2605 if (cmd == cmdID)
2607 sChangelist = it->first;
2609 cmdID++;
2612 if (!sChangelist.IsEmpty())
2614 SVN git;
2615 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
2617 // The changelists were moved, but we now need to run through the selected items again
2618 // and update their changelist
2619 POSITION pos = GetFirstSelectedItemPosition();
2620 int index;
2621 while ((index = GetNextSelectedItem(pos)) >= 0)
2623 FileEntry * e = GetListEntry(index);
2624 e->changelist = sChangelist;
2625 if (!e->IsFolder())
2627 if (m_changelists.find(e->changelist)!=m_changelists.end())
2628 SetItemGroup(index, m_changelists[e->changelist]);
2629 else
2630 SetItemGroup(index, 0);
2634 else
2636 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
2639 SetRedraw(TRUE);
2641 break;
2642 #endif
2644 } // switch (cmd)
2645 m_bBlock = FALSE;
2646 AfxGetApp()->DoWaitCursor(-1);
2647 GetStatisticsString();
2648 //int iItemCountAfterMenuCmd = GetItemCount();
2649 //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)
2651 // CWnd* pParent = GetParent();
2652 // if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2653 // {
2654 // pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);
2655 // }
2657 } // if (popup.CreatePopupMenu())
2658 } // if (selIndex >= 0)
2662 void CGitStatusListCtrl::SetGitIndexFlagsForSelectedFiles(UINT message, BOOL assumevalid, BOOL skipworktree)
2664 if (CMessageBox::Show(GetSafeHwnd(), message, IDS_APPNAME, MB_YESNO | MB_DEFBUTTON2 | MB_ICONQUESTION) != IDYES)
2665 return;
2667 CAutoRepository repository(g_Git.GetGitRepository());
2668 if (!repository)
2670 CMessageBox::Show(m_hWnd, g_Git.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR);
2671 return;
2674 CAutoIndex gitindex;
2675 if (git_repository_index(gitindex.GetPointer(), repository))
2677 CMessageBox::Show(m_hWnd, g_Git.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR);
2678 return;
2681 POSITION pos = GetFirstSelectedItemPosition();
2682 int index = -1;
2683 while ((index = GetNextSelectedItem(pos)) >= 0)
2685 CTGitPath * path = (CTGitPath *)GetItemData(index);
2686 ASSERT(path);
2687 if (path == nullptr)
2688 continue;
2690 size_t idx;
2691 if (!git_index_find(&idx, gitindex, CUnicodeUtils::GetMulti(path->GetGitPathString(), CP_UTF8)))
2693 git_index_entry *e = const_cast<git_index_entry *>(git_index_get_byindex(gitindex, idx)); // HACK
2694 if (assumevalid == BST_UNCHECKED)
2695 e->flags &= ~GIT_IDXENTRY_VALID;
2696 else if (assumevalid == BST_CHECKED)
2697 e->flags |= GIT_IDXENTRY_VALID;
2698 if (skipworktree == BST_UNCHECKED)
2699 e->flags_extended &= ~GIT_IDXENTRY_SKIP_WORKTREE;
2700 else if (skipworktree == BST_CHECKED)
2701 e->flags_extended |= GIT_IDXENTRY_SKIP_WORKTREE;
2702 git_index_add(gitindex, e);
2704 else
2705 CMessageBox::Show(m_hWnd, g_Git.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR);
2708 if (git_index_write(gitindex))
2710 CMessageBox::Show(m_hWnd, g_Git.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR);
2711 return;
2714 if (nullptr != GetLogicalParent() && nullptr != GetLogicalParent()->GetSafeHwnd())
2715 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2717 SetRedraw(TRUE);
2720 void CGitStatusListCtrl::OnContextMenuHeader(CWnd * pWnd, CPoint point)
2722 Locker lock(m_critSec);
2723 m_ColumnManager.OnContextMenuHeader(pWnd,point,!!IsGroupViewEnabled());
2726 void CGitStatusListCtrl::OnContextMenu(CWnd* pWnd, CPoint point)
2729 if (pWnd == this)
2731 OnContextMenuList(pWnd, point);
2732 } // if (pWnd == this)
2733 else if (pWnd == GetHeaderCtrl())
2735 OnContextMenuHeader(pWnd, point);
2739 void CGitStatusListCtrl::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
2742 Locker lock(m_critSec);
2743 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
2744 *pResult = 0;
2745 if (m_bBlock)
2746 return;
2748 if (pNMLV->iItem < 0)
2749 return;
2751 CTGitPath *file=(CTGitPath*)GetItemData(pNMLV->iItem);
2753 if (file->m_Action & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE)) {
2754 OpenFile(file, OPEN);
2755 return;
2757 if( file->m_Action&CTGitPath::LOGACTIONS_UNMERGED )
2759 if (CAppUtils::ConflictEdit(*file, false, m_bIsRevertTheirMy, GetLogicalParent() ? GetLogicalParent()->GetSafeHwnd() : nullptr))
2761 CString conflictedFile = g_Git.CombinePath(file);
2762 if (!PathFileExists(conflictedFile) && NULL != GetLogicalParent() && NULL != GetLogicalParent()->GetSafeHwnd())
2763 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2766 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))
2767 return;
2768 else
2770 if (!m_Rev1.IsEmpty() && !m_Rev2.IsEmpty())
2771 StartDiffTwo(pNMLV->iItem);
2772 else
2773 StartDiff(pNMLV->iItem);
2777 void CGitStatusListCtrl::StartDiffTwo(int fileindex)
2779 if(fileindex<0)
2780 return;
2782 auto ptr = (CTGitPath*)GetItemData(fileindex);
2783 if (ptr == nullptr)
2784 return;
2785 CTGitPath file1 = *ptr;
2787 if (file1.m_Action & CTGitPath::LOGACTIONS_ADDED)
2788 CGitDiff::DiffNull(&file1, m_Rev1, true);
2789 else if (file1.m_Action & CTGitPath::LOGACTIONS_DELETED)
2790 CGitDiff::DiffNull(&file1, m_Rev2, false);
2791 else
2792 CGitDiff::Diff(&file1, &file1, m_Rev1, m_Rev2);
2795 void CGitStatusListCtrl::StartDiffWC(int fileindex)
2797 if(fileindex<0)
2798 return;
2800 CString Ver;
2801 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
2802 return;
2804 auto ptr = (CTGitPath*)GetItemData(fileindex);
2805 if (ptr == nullptr)
2806 return;
2807 CTGitPath file1 = *ptr;
2808 file1.m_Action = 0; // reset action, so that diff is not started as added/deleted file; see issue #1757
2810 CGitDiff::Diff(&file1,&file1, GIT_REV_ZERO, m_CurrentVersion);
2814 void CGitStatusListCtrl::StartDiff(int fileindex)
2816 if(fileindex<0)
2817 return;
2819 auto ptr = (CTGitPath*)GetItemData(fileindex);
2820 if (ptr == nullptr)
2821 return;
2822 CTGitPath file1 = *ptr;
2823 CTGitPath file2;
2824 if(file1.m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY))
2826 file2.SetFromGit(file1.GetGitOldPathString());
2828 else
2830 file2=file1;
2833 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
2835 CString fromwhere;
2836 if(m_amend && (file1.m_Action & CTGitPath::LOGACTIONS_ADDED) == 0)
2837 fromwhere = _T("~1");
2838 if( g_Git.IsInitRepos())
2839 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2840 GIT_REV_ZERO);
2841 else if( file1.m_Action&CTGitPath::LOGACTIONS_ADDED )
2842 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2843 m_CurrentVersion+fromwhere,true);
2844 else if( file1.m_Action&CTGitPath::LOGACTIONS_DELETED )
2845 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2846 GitRev::GetHead()+fromwhere,false);
2847 else
2848 CGitDiff::Diff(&file1,&file2,
2849 CString(GIT_REV_ZERO),
2850 GitRev::GetHead()+fromwhere);
2852 else
2854 CGitHash hash;
2855 CString fromwhere = m_CurrentVersion+_T("~1");
2856 if(m_amend)
2857 fromwhere = m_CurrentVersion+_T("~2");
2858 bool revfail = !!g_Git.GetHash(hash, fromwhere);
2859 if (revfail || (file1.m_Action & file1.LOGACTIONS_ADDED))
2861 CGitDiff::DiffNull(&file1,m_CurrentVersion,true);
2864 else if (file1.m_Action & file1.LOGACTIONS_DELETED)
2866 if (file1.m_ParentNo > 0)
2867 fromwhere.Format(_T("%s^%d"), (LPCTSTR)m_CurrentVersion, file1.m_ParentNo + 1);
2869 CGitDiff::DiffNull(&file1,fromwhere,false);
2871 else
2873 if( file1.m_ParentNo & MERGE_MASK)
2876 CTGitPath base, theirs, mine, merge;
2878 CString temppath;
2879 GetTempPath(temppath);
2880 temppath.TrimRight(_T("\\"));
2882 mine.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".LOCAL") + file1.GetFileExtension());
2883 theirs.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".REMOTE") + file1.GetFileExtension());
2884 base.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".BASE") + file1.GetFileExtension());
2886 CFile tempfile;
2887 //create a empty file, incase stage is not three
2888 tempfile.Open(mine.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2889 tempfile.Close();
2890 tempfile.Open(theirs.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2891 tempfile.Close();
2892 tempfile.Open(base.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2893 tempfile.Close();
2895 merge.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".Merged") + file1.GetFileExtension());
2897 int parent1=-1, parent2 =-1;
2898 for (size_t i = 0; i < m_arStatusArray.size(); ++i)
2900 if(m_arStatusArray[i]->GetGitPathString() == file1.GetGitPathString())
2902 if(m_arStatusArray[i]->m_ParentNo & MERGE_MASK)
2905 else
2907 if(parent1<0)
2909 parent1 = m_arStatusArray[i]->m_ParentNo & PARENT_MASK;
2911 else if (parent2 <0)
2913 parent2 = m_arStatusArray[i]->m_ParentNo & PARENT_MASK;
2919 if(g_Git.GetOneFile(m_CurrentVersion, file1, (CString&)merge.GetWinPathString()))
2921 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2924 if(parent1>=0)
2926 CString str;
2927 str.Format(_T("%s^%d"), (LPCTSTR)this->m_CurrentVersion, parent1 + 1);
2929 if(g_Git.GetOneFile(str, file1, (CString&)mine.GetWinPathString()))
2931 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2935 if(parent2>=0)
2937 CString str;
2938 str.Format(_T("%s^%d"), (LPCTSTR)this->m_CurrentVersion, parent2 + 1);
2940 if(g_Git.GetOneFile(str, file1, (CString&)theirs.GetWinPathString()))
2942 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2946 if(parent1>=0 && parent2>=0)
2948 CString cmd, output;
2949 cmd.Format(_T("git.exe merge-base %s^%d %s^%d"), (LPCTSTR)this->m_CurrentVersion, parent1 + 1,
2950 this->m_CurrentVersion,parent2+1);
2952 if (g_Git.Run(cmd, &output, NULL, CP_UTF8))
2955 else
2957 if(g_Git.GetOneFile(output.Left(40), file1, (CString&)base.GetWinPathString()))
2959 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETBASEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2963 CAppUtils::StartExtMerge(base, theirs, mine, merge,_T("BASE"),_T("REMOTE"),_T("LOCAL"));
2966 else
2968 CString str;
2969 if( (file1.m_ParentNo&PARENT_MASK) == 0)
2971 str = _T("~1");
2973 else
2975 str.Format(_T("^%d"), (file1.m_ParentNo&PARENT_MASK)+1);
2977 CGitDiff::Diff(&file1,&file2,
2978 m_CurrentVersion,
2979 m_CurrentVersion+str);
2985 CString CGitStatusListCtrl::GetStatisticsString(bool simple)
2987 CString sNormal = CString(MAKEINTRESOURCE(IDS_STATUSNORMAL));
2988 CString sAdded = CString(MAKEINTRESOURCE(IDS_STATUSADDED));
2989 CString sDeleted = CString(MAKEINTRESOURCE(IDS_STATUSDELETED));
2990 CString sModified = CString(MAKEINTRESOURCE(IDS_STATUSMODIFIED));
2991 CString sConflicted = CString(MAKEINTRESOURCE(IDS_STATUSCONFLICTED));
2992 CString sUnversioned = CString(MAKEINTRESOURCE(IDS_STATUSUNVERSIONED));
2993 CString sRenamed = CString(MAKEINTRESOURCE(IDS_STATUSREPLACED));
2994 CString sToolTip;
2995 if(simple)
2997 sToolTip.Format(IDS_STATUSLIST_STATUSLINE1,
2998 this->m_nLineAdded,this->m_nLineDeleted,
2999 (LPCTSTR)sModified, m_nModified,
3000 (LPCTSTR)sAdded, m_nAdded,
3001 (LPCTSTR)sDeleted, m_nDeleted,
3002 (LPCTSTR)sRenamed, m_nRenamed
3005 else
3007 sToolTip.Format(IDS_STATUSLIST_STATUSLINE2,
3008 this->m_nLineAdded,this->m_nLineDeleted,
3009 (LPCTSTR)sNormal, m_nNormal,
3010 (LPCTSTR)sUnversioned, m_nUnversioned,
3011 (LPCTSTR)sModified, m_nModified,
3012 (LPCTSTR)sAdded, m_nAdded,
3013 (LPCTSTR)sDeleted, m_nDeleted,
3014 (LPCTSTR)sConflicted, m_nConflicted
3017 CString sStats;
3018 sStats.Format(IDS_COMMITDLG_STATISTICSFORMAT, m_nSelected, GetItemCount());
3019 if (m_pStatLabel)
3021 m_pStatLabel->SetWindowText(sStats);
3024 if (m_pSelectButton)
3026 if (m_nSelected == 0)
3027 m_pSelectButton->SetCheck(BST_UNCHECKED);
3028 else if (m_nSelected != GetItemCount())
3029 m_pSelectButton->SetCheck(BST_INDETERMINATE);
3030 else
3031 m_pSelectButton->SetCheck(BST_CHECKED);
3034 if (m_pConfirmButton)
3036 m_pConfirmButton->EnableWindow(m_nSelected>0);
3039 return sToolTip;
3044 CString CGitStatusListCtrl::GetCommonDirectory(bool bStrict)
3046 if (!bStrict)
3048 // not strict means that the selected folder has priority
3049 if (!m_StatusFileList.GetCommonDirectory().IsEmpty())
3050 return m_StatusFileList.GetCommonDirectory().GetWinPath();
3053 CTGitPath commonBaseDirectory;
3054 int nListItems = GetItemCount();
3055 for (int i=0; i<nListItems; ++i)
3057 CTGitPath baseDirectory,*p= (CTGitPath*)this->GetItemData(i);
3058 ASSERT(p);
3059 if(p==NULL)
3060 continue;
3061 baseDirectory = p->GetDirectory();
3063 if(commonBaseDirectory.IsEmpty())
3065 commonBaseDirectory = baseDirectory;
3067 else
3069 if (commonBaseDirectory.GetWinPathString().GetLength() > baseDirectory.GetWinPathString().GetLength())
3071 if (baseDirectory.IsAncestorOf(commonBaseDirectory))
3072 commonBaseDirectory = baseDirectory;
3076 return g_Git.CombinePath(commonBaseDirectory);
3080 void CGitStatusListCtrl::SelectAll(bool bSelect, bool /*bIncludeNoCommits*/)
3082 CWaitCursor waitCursor;
3083 // block here so the LVN_ITEMCHANGED messages
3084 // get ignored
3085 m_bBlock = TRUE;
3086 SetRedraw(FALSE);
3088 int nListItems = GetItemCount();
3089 if (bSelect)
3090 m_nSelected = nListItems;
3091 else
3092 m_nSelected = 0;
3094 for (int i=0; i<nListItems; ++i)
3096 //FileEntry * entry = GetListEntry(i);
3097 //ASSERT(entry != NULL);
3098 CTGitPath *path = (CTGitPath *) GetItemData(i);
3099 if (path == NULL)
3100 continue;
3101 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))
3102 SetEntryCheck(path,i,bSelect);
3105 // unblock before redrawing
3106 m_bBlock = FALSE;
3107 SetRedraw(TRUE);
3108 GetStatisticsString();
3109 NotifyCheck();
3112 void CGitStatusListCtrl::Check(DWORD dwCheck, bool check)
3114 CWaitCursor waitCursor;
3115 // block here so the LVN_ITEMCHANGED messages
3116 // get ignored
3117 m_bBlock = TRUE;
3118 SetRedraw(FALSE);
3120 int nListItems = GetItemCount();
3122 for (int i = 0; i < nListItems; ++i)
3124 CTGitPath *entry = (CTGitPath *) GetItemData(i);
3125 if (entry == NULL)
3126 continue;
3128 DWORD showFlags = entry->m_Action;
3129 if (entry->IsDirectory())
3130 showFlags |= GITSLC_SHOWSUBMODULES;
3131 else
3132 showFlags |= GITSLC_SHOWFILES;
3134 if (check && (showFlags & dwCheck) && !GetCheck(i) && !(entry->IsDirectory() && m_bDoNotAutoselectSubmodules && !(dwCheck & GITSLC_SHOWSUBMODULES)))
3136 SetEntryCheck(entry, i, true);
3137 m_nSelected++;
3139 else if (!check && (showFlags & dwCheck) && GetCheck(i))
3141 SetEntryCheck(entry, i, false);
3142 m_nSelected--;
3145 // unblock before redrawing
3146 m_bBlock = FALSE;
3147 SetRedraw(TRUE);
3148 GetStatisticsString();
3149 NotifyCheck();
3152 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR *pNMHDR, LRESULT *pResult)
3154 LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast<LPNMLVGETINFOTIP>(pNMHDR);
3155 *pResult = 0;
3156 if (m_bBlock)
3157 return;
3159 CTGitPath *entry=(CTGitPath *)GetItemData(pGetInfoTip->iItem);
3161 if (entry)
3162 if (pGetInfoTip->cchTextMax > entry->GetGitPathString().GetLength() + g_Git.m_CurrentDir.GetLength())
3164 CString str = g_Git.CombinePath(entry->GetWinPathString());
3165 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, str.GetBuffer(), pGetInfoTip->cchTextMax - 1);
3169 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult)
3171 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
3173 // Take the default processing unless we set this to something else below.
3174 *pResult = CDRF_DODEFAULT;
3176 // First thing - check the draw stage. If it's the control's prepaint
3177 // stage, then tell Windows we want messages for every item.
3179 switch (pLVCD->nmcd.dwDrawStage)
3181 case CDDS_PREPAINT:
3182 *pResult = CDRF_NOTIFYITEMDRAW;
3183 break;
3184 case CDDS_ITEMPREPAINT:
3186 // This is the prepaint stage for an item. Here's where we set the
3187 // item's text color. Our return value will tell Windows to draw the
3188 // item itself, but it will use the new color we set here.
3190 // Tell Windows to paint the control itself.
3191 *pResult = CDRF_DODEFAULT;
3192 if (m_bBlock)
3193 return;
3195 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
3197 if (m_arStatusArray.size() > (DWORD_PTR)pLVCD->nmcd.dwItemSpec)
3200 //FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);
3201 CTGitPath *entry=(CTGitPath *)GetItemData((int)pLVCD->nmcd.dwItemSpec);
3202 if (entry == NULL)
3203 return;
3205 // coloring
3206 // ========
3207 // black : unversioned, normal
3208 // purple : added
3209 // blue : modified
3210 // brown : missing, deleted, replaced
3211 // green : merged (or potential merges)
3212 // red : conflicts or sure conflicts
3213 if(entry->m_Action & CTGitPath::LOGACTIONS_GRAY)
3215 crText = RGB(128,128,128);
3218 else if(entry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
3220 crText = m_Colors.GetColor(CColors::Conflict);
3223 else if(entry->m_Action & (CTGitPath::LOGACTIONS_MODIFIED))
3225 crText = m_Colors.GetColor(CColors::Modified);
3228 else if(entry->m_Action & (CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))
3230 crText = m_Colors.GetColor(CColors::Added);
3232 else if(entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
3234 crText = m_Colors.GetColor(CColors::Deleted);
3236 else if(entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
3238 crText = m_Colors.GetColor(CColors::Renamed);
3240 else if(entry->m_Action & CTGitPath::LOGACTIONS_MERGED)
3242 crText = m_Colors.GetColor(CColors::Merged);
3244 else
3246 crText = GetSysColor(COLOR_WINDOWTEXT);
3248 // Store the color back in the NMLVCUSTOMDRAW struct.
3249 pLVCD->clrText = crText;
3252 break;
3256 BOOL CGitStatusListCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
3258 if (pWnd != this)
3259 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
3260 if (!m_bBlock)
3262 HCURSOR hCur = LoadCursor(NULL, IDC_ARROW);
3263 SetCursor(hCur);
3264 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
3266 HCURSOR hCur = LoadCursor(NULL, IDC_WAIT);
3267 SetCursor(hCur);
3268 return TRUE;
3271 void CGitStatusListCtrl::RemoveListEntry(int index)
3274 Locker lock(m_critSec);
3275 DeleteItem(index);
3277 m_arStatusArray.erase(m_arStatusArray.begin()+index);
3279 #if 0
3280 delete m_arStatusArray[m_arListArray[index]];
3281 m_arStatusArray.erase(m_arStatusArray.begin()+m_arListArray[index]);
3282 m_arListArray.erase(m_arListArray.begin()+index);
3283 for (int i=index; i< (int)m_arListArray.size(); ++i)
3285 m_arListArray[i]--;
3287 #endif
3290 ///< Set a checkbox on an entry in the listbox
3291 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync
3292 void CGitStatusListCtrl::SetEntryCheck(CTGitPath* pEntry, int listboxIndex, bool bCheck)
3294 pEntry->m_Checked = bCheck;
3295 m_mapFilenameToChecked[pEntry->GetGitPathString()] = bCheck;
3296 SetCheck(listboxIndex, bCheck);
3299 #if 0
3300 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry* parentEntry, bool bCheck)
3303 int nListItems = GetItemCount();
3304 for (int j=0; j< nListItems ; ++j)
3306 FileEntry * childEntry = GetListEntry(j);
3307 ASSERT(childEntry != NULL);
3308 if (childEntry == NULL || childEntry == parentEntry)
3309 continue;
3310 if (childEntry->checked != bCheck)
3312 if (parentEntry->path.IsAncestorOf(childEntry->path))
3314 SetEntryCheck(childEntry,j,bCheck);
3315 if(bCheck)
3317 m_nSelected++;
3319 else
3321 m_nSelected--;
3328 #endif
3330 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList& pathList)
3333 pathList.Clear();
3334 int nListItems = GetItemCount();
3335 for (int i = 0; i< nListItems; ++i)
3337 CTGitPath * entry = (CTGitPath*)GetItemData(i);
3338 ASSERT(entry != NULL);
3339 if (entry->m_Checked)
3341 pathList.AddPath(*entry);
3344 pathList.SortByPathname();
3349 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)
3350 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList& pathList, bool /*bNoIgnored*/)
3352 pathList.Clear();
3354 POSITION pos = GetFirstSelectedItemPosition();
3355 int index;
3356 while ((index = GetNextSelectedItem(pos)) >= 0)
3358 CTGitPath * entry = (CTGitPath*)GetItemData(index);
3359 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))
3360 // continue;
3361 pathList.AddPath(*entry);
3365 UINT CGitStatusListCtrl::OnGetDlgCode()
3367 // we want to process the return key and not have that one
3368 // routed to the default pushbutton
3369 return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS;
3372 void CGitStatusListCtrl::OnNMReturn(NMHDR * /*pNMHDR*/, LRESULT *pResult)
3374 *pResult = 0;
3375 if (m_bBlock)
3376 return;
3377 if (!CheckMultipleDiffs())
3378 return;
3379 POSITION pos = GetFirstSelectedItemPosition();
3380 while ( pos )
3382 int index = GetNextSelectedItem(pos);
3383 if (index < 0)
3384 return;
3385 CTGitPath *file=(CTGitPath*)GetItemData(index);
3386 if (file == nullptr)
3387 return;
3388 if (file->m_Action & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE))
3390 OpenFile(file, OPEN);
3392 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))
3393 continue;
3394 else
3396 if (!m_Rev1.IsEmpty() && !m_Rev2.IsEmpty())
3397 StartDiffTwo(index);
3398 else
3399 StartDiff(index);
3404 void CGitStatusListCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
3406 // Since we catch all keystrokes (to have the enter key processed here instead
3407 // of routed to the default pushbutton) we have to make sure that other
3408 // keys like Tab and Esc still do what they're supposed to do
3409 // Tab = change focus to next/previous control
3410 // Esc = quit the dialog
3411 switch (nChar)
3413 case (VK_TAB):
3415 ::PostMessage(GetLogicalParent()->GetSafeHwnd(), WM_NEXTDLGCTL, GetKeyState(VK_SHIFT)&0x8000, 0);
3416 return;
3418 break;
3419 case (VK_ESCAPE):
3421 ::SendMessage(GetLogicalParent()->GetSafeHwnd(), WM_CLOSE, 0, 0);
3423 break;
3426 CListCtrl::OnKeyDown(nChar, nRepCnt, nFlags);
3429 void CGitStatusListCtrl::PreSubclassWindow()
3431 CListCtrl::PreSubclassWindow();
3432 EnableToolTips(TRUE);
3433 SetWindowTheme(GetSafeHwnd(), L"Explorer", NULL);
3436 void CGitStatusListCtrl::OnPaint()
3438 LRESULT defres = Default();
3439 if ((m_bBusy)||(m_bEmpty))
3441 CString str;
3442 if (m_bBusy)
3444 if (m_sBusy.IsEmpty())
3445 str.LoadString(IDS_STATUSLIST_BUSYMSG);
3446 else
3447 str = m_sBusy;
3449 else
3451 if (m_sEmpty.IsEmpty())
3452 str.LoadString(IDS_STATUSLIST_EMPTYMSG);
3453 else
3454 str = m_sEmpty;
3456 COLORREF clrText = ::GetSysColor(COLOR_WINDOWTEXT);
3457 COLORREF clrTextBk;
3458 if (IsWindowEnabled())
3459 clrTextBk = ::GetSysColor(COLOR_WINDOW);
3460 else
3461 clrTextBk = ::GetSysColor(COLOR_3DFACE);
3463 CRect rc;
3464 GetClientRect(&rc);
3465 CHeaderCtrl* pHC;
3466 pHC = GetHeaderCtrl();
3467 if (pHC != NULL)
3469 CRect rcH;
3470 pHC->GetItemRect(0, &rcH);
3471 rc.top += rcH.bottom;
3473 CDC* pDC = GetDC();
3475 CMyMemDC memDC(pDC, &rc);
3477 memDC.SetTextColor(clrText);
3478 memDC.SetBkColor(clrTextBk);
3479 memDC.FillSolidRect(rc, clrTextBk);
3480 rc.top += 10;
3481 CGdiObject * oldfont = memDC.SelectStockObject(DEFAULT_GUI_FONT);
3482 memDC.DrawText(str, rc, DT_CENTER | DT_VCENTER |
3483 DT_WORDBREAK | DT_NOPREFIX | DT_NOCLIP);
3484 memDC.SelectObject(oldfont);
3486 ReleaseDC(pDC);
3488 if (defres)
3490 // the Default() call did not process the WM_PAINT message!
3491 // Validate the update region ourselves to avoid
3492 // an endless loop repainting
3493 CRect rc;
3494 GetUpdateRect(&rc, FALSE);
3495 if (!rc.IsRectEmpty())
3496 ValidateRect(rc);
3500 // prevent users from extending our hidden (size 0) columns
3501 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR *pNMHDR, LRESULT *pResult)
3503 m_ColumnManager.OnHdnBegintrack(pNMHDR, pResult);
3506 // prevent any function from extending our hidden (size 0) columns
3507 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
3509 if(!m_ColumnManager.OnHdnItemchanging(pNMHDR, pResult))
3510 Default();
3513 void CGitStatusListCtrl::OnDestroy()
3515 SaveColumnWidths(true);
3516 CListCtrl::OnDestroy();
3519 void CGitStatusListCtrl::OnBeginDrag(NMHDR* /*pNMHDR*/, LRESULT* pResult)
3521 Locker lock(m_critSec);
3522 CDropFiles dropFiles; // class for creating DROPFILES struct
3524 int index;
3525 POSITION pos = GetFirstSelectedItemPosition();
3526 if (!pos)
3527 return;
3529 bool bTempDirCreated = false;
3530 CString tempDir;
3531 while ( (index = GetNextSelectedItem(pos)) >= 0 )
3533 CTGitPath *path = (CTGitPath *)GetItemData(index); // m_arStatusArray[index] does not work with SyncDlg
3534 if (path->IsDirectory())
3535 continue;
3537 CString version;
3538 if (!this->m_CurrentVersion.IsEmpty() && this->m_CurrentVersion != GIT_REV_ZERO)
3540 if (path->m_Action & CTGitPath::LOGACTIONS_DELETED)
3541 version.Format(_T("%s^%d"), (LPCTSTR)m_CurrentVersion, (path->m_ParentNo + 1) & PARENT_MASK);
3542 else
3543 version = m_CurrentVersion;
3545 else
3547 if (path->m_Action & CTGitPath::LOGACTIONS_DELETED)
3548 version = _T("HEAD");
3551 CString tempFile;
3552 if (version.IsEmpty())
3554 TCHAR abspath[MAX_PATH] = {0};
3555 PathCombine(abspath, g_Git.m_CurrentDir, path->GetWinPath());
3556 tempFile = abspath;
3558 else
3560 if (!bTempDirCreated)
3562 tempDir = GetTempFile();
3563 ::DeleteFile(tempDir);
3564 ::CreateDirectory(tempDir, NULL);
3565 bTempDirCreated = true;
3567 tempFile = tempDir + _T("\\") + path->GetWinPathString();
3568 CString tempSubDir = tempDir + _T("\\") + path->GetContainingDirectory().GetWinPathString();
3569 CPathUtils::MakeSureDirectoryPathExists(tempSubDir);
3570 if (g_Git.GetOneFile(version, *path, tempFile))
3572 CString out;
3573 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, (LPCTSTR)path->GetGitPathString(), (LPCTSTR)version, (LPCTSTR)tempFile);
3574 CMessageBox::Show(nullptr, g_Git.GetGitLastErr(out, CGit::GIT_CMD_GETONEFILE), _T("TortoiseGit"), MB_OK);
3575 return;
3578 dropFiles.AddFile(tempFile);
3581 if (!dropFiles.IsEmpty())
3583 m_bOwnDrag = true;
3584 dropFiles.CreateStructure();
3585 m_bOwnDrag = false;
3587 *pResult = 0;
3590 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry /* = false */)
3592 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
3593 for (int col = 0; col <= maxcol; col++)
3594 if (m_ColumnManager.IsVisible (col))
3595 m_ColumnManager.ColumnResized (col);
3597 if (bSaveToRegistry)
3598 m_ColumnManager.WriteSettings();
3601 bool CGitStatusListCtrl::EnableFileDrop()
3603 m_bFileDropsEnabled = true;
3604 return true;
3607 bool CGitStatusListCtrl::HasPath(const CTGitPath& path)
3609 for (size_t i=0; i < m_arStatusArray.size(); ++i)
3611 if (m_arStatusArray[i]->IsEquivalentTo(path))
3612 return true;
3615 return false;
3618 BOOL CGitStatusListCtrl::PreTranslateMessage(MSG* pMsg)
3620 if (pMsg->message == WM_KEYDOWN)
3622 switch (pMsg->wParam)
3624 case 'A':
3626 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
3628 // select all entries
3629 for (int i=0; i<GetItemCount(); ++i)
3631 SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
3633 return TRUE;
3636 break;
3637 case 'C':
3638 case VK_INSERT:
3640 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
3642 // copy all selected paths to the clipboard
3643 if (GetAsyncKeyState(VK_SHIFT)&0x8000)
3644 CopySelectedEntriesToClipboard(GITSLC_COLSTATUS);
3645 else
3646 CopySelectedEntriesToClipboard(0);
3647 return TRUE;
3650 break;
3651 case VK_DELETE:
3653 if ((GetSelectedCount() > 0) && (m_dwContextMenus & GITSLC_POPDELETE))
3655 m_bBlock = TRUE;
3656 CTGitPath * filepath = (CTGitPath *)GetItemData(GetSelectionMark());
3657 if (filepath != nullptr && (filepath->m_Action & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE)))
3658 DeleteSelectedFiles();
3659 m_bBlock = FALSE;
3662 break;
3666 return CListCtrl::PreTranslateMessage(pMsg);
3669 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols)
3672 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
3673 // WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
3675 CString sClipboard;
3676 CString temp;
3677 //TCHAR buf[100];
3678 if (GetSelectedCount() == 0)
3679 return false;
3681 // first add the column titles as the first line
3682 // We needn't head when only path copy
3683 //temp.LoadString(IDS_STATUSLIST_COLFILE);
3684 //sClipboard = temp;
3686 DWORD selection = 0;
3687 for (int i = 0, count = m_ColumnManager.GetColumnCount(); i < count; ++i)
3688 if ( ((dwCols == -1) && m_ColumnManager.IsVisible (i))
3689 || ((dwCols != 1) && (i < 32) && ((dwCols & (1 << i)) != 0)))
3691 sClipboard += _T("\t") + m_ColumnManager.GetName(i);
3693 if (i < 32)
3694 selection += 1 << i;
3697 if(dwCols)
3698 sClipboard += _T("\r\n");
3700 POSITION pos = GetFirstSelectedItemPosition();
3701 int index;
3702 while ((index = GetNextSelectedItem(pos)) >= 0)
3704 CTGitPath * entry = (CTGitPath*)GetItemData(index);
3705 if(entry == NULL)
3706 continue;
3708 sClipboard += entry->GetWinPathString();
3709 if (selection & GITSLC_COLFILENAME)
3711 sClipboard += _T("\t")+entry->GetFileOrDirectoryName();
3713 if (selection & GITSLC_COLEXT)
3715 sClipboard += _T("\t")+entry->GetFileExtension();
3718 if (selection & GITSLC_COLSTATUS)
3720 sClipboard += _T("\t")+entry->GetActionName();
3722 #if 0
3723 if (selection & SVNSLC_COLDATE)
3725 TCHAR datebuf[SVN_DATE_BUFFER];
3726 apr_time_t date = entry->last_commit_date;
3727 SVN::formatDate(datebuf, date, true);
3728 if (date)
3729 temp = datebuf;
3730 else
3731 temp.Empty();
3732 sClipboard += _T("\t")+temp;
3734 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
3735 ; i < count
3736 ; ++i)
3738 if ((dwCols == -1) && m_ColumnManager.IsVisible (i))
3740 CString value
3741 = entry->present_props[m_ColumnManager.GetName(i)];
3742 sClipboard += _T("\t") + value;
3745 #endif
3746 if (selection & GITSLC_COLADD)
3748 sClipboard += _T("\t")+entry->m_StatAdd;
3750 if (selection & GITSLC_COLDEL)
3752 sClipboard += _T("\t")+entry->m_StatDel;
3755 sClipboard += _T("\r\n");
3758 return CStringUtils::WriteAsciiStringToClipboard(sClipboard);
3761 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()
3763 #if 0
3764 std::set<CString> changelists;
3765 POSITION pos = GetFirstSelectedItemPosition();
3766 int index;
3767 while ((index = GetNextSelectedItem(pos)) >= 0)
3769 FileEntry * entry = GetListEntry(index);
3770 if (!entry->changelist.IsEmpty())
3771 changelists.insert(entry->changelist);
3773 return changelists.size();
3774 #endif
3775 return 0;
3778 bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
3781 bool bHasGroups=false;
3782 int max =0;
3784 for (size_t i = 0; i < m_arStatusArray.size(); ++i)
3786 int ParentNo = m_arStatusArray[i]->m_ParentNo&PARENT_MASK;
3787 if( ParentNo > max)
3788 max=m_arStatusArray[i]->m_ParentNo&PARENT_MASK;
3791 if (((m_dwShow & GITSLC_SHOWUNVERSIONED) && !m_UnRevFileList.IsEmpty()) ||
3792 ((m_dwShow & GITSLC_SHOWIGNORED) && !m_IgnoreFileList.IsEmpty()) ||
3793 (m_dwShow & (GITSLC_SHOWASSUMEVALID | GITSLC_SHOWSKIPWORKTREE) && !m_LocalChangesIgnoredFileList.IsEmpty()) ||
3794 max>0 || bForce)
3796 bHasGroups = true;
3799 RemoveAllGroups();
3800 EnableGroupView(bHasGroups);
3802 TCHAR groupname[1024] = { 0 };
3803 int groupindex = 0;
3805 if(bHasGroups)
3807 LVGROUP grp = {0};
3808 grp.cbSize = sizeof(LVGROUP);
3809 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3810 groupindex=0;
3812 //if(m_UnRevFileList.GetCount()>0)
3813 if(max >0)
3815 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MERGEDFILES)), 1023);
3816 grp.pszHeader = groupname;
3817 grp.iGroupId = MERGE_MASK;
3818 grp.uAlign = LVGA_HEADER_LEFT;
3819 InsertGroup(0, &grp);
3821 CAutoRepository repository(g_Git.GetGitRepository());
3822 if (!repository)
3823 CMessageBox::Show(m_hWnd, CGit::GetLibGit2LastErr(_T("Could not open repository.")), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
3824 for (int i = 0; i <= max; ++i)
3826 CString str;
3827 str.Format(IDS_STATUSLIST_GROUP_DIFFWITHPARENT, i+1);
3828 if (repository)
3830 CString rev;
3831 rev.Format(_T("%s^%d"), (LPCTSTR)m_CurrentVersion, i + 1);
3832 CGitHash hash;
3833 if (!CGit::GetHash(repository, hash, rev))
3834 str += _T(": ") + hash.ToString().Left(g_Git.GetShortHASHLength());
3836 grp.pszHeader = str.GetBuffer();
3837 str.ReleaseBuffer();
3838 grp.iGroupId = i;
3839 grp.uAlign = LVGA_HEADER_LEFT;
3840 InsertGroup(i+1, &grp);
3843 else
3845 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MODIFIEDFILES)), 1023);
3846 grp.pszHeader = groupname;
3847 grp.iGroupId = groupindex;
3848 grp.uAlign = LVGA_HEADER_LEFT;
3849 InsertGroup(groupindex++, &grp);
3853 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_NOTVERSIONEDFILES)), 1023);
3854 grp.pszHeader = groupname;
3855 grp.iGroupId = groupindex;
3856 grp.uAlign = LVGA_HEADER_LEFT;
3857 InsertGroup(groupindex++, &grp);
3860 //if(m_IgnoreFileList.GetCount()>0)
3862 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_IGNOREDFILES)), 1023);
3863 grp.pszHeader = groupname;
3864 grp.iGroupId = groupindex;
3865 grp.uAlign = LVGA_HEADER_LEFT;
3866 InsertGroup(groupindex++, &grp);
3870 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_IGNORELOCALCHANGES)), 1023);
3871 grp.pszHeader = groupname;
3872 grp.iGroupId = groupindex;
3873 grp.uAlign = LVGA_HEADER_LEFT;
3874 InsertGroup(groupindex++, &grp);
3879 #if 0
3880 m_bHasIgnoreGroup = false;
3882 // now add the items which don't belong to a group
3883 LVGROUP grp = {0};
3884 grp.cbSize = sizeof(LVGROUP);
3885 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3886 CString sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET));
3887 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
3888 grp.pszHeader = groupname;
3889 grp.iGroupId = groupindex;
3890 grp.uAlign = LVGA_HEADER_LEFT;
3891 InsertGroup(groupindex++, &grp);
3893 for (std::map<CString,int>::iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
3895 if (it->first.Compare(SVNSLC_IGNORECHANGELIST)!=0)
3897 LVGROUP grp = {0};
3898 grp.cbSize = sizeof(LVGROUP);
3899 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3900 _tcsncpy_s(groupname, 1024, it->first, 1023);
3901 grp.pszHeader = groupname;
3902 grp.iGroupId = groupindex;
3903 grp.uAlign = LVGA_HEADER_LEFT;
3904 it->second = InsertGroup(groupindex++, &grp);
3906 else
3907 m_bHasIgnoreGroup = true;
3910 if (m_bHasIgnoreGroup)
3912 // and now add the group 'ignore-on-commit'
3913 std::map<CString,int>::iterator it = m_changelists.find(SVNSLC_IGNORECHANGELIST);
3914 if (it != m_changelists.end())
3916 grp.cbSize = sizeof(LVGROUP);
3917 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3918 _tcsncpy_s(groupname, 1024, SVNSLC_IGNORECHANGELIST, 1023);
3919 grp.pszHeader = groupname;
3920 grp.iGroupId = groupindex;
3921 grp.uAlign = LVGA_HEADER_LEFT;
3922 it->second = InsertGroup(groupindex, &grp);
3925 #endif
3926 return bHasGroups;
3929 void CGitStatusListCtrl::NotifyCheck()
3931 CWnd* pParent = GetLogicalParent();
3932 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
3934 pParent->SendMessage(GITSLNM_CHECKCHANGED, m_nSelected);
3938 int CGitStatusListCtrl::UpdateFileList(CTGitPathList *list)
3940 m_CurrentVersion = GIT_REV_ZERO;
3942 g_Git.GetWorkingTreeChanges(m_StatusFileList, m_amend, list);
3944 BOOL bDeleteChecked = FALSE;
3945 int deleteFromIndex = 0;
3946 bool needsRefresh = false;
3947 for (int i = 0; i < m_StatusFileList.GetCount(); ++i)
3949 CTGitPath * gitpatch=(CTGitPath*)&m_StatusFileList[i];
3950 gitpatch->m_Checked = TRUE;
3952 if ((gitpatch->m_Action & (CTGitPath::LOGACTIONS_ADDED | CTGitPath::LOGACTIONS_REPLACED | CTGitPath::LOGACTIONS_MODIFIED)) && !gitpatch->Exists())
3954 if (!bDeleteChecked)
3956 CString message;
3957 message.Format(IDS_ASK_REMOVE_FROM_INDEX, gitpatch->GetWinPath());
3958 deleteFromIndex = CMessageBox::ShowCheck(m_hWnd, message, _T("TortoiseGit"), 1, IDI_EXCLAMATION, CString(MAKEINTRESOURCE(IDS_RESTORE_FROM_INDEX)), CString(MAKEINTRESOURCE(IDS_REMOVE_FROM_INDEX)), CString(MAKEINTRESOURCE(IDS_IGNOREBUTTON)), NULL, CString(MAKEINTRESOURCE(IDS_DO_SAME_FOR_REST)), &bDeleteChecked);
3960 if (deleteFromIndex == 1)
3962 CString err;
3963 if (g_Git.Run(_T("git.exe checkout -- \"") + gitpatch->GetWinPathString() + _T("\""), &err, CP_UTF8))
3964 MessageBox(_T("Restoring from index failed:\n") + err, _T("TortoiseGit"), MB_ICONERROR);
3965 else
3966 needsRefresh = true;
3968 else if (deleteFromIndex == 2)
3970 CString err;
3971 if (g_Git.Run(_T("git.exe rm -f --cache -- \"") + gitpatch->GetWinPathString() + _T("\""), &err, CP_UTF8))
3972 MessageBox(_T("Removing from index failed:\n") + err, _T("TortoiseGit"), MB_ICONERROR);
3973 else
3974 needsRefresh = true;
3978 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
3981 if (needsRefresh)
3982 MessageBox(_T("Due to changes to the index, please refresh the dialog (e.g., by pressing F5)."), _T("TortoiseGit"), MB_ICONINFORMATION);
3984 return 0;
3987 int CGitStatusListCtrl::UpdateWithGitPathList(CTGitPathList &list)
3989 m_arStatusArray.clear();
3990 for (int i = 0; i < list.GetCount(); ++i)
3992 CTGitPath * gitpath=(CTGitPath*)&list[i];
3994 if(gitpath ->m_Action & CTGitPath::LOGACTIONS_HIDE)
3995 continue;
3997 gitpath->m_Checked = TRUE;
3998 m_arStatusArray.push_back((CTGitPath*)&list[i]);
4000 return 0;
4003 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList &list)
4005 m_UnRevFileList = list;
4006 for (int i = 0; i < m_UnRevFileList.GetCount(); ++i)
4008 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
4009 gitpatch->m_Checked = FALSE;
4010 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
4012 return 0;
4015 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList *List)
4017 CString err;
4018 if (m_UnRevFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER, List, &err))
4020 CMessageBox::Show(NULL, _T("Failed to get UnRev file list\n") + err, _T("TortoiseGit"), MB_OK);
4021 return -1;
4024 for (int i = 0; i < m_UnRevFileList.GetCount(); ++i)
4026 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
4027 gitpatch->m_Checked = FALSE;
4028 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
4030 return 0;
4033 int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList *List)
4035 CString err;
4036 if (m_IgnoreFileList.FillUnRev(CTGitPath::LOGACTIONS_IGNORE, List, &err))
4038 CMessageBox::Show(NULL, _T("Failed to get Ignore file list\n") + err, _T("TortoiseGit"), MB_OK);
4039 return -1;
4042 for (int i = 0; i < m_IgnoreFileList.GetCount(); ++i)
4044 CTGitPath * gitpatch=(CTGitPath*)&m_IgnoreFileList[i];
4045 gitpatch->m_Checked = FALSE;
4046 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
4048 return 0;
4051 int CGitStatusListCtrl::UpdateLocalChangesIgnoredFileList(CTGitPathList *list)
4053 m_LocalChangesIgnoredFileList.FillBasedOnIndexFlags(GIT_IDXENTRY_VALID | GIT_IDXENTRY_SKIP_WORKTREE, list);
4054 for (int i = 0; i < m_LocalChangesIgnoredFileList.GetCount(); ++i)
4056 CTGitPath * gitpatch = (CTGitPath*)&m_LocalChangesIgnoredFileList[i];
4057 gitpatch->m_Checked = FALSE;
4058 m_arStatusArray.push_back((CTGitPath*)&m_LocalChangesIgnoredFileList[i]);
4060 return 0;
4063 int CGitStatusListCtrl::UpdateFileList(int mask,bool once,CTGitPathList *List)
4065 if(mask&CGitStatusListCtrl::FILELIST_MODIFY)
4067 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_MODIFY)))
4069 UpdateFileList(List);
4070 m_FileLoaded|=CGitStatusListCtrl::FILELIST_MODIFY;
4073 if (mask & CGitStatusListCtrl::FILELIST_UNVER || mask & CGitStatusListCtrl::FILELIST_IGNORE)
4075 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_UNVER)))
4077 UpdateUnRevFileList(List);
4078 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
4080 if(mask&CGitStatusListCtrl::FILELIST_IGNORE && (once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_IGNORE))))
4082 UpdateIgnoreFileList(List);
4083 m_FileLoaded |= CGitStatusListCtrl::FILELIST_IGNORE;
4086 if (mask & CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED && (once || (!(m_FileLoaded & CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED))))
4088 UpdateLocalChangesIgnoredFileList(List);
4089 m_FileLoaded |= CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED;
4091 return 0;
4094 void CGitStatusListCtrl::Clear()
4096 m_FileLoaded=0;
4097 this->DeleteAllItems();
4098 this->m_arListArray.clear();
4099 this->m_arStatusArray.clear();
4100 this->m_changelists.clear();
4103 bool CGitStatusListCtrl::CheckMultipleDiffs()
4105 UINT selCount = GetSelectedCount();
4106 if (selCount > max(3, (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\NumDiffWarning"), 10)))
4108 CString message;
4109 message.Format(IDS_STATUSLIST_WARN_MAXDIFF, selCount);
4110 return ::MessageBox(GetSafeHwnd(), message, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION) == IDYES;
4112 return true;
4114 //////////////////////////////////////////////////////////////////////////
4115 #if 0
4116 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium, DWORD * /*pdwEffect*/, POINTL pt)
4118 if(pFmtEtc->cfFormat == CF_HDROP && medium.tymed == TYMED_HGLOBAL)
4120 HDROP hDrop = (HDROP)GlobalLock(medium.hGlobal);
4121 if(hDrop != NULL)
4123 TCHAR szFileName[MAX_PATH] = {0};
4125 UINT cFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
4127 POINT clientpoint;
4128 clientpoint.x = pt.x;
4129 clientpoint.y = pt.y;
4130 ScreenToClient(m_hTargetWnd, &clientpoint);
4131 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
4133 CTSVNPathList changelistItems;
4134 for(UINT i = 0; i < cFiles; ++i)
4136 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
4137 changelistItems.AddPath(CTSVNPath(szFileName));
4139 // find the changelist name
4140 CString sChangelist;
4141 LONG_PTR nGroup = m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint);
4142 for (std::map<CString, int>::iterator it = m_pSVNStatusListCtrl->m_changelists.begin(); it != m_pSVNStatusListCtrl->m_changelists.end(); ++it)
4143 if (it->second == nGroup)
4144 sChangelist = it->first;
4145 if (!sChangelist.IsEmpty())
4147 SVN git;
4148 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
4150 for (int l=0; l<changelistItems.GetCount(); ++l)
4152 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
4153 if (index >= 0)
4155 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
4156 if (e)
4158 e->changelist = sChangelist;
4159 if (!e->IsFolder())
4161 if (m_pSVNStatusListCtrl->m_changelists.find(e->changelist)!=m_pSVNStatusListCtrl->m_changelists.end())
4162 m_pSVNStatusListCtrl->SetItemGroup(index, m_pSVNStatusListCtrl->m_changelists[e->changelist]);
4163 else
4164 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
4168 else
4170 HWND hParentWnd = GetParent(m_hTargetWnd);
4171 if (hParentWnd != NULL)
4172 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
4176 else
4178 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
4181 else
4183 SVN git;
4184 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
4186 for (int l=0; l<changelistItems.GetCount(); ++l)
4188 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
4189 if (index >= 0)
4191 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
4192 if (e)
4194 e->changelist = sChangelist;
4195 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
4198 else
4200 HWND hParentWnd = GetParent(m_hTargetWnd);
4201 if (hParentWnd != NULL)
4202 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
4206 else
4208 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
4212 else
4214 for(UINT i = 0; i < cFiles; ++i)
4216 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
4217 HWND hParentWnd = GetParent(m_hTargetWnd);
4218 if (hParentWnd != NULL)
4219 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)szFileName);
4223 GlobalUnlock(medium.hGlobal);
4225 return true; //let base free the medium
4227 HRESULT STDMETHODCALLTYPE CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect)
4229 CIDropTarget::DragOver(grfKeyState, pt, pdwEffect);
4230 *pdwEffect = DROPEFFECT_COPY;
4231 if (m_pSVNStatusListCtrl)
4233 POINT clientpoint;
4234 clientpoint.x = pt.x;
4235 clientpoint.y = pt.y;
4236 ScreenToClient(m_hTargetWnd, &clientpoint);
4237 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
4239 *pdwEffect = DROPEFFECT_MOVE;
4241 else if ((!m_pSVNStatusListCtrl->m_bFileDropsEnabled)||(m_pSVNStatusListCtrl->m_bOwnDrag))
4243 *pdwEffect = DROPEFFECT_NONE;
4246 return S_OK;
4249 #endif
4251 void CGitStatusListCtrl::FilesExport()
4253 CString exportDir;
4254 // export all changed files to a folder
4255 CBrowseFolder browseFolder;
4256 browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
4257 if (browseFolder.Show(GetSafeHwnd(), exportDir) != CBrowseFolder::OK)
4258 return;
4260 POSITION pos = GetFirstSelectedItemPosition();
4261 int index;
4262 while ((index = GetNextSelectedItem(pos)) >= 0)
4264 CTGitPath *fd = (CTGitPath*)GetItemData(index);
4265 // we cannot export directories or folders
4266 if ((fd->m_Action & CTGitPath::LOGACTIONS_DELETED) || fd->IsDirectory())
4267 continue;
4269 CAppUtils::CreateMultipleDirectory(exportDir + _T("\\") + fd->GetContainingDirectory().GetWinPathString());
4270 CString filename = exportDir + _T("\\") + fd->GetWinPathString();
4271 if (m_CurrentVersion == GIT_REV_ZERO)
4273 if (!CopyFile(g_Git.CombinePath(fd), filename, false))
4275 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
4276 return;
4279 else
4281 if (g_Git.GetOneFile(m_CurrentVersion, *fd, filename))
4283 CString out;
4284 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, (LPCTSTR)fd->GetGitPathString(), (LPCTSTR)m_CurrentVersion, (LPCTSTR)filename);
4285 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)
4286 return;
4292 void CGitStatusListCtrl::FileSaveAs(CTGitPath *path)
4294 CString filename;
4295 filename.Format(_T("%s-%s%s"), (LPCTSTR)path->GetBaseFilename(), (LPCTSTR)this->m_CurrentVersion.Left(g_Git.GetShortHASHLength()), (LPCTSTR)path->GetFileExtension());
4296 CFileDialog dlg(FALSE,NULL,
4297 filename,
4298 OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
4299 NULL);
4301 CString currentpath = g_Git.CombinePath(path->GetContainingDirectory());
4302 dlg.m_ofn.lpstrInitialDir = currentpath;
4304 CString cmd,out;
4305 INT_PTR ret = dlg.DoModal();
4306 SetCurrentDirectory(g_Git.m_CurrentDir);
4307 if (ret == IDOK)
4309 filename = dlg.GetPathName();
4310 if(m_CurrentVersion == GIT_REV_ZERO)
4312 if(!CopyFile(g_Git.CombinePath(path), filename, false))
4314 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
4315 return;
4319 else
4321 if(g_Git.GetOneFile(m_CurrentVersion,*path,filename))
4323 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, (LPCTSTR)path->GetGitPathString(), (LPCTSTR)m_CurrentVersion, (LPCTSTR)filename);
4324 CMessageBox::Show(nullptr, g_Git.GetGitLastErr(out, CGit::GIT_CMD_GETONEFILE), _T("TortoiseGit"), MB_OK);
4325 return;
4332 int CGitStatusListCtrl::RevertSelectedItemToVersion(bool parent)
4334 if(this->m_CurrentVersion.IsEmpty())
4335 return 0;
4336 if(this->m_CurrentVersion == GIT_REV_ZERO)
4337 return 0;
4339 POSITION pos = GetFirstSelectedItemPosition();
4340 int index;
4341 CString cmd,out;
4342 std::map<CString, int> versionMap;
4343 while ((index = GetNextSelectedItem(pos)) >= 0)
4345 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
4346 CString version;
4347 if (parent)
4349 int parentNo = fentry->m_ParentNo & PARENT_MASK;
4350 CString ref;
4351 ref.Format(_T("%s^%d"), (LPCTSTR)m_CurrentVersion, parentNo + 1);
4352 CGitHash hash;
4353 if (g_Git.GetHash(hash, ref))
4355 MessageBox(g_Git.GetGitLastErr(_T("Could not get hash of ref \"") + ref + _T("\".")), _T("TortoiseGit"), MB_ICONERROR);
4356 continue;
4359 version = hash.ToString();
4361 else
4362 version = m_CurrentVersion;
4364 CString filename = fentry->GetGitPathString();
4365 if (!fentry->GetGitOldPathString().IsEmpty())
4366 filename = fentry->GetGitOldPathString();
4367 cmd.Format(_T("git.exe checkout %s -- \"%s\""), (LPCTSTR)version, (LPCTSTR)filename);
4368 out.Empty();
4369 if (g_Git.Run(cmd, &out, CP_UTF8))
4371 if (MessageBox(out, _T("TortoiseGit"), MB_ICONEXCLAMATION | MB_OKCANCEL) == IDCANCEL)
4372 continue;
4374 else
4375 versionMap[version]++;
4378 out.Empty();
4379 for (auto it = versionMap.begin(); it != versionMap.end(); ++it)
4381 CString versionEntry;
4382 versionEntry.Format(IDS_STATUSLIST_FILESREVERTED, it->second, (LPCTSTR)it->first);
4383 out += versionEntry + _T("\r\n");
4385 if (!out.IsEmpty())
4386 CMessageBox::Show(nullptr, out, _T("TortoiseGit"), MB_OK);
4387 return 0;
4390 void CGitStatusListCtrl::OpenFile(CTGitPath*filepath,int mode)
4392 CString file;
4393 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
4395 file = g_Git.CombinePath(filepath);
4397 else
4399 CString temppath;
4400 GetTempPath(temppath);
4401 TCHAR szTempName[MAX_PATH] = {0};
4402 GetTempFileName(temppath, filepath->GetBaseFilename(), 0, szTempName);
4403 CString temp(szTempName);
4404 DeleteFile(szTempName);
4405 CreateDirectory(szTempName, NULL);
4406 file.Format(_T("%s\\%s_%s%s"),
4407 (LPCTSTR)temp,
4408 (LPCTSTR)filepath->GetBaseFilename(),
4409 (LPCTSTR)m_CurrentVersion.Left(g_Git.GetShortHASHLength()),
4410 (LPCTSTR)filepath->GetFileExtension());
4411 CString cmd,out;
4412 if(g_Git.GetOneFile(m_CurrentVersion, *filepath, file))
4414 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, (LPCTSTR)filepath->GetGitPathString(), (LPCTSTR)m_CurrentVersion, (LPCTSTR)file);
4415 CMessageBox::Show(nullptr, g_Git.GetGitLastErr(out, CGit::GIT_CMD_GETONEFILE), _T("TortoiseGit"), MB_OK);
4416 return;
4418 SetFileAttributes(file, FILE_ATTRIBUTE_READONLY);
4420 if(mode == ALTERNATIVEEDITOR)
4422 CAppUtils::LaunchAlternativeEditor(file);
4423 return;
4426 if (mode == OPEN)
4427 CAppUtils::ShellOpen(file, GetSafeHwnd());
4428 else
4429 CAppUtils::ShowOpenWithDialog(file, GetSafeHwnd());
4432 void CGitStatusListCtrl::DeleteSelectedFiles()
4434 //Collect paths
4435 std::vector<int> selectIndex;
4437 POSITION pos = GetFirstSelectedItemPosition();
4438 int index;
4439 while ((index = GetNextSelectedItem(pos)) >= 0)
4441 selectIndex.push_back(index);
4444 CAutoRepository repo = g_Git.GetGitRepository();
4445 if (!repo)
4447 MessageBox(g_Git.GetLibGit2LastErr(_T("Could not open repository.")), _T("TortoiseGit"), MB_OK);
4448 return;
4450 CAutoIndex gitIndex;
4451 if (git_repository_index(gitIndex.GetPointer(), repo))
4453 g_Git.GetLibGit2LastErr(_T("Could not open index."));
4454 return;
4456 int needWriteIndex = 0;
4458 //Create file-list ('\0' separated) for SHFileOperation
4459 CString filelist;
4460 for (size_t i = 0; i < selectIndex.size(); ++i)
4462 index = selectIndex[i];
4464 CTGitPath * path=(CTGitPath*)GetItemData(index);
4465 ASSERT(path);
4466 if (path == nullptr)
4467 continue;
4469 // do not report errors as we could remove an unversioned file
4470 needWriteIndex += git_index_remove_bypath(gitIndex, CUnicodeUtils::GetUTF8(path->GetGitPathString())) == 0 ? 1 : 0;
4472 if (!path->Exists())
4473 continue;
4475 filelist += path->GetWinPathString();
4476 filelist += _T("|");
4478 filelist += _T("|");
4479 int len = filelist.GetLength();
4480 std::unique_ptr<TCHAR[]> buf(new TCHAR[len + 2]);
4481 _tcscpy_s(buf.get(), len + 2, filelist);
4482 CStringUtils::PipesToNulls(buf.get(), len + 2);
4483 SHFILEOPSTRUCT fileop;
4484 fileop.hwnd = this->m_hWnd;
4485 fileop.wFunc = FO_DELETE;
4486 fileop.pFrom = buf.get();
4487 fileop.pTo = NULL;
4488 fileop.fFlags = FOF_NO_CONNECTED_ELEMENTS | ((GetAsyncKeyState(VK_SHIFT) & 0x8000) ? 0 : FOF_ALLOWUNDO);
4489 fileop.lpszProgressTitle = _T("deleting file");
4490 int result = SHFileOperation(&fileop);
4492 if ((result == 0 || len == 1) && (!fileop.fAnyOperationsAborted))
4494 if (needWriteIndex && git_index_write(gitIndex))
4495 MessageBox(g_Git.GetLibGit2LastErr(_T("Could not write index.")), _T("TortoiseGit"), MB_OK);
4497 if (needWriteIndex)
4499 CWnd* pParent = GetLogicalParent();
4500 if (pParent && pParent->GetSafeHwnd())
4501 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
4502 SetRedraw(TRUE);
4503 return;
4506 SetRedraw(FALSE);
4507 POSITION pos2 = NULL;
4508 while ((pos2 = GetFirstSelectedItemPosition()) != 0)
4510 int index2 = GetNextSelectedItem(pos2);
4511 if (GetCheck(index2))
4512 m_nSelected--;
4513 m_nTotal--;
4515 RemoveListEntry(index2);
4517 SetRedraw(TRUE);
4521 BOOL CGitStatusListCtrl::OnWndMsg(UINT message, WPARAM wParam, LPARAM lParam, LRESULT* pResult)
4523 switch (message)
4525 case WM_MENUCHAR: // only supported by IContextMenu3
4526 if (g_IContext3)
4528 g_IContext3->HandleMenuMsg2(message, wParam, lParam, pResult);
4529 return TRUE;
4531 break;
4533 case WM_DRAWITEM:
4534 case WM_MEASUREITEM:
4535 if (wParam)
4536 break; // if wParam != 0 then the message is not menu-related
4538 case WM_INITMENU:
4539 case WM_INITMENUPOPUP:
4541 HMENU hMenu = (HMENU)wParam;
4542 if (pfnSHCreateDefaultContextMenu && pfnAssocCreateForClasses && (hMenu == m_hShellMenu) && (GetMenuItemCount(hMenu) == 0))
4544 // the shell submenu is populated only on request, i.e. right
4545 // before the submenu is shown
4546 if (g_pFolderhook)
4548 delete g_pFolderhook;
4549 g_pFolderhook = nullptr;
4551 CTGitPathList targetList;
4552 FillListOfSelectedItemPaths(targetList);
4553 if (targetList.GetCount() > 0)
4555 // get IShellFolder interface of Desktop (root of shell namespace)
4556 if (g_psfDesktopFolder)
4557 g_psfDesktopFolder->Release();
4558 SHGetDesktopFolder(&g_psfDesktopFolder); // needed to obtain full qualified pidl
4560 // ParseDisplayName creates a PIDL from a file system path relative to the IShellFolder interface
4561 // but since we use the Desktop as our interface and the Desktop is the namespace root
4562 // that means that it's a fully qualified PIDL, which is what we need
4564 if (g_pidlArray)
4566 for (int i = 0; i < g_pidlArrayItems; i++)
4568 if (g_pidlArray[i])
4569 CoTaskMemFree(g_pidlArray[i]);
4571 CoTaskMemFree(g_pidlArray);
4572 g_pidlArray = nullptr;
4573 g_pidlArrayItems = 0;
4575 int nItems = targetList.GetCount();
4576 g_pidlArray = (LPITEMIDLIST *)CoTaskMemAlloc((nItems + 10) * sizeof(LPITEMIDLIST));
4577 SecureZeroMemory(g_pidlArray, (nItems + 10) * sizeof(LPITEMIDLIST));
4578 int succeededItems = 0;
4579 PIDLIST_RELATIVE pidl = nullptr;
4581 int bufsize = 1024;
4582 std::unique_ptr<WCHAR[]> filepath(new WCHAR[bufsize]);
4583 for (int i = 0; i < nItems; i++)
4585 CString fullPath = g_Git.CombinePath(targetList[i].GetWinPath());
4586 if (bufsize < fullPath.GetLength())
4588 bufsize = fullPath.GetLength() + 3;
4589 filepath = std::unique_ptr<WCHAR[]>(new WCHAR[bufsize]);
4591 wcscpy_s(filepath.get(), bufsize, fullPath);
4592 if (SUCCEEDED(g_psfDesktopFolder->ParseDisplayName(nullptr, 0, filepath.get(), nullptr, &pidl, nullptr)))
4593 g_pidlArray[succeededItems++] = pidl; // copy pidl to pidlArray
4595 if (succeededItems == 0)
4597 CoTaskMemFree(g_pidlArray);
4598 g_pidlArray = nullptr;
4601 g_pidlArrayItems = succeededItems;
4603 if (g_pidlArrayItems)
4605 CString ext = targetList[0].GetFileExtension();
4607 ASSOCIATIONELEMENT const rgAssocItem[] =
4609 { ASSOCCLASS_PROGID_STR, NULL, ext },
4610 { ASSOCCLASS_SYSTEM_STR, NULL, ext },
4611 { ASSOCCLASS_APP_STR, NULL, ext },
4612 { ASSOCCLASS_STAR, NULL, NULL },
4613 { ASSOCCLASS_FOLDER, NULL, NULL },
4615 IQueryAssociations * pIQueryAssociations;
4616 pfnAssocCreateForClasses(rgAssocItem, ARRAYSIZE(rgAssocItem), IID_IQueryAssociations, (void**)&pIQueryAssociations);
4618 g_pFolderhook = new CIShellFolderHook(g_psfDesktopFolder, targetList);
4619 LPCONTEXTMENU icm1 = nullptr;
4621 DEFCONTEXTMENU dcm = { 0 };
4622 dcm.hwnd = m_hWnd;
4623 dcm.psf = g_pFolderhook;
4624 dcm.cidl = g_pidlArrayItems;
4625 dcm.apidl = (PCUITEMID_CHILD_ARRAY)g_pidlArray;
4626 dcm.punkAssociationInfo = pIQueryAssociations;
4627 if (SUCCEEDED(pfnSHCreateDefaultContextMenu(&dcm, IID_IContextMenu, (void**)&icm1)))
4629 int iMenuType = 0; // to know which version of IContextMenu is supported
4630 if (icm1)
4631 { // since we got an IContextMenu interface we can now obtain the higher version interfaces via that
4632 if (icm1->QueryInterface(IID_IContextMenu3, (void**)&m_pContextMenu) == S_OK)
4633 iMenuType = 3;
4634 else if (icm1->QueryInterface(IID_IContextMenu2, (void**)&m_pContextMenu) == S_OK)
4635 iMenuType = 2;
4637 if (m_pContextMenu)
4638 icm1->Release(); // we can now release version 1 interface, cause we got a higher one
4639 else
4641 // since no higher versions were found
4642 // redirect ppContextMenu to version 1 interface
4643 iMenuType = 1;
4644 m_pContextMenu = icm1;
4647 if (m_pContextMenu)
4649 // lets fill the our popup menu
4650 UINT flags = CMF_NORMAL;
4651 flags |= (GetKeyState(VK_SHIFT) & 0x8000) != 0 ? CMF_EXTENDEDVERBS : 0;
4652 m_pContextMenu->QueryContextMenu(hMenu, 0, SHELL_MIN_CMD, SHELL_MAX_CMD, flags);
4655 // subclass window to handle menu related messages in CShellContextMenu
4656 if (iMenuType > 1) // only subclass if its version 2 or 3
4658 if (iMenuType == 2)
4659 g_IContext2 = (LPCONTEXTMENU2)m_pContextMenu;
4660 else // version 3
4661 g_IContext3 = (LPCONTEXTMENU3)m_pContextMenu;
4665 pIQueryAssociations->Release();
4668 if (g_IContext3)
4669 g_IContext3->HandleMenuMsg2(message, wParam, lParam, pResult);
4670 else if (g_IContext2)
4671 g_IContext2->HandleMenuMsg(message, wParam, lParam);
4672 return TRUE;
4676 break;
4677 default:
4678 break;
4681 return CListCtrl::OnWndMsg(message, wParam, lParam, pResult);