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