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