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