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