?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
If entry does not exist any more, explore to nearest matching folder
[TortoiseGit.git] / src / Git / GitStatusListCtrl.cpp
blobd1140e4401becac8811b27ad63ee4b0caeaa6282
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 "GitStatus.h"
41 #include "InputDlg.h"
42 #include "ShellUpdater.h"
43 #include "GitAdminDir.h"
44 #include "DropFiles.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 {
1853 CString p = g_Git.m_CurrentDir + _T("\\") + filepath->GetWinPathString();
1854 // if filepath does not exist any more, navigate to closest matching folder
1855 while (!PathFileExists(p))
1856 {
1857 int pos = p.ReverseFind(_T('\\'));
1858 if (pos <= 3)
1859 break;
1860 p = p.Left(pos);
1861 }
1862 ShellExecute(GetSafeHwnd(), _T("explore"), p, nullptr, nullptr, SW_SHOW);
1863 }
1864 break;
1865
1866 case IDGITLC_CREATERESTORE:
1867 {
1868 POSITION pos = GetFirstSelectedItemPosition();
1869 while (pos)
1870 {
1871 int index = GetNextSelectedItem(pos);
1872 CTGitPath * entry2 = (CTGitPath * )GetItemData(index);
1873 ASSERT(entry2 != NULL);
1874 if (entry2 == NULL || entry2->IsDirectory())
1875 continue;
1876 if (m_restorepaths.find(entry2->GetWinPathString()) != m_restorepaths.end())
1877 continue;
1878 CTGitPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
1879 // delete the temp file: the temp file has the FILE_ATTRIBUTE_TEMPORARY flag set
1880 // and copying the real file over it would leave that temp flag.
1881 DeleteFile(tempFile.GetWinPath());
1882 if (CopyFile(g_Git.m_CurrentDir + _T("\\") + entry2->GetWinPathString(), tempFile.GetWinPath(), FALSE))
1883 {
1884 m_restorepaths[entry2->GetWinPathString()] = tempFile.GetWinPathString();
1885 SetItemState(index, INDEXTOOVERLAYMASK(OVL_RESTORE), LVIS_OVERLAYMASK);
1886 }
1887 }
1888 Invalidate();
1889 }
1890 break;
1891
1892 case IDGITLC_RESTOREPATH:
1893 {
1894 if (CMessageBox::Show(m_hWnd, IDS_STATUSLIST_RESTOREPATH, IDS_APPNAME, 2, IDI_QUESTION, IDS_RESTOREBUTTON, IDS_ABORTBUTTON) == 2)
1895 break;
1896 POSITION pos = GetFirstSelectedItemPosition();
1897 while (pos)
1898 {
1899 int index = GetNextSelectedItem(pos);
1900 CTGitPath * entry2 = (CTGitPath * )GetItemData(index);
1901 ASSERT(entry2 != NULL);
1902 if (entry2 == NULL)
1903 continue;
1904 if (m_restorepaths.find(entry2->GetWinPathString()) == m_restorepaths.end())
1905 continue;
1906 if (CopyFile(m_restorepaths[entry2->GetWinPathString()], g_Git.m_CurrentDir + _T("\\") + entry2->GetWinPathString(), FALSE))
1907 {
1908 m_restorepaths.erase(entry2->GetWinPathString());
1909 SetItemState(index, 0, LVIS_OVERLAYMASK);
1910 }
1911 }
1912 Invalidate();
1913 }
1914 break;
1915
1916 // Compare current version and work copy.
1917 case IDGITLC_COMPAREWC:
1918 {
1919 if (!CheckMultipleDiffs())
1920 break;
1921 POSITION pos = GetFirstSelectedItemPosition();
1922 while ( pos )
1923 {
1924 int index = GetNextSelectedItem(pos);
1925 StartDiffWC(index);
1926 }
1927 }
1928 break;
1929
1930 // Compare with base version. when current version is zero, compare workcopy and HEAD.
1931 case IDGITLC_COMPARE:
1932 {
1933 if (!CheckMultipleDiffs())
1934 break;
1935 POSITION pos = GetFirstSelectedItemPosition();
1936 while ( pos )
1937 {
1938 int index = GetNextSelectedItem(pos);
1939 StartDiff(index);
1940 }
1941 }
1942 break;
1943
1944 case IDGITLC_COMPARETWOREVISIONS:
1945 {
1946 POSITION pos = GetFirstSelectedItemPosition();
1947 while ( pos )
1948 {
1949 int index = GetNextSelectedItem(pos);
1950 StartDiffTwo(index);
1951 }
1952 }
1953 break;
1954
1955 case IDGITLC_COMPARETWOFILES:
1956 {
1957 POSITION pos = GetFirstSelectedItemPosition();
1958 CTGitPath * firstfilepath = NULL, * secondfilepath = NULL;
1959 if (pos)
1960 {
1961 firstfilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
1962 ASSERT(firstfilepath != NULL);
1963 if (firstfilepath == NULL)
1964 break;
1965
1966 secondfilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
1967 ASSERT(secondfilepath != NULL);
1968 if (secondfilepath == NULL)
1969 break;
1970
1971 CString sCmd;
1972 sCmd.Format(_T("/command:diff /path:\"%s\" /path2:\"%s\" /hwnd:%p"), firstfilepath->GetWinPath(), secondfilepath->GetWinPath(), (void*)m_hWnd);
1973 CAppUtils::RunTortoiseGitProc(sCmd);
1974 }
1975 }
1976 break;
1977
1978 case IDGITLC_GNUDIFF1:
1979 {
1980 POSITION pos = GetFirstSelectedItemPosition();
1981 while (pos)
1982 {
1983 CTGitPath * selectedFilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
1984 if (m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
1985 {
1986 CString fromwhere;
1987 if (m_amend)
1988 fromwhere = _T("~1");
1989 CAppUtils::StartShowUnifiedDiff(m_hWnd, *selectedFilepath, GitRev::GetHead() + fromwhere, *selectedFilepath, GitRev::GetWorkingCopy());
1990 }
1991 else
1992 {
1993 if ((selectedFilepath->m_ParentNo & (PARENT_MASK | MERGE_MASK)) == 0)
1994 CAppUtils::StartShowUnifiedDiff(m_hWnd, *selectedFilepath, m_CurrentVersion + _T("~1"), *selectedFilepath, m_CurrentVersion);
1995 else
1996 {
1997 CString str;
1998 if (!(selectedFilepath->m_ParentNo & MERGE_MASK))
1999 str.Format(_T("%s^%d"), m_CurrentVersion, (selectedFilepath->m_ParentNo & PARENT_MASK) + 1);
2000
2001 CAppUtils::StartShowUnifiedDiff(m_hWnd, *selectedFilepath, str, *selectedFilepath, m_CurrentVersion, false, false, false, false, !!(selectedFilepath->m_ParentNo & MERGE_MASK));
2002 }
2003 }
2004 }
2005 }
2006 break;
2007
2008 case IDGITLC_GNUDIFF2REVISIONS:
2009 {
2010 CAppUtils::StartShowUnifiedDiff(m_hWnd, *filepath, m_Rev2, *filepath, m_Rev1);
2011 }
2012 break;
2013
2014 case IDGITLC_ADD:
2015 {
2016 CTGitPathList paths;
2017 FillListOfSelectedItemPaths(paths, true);
2018
2019 CGitProgressDlg progDlg;
2020 progDlg.SetCommand(CGitProgressList::GitProgress_Add);
2021 progDlg.SetPathList(paths);
2022 progDlg.SetItemCount(paths.GetCount());
2023 progDlg.DoModal();
2024
2025 // reset unchecked status
2026 POSITION pos = GetFirstSelectedItemPosition();
2027 int index;
2028 while ((index = GetNextSelectedItem(pos)) >= 0)
2029 {
2030 m_mapFilenameToChecked.erase(((CTGitPath*)GetItemData(index))->GetGitPathString());
2031 }
2032
2033 if (NULL != GetLogicalParent() && NULL != GetLogicalParent()->GetSafeHwnd())
2034 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2035
2036 SetRedraw(TRUE);
2037 }
2038 break;
2039
2040 case IDGITLC_DELETE:
2041 DeleteSelectedFiles();
2042 break;
2043
2044 case IDGITLC_BLAME:
2045 {
2046 CAppUtils::LaunchTortoiseBlame(g_Git.m_CurrentDir+_T("\\")+filepath->GetWinPath(), m_CurrentVersion);
2047 }
2048 break;
2049
2050 case IDGITLC_LOG:
2051 case IDGITLC_LOGSUBMODULE:
2052 {
2053 CString sCmd;
2054 sCmd.Format(_T("/command:log /path:\"%s\""), g_Git.m_CurrentDir + _T("\\") + filepath->GetWinPath());
2055 if (cmd == IDGITLC_LOG && filepath->IsDirectory())
2056 sCmd += _T(" /submodule");
2057 CAppUtils::RunTortoiseGitProc(sCmd, false, !(cmd == IDGITLC_LOGSUBMODULE));
2058 }
2059 break;
2060
2061 case IDGITLC_LOGOLDNAME:
2062 {
2063 CTGitPath oldName(filepath->GetGitOldPathString());
2064 CString sCmd;
2065 sCmd.Format(_T("/command:log /path:\"%s\""), g_Git.m_CurrentDir + _T("\\") + oldName.GetWinPath());
2066 CAppUtils::RunTortoiseGitProc(sCmd);
2067 }
2068 break;
2069
2070 case IDGITLC_EDITCONFLICT:
2071 {
2072 if (CAppUtils::ConflictEdit(*filepath, false, this->m_bIsRevertTheirMy))
2073 {
2074 CString conflictedFile = g_Git.m_CurrentDir + _T("\\") + filepath->GetWinPathString();
2075 if (!PathFileExists(conflictedFile) && NULL != GetLogicalParent() && NULL != GetLogicalParent()->GetSafeHwnd())
2076 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2077 }
2078 }
2079 break;
2080
2081 case IDGITLC_RESOLVETHEIRS: //follow up
2082 case IDGITLC_RESOLVEMINE: //follow up
2083 case IDGITLC_RESOLVECONFLICT:
2084 {
2085 if (CMessageBox::Show(m_hWnd, IDS_PROC_RESOLVE, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO)==IDYES)
2086 {
2087 POSITION pos = GetFirstSelectedItemPosition();
2088 while (pos != 0)
2089 {
2090 int index;
2091 index = GetNextSelectedItem(pos);
2092 CTGitPath * fentry =(CTGitPath*) this->GetItemData(index);
2093 if(fentry == NULL)
2094 continue;
2095
2096 bool b_local = false, b_remote = false;
2097 {
2098 BYTE_VECTOR vector;
2099 CString cmd;
2100 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""), fentry->GetGitPathString());
2101 if (g_Git.Run(cmd, &vector))
2102 {
2103 CMessageBox::Show(NULL, _T("git ls-files failed!"), _T("TortoiseGit"), MB_OK);
2104 continue;
2105 }
2106
2107 CTGitPathList list;
2108 if (list.ParserFromLsFile(vector))
2109 {
2110 CMessageBox::Show(NULL, _T("Parse ls-files failed!"), _T("TortoiseGit"), MB_OK);
2111 continue;
2112 }
2113
2114 if (list.IsEmpty())
2115 continue;
2116 for (int i = 0; i < list.GetCount(); ++i)
2117 {
2118 if (list[i].m_Stage == 2)
2119 b_local = true;
2120 if (list[i].m_Stage == 3)
2121 b_remote = true;
2122 }
2123 }
2124
2125 CString gitcmd,output;
2126 output.Empty();
2127
2128 if ( ((!this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVETHEIRS) ||
2129 ((this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVEMINE) )
2130 {
2131 if (b_local && b_remote)
2132 gitcmd.Format(_T("git.exe checkout-index -f --stage=3 -- \"%s\""), fentry->GetGitPathString());
2133 else if (b_remote)
2134 gitcmd.Format(_T("git.exe add -f -- \"%s\""), fentry->GetGitPathString());
2135 else if (b_local)
2136 gitcmd.Format(_T("git.exe rm -f -- \"%s\""), fentry->GetGitPathString());
2137 if (g_Git.Run(gitcmd, &output,CP_UTF8))
2138 {
2139 CMessageBox::Show(m_hWnd, output, _T("TortoiseGit"), MB_ICONERROR);
2140 continue;
2141 }
2142 }
2143 output.Empty();
2144 if ( ((!this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVEMINE) ||
2145 ((this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVETHEIRS) )
2146 {
2147 if (b_local && b_remote)
2148 gitcmd.Format(_T("git.exe checkout-index -f --stage=2 -- \"%s\""),fentry->GetGitPathString());
2149 else if (b_local)
2150 gitcmd.Format(_T("git.exe add -f -- \"%s\""), fentry->GetGitPathString());
2151 else if (b_remote)
2152 gitcmd.Format(_T("git.exe rm -f -- \"%s\""), fentry->GetGitPathString());
2153 if (g_Git.Run(gitcmd, &output,CP_UTF8))
2154 {
2155 CMessageBox::Show(m_hWnd, output, _T("TortoiseGit"), MB_ICONERROR);
2156 continue;
2157 }
2158
2159 }
2160 output.Empty();
2161 if (b_local && b_remote && fentry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
2162 {
2163 gitcmd.Format(_T("git.exe add -f -- \"%s\""),fentry->GetGitPathString());
2164 if (g_Git.Run(gitcmd, &output,CP_UTF8))
2165 {
2166 CMessageBox::Show(m_hWnd, output, _T("TortoiseGit"), MB_ICONERROR);
2167 }
2168 else
2169 {
2170 fentry->m_Action |= CTGitPath::LOGACTIONS_MODIFIED;
2171 fentry->m_Action &=~CTGitPath::LOGACTIONS_UNMERGED;
2172 }
2173 }
2174
2175 CAppUtils::RemoveTempMergeFile(*fentry);
2176
2177 }
2178 Show(m_dwShow, 0, m_bShowFolders,0,true);
2179 }
2180 }
2181 break;
2182
2183 case IDGITLC_IGNORE:
2184 {
2185 CTGitPathList ignorelist;
2186 //std::vector<CString> toremove;
2187 FillListOfSelectedItemPaths(ignorelist, true);
2188
2189 if(!CAppUtils::IgnoreFile(ignorelist,false))
2190 break;
2191
2192 SetRedraw(FALSE);
2193 CWnd* pParent = GetLogicalParent();
2194 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2195 {
2196 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2197 }
2198 SetRedraw(TRUE);
2199 }
2200 break;
2201
2202 case IDGITLC_IGNOREMASK:
2203 {
2204 CString common;
2205 CString ext=filepath->GetFileExtension();
2206 CTGitPathList ignorelist;
2207 FillListOfSelectedItemPaths(ignorelist, true);
2208
2209 if (!CAppUtils::IgnoreFile(ignorelist,true))
2210 break;
2211
2212 SetRedraw(FALSE);
2213 CWnd* pParent = GetLogicalParent();
2214 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2215 {
2216 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2217 }
2218
2219 SetRedraw(TRUE);
2220 }
2221 break;
2222
2223 case IDGITLC_IGNOREFOLDER:
2224 {
2225 CTGitPathList ignorelist;
2226 ignorelist.AddPath(filepath->GetContainingDirectory());
2227
2228 if (!CAppUtils::IgnoreFile(ignorelist, false))
2229 break;
2230
2231 SetRedraw(FALSE);
2232 CWnd *pParent = GetLogicalParent();
2233 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2234 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2235
2236 SetRedraw(TRUE);
2237 }
2238 break;
2239 case IDGITLC_COMMIT:
2240 {
2241 CTGitPathList targetList;
2242 FillListOfSelectedItemPaths(targetList);
2243 CTGitPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
2244 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
2245 CString commandline = _T("/command:commit /pathfile:\"");
2246 commandline += tempFile.GetWinPathString();
2247 commandline += _T("\"");
2248 commandline += _T(" /deletepathfile");
2249 CAppUtils::RunTortoiseGitProc(commandline);
2250 }
2251 break;
2252 case IDGITLC_REVERT:
2253 {
2254 // If at least one item is not in the status "added"
2255 // we ask for a confirmation
2256 BOOL bConfirm = FALSE;
2257 POSITION pos = GetFirstSelectedItemPosition();
2258 int index;
2259 while ((index = GetNextSelectedItem(pos)) >= 0)
2260 {
2261 //FileEntry * fentry = GetListEntry(index);
2262 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
2263 if(fentry && fentry->m_Action &CTGitPath::LOGACTIONS_MODIFIED && !fentry->IsDirectory())
2264 {
2265 bConfirm = TRUE;
2266 break;
2267 }
2268 }
2269
2270 CString str;
2271 str.Format(IDS_PROC_WARNREVERT,GetSelectedCount());
2272
2273 if (!bConfirm || CMessageBox::Show(this->m_hWnd, str, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION)==IDYES)
2274 {
2275 CTGitPathList targetList;
2276 FillListOfSelectedItemPaths(targetList);
2277
2278 // make sure that the list is reverse sorted, so that
2279 // children are removed before any parents
2280 targetList.SortByPathname(true);
2281
2282 // put all reverted files in the trashbin, except the ones with 'added'
2283 // status because they are not restored by the revert.
2284 CTGitPathList delList;
2285 POSITION pos = GetFirstSelectedItemPosition();
2286 int index;
2287 while ((index = GetNextSelectedItem(pos)) >= 0)
2288 {
2289 CTGitPath *entry=(CTGitPath *)GetItemData(index);
2290 if (entry&&(!(entry->m_Action& CTGitPath::LOGACTIONS_ADDED))
2291 && (!(entry->m_Action& CTGitPath::LOGACTIONS_REPLACED)) && !entry->IsDirectory())
2292 {
2293 CTGitPath fullpath;
2294 fullpath.SetFromWin(g_Git.m_CurrentDir+_T("\\")+entry->GetWinPath());
2295 delList.AddPath(fullpath);
2296 }
2297 }
2298 if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))
2299 delList.DeleteAllFiles(true);
2300
2301 CString revertToCommit = _T("HEAD");
2302 if (m_amend)
2303 revertToCommit = _T("HEAD~1");
2304 if (g_Git.Revert(revertToCommit, targetList))
2305 {
2306 CMessageBox::Show(this->m_hWnd, _T("Revert Fail"), _T("TortoiseGit"), MB_ICONERROR);
2307 }
2308 else
2309 {
2310 bool updateStatusList = false;
2311 for (int i = 0 ; i < targetList.GetCount(); ++i)
2312 {
2313 int nListboxEntries = GetItemCount();
2314 for (int nItem=0; nItem<nListboxEntries; ++nItem)
2315 {
2316 CTGitPath *path=(CTGitPath*)GetItemData(nItem);
2317 if (path->GetGitPathString()==targetList[i].GetGitPathString() && !path->IsDirectory())
2318 {
2319 if(path->m_Action & CTGitPath::LOGACTIONS_ADDED)
2320 {
2321 path->m_Action = CTGitPath::LOGACTIONS_UNVER;
2322 SetEntryCheck(path,nItem,false);
2323 updateStatusList = true;
2324 #if 0 // revert an added file and some entry will be cloned (part 1/2)
2325 SetItemGroup(nItem,1);
2326 this->m_StatusFileList.RemoveItem(*path);
2327 this->m_UnRevFileList.AddPath(*path);
2328 //this->m_IgnoreFileList.RemoveItem(*path);
2329 #endif
2330 }
2331 else
2332 {
2333 RemoveListEntry(nItem);
2334 }
2335 break;
2336 }
2337 else if (path->GetGitPathString()==targetList[i].GetGitPathString() && path->IsDirectory() && path->IsWCRoot())
2338 {
2339 CString sCmd;
2340 sCmd.Format(_T("/command:revert /path:\"%s\""), path->GetGitPathString());
2341 CCommonAppUtils::RunTortoiseGitProc(sCmd);
2342 }
2343 }
2344 }
2345 SetRedraw(TRUE);
2346 SaveColumnWidths();
2347 #if 0 // revert an added file and some entry will be cloned (part 2/2)
2348 Show(m_dwShow, 0, m_bShowFolders,updateStatusList,true);
2349 NotifyCheck();
2350 #else
2351 if (updateStatusList && nullptr != GetLogicalParent() && nullptr != GetLogicalParent()->GetSafeHwnd())
2352 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2353 #endif
2354 }
2355 }
2356 }
2357 break;
2358
2359 case IDGITLC_ASSUMEVALID:
2360 SetGitIndexFlagsForSelectedFiles(IDS_PROC_MARK_ASSUMEVALID, BST_CHECKED, BST_INDETERMINATE);
2361 break;
2362 case IDGITLC_SKIPWORKTREE:
2363 SetGitIndexFlagsForSelectedFiles(IDS_PROC_MARK_SKIPWORKTREE, BST_INDETERMINATE, BST_CHECKED);
2364 break;
2365 case IDGITLC_UNSETIGNORELOCALCHANGES:
2366 SetGitIndexFlagsForSelectedFiles(IDS_PROC_UNSET_IGNORELOCALCHANGES, BST_UNCHECKED, BST_UNCHECKED);
2367 break;
2368 case IDGITLC_COPY:
2369 CopySelectedEntriesToClipboard(0);
2370 break;
2371 case IDGITLC_COPYEXT:
2372 CopySelectedEntriesToClipboard((DWORD)-1);
2373 break;
2374 case IDGITLC_EXPORT:
2375 FilesExport();
2376 break;
2377 case IDGITLC_SAVEAS:
2378 FileSaveAs(filepath);
2379 break;
2380
2381 case IDGITLC_REVERTTOREV:
2382 RevertSelectedItemToVersion();
2383 break;
2384 case IDGITLC_REVERTTOPARENT:
2385 RevertSelectedItemToVersion(true);
2386 break;
2387 #if 0
2388 case IDSVNLC_COMMIT:
2389 {
2390 CTSVNPathList targetList;
2391 FillListOfSelectedItemPaths(targetList);
2392 CTSVNPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
2393 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
2394 CString commandline = CPathUtils::GetAppDirectory();
2395 commandline += _T("TortoiseGitProc.exe /command:commit /pathfile:\"");
2396 commandline += tempFile.GetWinPathString();
2397 commandline += _T("\"");
2398 commandline += _T(" /deletepathfile");
2399 CAppUtils::LaunchApplication(commandline, NULL, false);
2400 }
2401 break;
2402 case IDSVNLC_CREATEIGNORECS:
2403 CreateChangeList(SVNSLC_IGNORECHANGELIST);
2404 break;
2405 case IDSVNLC_CREATECS:
2406 {
2407 CCreateChangelistDlg dlg;
2408 if (dlg.DoModal() == IDOK)
2409 {
2410 CreateChangeList(dlg.m_sName);
2411 }
2412 }
2413 break;
2414 default:
2415 {
2416 if (cmd < IDSVNLC_MOVETOCS)
2417 break;
2418 CTSVNPathList changelistItems;
2419 FillListOfSelectedItemPaths(changelistItems);
2420
2421 // find the changelist name
2422 CString sChangelist;
2423 int cmdID = IDSVNLC_MOVETOCS;
2424 SetRedraw(FALSE);
2425 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
2426 {
2427 if ((it->first.Compare(SVNSLC_IGNORECHANGELIST))&&(entry->changelist.Compare(it->first)))
2428 {
2429 if (cmd == cmdID)
2430 {
2431 sChangelist = it->first;
2432 }
2433 cmdID++;
2434 }
2435 }
2436 if (!sChangelist.IsEmpty())
2437 {
2438 SVN git;
2439 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
2440 {
2441 // The changelists were moved, but we now need to run through the selected items again
2442 // and update their changelist
2443 POSITION pos = GetFirstSelectedItemPosition();
2444 int index;
2445 while ((index = GetNextSelectedItem(pos)) >= 0)
2446 {
2447 FileEntry * e = GetListEntry(index);
2448 e->changelist = sChangelist;
2449 if (!e->IsFolder())
2450 {
2451 if (m_changelists.find(e->changelist)!=m_changelists.end())
2452 SetItemGroup(index, m_changelists[e->changelist]);
2453 else
2454 SetItemGroup(index, 0);
2455 }
2456 }
2457 }
2458 else
2459 {
2460 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
2461 }
2462 }
2463 SetRedraw(TRUE);
2464 }
2465 break;
2466 #endif
2467
2468 } // switch (cmd)
2469 m_bBlock = FALSE;
2470 AfxGetApp()->DoWaitCursor(-1);
2471 GetStatisticsString();
2472 //int iItemCountAfterMenuCmd = GetItemCount();
2473 //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)
2474 //{
2475 // CWnd* pParent = GetParent();
2476 // if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2477 // {
2478 // pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);
2479 // }
2480 //}
2481 } // if (popup.CreatePopupMenu())
2482 } // if (selIndex >= 0)
2483
2484 }
2485
2486 void CGitStatusListCtrl::SetGitIndexFlagsForSelectedFiles(UINT message, BOOL assumevalid, BOOL skipworktree)
2487 {
2488 if (CMessageBox::Show(GetSafeHwnd(), message, IDS_APPNAME, MB_YESNO | MB_DEFBUTTON2 | MB_ICONQUESTION) == IDNO)
2489 return;
2490
2491 CAutoRepository repository(g_Git.GetGitRepository());
2492 if (!repository)
2493 {
2494 CMessageBox::Show(m_hWnd, g_Git.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR);
2495 return;
2496 }
2497
2498 CAutoIndex gitindex;
2499 if (git_repository_index(gitindex.GetPointer(), repository))
2500 {
2501 CMessageBox::Show(m_hWnd, g_Git.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR);
2502 return;
2503 }
2504
2505 POSITION pos = GetFirstSelectedItemPosition();
2506 int index = -1;
2507 while ((index = GetNextSelectedItem(pos)) >= 0)
2508 {
2509 CTGitPath * path = (CTGitPath *)GetItemData(index);
2510 ASSERT(path);
2511 if (path == nullptr)
2512 continue;
2513
2514 size_t idx;
2515 if (!git_index_find(&idx, gitindex, CUnicodeUtils::GetMulti(path->GetGitPathString(), CP_UTF8)))
2516 {
2517 git_index_entry *e = const_cast<git_index_entry *>(git_index_get_byindex(gitindex, idx)); // HACK
2518 if (assumevalid == BST_UNCHECKED)
2519 e->flags &= ~GIT_IDXENTRY_VALID;
2520 else if (assumevalid == BST_CHECKED)
2521 e->flags |= GIT_IDXENTRY_VALID;
2522 if (skipworktree == BST_UNCHECKED)
2523 e->flags_extended &= ~GIT_IDXENTRY_SKIP_WORKTREE;
2524 else if (skipworktree == BST_CHECKED)
2525 e->flags_extended |= GIT_IDXENTRY_SKIP_WORKTREE;
2526 git_index_add(gitindex, e);
2527 }
2528 else
2529 CMessageBox::Show(m_hWnd, g_Git.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR);
2530 }
2531
2532 if (git_index_write(gitindex))
2533 {
2534 CMessageBox::Show(m_hWnd, g_Git.GetLibGit2LastErr(), _T("TortoiseGit"), MB_ICONERROR);
2535 return;
2536 }
2537
2538 if (nullptr != GetLogicalParent() && nullptr != GetLogicalParent()->GetSafeHwnd())
2539 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2540
2541 SetRedraw(TRUE);
2542 }
2543
2544 void CGitStatusListCtrl::OnContextMenuHeader(CWnd * pWnd, CPoint point)
2545 {
2546 Locker lock(m_critSec);
2547 m_ColumnManager.OnContextMenuHeader(pWnd,point,!!IsGroupViewEnabled());
2548 }
2549
2550 void CGitStatusListCtrl::OnContextMenu(CWnd* pWnd, CPoint point)
2551 {
2552
2553 if (pWnd == this)
2554 {
2555 OnContextMenuList(pWnd, point);
2556 } // if (pWnd == this)
2557 else if (pWnd == GetHeaderCtrl())
2558 {
2559 OnContextMenuHeader(pWnd, point);
2560 }
2561 }
2562
2563 void CGitStatusListCtrl::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
2564 {
2565
2566 Locker lock(m_critSec);
2567 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
2568 *pResult = 0;
2569 if (m_bBlock)
2570 return;
2571
2572 if (pNMLV->iItem < 0)
2573 {
2574 if (!IsGroupViewEnabled())
2575 return;
2576 POINT pt;
2577 DWORD ptW = GetMessagePos();
2578 pt.x = GET_X_LPARAM(ptW);
2579 pt.y = GET_Y_LPARAM(ptW);
2580 ScreenToClient(&pt);
2581 int group = GetGroupFromPoint(&pt);
2582 if (group < 0)
2583 return;
2584 // check/uncheck the whole group depending on the check-state
2585 // of the first item in the group
2586 m_bBlock = true;
2587 bool bCheck = false;
2588 bool bFirst = false;
2589 LVITEM lv;
2590 for (int i=0; i<GetItemCount(); ++i)
2591 {
2592 SecureZeroMemory(&lv, sizeof(LVITEM));
2593 lv.mask = LVIF_GROUPID;
2594 lv.iItem = i;
2595 GetItem(&lv);
2596 if (lv.iGroupId == group)
2597 {
2598 CTGitPath *entry=(CTGitPath*)GetItemData(i);
2599
2600 if (!bFirst)
2601 {
2602 bCheck = !GetCheck(i);
2603 bFirst = true;
2604 }
2605 if (entry)
2606 {
2607 bool bOldCheck = !!GetCheck(i);
2608 SetEntryCheck(entry, i, bCheck);
2609 if (bCheck != bOldCheck)
2610 {
2611 if (bCheck)
2612 m_nSelected++;
2613 else
2614 m_nSelected--;
2615 }
2616 }
2617 }
2618 }
2619 GetStatisticsString();
2620 m_bBlock = false;
2621 NotifyCheck();
2622 return;
2623 }
2624
2625 CTGitPath *file=(CTGitPath*)GetItemData(pNMLV->iItem);
2626
2627 if (file->m_Action & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE)) {
2628 OpenFile(file, OPEN);
2629 return;
2630 }
2631 if( file->m_Action&CTGitPath::LOGACTIONS_UNMERGED )
2632 {
2633 if (CAppUtils::ConflictEdit(*file, false, m_bIsRevertTheirMy))
2634 {
2635 CString conflictedFile = g_Git.m_CurrentDir + _T("\\") + file->GetWinPathString();
2636 if (!PathFileExists(conflictedFile) && NULL != GetLogicalParent() && NULL != GetLogicalParent()->GetSafeHwnd())
2637 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2638 }
2639 }
2640 else
2641 {
2642 if (!m_Rev1.IsEmpty() && !m_Rev2.IsEmpty())
2643 StartDiffTwo(pNMLV->iItem);
2644 else
2645 StartDiff(pNMLV->iItem);
2646 }
2647
2648 }
2649 void CGitStatusListCtrl::StartDiffTwo(int fileindex)
2650 {
2651 if(fileindex<0)
2652 return;
2653
2654 auto ptr = (CTGitPath*)GetItemData(fileindex);
2655 if (ptr == nullptr)
2656 return;
2657 CTGitPath file1 = *ptr;
2658
2659 if (file1.m_Action & CTGitPath::LOGACTIONS_ADDED)
2660 CGitDiff::DiffNull(&file1, m_Rev1, true);
2661 else if (file1.m_Action & CTGitPath::LOGACTIONS_DELETED)
2662 CGitDiff::DiffNull(&file1, m_Rev2, false);
2663 else
2664 CGitDiff::Diff(&file1, &file1, m_Rev1, m_Rev2);
2665
2666 }
2667 void CGitStatusListCtrl::StartDiffWC(int fileindex)
2668 {
2669 if(fileindex<0)
2670 return;
2671
2672 CString Ver;
2673 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
2674 return;
2675
2676 auto ptr = (CTGitPath*)GetItemData(fileindex);
2677 if (ptr == nullptr)
2678 return;
2679 CTGitPath file1 = *ptr;
2680 file1.m_Action = 0; // reset action, so that diff is not started as added/deleted file; see issue #1757
2681
2682 CGitDiff::Diff(&file1,&file1, GIT_REV_ZERO, m_CurrentVersion);
2683
2684 }
2685
2686 void CGitStatusListCtrl::StartDiff(int fileindex)
2687 {
2688 if(fileindex<0)
2689 return;
2690
2691 auto ptr = (CTGitPath*)GetItemData(fileindex);
2692 if (ptr == nullptr)
2693 return;
2694 CTGitPath file1 = *ptr;
2695 CTGitPath file2;
2696 if(file1.m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY))
2697 {
2698 file2.SetFromGit(file1.GetGitOldPathString());
2699 }
2700 else
2701 {
2702 file2=file1;
2703 }
2704
2705 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
2706 {
2707 CString fromwhere;
2708 if(m_amend && (file1.m_Action & CTGitPath::LOGACTIONS_ADDED) == 0)
2709 fromwhere = _T("~1");
2710 if( g_Git.IsInitRepos())
2711 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2712 GIT_REV_ZERO);
2713 else if( file1.m_Action&CTGitPath::LOGACTIONS_ADDED )
2714 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2715 m_CurrentVersion+fromwhere,true);
2716 else if( file1.m_Action&CTGitPath::LOGACTIONS_DELETED )
2717 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
2718 GitRev::GetHead()+fromwhere,false);
2719 else
2720 CGitDiff::Diff(&file1,&file2,
2721 CString(GIT_REV_ZERO),
2722 GitRev::GetHead()+fromwhere);
2723 }
2724 else
2725 {
2726 CGitHash hash;
2727 CString fromwhere = m_CurrentVersion+_T("~1");
2728 if(m_amend)
2729 fromwhere = m_CurrentVersion+_T("~2");
2730 bool revfail = !!g_Git.GetHash(hash, fromwhere);
2731 if (revfail || (file1.m_Action & file1.LOGACTIONS_ADDED))
2732 {
2733 CGitDiff::DiffNull(&file1,m_CurrentVersion,true);
2734
2735 }
2736 else if (file1.m_Action & file1.LOGACTIONS_DELETED)
2737 {
2738 if (file1.m_ParentNo > 0)
2739 fromwhere.Format(_T("%s^%d"), m_CurrentVersion, file1.m_ParentNo + 1);
2740
2741 CGitDiff::DiffNull(&file1,fromwhere,false);
2742 }
2743 else
2744 {
2745 if( file1.m_ParentNo & MERGE_MASK)
2746 {
2747
2748 CTGitPath base, theirs, mine, merge;
2749
2750 CString temppath;
2751 GetTempPath(temppath);
2752 temppath.TrimRight(_T("\\"));
2753
2754 mine.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".LOCAL") + file1.GetFileExtension());
2755 theirs.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".REMOTE") + file1.GetFileExtension());
2756 base.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".BASE") + file1.GetFileExtension());
2757
2758 CFile tempfile;
2759 //create a empty file, incase stage is not three
2760 tempfile.Open(mine.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2761 tempfile.Close();
2762 tempfile.Open(theirs.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2763 tempfile.Close();
2764 tempfile.Open(base.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
2765 tempfile.Close();
2766
2767 merge.SetFromGit(temppath + _T("\\") + file1.GetFileOrDirectoryName() + _T(".Merged") + file1.GetFileExtension());
2768
2769 int parent1=-1, parent2 =-1;
2770 for (size_t i = 0; i < m_arStatusArray.size(); ++i)
2771 {
2772 if(m_arStatusArray[i]->GetGitPathString() == file1.GetGitPathString())
2773 {
2774 if(m_arStatusArray[i]->m_ParentNo & MERGE_MASK)
2775 {
2776 }
2777 else
2778 {
2779 if(parent1<0)
2780 {
2781 parent1 = m_arStatusArray[i]->m_ParentNo & PARENT_MASK;
2782 }
2783 else if (parent2 <0)
2784 {
2785 parent2 = m_arStatusArray[i]->m_ParentNo & PARENT_MASK;
2786 }
2787 }
2788 }
2789 }
2790
2791 if(g_Git.GetOneFile(m_CurrentVersion, file1, (CString&)merge.GetWinPathString()))
2792 {
2793 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2794 }
2795
2796 if(parent1>=0)
2797 {
2798 CString str;
2799 str.Format(_T("%s^%d"),this->m_CurrentVersion, parent1+1);
2800
2801 if(g_Git.GetOneFile(str, file1, (CString&)mine.GetWinPathString()))
2802 {
2803 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2804 }
2805 }
2806
2807 if(parent2>=0)
2808 {
2809 CString str;
2810 str.Format(_T("%s^%d"),this->m_CurrentVersion, parent2+1);
2811
2812 if(g_Git.GetOneFile(str, file1, (CString&)theirs.GetWinPathString()))
2813 {
2814 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2815 }
2816 }
2817
2818 if(parent1>=0 && parent2>=0)
2819 {
2820 CString cmd, output;
2821 cmd.Format(_T("git.exe merge-base %s^%d %s^%d"), this->m_CurrentVersion, parent1+1,
2822 this->m_CurrentVersion,parent2+1);
2823
2824 if (g_Git.Run(cmd, &output, NULL, CP_UTF8))
2825 {
2826 }
2827 else
2828 {
2829 if(g_Git.GetOneFile(output.Left(40), file1, (CString&)base.GetWinPathString()))
2830 {
2831 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETBASEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
2832 }
2833 }
2834 }
2835 CAppUtils::StartExtMerge(base, theirs, mine, merge,_T("BASE"),_T("REMOTE"),_T("LOCAL"));
2836
2837 }
2838 else
2839 {
2840 CString str;
2841 if( (file1.m_ParentNo&PARENT_MASK) == 0)
2842 {
2843 str = _T("~1");
2844 }
2845 else
2846 {
2847 str.Format(_T("^%d"), (file1.m_ParentNo&PARENT_MASK)+1);
2848 }
2849 CGitDiff::Diff(&file1,&file2,
2850 m_CurrentVersion,
2851 m_CurrentVersion+str);
2852 }
2853 }
2854 }
2855 }
2856
2857 CString CGitStatusListCtrl::GetStatisticsString(bool simple)
2858 {
2859
2860 CString sNormal, sAdded, sDeleted, sModified, sConflicted, sUnversioned, sRenamed;
2861 WORD langID = (WORD)(DWORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
2862 TCHAR buf[MAX_STATUS_STRING_LENGTH] = { 0 };
2863 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_normal, buf, _countof(buf), langID);
2864 sNormal = buf;
2865 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_added, buf, _countof(buf), langID);
2866 sAdded = buf;
2867 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_deleted, buf, _countof(buf), langID);
2868 sDeleted = buf;
2869 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_modified, buf, _countof(buf), langID);
2870 sModified = buf;
2871 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_conflicted, buf, _countof(buf), langID);
2872 sConflicted = buf;
2873 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_unversioned, buf, _countof(buf), langID);
2874 sUnversioned = buf;
2875 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_replaced, buf, _countof(buf), langID);
2876 sRenamed = buf;
2877 CString sToolTip;
2878 if(simple)
2879 {
2880 sToolTip.Format(IDS_STATUSLIST_STATUSLINE1,
2881 this->m_nLineAdded,this->m_nLineDeleted,
2882 (LPCTSTR)sModified, m_nModified,
2883 (LPCTSTR)sAdded, m_nAdded,
2884 (LPCTSTR)sDeleted, m_nDeleted,
2885 (LPCTSTR)sRenamed, m_nRenamed
2886 );
2887 }
2888 else
2889 {
2890 sToolTip.Format(IDS_STATUSLIST_STATUSLINE2,
2891 this->m_nLineAdded,this->m_nLineDeleted,
2892 (LPCTSTR)sNormal, m_nNormal,
2893 (LPCTSTR)sUnversioned, m_nUnversioned,
2894 (LPCTSTR)sModified, m_nModified,
2895 (LPCTSTR)sAdded, m_nAdded,
2896 (LPCTSTR)sDeleted, m_nDeleted,
2897 (LPCTSTR)sConflicted, m_nConflicted
2898 );
2899 }
2900 CString sStats;
2901 sStats.Format(IDS_COMMITDLG_STATISTICSFORMAT, m_nSelected, GetItemCount());
2902 if (m_pStatLabel)
2903 {
2904 m_pStatLabel->SetWindowText(sStats);
2905 }
2906
2907 if (m_pSelectButton)
2908 {
2909 if (m_nSelected == 0)
2910 m_pSelectButton->SetCheck(BST_UNCHECKED);
2911 else if (m_nSelected != GetItemCount())
2912 m_pSelectButton->SetCheck(BST_INDETERMINATE);
2913 else
2914 m_pSelectButton->SetCheck(BST_CHECKED);
2915 }
2916
2917 if (m_pConfirmButton)
2918 {
2919 m_pConfirmButton->EnableWindow(m_nSelected>0);
2920 }
2921
2922 return sToolTip;
2923
2924
2925 }
2926
2927 CString CGitStatusListCtrl::GetCommonDirectory(bool bStrict)
2928 {
2929 if (!bStrict)
2930 {
2931 // not strict means that the selected folder has priority
2932 if (!m_StatusFileList.GetCommonDirectory().IsEmpty())
2933 return m_StatusFileList.GetCommonDirectory().GetWinPath();
2934 }
2935
2936 CTGitPath commonBaseDirectory;
2937 int nListItems = GetItemCount();
2938 for (int i=0; i<nListItems; ++i)
2939 {
2940 CTGitPath baseDirectory,*p= (CTGitPath*)this->GetItemData(i);
2941 ASSERT(p);
2942 if(p==NULL)
2943 continue;
2944 baseDirectory = p->GetDirectory();
2945
2946 if(commonBaseDirectory.IsEmpty())
2947 {
2948 commonBaseDirectory = baseDirectory;
2949 }
2950 else
2951 {
2952 if (commonBaseDirectory.GetWinPathString().GetLength() > baseDirectory.GetWinPathString().GetLength())
2953 {
2954 if (baseDirectory.IsAncestorOf(commonBaseDirectory))
2955 commonBaseDirectory = baseDirectory;
2956 }
2957 }
2958 }
2959 return g_Git.m_CurrentDir+CString(_T("\\"))+commonBaseDirectory.GetWinPath();
2960 }
2961
2962
2963 void CGitStatusListCtrl::SelectAll(bool bSelect, bool /*bIncludeNoCommits*/)
2964 {
2965 CWaitCursor waitCursor;
2966 // block here so the LVN_ITEMCHANGED messages
2967 // get ignored
2968 m_bBlock = TRUE;
2969 SetRedraw(FALSE);
2970
2971 int nListItems = GetItemCount();
2972 if (bSelect)
2973 m_nSelected = nListItems;
2974 else
2975 m_nSelected = 0;
2976
2977 for (int i=0; i<nListItems; ++i)
2978 {
2979 //FileEntry * entry = GetListEntry(i);
2980 //ASSERT(entry != NULL);
2981 CTGitPath *path = (CTGitPath *) GetItemData(i);
2982 if (path == NULL)
2983 continue;
2984 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))
2985 SetEntryCheck(path,i,bSelect);
2986 }
2987
2988 // unblock before redrawing
2989 m_bBlock = FALSE;
2990 SetRedraw(TRUE);
2991 GetStatisticsString();
2992 NotifyCheck();
2993 }
2994
2995 void CGitStatusListCtrl::Check(DWORD dwCheck, bool check)
2996 {
2997 CWaitCursor waitCursor;
2998 // block here so the LVN_ITEMCHANGED messages
2999 // get ignored
3000 m_bBlock = TRUE;
3001 SetRedraw(FALSE);
3002
3003 int nListItems = GetItemCount();
3004
3005 for (int i = 0; i < nListItems; ++i)
3006 {
3007 CTGitPath *entry = (CTGitPath *) GetItemData(i);
3008 if (entry == NULL)
3009 continue;
3010
3011 DWORD showFlags = entry->m_Action;
3012 if (entry->IsDirectory())
3013 showFlags |= GITSLC_SHOWSUBMODULES;
3014 else
3015 showFlags |= GITSLC_SHOWFILES;
3016
3017 if (check && (showFlags & dwCheck) && !GetCheck(i) && !(entry->IsDirectory() && m_bDoNotAutoselectSubmodules && !(dwCheck & GITSLC_SHOWSUBMODULES)))
3018 {
3019 SetEntryCheck(entry, i, true);
3020 m_nSelected++;
3021 }
3022 else if (!check && (showFlags & dwCheck) && GetCheck(i))
3023 {
3024 SetEntryCheck(entry, i, false);
3025 m_nSelected--;
3026 }
3027 }
3028 // unblock before redrawing
3029 m_bBlock = FALSE;
3030 SetRedraw(TRUE);
3031 GetStatisticsString();
3032 NotifyCheck();
3033 }
3034
3035 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR *pNMHDR, LRESULT *pResult)
3036 {
3037 LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast<LPNMLVGETINFOTIP>(pNMHDR);
3038 *pResult = 0;
3039 if (m_bBlock)
3040 return;
3041
3042 CTGitPath *entry=(CTGitPath *)GetItemData(pGetInfoTip->iItem);
3043
3044 if (entry)
3045 if (pGetInfoTip->cchTextMax > entry->GetGitPathString().GetLength() + g_Git.m_CurrentDir.GetLength())
3046 {
3047 CString str;
3048 str += g_Git.m_CurrentDir;
3049 str += _T("\\");
3050 str += entry->GetWinPathString();
3051
3052 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, str.GetBuffer(), str.GetLength());
3053 }
3054 }
3055
3056 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult)
3057 {
3058 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
3059
3060 // Take the default processing unless we set this to something else below.
3061 *pResult = CDRF_DODEFAULT;
3062
3063 // First thing - check the draw stage. If it's the control's prepaint
3064 // stage, then tell Windows we want messages for every item.
3065
3066 switch (pLVCD->nmcd.dwDrawStage)
3067 {
3068 case CDDS_PREPAINT:
3069 *pResult = CDRF_NOTIFYITEMDRAW;
3070 break;
3071 case CDDS_ITEMPREPAINT:
3072 {
3073 // This is the prepaint stage for an item. Here's where we set the
3074 // item's text color. Our return value will tell Windows to draw the
3075 // item itself, but it will use the new color we set here.
3076
3077 // Tell Windows to paint the control itself.
3078 *pResult = CDRF_DODEFAULT;
3079 if (m_bBlock)
3080 return;
3081
3082 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
3083
3084 if (m_arStatusArray.size() > (DWORD_PTR)pLVCD->nmcd.dwItemSpec)
3085 {
3086
3087 //FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);
3088 CTGitPath *entry=(CTGitPath *)GetItemData((int)pLVCD->nmcd.dwItemSpec);
3089 if (entry == NULL)
3090 return;
3091
3092 // coloring
3093 // ========
3094 // black : unversioned, normal
3095 // purple : added
3096 // blue : modified
3097 // brown : missing, deleted, replaced
3098 // green : merged (or potential merges)
3099 // red : conflicts or sure conflicts
3100 if(entry->m_Action & CTGitPath::LOGACTIONS_GRAY)
3101 {
3102 crText = RGB(128,128,128);
3103
3104 }
3105 else if(entry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
3106 {
3107 crText = m_Colors.GetColor(CColors::Conflict);
3108
3109 }
3110 else if(entry->m_Action & (CTGitPath::LOGACTIONS_MODIFIED))
3111 {
3112 crText = m_Colors.GetColor(CColors::Modified);
3113
3114 }
3115 else if(entry->m_Action & (CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))
3116 {
3117 crText = m_Colors.GetColor(CColors::Added);
3118 }
3119 else if(entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
3120 {
3121 crText = m_Colors.GetColor(CColors::Deleted);
3122 }
3123 else if(entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
3124 {
3125 crText = m_Colors.GetColor(CColors::Renamed);
3126 }
3127 else if(entry->m_Action & CTGitPath::LOGACTIONS_MERGED)
3128 {
3129 crText = m_Colors.GetColor(CColors::Merged);
3130 }
3131 else
3132 {
3133 crText = GetSysColor(COLOR_WINDOWTEXT);
3134 }
3135 // Store the color back in the NMLVCUSTOMDRAW struct.
3136 pLVCD->clrText = crText;
3137 }
3138 }
3139 break;
3140 }
3141 }
3142
3143 BOOL CGitStatusListCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
3144 {
3145 if (pWnd != this)
3146 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
3147 if (!m_bBlock)
3148 {
3149 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
3150 SetCursor(hCur);
3151 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
3152 }
3153 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
3154 SetCursor(hCur);
3155 return TRUE;
3156 }
3157
3158 void CGitStatusListCtrl::RemoveListEntry(int index)
3159 {
3160
3161 Locker lock(m_critSec);
3162 DeleteItem(index);
3163
3164 m_arStatusArray.erase(m_arStatusArray.begin()+index);
3165
3166 #if 0
3167 delete m_arStatusArray[m_arListArray[index]];
3168 m_arStatusArray.erase(m_arStatusArray.begin()+m_arListArray[index]);
3169 m_arListArray.erase(m_arListArray.begin()+index);
3170 for (int i=index; i< (int)m_arListArray.size(); ++i)
3171 {
3172 m_arListArray[i]--;
3173 }
3174 #endif
3175 }
3176
3177 ///< Set a checkbox on an entry in the listbox
3178 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync
3179 void CGitStatusListCtrl::SetEntryCheck(CTGitPath* pEntry, int listboxIndex, bool bCheck)
3180 {
3181 pEntry->m_Checked = bCheck;
3182 m_mapFilenameToChecked[pEntry->GetGitPathString()] = bCheck;
3183 SetCheck(listboxIndex, bCheck);
3184 }
3185
3186 #if 0
3187 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry* parentEntry, bool bCheck)
3188 {
3189
3190 int nListItems = GetItemCount();
3191 for (int j=0; j< nListItems ; ++j)
3192 {
3193 FileEntry * childEntry = GetListEntry(j);
3194 ASSERT(childEntry != NULL);
3195 if (childEntry == NULL || childEntry == parentEntry)
3196 continue;
3197 if (childEntry->checked != bCheck)
3198 {
3199 if (parentEntry->path.IsAncestorOf(childEntry->path))
3200 {
3201 SetEntryCheck(childEntry,j,bCheck);
3202 if(bCheck)
3203 {
3204 m_nSelected++;
3205 }
3206 else
3207 {
3208 m_nSelected--;
3209 }
3210 }
3211 }
3212 }
3213
3214 }
3215 #endif
3216
3217 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList& pathList)
3218 {
3219
3220 pathList.Clear();
3221 int nListItems = GetItemCount();
3222 for (int i = 0; i< nListItems; ++i)
3223 {
3224 CTGitPath * entry = (CTGitPath*)GetItemData(i);
3225 ASSERT(entry != NULL);
3226 if (entry->m_Checked)
3227 {
3228 pathList.AddPath(*entry);
3229 }
3230 }
3231 pathList.SortByPathname();
3232
3233 }
3234
3235
3236 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)
3237 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList& pathList, bool /*bNoIgnored*/)
3238 {
3239 pathList.Clear();
3240
3241 POSITION pos = GetFirstSelectedItemPosition();
3242 int index;
3243 while ((index = GetNextSelectedItem(pos)) >= 0)
3244 {
3245 CTGitPath * entry = (CTGitPath*)GetItemData(index);
3246 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))
3247 // continue;
3248 pathList.AddPath(*entry);
3249 }
3250 }
3251
3252 UINT CGitStatusListCtrl::OnGetDlgCode()
3253 {
3254 // we want to process the return key and not have that one
3255 // routed to the default pushbutton
3256 return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS;
3257 }
3258
3259 void CGitStatusListCtrl::OnNMReturn(NMHDR * /*pNMHDR*/, LRESULT *pResult)
3260 {
3261 *pResult = 0;
3262 if (m_bBlock)
3263 return;
3264 if (!CheckMultipleDiffs())
3265 return;
3266 POSITION pos = GetFirstSelectedItemPosition();
3267 while ( pos )
3268 {
3269 int index = GetNextSelectedItem(pos);
3270 CTGitPath *file=(CTGitPath*)GetItemData(index);
3271 if (file->m_Action & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE))
3272 {
3273 OpenFile(file, OPEN);
3274 }
3275 else
3276 {
3277 if (!m_Rev1.IsEmpty() && !m_Rev2.IsEmpty())
3278 StartDiffTwo(index);
3279 else
3280 StartDiff(index);
3281 }
3282 }
3283 }
3284
3285 void CGitStatusListCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
3286 {
3287 // Since we catch all keystrokes (to have the enter key processed here instead
3288 // of routed to the default pushbutton) we have to make sure that other
3289 // keys like Tab and Esc still do what they're supposed to do
3290 // Tab = change focus to next/previous control
3291 // Esc = quit the dialog
3292 switch (nChar)
3293 {
3294 case (VK_TAB):
3295 {
3296 ::PostMessage(GetLogicalParent()->GetSafeHwnd(), WM_NEXTDLGCTL, GetKeyState(VK_SHIFT)&0x8000, 0);
3297 return;
3298 }
3299 break;
3300 case (VK_ESCAPE):
3301 {
3302 ::SendMessage(GetLogicalParent()->GetSafeHwnd(), WM_CLOSE, 0, 0);
3303 }
3304 break;
3305 }
3306
3307 CListCtrl::OnKeyDown(nChar, nRepCnt, nFlags);
3308 }
3309
3310 void CGitStatusListCtrl::PreSubclassWindow()
3311 {
3312 CListCtrl::PreSubclassWindow();
3313 EnableToolTips(TRUE);
3314 SetWindowTheme(GetSafeHwnd(), L"Explorer", NULL);
3315 }
3316
3317 void CGitStatusListCtrl::OnPaint()
3318 {
3319 LRESULT defres = Default();
3320 if ((m_bBusy)||(m_bEmpty))
3321 {
3322 CString str;
3323 if (m_bBusy)
3324 {
3325 if (m_sBusy.IsEmpty())
3326 str.LoadString(IDS_STATUSLIST_BUSYMSG);
3327 else
3328 str = m_sBusy;
3329 }
3330 else
3331 {
3332 if (m_sEmpty.IsEmpty())
3333 str.LoadString(IDS_STATUSLIST_EMPTYMSG);
3334 else
3335 str = m_sEmpty;
3336 }
3337 COLORREF clrText = ::GetSysColor(COLOR_WINDOWTEXT);
3338 COLORREF clrTextBk;
3339 if (IsWindowEnabled())
3340 clrTextBk = ::GetSysColor(COLOR_WINDOW);
3341 else
3342 clrTextBk = ::GetSysColor(COLOR_3DFACE);
3343
3344 CRect rc;
3345 GetClientRect(&rc);
3346 CHeaderCtrl* pHC;
3347 pHC = GetHeaderCtrl();
3348 if (pHC != NULL)
3349 {
3350 CRect rcH;
3351 pHC->GetItemRect(0, &rcH);
3352 rc.top += rcH.bottom;
3353 }
3354 CDC* pDC = GetDC();
3355 {
3356 CMyMemDC memDC(pDC, &rc);
3357
3358 memDC.SetTextColor(clrText);
3359 memDC.SetBkColor(clrTextBk);
3360 memDC.FillSolidRect(rc, clrTextBk);
3361 rc.top += 10;
3362 CGdiObject * oldfont = memDC.SelectStockObject(DEFAULT_GUI_FONT);
3363 memDC.DrawText(str, rc, DT_CENTER | DT_VCENTER |
3364 DT_WORDBREAK | DT_NOPREFIX | DT_NOCLIP);
3365 memDC.SelectObject(oldfont);
3366 }
3367 ReleaseDC(pDC);
3368 }
3369 if (defres)
3370 {
3371 // the Default() call did not process the WM_PAINT message!
3372 // Validate the update region ourselves to avoid
3373 // an endless loop repainting
3374 CRect rc;
3375 GetUpdateRect(&rc, FALSE);
3376 if (!rc.IsRectEmpty())
3377 ValidateRect(rc);
3378 }
3379 }
3380
3381 // prevent users from extending our hidden (size 0) columns
3382 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR *pNMHDR, LRESULT *pResult)
3383 {
3384 m_ColumnManager.OnHdnBegintrack(pNMHDR, pResult);
3385 }
3386
3387 // prevent any function from extending our hidden (size 0) columns
3388 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
3389 {
3390 if(!m_ColumnManager.OnHdnItemchanging(pNMHDR, pResult))
3391 Default();
3392 }
3393
3394 void CGitStatusListCtrl::OnDestroy()
3395 {
3396 SaveColumnWidths(true);
3397 CListCtrl::OnDestroy();
3398 }
3399
3400 void CGitStatusListCtrl::OnBeginDrag(NMHDR* /*pNMHDR*/, LRESULT* pResult)
3401 {
3402 Locker lock(m_critSec);
3403 CDropFiles dropFiles; // class for creating DROPFILES struct
3404
3405 int index;
3406 POSITION pos = GetFirstSelectedItemPosition();
3407 if (!pos)
3408 return;
3409
3410 bool bTempDirCreated = false;
3411 CString tempDir;
3412 while ( (index = GetNextSelectedItem(pos)) >= 0 )
3413 {
3414 CTGitPath *path = (CTGitPath *)GetItemData(index); // m_arStatusArray[index] does not work with SyncDlg
3415 if (path->IsDirectory())
3416 continue;
3417
3418 CString version;
3419 if (!this->m_CurrentVersion.IsEmpty() && this->m_CurrentVersion != GIT_REV_ZERO)
3420 {
3421 if (path->m_Action & CTGitPath::LOGACTIONS_DELETED)
3422 version.Format(_T("%s^%d"), m_CurrentVersion, (path->m_ParentNo + 1) & PARENT_MASK);
3423 else
3424 version = m_CurrentVersion;
3425 }
3426 else
3427 {
3428 if (path->m_Action & CTGitPath::LOGACTIONS_DELETED)
3429 version = _T("HEAD");
3430 }
3431
3432 CString tempFile;
3433 if (version.IsEmpty())
3434 {
3435 TCHAR abspath[MAX_PATH] = {0};
3436 PathCombine(abspath, g_Git.m_CurrentDir, path->GetWinPath());
3437 tempFile = abspath;
3438 }
3439 else
3440 {
3441 if (!bTempDirCreated)
3442 {
3443 tempDir = GetTempFile();
3444 ::DeleteFile(tempDir);
3445 ::CreateDirectory(tempDir, NULL);
3446 bTempDirCreated = true;
3447 }
3448 tempFile = tempDir + _T("\\") + path->GetWinPathString();
3449 CString tempSubDir = tempDir + _T("\\") + path->GetContainingDirectory().GetWinPathString();
3450 CPathUtils::MakeSureDirectoryPathExists(tempSubDir);
3451 if (g_Git.GetOneFile(version, *path, tempFile))
3452 {
3453 CString out;
3454 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, path->GetGitPathString(), version, tempFile);
3455 CMessageBox::Show(nullptr, g_Git.GetGitLastErr(out, CGit::GIT_CMD_GETONEFILE), _T("TortoiseGit"), MB_OK);
3456 return;
3457 }
3458 }
3459 dropFiles.AddFile(tempFile);
3460 }
3461
3462 if (!dropFiles.IsEmpty())
3463 {
3464 m_bOwnDrag = true;
3465 dropFiles.CreateStructure();
3466 m_bOwnDrag = false;
3467 }
3468 *pResult = 0;
3469 }
3470
3471 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry /* = false */)
3472 {
3473 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
3474 for (int col = 0; col <= maxcol; col++)
3475 if (m_ColumnManager.IsVisible (col))
3476 m_ColumnManager.ColumnResized (col);
3477
3478 if (bSaveToRegistry)
3479 m_ColumnManager.WriteSettings();
3480 }
3481
3482 bool CGitStatusListCtrl::EnableFileDrop()
3483 {
3484 m_bFileDropsEnabled = true;
3485 return true;
3486 }
3487
3488 bool CGitStatusListCtrl::HasPath(const CTGitPath& path)
3489 {
3490 for (size_t i=0; i < m_arStatusArray.size(); ++i)
3491 {
3492 if (m_arStatusArray[i]->IsEquivalentTo(path))
3493 return true;
3494 }
3495
3496 return false;
3497 }
3498
3499 BOOL CGitStatusListCtrl::PreTranslateMessage(MSG* pMsg)
3500 {
3501 if (pMsg->message == WM_KEYDOWN)
3502 {
3503 switch (pMsg->wParam)
3504 {
3505 case 'A':
3506 {
3507 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
3508 {
3509 // select all entries
3510 for (int i=0; i<GetItemCount(); ++i)
3511 {
3512 SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
3513 }
3514 return TRUE;
3515 }
3516 }
3517 break;
3518 case 'C':
3519 case VK_INSERT:
3520 {
3521 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
3522 {
3523 // copy all selected paths to the clipboard
3524 if (GetAsyncKeyState(VK_SHIFT)&0x8000)
3525 CopySelectedEntriesToClipboard(GITSLC_COLSTATUS);
3526 else
3527 CopySelectedEntriesToClipboard(0);
3528 return TRUE;
3529 }
3530 }
3531 break;
3532 case VK_DELETE:
3533 {
3534 if ((GetSelectedCount() > 0) && (m_dwContextMenus & GITSLC_POPDELETE))
3535 {
3536 m_bBlock = TRUE;
3537 CTGitPath * filepath = (CTGitPath *)GetItemData(GetSelectionMark());
3538 if (filepath != nullptr && (filepath->m_Action & (CTGitPath::LOGACTIONS_UNVER | CTGitPath::LOGACTIONS_IGNORE)))
3539 DeleteSelectedFiles();
3540 m_bBlock = FALSE;
3541 }
3542 }
3543 break;
3544 }
3545 }
3546
3547 return CListCtrl::PreTranslateMessage(pMsg);
3548 }
3549
3550 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols)
3551 {
3552
3553 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
3554 // WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
3555
3556 CString sClipboard;
3557 CString temp;
3558 //TCHAR buf[100];
3559 if (GetSelectedCount() == 0)
3560 return false;
3561
3562 // first add the column titles as the first line
3563 // We needn't head when only path copy
3564 //temp.LoadString(IDS_STATUSLIST_COLFILE);
3565 //sClipboard = temp;
3566
3567 DWORD selection = 0;
3568 for (int i = 0, count = m_ColumnManager.GetColumnCount(); i < count; ++i)
3569 if ( ((dwCols == -1) && m_ColumnManager.IsVisible (i))
3570 || ((dwCols != 1) && (i < 32) && ((dwCols & (1 << i)) != 0)))
3571 {
3572 sClipboard += _T("\t") + m_ColumnManager.GetName(i);
3573
3574 if (i < 32)
3575 selection += 1 << i;
3576 }
3577
3578 if(dwCols)
3579 sClipboard += _T("\r\n");
3580
3581 POSITION pos = GetFirstSelectedItemPosition();
3582 int index;
3583 while ((index = GetNextSelectedItem(pos)) >= 0)
3584 {
3585 CTGitPath * entry = (CTGitPath*)GetItemData(index);
3586 if(entry == NULL)
3587 continue;
3588
3589 sClipboard += entry->GetWinPathString();
3590 if (selection & GITSLC_COLFILENAME)
3591 {
3592 sClipboard += _T("\t")+entry->GetFileOrDirectoryName();
3593 }
3594 if (selection & GITSLC_COLEXT)
3595 {
3596 sClipboard += _T("\t")+entry->GetFileExtension();
3597 }
3598
3599 if (selection & GITSLC_COLSTATUS)
3600 {
3601 sClipboard += _T("\t")+entry->GetActionName();
3602 }
3603 #if 0
3604 if (selection & SVNSLC_COLDATE)
3605 {
3606 TCHAR datebuf[SVN_DATE_BUFFER];
3607 apr_time_t date = entry->last_commit_date;
3608 SVN::formatDate(datebuf, date, true);
3609 if (date)
3610 temp = datebuf;
3611 else
3612 temp.Empty();
3613 sClipboard += _T("\t")+temp;
3614 }
3615 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
3616 ; i < count
3617 ; ++i)
3618 {
3619 if ((dwCols == -1) && m_ColumnManager.IsVisible (i))
3620 {
3621 CString value
3622 = entry->present_props[m_ColumnManager.GetName(i)];
3623 sClipboard += _T("\t") + value;
3624 }
3625 }
3626 #endif
3627 if (selection & GITSLC_COLADD)
3628 {
3629 sClipboard += _T("\t")+entry->m_StatAdd;
3630 }
3631 if (selection & GITSLC_COLDEL)
3632 {
3633 sClipboard += _T("\t")+entry->m_StatDel;
3634 }
3635
3636 sClipboard += _T("\r\n");
3637 }
3638
3639 return CStringUtils::WriteAsciiStringToClipboard(sClipboard);
3640 }
3641
3642 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()
3643 {
3644 #if 0
3645 std::set<CString> changelists;
3646 POSITION pos = GetFirstSelectedItemPosition();
3647 int index;
3648 while ((index = GetNextSelectedItem(pos)) >= 0)
3649 {
3650 FileEntry * entry = GetListEntry(index);
3651 if (!entry->changelist.IsEmpty())
3652 changelists.insert(entry->changelist);
3653 }
3654 return changelists.size();
3655 #endif
3656 return 0;
3657 }
3658
3659 bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
3660 {
3661
3662 bool bHasGroups=false;
3663 int max =0;
3664
3665 for (size_t i = 0; i < m_arStatusArray.size(); ++i)
3666 {
3667 int ParentNo = m_arStatusArray[i]->m_ParentNo&PARENT_MASK;
3668 if( ParentNo > max)
3669 max=m_arStatusArray[i]->m_ParentNo&PARENT_MASK;
3670 }
3671
3672 if (!m_UnRevFileList.IsEmpty() ||
3673 !m_IgnoreFileList.IsEmpty() ||
3674 !m_LocalChangesIgnoredFileList.IsEmpty() ||
3675 max>0 || bForce)
3676 {
3677 bHasGroups = true;
3678 }
3679
3680 RemoveAllGroups();
3681 EnableGroupView(bHasGroups);
3682
3683 TCHAR groupname[1024] = { 0 };
3684 int groupindex = 0;
3685
3686 if(bHasGroups)
3687 {
3688 LVGROUP grp = {0};
3689 grp.cbSize = sizeof(LVGROUP);
3690 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3691 groupindex=0;
3692
3693 //if(m_UnRevFileList.GetCount()>0)
3694 if(max >0)
3695 {
3696 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MERGEDFILES)), 1023);
3697 grp.pszHeader = groupname;
3698 grp.iGroupId = MERGE_MASK;
3699 grp.uAlign = LVGA_HEADER_LEFT;
3700 InsertGroup(0, &grp);
3701
3702 CAutoRepository repository(g_Git.GetGitRepository());
3703 if (!repository)
3704 CMessageBox::Show(m_hWnd, CGit::GetLibGit2LastErr(_T("Could not open repository.")), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
3705 for (int i = 0; i <= max; ++i)
3706 {
3707 CString str;
3708 str.Format(IDS_STATUSLIST_GROUP_DIFFWITHPARENT, i+1);
3709 if (repository)
3710 {
3711 CString rev;
3712 rev.Format(_T("%s^%d"), m_CurrentVersion, i + 1);
3713 CGitHash hash;
3714 if (!CGit::GetHash(repository, hash, rev))
3715 str += _T(": ") + hash.ToString().Left(g_Git.GetShortHASHLength());
3716 }
3717 grp.pszHeader = str.GetBuffer();
3718 str.ReleaseBuffer();
3719 grp.iGroupId = i;
3720 grp.uAlign = LVGA_HEADER_LEFT;
3721 InsertGroup(i+1, &grp);
3722 }
3723 }
3724 else
3725 {
3726 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MODIFIEDFILES)), 1023);
3727 grp.pszHeader = groupname;
3728 grp.iGroupId = groupindex;
3729 grp.uAlign = LVGA_HEADER_LEFT;
3730 InsertGroup(groupindex++, &grp);
3731
3732
3733 {
3734 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_NOTVERSIONEDFILES)), 1023);
3735 grp.pszHeader = groupname;
3736 grp.iGroupId = groupindex;
3737 grp.uAlign = LVGA_HEADER_LEFT;
3738 InsertGroup(groupindex++, &grp);
3739 }
3740
3741 //if(m_IgnoreFileList.GetCount()>0)
3742 {
3743 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_IGNOREDFILES)), 1023);
3744 grp.pszHeader = groupname;
3745 grp.iGroupId = groupindex;
3746 grp.uAlign = LVGA_HEADER_LEFT;
3747 InsertGroup(groupindex++, &grp);
3748 }
3749
3750 {
3751 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_IGNORELOCALCHANGES)), 1023);
3752 grp.pszHeader = groupname;
3753 grp.iGroupId = groupindex;
3754 grp.uAlign = LVGA_HEADER_LEFT;
3755 InsertGroup(groupindex++, &grp);
3756 }
3757 }
3758 }
3759
3760 #if 0
3761 m_bHasIgnoreGroup = false;
3762
3763 // now add the items which don't belong to a group
3764 LVGROUP grp = {0};
3765 grp.cbSize = sizeof(LVGROUP);
3766 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3767 CString sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET));
3768 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
3769 grp.pszHeader = groupname;
3770 grp.iGroupId = groupindex;
3771 grp.uAlign = LVGA_HEADER_LEFT;
3772 InsertGroup(groupindex++, &grp);
3773
3774 for (std::map<CString,int>::iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
3775 {
3776 if (it->first.Compare(SVNSLC_IGNORECHANGELIST)!=0)
3777 {
3778 LVGROUP grp = {0};
3779 grp.cbSize = sizeof(LVGROUP);
3780 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3781 _tcsncpy_s(groupname, 1024, it->first, 1023);
3782 grp.pszHeader = groupname;
3783 grp.iGroupId = groupindex;
3784 grp.uAlign = LVGA_HEADER_LEFT;
3785 it->second = InsertGroup(groupindex++, &grp);
3786 }
3787 else
3788 m_bHasIgnoreGroup = true;
3789 }
3790
3791 if (m_bHasIgnoreGroup)
3792 {
3793 // and now add the group 'ignore-on-commit'
3794 std::map<CString,int>::iterator it = m_changelists.find(SVNSLC_IGNORECHANGELIST);
3795 if (it != m_changelists.end())
3796 {
3797 grp.cbSize = sizeof(LVGROUP);
3798 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
3799 _tcsncpy_s(groupname, 1024, SVNSLC_IGNORECHANGELIST, 1023);
3800 grp.pszHeader = groupname;
3801 grp.iGroupId = groupindex;
3802 grp.uAlign = LVGA_HEADER_LEFT;
3803 it->second = InsertGroup(groupindex, &grp);
3804 }
3805 }
3806 #endif
3807 return bHasGroups;
3808 }
3809
3810 void CGitStatusListCtrl::NotifyCheck()
3811 {
3812 CWnd* pParent = GetLogicalParent();
3813 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
3814 {
3815 pParent->SendMessage(GITSLNM_CHECKCHANGED, m_nSelected);
3816 }
3817 }
3818
3819 int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash,CTGitPathList *list)
3820 {
3821 CString cmdList;
3822 BYTE_VECTOR out;
3823 this->m_bBusy=TRUE;
3824 m_CurrentVersion=hash;
3825
3826 int count = 0;
3827 if(list == NULL)
3828 count = 1;
3829 else
3830 count = list->GetCount();
3831
3832 CString head = _T("HEAD");
3833 if(m_amend)
3834 head = _T("HEAD~1");
3835
3836 if(hash == GIT_REV_ZERO)
3837 {
3838 for (int i = 0; i < count; ++i)
3839 {
3840 BYTE_VECTOR cmdout;
3841 cmdout.clear();
3842 CString cmd;
3843 if(!g_Git.IsInitRepos())
3844 {
3845 // also list staged files which will be in the commit
3846 cmd=(_T("git.exe diff-index --cached --raw ") + head + _T(" --numstat -C -M -z --"));
3847 cmdList += cmd + _T("\n");
3848 g_Git.Run(cmd, &cmdout);
3849
3850 if(list == NULL)
3851 cmd=(_T("git.exe diff-index --raw ") + head + _T(" --numstat -C -M -z --"));
3852 else
3853 cmd.Format(_T("git.exe diff-index --raw ") + head + _T(" --numstat -C -M -z -- \"%s\""),(*list)[i].GetGitPathString());
3854 cmdList += cmd + _T("\n");
3855
3856 BYTE_VECTOR cmdErr;
3857 if(g_Git.Run(cmd, &cmdout, &cmdErr))
3858 {
3859 int last = cmdErr.RevertFind(0,-1);
3860 CString str;
3861 g_Git.StringAppend(&str, &cmdErr[last + 1], CP_UTF8, (int)cmdErr.size() - last -1);
3862 CMessageBox::Show(NULL, str, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
3863 }
3864
3865 out.append(cmdout, 0);
3866 }
3867 else // Init Repository
3868 {
3869 //We will list all added file for init repository because commit will comit these
3870 //if(list == NULL)
3871 cmd=_T("git.exe ls-files -s -t -z");
3872 cmdList += cmd + _T("\n");
3873 //else
3874 // cmd.Format(_T("git.exe ls-files -s -t -z -- \"%s\""),(*list)[i].GetGitPathString());
3875
3876 g_Git.Run(cmd, &cmdout);
3877 //out+=cmdout;
3878 out.append(cmdout,0);
3879
3880 break;
3881 }
3882 }
3883
3884 if(g_Git.IsInitRepos())
3885 {
3886 if (m_StatusFileList.ParserFromLsFile(out))
3887 {
3888 CString tempFile1 = GetTempFile();
3889 CFile file1(tempFile1, CFile::modeWrite | CFile::typeBinary);
3890 file1.Write(out.data(), (UINT)out.size());
3891 file1.Close();
3892 CString tempFile2 = GetTempFile();
3893 CFile file2(tempFile2, CFile::modeWrite);
3894 file2.Write(cmdList, sizeof(TCHAR) * cmdList.GetLength());
3895 file2.Close();
3896 CMessageBox::Show(NULL, _T("Parse ls-files failed!\nPlease inspect ") + tempFile1 + _T("\nand ") + tempFile2, _T("TortoiseGit"), MB_OK);
3897 }
3898 for (int i = 0; i < m_StatusFileList.GetCount(); ++i)
3899 ((CTGitPath&)(m_StatusFileList[i])).m_Action=CTGitPath::LOGACTIONS_ADDED;
3900 }
3901 else
3902 this->m_StatusFileList.ParserFromLog(out);
3903
3904 //handle delete conflict case, when remote : modified, local : deleted.
3905 for (int i = 0; i < count; ++i)
3906 {
3907 BYTE_VECTOR cmdout;
3908 CString cmd;
3909
3910 if(list == NULL)
3911 cmd=_T("git.exe ls-files -u -t -z");
3912 else
3913 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),(*list)[i].GetGitPathString());
3914
3915 g_Git.Run(cmd, &cmdout);
3916
3917 CTGitPathList conflictlist;
3918 conflictlist.ParserFromLog(cmdout);
3919 for (int i = 0; i < conflictlist.GetCount(); ++i)
3920 {
3921 CTGitPath *p=m_StatusFileList.LookForGitPath(conflictlist[i].GetGitPathString());
3922 if(p)
3923 p->m_Action|=CTGitPath::LOGACTIONS_UNMERGED;
3924 else
3925 m_StatusFileList.AddPath(conflictlist[i]);
3926 }
3927 }
3928
3929 // handle source files of file renames/moves (issue #860)
3930 // if a file gets renamed and the new file "git add"ed, diff-index doesn't list the source file anymore
3931 for (int i = 0; i < count; ++i)
3932 {
3933 BYTE_VECTOR cmdout;
3934 CString cmd;
3935
3936 if(list == NULL)
3937 cmd = _T("git.exe ls-files -d -z");
3938 else
3939 cmd.Format(_T("git.exe ls-files -d -z -- \"%s\""),(*list)[i].GetGitPathString());
3940
3941 g_Git.Run(cmd, &cmdout);
3942
3943 CTGitPathList deletelist;
3944 deletelist.ParserFromLog(cmdout, true);
3945 BOOL bDeleteChecked = FALSE;
3946 int deleteFromIndex = 0;
3947 for (int i = 0; i < deletelist.GetCount(); ++i)
3948 {
3949 CTGitPath *p = m_StatusFileList.LookForGitPath(deletelist[i].GetGitPathString());
3950 if(!p)
3951 m_StatusFileList.AddPath(deletelist[i]);
3952 else if ((p->m_Action == CTGitPath::LOGACTIONS_ADDED || p->m_Action == CTGitPath::LOGACTIONS_REPLACED) && !p->Exists())
3953 {
3954 if (!bDeleteChecked)
3955 {
3956 CString message;
3957 message.Format(IDS_ASK_REMOVE_FROM_INDEX, p->GetWinPathString());
3958 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);
3959 }
3960 if (deleteFromIndex == 1)
3961 {
3962 g_Git.Run(_T("git.exe rm -f --cache -- \"") + p->GetWinPathString() + _T("\""), &cmdout);
3963 m_StatusFileList.RemoveItem(*p);
3964 }
3965 }
3966 }
3967 }
3968 }
3969 else
3970 {
3971 int count = 0;
3972 if(list == NULL)
3973 count = 1;
3974 else
3975 count = list->GetCount();
3976
3977 for (int i = 0; i < count; ++i)
3978 {
3979 BYTE_VECTOR cmdout;
3980 CString cmd;
3981 if(list == NULL)
3982 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M -z %s --"), hash);
3983 else
3984 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M %s -z -- \"%s\""),hash,(*list)[i].GetGitPathString());
3985
3986 g_Git.Run(cmd, &cmdout, NULL);
3987
3988 out.append(cmdout);
3989 }
3990 this->m_StatusFileList.ParserFromLog(out);
3991
3992 }
3993
3994 for (int i = 0; i < m_StatusFileList.GetCount(); ++i)
3995 {
3996 CTGitPath * gitpatch=(CTGitPath*)&m_StatusFileList[i];
3997 gitpatch->m_Checked = TRUE;
3998 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
3999 }
4000
4001 this->m_bBusy=FALSE;
4002 return 0;
4003 }
4004
4005 int CGitStatusListCtrl::UpdateWithGitPathList(CTGitPathList &list)
4006 {
4007 m_arStatusArray.clear();
4008 for (int i = 0; i < list.GetCount(); ++i)
4009 {
4010 CTGitPath * gitpath=(CTGitPath*)&list[i];
4011
4012 if(gitpath ->m_Action & CTGitPath::LOGACTIONS_HIDE)
4013 continue;
4014
4015 gitpath->m_Checked = TRUE;
4016 m_arStatusArray.push_back((CTGitPath*)&list[i]);
4017 }
4018 return 0;
4019 }
4020
4021 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList &list)
4022 {
4023 m_UnRevFileList = list;
4024 for (int i = 0; i < m_UnRevFileList.GetCount(); ++i)
4025 {
4026 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
4027 gitpatch->m_Checked = FALSE;
4028 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
4029 }
4030 return 0;
4031 }
4032
4033 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList *List)
4034 {
4035 CString err;
4036 if (m_UnRevFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER, List, &err))
4037 {
4038 CMessageBox::Show(NULL, _T("Failed to get UnRev file list\n") + err, _T("TortoiseGit"), MB_OK);
4039 return -1;
4040 }
4041
4042 for (int i = 0; i < m_UnRevFileList.GetCount(); ++i)
4043 {
4044 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
4045 gitpatch->m_Checked = FALSE;
4046 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
4047 }
4048 return 0;
4049 }
4050
4051 int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList *List)
4052 {
4053 CString err;
4054 if (m_IgnoreFileList.FillUnRev(CTGitPath::LOGACTIONS_IGNORE, List, &err))
4055 {
4056 CMessageBox::Show(NULL, _T("Failed to get Ignore file list\n") + err, _T("TortoiseGit"), MB_OK);
4057 return -1;
4058 }
4059
4060 for (int i = 0; i < m_IgnoreFileList.GetCount(); ++i)
4061 {
4062 CTGitPath * gitpatch=(CTGitPath*)&m_IgnoreFileList[i];
4063 gitpatch->m_Checked = FALSE;
4064 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
4065 }
4066 return 0;
4067 }
4068
4069 int CGitStatusListCtrl::UpdateLocalChangesIgnoredFileList(CTGitPathList *list)
4070 {
4071 m_LocalChangesIgnoredFileList.FillBasedOnIndexFlags(GIT_IDXENTRY_VALID | GIT_IDXENTRY_SKIP_WORKTREE, list);
4072 for (int i = 0; i < m_LocalChangesIgnoredFileList.GetCount(); ++i)
4073 {
4074 CTGitPath * gitpatch = (CTGitPath*)&m_LocalChangesIgnoredFileList[i];
4075 gitpatch->m_Checked = FALSE;
4076 m_arStatusArray.push_back((CTGitPath*)&m_LocalChangesIgnoredFileList[i]);
4077 }
4078 return 0;
4079 }
4080
4081 int CGitStatusListCtrl::UpdateFileList(int mask,bool once,CTGitPathList *List)
4082 {
4083 if(mask&CGitStatusListCtrl::FILELIST_MODIFY)
4084 {
4085 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_MODIFY)))
4086 {
4087 UpdateFileList(git_revnum_t(GIT_REV_ZERO),List);
4088 m_FileLoaded|=CGitStatusListCtrl::FILELIST_MODIFY;
4089 }
4090 }
4091 if (mask & CGitStatusListCtrl::FILELIST_UNVER || mask & CGitStatusListCtrl::FILELIST_IGNORE)
4092 {
4093 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_UNVER)))
4094 {
4095 UpdateUnRevFileList(List);
4096 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
4097 }
4098 if(mask&CGitStatusListCtrl::FILELIST_IGNORE && (once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_IGNORE))))
4099 {
4100 UpdateIgnoreFileList(List);
4101 m_FileLoaded |= CGitStatusListCtrl::FILELIST_IGNORE;
4102 }
4103 }
4104 if (mask & CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED && (once || (!(m_FileLoaded & CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED))))
4105 {
4106 UpdateLocalChangesIgnoredFileList(List);
4107 m_FileLoaded |= CGitStatusListCtrl::FILELIST_LOCALCHANGESIGNORED;
4108 }
4109 return 0;
4110 }
4111
4112 void CGitStatusListCtrl::Clear()
4113 {
4114 m_FileLoaded=0;
4115 this->DeleteAllItems();
4116 this->m_arListArray.clear();
4117 this->m_arStatusArray.clear();
4118 this->m_changelists.clear();
4119 }
4120
4121 bool CGitStatusListCtrl::CheckMultipleDiffs()
4122 {
4123 UINT selCount = GetSelectedCount();
4124 if (selCount > max(3, (DWORD)CRegDWORD(_T("Software\\TortoiseGit\\NumDiffWarning"), 10)))
4125 {
4126 CString message;
4127 message.Format(CString(MAKEINTRESOURCE(IDS_STATUSLIST_WARN_MAXDIFF)), selCount);
4128 return ::MessageBox(GetSafeHwnd(), message, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION) == IDYES;
4129 }
4130 return true;
4131 }
4132 //////////////////////////////////////////////////////////////////////////
4133 #if 0
4134 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium, DWORD * /*pdwEffect*/, POINTL pt)
4135 {
4136 if(pFmtEtc->cfFormat == CF_HDROP && medium.tymed == TYMED_HGLOBAL)
4137 {
4138 HDROP hDrop = (HDROP)GlobalLock(medium.hGlobal);
4139 if(hDrop != NULL)
4140 {
4141 TCHAR szFileName[MAX_PATH] = {0};
4142
4143 UINT cFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
4144
4145 POINT clientpoint;
4146 clientpoint.x = pt.x;
4147 clientpoint.y = pt.y;
4148 ScreenToClient(m_hTargetWnd, &clientpoint);
4149 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
4150 {
4151 CTSVNPathList changelistItems;
4152 for(UINT i = 0; i < cFiles; ++i)
4153 {
4154 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
4155 changelistItems.AddPath(CTSVNPath(szFileName));
4156 }
4157 // find the changelist name
4158 CString sChangelist;
4159 LONG_PTR nGroup = m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint);
4160 for (std::map<CString, int>::iterator it = m_pSVNStatusListCtrl->m_changelists.begin(); it != m_pSVNStatusListCtrl->m_changelists.end(); ++it)
4161 if (it->second == nGroup)
4162 sChangelist = it->first;
4163 if (!sChangelist.IsEmpty())
4164 {
4165 SVN git;
4166 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
4167 {
4168 for (int l=0; l<changelistItems.GetCount(); ++l)
4169 {
4170 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
4171 if (index >= 0)
4172 {
4173 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
4174 if (e)
4175 {
4176 e->changelist = sChangelist;
4177 if (!e->IsFolder())
4178 {
4179 if (m_pSVNStatusListCtrl->m_changelists.find(e->changelist)!=m_pSVNStatusListCtrl->m_changelists.end())
4180 m_pSVNStatusListCtrl->SetItemGroup(index, m_pSVNStatusListCtrl->m_changelists[e->changelist]);
4181 else
4182 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
4183 }
4184 }
4185 }
4186 else
4187 {
4188 HWND hParentWnd = GetParent(m_hTargetWnd);
4189 if (hParentWnd != NULL)
4190 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
4191 }
4192 }
4193 }
4194 else
4195 {
4196 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
4197 }
4198 }
4199 else
4200 {
4201 SVN git;
4202 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
4203 {
4204 for (int l=0; l<changelistItems.GetCount(); ++l)
4205 {
4206 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
4207 if (index >= 0)
4208 {
4209 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
4210 if (e)
4211 {
4212 e->changelist = sChangelist;
4213 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
4214 }
4215 }
4216 else
4217 {
4218 HWND hParentWnd = GetParent(m_hTargetWnd);
4219 if (hParentWnd != NULL)
4220 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
4221 }
4222 }
4223 }
4224 else
4225 {
4226 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
4227 }
4228 }
4229 }
4230 else
4231 {
4232 for(UINT i = 0; i < cFiles; ++i)
4233 {
4234 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
4235 HWND hParentWnd = GetParent(m_hTargetWnd);
4236 if (hParentWnd != NULL)
4237 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)szFileName);
4238 }
4239 }
4240 }
4241 GlobalUnlock(medium.hGlobal);
4242 }
4243 return true; //let base free the medium
4244 }
4245 HRESULT STDMETHODCALLTYPE CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect)
4246 {
4247 CIDropTarget::DragOver(grfKeyState, pt, pdwEffect);
4248 *pdwEffect = DROPEFFECT_COPY;
4249 if (m_pSVNStatusListCtrl)
4250 {
4251 POINT clientpoint;
4252 clientpoint.x = pt.x;
4253 clientpoint.y = pt.y;
4254 ScreenToClient(m_hTargetWnd, &clientpoint);
4255 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
4256 {
4257 *pdwEffect = DROPEFFECT_MOVE;
4258 }
4259 else if ((!m_pSVNStatusListCtrl->m_bFileDropsEnabled)||(m_pSVNStatusListCtrl->m_bOwnDrag))
4260 {
4261 *pdwEffect = DROPEFFECT_NONE;
4262 }
4263 }
4264 return S_OK;
4265 }f
4266
4267 #endif
4268
4269 void CGitStatusListCtrl::FilesExport()
4270 {
4271 CString exportDir;
4272 // export all changed files to a folder
4273 CBrowseFolder browseFolder;
4274 browseFolder.m_style = BIF_EDITBOX | BIF_NEWDIALOGSTYLE | BIF_RETURNFSANCESTORS | BIF_RETURNONLYFSDIRS;
4275 if (browseFolder.Show(GetSafeHwnd(), exportDir) != CBrowseFolder::OK)
4276 return;
4277
4278 POSITION pos = GetFirstSelectedItemPosition();
4279 int index;
4280 while ((index = GetNextSelectedItem(pos)) >= 0)
4281 {
4282 CTGitPath *fd = (CTGitPath*)GetItemData(index);
4283 // we cannot export directories or folders
4284 if (fd->m_Action == CTGitPath::LOGACTIONS_DELETED || fd->IsDirectory())
4285 continue;
4286
4287 CAppUtils::CreateMultipleDirectory(exportDir + _T("\\") + fd->GetContainingDirectory().GetWinPathString());
4288 CString filename = exportDir + _T("\\") + fd->GetWinPathString();
4289 if (m_CurrentVersion == GIT_REV_ZERO)
4290 {
4291 if (!CopyFile(g_Git.m_CurrentDir + _T("\\") + fd->GetWinPath(), filename, false))
4292 {
4293 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
4294 return;
4295 }
4296 }
4297 else
4298 {
4299 if (g_Git.GetOneFile(m_CurrentVersion, *fd, filename))
4300 {
4301 CString out;
4302 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, fd->GetGitPathString(), m_CurrentVersion, filename);
4303 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)
4304 return;
4305 }
4306 }
4307 }
4308 }
4309
4310 void CGitStatusListCtrl::FileSaveAs(CTGitPath *path)
4311 {
4312 CString filename;
4313 filename.Format(_T("%s-%s%s"), path->GetBaseFilename(), this->m_CurrentVersion.Left(g_Git.GetShortHASHLength()), path->GetFileExtension());
4314 CFileDialog dlg(FALSE,NULL,
4315 filename,
4316 OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
4317 NULL);
4318 CString currentpath;
4319 currentpath = g_Git.m_CurrentDir + _T("\\") + path->GetContainingDirectory().GetWinPath();
4320
4321 dlg.m_ofn.lpstrInitialDir=currentpath.GetBuffer();
4322
4323 CString cmd,out;
4324 INT_PTR ret = dlg.DoModal();
4325 SetCurrentDirectory(g_Git.m_CurrentDir);
4326 if (ret == IDOK)
4327 {
4328 filename = dlg.GetPathName();
4329 if(m_CurrentVersion == GIT_REV_ZERO)
4330 {
4331 if(!CopyFile(g_Git.m_CurrentDir +_T("\\") + path->GetWinPath(),filename,false))
4332 {
4333 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
4334 return;
4335 }
4336
4337 }
4338 else
4339 {
4340 if(g_Git.GetOneFile(m_CurrentVersion,*path,filename))
4341 {
4342 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, path->GetGitPathString(), m_CurrentVersion, filename);
4343 CMessageBox::Show(nullptr, g_Git.GetGitLastErr(out, CGit::GIT_CMD_GETONEFILE), _T("TortoiseGit"), MB_OK);
4344 return;
4345 }
4346 }
4347 }
4348
4349 }
4350
4351 int CGitStatusListCtrl::RevertSelectedItemToVersion(bool parent)
4352 {
4353 if(this->m_CurrentVersion.IsEmpty())
4354 return 0;
4355 if(this->m_CurrentVersion == GIT_REV_ZERO)
4356 return 0;
4357
4358 POSITION pos = GetFirstSelectedItemPosition();
4359 int index;
4360 CString cmd,out;
4361 std::map<CString, int> versionMap;
4362 while ((index = GetNextSelectedItem(pos)) >= 0)
4363 {
4364 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
4365 CString version;
4366 if (parent)
4367 {
4368 int parentNo = fentry->m_ParentNo & PARENT_MASK;
4369 CString ref;
4370 ref.Format(_T("%s^%d"), m_CurrentVersion, parentNo + 1);
4371 CGitHash hash;
4372 if (g_Git.GetHash(hash, ref))
4373 {
4374 MessageBox(g_Git.GetGitLastErr(_T("Could not get hash of ref \"") + ref + _T("\".")), _T("TortoiseGit"), MB_ICONERROR);
4375 continue;
4376 }
4377
4378 version = hash.ToString();
4379 }
4380 else
4381 version = m_CurrentVersion;
4382
4383 cmd.Format(_T("git.exe checkout %s -- \"%s\""), version, fentry->GetGitPathString());
4384 out.Empty();
4385 if (g_Git.Run(cmd, &out, CP_UTF8))
4386 {
4387 if (MessageBox(out, _T("TortoiseGit"), MB_ICONEXCLAMATION | MB_OKCANCEL) == IDCANCEL)
4388 continue;
4389 }
4390 else
4391 versionMap[version]++;
4392 }
4393
4394 out.Empty();
4395 for (auto it = versionMap.begin(); it != versionMap.end(); ++it)
4396 {
4397 CString versionEntry;
4398 versionEntry.Format(IDS_STATUSLIST_FILESREVERTED, it->second, it->first);
4399 out += versionEntry + _T("\r\n");
4400 }
4401 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
4402 return 0;
4403 }
4404
4405 void CGitStatusListCtrl::OpenFile(CTGitPath*filepath,int mode)
4406 {
4407 CString file;
4408 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
4409 {
4410 file = g_Git.m_CurrentDir + _T("\\") + filepath->GetWinPath();
4411 }
4412 else
4413 {
4414 CString temppath;
4415 GetTempPath(temppath);
4416 TCHAR szTempName[MAX_PATH] = {0};
4417 GetTempFileName(temppath, filepath->GetBaseFilename(), 0, szTempName);
4418 CString temp(szTempName);
4419 DeleteFile(szTempName);
4420 CreateDirectory(szTempName, NULL);
4421 file.Format(_T("%s\\%s_%s%s"),
4422 temp,
4423 filepath->GetBaseFilename(),
4424 m_CurrentVersion.Left(g_Git.GetShortHASHLength()),
4425 filepath->GetFileExtension());
4426 CString cmd,out;
4427 if(g_Git.GetOneFile(m_CurrentVersion, *filepath, file))
4428 {
4429 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, filepath->GetGitPathString(), m_CurrentVersion, file);
4430 CMessageBox::Show(nullptr, g_Git.GetGitLastErr(out, CGit::GIT_CMD_GETONEFILE), _T("TortoiseGit"), MB_OK);
4431 return;
4432 }
4433 SetFileAttributes(file, FILE_ATTRIBUTE_READONLY);
4434 }
4435 if(mode == ALTERNATIVEEDITOR)
4436 {
4437 CAppUtils::LaunchAlternativeEditor(file);
4438 return;
4439 }
4440 int ret = HINSTANCE_ERROR;
4441
4442 if(mode == OPEN )
4443 {
4444 ret = (int)ShellExecute(this->m_hWnd, NULL,file, NULL, NULL, SW_SHOW);
4445
4446 if (ret > HINSTANCE_ERROR)
4447 {
4448 return;
4449 }
4450 }
4451
4452 {
4453 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
4454 cmd += file;
4455 CAppUtils::LaunchApplication(cmd, NULL, false);
4456 }
4457 }
4458
4459 void CGitStatusListCtrl::DeleteSelectedFiles()
4460 {
4461 //Collect paths
4462 std::vector<int> selectIndex;
4463
4464 POSITION pos = GetFirstSelectedItemPosition();
4465 int index;
4466 while ((index = GetNextSelectedItem(pos)) >= 0)
4467 {
4468 selectIndex.push_back(index);
4469 }
4470
4471 //Create file-list ('\0' separated) for SHFileOperation
4472 CString filelist;
4473 for (size_t i = 0; i < selectIndex.size(); ++i)
4474 {
4475 index = selectIndex[i];
4476
4477 CTGitPath * path=(CTGitPath*)GetItemData(index);
4478 ASSERT(path);
4479 if (path == nullptr)
4480 continue;
4481
4482 filelist += path->GetWinPathString();
4483 filelist += _T("|");
4484 }
4485 filelist += _T("|");
4486 int len = filelist.GetLength();
4487 std::unique_ptr<TCHAR[]> buf(new TCHAR[len + 2]);
4488 _tcscpy_s(buf.get(), len + 2, filelist);
4489 CStringUtils::PipesToNulls(buf.get(), len + 2);
4490 SHFILEOPSTRUCT fileop;
4491 fileop.hwnd = this->m_hWnd;
4492 fileop.wFunc = FO_DELETE;
4493 fileop.pFrom = buf.get();
4494 fileop.pTo = NULL;
4495 fileop.fFlags = FOF_NO_CONNECTED_ELEMENTS | ((GetAsyncKeyState(VK_SHIFT) & 0x8000) ? 0 : FOF_ALLOWUNDO);
4496 fileop.lpszProgressTitle = _T("deleting file");
4497 int result = SHFileOperation(&fileop);
4498
4499 if ((result == 0) && (!fileop.fAnyOperationsAborted))
4500 {
4501 SetRedraw(FALSE);
4502 POSITION pos = NULL;
4503 while ((pos = GetFirstSelectedItemPosition()) != 0)
4504 {
4505 int index = GetNextSelectedItem(pos);
4506 if (GetCheck(index))
4507 m_nSelected--;
4508 m_nTotal--;
4509
4510 RemoveListEntry(index);
4511 }
4512 SetRedraw(TRUE);
4513 }
4514 }
Windows Explorer Extension to Operate Git