1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2008-2013 - TortoiseGit
4 // Copyright (C) 2003-2008, 2013 - TortoiseSVN
5 // Copyright (C) 2010-2012 Sven Strickroth <email@cs-ware.de>
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.
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.
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.
24 #include "..\\TortoiseShell\resource.h"
25 #include "GitStatusListCtrl.h"
26 #include "MessageBox.h"
28 #include "UnicodeUtils.h"
30 #include "PathUtils.h"
32 #include "StringUtils.h"
33 #include "DirFileEnum.h"
34 #include "GitConfig.h"
35 #include "LoglistUtils.h"
36 //#include "SVNProperties.h"
40 #include "GitProgressDlg.h"
41 #include "SysImageList.h"
42 //#include "Svnstatuslistctrl.h"
45 #include "GitStatus.h"
46 //#include "SVNHelpers.h"
48 #include "ShellUpdater.h"
49 #include "GitAdminDir.h"
50 //#include "DropFiles.h"
53 //#include "EditPropertiesDlg.h"
54 //#include "CreateChangelistDlg.h"
55 #include "FormatMessageWrapper.h"
56 #include "BrowseFolder.h"
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"));
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
)
79 ON_NOTIFY_REFLECT(NM_DBLCLK
, OnNMDblclk
)
80 ON_NOTIFY_REFLECT(LVN_GETINFOTIP
, OnLvnGetInfoTip
)
81 ON_NOTIFY_REFLECT(NM_CUSTOMDRAW
, OnNMCustomdraw
)
84 ON_NOTIFY_REFLECT(NM_RETURN
, OnNMReturn
)
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
)
92 ON_NOTIFY_REFLECT(LVN_BEGINDRAG
, OnBeginDrag
)
93 ON_NOTIFY_REFLECT(LVN_ITEMCHANGING
, &CGitStatusListCtrl::OnLvnItemchanging
)
98 CGitStatusListCtrl::CGitStatusListCtrl() : CListCtrl()
99 //, m_HeadRev(GitRev::REV_HEAD)
102 , m_pSelectButton(NULL
)
103 , m_pConfirmButton(NULL
)
106 , m_bShowIgnores(false)
107 , m_pDropTarget(NULL
)
108 , m_bIgnoreRemoveOnly(false)
109 , m_bCheckChildrenWithParent(false)
110 , m_bUnversionedLast(true)
111 , m_bHasChangeLists(false)
115 , m_bHasCheckboxes(false)
116 , m_bCheckIfGroupsExist(true)
117 , m_bFileDropsEnabled(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
))
126 , m_bDoNotAutoselectSubmodules(false)
128 , m_hwndLogicalParent(NULL
)
129 , m_bHasUnversionedItems(FALSE
)
132 m_dwDefaultColumns
= 0;
134 m_bIsRevertTheirMy
= false;
135 this->m_nLineAdded
=this->m_nLineDeleted
=0;
138 CGitStatusListCtrl::~CGitStatusListCtrl()
140 // if (m_pDropTarget)
141 // delete m_pDropTarget;
145 void CGitStatusListCtrl::ClearStatusArray()
148 Locker
lock(m_critSec
);
149 for (size_t i
=0; i
< m_arStatusArray
.size(); i
++)
151 delete m_arStatusArray
[i
];
153 m_arStatusArray
.clear();
157 void CGitStatusListCtrl::Init(DWORD dwColumns
, const CString
& sColumnInfoContainer
, unsigned __int64 dwContextMenus
/* = GitSLC_POPALL */, bool bHasCheckboxes
/* = true */, bool bHasWC
/* = true */, DWORD allowedColumns
/* = 0xffffffff */)
159 Locker
lock(m_critSec
);
161 m_dwDefaultColumns
= dwColumns
| 1;
162 m_dwContextMenus
= dwContextMenus
;
163 m_bHasCheckboxes
= bHasCheckboxes
;
166 // set the extended style of the listcontrol
167 // 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.
168 CRegDWORD
regFullRowSelect(_T("Software\\TortoiseGit\\FullRowSelect"), TRUE
);
169 DWORD exStyle
= LVS_EX_HEADERDRAGDROP
| LVS_EX_DOUBLEBUFFER
| LVS_EX_INFOTIP
| LVS_EX_SUBITEMIMAGES
;
170 if (DWORD(regFullRowSelect
))
171 exStyle
|= LVS_EX_FULLROWSELECT
;
172 exStyle
|= (bHasCheckboxes
? LVS_EX_CHECKBOXES
: 0);
174 SetExtendedStyle(exStyle
);
176 SetWindowTheme(m_hWnd
, L
"Explorer", NULL
);
178 m_nIconFolder
= SYS_IMAGE_LIST().GetDirIconIndex();
179 m_nRestoreOvl
= SYS_IMAGE_LIST().AddIcon((HICON
)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_RESTOREOVL
), IMAGE_ICON
, 0, 0, LR_DEFAULTSIZE
));
180 SYS_IMAGE_LIST().SetOverlayImage(m_nRestoreOvl
, OVL_RESTORE
);
181 SetImageList(&SYS_IMAGE_LIST(), LVSIL_SMALL
);
183 // keep CSorter::operator() in sync!!
184 static UINT standardColumnNames
[GITSLC_NUMCOLUMNS
]
185 = { IDS_STATUSLIST_COLFILE
186 , IDS_STATUSLIST_COLFILENAME
187 , IDS_STATUSLIST_COLEXT
188 , IDS_STATUSLIST_COLSTATUS
189 , IDS_STATUSLIST_COLADD
190 , IDS_STATUSLIST_COLDEL
191 , IDS_STATUSLIST_COLLASTMODIFIED
192 , IDS_STATUSLIST_COLSIZE
195 m_ColumnManager
.SetNames(standardColumnNames
,GITSLC_NUMCOLUMNS
);
196 m_ColumnManager
.ReadSettings(m_dwDefaultColumns
, 0xffffffff & ~(allowedColumns
| m_dwDefaultColumns
), sColumnInfoContainer
, GITSLC_NUMCOLUMNS
);
200 if (m_pDropTarget
== NULL
)
202 m_pDropTarget
= new CGitStatusListCtrlDropTarget(this);
203 RegisterDragDrop(m_hWnd
,m_pDropTarget
);
204 // create the supported formats:
206 ftetc
.dwAspect
= DVASPECT_CONTENT
;
208 ftetc
.tymed
= TYMED_HGLOBAL
;
209 ftetc
.cfFormat
=CF_HDROP
;
210 m_pDropTarget
->AddSuportedFormat(ftetc
);
217 bool CGitStatusListCtrl::SetBackgroundImage(UINT nID
)
219 return CAppUtils::SetListCtrlBackgroundImage(GetSafeHwnd(), nID
);
222 BOOL
CGitStatusListCtrl::GetStatus ( const CTGitPathList
* pathList
223 , bool bUpdate
/* = FALSE */
224 , bool bShowIgnores
/* = false */
227 Locker
lock(m_critSec
);
228 int mask
= CGitStatusListCtrl::FILELIST_MODIFY
;
230 mask
|= CGitStatusListCtrl::FILELIST_IGNORE
;
232 mask
|= CGitStatusListCtrl::FILELIST_UNVER
;
233 this->UpdateFileList(mask
,bUpdate
,(CTGitPathList
*)pathList
);
237 int refetchcounter
= 0;
240 // force the cursor to change
243 SetCursorPos(pt
.x
, pt
.y
);
245 m_mapFilenameToChecked
.clear();
246 //m_StatusUrlList.Clear();
247 bool bHasChangelists
= (m_changelists
.size() > 1 || (!m_changelists
.empty() && !m_bHasIgnoreGroup
));
248 m_changelists
.clear();
249 for (size_t i
=0; i
< m_arStatusArray
.size(); i
++)
251 FileEntry
* entry
= m_arStatusArray
[i
];
252 if ( bHasChangelists
&& entry
->checked
)
254 // If change lists are present, remember all checked entries
255 CString path
= entry
->GetPath().GetGitPathString();
256 m_mapFilenameToChecked
[path
] = true;
258 if ( (entry
->status
==git_wc_status_unversioned
|| entry
->status
==git_wc_status_missing
) && entry
->checked
)
260 // The user manually selected an unversioned or missing file. We remember
261 // this so that the selection can be restored when refreshing.
262 CString path
= entry
->GetPath().GetGitPathString();
263 m_mapFilenameToChecked
[path
] = true;
265 else if ( entry
->status
> git_wc_status_normal
&& !entry
->checked
)
267 // The user manually deselected a versioned file. We remember
268 // this so that the deselection can be restored when refreshing.
269 CString path
= entry
->GetPath().GetGitPathString();
270 m_mapFilenameToChecked
[path
] = false;
274 // use a sorted path list to make sure we fetch the status of
275 // parent items first, *then* the child items (if any)
276 CTGitPathList sortedPathList
= pathList
;
277 sortedPathList
.SortByPathname();
282 m_bHasExternalsFromDifferentRepos
= FALSE
;
283 m_bHasExternals
= FALSE
;
284 m_bHasUnversionedItems
= FALSE
;
286 m_bHasChangeLists
= false;
287 m_bShowIgnores
= bShowIgnores
;
294 // first clear possible status data left from
295 // previous GetStatus() calls
298 m_StatusFileList
= sortedPathList
;
300 // Since Git_client_status() returns all files, even those in
301 // folders included with Git:externals we need to check if all
302 // files we get here belongs to the same repository.
303 // It is possible to commit changes in an external folder, as long
304 // as the folder belongs to the same repository (but another path),
305 // but it is not possible to commit all files if the externals are
306 // from a different repository.
308 // To check if all files belong to the same repository, we compare the
309 // UUID's - if they're identical then the files belong to the same
310 // repository and can be committed. But if they're different, then
311 // tell the user to commit all changes in the external folders
313 CStringA sUUID
; // holds the repo UUID
314 CTGitPathList arExtPaths
; // list of Git:external paths
320 m_nTargetCount
= sortedPathList
.GetCount();
322 GitStatus
status(m_pbCanceled
);
323 if(m_nTargetCount
> 1 && sortedPathList
.AreAllPathsFilesInOneDirectory())
325 // This is a special case, where we've been given a list of files
326 // all from one folder
327 // We handle them by setting a status filter, then requesting the Git status of
328 // all the files in the directory, filtering for the ones we're interested in
329 status
.SetFilter(sortedPathList
);
331 // if all selected entries are files, we don't do a recursive status
332 // fetching. But if only one is a directory, we have to recurse.
333 git_depth_t depth
= git_depth_files
;
334 // We have set a filter. If all selected items were files or we fetch
335 // the status not recursively, then we have to include
336 // ignored items too - the user has selected them
337 bool bShowIgnoresRight
= true;
338 for (int fcindex
=0; fcindex
<sortedPathList
.GetCount(); ++fcindex
)
340 if (sortedPathList
[fcindex
].IsDirectory())
342 depth
= git_depth_infinity
;
343 bShowIgnoresRight
= false;
347 if(!FetchStatusForSingleTarget(config
, status
, sortedPathList
.GetCommonDirectory(), bUpdate
, sUUID
, arExtPaths
, true, depth
, bShowIgnoresRight
))
354 for(int nTarget
= 0; nTarget
< m_nTargetCount
; nTarget
++)
356 // check whether the path we want the status for is already fetched due to status-fetching
358 // this check is only done for file paths, because folder paths could be included already
359 // but not recursively
360 if (sortedPathList
[nTarget
].IsDirectory() || GetListEntry(sortedPathList
[nTarget
]) == NULL
)
362 if(!FetchStatusForSingleTarget(config
, status
, sortedPathList
[nTarget
], bUpdate
, sUUID
,
363 arExtPaths
, false, git_depth_infinity
, bShowIgnores
))
371 // remove the 'helper' files of conflicted items from the list.
372 // otherwise they would appear as unversioned files.
373 for (INT_PTR cind
= 0; cind
< m_ConflictFileList
.GetCount(); ++cind
)
375 for (size_t i
=0; i
< m_arStatusArray
.size(); i
++)
377 if (m_arStatusArray
[i
]->GetPath().IsEquivalentTo(m_ConflictFileList
[cind
]))
379 delete m_arStatusArray
[i
];
380 m_arStatusArray
.erase(m_arStatusArray
.begin()+i
);
386 } while(!BuildStatistics() && (refetchcounter
< 2) && (*m_pbCanceled
==false));
391 SetCursorPos(pt
.x
, pt
.y
);
398 // Get the show-flags bitmap value which corresponds to a particular Git status
399 DWORD
CGitStatusListCtrl::GetShowFlagsFromGitStatus(git_wc_status_kind status
)
403 case git_wc_status_none
:
404 case git_wc_status_unversioned
:
405 return GITSLC_SHOWUNVERSIONED
;
406 case git_wc_status_ignored
:
408 return GITSLC_SHOWDIRECTS
;
409 return GITSLC_SHOWDIRECTS
|GITSLC_SHOWIGNORED
;
410 case git_wc_status_incomplete
:
411 return GITSLC_SHOWINCOMPLETE
;
412 case git_wc_status_normal
:
413 return GITSLC_SHOWNORMAL
;
414 case git_wc_status_external
:
415 return GITSLC_SHOWEXTERNAL
;
416 case git_wc_status_added
:
417 return GITSLC_SHOWADDED
;
418 case git_wc_status_missing
:
419 return GITSLC_SHOWMISSING
;
420 case git_wc_status_deleted
:
421 return GITSLC_SHOWREMOVED
;
422 case git_wc_status_replaced
:
423 return GITSLC_SHOWREPLACED
;
424 case git_wc_status_modified
:
425 return GITSLC_SHOWMODIFIED
;
426 case git_wc_status_merged
:
427 return GITSLC_SHOWMERGED
;
428 case git_wc_status_conflicted
:
429 return GITSLC_SHOWCONFLICTED
;
430 case git_wc_status_obstructed
:
431 return GITSLC_SHOWOBSTRUCTED
;
433 // we should NEVER get here!
440 void CGitStatusListCtrl::Show(unsigned int dwShow
, unsigned int dwCheck
/*=0*/, bool /*bShowFolders*/ /* = true */,BOOL UpdateStatusList
,bool UseStoredCheckStatus
)
442 CWinApp
* pApp
= AfxGetApp();
444 pApp
->DoWaitCursor(1);
446 Locker
lock(m_critSec
);
447 WORD langID
= (WORD
)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
449 //SetItemCount(listIndex);
454 m_nShownUnversioned
= 0;
455 m_nShownModified
= 0;
458 m_nShownConflicted
= 0;
460 m_nShownSubmodules
= 0;
464 m_arStatusArray
.clear();
465 for(int i
=0;i
<this->m_StatusFileList
.GetCount();i
++)
467 m_arStatusArray
.push_back((CTGitPath
*)&m_StatusFileList
[i
]);
470 for(int i
=0;i
<this->m_UnRevFileList
.GetCount();i
++)
472 m_arStatusArray
.push_back((CTGitPath
*)&m_UnRevFileList
[i
]);
475 for(int i
=0;i
<this->m_IgnoreFileList
.GetCount();i
++)
477 m_arStatusArray
.push_back((CTGitPath
*)&m_IgnoreFileList
[i
]);
481 if (m_nSortedColumn
>= 0)
483 CSorter
predicate (&m_ColumnManager
, m_nSortedColumn
, m_bAscending
);
484 std::sort(m_arStatusArray
.begin(), m_arStatusArray
.end(), predicate
);
488 for(int i
=0;i
<this->m_arStatusArray
.size();i
++)
490 //set default checkbox status
491 CTGitPath
* entry
= ((CTGitPath
*)m_arStatusArray
[i
]);
492 CString path
= entry
->GetGitPathString();
493 if (!m_mapFilenameToChecked
.empty() && m_mapFilenameToChecked
.find(path
) != m_mapFilenameToChecked
.end())
495 entry
->m_Checked
=m_mapFilenameToChecked
[path
];
497 else if (!UseStoredCheckStatus
)
499 bool autoSelectSubmodules
= !(entry
->IsDirectory() && m_bDoNotAutoselectSubmodules
);
500 if(entry
->m_Action
& dwCheck
&& autoSelectSubmodules
)
501 entry
->m_Checked
=true;
503 entry
->m_Checked
=false;
504 m_mapFilenameToChecked
[path
] = entry
->m_Checked
;
507 if(entry
->m_Action
& dwShow
)
509 AddEntry(entry
,langID
,index
);
514 int maxcol
= ((CHeaderCtrl
*)(GetDlgItem(0)))->GetItemCount()-1;
515 for (int col
= 0; col
<= maxcol
; col
++)
516 SetColumnWidth (col
, m_ColumnManager
.GetWidth (col
, true));
519 GetStatisticsString();
521 CHeaderCtrl
* pHeader
= GetHeaderCtrl();
522 HDITEM HeaderItem
= {0};
523 HeaderItem
.mask
= HDI_FORMAT
;
524 for (int i
=0; i
<pHeader
->GetItemCount(); ++i
)
526 pHeader
->GetItem(i
, &HeaderItem
);
527 HeaderItem
.fmt
&= ~(HDF_SORTDOWN
| HDF_SORTUP
);
528 pHeader
->SetItem(i
, &HeaderItem
);
530 if (m_nSortedColumn
>= 0)
532 pHeader
->GetItem(m_nSortedColumn
, &HeaderItem
);
533 HeaderItem
.fmt
|= (m_bAscending
? HDF_SORTUP
: HDF_SORTDOWN
);
534 pHeader
->SetItem(m_nSortedColumn
, &HeaderItem
);
540 SetItemState(nSelectedEntry
, LVIS_SELECTED
, LVIS_SELECTED
);
541 EnsureVisible(nSelectedEntry
, false);
545 // Restore the item at the top of the list.
546 for (int i
=0;GetTopIndex() != nTopIndex
;i
++)
548 if ( !EnsureVisible(nTopIndex
+i
,false) )
556 pApp
->DoWaitCursor(-1);
562 this->BuildStatistics();
566 CWinApp
* pApp
= AfxGetApp();
568 pApp
->DoWaitCursor(1);
570 m_bShowFolders
= bShowFolders
;
572 int nTopIndex
= GetTopIndex();
573 POSITION posSelectedEntry
= GetFirstSelectedItemPosition();
574 int nSelectedEntry
= 0;
575 if (posSelectedEntry
)
576 nSelectedEntry
= GetNextSelectedItem(posSelectedEntry
);
582 m_arListArray
.clear();
584 m_arListArray
.reserve(m_arStatusArray
.size());
585 SetItemCount (static_cast<int>(m_arStatusArray
.size()));
588 for (size_t i
=0; i
< m_arStatusArray
.size(); ++i
)
590 FileEntry
* entry
= m_arStatusArray
[i
];
591 if ((entry
->inexternal
) && (!(dwShow
& SVNSLC_SHOWINEXTERNALS
)))
593 if ((entry
->differentrepo
|| entry
->isNested
) && (! (dwShow
& SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO
)))
595 if (entry
->IsFolder() && (!bShowFolders
))
596 continue; // don't show folders if they're not wanted.
599 git_wc_status_kind status
= GitStatus::GetMoreImportant(entry
->status
, entry
->remotestatus
);
600 DWORD showFlags
= GetShowFlagsFromGitStatus(status
);
601 if (entry
->IsLocked())
602 showFlags
|= SVNSLC_SHOWLOCKS
;
604 showFlags
|= SVNSLC_SHOWSWITCHED
;
605 if (!entry
->changelist
.IsEmpty())
606 showFlags
|= SVNSLC_SHOWINCHANGELIST
;
608 bool bAllowCheck
= ((entry
->changelist
.Compare(GITSLC_IGNORECHANGELIST
) != 0)
609 && (m_bCheckIfGroupsExist
|| (m_changelists
.empty() || (m_changelists
.size() == 1 && m_bHasIgnoreGroup
))));
611 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
613 if (status
!= Git_wc_status_ignored
|| (entry
->direct
) || (dwShow
& GitSLC_SHOWIGNORED
))
615 if ((!entry
->IsFolder()) && (status
== Git_wc_status_deleted
) && (dwShow
& SVNSLC_SHOWREMOVEDANDPRESENT
))
617 if (PathFileExists(entry
->GetPath().GetWinPath()))
619 m_arListArray
.push_back(i
);
620 if ((dwCheck
& SVNSLC_SHOWREMOVEDANDPRESENT
)||((dwCheck
& SVNSLC_SHOWDIRECTS
)&&(entry
->direct
)))
623 entry
->checked
= true;
625 AddEntry(entry
, langID
, listIndex
++);
628 else if ((dwShow
& showFlags
)||((dwShow
& SVNSLC_SHOWDIRECTFILES
)&&(entry
->direct
)&&(!entry
->IsFolder())))
630 m_arListArray
.push_back(i
);
631 if ((dwCheck
& showFlags
)||((dwCheck
& SVNSLC_SHOWDIRECTS
)&&(entry
->direct
)))
634 entry
->checked
= true;
636 AddEntry(entry
, langID
, listIndex
++);
638 else if ((dwShow
& showFlags
)||((dwShow
& SVNSLC_SHOWDIRECTFOLDER
)&&(entry
->direct
)&&entry
->IsFolder()))
640 m_arListArray
.push_back(i
);
641 if ((dwCheck
& showFlags
)||((dwCheck
& SVNSLC_SHOWDIRECTS
)&&(entry
->direct
)))
644 entry
->checked
= true;
646 AddEntry(entry
, langID
, listIndex
++);
652 SetItemCount(listIndex
);
654 m_ColumnManager
.UpdateRelevance (m_arStatusArray
, m_arListArray
);
656 int maxcol
= ((CHeaderCtrl
*)(GetDlgItem(0)))->GetItemCount()-1;
657 for (int col
= 0; col
<= maxcol
; col
++)
658 SetColumnWidth (col
, m_ColumnManager
.GetWidth (col
, true));
661 GetStatisticsString();
663 CHeaderCtrl
* pHeader
= GetHeaderCtrl();
664 HDITEM HeaderItem
= {0};
665 HeaderItem
.mask
= HDI_FORMAT
;
666 for (int i
=0; i
<pHeader
->GetItemCount(); ++i
)
668 pHeader
->GetItem(i
, &HeaderItem
);
669 HeaderItem
.fmt
&= ~(HDF_SORTDOWN
| HDF_SORTUP
);
670 pHeader
->SetItem(i
, &HeaderItem
);
674 pHeader
->GetItem(m_nSortedColumn
, &HeaderItem
);
675 HeaderItem
.fmt
|= (m_bAscending
? HDF_SORTUP
: HDF_SORTDOWN
);
676 pHeader
->SetItem(m_nSortedColumn
, &HeaderItem
);
681 SetItemState(nSelectedEntry
, LVIS_SELECTED
, LVIS_SELECTED
);
682 EnsureVisible(nSelectedEntry
, false);
686 // Restore the item at the top of the list.
687 for (int i
=0;GetTopIndex() != nTopIndex
;i
++)
689 if ( !EnsureVisible(nTopIndex
+i
,false) )
697 pApp
->DoWaitCursor(-1);
699 m_bEmpty
= (GetItemCount() == 0);
705 void CGitStatusListCtrl::Show(unsigned int /*dwShow*/, const CTGitPathList
& checkedList
, bool /*bShowFolders*/ /* = true */)
708 for(int i
=0;i
<checkedList
.GetCount();i
++)
709 this->AddEntry((CTGitPath
*)&checkedList
[i
],0,i
);
713 Locker
lock(m_critSec
);
714 WORD langID
= (WORD
)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
716 CWinApp
* pApp
= AfxGetApp();
718 pApp
->DoWaitCursor(1);
720 m_bShowFolders
= bShowFolders
;
722 int nTopIndex
= GetTopIndex();
723 POSITION posSelectedEntry
= GetFirstSelectedItemPosition();
724 int nSelectedEntry
= 0;
725 if (posSelectedEntry
)
726 nSelectedEntry
= GetNextSelectedItem(posSelectedEntry
);
732 m_arListArray
.clear();
734 m_arListArray
.reserve(m_arStatusArray
.size());
735 SetItemCount (static_cast<int>(m_arStatusArray
.size()));
738 for (size_t i
=0; i
< m_arStatusArray
.size(); ++i
)
740 FileEntry
* entry
= m_arStatusArray
[i
];
741 if ((entry
->inexternal
) && (!(dwShow
& SVNSLC_SHOWINEXTERNALS
)))
743 if ((entry
->differentrepo
|| entry
->isNested
) && (! (dwShow
& SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO
)))
745 if (entry
->IsFolder() && (!bShowFolders
))
746 continue; // don't show folders if they're not wanted.
748 git_wc_status_kind status
= SVNStatus::GetMoreImportant(entry
->status
, entry
->remotestatus
);
749 DWORD showFlags
= GetShowFlagsFromSVNStatus(status
);
750 if (entry
->IsLocked())
751 showFlags
|= SVNSLC_SHOWLOCKS
;
752 if (!entry
->changelist
.IsEmpty())
753 showFlags
|= SVNSLC_SHOWINCHANGELIST
;
755 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
756 if (status
!= git_wc_status_ignored
|| (entry
->direct
) || (dwShow
& SVNSLC_SHOWIGNORED
))
758 for (int npath
= 0; npath
< checkedList
.GetCount(); ++npath
)
760 if (entry
->GetPath().IsEquivalentTo(checkedList
[npath
]))
762 entry
->checked
= true;
766 if ((!entry
->IsFolder()) && (status
== git_wc_status_deleted
) && (dwShow
& SVNSLC_SHOWREMOVEDANDPRESENT
))
768 if (PathFileExists(entry
->GetPath().GetWinPath()))
770 m_arListArray
.push_back(i
);
771 AddEntry(entry
, langID
, listIndex
++);
774 else if ((dwShow
& showFlags
)||((dwShow
& SVNSLC_SHOWDIRECTFILES
)&&(entry
->direct
)&&(!entry
->IsFolder())))
776 m_arListArray
.push_back(i
);
777 AddEntry(entry
, langID
, listIndex
++);
779 else if ((dwShow
& showFlags
)||((dwShow
& SVNSLC_SHOWDIRECTFOLDER
)&&(entry
->direct
)&&entry
->IsFolder()))
781 m_arListArray
.push_back(i
);
782 AddEntry(entry
, langID
, listIndex
++);
784 else if (entry
->switched
)
786 m_arListArray
.push_back(i
);
787 AddEntry(entry
, langID
, listIndex
++);
793 SetItemCount(listIndex
);
795 int maxcol
= ((CHeaderCtrl
*)(GetDlgItem(0)))->GetItemCount()-1;
796 for (int col
= 0; col
<= maxcol
; col
++)
797 SetColumnWidth (col
, m_ColumnManager
.GetWidth (col
, true));
800 GetStatisticsString();
802 CHeaderCtrl
* pHeader
= GetHeaderCtrl();
803 HDITEM HeaderItem
= {0};
804 HeaderItem
.mask
= HDI_FORMAT
;
805 for (int i
=0; i
<pHeader
->GetItemCount(); ++i
)
807 pHeader
->GetItem(i
, &HeaderItem
);
808 HeaderItem
.fmt
&= ~(HDF_SORTDOWN
| HDF_SORTUP
);
809 pHeader
->SetItem(i
, &HeaderItem
);
813 pHeader
->GetItem(m_nSortedColumn
, &HeaderItem
);
814 HeaderItem
.fmt
|= (m_bAscending
? HDF_SORTUP
: HDF_SORTDOWN
);
815 pHeader
->SetItem(m_nSortedColumn
, &HeaderItem
);
820 SetItemState(nSelectedEntry
, LVIS_SELECTED
, LVIS_SELECTED
);
821 EnsureVisible(nSelectedEntry
, false);
825 // Restore the item at the top of the list.
826 for (int i
=0;GetTopIndex() != nTopIndex
;i
++)
828 if ( !EnsureVisible(nTopIndex
+i
,false) )
836 pApp
->DoWaitCursor(-1);
838 m_bEmpty
= (GetItemCount() == 0);
843 int CGitStatusListCtrl::GetColumnIndex(int mask
)
853 void CGitStatusListCtrl::AddEntry(CTGitPath
* GitPath
, WORD
/*langID*/, int listIndex
)
855 static CString
from(MAKEINTRESOURCE(IDS_STATUSLIST_FROM
));
856 static HINSTANCE
hResourceHandle(AfxGetResourceHandle());
857 static bool abbreviateRenamings(((DWORD
)CRegDWORD(_T("Software\\TortoiseGit\\AbbreviateRenamings"), FALSE
)) == TRUE
);
858 static bool relativeTimes
= (CRegDWORD(_T("Software\\TortoiseGit\\RelativeTimes"), FALSE
) != FALSE
);
860 CString path
= GitPath
->GetGitPathString();
863 int index
= listIndex
;
865 CString entryname
= GitPath
->GetGitPathString();
867 if (GitPath
->IsDirectory())
869 icon_idx
= m_nIconFolder
;
870 m_nShownSubmodules
++;
874 icon_idx
= SYS_IMAGE_LIST().GetPathIconIndex(*GitPath
);
877 switch (GitPath
->m_Action
)
879 case CTGitPath::LOGACTIONS_ADDED
:
880 case CTGitPath::LOGACTIONS_COPY
:
883 case CTGitPath::LOGACTIONS_DELETED
:
886 case CTGitPath::LOGACTIONS_REPLACED
:
887 case CTGitPath::LOGACTIONS_MODIFIED
:
888 case CTGitPath::LOGACTIONS_MERGED
:
891 case CTGitPath::LOGACTIONS_UNMERGED
:
892 m_nShownConflicted
++;
894 case CTGitPath::LOGACTIONS_UNVER
:
895 m_nShownUnversioned
++;
898 m_nShownUnversioned
++;
901 if(GitPath
->m_Action
& (CTGitPath::LOGACTIONS_REPLACED
|CTGitPath::LOGACTIONS_COPY
) && !GitPath
->GetGitOldPathString().IsEmpty())
903 if (!abbreviateRenamings
)
907 rename
.Format(from
, GitPath
->GetGitOldPathString());
908 entryname
+= _T(" ") + rename
;
913 tgpl
.AddPath(*GitPath
);
914 CTGitPath
old(GitPath
->GetGitOldPathString());
916 CString commonRoot
= tgpl
.GetCommonRoot().GetGitPathString();
917 if (!commonRoot
.IsEmpty())
918 commonRoot
+= _T("/");
919 if (old
.GetFileOrDirectoryName() == GitPath
->GetFileOrDirectoryName() && old
.GetContainingDirectory().GetGitPathString() != "" && GitPath
->GetContainingDirectory().GetGitPathString())
921 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();
923 else if (!commonRoot
.IsEmpty())
925 entryname
= commonRoot
+ _T("{") + GitPath
->GetGitOldPathString().Mid(commonRoot
.GetLength()) + _T(" => ") + GitPath
->GetGitPathString().Mid(commonRoot
.GetLength()) + _T("}");
929 entryname
= GitPath
->GetGitOldPathString().Mid(commonRoot
.GetLength()) + _T(" => ") + GitPath
->GetGitPathString().Mid(commonRoot
.GetLength());
934 InsertItem(index
, entryname
, icon_idx
);
935 if (m_restorepaths
.find(GitPath
->GetWinPathString()) != m_restorepaths
.end())
936 SetItemState(index
, INDEXTOOVERLAYMASK(OVL_RESTORE
), TVIS_OVERLAYMASK
);
938 this->SetItemData(index
, (DWORD_PTR
)GitPath
);
939 // SVNSLC_COLFILENAME
940 SetItemText(index
, nCol
++, GitPath
->GetFileOrDirectoryName());
942 SetItemText(index
, nCol
++, GitPath
->GetFileExtension());
944 SetItemText(index
, nCol
++, GitPath
->GetActionName());
946 SetItemText(index
, GetColumnIndex(GITSLC_COLADD
),GitPath
->m_StatAdd
);
947 SetItemText(index
, GetColumnIndex(GITSLC_COLDEL
),GitPath
->m_StatDel
);
950 CString modificationDate
;
951 __int64 filetime
= GitPath
->GetLastWriteTime();
952 if (filetime
&& (GitPath
->m_Action
!= CTGitPath::LOGACTIONS_DELETED
))
954 FILETIME
* f
= (FILETIME
*)(__int64
*)&filetime
;
955 modificationDate
= CLoglistUtils::FormatDateAndTime(CTime(g_Git
.filetime_to_time_t(f
)), DATE_SHORTDATE
, true, relativeTimes
);
957 SetItemText(index
, GetColumnIndex(GITSLC_COLMODIFICATIONDATE
), modificationDate
);
960 if (GitPath
->IsDirectory())
961 SetItemText(index
, GetColumnIndex(GITSLC_COLSIZE
), _T(""));
965 StrFormatByteSize64(GitPath
->GetFileSize(), buf
, 100);
966 SetItemText(index
, GetColumnIndex(GITSLC_COLSIZE
), buf
);
969 SetCheck(index
, GitPath
->m_Checked
);
970 if (GitPath
->m_Checked
)
974 if( GitPath
->m_Action
& CTGitPath::LOGACTIONS_IGNORE
)
975 SetItemGroup(index
, 2);
976 else if( GitPath
->m_Action
& CTGitPath::LOGACTIONS_UNVER
)
977 SetItemGroup(index
,1);
980 SetItemGroup(index
, GitPath
->m_ParentNo
&(PARENT_MASK
|MERGE_MASK
));
988 bool CGitStatusListCtrl::SetItemGroup(int item
, int groupindex
)
990 // if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS) == NULL)
995 i
.mask
= LVIF_GROUPID
;
998 i
.iGroupId
= groupindex
;
1000 return !!SetItem(&i
);
1003 void CGitStatusListCtrl::OnHdnItemclick(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1005 LPNMHEADER phdr
= reinterpret_cast<LPNMHEADER
>(pNMHDR
);
1007 if (m_bBlock
|| m_arStatusArray
.empty())
1010 if (m_nSortedColumn
== phdr
->iItem
)
1011 m_bAscending
= !m_bAscending
;
1013 m_bAscending
= TRUE
;
1014 m_nSortedColumn
= phdr
->iItem
;
1015 Show(m_dwShow
, 0, m_bShowFolders
,false,true);
1020 void CGitStatusListCtrl::OnLvnItemchanging(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1022 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1025 #define ISCHECKED(x) ((x) ? ((((x)&LVIS_STATEIMAGEMASK)>>12)-1) : FALSE)
1026 if ((m_bBlock
)&&(m_bBlockUI
))
1028 // if we're blocked, prevent changing of the check state
1029 if ((!ISCHECKED(pNMLV
->uOldState
) && ISCHECKED(pNMLV
->uNewState
))||
1030 (ISCHECKED(pNMLV
->uOldState
) && !ISCHECKED(pNMLV
->uNewState
)))
1035 BOOL
CGitStatusListCtrl::OnLvnItemchanged(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1037 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
1039 CWnd
* pParent
= GetLogicalParent();
1040 if (NULL
!= pParent
&& NULL
!= pParent
->GetSafeHwnd())
1042 pParent
->SendMessage(GITSLNM_ITEMCHANGED
, pNMLV
->iItem
);
1045 if ((pNMLV
->uNewState
==0)||(pNMLV
->uNewState
& LVIS_SELECTED
)||(pNMLV
->uNewState
& LVIS_FOCUSED
))
1051 bool bSelected
= !!(ListView_GetItemState(m_hWnd
, pNMLV
->iItem
, LVIS_SELECTED
) & LVIS_SELECTED
);
1052 int nListItems
= GetItemCount();
1055 // was the item checked?
1057 //CTGitPath *gitpath=(CTGitPath*)GetItemData(pNMLV->iItem);
1058 //gitpath->m_Checked=GetCheck(pNMLV->iItem);
1060 if (GetCheck(pNMLV
->iItem
))
1062 CheckEntry(pNMLV
->iItem
, nListItems
);
1065 POSITION pos
= GetFirstSelectedItemPosition();
1067 while ((index
= GetNextSelectedItem(pos
)) >= 0)
1069 if (index
!= pNMLV
->iItem
)
1070 CheckEntry(index
, nListItems
);
1076 UncheckEntry(pNMLV
->iItem
, nListItems
);
1079 POSITION pos
= GetFirstSelectedItemPosition();
1081 while ((index
= GetNextSelectedItem(pos
)) >= 0)
1083 if (index
!= pNMLV
->iItem
)
1084 UncheckEntry(index
, nListItems
);
1089 GetStatisticsString();
1096 void CGitStatusListCtrl::OnColumnResized(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1098 m_ColumnManager
.OnColumnResized(pNMHDR
,pResult
);
1103 void CGitStatusListCtrl::OnColumnMoved(NMHDR
*pNMHDR
, LRESULT
*pResult
)
1105 m_ColumnManager
.OnColumnMoved(pNMHDR
, pResult
);
1110 void CGitStatusListCtrl::CheckEntry(int index
, int /*nListItems*/)
1112 Locker
lock(m_critSec
);
1113 //FileEntry * entry = GetListEntry(index);
1114 CTGitPath
*path
=(CTGitPath
*)GetItemData(index
);
1115 ASSERT(path
!= NULL
);
1118 m_mapFilenameToChecked
[path
->GetGitPathString()] = true;
1119 SetCheck(index
, TRUE
);
1120 //entry = GetListEntry(index);
1121 // if an unversioned item was checked, then we need to check if
1122 // the parent folders are unversioned too. If the parent folders actually
1123 // are unversioned, then check those too.
1125 if (entry
->status
== git_wc_status_unversioned
)
1127 // we need to check the parent folder too
1128 const CTGitPath
& folderpath
= entry
->path
;
1129 for (int i
=0; i
< nListItems
; ++i
)
1131 FileEntry
* testEntry
= GetListEntry(i
);
1132 ASSERT(testEntry
!= NULL
);
1133 if (testEntry
== NULL
)
1135 if (!testEntry
->checked
)
1137 if (testEntry
->path
.IsAncestorOf(folderpath
) && (!testEntry
->path
.IsEquivalentTo(folderpath
)))
1139 SetEntryCheck(testEntry
,i
,true);
1145 bool bShift
= !!(GetAsyncKeyState(VK_SHIFT
) & 0x8000);
1146 if ( (entry
->status
== git_wc_status_deleted
) || (m_bCheckChildrenWithParent
) || (bShift
) )
1148 // if a deleted folder gets checked, we have to check all
1149 // children of that folder too.
1150 if (entry
->path
.IsDirectory())
1152 SetCheckOnAllDescendentsOf(entry
, true);
1155 // if a deleted file or folder gets checked, we have to
1156 // check all parents of this item too.
1157 for (int i
=0; i
<nListItems
; ++i
)
1159 FileEntry
* testEntry
= GetListEntry(i
);
1160 ASSERT(testEntry
!= NULL
);
1161 if (testEntry
== NULL
)
1163 if (!testEntry
->checked
)
1165 if (testEntry
->path
.IsAncestorOf(entry
->path
) && (!testEntry
->path
.IsEquivalentTo(entry
->path
)))
1167 if ((testEntry
->status
== git_wc_status_deleted
)||(m_bCheckChildrenWithParent
))
1169 SetEntryCheck(testEntry
,i
,true);
1171 // now we need to check all children of this parent folder
1172 SetCheckOnAllDescendentsOf(testEntry
, true);
1179 if ( !path
->m_Checked
)
1181 path
->m_Checked
= TRUE
;
1186 void CGitStatusListCtrl::UncheckEntry(int index
, int /*nListItems*/)
1188 Locker
lock(m_critSec
);
1189 CTGitPath
*path
=(CTGitPath
*)GetItemData(index
);
1190 ASSERT(path
!= NULL
);
1193 SetCheck(index
, FALSE
);
1194 m_mapFilenameToChecked
[path
->GetGitPathString()] = false;
1195 //entry = GetListEntry(index);
1196 // item was unchecked
1198 if (entry
->path
.IsDirectory())
1200 // disable all files within an unselected folder, except when unchecking a folder with property changes
1201 bool bShift
= !!(GetAsyncKeyState(VK_SHIFT
) & 0x8000);
1202 if ( (entry
->status
!= git_wc_status_modified
) || (bShift
) )
1204 SetCheckOnAllDescendentsOf(entry
, false);
1207 else if (entry
->status
== git_wc_status_deleted
)
1209 // a "deleted" file was unchecked, so uncheck all parent folders
1210 // and all children of those parents
1211 for (int i
=0; i
<nListItems
; i
++)
1213 FileEntry
* testEntry
= GetListEntry(i
);
1214 ASSERT(testEntry
!= NULL
);
1215 if (testEntry
== NULL
)
1217 if (testEntry
->checked
)
1219 if (testEntry
->path
.IsAncestorOf(entry
->path
))
1221 if (testEntry
->status
== git_wc_status_deleted
)
1223 SetEntryCheck(testEntry
,i
,false);
1226 SetCheckOnAllDescendentsOf(testEntry
, false);
1233 if ( path
->m_Checked
)
1235 path
->m_Checked
= FALSE
;
1239 bool CGitStatusListCtrl::BuildStatistics()
1242 bool bRefetchStatus
= false;
1244 // now gather some statistics
1257 for (int i
=0; i
< (int)m_arStatusArray
.size(); ++i
)
1259 int status
=((CTGitPath
*)m_arStatusArray
[i
])->m_Action
;
1261 m_nLineAdded
+= _tstol(((CTGitPath
*)m_arStatusArray
[i
])->m_StatAdd
);
1262 m_nLineDeleted
+= _tstol(((CTGitPath
*)m_arStatusArray
[i
])->m_StatDel
);
1264 if(status
&(CTGitPath::LOGACTIONS_ADDED
|CTGitPath::LOGACTIONS_COPY
))
1267 if(status
&CTGitPath::LOGACTIONS_DELETED
)
1270 if(status
&(CTGitPath::LOGACTIONS_REPLACED
|CTGitPath::LOGACTIONS_MODIFIED
))
1273 if(status
&CTGitPath::LOGACTIONS_UNMERGED
)
1276 if(status
&(CTGitPath::LOGACTIONS_IGNORE
|CTGitPath::LOGACTIONS_UNVER
))
1279 if(status
&(CTGitPath::LOGACTIONS_REPLACED
))
1282 if(((CTGitPath
*)m_arStatusArray
[i
])->m_Checked
)
1285 // } // switch (entry->status)
1287 } // for (int i=0; i < (int)m_arStatusArray.size(); ++i)
1288 return !bRefetchStatus
;
1292 int CGitStatusListCtrl::GetGroupFromPoint(POINT
* ppt
)
1294 // the point must be relative to the upper left corner of the control
1298 if (!IsGroupViewEnabled())
1307 while (((flags
& LVHT_BELOW
) == 0)&&(pt
.y
< rc
.bottom
))
1309 nItem
= HitTest(pt
, &flags
);
1310 if ((flags
& LVHT_ONITEM
)||(flags
& LVHT_EX_GROUP_HEADER
))
1312 // the first item below the point
1314 // check if the point is too much right (i.e. if the point
1315 // is farther to the right than the width of the item)
1317 GetItemRect(nItem
, &r
, LVIR_LABEL
);
1318 if (ppt
->x
> r
.right
)
1322 lv
.mask
= LVIF_GROUPID
;
1325 int groupID
= lv
.iGroupId
;
1326 // now we search upwards and check if the item above this one
1327 // belongs to another group. If it belongs to the same group,
1328 // we're not over a group header
1332 nItem
= HitTest(pt
, &flags
);
1333 if ((flags
& LVHT_ONITEM
)&&(nItem
>= 0))
1335 // the first item below the point
1337 lv
.mask
= LVIF_GROUPID
;
1340 if (lv
.iGroupId
!= groupID
)
1355 void CGitStatusListCtrl::OnContextMenuGroup(CWnd
* /*pWnd*/, CPoint point
)
1357 POINT clientpoint
= point
;
1358 ScreenToClient(&clientpoint
);
1359 if ((IsGroupViewEnabled())&&(GetGroupFromPoint(&clientpoint
) >= 0))
1362 if (popup
.CreatePopupMenu())
1365 temp
.LoadString(IDS_STATUSLIST_CHECKGROUP
);
1366 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, IDGITLC_CHECKGROUP
, temp
);
1367 temp
.LoadString(IDS_STATUSLIST_UNCHECKGROUP
);
1368 popup
.AppendMenu(MF_STRING
| MF_ENABLED
, IDGITLC_UNCHECKGROUP
, temp
);
1369 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1370 bool bCheck
= false;
1373 case IDGITLC_CHECKGROUP
:
1375 // fall through here
1376 case IDGITLC_UNCHECKGROUP
:
1378 int group
= GetGroupFromPoint(&clientpoint
);
1379 // go through all items and check/uncheck those assigned to the group
1380 // but block the OnLvnItemChanged handler
1383 for (int i
=0; i
<GetItemCount(); ++i
)
1385 SecureZeroMemory(&lv
, sizeof(LVITEM
));
1386 lv
.mask
= LVIF_GROUPID
;
1390 if (lv
.iGroupId
== group
)
1392 CTGitPath
* entry
= (CTGitPath
*)GetItemData(i
);
1395 bool bOldCheck
= entry
->m_Checked
;
1396 SetEntryCheck(entry
, i
, bCheck
);
1397 if (bCheck
!= bOldCheck
)
1408 GetStatisticsString();
1418 void CGitStatusListCtrl::OnContextMenuList(CWnd
* pWnd
, CPoint point
)
1421 //WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
1423 //bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1424 CTGitPath
* filepath
;
1426 int selIndex
= GetSelectionMark();
1427 if ((point
.x
== -1) && (point
.y
== -1))
1430 GetItemRect(selIndex
, &rect
, LVIR_LABEL
);
1431 ClientToScreen(&rect
);
1432 point
= rect
.CenterPoint();
1434 if ((GetSelectedCount() == 0) && (m_bHasCheckboxes
))
1436 // nothing selected could mean the context menu is requested for
1438 OnContextMenuGroup(pWnd
, point
);
1440 else if (selIndex
>= 0)
1442 //FileEntry * entry = GetListEntry(selIndex);
1444 filepath
= (CTGitPath
* )GetItemData(selIndex
);
1446 ASSERT(filepath
!= NULL
);
1447 if (filepath
== NULL
)
1450 //const CTGitPath& filepath = entry->path;
1451 int wcStatus
= filepath
->m_Action
;
1452 // entry is selected, now show the popup menu
1453 Locker
lock(m_critSec
);
1455 CMenu changelistSubMenu
;
1456 CMenu ignoreSubMenu
;
1457 if (popup
.CreatePopupMenu())
1459 //Add Menu for version controlled file
1461 if (GetSelectedCount() > 0 && wcStatus
& CTGitPath::LOGACTIONS_UNMERGED
)
1463 if (GetSelectedCount() == 1 && (m_dwContextMenus
& GITSLC_POPCONFLICT
)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1465 popup
.AppendMenuIcon(IDGITLC_EDITCONFLICT
, IDS_MENUCONFLICT
, IDI_CONFLICT
);
1467 if (m_dwContextMenus
& GITSLC_POPRESOLVE
)
1469 popup
.AppendMenuIcon(IDGITLC_RESOLVECONFLICT
, IDS_STATUSLIST_CONTEXT_RESOLVED
, IDI_RESOLVE
);
1471 if ((m_dwContextMenus
& GITSLC_POPRESOLVE
)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1473 popup
.AppendMenuIcon(IDGITLC_RESOLVETHEIRS
, IDS_SVNPROGRESS_MENUUSETHEIRS
, IDI_RESOLVE
);
1474 popup
.AppendMenuIcon(IDGITLC_RESOLVEMINE
, IDS_SVNPROGRESS_MENUUSEMINE
, IDI_RESOLVE
);
1476 if ((m_dwContextMenus
& GITSLC_POPCONFLICT
)||(m_dwContextMenus
& GITSLC_POPRESOLVE
))
1477 popup
.AppendMenu(MF_SEPARATOR
);
1480 if (GetSelectedCount() > 0)
1482 if (wcStatus
& CTGitPath::LOGACTIONS_UNVER
)
1483 if (m_dwContextMenus
& GITSLC_POPADD
)
1485 //if ( entry->IsFolder() )
1487 // popup.AppendMenuIcon(IDSVNLC_ADD_RECURSIVE, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE, IDI_ADD);
1491 popup
.AppendMenuIcon(IDGITLC_ADD
, IDS_STATUSLIST_CONTEXT_ADD
, IDI_ADD
);
1496 if (!(wcStatus
& CTGitPath::LOGACTIONS_UNVER
) && GetSelectedCount() > 0)
1498 bool bEntryAdded
= false;
1499 if (m_dwContextMenus
& GITSLC_POPCOMPAREWITHBASE
)
1501 if(filepath
->m_ParentNo
& MERGE_MASK
)
1502 popup
.AppendMenuIcon(IDGITLC_COMPARE
, IDS_TREE_DIFF
, IDI_DIFF
);
1504 popup
.AppendMenuIcon(IDGITLC_COMPARE
, IDS_LOG_COMPAREWITHBASE
, IDI_DIFF
);
1506 popup
.SetDefaultItem(IDGITLC_COMPARE
, FALSE
);
1510 if (!g_Git
.IsInitRepos() && (m_dwContextMenus
& GITSLC_POPGNUDIFF
))
1512 popup
.AppendMenuIcon(IDGITLC_GNUDIFF1
, IDS_LOG_POPUP_GNUDIFF
, IDI_DIFF
);
1516 if ((m_dwContextMenus
& this->GetContextMenuBit(IDGITLC_COMPAREWC
)) && m_bHasWC
)
1518 if ((!m_CurrentVersion
.IsEmpty()) && m_CurrentVersion
!= GIT_REV_ZERO
)
1520 popup
.AppendMenuIcon(IDGITLC_COMPAREWC
, IDS_LOG_POPUP_COMPARE
, IDI_DIFF
);
1525 //else if (GetSelectedCount() > 1)
1527 // if (m_dwContextMenus & SVNSLC_POPCOMMIT)
1529 // popup.AppendMenuIcon(IDSVNLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);
1530 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
1535 popup
.AppendMenu(MF_SEPARATOR
);
1538 if( (!this->m_Rev1
.IsEmpty()) || (!this->m_Rev1
.IsEmpty()) )
1540 if(GetSelectedCount() == 1)
1542 if (m_dwContextMenus
& this->GetContextMenuBit(IDGITLC_COMPARETWO
))
1544 popup
.AppendMenuIcon(IDGITLC_COMPARETWO
, IDS_LOG_POPUP_COMPARETWO
, IDI_DIFF
);
1545 popup
.SetDefaultItem(IDGITLC_COMPARETWO
, FALSE
);
1547 if (m_dwContextMenus
& this->GetContextMenuBit(IDGITLC_GNUDIFF2
))
1549 popup
.AppendMenuIcon(IDGITLC_GNUDIFF2
, IDS_LOG_POPUP_GNUDIFF
, IDI_DIFF
);
1555 if (GetSelectedCount() > 0)
1557 if ((GetSelectedCount() == 2) && (m_dwContextMenus
& GITSLC_POPCOMPARETWOFILES
) && (this->m_CurrentVersion
.IsEmpty() || this->m_CurrentVersion
== GIT_REV_ZERO
))
1559 POSITION pos
= GetFirstSelectedItemPosition();
1560 int index
= GetNextSelectedItem(pos
);
1563 CTGitPath
* entry2
= NULL
;
1564 bool bothItemsAreExistingFiles
= true;
1565 entry2
= (CTGitPath
* )GetItemData(index
);
1567 bothItemsAreExistingFiles
= !entry2
->IsDirectory() && entry2
->Exists();
1568 index
= GetNextSelectedItem(pos
);
1571 entry2
= (CTGitPath
* )GetItemData(index
);
1573 bothItemsAreExistingFiles
= bothItemsAreExistingFiles
&& !entry2
->IsDirectory() && entry2
->Exists();
1574 if (bothItemsAreExistingFiles
)
1575 popup
.AppendMenuIcon(IDGITLC_COMPARETWOFILES
, IDS_STATUSLIST_CONTEXT_COMPARETWOFILES
, IDI_DIFF
);
1579 // if (wcStatus > git_wc_status_normal)
1581 // if (m_dwContextMenus & SVNSLC_POPREVERT)
1583 // // reverting missing folders is not possible
1584 // if (!entry->IsFolder() || (wcStatus != git_wc_status_missing))
1586 // popup.AppendMenuIcon(IDSVNLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
1590 // if (entry->remotestatus > git_wc_status_normal)
1592 // if (m_dwContextMenus & SVNSLC_POPUPDATE)
1594 // popup.AppendMenuIcon(IDSVNLC_UPDATE, IDS_MENUUPDATE, IDI_UPDATE);
1599 if ( (GetSelectedCount() >0 ) && (!(wcStatus
& CTGitPath::LOGACTIONS_UNVER
)) && m_bHasWC
)
1601 if ((m_dwContextMenus
& GITSLC_POPREVERT
) && (this->m_CurrentVersion
.IsEmpty() || this->m_CurrentVersion
== GIT_REV_ZERO
))
1603 popup
.AppendMenuIcon(IDGITLC_REVERT
, IDS_MENUREVERT
, IDI_REVERT
);
1606 if ((m_dwContextMenus
& GITSLC_POPSKIPWORKTREE
) && (this->m_CurrentVersion
.IsEmpty() || this->m_CurrentVersion
== GIT_REV_ZERO
) && !(wcStatus
& (CTGitPath::LOGACTIONS_ADDED
| CTGitPath::LOGACTIONS_DELETED
| CTGitPath::LOGACTIONS_UNMERGED
)) && !filepath
->IsDirectory())
1608 popup
.AppendMenuIcon(IDGITLC_SKIPWORKTREE
, IDS_STATUSLIST_SKIPWORKTREE
);
1611 if ((m_dwContextMenus
& GITSLC_POPASSUMEVALID
) && (this->m_CurrentVersion
.IsEmpty() || this->m_CurrentVersion
== GIT_REV_ZERO
) && !(wcStatus
& (CTGitPath::LOGACTIONS_ADDED
| CTGitPath::LOGACTIONS_DELETED
| CTGitPath::LOGACTIONS_UNMERGED
)) && !filepath
->IsDirectory())
1613 popup
.AppendMenuIcon(IDGITLC_ASSUMEVALID
, IDS_MENUASSUMEVALID
);
1616 if (m_dwContextMenus
& GITSLC_POPRESTORE
&& !filepath
->IsDirectory())
1618 if (m_restorepaths
.find(filepath
->GetWinPathString()) == m_restorepaths
.end())
1619 popup
.AppendMenuIcon(IDGITLC_CREATERESTORE
, IDS_MENUCREATERESTORE
, IDI_RESTORE
);
1621 popup
.AppendMenuIcon(IDGITLC_RESTOREPATH
, IDS_MENURESTORE
, IDI_RESTORE
);
1624 if ((m_dwContextMenus
& GetContextMenuBit(IDGITLC_REVERTTOREV
)) && ( !this->m_CurrentVersion
.IsEmpty() )
1625 && this->m_CurrentVersion
!= GIT_REV_ZERO
&& !(wcStatus
& CTGitPath::LOGACTIONS_DELETED
))
1627 popup
.AppendMenuIcon(IDGITLC_REVERTTOREV
, IDS_LOG_POPUP_REVERTTOREV
, IDI_REVERT
);
1630 if ((m_dwContextMenus
& GetContextMenuBit(IDGITLC_REVERTTOPARENT
)) && ( !this->m_CurrentVersion
.IsEmpty() )
1631 && this->m_CurrentVersion
!= GIT_REV_ZERO
&& !(wcStatus
& CTGitPath::LOGACTIONS_ADDED
))
1633 popup
.AppendMenuIcon(IDGITLC_REVERTTOPARENT
, IDS_LOG_POPUP_REVERTTOPARENT
, IDI_REVERT
);
1637 if ((GetSelectedCount() == 1)&&(!(wcStatus
& CTGitPath::LOGACTIONS_UNVER
))
1638 &&(!(wcStatus
& CTGitPath::LOGACTIONS_IGNORE
)))
1640 if (m_dwContextMenus
& GITSLC_POPSHOWLOG
)
1642 popup
.AppendMenuIcon(IDGITLC_LOG
, IDS_REPOBROWSE_SHOWLOG
, IDI_LOG
);
1644 if (m_dwContextMenus
& GITSLC_POPSHOWLOGSUBMODULE
&& filepath
->IsDirectory())
1646 popup
.AppendMenuIcon(IDGITLC_LOGSUBMODULE
, IDS_LOG_SUBMODULE
, IDI_LOG
);
1648 if (m_dwContextMenus
& GITSLC_POPSHOWLOGOLDNAME
&& (wcStatus
& (CTGitPath::LOGACTIONS_REPLACED
|CTGitPath::LOGACTIONS_COPY
) && !filepath
->GetGitOldPathString().IsEmpty()))
1650 popup
.AppendMenuIcon(IDGITLC_LOGOLDNAME
, IDS_STATUSLIST_SHOWLOGOLDNAME
, IDI_LOG
);
1652 if (m_dwContextMenus
& GITSLC_POPBLAME
&& ! filepath
->IsDirectory() && !(wcStatus
& CTGitPath::LOGACTIONS_DELETED
) && m_bHasWC
)
1654 popup
.AppendMenuIcon(IDGITLC_BLAME
, IDS_MENUBLAME
, IDI_BLAME
);
1658 if (GetSelectedCount() > 0)
1660 if ((m_dwContextMenus
& GetContextMenuBit(IDGITLC_EXPORT
)) && !(wcStatus
& CTGitPath::LOGACTIONS_DELETED
))
1661 popup
.AppendMenuIcon(IDGITLC_EXPORT
, IDS_LOG_POPUP_EXPORT
, IDI_EXPORT
);
1664 // if ((wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing) && (GetSelectedCount() == 1))
1665 if ( (GetSelectedCount() == 1) )
1667 if (m_dwContextMenus
& this->GetContextMenuBit(IDGITLC_SAVEAS
) && ! filepath
->IsDirectory() && !(wcStatus
& CTGitPath::LOGACTIONS_DELETED
))
1669 popup
.AppendMenuIcon(IDGITLC_SAVEAS
, IDS_LOG_POPUP_SAVE
, IDI_SAVEAS
);
1672 if (m_dwContextMenus
& GITSLC_POPOPEN
&& ! filepath
->IsDirectory() && !(wcStatus
& CTGitPath::LOGACTIONS_DELETED
))
1674 popup
.AppendMenuIcon(IDGITLC_VIEWREV
, IDS_LOG_POPUP_VIEWREV
);
1675 popup
.AppendMenuIcon(IDGITLC_OPEN
, IDS_REPOBROWSE_OPEN
, IDI_OPEN
);
1676 popup
.AppendMenuIcon(IDGITLC_OPENWITH
, IDS_LOG_POPUP_OPENWITH
, IDI_OPEN
);
1677 if (wcStatus
&CTGitPath::LOGACTIONS_UNVER
) {
1678 popup
.SetDefaultItem(IDGITLC_OPEN
, FALSE
);
1682 if (m_dwContextMenus
& GITSLC_POPEXPLORE
&& !(wcStatus
& CTGitPath::LOGACTIONS_DELETED
) && m_bHasWC
)
1684 popup
.AppendMenuIcon(IDGITLC_EXPLORE
, IDS_STATUSLIST_CONTEXT_EXPLORE
, IDI_EXPLORER
);
1688 if (GetSelectedCount() > 0)
1690 // if (((wcStatus == git_wc_status_unversioned)||(wcStatus == git_wc_status_ignored))&&(m_dwContextMenus & SVNSLC_POPDELETE))
1692 // popup.AppendMenuIcon(IDSVNLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
1694 // 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))
1697 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVEKEEP, IDI_DELETE);
1699 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVE, IDI_DELETE);
1701 if ((wcStatus
& CTGitPath::LOGACTIONS_UNVER
)/*||(wcStatus == git_wc_status_deleted)*/)
1703 if (m_dwContextMenus
& GITSLC_POPDELETE
)
1705 popup
.AppendMenuIcon(IDGITLC_DELETE
, IDS_MENUREMOVE
, IDI_DELETE
);
1708 if ( (wcStatus
& CTGitPath::LOGACTIONS_UNVER
|| wcStatus
& CTGitPath::LOGACTIONS_DELETED
) )
1710 if (m_dwContextMenus
& GITSLC_POPIGNORE
)
1713 CTGitPathList ignorelist
;
1714 FillListOfSelectedItemPaths(ignorelist
);
1715 //check if all selected entries have the same extension
1716 bool bSameExt
= true;
1718 for (int i
=0; i
<ignorelist
.GetCount(); ++i
)
1720 if (sExt
.IsEmpty() && (i
==0))
1721 sExt
= ignorelist
[i
].GetFileExtension();
1722 else if (sExt
.CompareNoCase(ignorelist
[i
].GetFileExtension())!=0)
1727 if (ignoreSubMenu
.CreateMenu())
1730 if (ignorelist
.GetCount()==1)
1731 ignorepath
= ignorelist
[0].GetFileOrDirectoryName();
1733 ignorepath
.Format(IDS_MENUIGNOREMULTIPLE
, ignorelist
.GetCount());
1734 ignoreSubMenu
.AppendMenu(MF_STRING
| MF_ENABLED
, IDGITLC_IGNORE
, ignorepath
);
1735 ignorepath
= _T("*")+sExt
;
1736 ignoreSubMenu
.AppendMenu(MF_STRING
| MF_ENABLED
, IDGITLC_IGNOREMASK
, ignorepath
);
1738 temp
.LoadString(IDS_MENUIGNORE
);
1739 popup
.InsertMenu((UINT
)-1, MF_BYPOSITION
| MF_POPUP
, (UINT_PTR
)ignoreSubMenu
.m_hMenu
, temp
);
1745 if (ignorelist
.GetCount()==1)
1747 temp
.LoadString(IDS_MENUIGNORE
);
1751 temp
.Format(IDS_MENUIGNOREMULTIPLE
, ignorelist
.GetCount());
1753 popup
.AppendMenuIcon(IDGITLC_IGNORE
, temp
, IDI_IGNORE
);
1761 if (GetSelectedCount() > 0)
1763 popup
.AppendMenu(MF_SEPARATOR
);
1764 popup
.AppendMenuIcon(IDGITLC_COPY
, IDS_STATUSLIST_CONTEXT_COPY
, IDI_COPYCLIP
);
1765 popup
.AppendMenuIcon(IDGITLC_COPYEXT
, IDS_STATUSLIST_CONTEXT_COPYEXT
, IDI_COPYCLIP
);
1767 if ((m_dwContextMenus
& SVNSLC_POPCHANGELISTS
))
1768 &&(wcStatus
!= git_wc_status_unversioned
)&&(wcStatus
!= git_wc_status_none
))
1770 popup
.AppendMenu(MF_SEPARATOR
);
1771 // changelist commands
1772 size_t numChangelists
= GetNumberOfChangelistsInSelection();
1773 if (numChangelists
> 0)
1775 popup
.AppendMenuIcon(IDSVNLC_REMOVEFROMCS
, IDS_STATUSLIST_CONTEXT_REMOVEFROMCS
);
1777 if ((!entry
->IsFolder())&&(changelistSubMenu
.CreateMenu()))
1780 temp
.LoadString(IDS_STATUSLIST_CONTEXT_CREATECS
);
1781 changelistSubMenu
.AppendMenu(MF_STRING
| MF_ENABLED
, IDSVNLC_CREATECS
, temp
);
1783 if (entry
->changelist
.Compare(SVNSLC_IGNORECHANGELIST
))
1785 changelistSubMenu
.AppendMenu(MF_SEPARATOR
);
1786 changelistSubMenu
.AppendMenu(MF_STRING
| MF_ENABLED
, IDSVNLC_CREATEIGNORECS
, SVNSLC_IGNORECHANGELIST
);
1789 if (!m_changelists
.empty())
1791 // find the changelist names
1792 bool bNeedSeparator
= true;
1793 int cmdID
= IDSVNLC_MOVETOCS
;
1794 for (std::map
<CString
, int>::const_iterator it
= m_changelists
.begin(); it
!= m_changelists
.end(); ++it
)
1796 if ((entry
->changelist
.Compare(it
->first
))&&(it
->first
.Compare(SVNSLC_IGNORECHANGELIST
)))
1800 changelistSubMenu
.AppendMenu(MF_SEPARATOR
);
1801 bNeedSeparator
= false;
1803 changelistSubMenu
.AppendMenu(MF_STRING
| MF_ENABLED
, cmdID
, it
->first
);
1808 temp
.LoadString(IDS_STATUSLIST_CONTEXT_MOVETOCS
);
1809 popup
.AppendMenu(MF_POPUP
|MF_STRING
, (UINT_PTR
)changelistSubMenu
.GetSafeHmenu(), temp
);
1815 int cmd
= popup
.TrackPopupMenu(TPM_RETURNCMD
| TPM_LEFTALIGN
| TPM_NONOTIFY
, point
.x
, point
.y
, this, 0);
1818 AfxGetApp()->DoWaitCursor(1);
1819 //int iItemCountBeforeMenuCmd = GetItemCount();
1820 //bool bForce = false;
1823 case IDGITLC_VIEWREV
:
1824 OpenFile(filepath
, ALTERNATIVEEDITOR
);
1827 OpenFile(filepath
,OPEN
);
1829 case IDGITLC_OPENWITH
:
1830 OpenFile(filepath
,OPEN_WITH
);
1832 case IDGITLC_EXPLORE
:
1834 ShellExecute(this->m_hWnd
, _T("explore"), filepath
->GetDirectory().GetWinPath(), NULL
, NULL
, SW_SHOW
);
1837 case IDGITLC_CREATERESTORE
:
1839 POSITION pos
= GetFirstSelectedItemPosition();
1842 int index
= GetNextSelectedItem(pos
);
1843 CTGitPath
* entry2
= (CTGitPath
* )GetItemData(index
);
1844 ASSERT(entry2
!= NULL
);
1845 if (entry2
== NULL
|| entry2
->IsDirectory())
1847 if (m_restorepaths
.find(entry2
->GetWinPathString()) != m_restorepaths
.end())
1849 CTGitPath tempFile
= CTempFiles::Instance().GetTempFilePath(false);
1850 if (CopyFile(g_Git
.m_CurrentDir
+ _T("\\") + entry2
->GetWinPathString(), tempFile
.GetWinPath(), FALSE
))
1852 m_restorepaths
[entry2
->GetWinPathString()] = tempFile
.GetWinPathString();
1853 SetItemState(index
, INDEXTOOVERLAYMASK(OVL_RESTORE
), LVIS_OVERLAYMASK
);
1859 case IDGITLC_RESTOREPATH
:
1861 if (CMessageBox::Show(m_hWnd
, IDS_STATUSLIST_RESTOREPATH
, IDS_APPNAME
, 2, IDI_QUESTION
, IDS_RESTOREBUTTON
, IDS_ABORTBUTTON
) == 2)
1863 POSITION pos
= GetFirstSelectedItemPosition();
1866 int index
= GetNextSelectedItem(pos
);
1867 CTGitPath
* entry2
= (CTGitPath
* )GetItemData(index
);
1868 ASSERT(entry2
!= NULL
);
1871 if (m_restorepaths
.find(entry2
->GetWinPathString()) == m_restorepaths
.end())
1873 if (CopyFile(m_restorepaths
[entry2
->GetWinPathString()], g_Git
.m_CurrentDir
+ _T("\\") + entry2
->GetWinPathString(), FALSE
))
1875 m_restorepaths
.erase(entry2
->GetWinPathString());
1876 SetItemState(index
, 0, LVIS_OVERLAYMASK
);
1882 // Compare current version and work copy.
1883 case IDGITLC_COMPAREWC
:
1885 if (!CheckMultipleDiffs())
1887 POSITION pos
= GetFirstSelectedItemPosition();
1890 int index
= GetNextSelectedItem(pos
);
1895 // Compare with base version. when current version is zero, compare workcopy and HEAD.
1896 case IDGITLC_COMPARE
:
1898 if (!CheckMultipleDiffs())
1900 POSITION pos
= GetFirstSelectedItemPosition();
1903 int index
= GetNextSelectedItem(pos
);
1908 case IDGITLC_COMPARETWO
:
1910 POSITION pos
= GetFirstSelectedItemPosition();
1913 int index
= GetNextSelectedItem(pos
);
1914 StartDiffTwo(index
);
1918 case IDGITLC_COMPARETWOFILES
:
1920 POSITION pos
= GetFirstSelectedItemPosition();
1921 CTGitPath
* firstfilepath
= NULL
, * secondfilepath
= NULL
;
1924 firstfilepath
= (CTGitPath
* )GetItemData(GetNextSelectedItem(pos
));
1925 ASSERT(firstfilepath
!= NULL
);
1926 if (firstfilepath
== NULL
)
1929 secondfilepath
= (CTGitPath
* )GetItemData(GetNextSelectedItem(pos
));
1930 ASSERT(secondfilepath
!= NULL
);
1931 if (secondfilepath
== NULL
)
1935 sCmd
.Format(_T("/command:diff /path:\"%s\" /path2:\"%s\" /hwnd:%ld"), firstfilepath
->GetWinPath(), secondfilepath
->GetWinPath(), (unsigned long)m_hWnd
);
1936 CAppUtils::RunTortoiseGitProc(sCmd
);
1940 case IDGITLC_GNUDIFF1
:
1942 POSITION pos
= GetFirstSelectedItemPosition();
1945 CTGitPath
* selectedFilepath
= (CTGitPath
* )GetItemData(GetNextSelectedItem(pos
));
1946 if (m_CurrentVersion
.IsEmpty() || m_CurrentVersion
== GIT_REV_ZERO
)
1950 fromwhere
= _T("~1");
1951 CAppUtils::StartShowUnifiedDiff(m_hWnd
, *selectedFilepath
, GitRev::GetHead() + fromwhere
, *selectedFilepath
, GitRev::GetWorkingCopy());
1955 if ((selectedFilepath
->m_ParentNo
& (PARENT_MASK
| MERGE_MASK
)) == 0)
1956 CAppUtils::StartShowUnifiedDiff(m_hWnd
, *selectedFilepath
, m_CurrentVersion
+ _T("~1"), *selectedFilepath
, m_CurrentVersion
);
1960 if (!(selectedFilepath
->m_ParentNo
& MERGE_MASK
))
1961 str
.Format(_T("%s^%d"), m_CurrentVersion
, (selectedFilepath
->m_ParentNo
& PARENT_MASK
) + 1);
1963 CAppUtils::StartShowUnifiedDiff(m_hWnd
, *selectedFilepath
, str
, *selectedFilepath
, m_CurrentVersion
, false, false, false, !!(selectedFilepath
->m_ParentNo
& MERGE_MASK
));
1969 case IDGITLC_GNUDIFF2
:
1971 CAppUtils::StartShowUnifiedDiff(m_hWnd
, *filepath
, m_Rev2
, *filepath
, m_Rev1
);
1977 CTGitPathList paths
;
1978 FillListOfSelectedItemPaths(paths
, true);
1980 CGitProgressDlg progDlg
;
1981 progDlg
.SetCommand(CGitProgressList::GitProgress_Add
);
1982 progDlg
.SetPathList(paths
);
1983 progDlg
.SetItemCount(paths
.GetCount());
1986 // reset unchecked status
1987 POSITION pos
= GetFirstSelectedItemPosition();
1989 while ((index
= GetNextSelectedItem(pos
)) >= 0)
1991 m_mapFilenameToChecked
.erase(((CTGitPath
*)GetItemData(index
))->GetGitPathString());
1994 if (NULL
!= GetLogicalParent() && NULL
!= GetLogicalParent()->GetSafeHwnd())
1995 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH
);
2001 case IDGITLC_DELETE
:
2004 std::vector
<int> selectIndex
;
2006 POSITION pos
= GetFirstSelectedItemPosition();
2008 while ((index
= GetNextSelectedItem(pos
)) >= 0)
2010 selectIndex
.push_back(index
);
2013 //Create file-list ('\0' separated) for SHFileOperation
2015 for(int i
=0;i
<selectIndex
.size();i
++)
2017 index
=selectIndex
[i
];
2019 CTGitPath
* path
=(CTGitPath
*)GetItemData(index
);
2024 filelist
+= path
->GetWinPathString();
2025 filelist
+= _T("|");
2027 filelist
+= _T("|");
2028 int len
= filelist
.GetLength();
2029 std::unique_ptr
<TCHAR
[]> buf(new TCHAR
[len
+ 2]);
2030 _tcscpy_s(buf
.get(), len
+ 2, filelist
);
2031 for (int i
=0; i
<len
; ++i
)
2032 if (buf
.get()[i
] == '|')
2034 SHFILEOPSTRUCT fileop
;
2035 fileop
.hwnd
= this->m_hWnd
;
2036 fileop
.wFunc
= FO_DELETE
;
2037 fileop
.pFrom
= buf
.get();
2039 fileop
.fFlags
= FOF_NO_CONNECTED_ELEMENTS
| ((GetAsyncKeyState(VK_SHIFT
) & 0x8000) ? 0 : FOF_ALLOWUNDO
);
2040 fileop
.lpszProgressTitle
= _T("deleting file");
2041 int result
= SHFileOperation(&fileop
);
2043 if ( (result
==0) && (!fileop
.fAnyOperationsAborted
) )
2046 POSITION pos
= NULL
;
2047 while ((pos
= GetFirstSelectedItemPosition()) != 0)
2049 int index
= GetNextSelectedItem(pos
);
2050 if (GetCheck(index
))
2054 RemoveListEntry(index
);
2063 CAppUtils::LaunchTortoiseBlame(g_Git
.m_CurrentDir
+_T("\\")+filepath
->GetWinPath(), m_CurrentVersion
);
2068 case IDGITLC_LOGSUBMODULE
:
2071 sCmd
.Format(_T("/command:log /path:\"%s\""), g_Git
.m_CurrentDir
+ _T("\\") + filepath
->GetWinPath());
2072 if (cmd
== IDGITLC_LOG
&& filepath
->IsDirectory())
2073 sCmd
+= _T(" /submodule");
2074 CAppUtils::RunTortoiseGitProc(sCmd
);
2078 case IDGITLC_LOGOLDNAME
:
2080 CTGitPath
oldName(filepath
->GetGitOldPathString());
2082 sCmd
.Format(_T("/command:log /path:\"%s\""), g_Git
.m_CurrentDir
+ _T("\\") + oldName
.GetWinPath());
2083 CAppUtils::RunTortoiseGitProc(sCmd
);
2088 case IDGITLC_EDITCONFLICT
:
2090 if (CAppUtils::ConflictEdit(*filepath
, false, this->m_bIsRevertTheirMy
))
2092 CString conflictedFile
= g_Git
.m_CurrentDir
+ _T("\\") + filepath
->GetWinPathString();
2093 if (!PathFileExists(conflictedFile
) && NULL
!= GetLogicalParent() && NULL
!= GetLogicalParent()->GetSafeHwnd())
2094 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH
);
2098 case IDGITLC_RESOLVETHEIRS
: //follow up
2099 case IDGITLC_RESOLVEMINE
: //follow up
2100 case IDGITLC_RESOLVECONFLICT
:
2102 if (CMessageBox::Show(m_hWnd
, IDS_PROC_RESOLVE
, IDS_APPNAME
, MB_ICONQUESTION
| MB_YESNO
)==IDYES
)
2104 POSITION pos
= GetFirstSelectedItemPosition();
2108 index
= GetNextSelectedItem(pos
);
2109 CTGitPath
* fentry
=(CTGitPath
*) this->GetItemData(index
);
2112 CString gitcmd
,output
;
2115 if ( ((!this->m_bIsRevertTheirMy
)&&cmd
== IDGITLC_RESOLVETHEIRS
) ||
2116 ((this->m_bIsRevertTheirMy
)&&cmd
== IDGITLC_RESOLVEMINE
) )
2118 gitcmd
.Format(_T("git.exe checkout-index -f --stage=3 -- \"%s\""),fentry
->GetGitPathString());
2119 if (g_Git
.Run(gitcmd
, &output
,CP_UTF8
))
2121 CMessageBox::Show(m_hWnd
, output
, _T("TortoiseGit"), MB_ICONERROR
);
2126 if ( ((!this->m_bIsRevertTheirMy
)&&cmd
== IDGITLC_RESOLVEMINE
) ||
2127 ((this->m_bIsRevertTheirMy
)&&cmd
== IDGITLC_RESOLVETHEIRS
) )
2129 gitcmd
.Format(_T("git.exe checkout-index -f --stage=2 -- \"%s\""),fentry
->GetGitPathString());
2130 if (g_Git
.Run(gitcmd
, &output
,CP_UTF8
))
2132 CMessageBox::Show(m_hWnd
, output
, _T("TortoiseGit"), MB_ICONERROR
);
2138 if ( fentry
->m_Action
& CTGitPath::LOGACTIONS_UNMERGED
)
2140 gitcmd
.Format(_T("git.exe add -f -- \"%s\""),fentry
->GetGitPathString());
2141 if (g_Git
.Run(gitcmd
, &output
,CP_UTF8
))
2143 CMessageBox::Show(m_hWnd
, output
, _T("TortoiseGit"), MB_ICONERROR
);
2147 fentry
->m_Action
|= CTGitPath::LOGACTIONS_MODIFIED
;
2148 fentry
->m_Action
&=~CTGitPath::LOGACTIONS_UNMERGED
;
2152 CAppUtils::RemoveTempMergeFile(*fentry
);
2155 Show(m_dwShow
, 0, m_bShowFolders
,0,true);
2160 case IDGITLC_IGNORE
:
2162 CTGitPathList ignorelist
;
2163 //std::vector<CString> toremove;
2164 FillListOfSelectedItemPaths(ignorelist
, true);
2167 if(!CAppUtils::IgnoreFile(ignorelist
,false))
2170 CWnd
* pParent
= GetLogicalParent();
2171 if (NULL
!= pParent
&& NULL
!= pParent
->GetSafeHwnd())
2173 pParent
->SendMessage(GITSLNM_NEEDSREFRESH
);
2178 case IDGITLC_IGNOREMASK
:
2181 CString ext
=filepath
->GetFileExtension();
2182 CTGitPathList ignorelist
;
2183 FillListOfSelectedItemPaths(ignorelist
, true);
2186 if (!CAppUtils::IgnoreFile(ignorelist
,true))
2189 CWnd
* pParent
= GetLogicalParent();
2190 if (NULL
!= pParent
&& NULL
!= pParent
->GetSafeHwnd())
2192 pParent
->SendMessage(GITSLNM_NEEDSREFRESH
);
2199 case IDGITLC_REVERT
:
2201 // If at least one item is not in the status "added"
2202 // we ask for a confirmation
2203 BOOL bConfirm
= FALSE
;
2204 POSITION pos
= GetFirstSelectedItemPosition();
2206 while ((index
= GetNextSelectedItem(pos
)) >= 0)
2208 //FileEntry * fentry = GetListEntry(index);
2209 CTGitPath
*fentry
=(CTGitPath
*)GetItemData(index
);
2210 if(fentry
&& fentry
->m_Action
&CTGitPath::LOGACTIONS_MODIFIED
&& !fentry
->IsDirectory())
2218 str
.Format(IDS_PROC_WARNREVERT
,GetSelectedCount());
2220 if (!bConfirm
|| CMessageBox::Show(this->m_hWnd
, str
, _T("TortoiseGit"), MB_YESNO
| MB_ICONQUESTION
)==IDYES
)
2222 CTGitPathList targetList
;
2223 FillListOfSelectedItemPaths(targetList
);
2225 // make sure that the list is reverse sorted, so that
2226 // children are removed before any parents
2227 targetList
.SortByPathname(true);
2229 // put all reverted files in the trashbin, except the ones with 'added'
2230 // status because they are not restored by the revert.
2231 CTGitPathList delList
;
2232 POSITION pos
= GetFirstSelectedItemPosition();
2234 while ((index
= GetNextSelectedItem(pos
)) >= 0)
2236 CTGitPath
*entry
=(CTGitPath
*)GetItemData(index
);
2237 if (entry
&&(!(entry
->m_Action
& CTGitPath::LOGACTIONS_ADDED
))
2238 && (!(entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
)) && !entry
->IsDirectory())
2241 fullpath
.SetFromWin(g_Git
.m_CurrentDir
+_T("\\")+entry
->GetWinPath());
2242 delList
.AddPath(fullpath
);
2245 if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE
)))
2246 delList
.DeleteAllFiles(true);
2248 CString revertToCommit
= _T("HEAD");
2250 revertToCommit
= _T("HEAD~1");
2251 if (g_Git
.Revert(revertToCommit
, targetList
))
2253 CMessageBox::Show(this->m_hWnd
, _T("Revert Fail"), _T("TortoiseGit"), MB_ICONERROR
);
2257 bool updateStatusList
= false;
2258 for(int i
=0;i
<targetList
.GetCount();i
++)
2260 int nListboxEntries
= GetItemCount();
2261 for (int nItem
=0; nItem
<nListboxEntries
; ++nItem
)
2263 CTGitPath
*path
=(CTGitPath
*)GetItemData(nItem
);
2264 if (path
->GetGitPathString()==targetList
[i
].GetGitPathString() && !path
->IsDirectory())
2266 if(path
->m_Action
& CTGitPath::LOGACTIONS_ADDED
)
2268 path
->m_Action
= CTGitPath::LOGACTIONS_UNVER
;
2269 SetEntryCheck(path
,nItem
,false);
2270 updateStatusList
= true;
2271 SetItemGroup(nItem
,1);
2272 this->m_StatusFileList
.RemoveItem(*path
);
2273 this->m_UnRevFileList
.AddPath(*path
);
2274 //this->m_IgnoreFileList.RemoveItem(*path);
2279 RemoveListEntry(nItem
);
2283 else if (path
->GetGitPathString()==targetList
[i
].GetGitPathString() && path
->IsDirectory() && path
->IsWCRoot())
2286 sCmd
.Format(_T("/command:revert /path:\"%s\""), path
->GetGitPathString());
2287 CCommonAppUtils::RunTortoiseGitProc(sCmd
);
2293 Show(m_dwShow
, 0, m_bShowFolders
,updateStatusList
,true);
2300 case IDGITLC_ASSUMEVALID
:
2302 CString cmdTemplate
;
2303 cmdTemplate
= _T("git.exe update-index --assume-unchanged \"%s\"");
2304 POSITION pos
= GetFirstSelectedItemPosition();
2306 while ((index
= GetNextSelectedItem(pos
)) >= 0)
2308 CTGitPath
* path
= (CTGitPath
*)GetItemData(index
);
2313 CString cmd
, output
;
2314 cmd
.Format(cmdTemplate
, path
->GetGitPathString());
2315 if (g_Git
.Run(cmd
, &output
, CP_UTF8
))
2317 MessageBox(output
, _T("TortoiseGit"), MB_ICONERROR
);
2320 if (NULL
!= GetLogicalParent() && NULL
!= GetLogicalParent()->GetSafeHwnd())
2321 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH
);
2326 case IDGITLC_SKIPWORKTREE
:
2328 CString cmdTemplate
;
2329 cmdTemplate
= _T("git.exe update-index --skip-worktree \"%s\"");
2330 POSITION pos
= GetFirstSelectedItemPosition();
2332 while ((index
= GetNextSelectedItem(pos
)) >= 0)
2334 CTGitPath
* path
= (CTGitPath
*)GetItemData(index
);
2339 CString cmd
, output
;
2340 cmd
.Format(cmdTemplate
, path
->GetGitPathString());
2341 if (g_Git
.Run(cmd
, &output
, CP_UTF8
))
2343 MessageBox(output
, _T("TortoiseGit"), MB_ICONERROR
);
2346 if (NULL
!= GetLogicalParent() && NULL
!= GetLogicalParent()->GetSafeHwnd())
2347 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH
);
2353 CopySelectedEntriesToClipboard(0);
2355 case IDGITLC_COPYEXT
:
2356 CopySelectedEntriesToClipboard((DWORD
)-1);
2358 case IDGITLC_EXPORT
:
2361 case IDGITLC_SAVEAS
:
2362 FileSaveAs(filepath
);
2365 case IDGITLC_REVERTTOREV
:
2366 RevertSelectedItemToVersion();
2368 case IDGITLC_REVERTTOPARENT
:
2369 RevertSelectedItemToVersion(true);
2372 case IDSVNLC_COMMIT
:
2374 CTSVNPathList targetList
;
2375 FillListOfSelectedItemPaths(targetList
);
2376 CTSVNPath tempFile
= CTempFiles::Instance().GetTempFilePath(false);
2377 VERIFY(targetList
.WriteToFile(tempFile
.GetWinPathString()));
2378 CString commandline
= CPathUtils::GetAppDirectory();
2379 commandline
+= _T("TortoiseGitProc.exe /command:commit /pathfile:\"");
2380 commandline
+= tempFile
.GetWinPathString();
2381 commandline
+= _T("\"");
2382 commandline
+= _T(" /deletepathfile");
2383 CAppUtils::LaunchApplication(commandline
, NULL
, false);
2386 case IDSVNLC_CREATEIGNORECS
:
2387 CreateChangeList(SVNSLC_IGNORECHANGELIST
);
2389 case IDSVNLC_CREATECS
:
2391 CCreateChangelistDlg dlg
;
2392 if (dlg
.DoModal() == IDOK
)
2394 CreateChangeList(dlg
.m_sName
);
2400 if (cmd
< IDSVNLC_MOVETOCS
)
2402 CTSVNPathList changelistItems
;
2403 FillListOfSelectedItemPaths(changelistItems
);
2405 // find the changelist name
2406 CString sChangelist
;
2407 int cmdID
= IDSVNLC_MOVETOCS
;
2409 for (std::map
<CString
, int>::const_iterator it
= m_changelists
.begin(); it
!= m_changelists
.end(); ++it
)
2411 if ((it
->first
.Compare(SVNSLC_IGNORECHANGELIST
))&&(entry
->changelist
.Compare(it
->first
)))
2415 sChangelist
= it
->first
;
2420 if (!sChangelist
.IsEmpty())
2423 if (git
.AddToChangeList(changelistItems
, sChangelist
, git_depth_empty
))
2425 // The changelists were moved, but we now need to run through the selected items again
2426 // and update their changelist
2427 POSITION pos
= GetFirstSelectedItemPosition();
2429 while ((index
= GetNextSelectedItem(pos
)) >= 0)
2431 FileEntry
* e
= GetListEntry(index
);
2432 e
->changelist
= sChangelist
;
2435 if (m_changelists
.find(e
->changelist
)!=m_changelists
.end())
2436 SetItemGroup(index
, m_changelists
[e
->changelist
]);
2438 SetItemGroup(index
, 0);
2444 CMessageBox::Show(m_hWnd
, git
.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR
);
2454 AfxGetApp()->DoWaitCursor(-1);
2455 GetStatisticsString();
2456 //int iItemCountAfterMenuCmd = GetItemCount();
2457 //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)
2459 // CWnd* pParent = GetParent();
2460 // if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2462 // pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);
2465 } // if (popup.CreatePopupMenu())
2466 } // if (selIndex >= 0)
2470 void CGitStatusListCtrl::OnContextMenuHeader(CWnd
* pWnd
, CPoint point
)
2472 Locker
lock(m_critSec
);
2473 m_ColumnManager
.OnContextMenuHeader(pWnd
,point
,!!IsGroupViewEnabled());
2476 void CGitStatusListCtrl::OnContextMenu(CWnd
* pWnd
, CPoint point
)
2481 OnContextMenuList(pWnd
, point
);
2482 } // if (pWnd == this)
2483 else if (pWnd
== GetHeaderCtrl())
2485 OnContextMenuHeader(pWnd
, point
);
2489 void CGitStatusListCtrl::OnNMDblclk(NMHDR
*pNMHDR
, LRESULT
*pResult
)
2492 Locker
lock(m_critSec
);
2493 LPNMLISTVIEW pNMLV
= reinterpret_cast<LPNMLISTVIEW
>(pNMHDR
);
2498 if (pNMLV
->iItem
< 0)
2500 if (!IsGroupViewEnabled())
2503 DWORD ptW
= GetMessagePos();
2504 pt
.x
= GET_X_LPARAM(ptW
);
2505 pt
.y
= GET_Y_LPARAM(ptW
);
2506 ScreenToClient(&pt
);
2507 int group
= GetGroupFromPoint(&pt
);
2510 // check/uncheck the whole group depending on the check-state
2511 // of the first item in the group
2513 bool bCheck
= false;
2514 bool bFirst
= false;
2516 for (int i
=0; i
<GetItemCount(); ++i
)
2518 SecureZeroMemory(&lv
, sizeof(LVITEM
));
2519 lv
.mask
= LVIF_GROUPID
;
2522 if (lv
.iGroupId
== group
)
2524 CTGitPath
*entry
=(CTGitPath
*)GetItemData(i
);
2528 bCheck
= !GetCheck(i
);
2533 bool bOldCheck
= !!GetCheck(i
);
2534 SetEntryCheck(entry
, i
, bCheck
);
2535 if (bCheck
!= bOldCheck
)
2545 GetStatisticsString();
2551 CTGitPath
*file
=(CTGitPath
*)GetItemData(pNMLV
->iItem
);
2553 if (file
->m_Action
== CTGitPath::LOGACTIONS_UNVER
) {
2554 OpenFile(file
, OPEN
);
2557 if( file
->m_Action
&CTGitPath::LOGACTIONS_UNMERGED
)
2559 if (CAppUtils::ConflictEdit(*file
, false, m_bIsRevertTheirMy
))
2561 CString conflictedFile
= g_Git
.m_CurrentDir
+ _T("\\") + file
->GetWinPathString();
2562 if (!PathFileExists(conflictedFile
) && NULL
!= GetLogicalParent() && NULL
!= GetLogicalParent()->GetSafeHwnd())
2563 GetLogicalParent()->SendMessage(GITSLNM_NEEDSREFRESH
);
2568 if( (!m_Rev1
.IsEmpty()) || (!m_Rev1
.IsEmpty())) // m_Rev1 twice???
2569 StartDiffTwo(pNMLV
->iItem
);
2571 StartDiff(pNMLV
->iItem
);
2575 void CGitStatusListCtrl::StartDiffTwo(int fileindex
)
2580 CTGitPath file1
=*(CTGitPath
*)GetItemData(fileindex
);
2582 CGitDiff::Diff(&file1
,&file1
,
2587 void CGitStatusListCtrl::StartDiffWC(int fileindex
)
2593 if(this->m_CurrentVersion
.IsEmpty() || m_CurrentVersion
== GIT_REV_ZERO
)
2596 CTGitPath file1
=*(CTGitPath
*)GetItemData(fileindex
);
2598 CGitDiff::Diff(&file1
,&file1
, GIT_REV_ZERO
, m_CurrentVersion
);
2602 void CGitStatusListCtrl::StartDiff(int fileindex
)
2607 CTGitPath file1
=*(CTGitPath
*)GetItemData(fileindex
);
2609 if(file1
.m_Action
& (CTGitPath::LOGACTIONS_REPLACED
|CTGitPath::LOGACTIONS_COPY
))
2611 file2
.SetFromGit(file1
.GetGitOldPathString());
2618 if(this->m_CurrentVersion
.IsEmpty() || m_CurrentVersion
== GIT_REV_ZERO
)
2621 if(m_amend
&& (file1
.m_Action
& CTGitPath::LOGACTIONS_ADDED
) == 0)
2622 fromwhere
= _T("~1");
2623 if( g_Git
.IsInitRepos())
2624 CGitDiff::DiffNull((CTGitPath
*)GetItemData(fileindex
),
2626 else if( file1
.m_Action
&CTGitPath::LOGACTIONS_ADDED
)
2627 CGitDiff::DiffNull((CTGitPath
*)GetItemData(fileindex
),
2628 m_CurrentVersion
+fromwhere
,true);
2629 else if( file1
.m_Action
&CTGitPath::LOGACTIONS_DELETED
)
2630 CGitDiff::DiffNull((CTGitPath
*)GetItemData(fileindex
),
2631 GitRev::GetHead()+fromwhere
,false);
2633 CGitDiff::Diff(&file1
,&file2
,
2634 CString(GIT_REV_ZERO
),
2635 GitRev::GetHead()+fromwhere
);
2640 CString fromwhere
= m_CurrentVersion
+_T("~1");
2642 fromwhere
= m_CurrentVersion
+_T("~2");
2643 if (rev
.GetCommit(fromwhere
) || (file1
.m_Action
& file1
.LOGACTIONS_ADDED
))
2645 CGitDiff::DiffNull(&file1
,m_CurrentVersion
,true);
2648 else if (file1
.m_Action
& file1
.LOGACTIONS_DELETED
)
2650 if (file1
.m_ParentNo
> 0)
2651 fromwhere
.Format(_T("%s^%d"), m_CurrentVersion
, file1
.m_ParentNo
+ 1);
2653 CGitDiff::DiffNull(&file1
,fromwhere
,false);
2657 if( file1
.m_ParentNo
& MERGE_MASK
)
2660 CTGitPath base
, theirs
, mine
, merge
;
2663 GetTempPath(temppath
);
2664 temppath
.TrimRight(_T("\\"));
2666 mine
.SetFromGit(temppath
+ _T("\\") + file1
.GetFileOrDirectoryName() + _T(".LOCAL") + file1
.GetFileExtension());
2667 theirs
.SetFromGit(temppath
+ _T("\\") + file1
.GetFileOrDirectoryName() + _T(".REMOTE") + file1
.GetFileExtension());
2668 base
.SetFromGit(temppath
+ _T("\\") + file1
.GetFileOrDirectoryName() + _T(".BASE") + file1
.GetFileExtension());
2671 //create a empty file, incase stage is not three
2672 tempfile
.Open(mine
.GetWinPathString(),CFile::modeCreate
|CFile::modeReadWrite
);
2674 tempfile
.Open(theirs
.GetWinPathString(),CFile::modeCreate
|CFile::modeReadWrite
);
2676 tempfile
.Open(base
.GetWinPathString(),CFile::modeCreate
|CFile::modeReadWrite
);
2679 merge
.SetFromGit(temppath
+ _T("\\") + file1
.GetFileOrDirectoryName() + _T(".Merged") + file1
.GetFileExtension());
2681 int parent1
=-1, parent2
=-1;
2682 for(int i
=0;i
<this->m_arStatusArray
.size();i
++)
2684 if(m_arStatusArray
[i
]->GetGitPathString() == file1
.GetGitPathString())
2686 if(m_arStatusArray
[i
]->m_ParentNo
& MERGE_MASK
)
2693 parent1
= m_arStatusArray
[i
]->m_ParentNo
& PARENT_MASK
;
2695 else if (parent2
<0)
2697 parent2
= m_arStatusArray
[i
]->m_ParentNo
& PARENT_MASK
;
2703 if(g_Git
.GetOneFile(m_CurrentVersion
, file1
, (CString
&)merge
.GetWinPathString()))
2705 CMessageBox::Show(NULL
, IDS_STATUSLIST_FAILEDGETMERGEFILE
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
2711 str
.Format(_T("%s^%d"),this->m_CurrentVersion
, parent1
+1);
2713 if(g_Git
.GetOneFile(str
, file1
, (CString
&)mine
.GetWinPathString()))
2715 CMessageBox::Show(NULL
, IDS_STATUSLIST_FAILEDGETMERGEFILE
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
2722 str
.Format(_T("%s^%d"),this->m_CurrentVersion
, parent2
+1);
2724 if(g_Git
.GetOneFile(str
, file1
, (CString
&)theirs
.GetWinPathString()))
2726 CMessageBox::Show(NULL
, IDS_STATUSLIST_FAILEDGETMERGEFILE
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
2730 if(parent1
>=0 && parent2
>=0)
2732 CString cmd
, output
;
2733 cmd
.Format(_T("git.exe merge-base %s^%d %s^%d"), this->m_CurrentVersion
, parent1
+1,
2734 this->m_CurrentVersion
,parent2
+1);
2736 if (g_Git
.Run(cmd
, &output
, NULL
, CP_UTF8
))
2741 if(g_Git
.GetOneFile(output
.Left(40), file1
, (CString
&)base
.GetWinPathString()))
2743 CMessageBox::Show(NULL
, IDS_STATUSLIST_FAILEDGETBASEFILE
, IDS_APPNAME
, MB_OK
| MB_ICONERROR
);
2747 CAppUtils::StartExtMerge(base
, theirs
, mine
, merge
,_T("BASE"),_T("REMOTE"),_T("LOCAL"));
2753 if( (file1
.m_ParentNo
&PARENT_MASK
) == 0)
2759 str
.Format(_T("^%d"), (file1
.m_ParentNo
&PARENT_MASK
)+1);
2761 CGitDiff::Diff(&file1
,&file2
,
2763 m_CurrentVersion
+str
);
2769 CString
CGitStatusListCtrl::GetStatisticsString(bool simple
)
2772 CString sNormal
, sAdded
, sDeleted
, sModified
, sConflicted
, sUnversioned
, sRenamed
;
2773 WORD langID
= (WORD
)(DWORD
)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
2774 TCHAR buf
[MAX_STATUS_STRING_LENGTH
];
2775 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_normal
, buf
, _countof(buf
), langID
);
2777 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_added
, buf
, _countof(buf
), langID
);
2779 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_deleted
, buf
, _countof(buf
), langID
);
2781 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_modified
, buf
, _countof(buf
), langID
);
2783 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_conflicted
, buf
, _countof(buf
), langID
);
2785 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_unversioned
, buf
, _countof(buf
), langID
);
2787 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_replaced
, buf
, _countof(buf
), langID
);
2792 sToolTip
.Format(IDS_STATUSLIST_STATUSLINE1
,
2793 this->m_nLineAdded
,this->m_nLineDeleted
,
2794 (LPCTSTR
)sModified
, m_nModified
,
2795 (LPCTSTR
)sAdded
, m_nAdded
,
2796 (LPCTSTR
)sDeleted
, m_nDeleted
,
2797 (LPCTSTR
)sRenamed
, m_nRenamed
2802 sToolTip
.Format(IDS_STATUSLIST_STATUSLINE2
,
2803 this->m_nLineAdded
,this->m_nLineDeleted
,
2804 (LPCTSTR
)sNormal
, m_nNormal
,
2805 (LPCTSTR
)sUnversioned
, m_nUnversioned
,
2806 (LPCTSTR
)sModified
, m_nModified
,
2807 (LPCTSTR
)sAdded
, m_nAdded
,
2808 (LPCTSTR
)sDeleted
, m_nDeleted
,
2809 (LPCTSTR
)sConflicted
, m_nConflicted
2813 sStats
.Format(IDS_COMMITDLG_STATISTICSFORMAT
, m_nSelected
, GetItemCount());
2816 m_pStatLabel
->SetWindowText(sStats
);
2819 if (m_pSelectButton
)
2821 if (m_nSelected
== 0)
2822 m_pSelectButton
->SetCheck(BST_UNCHECKED
);
2823 else if (m_nSelected
!= GetItemCount())
2824 m_pSelectButton
->SetCheck(BST_INDETERMINATE
);
2826 m_pSelectButton
->SetCheck(BST_CHECKED
);
2829 if (m_pConfirmButton
)
2831 m_pConfirmButton
->EnableWindow(m_nSelected
>0);
2839 CString
CGitStatusListCtrl::GetCommonDirectory(bool bStrict
)
2843 // not strict means that the selected folder has priority
2844 if (!m_StatusFileList
.GetCommonDirectory().IsEmpty())
2845 return m_StatusFileList
.GetCommonDirectory().GetWinPath();
2848 CTGitPath commonBaseDirectory
;
2849 int nListItems
= GetItemCount();
2850 for (int i
=0; i
<nListItems
; ++i
)
2852 CTGitPath baseDirectory
,*p
= (CTGitPath
*)this->GetItemData(i
);
2856 baseDirectory
= p
->GetDirectory();
2858 if(commonBaseDirectory
.IsEmpty())
2860 commonBaseDirectory
= baseDirectory
;
2864 if (commonBaseDirectory
.GetWinPathString().GetLength() > baseDirectory
.GetWinPathString().GetLength())
2866 if (baseDirectory
.IsAncestorOf(commonBaseDirectory
))
2867 commonBaseDirectory
= baseDirectory
;
2871 return g_Git
.m_CurrentDir
+CString(_T("\\"))+commonBaseDirectory
.GetWinPath();
2875 void CGitStatusListCtrl::SelectAll(bool bSelect
, bool /*bIncludeNoCommits*/)
2877 CWaitCursor waitCursor
;
2878 // block here so the LVN_ITEMCHANGED messages
2883 int nListItems
= GetItemCount();
2885 m_nSelected
= nListItems
;
2889 for (int i
=0; i
<nListItems
; ++i
)
2891 //FileEntry * entry = GetListEntry(i);
2892 //ASSERT(entry != NULL);
2893 CTGitPath
*path
= (CTGitPath
*) GetItemData(i
);
2896 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))
2897 SetEntryCheck(path
,i
,bSelect
);
2900 // unblock before redrawing
2903 GetStatisticsString();
2907 void CGitStatusListCtrl::Check(DWORD dwCheck
, bool check
)
2909 CWaitCursor waitCursor
;
2910 // block here so the LVN_ITEMCHANGED messages
2915 int nListItems
= GetItemCount();
2917 for (int i
= 0; i
< nListItems
; ++i
)
2919 CTGitPath
*entry
= (CTGitPath
*) GetItemData(i
);
2923 DWORD showFlags
= entry
->m_Action
;
2924 if (entry
->IsDirectory())
2925 showFlags
|= GITSLC_SHOWSUBMODULES
;
2927 showFlags
|= GITSLC_SHOWFILES
;
2929 if (check
&& (showFlags
& dwCheck
) && !GetCheck(i
) && !(entry
->IsDirectory() && m_bDoNotAutoselectSubmodules
&& !(dwCheck
& GITSLC_SHOWSUBMODULES
)))
2931 SetEntryCheck(entry
, i
, true);
2934 else if (!check
&& (showFlags
& dwCheck
) && GetCheck(i
))
2936 SetEntryCheck(entry
, i
, false);
2940 // unblock before redrawing
2943 GetStatisticsString();
2947 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR
*pNMHDR
, LRESULT
*pResult
)
2949 LPNMLVGETINFOTIP pGetInfoTip
= reinterpret_cast<LPNMLVGETINFOTIP
>(pNMHDR
);
2954 CTGitPath
*entry
=(CTGitPath
*)GetItemData(pGetInfoTip
->iItem
);
2957 if (pGetInfoTip
->cchTextMax
> entry
->GetGitPathString().GetLength() + g_Git
.m_CurrentDir
.GetLength())
2960 str
+= g_Git
.m_CurrentDir
;
2962 str
+= entry
->GetWinPathString();
2964 _tcsncpy_s(pGetInfoTip
->pszText
, pGetInfoTip
->cchTextMax
, str
.GetBuffer(), str
.GetLength());
2968 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR
*pNMHDR
, LRESULT
*pResult
)
2970 NMLVCUSTOMDRAW
* pLVCD
= reinterpret_cast<NMLVCUSTOMDRAW
*>( pNMHDR
);
2972 // Take the default processing unless we set this to something else below.
2973 *pResult
= CDRF_DODEFAULT
;
2975 // First thing - check the draw stage. If it's the control's prepaint
2976 // stage, then tell Windows we want messages for every item.
2978 switch (pLVCD
->nmcd
.dwDrawStage
)
2981 *pResult
= CDRF_NOTIFYITEMDRAW
;
2983 case CDDS_ITEMPREPAINT
:
2985 // This is the prepaint stage for an item. Here's where we set the
2986 // item's text color. Our return value will tell Windows to draw the
2987 // item itself, but it will use the new color we set here.
2989 // Tell Windows to paint the control itself.
2990 *pResult
= CDRF_DODEFAULT
;
2994 COLORREF crText
= GetSysColor(COLOR_WINDOWTEXT
);
2996 if (m_arStatusArray
.size() > (DWORD_PTR
)pLVCD
->nmcd
.dwItemSpec
)
2999 //FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);
3000 CTGitPath
*entry
=(CTGitPath
*)GetItemData((int)pLVCD
->nmcd
.dwItemSpec
);
3006 // black : unversioned, normal
3009 // brown : missing, deleted, replaced
3010 // green : merged (or potential merges)
3011 // red : conflicts or sure conflicts
3012 if(entry
->m_Action
& CTGitPath::LOGACTIONS_GRAY
)
3014 crText
= RGB(128,128,128);
3017 else if(entry
->m_Action
& CTGitPath::LOGACTIONS_UNMERGED
)
3019 crText
= m_Colors
.GetColor(CColors::Conflict
);
3022 else if(entry
->m_Action
& (CTGitPath::LOGACTIONS_MODIFIED
))
3024 crText
= m_Colors
.GetColor(CColors::Modified
);
3027 else if(entry
->m_Action
& (CTGitPath::LOGACTIONS_ADDED
|CTGitPath::LOGACTIONS_COPY
))
3029 crText
= m_Colors
.GetColor(CColors::Added
);
3031 else if(entry
->m_Action
& CTGitPath::LOGACTIONS_DELETED
)
3033 crText
= m_Colors
.GetColor(CColors::DeletedNode
);
3035 else if(entry
->m_Action
& CTGitPath::LOGACTIONS_REPLACED
)
3037 crText
= m_Colors
.GetColor(CColors::RenamedNode
);
3039 else if(entry
->m_Action
& CTGitPath::LOGACTIONS_MERGED
)
3041 crText
= m_Colors
.GetColor(CColors::Merged
);
3045 crText
= GetSysColor(COLOR_WINDOWTEXT
);
3047 // Store the color back in the NMLVCUSTOMDRAW struct.
3048 pLVCD
->clrText
= crText
;
3055 BOOL
CGitStatusListCtrl::OnSetCursor(CWnd
* pWnd
, UINT nHitTest
, UINT message
)
3058 return CListCtrl::OnSetCursor(pWnd
, nHitTest
, message
);
3061 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_ARROW
));
3063 return CListCtrl::OnSetCursor(pWnd
, nHitTest
, message
);
3065 HCURSOR hCur
= LoadCursor(NULL
, MAKEINTRESOURCE(IDC_WAIT
));
3070 void CGitStatusListCtrl::RemoveListEntry(int index
)
3073 Locker
lock(m_critSec
);
3076 m_arStatusArray
.erase(m_arStatusArray
.begin()+index
);
3079 delete m_arStatusArray
[m_arListArray
[index
]];
3080 m_arStatusArray
.erase(m_arStatusArray
.begin()+m_arListArray
[index
]);
3081 m_arListArray
.erase(m_arListArray
.begin()+index
);
3082 for (int i
=index
; i
< (int)m_arListArray
.size(); ++i
)
3089 ///< Set a checkbox on an entry in the listbox
3090 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync
3091 void CGitStatusListCtrl::SetEntryCheck(CTGitPath
* pEntry
, int listboxIndex
, bool bCheck
)
3093 pEntry
->m_Checked
= bCheck
;
3094 m_mapFilenameToChecked
[pEntry
->GetGitPathString()] = bCheck
;
3095 SetCheck(listboxIndex
, bCheck
);
3099 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry
* parentEntry
, bool bCheck
)
3102 int nListItems
= GetItemCount();
3103 for (int j
=0; j
< nListItems
; ++j
)
3105 FileEntry
* childEntry
= GetListEntry(j
);
3106 ASSERT(childEntry
!= NULL
);
3107 if (childEntry
== NULL
|| childEntry
== parentEntry
)
3109 if (childEntry
->checked
!= bCheck
)
3111 if (parentEntry
->path
.IsAncestorOf(childEntry
->path
))
3113 SetEntryCheck(childEntry
,j
,bCheck
);
3129 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList
& pathList
)
3133 int nListItems
= GetItemCount();
3134 for (int i
=0; i
< nListItems
; i
++)
3136 CTGitPath
* entry
= (CTGitPath
*)GetItemData(i
);
3137 ASSERT(entry
!= NULL
);
3138 if (entry
->m_Checked
)
3140 pathList
.AddPath(*entry
);
3143 pathList
.SortByPathname();
3148 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)
3149 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList
& pathList
, bool /*bNoIgnored*/)
3153 POSITION pos
= GetFirstSelectedItemPosition();
3155 while ((index
= GetNextSelectedItem(pos
)) >= 0)
3157 CTGitPath
* entry
= (CTGitPath
*)GetItemData(index
);
3158 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))
3160 pathList
.AddPath(*entry
);
3164 UINT
CGitStatusListCtrl::OnGetDlgCode()
3166 // we want to process the return key and not have that one
3167 // routed to the default pushbutton
3168 return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS
;
3171 void CGitStatusListCtrl::OnNMReturn(NMHDR
* /*pNMHDR*/, LRESULT
*pResult
)
3176 if (!CheckMultipleDiffs())
3178 POSITION pos
= GetFirstSelectedItemPosition();
3181 int index
= GetNextSelectedItem(pos
);
3182 CTGitPath
*file
=(CTGitPath
*)GetItemData(index
);
3183 if (file
->m_Action
== CTGitPath::LOGACTIONS_UNVER
)
3185 OpenFile(file
, OPEN
);
3189 if( (!m_Rev1
.IsEmpty()) || (!m_Rev1
.IsEmpty())) // m_Rev1 twice???
3190 StartDiffTwo(index
);
3197 void CGitStatusListCtrl::OnKeyDown(UINT nChar
, UINT nRepCnt
, UINT nFlags
)
3199 // Since we catch all keystrokes (to have the enter key processed here instead
3200 // of routed to the default pushbutton) we have to make sure that other
3201 // keys like Tab and Esc still do what they're supposed to do
3202 // Tab = change focus to next/previous control
3203 // Esc = quit the dialog
3208 ::PostMessage(GetLogicalParent()->GetSafeHwnd(), WM_NEXTDLGCTL
, GetKeyState(VK_SHIFT
)&0x8000, 0);
3214 ::SendMessage(GetLogicalParent()->GetSafeHwnd(), WM_CLOSE
, 0, 0);
3219 CListCtrl::OnKeyDown(nChar
, nRepCnt
, nFlags
);
3222 void CGitStatusListCtrl::PreSubclassWindow()
3224 CListCtrl::PreSubclassWindow();
3225 EnableToolTips(TRUE
);
3226 SetWindowTheme(GetSafeHwnd(), L
"Explorer", NULL
);
3229 INT_PTR
CGitStatusListCtrl::OnToolHitTest(CPoint point
, TOOLINFO
* pTI
) const
3233 row
= CellRectFromPoint(point
, &cellrect
, &col
);
3240 pTI
->uId
= (UINT
)((row
<<10)+(col
&0x3ff)+1);
3241 pTI
->lpszText
= LPSTR_TEXTCALLBACK
;
3243 pTI
->rect
= cellrect
;
3248 int CGitStatusListCtrl::CellRectFromPoint(CPoint
& point
, RECT
*cellrect
, int *col
) const
3252 // Make sure that the ListView is in LVS_REPORT
3253 if ((GetWindowLong(m_hWnd
, GWL_STYLE
) & LVS_TYPEMASK
) != LVS_REPORT
)
3256 // Get the top and bottom row visible
3257 int row
= GetTopIndex();
3258 int bottom
= row
+ GetCountPerPage();
3259 if (bottom
> GetItemCount())
3260 bottom
= GetItemCount();
3262 // Get the number of columns
3263 CHeaderCtrl
* pHeader
= (CHeaderCtrl
*)GetDlgItem(0);
3264 int nColumnCount
= pHeader
->GetItemCount();
3266 // Loop through the visible rows
3267 for ( ;row
<=bottom
;row
++)
3269 // Get bounding rect of item and check whether point falls in it.
3271 GetItemRect(row
, &rect
, LVIR_BOUNDS
);
3272 if (rect
.PtInRect(point
))
3274 // Now find the column
3275 for (colnum
= 0; colnum
< nColumnCount
; colnum
++)
3277 int colwidth
= GetColumnWidth(colnum
);
3278 if (point
.x
>= rect
.left
&& point
.x
<= (rect
.left
+ colwidth
))
3281 GetClientRect(&rectClient
);
3284 rect
.right
= rect
.left
+ colwidth
;
3286 // Make sure that the right extent does not exceed
3288 if (rect
.right
> rectClient
.right
)
3289 rect
.right
= rectClient
.right
;
3293 rect
.left
+= colwidth
;
3300 void CGitStatusListCtrl::OnPaint()
3303 if ((m_bBusy
)||(m_bEmpty
))
3308 if (m_sBusy
.IsEmpty())
3309 str
.LoadString(IDS_STATUSLIST_BUSYMSG
);
3315 if (m_sEmpty
.IsEmpty())
3316 str
.LoadString(IDS_STATUSLIST_EMPTYMSG
);
3320 COLORREF clrText
= ::GetSysColor(COLOR_WINDOWTEXT
);
3322 if (IsWindowEnabled())
3323 clrTextBk
= ::GetSysColor(COLOR_WINDOW
);
3325 clrTextBk
= ::GetSysColor(COLOR_3DFACE
);
3330 pHC
= GetHeaderCtrl();
3334 pHC
->GetItemRect(0, &rcH
);
3335 rc
.top
+= rcH
.bottom
;
3339 CMyMemDC
memDC(pDC
, &rc
);
3341 memDC
.SetTextColor(clrText
);
3342 memDC
.SetBkColor(clrTextBk
);
3343 memDC
.FillSolidRect(rc
, clrTextBk
);
3345 CGdiObject
* oldfont
= memDC
.SelectStockObject(DEFAULT_GUI_FONT
);
3346 memDC
.DrawText(str
, rc
, DT_CENTER
| DT_VCENTER
|
3347 DT_WORDBREAK
| DT_NOPREFIX
| DT_NOCLIP
);
3348 memDC
.SelectObject(oldfont
);
3355 // prevent users from extending our hidden (size 0) columns
3356 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR
*pNMHDR
, LRESULT
*pResult
)
3358 m_ColumnManager
.OnHdnBegintrack(pNMHDR
, pResult
);
3361 // prevent any function from extending our hidden (size 0) columns
3362 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR
*pNMHDR
, LRESULT
*pResult
)
3364 if(!m_ColumnManager
.OnHdnItemchanging(pNMHDR
, pResult
))
3368 void CGitStatusListCtrl::OnDestroy()
3370 SaveColumnWidths(true);
3371 CListCtrl::OnDestroy();
3374 void CGitStatusListCtrl::OnBeginDrag(NMHDR
* /*pNMHDR*/, LRESULT
* pResult
)
3377 Locker
lock(m_critSec
);
3378 CDropFiles dropFiles
; // class for creating DROPFILES struct
3381 POSITION pos
= GetFirstSelectedItemPosition();
3382 while ( (index
= GetNextSelectedItem(pos
)) >= 0 )
3384 FileEntry
* fentry
= m_arStatusArray
[m_arListArray
[index
]];
3385 CTGitPath path
= fentry
->GetPath();
3386 dropFiles
.AddFile( path
.GetWinPathString() );
3389 if ( dropFiles
.GetCount()>0 )
3392 dropFiles
.CreateStructure();
3399 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry
/* = false */)
3401 int maxcol
= ((CHeaderCtrl
*)(GetDlgItem(0)))->GetItemCount()-1;
3402 for (int col
= 0; col
<= maxcol
; col
++)
3403 if (m_ColumnManager
.IsVisible (col
))
3404 m_ColumnManager
.ColumnResized (col
);
3406 if (bSaveToRegistry
)
3407 m_ColumnManager
.WriteSettings();
3410 bool CGitStatusListCtrl::EnableFileDrop()
3412 m_bFileDropsEnabled
= true;
3416 bool CGitStatusListCtrl::HasPath(const CTGitPath
& path
)
3418 for (size_t i
=0; i
< m_arStatusArray
.size(); i
++)
3420 if (m_arStatusArray
[i
]->IsEquivalentTo(path
))
3427 BOOL
CGitStatusListCtrl::PreTranslateMessage(MSG
* pMsg
)
3429 if (pMsg
->message
== WM_KEYDOWN
)
3431 switch (pMsg
->wParam
)
3435 if (GetAsyncKeyState(VK_CONTROL
)&0x8000)
3437 // select all entries
3438 for (int i
=0; i
<GetItemCount(); ++i
)
3440 SetItemState(i
, LVIS_SELECTED
, LVIS_SELECTED
);
3449 if (GetAsyncKeyState(VK_CONTROL
)&0x8000)
3451 // copy all selected paths to the clipboard
3452 if (GetAsyncKeyState(VK_SHIFT
)&0x8000)
3453 CopySelectedEntriesToClipboard(GITSLC_COLSTATUS
);
3455 CopySelectedEntriesToClipboard(0);
3463 return CListCtrl::PreTranslateMessage(pMsg
);
3466 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols
)
3469 static HINSTANCE
hResourceHandle(AfxGetResourceHandle());
3470 // WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
3475 if (GetSelectedCount() == 0)
3478 // first add the column titles as the first line
3479 // We needn't head when only path copy
3480 //temp.LoadString(IDS_STATUSLIST_COLFILE);
3481 //sClipboard = temp;
3483 DWORD selection
= 0;
3484 for (int i
= 0, count
= m_ColumnManager
.GetColumnCount(); i
< count
; ++i
)
3485 if ( ((dwCols
== -1) && m_ColumnManager
.IsVisible (i
))
3486 || ((dwCols
!= 1) && (i
< 32) && ((dwCols
& (1 << i
)) != 0)))
3488 sClipboard
+= _T("\t") + m_ColumnManager
.GetName(i
);
3491 selection
+= 1 << i
;
3495 sClipboard
+= _T("\r\n");
3497 POSITION pos
= GetFirstSelectedItemPosition();
3499 while ((index
= GetNextSelectedItem(pos
)) >= 0)
3501 CTGitPath
* entry
= (CTGitPath
*)GetItemData(index
);
3505 sClipboard
+= entry
->GetWinPathString();
3506 if (selection
& GITSLC_COLFILENAME
)
3508 sClipboard
+= _T("\t")+entry
->GetFileOrDirectoryName();
3510 if (selection
& GITSLC_COLEXT
)
3512 sClipboard
+= _T("\t")+entry
->GetFileExtension();
3515 if (selection
& GITSLC_COLSTATUS
)
3517 sClipboard
+= _T("\t")+entry
->GetActionName();
3520 if (selection
& SVNSLC_COLDATE
)
3522 TCHAR datebuf
[SVN_DATE_BUFFER
];
3523 apr_time_t date
= entry
->last_commit_date
;
3524 SVN::formatDate(datebuf
, date
, true);
3529 sClipboard
+= _T("\t")+temp
;
3531 for ( int i
= SVNSLC_NUMCOLUMNS
, count
= m_ColumnManager
.GetColumnCount()
3535 if ((dwCols
== -1) && m_ColumnManager
.IsVisible (i
))
3538 = entry
->present_props
[m_ColumnManager
.GetName(i
)];
3539 sClipboard
+= _T("\t") + value
;
3543 if (selection
& GITSLC_COLADD
)
3545 sClipboard
+= _T("\t")+entry
->m_StatAdd
;
3547 if (selection
& GITSLC_COLDEL
)
3549 sClipboard
+= _T("\t")+entry
->m_StatDel
;
3552 sClipboard
+= _T("\r\n");
3555 return CStringUtils::WriteAsciiStringToClipboard(sClipboard
);
3558 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()
3561 std::set
<CString
> changelists
;
3562 POSITION pos
= GetFirstSelectedItemPosition();
3564 while ((index
= GetNextSelectedItem(pos
)) >= 0)
3566 FileEntry
* entry
= GetListEntry(index
);
3567 if (!entry
->changelist
.IsEmpty())
3568 changelists
.insert(entry
->changelist
);
3570 return changelists
.size();
3575 bool CGitStatusListCtrl::PrepareGroups(bool bForce
/* = false */)
3578 bool bHasGroups
=false;
3581 for(int i
=0;i
< this->m_arStatusArray
.size(); i
++)
3583 int ParentNo
= m_arStatusArray
[i
]->m_ParentNo
&PARENT_MASK
;
3585 max
=m_arStatusArray
[i
]->m_ParentNo
&PARENT_MASK
;
3588 if ( this->m_UnRevFileList
.GetCount()>0 ||
3589 this->m_IgnoreFileList
.GetCount()>0 ||
3596 EnableGroupView(bHasGroups
);
3598 TCHAR groupname
[1024];
3604 grp
.cbSize
= sizeof(LVGROUP
);
3605 grp
.mask
= LVGF_ALIGN
| LVGF_GROUPID
| LVGF_HEADER
;
3608 //if(m_UnRevFileList.GetCount()>0)
3611 _tcsncpy_s(groupname
, 1024, (LPCTSTR
)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MERGEDFILES
)), 1023);
3612 grp
.pszHeader
= groupname
;
3613 grp
.iGroupId
= MERGE_MASK
;
3614 grp
.uAlign
= LVGA_HEADER_LEFT
;
3615 InsertGroup(0, &grp
);
3617 for(int i
=0;i
<=max
;i
++)
3620 str
.Format(IDS_STATUSLIST_GROUP_DIFFWITHPARENT
, i
+1);
3621 grp
.pszHeader
= str
.GetBuffer();
3622 str
.ReleaseBuffer();
3624 grp
.uAlign
= LVGA_HEADER_LEFT
;
3625 InsertGroup(i
+1, &grp
);
3630 _tcsncpy_s(groupname
, 1024, (LPCTSTR
)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MODIFIEDFILES
)), 1023);
3631 grp
.pszHeader
= groupname
;
3632 grp
.iGroupId
= groupindex
;
3633 grp
.uAlign
= LVGA_HEADER_LEFT
;
3634 InsertGroup(groupindex
++, &grp
);
3638 _tcsncpy_s(groupname
, 1024, (LPCTSTR
)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_NOTVERSIONEDFILES
)), 1023);
3639 grp
.pszHeader
= groupname
;
3640 grp
.iGroupId
= groupindex
;
3641 grp
.uAlign
= LVGA_HEADER_LEFT
;
3642 InsertGroup(groupindex
++, &grp
);
3645 //if(m_IgnoreFileList.GetCount()>0)
3647 _tcsncpy_s(groupname
, 1024, (LPCTSTR
)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_IGNOREDFILES
)), 1023);
3648 grp
.pszHeader
= groupname
;
3649 grp
.iGroupId
= groupindex
;
3650 grp
.uAlign
= LVGA_HEADER_LEFT
;
3651 InsertGroup(groupindex
++, &grp
);
3657 m_bHasIgnoreGroup
= false;
3659 // now add the items which don't belong to a group
3661 grp
.cbSize
= sizeof(LVGROUP
);
3662 grp
.mask
= LVGF_ALIGN
| LVGF_GROUPID
| LVGF_HEADER
;
3663 CString
sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET
));
3664 _tcsncpy_s(groupname
, 1024, (LPCTSTR
)sUnassignedName
, 1023);
3665 grp
.pszHeader
= groupname
;
3666 grp
.iGroupId
= groupindex
;
3667 grp
.uAlign
= LVGA_HEADER_LEFT
;
3668 InsertGroup(groupindex
++, &grp
);
3670 for (std::map
<CString
,int>::iterator it
= m_changelists
.begin(); it
!= m_changelists
.end(); ++it
)
3672 if (it
->first
.Compare(SVNSLC_IGNORECHANGELIST
)!=0)
3675 grp
.cbSize
= sizeof(LVGROUP
);
3676 grp
.mask
= LVGF_ALIGN
| LVGF_GROUPID
| LVGF_HEADER
;
3677 _tcsncpy_s(groupname
, 1024, it
->first
, 1023);
3678 grp
.pszHeader
= groupname
;
3679 grp
.iGroupId
= groupindex
;
3680 grp
.uAlign
= LVGA_HEADER_LEFT
;
3681 it
->second
= InsertGroup(groupindex
++, &grp
);
3684 m_bHasIgnoreGroup
= true;
3687 if (m_bHasIgnoreGroup
)
3689 // and now add the group 'ignore-on-commit'
3690 std::map
<CString
,int>::iterator it
= m_changelists
.find(SVNSLC_IGNORECHANGELIST
);
3691 if (it
!= m_changelists
.end())
3693 grp
.cbSize
= sizeof(LVGROUP
);
3694 grp
.mask
= LVGF_ALIGN
| LVGF_GROUPID
| LVGF_HEADER
;
3695 _tcsncpy_s(groupname
, 1024, SVNSLC_IGNORECHANGELIST
, 1023);
3696 grp
.pszHeader
= groupname
;
3697 grp
.iGroupId
= groupindex
;
3698 grp
.uAlign
= LVGA_HEADER_LEFT
;
3699 it
->second
= InsertGroup(groupindex
, &grp
);
3706 void CGitStatusListCtrl::NotifyCheck()
3708 CWnd
* pParent
= GetLogicalParent();
3709 if (NULL
!= pParent
&& NULL
!= pParent
->GetSafeHwnd())
3711 pParent
->SendMessage(GITSLNM_CHECKCHANGED
, m_nSelected
);
3715 int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash
,CTGitPathList
*list
)
3719 m_CurrentVersion
=hash
;
3725 count
= list
->GetCount();
3727 CString head
= _T("HEAD");
3729 head
= _T("HEAD~1");
3731 if(hash
== GIT_REV_ZERO
)
3733 for(int i
=0;i
<count
;i
++)
3738 if(!g_Git
.IsInitRepos())
3740 // also list staged files which will be in the commit
3741 cmd
=(_T("git.exe diff-index --cached --raw ") + head
+ _T(" --numstat -C -M -z"));
3742 g_Git
.Run(cmd
, &cmdout
);
3745 cmd
=(_T("git.exe diff-index --raw ") + head
+ _T(" --numstat -C -M -z"));
3747 cmd
.Format(_T("git.exe diff-index --raw ") + head
+ _T(" --numstat -C -M -z -- \"%s\""),(*list
)[i
].GetGitPathString());
3750 if(g_Git
.Run(cmd
, &cmdout
, &cmdErr
))
3752 int last
= cmdErr
.RevertFind(0,-1);
3754 g_Git
.StringAppend(&str
, &cmdErr
[last
+ 1], CP_UTF8
, (int)cmdErr
.size() - last
-1);
3755 CMessageBox::Show(NULL
, str
, _T("TortoiseGit"), MB_OK
|MB_ICONERROR
);
3758 out
.append(cmdout
, 0);
3760 else // Init Repository
3762 //We will list all added file for init repository because commit will comit these
3764 cmd
=_T("git.exe ls-files -s -t -z");
3766 // cmd.Format(_T("git.exe ls-files -s -t -z -- \"%s\""),(*list)[i].GetGitPathString());
3768 g_Git
.Run(cmd
, &cmdout
);
3770 out
.append(cmdout
,0);
3774 if(g_Git
.IsInitRepos())
3776 m_StatusFileList
.ParserFromLsFile(out
);
3777 for(int i
=0;i
<m_StatusFileList
.GetCount();i
++)
3778 ((CTGitPath
&)(m_StatusFileList
[i
])).m_Action
=CTGitPath::LOGACTIONS_ADDED
;
3781 this->m_StatusFileList
.ParserFromLog(out
);
3783 //handle delete conflict case, when remote : modified, local : deleted.
3784 for(int i
=0;i
<count
;i
++)
3790 cmd
=_T("git.exe ls-files -u -t -z");
3792 cmd
.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),(*list
)[i
].GetGitPathString());
3794 g_Git
.Run(cmd
, &cmdout
);
3796 CTGitPathList conflictlist
;
3797 conflictlist
.ParserFromLog(cmdout
);
3798 for(int i
=0;i
<conflictlist
.GetCount();i
++)
3800 CTGitPath
*p
=m_StatusFileList
.LookForGitPath(conflictlist
[i
].GetGitPathString());
3802 p
->m_Action
|=CTGitPath::LOGACTIONS_UNMERGED
;
3804 m_StatusFileList
.AddPath(conflictlist
[i
]);
3808 // handle source files of file renames/moves (issue #860)
3809 // if a file gets renamed and the new file "git add"ed, diff-index doesn't list the source file anymore
3810 for(int i
= 0; i
< count
; i
++)
3816 cmd
= _T("git.exe ls-files -d -z");
3818 cmd
.Format(_T("git.exe ls-files -d -z -- \"%s\""),(*list
)[i
].GetGitPathString());
3820 g_Git
.Run(cmd
, &cmdout
);
3822 CTGitPathList deletelist
;
3823 deletelist
.ParserFromLog(cmdout
, true);
3824 for(int i
= 0; i
< deletelist
.GetCount(); i
++)
3826 CTGitPath
*p
= m_StatusFileList
.LookForGitPath(deletelist
[i
].GetGitPathString());
3828 m_StatusFileList
.AddPath(deletelist
[i
]);
3829 else if ((p
->m_Action
== CTGitPath::LOGACTIONS_ADDED
|| p
->m_Action
== CTGitPath::LOGACTIONS_REPLACED
) && !p
->Exists())
3831 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)
3833 g_Git
.Run(_T("git.exe rm -f --cache -- \"") + p
->GetWinPathString() + _T("\""), &cmdout
);
3834 m_StatusFileList
.RemoveItem(*p
);
3846 count
= list
->GetCount();
3848 for(int i
=0;i
<count
;i
++)
3853 cmd
.Format(_T("git.exe diff-tree --raw --numstat -C -M -z %s"),hash
);
3855 cmd
.Format(_T("git.exe diff-tree --raw --numstat -C -M %s -z -- \"%s\""),hash
,(*list
)[i
].GetGitPathString());
3857 g_Git
.Run(cmd
, &cmdout
, NULL
);
3861 this->m_StatusFileList
.ParserFromLog(out
);
3865 for(int i
=0;i
<m_StatusFileList
.GetCount();i
++)
3867 CTGitPath
* gitpatch
=(CTGitPath
*)&m_StatusFileList
[i
];
3868 gitpatch
->m_Checked
= TRUE
;
3869 m_arStatusArray
.push_back((CTGitPath
*)&m_StatusFileList
[i
]);
3872 this->m_bBusy
=FALSE
;
3876 int CGitStatusListCtrl::UpdateWithGitPathList(CTGitPathList
&list
)
3878 m_arStatusArray
.clear();
3879 for(int i
=0;i
<list
.GetCount();i
++)
3881 CTGitPath
* gitpath
=(CTGitPath
*)&list
[i
];
3883 if(gitpath
->m_Action
& CTGitPath::LOGACTIONS_HIDE
)
3886 gitpath
->m_Checked
= TRUE
;
3887 m_arStatusArray
.push_back((CTGitPath
*)&list
[i
]);
3892 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList
&list
)
3894 m_UnRevFileList
= list
;
3895 for(int i
=0;i
<m_UnRevFileList
.GetCount();i
++)
3897 CTGitPath
* gitpatch
=(CTGitPath
*)&m_UnRevFileList
[i
];
3898 gitpatch
->m_Checked
= FALSE
;
3899 m_arStatusArray
.push_back((CTGitPath
*)&m_UnRevFileList
[i
]);
3904 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList
*List
)
3906 this->m_UnRevFileList
.FillUnRev(CTGitPath::LOGACTIONS_UNVER
,List
);
3907 for(int i
=0;i
<m_UnRevFileList
.GetCount();i
++)
3909 CTGitPath
* gitpatch
=(CTGitPath
*)&m_UnRevFileList
[i
];
3910 gitpatch
->m_Checked
= FALSE
;
3911 m_arStatusArray
.push_back((CTGitPath
*)&m_UnRevFileList
[i
]);
3916 int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList
*List
)
3918 this->m_IgnoreFileList
.FillUnRev(CTGitPath::LOGACTIONS_UNVER
|CTGitPath::LOGACTIONS_IGNORE
,List
);
3919 for(int i
=0;i
<m_IgnoreFileList
.GetCount();i
++)
3921 CTGitPath
* gitpatch
=(CTGitPath
*)&m_IgnoreFileList
[i
];
3922 gitpatch
->m_Checked
= FALSE
;
3923 m_arStatusArray
.push_back((CTGitPath
*)&m_IgnoreFileList
[i
]);
3927 int CGitStatusListCtrl::UpdateFileList(int mask
,bool once
,CTGitPathList
*List
)
3929 if(mask
&CGitStatusListCtrl::FILELIST_MODIFY
)
3931 if(once
|| (!(m_FileLoaded
&CGitStatusListCtrl::FILELIST_MODIFY
)))
3933 UpdateFileList(git_revnum_t(GIT_REV_ZERO
),List
);
3934 m_FileLoaded
|=CGitStatusListCtrl::FILELIST_MODIFY
;
3937 if(mask
&CGitStatusListCtrl::FILELIST_UNVER
)
3939 if(once
|| (!(m_FileLoaded
&CGitStatusListCtrl::FILELIST_UNVER
)))
3941 UpdateUnRevFileList(List
);
3942 m_FileLoaded
|=CGitStatusListCtrl::FILELIST_UNVER
;
3944 if(mask
&CGitStatusListCtrl::FILELIST_IGNORE
&& (once
|| (!(m_FileLoaded
&CGitStatusListCtrl::FILELIST_IGNORE
))))
3946 UpdateIgnoreFileList(List
);
3947 m_FileLoaded
|=CGitStatusListCtrl::FILELIST_UNVER
;
3953 void CGitStatusListCtrl::Clear()
3956 this->DeleteAllItems();
3957 this->m_arListArray
.clear();
3958 this->m_arStatusArray
.clear();
3959 this->m_changelists
.clear();
3962 bool CGitStatusListCtrl::CheckMultipleDiffs()
3964 UINT selCount
= GetSelectedCount();
3965 if (selCount
> max(3, (DWORD
)CRegDWORD(_T("Software\\TortoiseGit\\NumDiffWarning"), 10)))
3968 message
.Format(CString(MAKEINTRESOURCE(IDS_STATUSLIST_WARN_MAXDIFF
)), selCount
);
3969 return ::MessageBox(GetSafeHwnd(), message
, _T("TortoiseGit"), MB_YESNO
| MB_ICONQUESTION
) == IDYES
;
3973 //////////////////////////////////////////////////////////////////////////
3975 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC
* pFmtEtc
, STGMEDIUM
& medium
, DWORD
* /*pdwEffect*/, POINTL pt
)
3977 if(pFmtEtc
->cfFormat
== CF_HDROP
&& medium
.tymed
== TYMED_HGLOBAL
)
3979 HDROP hDrop
= (HDROP
)GlobalLock(medium
.hGlobal
);
3982 TCHAR szFileName
[MAX_PATH
];
3984 UINT cFiles
= DragQueryFile(hDrop
, 0xFFFFFFFF, NULL
, 0);
3987 clientpoint
.x
= pt
.x
;
3988 clientpoint
.y
= pt
.y
;
3989 ScreenToClient(m_hTargetWnd
, &clientpoint
);
3990 if ((m_pSVNStatusListCtrl
->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl
->GetGroupFromPoint(&clientpoint
) >= 0))
3992 CTSVNPathList changelistItems
;
3993 for(UINT i
= 0; i
< cFiles
; ++i
)
3995 DragQueryFile(hDrop
, i
, szFileName
, sizeof(szFileName
));
3996 changelistItems
.AddPath(CTSVNPath(szFileName
));
3998 // find the changelist name
3999 CString sChangelist
;
4000 LONG_PTR nGroup
= m_pSVNStatusListCtrl
->GetGroupFromPoint(&clientpoint
);
4001 for (std::map
<CString
, int>::iterator it
= m_pSVNStatusListCtrl
->m_changelists
.begin(); it
!= m_pSVNStatusListCtrl
->m_changelists
.end(); ++it
)
4002 if (it
->second
== nGroup
)
4003 sChangelist
= it
->first
;
4004 if (!sChangelist
.IsEmpty())
4007 if (git
.AddToChangeList(changelistItems
, sChangelist
, git_depth_empty
))
4009 for (int l
=0; l
<changelistItems
.GetCount(); ++l
)
4011 int index
= m_pSVNStatusListCtrl
->GetIndex(changelistItems
[l
]);
4014 CSVNStatusListCtrl::FileEntry
* e
= m_pSVNStatusListCtrl
->GetListEntry(index
);
4017 e
->changelist
= sChangelist
;
4020 if (m_pSVNStatusListCtrl
->m_changelists
.find(e
->changelist
)!=m_pSVNStatusListCtrl
->m_changelists
.end())
4021 m_pSVNStatusListCtrl
->SetItemGroup(index
, m_pSVNStatusListCtrl
->m_changelists
[e
->changelist
]);
4023 m_pSVNStatusListCtrl
->SetItemGroup(index
, 0);
4029 HWND hParentWnd
= GetParent(m_hTargetWnd
);
4030 if (hParentWnd
!= NULL
)
4031 ::SendMessage(hParentWnd
, CSVNStatusListCtrl::SVNSLNM_ADDFILE
, 0, (LPARAM
)changelistItems
[l
].GetWinPath());
4037 CMessageBox::Show(m_pSVNStatusListCtrl
->m_hWnd
, git
.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR
);
4043 if (git
.RemoveFromChangeList(changelistItems
, CStringArray(), git_depth_empty
))
4045 for (int l
=0; l
<changelistItems
.GetCount(); ++l
)
4047 int index
= m_pSVNStatusListCtrl
->GetIndex(changelistItems
[l
]);
4050 CSVNStatusListCtrl::FileEntry
* e
= m_pSVNStatusListCtrl
->GetListEntry(index
);
4053 e
->changelist
= sChangelist
;
4054 m_pSVNStatusListCtrl
->SetItemGroup(index
, 0);
4059 HWND hParentWnd
= GetParent(m_hTargetWnd
);
4060 if (hParentWnd
!= NULL
)
4061 ::SendMessage(hParentWnd
, CSVNStatusListCtrl::SVNSLNM_ADDFILE
, 0, (LPARAM
)changelistItems
[l
].GetWinPath());
4067 CMessageBox::Show(m_pSVNStatusListCtrl
->m_hWnd
, git
.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR
);
4073 for(UINT i
= 0; i
< cFiles
; ++i
)
4075 DragQueryFile(hDrop
, i
, szFileName
, sizeof(szFileName
));
4076 HWND hParentWnd
= GetParent(m_hTargetWnd
);
4077 if (hParentWnd
!= NULL
)
4078 ::SendMessage(hParentWnd
, CSVNStatusListCtrl::SVNSLNM_ADDFILE
, 0, (LPARAM
)szFileName
);
4082 GlobalUnlock(medium
.hGlobal
);
4084 return true; //let base free the medium
4086 HRESULT STDMETHODCALLTYPE
CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState
, POINTL pt
, DWORD __RPC_FAR
*pdwEffect
)
4088 CIDropTarget::DragOver(grfKeyState
, pt
, pdwEffect
);
4089 *pdwEffect
= DROPEFFECT_COPY
;
4090 if (m_pSVNStatusListCtrl
)
4093 clientpoint
.x
= pt
.x
;
4094 clientpoint
.y
= pt
.y
;
4095 ScreenToClient(m_hTargetWnd
, &clientpoint
);
4096 if ((m_pSVNStatusListCtrl
->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl
->GetGroupFromPoint(&clientpoint
) >= 0))
4098 *pdwEffect
= DROPEFFECT_MOVE
;
4100 else if ((!m_pSVNStatusListCtrl
->m_bFileDropsEnabled
)||(m_pSVNStatusListCtrl
->m_bOwnDrag
))
4102 *pdwEffect
= DROPEFFECT_NONE
;
4110 void CGitStatusListCtrl::FilesExport()
4113 // export all changed files to a folder
4114 CBrowseFolder browseFolder
;
4115 browseFolder
.m_style
= BIF_EDITBOX
| BIF_NEWDIALOGSTYLE
| BIF_RETURNFSANCESTORS
| BIF_RETURNONLYFSDIRS
;
4116 if (browseFolder
.Show(GetSafeHwnd(), exportDir
) != CBrowseFolder::OK
)
4119 POSITION pos
= GetFirstSelectedItemPosition();
4121 while ((index
= GetNextSelectedItem(pos
)) >= 0)
4123 CTGitPath
*fd
= (CTGitPath
*)GetItemData(index
);
4124 // we cannot export directories or folders
4125 if (fd
->m_Action
== CTGitPath::LOGACTIONS_DELETED
|| fd
->IsDirectory())
4128 CAppUtils::CreateMultipleDirectory(exportDir
+ _T("\\") + fd
->GetDirectory().GetWinPathString());
4129 CString filename
= exportDir
+ _T("\\") + fd
->GetWinPathString();
4130 if (m_CurrentVersion
== GIT_REV_ZERO
)
4132 if (!CopyFile(g_Git
.m_CurrentDir
+ _T("\\") + fd
->GetWinPath(), filename
, false))
4134 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
4140 if (g_Git
.GetOneFile(m_CurrentVersion
, *fd
, filename
))
4143 out
.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED
, fd
->GetGitPathString(), m_CurrentVersion
, filename
);
4144 if (CMessageBox::Show(NULL
, out
, _T("TortoiseGit"), 2, IDI_WARNING
, CString(MAKEINTRESOURCE(IDS_IGNOREBUTTON
)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON
))) == 2)
4151 void CGitStatusListCtrl::FileSaveAs(CTGitPath
*path
)
4154 filename
.Format(_T("%s-%s%s"), path
->GetBaseFilename(), this->m_CurrentVersion
.Left(g_Git
.GetShortHASHLength()), path
->GetFileExtension());
4155 CFileDialog
dlg(FALSE
,NULL
,
4157 OFN_HIDEREADONLY
| OFN_OVERWRITEPROMPT
,
4159 CString currentpath
;
4160 currentpath
=g_Git
.m_CurrentDir
+_T("\\");
4161 currentpath
+=path
->GetWinPathString();
4163 dlg
.m_ofn
.lpstrInitialDir
=currentpath
.GetBuffer();
4166 INT_PTR ret
= dlg
.DoModal();
4167 SetCurrentDirectory(g_Git
.m_CurrentDir
);
4170 filename
= dlg
.GetPathName();
4171 if(m_CurrentVersion
== GIT_REV_ZERO
)
4173 if(!CopyFile(g_Git
.m_CurrentDir
+_T("\\") + path
->GetWinPath(),filename
,false))
4175 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK
| MB_ICONERROR
);
4182 if(g_Git
.GetOneFile(m_CurrentVersion
,*path
,filename
))
4184 out
.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED
, path
->GetGitPathString(), m_CurrentVersion
, filename
);
4185 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
4193 int CGitStatusListCtrl::RevertSelectedItemToVersion(bool parent
)
4195 if(this->m_CurrentVersion
.IsEmpty())
4197 if(this->m_CurrentVersion
== GIT_REV_ZERO
)
4200 POSITION pos
= GetFirstSelectedItemPosition();
4203 std::map
<CString
, int> versionMap
;
4204 while ((index
= GetNextSelectedItem(pos
)) >= 0)
4206 CTGitPath
*fentry
=(CTGitPath
*)GetItemData(index
);
4210 int parentNo
= fentry
->m_ParentNo
& PARENT_MASK
;
4212 ref
.Format(_T("%s^%d"), m_CurrentVersion
, parentNo
+ 1);
4214 if (g_Git
.GetHash(hash
, ref
))
4216 MessageBox(g_Git
.GetGitLastErr(_T("Could not get hash of ref \"") + ref
+ _T("\".")), _T("TortoiseGit"), MB_ICONERROR
);
4220 version
= hash
.ToString();
4223 version
= m_CurrentVersion
;
4225 cmd
.Format(_T("git.exe checkout %s -- \"%s\""), version
, fentry
->GetGitPathString());
4227 if (g_Git
.Run(cmd
, &out
, CP_UTF8
))
4229 if (MessageBox(out
, _T("TortoiseGit"), MB_ICONEXCLAMATION
| MB_OKCANCEL
) == IDCANCEL
)
4233 versionMap
[version
]++;
4237 for (auto it
= versionMap
.begin(); it
!= versionMap
.end(); ++it
)
4239 CString versionEntry
;
4240 versionEntry
.Format(IDS_STATUSLIST_FILESREVERTED
, it
->second
, it
->first
);
4241 out
+= versionEntry
+ _T("\r\n");
4243 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
4247 void CGitStatusListCtrl::OpenFile(CTGitPath
*filepath
,int mode
)
4250 if(this->m_CurrentVersion
.IsEmpty() || m_CurrentVersion
== GIT_REV_ZERO
)
4252 file
= g_Git
.m_CurrentDir
+ _T("\\") + filepath
->GetWinPath();
4257 GetTempPath(temppath
);
4258 TCHAR szTempName
[MAX_PATH
];
4259 GetTempFileName(temppath
, filepath
->GetBaseFilename(), 0, szTempName
);
4260 CString
temp(szTempName
);
4261 DeleteFile(szTempName
);
4262 CreateDirectory(szTempName
, NULL
);
4263 file
.Format(_T("%s\\%s_%s%s"),
4265 filepath
->GetBaseFilename(),
4266 m_CurrentVersion
.Left(g_Git
.GetShortHASHLength()),
4267 filepath
->GetFileExtension());
4269 if(g_Git
.GetOneFile(m_CurrentVersion
, *filepath
, file
))
4271 out
.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED
, filepath
->GetGitPathString(), m_CurrentVersion
, file
);
4272 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
4275 SetFileAttributes(file
, FILE_ATTRIBUTE_READONLY
);
4277 if(mode
== ALTERNATIVEEDITOR
)
4279 CAppUtils::LaunchAlternativeEditor(file
);
4282 int ret
= HINSTANCE_ERROR
;
4286 ret
= (int)ShellExecute(this->m_hWnd
, NULL
,file
, NULL
, NULL
, SW_SHOW
);
4288 if (ret
> HINSTANCE_ERROR
)
4295 CString cmd
= _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
4297 CAppUtils::LaunchApplication(cmd
, NULL
, false);