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