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