?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
pulled latest translations from Transifex
[TortoiseGit.git] / src / Git / GitStatusListCtrl.cpp
blob82fa1fb81d8b2ff407ff8c075078539772239af1
1 // TortoiseGit - a Windows shell extension for easy version control
2
3 // Copyright (C) 2008-2012 - TortoiseGit
4 // Copyright (C) 2003-2008 - TortoiseSVN
5 // Copyright (C) 2010-2012 Sven Strickroth <email@cs-ware.de>
6
7 // This program is free software; you can redistribute it and/or
8 // modify it under the terms of the GNU General Public License
9 // as published by the Free Software Foundation; either version 2
10 // of the License, or (at your option) any later version.
11
12 // This program is distributed in the hope that it will be useful,
13 // but WITHOUT ANY WARRANTY; without even the implied warranty of
14 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 // GNU General Public License for more details.
16
17 // You should have received a copy of the GNU General Public License
18 // along with this program; if not, write to the Free Software Foundation,
19 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
20 //
21
22 #include "StdAfx.h"
23 #include "resource.h"
24 #include "..\\TortoiseShell\resource.h"
25 #include "GitStatusListCtrl.h"
26 #include "MessageBox.h"
27 #include "MyMemDC.h"
28 #include "UnicodeUtils.h"
29 #include "AppUtils.h"
30 #include "PathUtils.h"
31 #include "TempFile.h"
32 #include "StringUtils.h"
33 #include "DirFileEnum.h"
34 #include "GitConfig.h"
35 //#include "SVNProperties.h"
36 #include "Git.h"
37 #include "GitDiff.h"
38 //#include "LogDlg.h"
39 //#include "SVNProgressDlg.h"
40 #include "SysImageList.h"
41 //#include "Svnstatuslistctrl.h"
42 #include "TGitPath.h"
43 #include "Registry.h"
44 #include "GitStatus.h"
45 //#include "SVNHelpers.h"
46 #include "InputDlg.h"
47 #include "ShellUpdater.h"
48 #include "GitAdminDir.h"
49 //#include "DropFiles.h"
50 #include "IconMenu.h"
51 //#include "AddDlg.h"
52 //#include "EditPropertiesDlg.h"
53 //#include "CreateChangelistDlg.h"
54 #include "FormatMessageWrapper.h"
55 #include "MassiveGitTask.h"
56
57 const UINT CGitStatusListCtrl::GITSLNM_ITEMCOUNTCHANGED
58 = ::RegisterWindowMessage(_T("GITSLNM_ITEMCOUNTCHANGED"));
59 const UINT CGitStatusListCtrl::GITSLNM_NEEDSREFRESH
60 = ::RegisterWindowMessage(_T("GITSLNM_NEEDSREFRESH"));
61 const UINT CGitStatusListCtrl::GITSLNM_ADDFILE
62 = ::RegisterWindowMessage(_T("GITSLNM_ADDFILE"));
63 const UINT CGitStatusListCtrl::GITSLNM_CHECKCHANGED
64 = ::RegisterWindowMessage(_T("GITSLNM_CHECKCHANGED"));
65 const UINT CGitStatusListCtrl::GITSLNM_ITEMCHANGED
66 = ::RegisterWindowMessage(_T("GITSLNM_ITEMCHANGED"));
67
68
69
70
71 BEGIN_MESSAGE_MAP(CGitStatusListCtrl, CListCtrl)
72 ON_NOTIFY(HDN_ITEMCLICKA, 0, OnHdnItemclick)
73 ON_NOTIFY(HDN_ITEMCLICKW, 0, OnHdnItemclick)
74 ON_NOTIFY(HDN_ENDTRACK, 0, OnColumnResized)
75 ON_NOTIFY(HDN_ENDDRAG, 0, OnColumnMoved)
76 ON_NOTIFY_REFLECT_EX(LVN_ITEMCHANGED, OnLvnItemchanged)
77 ON_WM_CONTEXTMENU()
78 ON_NOTIFY_REFLECT(NM_DBLCLK, OnNMDblclk)
79 ON_NOTIFY_REFLECT(LVN_GETINFOTIP, OnLvnGetInfoTip)
80 ON_NOTIFY_REFLECT(NM_CUSTOMDRAW, OnNMCustomdraw)
81 ON_WM_SETCURSOR()
82 ON_WM_GETDLGCODE()
83 ON_NOTIFY_REFLECT(NM_RETURN, OnNMReturn)
84 ON_WM_KEYDOWN()
85 ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTW, 0, 0xFFFF, OnToolTipText)
86 ON_NOTIFY_EX_RANGE(TTN_NEEDTEXTA, 0, 0xFFFF, OnToolTipText)
87 ON_WM_PAINT()
88 ON_NOTIFY(HDN_BEGINTRACKA, 0, &CGitStatusListCtrl::OnHdnBegintrack)
89 ON_NOTIFY(HDN_BEGINTRACKW, 0, &CGitStatusListCtrl::OnHdnBegintrack)
90 ON_NOTIFY(HDN_ITEMCHANGINGA, 0, &CGitStatusListCtrl::OnHdnItemchanging)
91 ON_NOTIFY(HDN_ITEMCHANGINGW, 0, &CGitStatusListCtrl::OnHdnItemchanging)
92 ON_WM_DESTROY()
93 ON_NOTIFY_REFLECT(LVN_BEGINDRAG, OnBeginDrag)
94 ON_NOTIFY_REFLECT(LVN_ITEMCHANGING, &CGitStatusListCtrl::OnLvnItemchanging)
95 END_MESSAGE_MAP()
96
97
98
99 CGitStatusListCtrl::CGitStatusListCtrl() : CListCtrl()
100 //, m_HeadRev(GitRev::REV_HEAD)
101 , m_pbCanceled(NULL)
102 , m_pStatLabel(NULL)
103 , m_pSelectButton(NULL)
104 , m_pConfirmButton(NULL)
105 , m_bBusy(false)
106 , m_bEmpty(false)
107 , m_bShowIgnores(false)
108 , m_pDropTarget(NULL)
109 , m_bIgnoreRemoveOnly(false)
110 , m_bCheckChildrenWithParent(false)
111 , m_bUnversionedLast(true)
112 , m_bHasChangeLists(false)
113 , m_bHasLocks(false)
114 , m_bBlock(false)
115 , m_bBlockUI(false)
116 , m_bHasCheckboxes(false)
117 , m_bCheckIfGroupsExist(true)
118 , m_bFileDropsEnabled(false)
119 , m_bOwnDrag(false)
120 , m_dwDefaultColumns(0)
121 , m_ColumnManager(this)
122 , m_bAscending(false)
123 , m_nSortedColumn(-1)
124 , m_bHasExternalsFromDifferentRepos(false)
125 , m_sNoPropValueText(MAKEINTRESOURCE(IDS_STATUSLIST_NOPROPVALUE))
126 , m_amend(false)
127 , m_bDoNotAutoselectSubmodules(false)
128 , m_bHasWC(true)
129 {
130 m_FileLoaded=0;
131 m_critSec.Init();
132 m_bIsRevertTheirMy = false;
133 this->m_nLineAdded =this->m_nLineDeleted =0;
134 }
135
136 CGitStatusListCtrl::~CGitStatusListCtrl()
137 {
138 // if (m_pDropTarget)
139 // delete m_pDropTarget;
140 ClearStatusArray();
141 }
142
143 void CGitStatusListCtrl::ClearStatusArray()
144 {
145 #if 0
146 Locker lock(m_critSec);
147 for (size_t i=0; i < m_arStatusArray.size(); i++)
148 {
149 delete m_arStatusArray[i];
150 }
151 m_arStatusArray.clear();
152 #endif
153 }
154 #if 0
155 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetListEntry(UINT_PTR index)
156 {
157
158 if (index >= (UINT_PTR)m_arListArray.size())
159 return NULL;
160 if (m_arListArray[index] >= m_arStatusArray.size())
161 return NULL;
162 return m_arStatusArray[m_arListArray[index]];
163
164 return NULL;
165 }
166 #endif
167 #if 0
168 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetVisibleListEntry(const CTGitPath& path)
169 {
170 int itemCount = GetItemCount();
171 for (int i=0; i < itemCount; i++)
172 {
173 FileEntry * entry = GetListEntry(i);
174 if (entry->GetPath().IsEquivalentTo(path))
175 return entry;
176 }
177 return NULL;
178 }
179 #endif
180 #if 0
181 CGitStatusListCtrl::FileEntry * CGitStatusListCtrl::GetListEntry(const CTGitPath& path)
182 {
183
184 for (size_t i=0; i < m_arStatusArray.size(); i++)
185 {
186 FileEntry * entry = m_arStatusArray[i];
187 if (entry->GetPath().IsEquivalentTo(path))
188 return entry;
189 }
190
191 return NULL;
192 }
193 #endif
194
195 #if 0
196 int CGitStatusListCtrl::GetIndex(const CTGitPath& path)
197 {
198 int itemCount = GetItemCount();
199 for (int i=0; i < itemCount; i++)
200 {
201 FileEntry * entry = GetListEntry(i);
202 if (entry->GetPath().IsEquivalentTo(path))
203 return i;
204 }
205 return -1;
206 }
207 #endif
208
209 void CGitStatusListCtrl::Init(DWORD dwColumns, const CString& sColumnInfoContainer, unsigned __int64 dwContextMenus /* = GitSLC_POPALL */, bool bHasCheckboxes /* = true */, bool bHasWC /* = true */)
210 {
211 Locker lock(m_critSec);
212
213 m_dwDefaultColumns = dwColumns | 1;
214 m_dwContextMenus = dwContextMenus;
215 m_bHasCheckboxes = bHasCheckboxes;
216 m_bHasWC = bHasWC;
217
218 // set the extended style of the listcontrol
219 // 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.
220 CRegDWORD regFullRowSelect(_T("Software\\TortoiseGit\\FullRowSelect"), TRUE);
221 DWORD exStyle = LVS_EX_HEADERDRAGDROP | LVS_EX_DOUBLEBUFFER | LVS_EX_INFOTIP | LVS_EX_SUBITEMIMAGES;
222 if (DWORD(regFullRowSelect))
223 exStyle |= LVS_EX_FULLROWSELECT;
224 exStyle |= (bHasCheckboxes ? LVS_EX_CHECKBOXES : 0);
225 SetRedraw(false);
226 SetExtendedStyle(exStyle);
227
228 SetWindowTheme(m_hWnd, L"Explorer", NULL);
229
230 m_nIconFolder = SYS_IMAGE_LIST().GetDirIconIndex();
231 m_nRestoreOvl = SYS_IMAGE_LIST().AddIcon((HICON)LoadImage(AfxGetResourceHandle(), MAKEINTRESOURCE(IDI_RESTOREOVL), IMAGE_ICON, 0, 0, LR_DEFAULTSIZE));
232 SYS_IMAGE_LIST().SetOverlayImage(m_nRestoreOvl, OVL_RESTORE);
233 SetImageList(&SYS_IMAGE_LIST(), LVSIL_SMALL);
234
235 // keep CSorter::operator() in sync!!
236 static UINT standardColumnNames[GITSLC_NUMCOLUMNS]
237 = { IDS_STATUSLIST_COLFILE
238 , IDS_STATUSLIST_COLFILENAME
239 , IDS_STATUSLIST_COLEXT
240 , IDS_STATUSLIST_COLSTATUS
241 , IDS_STATUSLIST_COLADD
242 , IDS_STATUSLIST_COLDEL
243 };
244
245 m_ColumnManager.SetNames(standardColumnNames,GITSLC_NUMCOLUMNS);
246 m_ColumnManager.ReadSettings (m_dwDefaultColumns, 0, sColumnInfoContainer, GITSLC_NUMCOLUMNS);
247
248 // enable file drops
249 #if 0
250 if (m_pDropTarget == NULL)
251 {
252 m_pDropTarget = new CGitStatusListCtrlDropTarget(this);
253 RegisterDragDrop(m_hWnd,m_pDropTarget);
254 // create the supported formats:
255 FORMATETC ftetc={0};
256 ftetc.dwAspect = DVASPECT_CONTENT;
257 ftetc.lindex = -1;
258 ftetc.tymed = TYMED_HGLOBAL;
259 ftetc.cfFormat=CF_HDROP;
260 m_pDropTarget->AddSuportedFormat(ftetc);
261 }
262 #endif
263
264 SetRedraw(true);
265 }
266
267 bool CGitStatusListCtrl::SetBackgroundImage(UINT nID)
268 {
269 return CAppUtils::SetListCtrlBackgroundImage(GetSafeHwnd(), nID);
270 }
271
272 BOOL CGitStatusListCtrl::GetStatus ( const CTGitPathList* pathList
273 , bool bUpdate /* = FALSE */
274 , bool bShowIgnores /* = false */
275 , bool bShowUnRev
276 , bool /*bShowUserProps*/ /* = false */)
277 {
278 Locker lock(m_critSec);
279 int mask= CGitStatusListCtrl::FILELIST_MODIFY;
280 if(bShowIgnores)
281 mask|= CGitStatusListCtrl::FILELIST_IGNORE;
282 if(bShowUnRev)
283 mask|= CGitStatusListCtrl::FILELIST_UNVER;
284 this->UpdateFileList(mask,bUpdate,(CTGitPathList*)pathList);
285
286
287 #if 0
288 int refetchcounter = 0;
289 BOOL bRet = TRUE;
290 Invalidate();
291 // force the cursor to change
292 POINT pt;
293 GetCursorPos(&pt);
294 SetCursorPos(pt.x, pt.y);
295
296 m_mapFilenameToChecked.clear();
297 //m_StatusUrlList.Clear();
298 bool bHasChangelists = (m_changelists.size()>1 || (m_changelists.size()>0 && !m_bHasIgnoreGroup));
299 m_changelists.clear();
300 for (size_t i=0; i < m_arStatusArray.size(); i++)
301 {
302 FileEntry * entry = m_arStatusArray[i];
303 if ( bHasChangelists && entry->checked)
304 {
305 // If change lists are present, remember all checked entries
306 CString path = entry->GetPath().GetGitPathString();
307 m_mapFilenameToChecked[path] = true;
308 }
309 if ( (entry->status==git_wc_status_unversioned || entry->status==git_wc_status_missing ) && entry->checked )
310 {
311 // The user manually selected an unversioned or missing file. We remember
312 // this so that the selection can be restored when refreshing.
313 CString path = entry->GetPath().GetGitPathString();
314 m_mapFilenameToChecked[path] = true;
315 }
316 else if ( entry->status > git_wc_status_normal && !entry->checked )
317 {
318 // The user manually deselected a versioned file. We remember
319 // this so that the deselection can be restored when refreshing.
320 CString path = entry->GetPath().GetGitPathString();
321 m_mapFilenameToChecked[path] = false;
322 }
323 }
324
325 // use a sorted path list to make sure we fetch the status of
326 // parent items first, *then* the child items (if any)
327 CTGitPathList sortedPathList = pathList;
328 sortedPathList.SortByPathname();
329 do
330 {
331 bRet = TRUE;
332 m_nTargetCount = 0;
333 m_bHasExternalsFromDifferentRepos = FALSE;
334 m_bHasExternals = FALSE;
335 m_bHasUnversionedItems = FALSE;
336 m_bHasLocks = false;
337 m_bHasChangeLists = false;
338 m_bShowIgnores = bShowIgnores;
339 m_nSortedColumn = 0;
340 m_bBlock = TRUE;
341 m_bBusy = true;
342 m_bEmpty = false;
343 Invalidate();
344
345 // first clear possible status data left from
346 // previous GetStatus() calls
347 ClearStatusArray();
348
349 m_StatusFileList = sortedPathList;
350
351 // Since Git_client_status() returns all files, even those in
352 // folders included with Git:externals we need to check if all
353 // files we get here belongs to the same repository.
354 // It is possible to commit changes in an external folder, as long
355 // as the folder belongs to the same repository (but another path),
356 // but it is not possible to commit all files if the externals are
357 // from a different repository.
358 //
359 // To check if all files belong to the same repository, we compare the
360 // UUID's - if they're identical then the files belong to the same
361 // repository and can be committed. But if they're different, then
362 // tell the user to commit all changes in the external folders
363 // first and exit.
364 CStringA sUUID; // holds the repo UUID
365 CTGitPathList arExtPaths; // list of Git:external paths
366
367 GitConfig config;
368
369 m_sURL.Empty();
370
371 m_nTargetCount = sortedPathList.GetCount();
372
373 GitStatus status(m_pbCanceled);
374 if(m_nTargetCount > 1 && sortedPathList.AreAllPathsFilesInOneDirectory())
375 {
376 // This is a special case, where we've been given a list of files
377 // all from one folder
378 // We handle them by setting a status filter, then requesting the Git status of
379 // all the files in the directory, filtering for the ones we're interested in
380 status.SetFilter(sortedPathList);
381
382 // if all selected entries are files, we don't do a recursive status
383 // fetching. But if only one is a directory, we have to recurse.
384 git_depth_t depth = git_depth_files;
385 // We have set a filter. If all selected items were files or we fetch
386 // the status not recursively, then we have to include
387 // ignored items too - the user has selected them
388 bool bShowIgnoresRight = true;
389 for (int fcindex=0; fcindex<sortedPathList.GetCount(); ++fcindex)
390 {
391 if (sortedPathList[fcindex].IsDirectory())
392 {
393 depth = git_depth_infinity;
394 bShowIgnoresRight = false;
395 break;
396 }
397 }
398 if(!FetchStatusForSingleTarget(config, status, sortedPathList.GetCommonDirectory(), bUpdate, sUUID, arExtPaths, true, depth, bShowIgnoresRight))
399 {
400 bRet = FALSE;
401 }
402 }
403 else
404 {
405 for(int nTarget = 0; nTarget < m_nTargetCount; nTarget++)
406 {
407 // check whether the path we want the status for is already fetched due to status-fetching
408 // of a parent path.
409 // this check is only done for file paths, because folder paths could be included already
410 // but not recursively
411 if (sortedPathList[nTarget].IsDirectory() || GetListEntry(sortedPathList[nTarget]) == NULL)
412 {
413 if(!FetchStatusForSingleTarget(config, status, sortedPathList[nTarget], bUpdate, sUUID,
414 arExtPaths, false, git_depth_infinity, bShowIgnores))
415 {
416 bRet = FALSE;
417 }
418 }
419 }
420 }
421
422 // remove the 'helper' files of conflicted items from the list.
423 // otherwise they would appear as unversioned files.
424 for (INT_PTR cind = 0; cind < m_ConflictFileList.GetCount(); ++cind)
425 {
426 for (size_t i=0; i < m_arStatusArray.size(); i++)
427 {
428 if (m_arStatusArray[i]->GetPath().IsEquivalentTo(m_ConflictFileList[cind]))
429 {
430 delete m_arStatusArray[i];
431 m_arStatusArray.erase(m_arStatusArray.begin()+i);
432 break;
433 }
434 }
435 }
436 refetchcounter++;
437 } while(!BuildStatistics() && (refetchcounter < 2) && (*m_pbCanceled==false));
438
439 if (bShowUserProps)
440 FetchUserProperties();
441
442 m_ColumnManager.UpdateUserPropList (m_arStatusArray);
443
444 m_bBlock = FALSE;
445 m_bBusy = false;
446 GetCursorPos(&pt);
447 SetCursorPos(pt.x, pt.y);
448 return bRet;
449 #endif
450 BuildStatistics();
451 return TRUE;
452 }
453
454 //
455 // Fetch all local properties for all elements in the status array
456 //
457 void CGitStatusListCtrl::FetchUserProperties()
458 {
459 #if 0
460 GitPool globalPool;
461
462 for (size_t i = 0, count = m_arStatusArray.size(); i < count; ++i)
463 {
464 // local / temp pool to hold parameters and props for a single item
465
466 GitPool localPool ((apr_pool_t*)globalPool);
467
468 // open working copy for this path
469
470 const char* path = m_arStatusArray[i]->path.GetGitApiPath (localPool);
471
472 Git_wc_adm_access_t *adm_access = NULL;
473 Git_error_t * error = Git_wc_adm_probe_open3 ( &adm_access
474 , NULL
475 , path
476 , FALSE // no write lock
477 , 0 // lock just the directory/file itself
478 , NULL
479 , NULL
480 , localPool);
481 if (error == NULL)
482 {
483 // get the props and add them to the status info
484
485 apr_hash_t* props = NULL;
486 Git_error_t * error = Git_wc_prop_list ( &props
487 , path
488 , adm_access
489 , localPool);
490 if (error == NULL)
491 {
492 for ( apr_hash_index_t *index
493 = apr_hash_first (localPool, props)
494 ; index != NULL
495 ; index = apr_hash_next (index))
496 {
497 // extract next entry from hash
498
499 const char* key = NULL;
500 ptrdiff_t keyLen;
501 const char** val = NULL;
502
503 apr_hash_this ( index
504 , reinterpret_cast<const void**>(&key)
505 , &keyLen
506 , reinterpret_cast<void**>(&val));
507
508 // decode / dispatch it
509
510 CString name = CUnicodeUtils::GetUnicode (key);
511 CString value = CUnicodeUtils::GetUnicode (*val);
512
513 // store in property container (truncate it after ~100 chars)
514
515 m_arStatusArray[i]->present_props[name]
516 = value.Left (GitSLC_MAXUSERPROPLENGTH);
517 }
518 }
519 error = Git_wc_adm_close2 (adm_access, localPool);
520 }
521 Git_error_clear (error);
522 }
523 #endif
524 }
525
526 // Get the show-flags bitmap value which corresponds to a particular Git status
527 DWORD CGitStatusListCtrl::GetShowFlagsFromGitStatus(git_wc_status_kind status)
528 {
529 switch (status)
530 {
531 case git_wc_status_none:
532 case git_wc_status_unversioned:
533 return GITSLC_SHOWUNVERSIONED;
534 case git_wc_status_ignored:
535 if (!m_bShowIgnores)
536 return GITSLC_SHOWDIRECTS;
537 return GITSLC_SHOWDIRECTS|GITSLC_SHOWIGNORED;
538 case git_wc_status_incomplete:
539 return GITSLC_SHOWINCOMPLETE;
540 case git_wc_status_normal:
541 return GITSLC_SHOWNORMAL;
542 case git_wc_status_external:
543 return GITSLC_SHOWEXTERNAL;
544 case git_wc_status_added:
545 return GITSLC_SHOWADDED;
546 case git_wc_status_missing:
547 return GITSLC_SHOWMISSING;
548 case git_wc_status_deleted:
549 return GITSLC_SHOWREMOVED;
550 case git_wc_status_replaced:
551 return GITSLC_SHOWREPLACED;
552 case git_wc_status_modified:
553 return GITSLC_SHOWMODIFIED;
554 case git_wc_status_merged:
555 return GITSLC_SHOWMERGED;
556 case git_wc_status_conflicted:
557 return GITSLC_SHOWCONFLICTED;
558 case git_wc_status_obstructed:
559 return GITSLC_SHOWOBSTRUCTED;
560 default:
561 // we should NEVER get here!
562 ASSERT(FALSE);
563 break;
564 }
565 return 0;
566 }
567
568 void CGitStatusListCtrl::Show(unsigned int dwShow, unsigned int dwCheck /*=0*/, bool /*bShowFolders*/ /* = true */,BOOL UpdateStatusList,bool UseStoredCheckStatus)
569 {
570 CWinApp * pApp = AfxGetApp();
571 if (pApp)
572 pApp->DoWaitCursor(1);
573
574 Locker lock(m_critSec);
575 WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
576
577 //SetItemCount(listIndex);
578 SetRedraw(FALSE);
579 DeleteAllItems();
580 m_nSelected = 0;
581
582 if(UpdateStatusList)
583 {
584 m_arStatusArray.clear();
585 for(int i=0;i<this->m_StatusFileList.GetCount();i++)
586 {
587 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
588 }
589
590 for(int i=0;i<this->m_UnRevFileList.GetCount();i++)
591 {
592 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
593 }
594
595 for(int i=0;i<this->m_IgnoreFileList.GetCount();i++)
596 {
597 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
598 }
599 }
600 PrepareGroups();
601 if (m_nSortedColumn >= 0)
602 {
603 CSorter predicate (&m_ColumnManager, m_nSortedColumn, m_bAscending);
604 std::sort(m_arStatusArray.begin(), m_arStatusArray.end(), predicate);
605 }
606
607 int index =0;
608 for(int i=0;i<this->m_arStatusArray.size();i++)
609 {
610 //set default checkbox status
611 CTGitPath* entry = ((CTGitPath*)m_arStatusArray[i]);
612 CString path = entry->GetGitPathString();
613 if (m_mapFilenameToChecked.size()!=0 && m_mapFilenameToChecked.find(path) != m_mapFilenameToChecked.end())
614 {
615 entry->m_Checked=m_mapFilenameToChecked[path];
616 }
617 else if (!UseStoredCheckStatus)
618 {
619 bool autoSelectSubmodules = !(entry->IsDirectory() && m_bDoNotAutoselectSubmodules);
620 if(entry->m_Action & dwCheck && autoSelectSubmodules)
621 entry->m_Checked=true;
622 else
623 entry->m_Checked=false;
624 }
625
626 if(entry->m_Action & dwShow)
627 {
628 AddEntry(entry,langID,index);
629 index++;
630 }
631 }
632
633 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
634 for (int col = 0; col <= maxcol; col++)
635 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
636
637 SetRedraw(TRUE);
638 GetStatisticsString();
639
640 CHeaderCtrl * pHeader = GetHeaderCtrl();
641 HDITEM HeaderItem = {0};
642 HeaderItem.mask = HDI_FORMAT;
643 for (int i=0; i<pHeader->GetItemCount(); ++i)
644 {
645 pHeader->GetItem(i, &HeaderItem);
646 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
647 pHeader->SetItem(i, &HeaderItem);
648 }
649 if (m_nSortedColumn >= 0)
650 {
651 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
652 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
653 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
654 }
655
656 #if 0
657 if (nSelectedEntry)
658 {
659 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
660 EnsureVisible(nSelectedEntry, false);
661 }
662 else
663 {
664 // Restore the item at the top of the list.
665 for (int i=0;GetTopIndex() != nTopIndex;i++)
666 {
667 if ( !EnsureVisible(nTopIndex+i,false) )
668 {
669 break;
670 }
671 }
672 }
673 #endif
674 if (pApp)
675 pApp->DoWaitCursor(-1);
676
677 Invalidate();
678
679 m_dwShow = dwShow;
680
681 this->BuildStatistics();
682
683 #if 0
684
685 CWinApp * pApp = AfxGetApp();
686 if (pApp)
687 pApp->DoWaitCursor(1);
688
689 m_bShowFolders = bShowFolders;
690
691 int nTopIndex = GetTopIndex();
692 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
693 int nSelectedEntry = 0;
694 if (posSelectedEntry)
695 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
696 SetRedraw(FALSE);
697 DeleteAllItems();
698
699 PrepareGroups();
700
701 m_arListArray.clear();
702
703 m_arListArray.reserve(m_arStatusArray.size());
704 SetItemCount (static_cast<int>(m_arStatusArray.size()));
705
706 int listIndex = 0;
707 for (size_t i=0; i < m_arStatusArray.size(); ++i)
708 {
709 FileEntry * entry = m_arStatusArray[i];
710 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
711 continue;
712 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
713 continue;
714 if (entry->IsFolder() && (!bShowFolders))
715 continue; // don't show folders if they're not wanted.
716
717 #if 0
718 git_wc_status_kind status = GitStatus::GetMoreImportant(entry->status, entry->remotestatus);
719 DWORD showFlags = GetShowFlagsFromGitStatus(status);
720 if (entry->IsLocked())
721 showFlags |= SVNSLC_SHOWLOCKS;
722 if (entry->switched)
723 showFlags |= SVNSLC_SHOWSWITCHED;
724 if (!entry->changelist.IsEmpty())
725 showFlags |= SVNSLC_SHOWINCHANGELIST;
726 #endif
727 bool bAllowCheck = ((entry->changelist.Compare(GITSLC_IGNORECHANGELIST) != 0)
728 && (m_bCheckIfGroupsExist || (m_changelists.size()==0 || (m_changelists.size()==1 && m_bHasIgnoreGroup))));
729
730 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
731 #if 0
732 if (status != Git_wc_status_ignored || (entry->direct) || (dwShow & GitSLC_SHOWIGNORED))
733 {
734 if ((!entry->IsFolder()) && (status == Git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
735 {
736 if (PathFileExists(entry->GetPath().GetWinPath()))
737 {
738 m_arListArray.push_back(i);
739 if ((dwCheck & SVNSLC_SHOWREMOVEDANDPRESENT)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
740 {
741 if (bAllowCheck)
742 entry->checked = true;
743 }
744 AddEntry(entry, langID, listIndex++);
745 }
746 }
747 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
748 {
749 m_arListArray.push_back(i);
750 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
751 {
752 if (bAllowCheck)
753 entry->checked = true;
754 }
755 AddEntry(entry, langID, listIndex++);
756 }
757 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
758 {
759 m_arListArray.push_back(i);
760 if ((dwCheck & showFlags)||((dwCheck & SVNSLC_SHOWDIRECTS)&&(entry->direct)))
761 {
762 if (bAllowCheck)
763 entry->checked = true;
764 }
765 AddEntry(entry, langID, listIndex++);
766 }
767 }
768 #endif
769 }
770
771 SetItemCount(listIndex);
772
773 m_ColumnManager.UpdateRelevance (m_arStatusArray, m_arListArray);
774
775 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
776 for (int col = 0; col <= maxcol; col++)
777 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
778
779 SetRedraw(TRUE);
780 GetStatisticsString();
781
782 CHeaderCtrl * pHeader = GetHeaderCtrl();
783 HDITEM HeaderItem = {0};
784 HeaderItem.mask = HDI_FORMAT;
785 for (int i=0; i<pHeader->GetItemCount(); ++i)
786 {
787 pHeader->GetItem(i, &HeaderItem);
788 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
789 pHeader->SetItem(i, &HeaderItem);
790 }
791 if (m_nSortedColumn)
792 {
793 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
794 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
795 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
796 }
797
798 if (nSelectedEntry)
799 {
800 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
801 EnsureVisible(nSelectedEntry, false);
802 }
803 else
804 {
805 // Restore the item at the top of the list.
806 for (int i=0;GetTopIndex() != nTopIndex;i++)
807 {
808 if ( !EnsureVisible(nTopIndex+i,false) )
809 {
810 break;
811 }
812 }
813 }
814
815 if (pApp)
816 pApp->DoWaitCursor(-1);
817
818 m_bEmpty = (GetItemCount() == 0);
819 Invalidate();
820 #endif
821
822 }
823
824 void CGitStatusListCtrl::Show(unsigned int /*dwShow*/, const CTGitPathList& checkedList, bool /*bShowFolders*/ /* = true */)
825 {
826 DeleteAllItems();
827 for(int i=0;i<checkedList.GetCount();i++)
828 this->AddEntry((CTGitPath *)&checkedList[i],0,i);
829 return ;
830 #if 0
831
832 Locker lock(m_critSec);
833 WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
834
835 CWinApp * pApp = AfxGetApp();
836 if (pApp)
837 pApp->DoWaitCursor(1);
838 m_dwShow = dwShow;
839 m_bShowFolders = bShowFolders;
840 m_nSelected = 0;
841 int nTopIndex = GetTopIndex();
842 POSITION posSelectedEntry = GetFirstSelectedItemPosition();
843 int nSelectedEntry = 0;
844 if (posSelectedEntry)
845 nSelectedEntry = GetNextSelectedItem(posSelectedEntry);
846 SetRedraw(FALSE);
847 DeleteAllItems();
848
849 PrepareGroups();
850
851 m_arListArray.clear();
852
853 m_arListArray.reserve(m_arStatusArray.size());
854 SetItemCount (static_cast<int>(m_arStatusArray.size()));
855
856 int listIndex = 0;
857 for (size_t i=0; i < m_arStatusArray.size(); ++i)
858 {
859 FileEntry * entry = m_arStatusArray[i];
860 if ((entry->inexternal) && (!(dwShow & SVNSLC_SHOWINEXTERNALS)))
861 continue;
862 if ((entry->differentrepo || entry->isNested) && (! (dwShow & SVNSLC_SHOWEXTERNALFROMDIFFERENTREPO)))
863 continue;
864 if (entry->IsFolder() && (!bShowFolders))
865 continue; // don't show folders if they're not wanted.
866 #if 0
867 git_wc_status_kind status = SVNStatus::GetMoreImportant(entry->status, entry->remotestatus);
868 DWORD showFlags = GetShowFlagsFromSVNStatus(status);
869 if (entry->IsLocked())
870 showFlags |= SVNSLC_SHOWLOCKS;
871 if (!entry->changelist.IsEmpty())
872 showFlags |= SVNSLC_SHOWINCHANGELIST;
873
874 // status_ignored is a special case - we must have the 'direct' flag set to add a status_ignored item
875 if (status != git_wc_status_ignored || (entry->direct) || (dwShow & SVNSLC_SHOWIGNORED))
876 {
877 for (int npath = 0; npath < checkedList.GetCount(); ++npath)
878 {
879 if (entry->GetPath().IsEquivalentTo(checkedList[npath]))
880 {
881 entry->checked = true;
882 break;
883 }
884 }
885 if ((!entry->IsFolder()) && (status == git_wc_status_deleted) && (dwShow & SVNSLC_SHOWREMOVEDANDPRESENT))
886 {
887 if (PathFileExists(entry->GetPath().GetWinPath()))
888 {
889 m_arListArray.push_back(i);
890 AddEntry(entry, langID, listIndex++);
891 }
892 }
893 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFILES)&&(entry->direct)&&(!entry->IsFolder())))
894 {
895 m_arListArray.push_back(i);
896 AddEntry(entry, langID, listIndex++);
897 }
898 else if ((dwShow & showFlags)||((dwShow & SVNSLC_SHOWDIRECTFOLDER)&&(entry->direct)&&entry->IsFolder()))
899 {
900 m_arListArray.push_back(i);
901 AddEntry(entry, langID, listIndex++);
902 }
903 else if (entry->switched)
904 {
905 m_arListArray.push_back(i);
906 AddEntry(entry, langID, listIndex++);
907 }
908 }
909 #endif
910 }
911
912 SetItemCount(listIndex);
913
914 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
915 for (int col = 0; col <= maxcol; col++)
916 SetColumnWidth (col, m_ColumnManager.GetWidth (col, true));
917
918 SetRedraw(TRUE);
919 GetStatisticsString();
920
921 CHeaderCtrl * pHeader = GetHeaderCtrl();
922 HDITEM HeaderItem = {0};
923 HeaderItem.mask = HDI_FORMAT;
924 for (int i=0; i<pHeader->GetItemCount(); ++i)
925 {
926 pHeader->GetItem(i, &HeaderItem);
927 HeaderItem.fmt &= ~(HDF_SORTDOWN | HDF_SORTUP);
928 pHeader->SetItem(i, &HeaderItem);
929 }
930 if (m_nSortedColumn)
931 {
932 pHeader->GetItem(m_nSortedColumn, &HeaderItem);
933 HeaderItem.fmt |= (m_bAscending ? HDF_SORTUP : HDF_SORTDOWN);
934 pHeader->SetItem(m_nSortedColumn, &HeaderItem);
935 }
936
937 if (nSelectedEntry)
938 {
939 SetItemState(nSelectedEntry, LVIS_SELECTED, LVIS_SELECTED);
940 EnsureVisible(nSelectedEntry, false);
941 }
942 else
943 {
944 // Restore the item at the top of the list.
945 for (int i=0;GetTopIndex() != nTopIndex;i++)
946 {
947 if ( !EnsureVisible(nTopIndex+i,false) )
948 {
949 break;
950 }
951 }
952 }
953
954 if (pApp)
955 pApp->DoWaitCursor(-1);
956
957 m_bEmpty = (GetItemCount() == 0);
958 Invalidate();
959 #endif
960
961 }
962 int CGitStatusListCtrl::GetColumnIndex(int mask)
963 {
964 int i=0;
965 for(i=0;i<32;i++)
966 if(mask&0x1)
967 return i;
968 else
969 mask=mask>>1;
970 return -1;
971 }
972 void CGitStatusListCtrl::AddEntry(CTGitPath * GitPath, WORD /*langID*/, int listIndex)
973 {
974 static CString from(MAKEINTRESOURCE(IDS_STATUSLIST_FROM));
975 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
976
977 CString path = GitPath->GetGitPathString();
978
979 m_bBlock = TRUE;
980 int index = listIndex;
981 int nCol = 1;
982 CString entryname = GitPath->GetGitPathString();
983 int icon_idx = 0;
984 if (GitPath->IsDirectory())
985 icon_idx = m_nIconFolder;
986 else
987 {
988 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(*GitPath);
989 }
990 if(GitPath->m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY) && !GitPath->GetGitOldPathString().IsEmpty())
991 {
992 // relative path
993 CString rename;
994 rename.Format(from, GitPath->GetGitOldPathString());
995 entryname += _T(" ") + rename;
996 }
997
998 InsertItem(index, entryname, icon_idx);
999 if (m_restorepaths.find(GitPath->GetWinPathString()) != m_restorepaths.end())
1000 SetItemState(index, INDEXTOOVERLAYMASK(OVL_RESTORE), TVIS_OVERLAYMASK);
1001
1002 this->SetItemData(index, (DWORD_PTR)GitPath);
1003 // SVNSLC_COLFILENAME
1004 SetItemText(index, nCol++, GitPath->GetFileOrDirectoryName());
1005 // SVNSLC_COLEXT
1006 SetItemText(index, nCol++, GitPath->GetFileExtension());
1007 // SVNSLC_COLSTATUS
1008 SetItemText(index, nCol++, GitPath->GetActionName());
1009
1010 SetItemText(index, GetColumnIndex(GITSLC_COLADD),GitPath->m_StatAdd);
1011 SetItemText(index, GetColumnIndex(GITSLC_COLDEL),GitPath->m_StatDel);
1012
1013
1014 SetCheck(index, GitPath->m_Checked);
1015 if (GitPath->m_Checked)
1016 m_nSelected++;
1017
1018
1019 if( GitPath->m_Action & CTGitPath::LOGACTIONS_IGNORE)
1020 SetItemGroup(index, 2);
1021 else if( GitPath->m_Action & CTGitPath::LOGACTIONS_UNVER)
1022 SetItemGroup(index,1);
1023 else
1024 {
1025 SetItemGroup(index, GitPath->m_ParentNo&(PARENT_MASK|MERGE_MASK));
1026 }
1027
1028 m_bBlock = FALSE;
1029
1030
1031 }
1032 #if 0
1033 void CGitStatusListCtrl::AddEntry(FileEntry * entry, WORD langID, int listIndex)
1034 {
1035 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
1036
1037 CString path = entry->GetPath().GetGitPathString();
1038 if ( m_mapFilenameToChecked.size()!=0 && m_mapFilenameToChecked.find(path) != m_mapFilenameToChecked.end() )
1039 {
1040 // The user manually de-/selected an item. We now restore this status
1041 // when refreshing.
1042 entry->checked = m_mapFilenameToChecked[path];
1043 }
1044
1045 m_bBlock = TRUE;
1046 TCHAR buf[100];
1047 int index = listIndex;
1048 int nCol = 1;
1049 CString entryname = entry->GetDisplayName();
1050 int icon_idx = 0;
1051 if (entry->isfolder)
1052 icon_idx = m_nIconFolder;
1053 else
1054 {
1055 icon_idx = SYS_IMAGE_LIST().GetPathIconIndex(entry->path);
1056 }
1057 // relative path
1058 InsertItem(index, entryname, icon_idx);
1059 // SVNSLC_COLFILENAME
1060 SetItemText(index, nCol++, entry->path.GetFileOrDirectoryName());
1061 // SVNSLC_COLEXT
1062 SetItemText(index, nCol++, entry->path.GetFileExtension());
1063 // SVNSLC_COLSTATUS
1064 if (entry->isNested)
1065 {
1066 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
1067 SetItemText(index, nCol++, sTemp);
1068 }
1069 else
1070 {
1071 GitStatus::GetStatusString(hResourceHandle, entry->status, buf, _countof(buf), (WORD)langID);
1072 if ((entry->copied)&&(_tcslen(buf)>1))
1073 _tcscat_s(buf, 100, _T(" (+)"));
1074 if ((entry->switched)&&(_tcslen(buf)>1))
1075 _tcscat_s(buf, 100, _T(" (s)"));
1076 SetItemText(index, nCol++, buf);
1077 }
1078 // SVNSLC_COLREMOTESTATUS
1079 if (entry->isNested)
1080 {
1081 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
1082 SetItemText(index, nCol++, sTemp);
1083 }
1084 else
1085 {
1086 #if 0
1087 SVNStatus::GetStatusString(hResourceHandle, entry->remotestatus, buf, _countof(buf), (WORD)langID);
1088 if ((entry->copied)&&(_tcslen(buf)>1))
1089 _tcscat_s(buf, 100, _T(" (+)"));
1090 if ((entry->switched)&&(_tcslen(buf)>1))
1091 _tcscat_s(buf, 100, _T(" (s)"));
1092 #endif
1093 SetItemText(index, nCol++, buf);
1094 }
1095 // SVNSLC_COLTEXTSTATUS
1096 if (entry->isNested)
1097 {
1098 CString sTemp(MAKEINTRESOURCE(IDS_STATUSLIST_NESTED));
1099 SetItemText(index, nCol++, sTemp);
1100 }
1101 else
1102 {
1103 #if 0
1104 SVNStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, _countof(buf), (WORD)langID);
1105 if ((entry->copied)&&(_tcslen(buf)>1))
1106 _tcscat_s(buf, 100, _T(" (+)"));
1107 if ((entry->switched)&&(_tcslen(buf)>1))
1108 _tcscat_s(buf, 100, _T(" (s)"));
1109 #endif
1110 SetItemText(index, nCol++, buf);
1111 }
1112 // SVNSLC_COLPROPSTATUS
1113 if (entry->isNested)
1114 {
1115 SetItemText(index, nCol++, _T(""));
1116 }
1117 else
1118 {
1119 #if 0
1120 SVNStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, _countof(buf), (WORD)langID);
1121 if ((entry->copied)&&(_tcslen(buf)>1))
1122 _tcscat_s(buf, 100, _T(" (+)"));
1123 if ((entry->switched)&&(_tcslen(buf)>1))
1124 _tcscat_s(buf, 100, _T(" (s)"));
1125 #endif
1126 SetItemText(index, nCol++, buf);
1127 }
1128 // SVNSLC_COLREMOTETEXT
1129 if (entry->isNested)
1130 {
1131 SetItemText(index, nCol++, _T(""));
1132 }
1133 else
1134 {
1135 #if 0
1136 SVNStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, _countof(buf), (WORD)langID);
1137 SetItemText(index, nCol++, buf);
1138 #endif
1139 }
1140 // SVNSLC_COLREMOTEPROP
1141 if (entry->isNested)
1142 {
1143 SetItemText(index, nCol++, _T(""));
1144 }
1145 else
1146 {
1147 // SVNStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, _countof(buf), (WORD)langID);
1148 SetItemText(index, nCol++, buf);
1149 }
1150 // SVNSLC_COLURL
1151 // SetItemText(index, nCol++, entry->url);
1152 // SVNSLC_COLLOCK
1153 #if 0
1154 if (!m_HeadRev.IsHead())
1155 {
1156 // we have contacted the repository
1157
1158 // decision-matrix
1159 // wc repository text
1160 // "" "" ""
1161 // "" UID1 owner
1162 // UID1 UID1 owner
1163 // UID1 "" lock has been broken
1164 // UID1 UID2 lock has been stolen
1165 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))
1166 {
1167 if (entry->lock_owner.IsEmpty())
1168 SetItemText(index, nCol++, entry->lock_remoteowner);
1169 else
1170 SetItemText(index, nCol++, entry->lock_owner);
1171 }
1172 else if (entry->lock_remotetoken.IsEmpty())
1173 {
1174 // broken lock
1175 CString temp(MAKEINTRESOURCE(IDS_STATUSLIST_LOCKBROKEN));
1176 SetItemText(index, nCol++, temp);
1177 }
1178 else
1179 {
1180 // stolen lock
1181 CString temp;
1182 temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);
1183 SetItemText(index, nCol++, temp);
1184 }
1185 }
1186 else
1187 SetItemText(index, nCol++, entry->lock_owner);
1188 // SVNSLC_COLLOCKCOMMENT
1189 SetItemText(index, nCol++, entry->lock_comment);
1190 // SVNSLC_COLAUTHOR
1191 SetItemText(index, nCol++, entry->last_commit_author);
1192 // SVNSLC_COLREVISION
1193 CString temp;
1194 temp.Format(_T("%ld"), entry->last_commit_rev);
1195 if (entry->last_commit_rev > 0)
1196 SetItemText(index, nCol++, temp);
1197 else
1198 SetItemText(index, nCol++, _T(""));
1199 // SVNSLC_COLREMOTEREVISION
1200 temp.Format(_T("%ld"), entry->remoterev);
1201 if (entry->remoterev > 0)
1202 SetItemText(index, nCol++, temp);
1203 else
1204 SetItemText(index, nCol++, _T(""));
1205 // SVNSLC_COLDATE
1206 TCHAR datebuf[SVN_DATE_BUFFER];
1207 apr_time_t date = entry->last_commit_date;
1208 SVN::formatDate(datebuf, date, true);
1209 if (date)
1210 SetItemText(index, nCol++, datebuf);
1211 else
1212 SetItemText(index, nCol++, _T(""));
1213 // SVNSLC_COLSVNNEEDSLOCK
1214 BOOL bFoundSVNNeedsLock = entry->present_props.IsNeedsLockSet();
1215 CString strSVNNeedsLock = (bFoundSVNNeedsLock) ? _T("*") : _T("");
1216 SetItemText(index, nCol++, strSVNNeedsLock);
1217 // SVNSLC_COLCOPYFROM
1218 if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)
1219 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());
1220 else
1221 temp = entry->copyfrom_url;
1222 SetItemText(index, nCol++, temp);
1223 // SVNSLC_COLMODIFICATIONDATE
1224 __int64 filetime = entry->GetPath().GetLastWriteTime();
1225 if ( (filetime) && (entry->status!=git_wc_status_deleted) )
1226 {
1227 FILETIME* f = (FILETIME*)(__int64*)&filetime;
1228 TCHAR datebuf[SVN_DATE_BUFFER];
1229 SVN::formatDate(datebuf,*f,true);
1230 SetItemText(index, nCol++, datebuf);
1231 }
1232 else
1233 {
1234 SetItemText(index, nCol++, _T(""));
1235 }
1236
1237 // user-defined properties
1238 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
1239 ; i < count
1240 ; ++i)
1241 {
1242 assert (i == nCol++);
1243 assert (m_ColumnManager.IsUserProp (i));
1244
1245 CString name = m_ColumnManager.GetName(i);
1246 if (entry->present_props.HasProperty (name))
1247 {
1248 const CString& propVal = entry->present_props [name];
1249 if (propVal.IsEmpty())
1250 SetItemText(index, i, m_sNoPropValueText);
1251 else
1252 SetItemText(index, i, propVal);
1253 }
1254 else
1255 SetItemText(index, i, _T(""));
1256 }
1257
1258 SetCheck(index, entry->checked);
1259 if (entry->checked)
1260 m_nSelected++;
1261 if (m_changelists.find(entry->changelist) != m_changelists.end())
1262 SetItemGroup(index, m_changelists[entry->changelist]);
1263 else
1264 SetItemGroup(index, 0);
1265 m_bBlock = FALSE;
1266 #endif
1267 }
1268 #endif
1269 bool CGitStatusListCtrl::SetItemGroup(int item, int groupindex)
1270 {
1271 // if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS) == NULL)
1272 // return false;
1273 if (groupindex < 0)
1274 return false;
1275 LVITEM i = {0};
1276 i.mask = LVIF_GROUPID;
1277 i.iItem = item;
1278 i.iSubItem = 0;
1279 i.iGroupId = groupindex;
1280
1281 return !!SetItem(&i);
1282 }
1283
1284 void CGitStatusListCtrl::OnHdnItemclick(NMHDR *pNMHDR, LRESULT *pResult)
1285 {
1286 LPNMHEADER phdr = reinterpret_cast<LPNMHEADER>(pNMHDR);
1287 *pResult = 0;
1288 if (m_bBlock)
1289 return;
1290 m_bBlock = TRUE;
1291 if (m_nSortedColumn == phdr->iItem)
1292 m_bAscending = !m_bAscending;
1293 else
1294 m_bAscending = TRUE;
1295 m_nSortedColumn = phdr->iItem;
1296 Show(m_dwShow, 0, m_bShowFolders,false,true);
1297
1298 m_bBlock = FALSE;
1299 }
1300
1301 void CGitStatusListCtrl::OnLvnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
1302 {
1303 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1304 *pResult = 0;
1305
1306 #define ISCHECKED(x) ((x) ? ((((x)&LVIS_STATEIMAGEMASK)>>12)-1) : FALSE)
1307 if ((m_bBlock)&&(m_bBlockUI))
1308 {
1309 // if we're blocked, prevent changing of the check state
1310 if ((!ISCHECKED(pNMLV->uOldState) && ISCHECKED(pNMLV->uNewState))||
1311 (ISCHECKED(pNMLV->uOldState) && !ISCHECKED(pNMLV->uNewState)))
1312 *pResult = TRUE;
1313 }
1314 }
1315
1316 BOOL CGitStatusListCtrl::OnLvnItemchanged(NMHDR *pNMHDR, LRESULT *pResult)
1317 {
1318 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
1319 *pResult = 0;
1320 CWnd* pParent = GetParent();
1321 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
1322 {
1323 pParent->SendMessage(GITSLNM_ITEMCHANGED, pNMLV->iItem);
1324 }
1325
1326 if ((pNMLV->uNewState==0)||(pNMLV->uNewState & LVIS_SELECTED)||(pNMLV->uNewState & LVIS_FOCUSED))
1327 return FALSE;
1328
1329 if (m_bBlock)
1330 return FALSE;
1331
1332 bool bSelected = !!(ListView_GetItemState(m_hWnd, pNMLV->iItem, LVIS_SELECTED) & LVIS_SELECTED);
1333 int nListItems = GetItemCount();
1334
1335 m_bBlock = TRUE;
1336 // was the item checked?
1337
1338 //CTGitPath *gitpath=(CTGitPath*)GetItemData(pNMLV->iItem);
1339 //gitpath->m_Checked=GetCheck(pNMLV->iItem);
1340
1341 if (GetCheck(pNMLV->iItem))
1342 {
1343 CheckEntry(pNMLV->iItem, nListItems);
1344 if (bSelected)
1345 {
1346 POSITION pos = GetFirstSelectedItemPosition();
1347 int index;
1348 while ((index = GetNextSelectedItem(pos)) >= 0)
1349 {
1350 if (index != pNMLV->iItem)
1351 CheckEntry(index, nListItems);
1352 }
1353 }
1354 }
1355 else
1356 {
1357 UncheckEntry(pNMLV->iItem, nListItems);
1358 if (bSelected)
1359 {
1360 POSITION pos = GetFirstSelectedItemPosition();
1361 int index;
1362 while ((index = GetNextSelectedItem(pos)) >= 0)
1363 {
1364 if (index != pNMLV->iItem)
1365 UncheckEntry(index, nListItems);
1366 }
1367 }
1368 }
1369
1370 GetStatisticsString();
1371 m_bBlock = FALSE;
1372 NotifyCheck();
1373
1374 return FALSE;
1375 }
1376
1377 void CGitStatusListCtrl::OnColumnResized(NMHDR *pNMHDR, LRESULT *pResult)
1378 {
1379 m_ColumnManager.OnColumnResized(pNMHDR,pResult);
1380
1381 *pResult = FALSE;
1382 }
1383
1384 void CGitStatusListCtrl::OnColumnMoved(NMHDR *pNMHDR, LRESULT *pResult)
1385 {
1386 m_ColumnManager.OnColumnMoved(pNMHDR, pResult);
1387
1388 Invalidate(FALSE);
1389 }
1390
1391 void CGitStatusListCtrl::CheckEntry(int index, int /*nListItems*/)
1392 {
1393 Locker lock(m_critSec);
1394 //FileEntry * entry = GetListEntry(index);
1395 CTGitPath *path=(CTGitPath*)GetItemData(index);
1396 ASSERT(path != NULL);
1397 if (path == NULL)
1398 return;
1399 m_mapFilenameToChecked[path->GetGitPathString()] = true;
1400 SetCheck(index, TRUE);
1401 //entry = GetListEntry(index);
1402 // if an unversioned item was checked, then we need to check if
1403 // the parent folders are unversioned too. If the parent folders actually
1404 // are unversioned, then check those too.
1405 #if 0
1406 if (entry->status == git_wc_status_unversioned)
1407 {
1408 // we need to check the parent folder too
1409 const CTGitPath& folderpath = entry->path;
1410 for (int i=0; i< nListItems; ++i)
1411 {
1412 FileEntry * testEntry = GetListEntry(i);
1413 ASSERT(testEntry != NULL);
1414 if (testEntry == NULL)
1415 continue;
1416 if (!testEntry->checked)
1417 {
1418 if (testEntry->path.IsAncestorOf(folderpath) && (!testEntry->path.IsEquivalentTo(folderpath)))
1419 {
1420 SetEntryCheck(testEntry,i,true);
1421 m_nSelected++;
1422 }
1423 }
1424 }
1425 }
1426 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1427 if ( (entry->status == git_wc_status_deleted) || (m_bCheckChildrenWithParent) || (bShift) )
1428 {
1429 // if a deleted folder gets checked, we have to check all
1430 // children of that folder too.
1431 if (entry->path.IsDirectory())
1432 {
1433 SetCheckOnAllDescendentsOf(entry, true);
1434 }
1435
1436 // if a deleted file or folder gets checked, we have to
1437 // check all parents of this item too.
1438 for (int i=0; i<nListItems; ++i)
1439 {
1440 FileEntry * testEntry = GetListEntry(i);
1441 ASSERT(testEntry != NULL);
1442 if (testEntry == NULL)
1443 continue;
1444 if (!testEntry->checked)
1445 {
1446 if (testEntry->path.IsAncestorOf(entry->path) && (!testEntry->path.IsEquivalentTo(entry->path)))
1447 {
1448 if ((testEntry->status == git_wc_status_deleted)||(m_bCheckChildrenWithParent))
1449 {
1450 SetEntryCheck(testEntry,i,true);
1451 m_nSelected++;
1452 // now we need to check all children of this parent folder
1453 SetCheckOnAllDescendentsOf(testEntry, true);
1454 }
1455 }
1456 }
1457 }
1458 }
1459 #endif
1460 if ( !path->m_Checked )
1461 {
1462 path->m_Checked = TRUE;
1463 m_nSelected++;
1464 }
1465 }
1466
1467 void CGitStatusListCtrl::UncheckEntry(int index, int /*nListItems*/)
1468 {
1469 Locker lock(m_critSec);
1470 CTGitPath *path=(CTGitPath*)GetItemData(index);
1471 ASSERT(path != NULL);
1472 if (path == NULL)
1473 return;
1474 SetCheck(index, FALSE);
1475 m_mapFilenameToChecked[path->GetGitPathString()] = false;
1476 //entry = GetListEntry(index);
1477 // item was unchecked
1478 #if 0
1479 if (entry->path.IsDirectory())
1480 {
1481 // disable all files within an unselected folder, except when unchecking a folder with property changes
1482 bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1483 if ( (entry->status != git_wc_status_modified) || (bShift) )
1484 {
1485 SetCheckOnAllDescendentsOf(entry, false);
1486 }
1487 }
1488 else if (entry->status == git_wc_status_deleted)
1489 {
1490 // a "deleted" file was unchecked, so uncheck all parent folders
1491 // and all children of those parents
1492 for (int i=0; i<nListItems; i++)
1493 {
1494 FileEntry * testEntry = GetListEntry(i);
1495 ASSERT(testEntry != NULL);
1496 if (testEntry == NULL)
1497 continue;
1498 if (testEntry->checked)
1499 {
1500 if (testEntry->path.IsAncestorOf(entry->path))
1501 {
1502 if (testEntry->status == git_wc_status_deleted)
1503 {
1504 SetEntryCheck(testEntry,i,false);
1505 m_nSelected--;
1506
1507 SetCheckOnAllDescendentsOf(testEntry, false);
1508 }
1509 }
1510 }
1511 }
1512 }
1513 #endif
1514 if ( path->m_Checked )
1515 {
1516 path->m_Checked = FALSE;
1517 m_nSelected--;
1518 }
1519 }
1520 #if 0
1521 bool CGitStatusListCtrl::EntryPathCompareNoCase(const FileEntry* pEntry1, const FileEntry* pEntry2)
1522 {
1523 return pEntry1->path < pEntry2->path;
1524 }
1525
1526 bool CGitStatusListCtrl::IsEntryVersioned(const FileEntry* pEntry1)
1527 {
1528 return pEntry1->status != git_wc_status_unversioned;
1529 }
1530 #endif
1531 bool CGitStatusListCtrl::BuildStatistics()
1532 {
1533
1534 bool bRefetchStatus = false;
1535
1536 // now gather some statistics
1537 m_nUnversioned = 0;
1538 m_nNormal = 0;
1539 m_nModified = 0;
1540 m_nAdded = 0;
1541 m_nDeleted = 0;
1542 m_nConflicted = 0;
1543 m_nTotal = 0;
1544 m_nSelected = 0;
1545 m_nLineAdded = 0;
1546 m_nLineDeleted = 0;
1547 m_nRenamed = 0;
1548
1549 for (int i=0; i < (int)m_arStatusArray.size(); ++i)
1550 {
1551 int status=((CTGitPath*)m_arStatusArray[i])->m_Action;
1552
1553 m_nLineAdded += _tstol(((CTGitPath*)m_arStatusArray[i])->m_StatAdd);
1554 m_nLineDeleted += _tstol(((CTGitPath*)m_arStatusArray[i])->m_StatDel);
1555
1556 if(status&(CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))
1557 m_nAdded++;
1558
1559 if(status&CTGitPath::LOGACTIONS_DELETED)
1560 m_nDeleted++;
1561
1562 if(status&(CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_MODIFIED))
1563 m_nModified++;
1564
1565 if(status&CTGitPath::LOGACTIONS_UNMERGED)
1566 m_nConflicted++;
1567
1568 if(status&(CTGitPath::LOGACTIONS_IGNORE|CTGitPath::LOGACTIONS_UNVER))
1569 m_nUnversioned++;
1570
1571 if(status&(CTGitPath::LOGACTIONS_REPLACED))
1572 m_nRenamed++;
1573
1574 if(((CTGitPath*)m_arStatusArray[i])->m_Checked)
1575 m_nSelected++;
1576
1577 // } // switch (entry->status)
1578 // } // if (entry)
1579 } // for (int i=0; i < (int)m_arStatusArray.size(); ++i)
1580 return !bRefetchStatus;
1581
1582 return FALSE;
1583 }
1584
1585
1586 int CGitStatusListCtrl::GetGroupFromPoint(POINT * ppt)
1587 {
1588 // the point must be relative to the upper left corner of the control
1589
1590 if (ppt == NULL)
1591 return -1;
1592 if (!IsGroupViewEnabled())
1593 return -1;
1594
1595 POINT pt = *ppt;
1596 pt.x = 10;
1597 UINT flags = 0;
1598 int nItem = -1;
1599 RECT rc;
1600 GetWindowRect(&rc);
1601 while (((flags & LVHT_BELOW) == 0)&&(pt.y < rc.bottom))
1602 {
1603 nItem = HitTest(pt, &flags);
1604 if ((flags & LVHT_ONITEM)||(flags & LVHT_EX_GROUP_HEADER))
1605 {
1606 // the first item below the point
1607
1608 // check if the point is too much right (i.e. if the point
1609 // is farther to the right than the width of the item)
1610 RECT r;
1611 GetItemRect(nItem, &r, LVIR_LABEL);
1612 if (ppt->x > r.right)
1613 return -1;
1614
1615 LVITEM lv = {0};
1616 lv.mask = LVIF_GROUPID;
1617 lv.iItem = nItem;
1618 GetItem(&lv);
1619 int groupID = lv.iGroupId;
1620 // now we search upwards and check if the item above this one
1621 // belongs to another group. If it belongs to the same group,
1622 // we're not over a group header
1623 while (pt.y >= 0)
1624 {
1625 pt.y -= 2;
1626 nItem = HitTest(pt, &flags);
1627 if ((flags & LVHT_ONITEM)&&(nItem >= 0))
1628 {
1629 // the first item below the point
1630 LVITEM lv = {0};
1631 lv.mask = LVIF_GROUPID;
1632 lv.iItem = nItem;
1633 GetItem(&lv);
1634 if (lv.iGroupId != groupID)
1635 return groupID;
1636 else
1637 return -1;
1638 }
1639 }
1640 if (pt.y < 0)
1641 return groupID;
1642 return -1;
1643 }
1644 pt.y += 2;
1645 };
1646 return -1;
1647 }
1648
1649 void CGitStatusListCtrl::OnContextMenuGroup(CWnd * /*pWnd*/, CPoint point)
1650 {
1651 POINT clientpoint = point;
1652 ScreenToClient(&clientpoint);
1653 if ((IsGroupViewEnabled())&&(GetGroupFromPoint(&clientpoint) >= 0))
1654 {
1655 CMenu popup;
1656 if (popup.CreatePopupMenu())
1657 {
1658 CString temp;
1659 temp.LoadString(IDS_STATUSLIST_CHECKGROUP);
1660 popup.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_CHECKGROUP, temp);
1661 temp.LoadString(IDS_STATUSLIST_UNCHECKGROUP);
1662 popup.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_UNCHECKGROUP, temp);
1663 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
1664 bool bCheck = false;
1665 switch (cmd)
1666 {
1667 case IDGITLC_CHECKGROUP:
1668 bCheck = true;
1669 // fall through here
1670 case IDGITLC_UNCHECKGROUP:
1671 {
1672 int group = GetGroupFromPoint(&clientpoint);
1673 // go through all items and check/uncheck those assigned to the group
1674 // but block the OnLvnItemChanged handler
1675 m_bBlock = true;
1676 LVITEM lv;
1677 for (int i=0; i<GetItemCount(); ++i)
1678 {
1679 SecureZeroMemory(&lv, sizeof(LVITEM));
1680 lv.mask = LVIF_GROUPID;
1681 lv.iItem = i;
1682 GetItem(&lv);
1683
1684 if (lv.iGroupId == group)
1685 {
1686 CTGitPath * entry = (CTGitPath*)GetItemData(i);
1687 if (entry)
1688 {
1689 bool bOldCheck = entry->m_Checked;
1690 SetEntryCheck(entry, i, bCheck);
1691 if (bCheck != bOldCheck)
1692 {
1693 if (bCheck)
1694 m_nSelected++;
1695 else
1696 m_nSelected--;
1697 }
1698 }
1699 }
1700
1701 }
1702 GetStatisticsString();
1703 NotifyCheck();
1704 m_bBlock = false;
1705 }
1706 break;
1707 }
1708 }
1709 }
1710 }
1711
1712 void CGitStatusListCtrl::OnContextMenuList(CWnd * pWnd, CPoint point)
1713 {
1714
1715 //WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
1716
1717 //bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1718 CTGitPath * filepath;
1719
1720 int selIndex = GetSelectionMark();
1721 if ((point.x == -1) && (point.y == -1))
1722 {
1723 CRect rect;
1724 GetItemRect(selIndex, &rect, LVIR_LABEL);
1725 ClientToScreen(&rect);
1726 point = rect.CenterPoint();
1727 }
1728 if ((GetSelectedCount() == 0) && (m_bHasCheckboxes))
1729 {
1730 // nothing selected could mean the context menu is requested for
1731 // a group header
1732 OnContextMenuGroup(pWnd, point);
1733 }
1734 else if (selIndex >= 0)
1735 {
1736 //FileEntry * entry = GetListEntry(selIndex);
1737
1738 filepath = (CTGitPath * )GetItemData(selIndex);
1739
1740 ASSERT(filepath != NULL);
1741 if (filepath == NULL)
1742 return;
1743
1744 //const CTGitPath& filepath = entry->path;
1745 int wcStatus = filepath->m_Action;
1746 // entry is selected, now show the popup menu
1747 Locker lock(m_critSec);
1748 CIconMenu popup;
1749 CMenu changelistSubMenu;
1750 CMenu ignoreSubMenu;
1751 if (popup.CreatePopupMenu())
1752 {
1753 //Add Menu for version controlled file
1754
1755 if (GetSelectedCount() > 0 && wcStatus & CTGitPath::LOGACTIONS_UNMERGED)
1756 {
1757 if (GetSelectedCount() == 1 && (m_dwContextMenus & GITSLC_POPCONFLICT)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1758 {
1759 popup.AppendMenuIcon(IDGITLC_EDITCONFLICT, IDS_MENUCONFLICT, IDI_CONFLICT);
1760 }
1761 if (m_dwContextMenus & GITSLC_POPRESOLVE)
1762 {
1763 popup.AppendMenuIcon(IDGITLC_RESOLVECONFLICT, IDS_STATUSLIST_CONTEXT_RESOLVED, IDI_RESOLVE);
1764 }
1765 if ((m_dwContextMenus & GITSLC_POPRESOLVE)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1766 {
1767 popup.AppendMenuIcon(IDGITLC_RESOLVETHEIRS, IDS_SVNPROGRESS_MENUUSETHEIRS, IDI_RESOLVE);
1768 popup.AppendMenuIcon(IDGITLC_RESOLVEMINE, IDS_SVNPROGRESS_MENUUSEMINE, IDI_RESOLVE);
1769 }
1770 if ((m_dwContextMenus & GITSLC_POPCONFLICT)||(m_dwContextMenus & GITSLC_POPRESOLVE))
1771 popup.AppendMenu(MF_SEPARATOR);
1772 }
1773
1774 if (GetSelectedCount() > 0)
1775 {
1776 if (wcStatus & CTGitPath::LOGACTIONS_UNVER)
1777 if (m_dwContextMenus & GITSLC_POPADD)
1778 {
1779 //if ( entry->IsFolder() )
1780 //{
1781 // popup.AppendMenuIcon(IDSVNLC_ADD_RECURSIVE, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE, IDI_ADD);
1782 //}
1783 //else
1784 {
1785 popup.AppendMenuIcon(IDGITLC_ADD, IDS_STATUSLIST_CONTEXT_ADD, IDI_ADD);
1786 }
1787 }
1788 }
1789
1790 if (!(wcStatus &CTGitPath::LOGACTIONS_UNVER))
1791 {
1792 if ( (m_dwContextMenus & GITSLC_POPCOMPAREWITHBASE) && GetSelectedCount()>0)
1793 {
1794 if(filepath->m_ParentNo & MERGE_MASK)
1795 popup.AppendMenuIcon(IDGITLC_COMPARE, IDS_TREE_DIFF, IDI_DIFF);
1796 else
1797 popup.AppendMenuIcon(IDGITLC_COMPARE, IDS_LOG_COMPAREWITHBASE, IDI_DIFF);
1798
1799 popup.SetDefaultItem(IDGITLC_COMPARE, FALSE);
1800 }
1801
1802 if ((m_dwContextMenus & this->GetContextMenuBit(IDGITLC_COMPAREWC)) && GetSelectedCount()>0 && m_bHasWC)
1803 {
1804 if( (!m_CurrentVersion.IsEmpty()) && m_CurrentVersion != GIT_REV_ZERO)
1805 popup.AppendMenuIcon(IDGITLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
1806 }
1807 //Select one items
1808 if (GetSelectedCount() == 1)
1809 {
1810 bool bEntryAdded = false;
1811 //if (entry->remotestatus <= git_wc_status_normal)
1812 //{
1813 // if (wcStatus > git_wc_status_normal)
1814 // {
1815 // if ((m_dwContextMenus & SVNSLC_POPGNUDIFF)&&(wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing))
1816 // {
1817 if(!g_Git.IsInitRepos() && (m_dwContextMenus&GITSLC_POPGNUDIFF))
1818 {
1819 popup.AppendMenuIcon(IDGITLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1820
1821 bEntryAdded = true;
1822 }
1823 // }
1824 // }
1825 //
1826 //}
1827 //else if (wcStatus != git_wc_status_deleted)
1828 //{
1829 // if (m_dwContextMenus & SVNSLC_POPCOMPARE)
1830 // {
1831 // popup.AppendMenuIcon(IDSVNLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
1832 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
1833 // bEntryAdded = true;
1834 // }
1835 // if (m_dwContextMenus & SVNSLC_POPGNUDIFF)
1836 // {
1837 // popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1838 // bEntryAdded = true;
1839 // }
1840 //}
1841 if (bEntryAdded)
1842 popup.AppendMenu(MF_SEPARATOR);
1843 }
1844 //else if (GetSelectedCount() > 1)
1845 //{
1846 // if (m_dwContextMenus & SVNSLC_POPCOMMIT)
1847 // {
1848 // popup.AppendMenuIcon(IDSVNLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);
1849 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
1850 // }
1851 //}
1852 }
1853
1854 if( (!this->m_Rev1.IsEmpty()) || (!this->m_Rev1.IsEmpty()) )
1855 {
1856 if(GetSelectedCount() == 1)
1857 {
1858 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_COMPARETWO))
1859 {
1860 popup.AppendMenuIcon(IDGITLC_COMPARETWO, IDS_LOG_POPUP_COMPARETWO, IDI_DIFF);
1861 popup.SetDefaultItem(IDGITLC_COMPARETWO, FALSE);
1862 }
1863 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_GNUDIFF2))
1864 {
1865 popup.AppendMenuIcon(IDGITLC_GNUDIFF2, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1866 }
1867 }
1868 }
1869
1870 //Select Multi item
1871 if (GetSelectedCount() > 0)
1872 {
1873 if ((GetSelectedCount() == 2) && (m_dwContextMenus & this->GetContextMenuBit(GITSLC_POPCOMPARETWOFILES)) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO))
1874 {
1875 POSITION pos = GetFirstSelectedItemPosition();
1876 int index = GetNextSelectedItem(pos);
1877 if (index >= 0)
1878 {
1879 CTGitPath * entry2 = NULL;
1880 bool bothItemsAreExistingFiles = true;
1881 entry2 = (CTGitPath * )GetItemData(index);
1882 if (entry2)
1883 bothItemsAreExistingFiles = !entry2->IsDirectory() && entry2->Exists();
1884 index = GetNextSelectedItem(pos);
1885 if (index >= 0)
1886 {
1887 entry2 = (CTGitPath * )GetItemData(index);
1888 if (entry2)
1889 bothItemsAreExistingFiles = bothItemsAreExistingFiles && !entry2->IsDirectory() && entry2->Exists();
1890 if (bothItemsAreExistingFiles)
1891 popup.AppendMenuIcon(IDGITLC_COMPARETWOFILES, IDS_STATUSLIST_CONTEXT_COMPARETWOFILES, IDI_DIFF);
1892 }
1893 }
1894 }
1895 // if ((GetSelectedCount() == 2)&&(m_dwContextMenus & SVNSLC_POPREPAIRMOVE))
1896 // {
1897 // POSITION pos = GetFirstSelectedItemPosition();
1898 // int index = GetNextSelectedItem(pos);
1899 // if (index >= 0)
1900 // {
1901 // FileEntry * entry = GetListEntry(index);
1902 // git_wc_status_kind status1 = git_wc_status_none;
1903 // git_wc_status_kind status2 = git_wc_status_none;
1904 // if (entry)
1905 // status1 = entry->status;
1906 // index = GetNextSelectedItem(pos);
1907 // if (index >= 0)
1908 // {
1909 // entry = GetListEntry(index);
1910 // if (entry)
1911 // status2 = entry->status;
1912 // if ((status1 == git_wc_status_missing && status2 == git_wc_status_unversioned) ||
1913 // (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned))
1914 // {
1915 // popup.AppendMenuIcon(IDSVNLC_REPAIRMOVE, IDS_STATUSLIST_CONTEXT_REPAIRMOVE);
1916 // }
1917 // }
1918 // }
1919 // }
1920 // if (wcStatus > git_wc_status_normal)
1921 // {
1922 // if (m_dwContextMenus & SVNSLC_POPREVERT)
1923 // {
1924 // // reverting missing folders is not possible
1925 // if (!entry->IsFolder() || (wcStatus != git_wc_status_missing))
1926 // {
1927 // popup.AppendMenuIcon(IDSVNLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
1928 // }
1929 // }
1930 // }
1931 // if (entry->remotestatus > git_wc_status_normal)
1932 // {
1933 // if (m_dwContextMenus & SVNSLC_POPUPDATE)
1934 // {
1935 // popup.AppendMenuIcon(IDSVNLC_UPDATE, IDS_MENUUPDATE, IDI_UPDATE);
1936 // }
1937 // }
1938 }
1939
1940 if ( (GetSelectedCount() >0 ) && (!(wcStatus & CTGitPath::LOGACTIONS_UNVER)) && m_bHasWC)
1941 {
1942 if ((m_dwContextMenus & GITSLC_POPREVERT) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO))
1943 {
1944 popup.AppendMenuIcon(IDGITLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
1945 }
1946
1947 if (m_dwContextMenus & GITSLC_POPRESTORE && !filepath->IsDirectory())
1948 {
1949 if (m_restorepaths.find(filepath->GetWinPathString()) == m_restorepaths.end())
1950 popup.AppendMenuIcon(IDGITLC_CREATERESTORE, IDS_MENUCREATERESTORE, IDI_RESTORE);
1951 else
1952 popup.AppendMenuIcon(IDGITLC_RESTOREPATH, IDS_MENURESTORE, IDI_RESTORE);
1953 }
1954
1955 if ((m_dwContextMenus & GetContextMenuBit(IDGITLC_REVERTTOREV)) && ( !this->m_CurrentVersion.IsEmpty() )
1956 && this->m_CurrentVersion != GIT_REV_ZERO && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1957 {
1958 popup.AppendMenuIcon(IDGITLC_REVERTTOREV, IDS_LOG_POPUP_REVERTTOREV, IDI_REVERT);
1959 }
1960 }
1961
1962 if ((GetSelectedCount() == 1)&&(!(wcStatus & CTGitPath::LOGACTIONS_UNVER))
1963 &&(!(wcStatus & CTGitPath::LOGACTIONS_IGNORE)))
1964 {
1965 if (m_dwContextMenus & GITSLC_POPSHOWLOG)
1966 {
1967 popup.AppendMenuIcon(IDGITLC_LOG, IDS_REPOBROWSE_SHOWLOG, IDI_LOG);
1968 }
1969 if (m_dwContextMenus & GITSLC_POPSHOWLOGOLDNAME && (wcStatus & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY) && !filepath->GetGitOldPathString().IsEmpty()))
1970 {
1971 popup.AppendMenuIcon(IDGITLC_LOGOLDNAME, IDS_STATUSLIST_SHOWLOGOLDNAME, IDI_LOG);
1972 }
1973 if (m_dwContextMenus & GITSLC_POPBLAME && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED) && m_bHasWC)
1974 {
1975 popup.AppendMenuIcon(IDGITLC_BLAME, IDS_MENUBLAME, IDI_BLAME);
1976 }
1977 }
1978 // if ((wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing) && (GetSelectedCount() == 1))
1979 if ( (GetSelectedCount() == 1) )
1980 {
1981 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_SAVEAS) && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1982 {
1983 popup.AppendMenuIcon(IDGITLC_SAVEAS, IDS_LOG_POPUP_SAVE, IDI_SAVEAS);
1984 }
1985
1986 if (m_dwContextMenus & GITSLC_POPOPEN && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1987 {
1988 popup.AppendMenuIcon(IDGITLC_VIEWREV, IDS_LOG_POPUP_VIEWREV);
1989 popup.AppendMenuIcon(IDGITLC_OPEN, IDS_REPOBROWSE_OPEN, IDI_OPEN);
1990 popup.AppendMenuIcon(IDGITLC_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
1991 if (wcStatus &CTGitPath::LOGACTIONS_UNVER) {
1992 popup.SetDefaultItem(IDGITLC_OPEN, FALSE);
1993 }
1994 }
1995
1996 if (m_dwContextMenus & GITSLC_POPEXPLORE && !(wcStatus & CTGitPath::LOGACTIONS_DELETED) && m_bHasWC)
1997 {
1998 popup.AppendMenuIcon(IDGITLC_EXPLORE, IDS_STATUSLIST_CONTEXT_EXPLORE, IDI_EXPLORER);
1999 }
2000
2001 }
2002 if (GetSelectedCount() > 0)
2003 {
2004 // if (((wcStatus == git_wc_status_unversioned)||(wcStatus == git_wc_status_ignored))&&(m_dwContextMenus & SVNSLC_POPDELETE))
2005 // {
2006 // popup.AppendMenuIcon(IDSVNLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
2007 // }
2008 // 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))
2009 // {
2010 // if (bShift)
2011 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVEKEEP, IDI_DELETE);
2012 // else
2013 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVE, IDI_DELETE);
2014 // }
2015 if ((wcStatus & CTGitPath::LOGACTIONS_UNVER)/*||(wcStatus == git_wc_status_deleted)*/)
2016 {
2017 if (m_dwContextMenus & GITSLC_POPDELETE)
2018 {
2019 popup.AppendMenuIcon(IDGITLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
2020 }
2021 }
2022 if ( (wcStatus & CTGitPath::LOGACTIONS_UNVER || wcStatus & CTGitPath::LOGACTIONS_DELETED) )
2023 {
2024 if (m_dwContextMenus & GITSLC_POPIGNORE)
2025 {
2026
2027 CTGitPathList ignorelist;
2028 FillListOfSelectedItemPaths(ignorelist);
2029 //check if all selected entries have the same extension
2030 bool bSameExt = true;
2031 CString sExt;
2032 for (int i=0; i<ignorelist.GetCount(); ++i)
2033 {
2034 if (sExt.IsEmpty() && (i==0))
2035 sExt = ignorelist[i].GetFileExtension();
2036 else if (sExt.CompareNoCase(ignorelist[i].GetFileExtension())!=0)
2037 bSameExt = false;
2038 }
2039 if (bSameExt)
2040 {
2041 if (ignoreSubMenu.CreateMenu())
2042 {
2043 CString ignorepath;
2044 if (ignorelist.GetCount()==1)
2045 ignorepath = ignorelist[0].GetFileOrDirectoryName();
2046 else
2047 ignorepath.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
2048 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_IGNORE, ignorepath);
2049 ignorepath = _T("*")+sExt;
2050 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_IGNOREMASK, ignorepath);
2051 CString temp;
2052 temp.LoadString(IDS_MENUIGNORE);
2053 popup.InsertMenu((UINT)-1, MF_BYPOSITION | MF_POPUP, (UINT_PTR)ignoreSubMenu.m_hMenu, temp);
2054 }
2055 }
2056 else
2057 {
2058 CString temp;
2059 if (ignorelist.GetCount()==1)
2060 {
2061 temp.LoadString(IDS_MENUIGNORE);
2062 }
2063 else
2064 {
2065 temp.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
2066 }
2067 popup.AppendMenuIcon(IDGITLC_IGNORE, temp, IDI_IGNORE);
2068 }
2069 }
2070 }
2071 }
2072
2073
2074
2075 if (GetSelectedCount() > 0)
2076 {
2077 popup.AppendMenu(MF_SEPARATOR);
2078 popup.AppendMenuIcon(IDGITLC_COPY, IDS_STATUSLIST_CONTEXT_COPY, IDI_COPYCLIP);
2079 popup.AppendMenuIcon(IDGITLC_COPYEXT, IDS_STATUSLIST_CONTEXT_COPYEXT, IDI_COPYCLIP);
2080 #if 0
2081 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS))
2082 &&(wcStatus != git_wc_status_unversioned)&&(wcStatus != git_wc_status_none))
2083 {
2084 popup.AppendMenu(MF_SEPARATOR);
2085 // changelist commands
2086 size_t numChangelists = GetNumberOfChangelistsInSelection();
2087 if (numChangelists > 0)
2088 {
2089 popup.AppendMenuIcon(IDSVNLC_REMOVEFROMCS, IDS_STATUSLIST_CONTEXT_REMOVEFROMCS);
2090 }
2091 if ((!entry->IsFolder())&&(changelistSubMenu.CreateMenu()))
2092 {
2093 CString temp;
2094 temp.LoadString(IDS_STATUSLIST_CONTEXT_CREATECS);
2095 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATECS, temp);
2096
2097 if (entry->changelist.Compare(SVNSLC_IGNORECHANGELIST))
2098 {
2099 changelistSubMenu.AppendMenu(MF_SEPARATOR);
2100 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATEIGNORECS, SVNSLC_IGNORECHANGELIST);
2101 }
2102
2103 if (m_changelists.size() > 0)
2104 {
2105 // find the changelist names
2106 bool bNeedSeparator = true;
2107 int cmdID = IDSVNLC_MOVETOCS;
2108 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
2109 {
2110 if ((entry->changelist.Compare(it->first))&&(it->first.Compare(SVNSLC_IGNORECHANGELIST)))
2111 {
2112 if (bNeedSeparator)
2113 {
2114 changelistSubMenu.AppendMenu(MF_SEPARATOR);
2115 bNeedSeparator = false;
2116 }
2117 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, cmdID, it->first);
2118 cmdID++;
2119 }
2120 }
2121 }
2122 temp.LoadString(IDS_STATUSLIST_CONTEXT_MOVETOCS);
2123 popup.AppendMenu(MF_POPUP|MF_STRING, (UINT_PTR)changelistSubMenu.GetSafeHmenu(), temp);
2124 }
2125 }
2126 #endif
2127 }
2128
2129 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
2130
2131 m_bBlock = TRUE;
2132 AfxGetApp()->DoWaitCursor(1);
2133 //int iItemCountBeforeMenuCmd = GetItemCount();
2134 //bool bForce = false;
2135 switch (cmd)
2136 {
2137 case IDGITLC_VIEWREV:
2138 OpenFile(filepath, ALTERNATIVEEDITOR);
2139 break;
2140 case IDGITLC_OPEN:
2141 OpenFile(filepath,OPEN);
2142 break;
2143 case IDGITLC_OPENWITH:
2144 OpenFile(filepath,OPEN_WITH);
2145 break;
2146 case IDGITLC_EXPLORE:
2147 {
2148 ShellExecute(this->m_hWnd, _T("explore"), filepath->GetDirectory().GetWinPath(), NULL, NULL, SW_SHOW);
2149 }
2150 break;
2151 case IDGITLC_CREATERESTORE:
2152 {
2153 POSITION pos = GetFirstSelectedItemPosition();
2154 while (pos)
2155 {
2156 int index = GetNextSelectedItem(pos);
2157 CTGitPath * entry2 = (CTGitPath * )GetItemData(index);
2158 ASSERT(entry2 != NULL);
2159 if (entry2 == NULL)
2160 continue;
2161 if (m_restorepaths.find(entry2->GetWinPathString()) != m_restorepaths.end())
2162 continue;
2163 CTGitPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
2164 if (CopyFile(g_Git.m_CurrentDir + _T("\\") + entry2->GetWinPathString(), tempFile.GetWinPath(), FALSE))
2165 {
2166 m_restorepaths[entry2->GetWinPathString()] = tempFile.GetWinPathString();
2167 SetItemState(index, INDEXTOOVERLAYMASK(OVL_RESTORE), LVIS_OVERLAYMASK);
2168 }
2169 }
2170 Invalidate();
2171 }
2172 break;
2173 case IDGITLC_RESTOREPATH:
2174 {
2175 if (CMessageBox::Show(m_hWnd, IDS_STATUSLIST_RESTOREPATH, IDS_APPNAME, 2, IDI_QUESTION, IDS_RESTOREBUTTON, IDS_ABORTBUTTON) == 2)
2176 break;
2177 POSITION pos = GetFirstSelectedItemPosition();
2178 while (pos)
2179 {
2180 int index = GetNextSelectedItem(pos);
2181 CTGitPath * entry2 = (CTGitPath * )GetItemData(index);
2182 ASSERT(entry2 != NULL);
2183 if (entry2 == NULL)
2184 continue;
2185 if (m_restorepaths.find(entry2->GetWinPathString()) == m_restorepaths.end())
2186 continue;
2187 if (CopyFile(m_restorepaths[entry2->GetWinPathString()], g_Git.m_CurrentDir + _T("\\") + entry2->GetWinPathString(), FALSE))
2188 {
2189 m_restorepaths.erase(entry2->GetWinPathString());
2190 SetItemState(index, 0, LVIS_OVERLAYMASK);
2191 }
2192 }
2193 Invalidate();
2194 }
2195 break;
2196 // Compare current version and work copy.
2197 case IDGITLC_COMPAREWC:
2198 {
2199 POSITION pos = GetFirstSelectedItemPosition();
2200 while ( pos )
2201 {
2202 int index = GetNextSelectedItem(pos);
2203 StartDiffWC(index);
2204 }
2205 }
2206 break;
2207 // Compare with base version. when current version is zero, compare workcopy and HEAD.
2208 case IDGITLC_COMPARE:
2209 {
2210 POSITION pos = GetFirstSelectedItemPosition();
2211 while ( pos )
2212 {
2213 int index = GetNextSelectedItem(pos);
2214 StartDiff(index);
2215 }
2216 }
2217 break;
2218 case IDGITLC_COMPARETWO:
2219 {
2220 POSITION pos = GetFirstSelectedItemPosition();
2221 while ( pos )
2222 {
2223 int index = GetNextSelectedItem(pos);
2224 StartDiffTwo(index);
2225 }
2226 }
2227 break;
2228 case IDGITLC_COMPARETWOFILES:
2229 {
2230 POSITION pos = GetFirstSelectedItemPosition();
2231 CTGitPath * firstfilepath = NULL, * secondfilepath = NULL;
2232 if (pos)
2233 {
2234 firstfilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
2235 ASSERT(firstfilepath != NULL);
2236 if (firstfilepath == NULL)
2237 break;
2238
2239 secondfilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
2240 ASSERT(secondfilepath != NULL);
2241 if (secondfilepath == NULL)
2242 break;
2243
2244 CString sCmd;
2245 sCmd.Format(_T("/command:diff /path:\"%s\" /path2:\"%s\" /hwnd:%ld"), firstfilepath->GetWinPath(), secondfilepath->GetWinPath(), (unsigned long)m_hWnd);
2246 CAppUtils::RunTortoiseProc(sCmd);
2247 }
2248 }
2249 break;
2250 case IDGITLC_GNUDIFF1:
2251 {
2252 // SVNDiff diff(NULL, this->m_hWnd, true);
2253 //
2254 // if (entry->remotestatus <= git_wc_status_normal)
2255 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
2256 // else
2257 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
2258 if(m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
2259 {
2260 CString fromwhere;
2261 if(m_amend)
2262 fromwhere = _T("~1");
2263 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,GitRev::GetHead()+fromwhere,
2264 *filepath,GitRev::GetWorkingCopy());
2265 }
2266 else
2267 {
2268 if((filepath->m_ParentNo&(PARENT_MASK|MERGE_MASK)) ==0)
2269 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,m_CurrentVersion+_T("~1"),
2270 *filepath,m_CurrentVersion);
2271 else
2272 {
2273 CString str;
2274 if(filepath->m_ParentNo & MERGE_MASK)
2275 {
2276 }
2277 else
2278 {
2279 str.Format(_T("%s^%d"),m_CurrentVersion,(filepath->m_ParentNo&PARENT_MASK)+1);
2280 }
2281
2282 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath, str,
2283 *filepath, m_CurrentVersion, false, false, false,
2284 !!(filepath->m_ParentNo & MERGE_MASK));
2285 }
2286 }
2287 }
2288 break;
2289 case IDGITLC_GNUDIFF2:
2290 {
2291 // SVNDiff diff(NULL, this->m_hWnd, true);
2292 //
2293 // if (entry->remotestatus <= git_wc_status_normal)
2294 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
2295 // else
2296 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
2297
2298 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,m_Rev1,
2299 *filepath,m_Rev2);
2300 }
2301 break;
2302
2303 case IDGITLC_ADD:
2304 { // The add went ok, but we now need to run through the selected items again
2305 // and update their status
2306 std::vector<int> selectIndex;
2307
2308 POSITION pos = GetFirstSelectedItemPosition();
2309 int index;
2310 CMassiveGitTask mgt(L"add -f");
2311 while ((index = GetNextSelectedItem(pos)) >= 0)
2312 {
2313 CTGitPath * path = (CTGitPath *)GetItemData(index);
2314 ASSERT(path);
2315 if(path == NULL)
2316 continue;
2317
2318 selectIndex.push_back(index);
2319 mgt.AddFile(*path);
2320 }
2321 BOOL cancel = FALSE;
2322 mgt.Execute(cancel);
2323
2324 if (NULL != GetParent() && NULL != GetParent()->GetSafeHwnd())
2325 GetParent()->SendMessage(GITSLNM_NEEDSREFRESH);
2326
2327 SetRedraw(TRUE);
2328 }
2329 break;
2330
2331 case IDGITLC_DELETE:
2332 {
2333 //Collect paths
2334 std::vector<int> selectIndex;
2335
2336 POSITION pos = GetFirstSelectedItemPosition();
2337 int index;
2338 while ((index = GetNextSelectedItem(pos)) >= 0)
2339 {
2340 selectIndex.push_back(index);
2341 }
2342
2343 //Create file-list ('\0' separated) for SHFileOperation
2344 CString filelist;
2345 for(int i=0;i<selectIndex.size();i++)
2346 {
2347 index=selectIndex[i];
2348
2349 CTGitPath * path=(CTGitPath*)GetItemData(index);
2350 ASSERT(path);
2351 if(path == NULL)
2352 continue;
2353
2354 filelist += path->GetWinPathString();
2355 filelist += _T("|");
2356 }
2357 filelist += _T("|");
2358 int len = filelist.GetLength();
2359 TCHAR * buf = new TCHAR[len+2];
2360 _tcscpy_s(buf, len+2, filelist);
2361 for (int i=0; i<len; ++i)
2362 if (buf[i] == '|')
2363 buf[i] = 0;
2364 SHFILEOPSTRUCT fileop;
2365 fileop.hwnd = this->m_hWnd;
2366 fileop.wFunc = FO_DELETE;
2367 fileop.pFrom = buf;
2368 fileop.pTo = NULL;
2369 fileop.fFlags = FOF_NO_CONNECTED_ELEMENTS | ((GetAsyncKeyState(VK_SHIFT) & 0x8000) ? 0 : FOF_ALLOWUNDO);
2370 fileop.lpszProgressTitle = _T("deleting file");
2371 int result = SHFileOperation(&fileop);
2372 delete [] buf;
2373
2374 if ( (result==0) && (!fileop.fAnyOperationsAborted) )
2375 {
2376 SetRedraw(FALSE);
2377 POSITION pos = NULL;
2378 while ((pos = GetFirstSelectedItemPosition()) != 0)
2379 {
2380 int index = GetNextSelectedItem(pos);
2381 if (GetCheck(index))
2382 m_nSelected--;
2383 m_nTotal--;
2384
2385 RemoveListEntry(index);
2386 }
2387 SetRedraw(TRUE);
2388 }
2389 }
2390 break;
2391
2392 case IDGITLC_BLAME:
2393 {
2394 CAppUtils::LaunchTortoiseBlame(g_Git.m_CurrentDir+_T("\\")+filepath->GetWinPath(), m_CurrentVersion);
2395 }
2396 break;
2397
2398 case IDGITLC_LOG:
2399 {
2400 CString sCmd;
2401 sCmd.Format(_T("/command:log /path:\"%s\""), g_Git.m_CurrentDir + _T("\\") + filepath->GetWinPath());
2402 CAppUtils::RunTortoiseProc(sCmd);
2403 }
2404 break;
2405
2406 case IDGITLC_LOGOLDNAME:
2407 {
2408 CTGitPath oldName(filepath->GetGitOldPathString());
2409 CString sCmd;
2410 sCmd.Format(_T("/command:log /path:\"%s\""), g_Git.m_CurrentDir + _T("\\") + oldName.GetWinPath());
2411 CAppUtils::RunTortoiseProc(sCmd);
2412 }
2413 break;
2414
2415
2416 case IDGITLC_EDITCONFLICT:
2417 {
2418 CAppUtils::ConflictEdit(*filepath,false,this->m_bIsRevertTheirMy);
2419 break;
2420 }
2421 case IDGITLC_RESOLVETHEIRS: //follow up
2422 case IDGITLC_RESOLVEMINE: //follow up
2423 case IDGITLC_RESOLVECONFLICT:
2424 {
2425 if (CMessageBox::Show(m_hWnd, IDS_PROC_RESOLVE, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO)==IDYES)
2426 {
2427 POSITION pos = GetFirstSelectedItemPosition();
2428 while (pos != 0)
2429 {
2430 int index;
2431 index = GetNextSelectedItem(pos);
2432 CTGitPath * fentry =(CTGitPath*) this->GetItemData(index);
2433 if(fentry == NULL)
2434 continue;
2435 CString gitcmd,output;
2436 output.Empty();
2437
2438 if ( ((!this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVETHEIRS) ||
2439 ((this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVEMINE) )
2440 {
2441 gitcmd.Format(_T("git.exe checkout-index -f --stage=3 -- \"%s\""),fentry->GetGitPathString());
2442 if (g_Git.Run(gitcmd, &output,CP_UTF8))
2443 {
2444 CMessageBox::Show(m_hWnd, output, _T("TortoiseGit"), MB_ICONERROR);
2445 continue;
2446 }
2447 }
2448 output.Empty();
2449 if ( ((!this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVEMINE) ||
2450 ((this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVETHEIRS) )
2451 {
2452 gitcmd.Format(_T("git.exe checkout-index -f --stage=2 -- \"%s\""),fentry->GetGitPathString());
2453 if (g_Git.Run(gitcmd, &output,CP_UTF8))
2454 {
2455 CMessageBox::Show(m_hWnd, output, _T("TortoiseGit"), MB_ICONERROR);
2456 continue;
2457 }
2458
2459 }
2460 output.Empty();
2461 if ( fentry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
2462 {
2463 gitcmd.Format(_T("git.exe add -f -- \"%s\""),fentry->GetGitPathString());
2464 if (g_Git.Run(gitcmd, &output,CP_UTF8))
2465 {
2466 CMessageBox::Show(m_hWnd, output, _T("TortoiseGit"), MB_ICONERROR);
2467 }
2468 else
2469 {
2470 fentry->m_Action |= CTGitPath::LOGACTIONS_MODIFIED;
2471 fentry->m_Action &=~CTGitPath::LOGACTIONS_UNMERGED;
2472 }
2473 }
2474
2475 CAppUtils::RemoveTempMergeFile(*fentry);
2476
2477 }
2478 Show(m_dwShow, 0, m_bShowFolders,0,true);
2479 }
2480 }
2481 break;
2482
2483 case IDGITLC_IGNORE:
2484 {
2485 CTGitPathList ignorelist;
2486 //std::vector<CString> toremove;
2487 FillListOfSelectedItemPaths(ignorelist, true);
2488 SetRedraw(FALSE);
2489
2490 if(!CAppUtils::IgnoreFile(ignorelist,false))
2491 break;
2492
2493 for(int i=0;i<ignorelist.GetCount();i++)
2494 {
2495 int nListboxEntries = GetItemCount();
2496 for (int nItem=0; nItem<nListboxEntries; ++nItem)
2497 {
2498 CTGitPath *path=(CTGitPath*)GetItemData(nItem);
2499 if (path->GetGitPathString()==ignorelist[i].GetGitPathString())
2500 {
2501 RemoveListEntry(nItem);
2502 break;
2503 }
2504 }
2505 }
2506 SetRedraw(TRUE);
2507 }
2508 #if 0
2509 CTSVNPathList ignorelist;
2510 std::vector<CString> toremove;
2511 FillListOfSelectedItemPaths(ignorelist, true);
2512 SetRedraw(FALSE);
2513 for (int j=0; j<ignorelist.GetCount(); ++j)
2514 {
2515 int nListboxEntries = GetItemCount();
2516 for (int i=0; i<nListboxEntries; ++i)
2517 {
2518 if (GetListEntry(i)->GetPath().IsEquivalentTo(ignorelist[j]))
2519 {
2520 selIndex = i;
2521 break;
2522 }
2523 }
2524 CString name = CPathUtils::PathPatternEscape(ignorelist[j].GetFileOrDirectoryName());
2525 CTSVNPath parentfolder = ignorelist[j].GetContainingDirectory();
2526 SVNProperties props(parentfolder, SVNRev::REV_WC, false);
2527 CStringA value;
2528 for (int i=0; i<props.GetCount(); i++)
2529 {
2530 CString propname(props.GetItemName(i).c_str());
2531 if (propname.CompareNoCase(_T("git:ignore"))==0)
2532 {
2533 stdstring stemp;
2534 // treat values as normal text even if they're not
2535 value = (char *)props.GetItemValue(i).c_str();
2536 }
2537 }
2538 if (value.IsEmpty())
2539 value = name;
2540 else
2541 {
2542 value = value.Trim("\n\r");
2543 value += "\n";
2544 value += name;
2545 value.Remove('\r');
2546 }
2547 if (!props.Add(_T("git:ignore"), (LPCSTR)value))
2548 {
2549 CString temp;
2550 temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
2551 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
2552 break;
2553 }
2554 if (GetCheck(selIndex))
2555 m_nSelected--;
2556 m_nTotal--;
2557
2558 // now, if we ignored a folder, remove all its children
2559 if (ignorelist[j].IsDirectory())
2560 {
2561 for (int i=0; i<(int)m_arListArray.size(); ++i)
2562 {
2563 FileEntry * entry = GetListEntry(i);
2564 if (entry->status == git_wc_status_unversioned)
2565 {
2566 if (!ignorelist[j].IsEquivalentTo(entry->GetPath())&&(ignorelist[j].IsAncestorOf(entry->GetPath())))
2567 {
2568 entry->status = git_wc_status_ignored;
2569 entry->textstatus = git_wc_status_ignored;
2570 if (GetCheck(i))
2571 m_nSelected--;
2572 toremove.push_back(entry->GetPath().GetSVNPathString());
2573 }
2574 }
2575 }
2576 }
2577
2578 CTSVNPath basepath = m_arStatusArray[m_arListArray[selIndex]]->basepath;
2579
2580 FileEntry * entry = m_arStatusArray[m_arListArray[selIndex]];
2581 if ( entry->status == git_wc_status_unversioned ) // keep "deleted" items
2582 toremove.push_back(entry->GetPath().GetSVNPathString());
2583
2584 if (!m_bIgnoreRemoveOnly)
2585 {
2586 SVNStatus status;
2587 git_wc_status2_t * s;
2588 CTSVNPath gitPath;
2589 s = status.GetFirstFileStatus(parentfolder, gitPath, false, git_depth_empty);
2590 // first check if the folder isn't already present in the list
2591 bool bFound = false;
2592 nListboxEntries = GetItemCount();
2593 for (int i=0; i<nListboxEntries; ++i)
2594 {
2595 FileEntry * entry = GetListEntry(i);
2596 if (entry->path.IsEquivalentTo(gitPath))
2597 {
2598 bFound = true;
2599 break;
2600 }
2601 }
2602 if (!bFound)
2603 {
2604 if (s!=0)
2605 {
2606 FileEntry * entry = new FileEntry();
2607 entry->path = gitPath;
2608 entry->basepath = basepath;
2609 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);
2610 entry->textstatus = s->text_status;
2611 entry->propstatus = s->prop_status;
2612 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);
2613 entry->remotetextstatus = s->repos_text_status;
2614 entry->remotepropstatus = s->repos_prop_status;
2615 entry->inunversionedfolder = FALSE;
2616 entry->checked = true;
2617 entry->inexternal = false;
2618 entry->direct = false;
2619 entry->isfolder = true;
2620 entry->last_commit_date = 0;
2621 entry->last_commit_rev = 0;
2622 entry->remoterev = 0;
2623 if (s->entry)
2624 {
2625 if (s->entry->url)
2626 {
2627 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));
2628 }
2629 }
2630 if (s->entry && s->entry->present_props)
2631 {
2632 entry->present_props = s->entry->present_props;
2633 }
2634 m_arStatusArray.push_back(entry);
2635 m_arListArray.push_back(m_arStatusArray.size()-1);
2636 AddEntry(entry, langID, GetItemCount());
2637 }
2638 }
2639 }
2640 }
2641 for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)
2642 {
2643 int nListboxEntries = GetItemCount();
2644 for (int i=0; i<nListboxEntries; ++i)
2645 {
2646 if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)
2647 {
2648 RemoveListEntry(i);
2649 break;
2650 }
2651 }
2652 }
2653 SetRedraw(TRUE);
2654 }
2655 #endif
2656 break;
2657 case IDGITLC_IGNOREMASK:
2658 {
2659 CString common;
2660 CString ext=filepath->GetFileExtension();
2661 CTGitPathList ignorelist;
2662 FillListOfSelectedItemPaths(ignorelist, true);
2663 SetRedraw(FALSE);
2664
2665 CAppUtils::IgnoreFile(ignorelist,true);
2666
2667 common=ignorelist.GetCommonRoot().GetGitPathString();
2668
2669 for (int i=0; i< GetItemCount(); ++i)
2670 {
2671 CTGitPath *path=(CTGitPath*)GetItemData(i);
2672 if(!( path->m_Action & CTGitPath::LOGACTIONS_UNVER))
2673 continue;
2674 if( path->GetGitPathString().Left(common.GetLength()) == common )
2675 {
2676 if (path->GetFileExtension()==ext)
2677 {
2678 RemoveListEntry(i);
2679 i--; // remove index i at item, new one will replace.
2680 }
2681 }
2682 }
2683
2684 CWnd* pParent = GetParent();
2685 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2686 {
2687 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2688 }
2689
2690 SetRedraw(TRUE);
2691 }
2692 #if 0
2693 std::set<CTSVNPath> parentlist;
2694 for (int i=0; i<ignorelist.GetCount(); ++i)
2695 {
2696 parentlist.insert(ignorelist[i].GetContainingDirectory());
2697 }
2698 std::set<CTSVNPath>::iterator it;
2699 std::vector<CString> toremove;
2700
2701 for (it = parentlist.begin(); it != parentlist.end(); ++it)
2702 {
2703 CTSVNPath parentFolder = (*it).GetDirectory();
2704 SVNProperties props(parentFolder, SVNRev::REV_WC, false);
2705 CStringA value;
2706 for (int i=0; i<props.GetCount(); i++)
2707 {
2708 CString propname(props.GetItemName(i).c_str());
2709 if (propname.CompareNoCase(_T("git:ignore"))==0)
2710 {
2711 stdstring stemp;
2712 // treat values as normal text even if they're not
2713 value = (char *)props.GetItemValue(i).c_str();
2714 }
2715 }
2716 if (value.IsEmpty())
2717 value = name;
2718 else
2719 {
2720 value = value.Trim("\n\r");
2721 value += "\n";
2722 value += name;
2723 value.Remove('\r');
2724 }
2725 if (!props.Add(_T("git:ignore"), (LPCSTR)value))
2726 {
2727 CString temp;
2728 temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
2729 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
2730 }
2731 else
2732 {
2733 CTSVNPath basepath;
2734 int nListboxEntries = GetItemCount();
2735 for (int i=0; i<nListboxEntries; ++i)
2736 {
2737 FileEntry * entry = GetListEntry(i);
2738 ASSERT(entry != NULL);
2739 if (entry == NULL)
2740 continue;
2741 if (basepath.IsEmpty())
2742 basepath = entry->basepath;
2743 // since we ignored files with a mask (e.g. *.exe)
2744 // we have to find find all files in the same
2745 // folder (IsAncestorOf() returns TRUE for _all_ children,
2746 // not just the immediate ones) which match the
2747 // mask and remove them from the list too.
2748 if ((entry->status == git_wc_status_unversioned)&&(parentFolder.IsAncestorOf(entry->path)))
2749 {
2750 CString f = entry->path.GetSVNPathString();
2751 if (f.Mid(parentFolder.GetSVNPathString().GetLength()).Find('/')<=0)
2752 {
2753 if (CStringUtils::WildCardMatch(name, f))
2754 {
2755 if (GetCheck(i))
2756 m_nSelected--;
2757 m_nTotal--;
2758 toremove.push_back(f);
2759 }
2760 }
2761 }
2762 }
2763 if (!m_bIgnoreRemoveOnly)
2764 {
2765 SVNStatus status;
2766 git_wc_status2_t * s;
2767 CTSVNPath gitPath;
2768 s = status.GetFirstFileStatus(parentFolder, gitPath, false, git_depth_empty);
2769 if (s!=0)
2770 {
2771 // first check if the folder isn't already present in the list
2772 bool bFound = false;
2773 for (int i=0; i<nListboxEntries; ++i)
2774 {
2775 FileEntry * entry = GetListEntry(i);
2776 if (entry->path.IsEquivalentTo(gitPath))
2777 {
2778 bFound = true;
2779 break;
2780 }
2781 }
2782 if (!bFound)
2783 {
2784 FileEntry * entry = new FileEntry();
2785 entry->path = gitPath;
2786 entry->basepath = basepath;
2787 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);
2788 entry->textstatus = s->text_status;
2789 entry->propstatus = s->prop_status;
2790 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);
2791 entry->remotetextstatus = s->repos_text_status;
2792 entry->remotepropstatus = s->repos_prop_status;
2793 entry->inunversionedfolder = false;
2794 entry->checked = true;
2795 entry->inexternal = false;
2796 entry->direct = false;
2797 entry->isfolder = true;
2798 entry->last_commit_date = 0;
2799 entry->last_commit_rev = 0;
2800 entry->remoterev = 0;
2801 if (s->entry)
2802 {
2803 if (s->entry->url)
2804 {
2805 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));
2806 }
2807 }
2808 if (s->entry && s->entry->present_props)
2809 {
2810 entry->present_props = s->entry->present_props;
2811 }
2812 m_arStatusArray.push_back(entry);
2813 m_arListArray.push_back(m_arStatusArray.size()-1);
2814 AddEntry(entry, langID, GetItemCount());
2815 }
2816 }
2817 }
2818 }
2819 }
2820 for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)
2821 {
2822 int nListboxEntries = GetItemCount();
2823 for (int i=0; i<nListboxEntries; ++i)
2824 {
2825 if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)
2826 {
2827 RemoveListEntry(i);
2828 break;
2829 }
2830 }
2831 }
2832 SetRedraw(TRUE);
2833 }
2834 #endif
2835 break;
2836
2837 case IDGITLC_REVERT:
2838 {
2839 // If at least one item is not in the status "added"
2840 // we ask for a confirmation
2841 BOOL bConfirm = FALSE;
2842 POSITION pos = GetFirstSelectedItemPosition();
2843 int index;
2844 while ((index = GetNextSelectedItem(pos)) >= 0)
2845 {
2846 //FileEntry * fentry = GetListEntry(index);
2847 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
2848 if(fentry && fentry->m_Action &CTGitPath::LOGACTIONS_MODIFIED )
2849 {
2850 bConfirm = TRUE;
2851 break;
2852 }
2853 }
2854
2855 CString str;
2856 str.Format(IDS_PROC_WARNREVERT,GetSelectedCount());
2857
2858 if (!bConfirm || CMessageBox::Show(this->m_hWnd, str, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION)==IDYES)
2859 {
2860 CTGitPathList targetList;
2861 FillListOfSelectedItemPaths(targetList);
2862
2863 // make sure that the list is reverse sorted, so that
2864 // children are removed before any parents
2865 targetList.SortByPathname(true);
2866
2867 // put all reverted files in the trashbin, except the ones with 'added'
2868 // status because they are not restored by the revert.
2869 CTGitPathList delList;
2870 POSITION pos = GetFirstSelectedItemPosition();
2871 int index;
2872 while ((index = GetNextSelectedItem(pos)) >= 0)
2873 {
2874 CTGitPath *entry=(CTGitPath *)GetItemData(index);
2875 if (entry&&(!(entry->m_Action& CTGitPath::LOGACTIONS_ADDED))
2876 && (!(entry->m_Action& CTGitPath::LOGACTIONS_REPLACED)))
2877 {
2878 CTGitPath fullpath;
2879 fullpath.SetFromWin(g_Git.m_CurrentDir+_T("\\")+entry->GetWinPath());
2880 delList.AddPath(fullpath);
2881 }
2882 }
2883 if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))
2884 delList.DeleteAllFiles(true);
2885
2886 CString revertToCommit = _T("HEAD");
2887 if (m_amend)
2888 revertToCommit = _T("HEAD~1");
2889 if (g_Git.Revert(revertToCommit, targetList))
2890 {
2891 CMessageBox::Show(this->m_hWnd, _T("Revert Fail"), _T("TortoiseGit"), MB_ICONERROR);
2892 }
2893 else
2894 {
2895 bool updateStatusList = false;
2896 for(int i=0;i<targetList.GetCount();i++)
2897 {
2898 int nListboxEntries = GetItemCount();
2899 for (int nItem=0; nItem<nListboxEntries; ++nItem)
2900 {
2901 CTGitPath *path=(CTGitPath*)GetItemData(nItem);
2902 if (path->GetGitPathString()==targetList[i].GetGitPathString())
2903 {
2904 if(path->m_Action & CTGitPath::LOGACTIONS_ADDED)
2905 {
2906 path->m_Action = CTGitPath::LOGACTIONS_UNVER;
2907 SetEntryCheck(path,nItem,false);
2908 updateStatusList = true;
2909 SetItemGroup(nItem,1);
2910 this->m_StatusFileList.RemoveItem(*path);
2911 this->m_UnRevFileList.AddPath(*path);
2912 //this->m_IgnoreFileList.RemoveItem(*path);
2913
2914 }
2915 else
2916 {
2917 RemoveListEntry(nItem);
2918 }
2919 break;
2920 }
2921 }
2922 }
2923 SetRedraw(TRUE);
2924 SaveColumnWidths();
2925 Show(m_dwShow, 0, m_bShowFolders,updateStatusList,true);
2926 NotifyCheck();
2927 }
2928 }
2929 }
2930 break;
2931
2932 case IDGITLC_COPY:
2933 CopySelectedEntriesToClipboard(0);
2934 break;
2935 case IDGITLC_COPYEXT:
2936 CopySelectedEntriesToClipboard((DWORD)-1);
2937 break;
2938
2939 case IDGITLC_SAVEAS:
2940 FileSaveAs(filepath);
2941 break;
2942
2943 case IDGITLC_REVERTTOREV:
2944 RevertSelectedItemToVersion();
2945 break;
2946 #if 0
2947 case IDSVNLC_PROPERTIES:
2948 {
2949 CTSVNPathList targetList;
2950 FillListOfSelectedItemPaths(targetList);
2951 CEditPropertiesDlg dlg;
2952 dlg.SetPathList(targetList);
2953 dlg.DoModal();
2954 if (dlg.HasChanged())
2955 {
2956 // since the user might have changed/removed/added
2957 // properties recursively, we don't really know
2958 // which items have changed their status.
2959 // So tell the parent to do a refresh.
2960 CWnd* pParent = GetParent();
2961 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2962 {
2963 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
2964 }
2965 }
2966 }
2967 break;
2968 case IDSVNLC_COMMIT:
2969 {
2970 CTSVNPathList targetList;
2971 FillListOfSelectedItemPaths(targetList);
2972 CTSVNPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
2973 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
2974 CString commandline = CPathUtils::GetAppDirectory();
2975 commandline += _T("TortoiseProc.exe /command:commit /pathfile:\"");
2976 commandline += tempFile.GetWinPathString();
2977 commandline += _T("\"");
2978 commandline += _T(" /deletepathfile");
2979 CAppUtils::LaunchApplication(commandline, NULL, false);
2980 }
2981 break;
2982
2983 case IDSVNLC_COMPAREWC:
2984 {
2985 POSITION pos = GetFirstSelectedItemPosition();
2986 while ( pos )
2987 {
2988 int index = GetNextSelectedItem(pos);
2989 FileEntry * entry = GetListEntry(index);
2990 ASSERT(entry != NULL);
2991 if (entry == NULL)
2992 continue;
2993 SVNDiff diff(NULL, m_hWnd, true);
2994 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
2995 git_revnum_t baseRev = entry->Revision;
2996 diff.DiffFileAgainstBase(
2997 entry->path, baseRev, entry->textstatus, entry->propstatus);
2998 }
2999 }
3000 break;
3001 case IDSVNLC_GNUDIFF1:
3002 {
3003 SVNDiff diff(NULL, this->m_hWnd, true);
3004
3005 if (entry->remotestatus <= git_wc_status_normal)
3006 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
3007 else
3008 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
3009 }
3010 break;
3011 case IDSVNLC_UPDATE:
3012 {
3013 CTSVNPathList targetList;
3014 FillListOfSelectedItemPaths(targetList);
3015 bool bAllExist = true;
3016 for (int i=0; i<targetList.GetCount(); ++i)
3017 {
3018 if (!targetList[i].Exists())
3019 {
3020 bAllExist = false;
3021 break;
3022 }
3023 }
3024 if (bAllExist)
3025 {
3026 CSVNProgressDlg dlg;
3027 dlg.SetCommand(CSVNProgressDlg::SVNProgress_Update);
3028 dlg.SetPathList(targetList);
3029 dlg.SetRevision(SVNRev::REV_HEAD);
3030 dlg.DoModal();
3031 }
3032 else
3033 {
3034 CString sTempFile = CTempFiles::Instance().GetTempFilePath(false).GetWinPathString();
3035 targetList.WriteToFile(sTempFile, false);
3036 CString sCmd;
3037 sCmd.Format(_T("\"%s\" /command:update /rev /pathfile:\"%s\" /deletepathfile"),
3038 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), (LPCTSTR)sTempFile);
3039
3040 CAppUtils::LaunchApplication(sCmd, NULL, false);
3041 }
3042 }
3043 break;
3044
3045 case IDSVNLC_REMOVE:
3046 {
3047 SVN git;
3048 CTSVNPathList itemsToRemove;
3049 FillListOfSelectedItemPaths(itemsToRemove);
3050
3051 // We must sort items before removing, so that files are always removed
3052 // *before* their parents
3053 itemsToRemove.SortByPathname(true);
3054
3055 bool bSuccess = false;
3056 if (git.Remove(itemsToRemove, FALSE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))
3057 {
3058 bSuccess = true;
3059 }
3060 else
3061 {
3062 if ((git.Err->apr_err == SVN_ERR_UNVERSIONED_RESOURCE) ||
3063 (git.Err->apr_err == SVN_ERR_CLIENT_MODIFIED))
3064 {
3065 CString msg, yes, no, yestoall;
3066 msg.Format(IDS_PROC_REMOVEFORCE, (LPCTSTR)git.GetLastErrorMessage());
3067 yes.LoadString(IDS_MSGBOX_YES);
3068 no.LoadString(IDS_MSGBOX_NO);
3069 yestoall.LoadString(IDS_PROC_YESTOALL);
3070 UINT ret = CMessageBox::Show(m_hWnd, msg, _T("TortoiseGit"), 2, IDI_ERROR, yes, no, yestoall);
3071 if ((ret == 1)||(ret==3))
3072 {
3073 if (!git.Remove(itemsToRemove, TRUE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))
3074 {
3075 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
3076 }
3077 else
3078 bSuccess = true;
3079 }
3080 }
3081 else
3082 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
3083 }
3084 if (bSuccess)
3085 {
3086 // The remove went ok, but we now need to run through the selected items again
3087 // and update their status
3088 POSITION pos = GetFirstSelectedItemPosition();
3089 int index;
3090 std::vector<int> entriesToRemove;
3091 while ((index = GetNextSelectedItem(pos)) >= 0)
3092 {
3093 FileEntry * e = GetListEntry(index);
3094 if (!bShift &&
3095 ((e->textstatus == git_wc_status_unversioned)||
3096 (e->textstatus == git_wc_status_none)||
3097 (e->textstatus == git_wc_status_ignored)))
3098 {
3099 if (GetCheck(index))
3100 m_nSelected--;
3101 m_nTotal--;
3102 entriesToRemove.push_back(index);
3103 }
3104 else
3105 {
3106 e->textstatus = git_wc_status_deleted;
3107 e->status = git_wc_status_deleted;
3108 SetEntryCheck(e,index,true);
3109 }
3110 }
3111 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)
3112 {
3113 RemoveListEntry(*it);
3114 }
3115 }
3116 SaveColumnWidths();
3117 Show(m_dwShow, 0, m_bShowFolders);
3118 NotifyCheck();
3119 }
3120 break;
3121 case IDSVNLC_DELETE:
3122 {
3123 CTSVNPathList pathlist;
3124 FillListOfSelectedItemPaths(pathlist);
3125 pathlist.RemoveChildren();
3126 CString filelist;
3127 for (INT_PTR i=0; i<pathlist.GetCount(); ++i)
3128 {
3129 filelist += pathlist[i].GetWinPathString();
3130 filelist += _T("|");
3131 }
3132 filelist += _T("|");
3133 int len = filelist.GetLength();
3134 TCHAR * buf = new TCHAR[len+2];
3135 _tcscpy_s(buf, len+2, filelist);
3136 for (int i=0; i<len; ++i)
3137 if (buf[i] == '|')
3138 buf[i] = 0;
3139 SHFILEOPSTRUCT fileop;
3140 fileop.hwnd = this->m_hWnd;
3141 fileop.wFunc = FO_DELETE;
3142 fileop.pFrom = buf;
3143 fileop.pTo = NULL;
3144 fileop.fFlags = FOF_NO_CONNECTED_ELEMENTS | ((GetAsyncKeyState(VK_SHIFT) & 0x8000) ? 0 : FOF_ALLOWUNDO);
3145 fileop.lpszProgressTitle = _T("deleting file");
3146 int result = SHFileOperation(&fileop);
3147 delete [] buf;
3148
3149 if ( (result==0) && (!fileop.fAnyOperationsAborted) )
3150 {
3151 SetRedraw(FALSE);
3152 POSITION pos = NULL;
3153 CTSVNPathList deletedlist; // to store list of deleted folders
3154 while ((pos = GetFirstSelectedItemPosition()) != 0)
3155 {
3156 int index = GetNextSelectedItem(pos);
3157 if (GetCheck(index))
3158 m_nSelected--;
3159 m_nTotal--;
3160 FileEntry * fentry = GetListEntry(index);
3161 if ((fentry)&&(fentry->isfolder))
3162 deletedlist.AddPath(fentry->path);
3163 RemoveListEntry(index);
3164 }
3165 // now go through the list of deleted folders
3166 // and remove all their children from the list too!
3167 int nListboxEntries = GetItemCount();
3168 for (int folderindex = 0; folderindex < deletedlist.GetCount(); ++folderindex)
3169 {
3170 CTSVNPath folderpath = deletedlist[folderindex];
3171 for (int i=0; i<nListboxEntries; ++i)
3172 {
3173 FileEntry * entry = GetListEntry(i);
3174 if (folderpath.IsAncestorOf(entry->path))
3175 {
3176 RemoveListEntry(i--);
3177 nListboxEntries--;
3178 }
3179 }
3180 }
3181 SetRedraw(TRUE);
3182 }
3183 }
3184 break;
3185
3186
3187 case IDSVNLC_ADD:
3188 {
3189 SVN git;
3190 CTSVNPathList itemsToAdd;
3191 FillListOfSelectedItemPaths(itemsToAdd);
3192
3193 // We must sort items before adding, so that folders are always added
3194 // *before* any of their children
3195 itemsToAdd.SortByPathname();
3196
3197 ProjectProperties props;
3198 props.ReadPropsPathList(itemsToAdd);
3199 if (git.Add(itemsToAdd, &props, git_depth_empty, TRUE, TRUE, TRUE))
3200 {
3201 // The add went ok, but we now need to run through the selected items again
3202 // and update their status
3203 POSITION pos = GetFirstSelectedItemPosition();
3204 int index;
3205 while ((index = GetNextSelectedItem(pos)) >= 0)
3206 {
3207 FileEntry * e = GetListEntry(index);
3208 e->textstatus = git_wc_status_added;
3209 e->propstatus = git_wc_status_none;
3210 e->status = git_wc_status_added;
3211 SetEntryCheck(e,index,true);
3212 }
3213 }
3214 else
3215 {
3216 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
3217 }
3218 SaveColumnWidths();
3219 Show(m_dwShow, 0, m_bShowFolders);
3220 NotifyCheck();
3221 }
3222 break;
3223 case IDSVNLC_ADD_RECURSIVE:
3224 {
3225 CTSVNPathList itemsToAdd;
3226 FillListOfSelectedItemPaths(itemsToAdd);
3227
3228 CAddDlg dlg;
3229 dlg.m_pathList = itemsToAdd;
3230 if (dlg.DoModal() == IDOK)
3231 {
3232 if (dlg.m_pathList.GetCount() == 0)
3233 break;
3234 CSVNProgressDlg progDlg;
3235 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Add);
3236 progDlg.SetPathList(dlg.m_pathList);
3237 ProjectProperties props;
3238 props.ReadPropsPathList(dlg.m_pathList);
3239 progDlg.SetProjectProperties(props);
3240 progDlg.SetItemCount(dlg.m_pathList.GetCount());
3241 progDlg.DoModal();
3242
3243 // refresh!
3244 CWnd* pParent = GetParent();
3245 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
3246 {
3247 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
3248 }
3249 }
3250 }
3251 break;
3252
3253 case IDSVNLC_REPAIRMOVE:
3254 {
3255 POSITION pos = GetFirstSelectedItemPosition();
3256 int index = GetNextSelectedItem(pos);
3257 FileEntry * entry1 = NULL;
3258 FileEntry * entry2 = NULL;
3259 if (index >= 0)
3260 {
3261 entry1 = GetListEntry(index);
3262 git_wc_status_kind status1 = git_wc_status_none;
3263 git_wc_status_kind status2 = git_wc_status_none;
3264 if (entry1)
3265 {
3266 status1 = entry1->status;
3267 index = GetNextSelectedItem(pos);
3268 if (index >= 0)
3269 {
3270 entry2 = GetListEntry(index);
3271 if (entry2)
3272 {
3273 status2 = entry2->status;
3274 if (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned)
3275 {
3276 FileEntry * tempentry = entry1;
3277 entry1 = entry2;
3278 entry2 = tempentry;
3279 }
3280 // entry1 was renamed to entry2 but outside of Subversion
3281 // fix this by moving entry2 back to entry1 first,
3282 // then do an git-move from entry1 to entry2
3283 if (MoveFile(entry2->GetPath().GetWinPath(), entry1->GetPath().GetWinPath()))
3284 {
3285 SVN git;
3286 if (!git.Move(CTSVNPathList(entry1->GetPath()), entry2->GetPath(), TRUE))
3287 {
3288 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
3289 }
3290 else
3291 {
3292 // check the previously unversioned item
3293 entry1->checked = true;
3294 // fixing the move was successful. We have to adjust the new status of the
3295 // files.
3296 // Since we don't know if the moved/renamed file had local modifications or not,
3297 // we can't guess the new status. That means we have to refresh...
3298 CWnd* pParent = GetParent();
3299 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
3300 {
3301 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
3302 }
3303 }
3304 }
3305 else
3306 {
3307 LPVOID lpMsgBuf;
3308 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
3309 FORMAT_MESSAGE_FROM_SYSTEM |
3310 FORMAT_MESSAGE_IGNORE_INSERTS,
3311 NULL,
3312 GetLastError(),
3313 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
3314 (LPTSTR) &lpMsgBuf,
3315 0,
3316 NULL
3317 );
3318 MessageBox((LPCTSTR)lpMsgBuf, _T("Error"), MB_OK | MB_ICONINFORMATION );
3319 LocalFree( lpMsgBuf );
3320 }
3321 }
3322 }
3323 }
3324 }
3325 }
3326 break;
3327 case IDSVNLC_REMOVEFROMCS:
3328 {
3329 CTSVNPathList changelistItems;
3330 FillListOfSelectedItemPaths(changelistItems);
3331 SVN git;
3332 SetRedraw(FALSE);
3333 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
3334 {
3335 // The changelists were removed, but we now need to run through the selected items again
3336 // and update their changelist
3337 POSITION pos = GetFirstSelectedItemPosition();
3338 int index;
3339 std::vector<int> entriesToRemove;
3340 while ((index = GetNextSelectedItem(pos)) >= 0)
3341 {
3342 FileEntry * e = GetListEntry(index);
3343 if (e)
3344 {
3345 e->changelist.Empty();
3346 if (e->status == git_wc_status_normal)
3347 {
3348 // remove the entry completely
3349 entriesToRemove.push_back(index);
3350 }
3351 else
3352 SetItemGroup(index, 0);
3353 }
3354 }
3355 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)
3356 {
3357 RemoveListEntry(*it);
3358 }
3359 // TODO: Should we go through all entries here and check if we also could
3360 // remove the changelist from m_changelists ?
3361 }
3362 else
3363 {
3364 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
3365 }
3366 SetRedraw(TRUE);
3367 }
3368 break;
3369 case IDSVNLC_CREATEIGNORECS:
3370 CreateChangeList(SVNSLC_IGNORECHANGELIST);
3371 break;
3372 case IDSVNLC_CREATECS:
3373 {
3374 CCreateChangelistDlg dlg;
3375 if (dlg.DoModal() == IDOK)
3376 {
3377 CreateChangeList(dlg.m_sName);
3378 }
3379 }
3380 break;
3381 default:
3382 {
3383 if (cmd < IDSVNLC_MOVETOCS)
3384 break;
3385 CTSVNPathList changelistItems;
3386 FillListOfSelectedItemPaths(changelistItems);
3387
3388 // find the changelist name
3389 CString sChangelist;
3390 int cmdID = IDSVNLC_MOVETOCS;
3391 SetRedraw(FALSE);
3392 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
3393 {
3394 if ((it->first.Compare(SVNSLC_IGNORECHANGELIST))&&(entry->changelist.Compare(it->first)))
3395 {
3396 if (cmd == cmdID)
3397 {
3398 sChangelist = it->first;
3399 }
3400 cmdID++;
3401 }
3402 }
3403 if (!sChangelist.IsEmpty())
3404 {
3405 SVN git;
3406 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
3407 {
3408 // The changelists were moved, but we now need to run through the selected items again
3409 // and update their changelist
3410 POSITION pos = GetFirstSelectedItemPosition();
3411 int index;
3412 while ((index = GetNextSelectedItem(pos)) >= 0)
3413 {
3414 FileEntry * e = GetListEntry(index);
3415 e->changelist = sChangelist;
3416 if (!e->IsFolder())
3417 {
3418 if (m_changelists.find(e->changelist)!=m_changelists.end())
3419 SetItemGroup(index, m_changelists[e->changelist]);
3420 else
3421 SetItemGroup(index, 0);
3422 }
3423 }
3424 }
3425 else
3426 {
3427 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
3428 }
3429 }
3430 SetRedraw(TRUE);
3431 }
3432 break;
3433 #endif
3434
3435 } // switch (cmd)
3436 m_bBlock = FALSE;
3437 AfxGetApp()->DoWaitCursor(-1);
3438 GetStatisticsString();
3439 //int iItemCountAfterMenuCmd = GetItemCount();
3440 //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)
3441 //{
3442 // CWnd* pParent = GetParent();
3443 // if (NULL != pParent && NULL != pParent->GetSafeHwnd())
3444 // {
3445 // pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);
3446 // }
3447 //}
3448 } // if (popup.CreatePopupMenu())
3449 } // if (selIndex >= 0)
3450
3451 }
3452
3453 void CGitStatusListCtrl::OnContextMenuHeader(CWnd * pWnd, CPoint point)
3454 {
3455 Locker lock(m_critSec);
3456 m_ColumnManager.OnContextMenuHeader(pWnd,point,!!IsGroupViewEnabled());
3457 }
3458
3459 void CGitStatusListCtrl::OnContextMenu(CWnd* pWnd, CPoint point)
3460 {
3461
3462 if (pWnd == this)
3463 {
3464 OnContextMenuList(pWnd, point);
3465 } // if (pWnd == this)
3466 else if (pWnd == GetHeaderCtrl())
3467 {
3468 OnContextMenuHeader(pWnd, point);
3469 }
3470 }
3471
3472 void CGitStatusListCtrl::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
3473 {
3474
3475 Locker lock(m_critSec);
3476 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
3477 *pResult = 0;
3478 if (m_bBlock)
3479 return;
3480
3481 if (pNMLV->iItem < 0)
3482 {
3483 if (!IsGroupViewEnabled())
3484 return;
3485 POINT pt;
3486 DWORD ptW = GetMessagePos();
3487 pt.x = GET_X_LPARAM(ptW);
3488 pt.y = GET_Y_LPARAM(ptW);
3489 ScreenToClient(&pt);
3490 int group = GetGroupFromPoint(&pt);
3491 if (group < 0)
3492 return;
3493 // check/uncheck the whole group depending on the check-state
3494 // of the first item in the group
3495 m_bBlock = true;
3496 bool bCheck = false;
3497 bool bFirst = false;
3498 LVITEM lv;
3499 for (int i=0; i<GetItemCount(); ++i)
3500 {
3501 SecureZeroMemory(&lv, sizeof(LVITEM));
3502 lv.mask = LVIF_GROUPID;
3503 lv.iItem = i;
3504 GetItem(&lv);
3505 if (lv.iGroupId == group)
3506 {
3507 CTGitPath *entry=(CTGitPath*)GetItemData(i);
3508
3509 if (!bFirst)
3510 {
3511 bCheck = !GetCheck(i);
3512 bFirst = true;
3513 }
3514 if (entry)
3515 {
3516 bool bOldCheck = !!GetCheck(i);
3517 SetEntryCheck(entry, i, bCheck);
3518 if (bCheck != bOldCheck)
3519 {
3520 if (bCheck)
3521 m_nSelected++;
3522 else
3523 m_nSelected--;
3524 }
3525 }
3526 }
3527 }
3528 GetStatisticsString();
3529 m_bBlock = false;
3530 NotifyCheck();
3531 return;
3532 }
3533
3534 CTGitPath *file=(CTGitPath*)GetItemData(pNMLV->iItem);
3535
3536 if (file->m_Action == CTGitPath::LOGACTIONS_UNVER) {
3537 OpenFile(file, OPEN);
3538 return;
3539 }
3540 if( file->m_Action&CTGitPath::LOGACTIONS_UNMERGED )
3541 {
3542 CAppUtils::ConflictEdit(*file,false,m_bIsRevertTheirMy);
3543
3544 }
3545 else
3546 {
3547 if( (!m_Rev1.IsEmpty()) || (!m_Rev1.IsEmpty())) // m_Rev1 twice???
3548 StartDiffTwo(pNMLV->iItem);
3549 else
3550 StartDiff(pNMLV->iItem);
3551 }
3552
3553 }
3554 void CGitStatusListCtrl::StartDiffTwo(int fileindex)
3555 {
3556 if(fileindex<0)
3557 return;
3558
3559 CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);
3560
3561 CGitDiff::Diff(&file1,&file1,
3562 m_Rev1,
3563 m_Rev2);
3564
3565 }
3566 void CGitStatusListCtrl::StartDiffWC(int fileindex)
3567 {
3568 if(fileindex<0)
3569 return;
3570
3571 CString Ver;
3572 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
3573 return;
3574
3575 CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);
3576
3577 CGitDiff::Diff(&file1,&file1, GIT_REV_ZERO, m_CurrentVersion);
3578
3579 }
3580
3581 void CGitStatusListCtrl::StartDiff(int fileindex)
3582 {
3583 if(fileindex<0)
3584 return;
3585
3586 CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);
3587 CTGitPath file2;
3588 if(file1.m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY))
3589 {
3590 file2.SetFromGit(file1.GetGitOldPathString());
3591 }
3592 else
3593 {
3594 file2=file1;
3595 }
3596
3597 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
3598 {
3599 CString fromwhere;
3600 if(m_amend && (file1.m_Action & CTGitPath::LOGACTIONS_ADDED) == 0)
3601 fromwhere = _T("~1");
3602 if( g_Git.IsInitRepos())
3603 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
3604 GIT_REV_ZERO);
3605 else if( file1.m_Action&CTGitPath::LOGACTIONS_ADDED )
3606 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
3607 m_CurrentVersion+fromwhere,true);
3608 else if( file1.m_Action&CTGitPath::LOGACTIONS_DELETED )
3609 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
3610 GitRev::GetHead()+fromwhere,false);
3611 else
3612 CGitDiff::Diff(&file1,&file2,
3613 CString(GIT_REV_ZERO),
3614 GitRev::GetHead()+fromwhere);
3615 }
3616 else
3617 {
3618 GitRev rev;
3619 CString fromwhere = m_CurrentVersion+_T("~1");
3620 if(m_amend)
3621 fromwhere = m_CurrentVersion+_T("~2");
3622 if(rev.GetCommit(fromwhere) || (file1.m_Action == file1.LOGACTIONS_ADDED))
3623 {
3624 CGitDiff::DiffNull(&file1,m_CurrentVersion,true);
3625
3626 }
3627 else if (file1.m_Action == file1.LOGACTIONS_DELETED)
3628 {
3629 if (file1.m_ParentNo > 0)
3630 fromwhere.Format(_T("%s^%d"), m_CurrentVersion, file1.m_ParentNo + 1);
3631
3632 CGitDiff::DiffNull(&file1,fromwhere,false);
3633 }
3634 else
3635 {
3636 if( file1.m_ParentNo & MERGE_MASK)
3637 {
3638
3639 CTGitPath base,theirs, mine;
3640
3641 CTGitPath merge=file1;
3642 CTGitPath directory = merge.GetDirectory();
3643
3644 mine.SetFromGit(CAppUtils::GetMergeTempFile(_T("LOCAL"),merge));
3645 theirs.SetFromGit(CAppUtils::GetMergeTempFile(_T("REMOTE"),merge));
3646 base.SetFromGit(CAppUtils::GetMergeTempFile(_T("BASE"),merge));
3647
3648 CFile tempfile;
3649 //create a empty file, incase stage is not three
3650 tempfile.Open(mine.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
3651 tempfile.Close();
3652 tempfile.Open(theirs.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
3653 tempfile.Close();
3654 tempfile.Open(base.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
3655 tempfile.Close();
3656
3657 merge.SetFromGit(merge.GetGitPathString()+_T("Merged"));
3658
3659 int parent1=-1, parent2 =-1;
3660 for(int i=0;i<this->m_arStatusArray.size();i++)
3661 {
3662 if(m_arStatusArray[i]->GetGitPathString() == file1.GetGitPathString())
3663 {
3664 if(m_arStatusArray[i]->m_ParentNo & MERGE_MASK)
3665 {
3666 }
3667 else
3668 {
3669 if(parent1<0)
3670 {
3671 parent1 = m_arStatusArray[i]->m_ParentNo & PARENT_MASK;
3672 }
3673 else if (parent2 <0)
3674 {
3675 parent2 = m_arStatusArray[i]->m_ParentNo & PARENT_MASK;
3676 }
3677 }
3678 }
3679 }
3680
3681 if(g_Git.GetOneFile(m_CurrentVersion, file1, (CString&)merge.GetWinPathString()))
3682 {
3683 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
3684 }
3685
3686 if(parent1>=0)
3687 {
3688 CString str;
3689 str.Format(_T("%s^%d"),this->m_CurrentVersion, parent1+1);
3690
3691 if(g_Git.GetOneFile(str, file1, (CString&)mine.GetWinPathString()))
3692 {
3693 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
3694 }
3695 }
3696
3697 if(parent2>=0)
3698 {
3699 CString str;
3700 str.Format(_T("%s^%d"),this->m_CurrentVersion, parent2+1);
3701
3702 if(g_Git.GetOneFile(str, file1, (CString&)theirs.GetWinPathString()))
3703 {
3704 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETMERGEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
3705 }
3706 }
3707
3708 if(parent1>=0 && parent2>=0)
3709 {
3710 CString cmd, output;
3711 cmd.Format(_T("git.exe merge-base %s^%d %s^%d"), this->m_CurrentVersion, parent1+1,
3712 this->m_CurrentVersion,parent2+1);
3713
3714 if (g_Git.Run(cmd, &output, NULL, CP_UTF8))
3715 {
3716 }
3717 else
3718 {
3719 if(g_Git.GetOneFile(output.Left(40), file1, (CString&)base.GetWinPathString()))
3720 {
3721 CMessageBox::Show(NULL, IDS_STATUSLIST_FAILEDGETBASEFILE, IDS_APPNAME, MB_OK | MB_ICONERROR);
3722 }
3723 }
3724 }
3725 CAppUtils::StartExtMerge(base, theirs, mine, merge,_T("BASE"),_T("REMOTE"),_T("LOCAL"));
3726
3727 }
3728 else
3729 {
3730 CString str;
3731 if( (file1.m_ParentNo&PARENT_MASK) == 0)
3732 {
3733 str = _T("~1");
3734 }
3735 else
3736 {
3737 str.Format(_T("^%d"), (file1.m_ParentNo&PARENT_MASK)+1);
3738 }
3739 CGitDiff::Diff(&file1,&file2,
3740 m_CurrentVersion,
3741 m_CurrentVersion+str);
3742 }
3743 }
3744 }
3745 #if 0
3746 if (fileindex < 0)
3747 return;
3748 FileEntry * entry = GetListEntry(fileindex);
3749 ASSERT(entry != NULL);
3750 if (entry == NULL)
3751 return;
3752 if (((entry->status == git_wc_status_normal)&&(entry->remotestatus <= git_wc_status_normal))||
3753 (entry->status == git_wc_status_unversioned)||(entry->status == git_wc_status_none))
3754 {
3755 int ret = (int)ShellExecute(this->m_hWnd, NULL, entry->path.GetWinPath(), NULL, NULL, SW_SHOW);
3756 if (ret <= HINSTANCE_ERROR)
3757 {
3758 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
3759 cmd += entry->path.GetWinPathString();
3760 CAppUtils::LaunchApplication(cmd, NULL, false);
3761 }
3762 return;
3763 }
3764
3765 GitDiff diff(NULL, m_hWnd, true);
3766 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
3767 diff.DiffWCFile(
3768 entry->path, entry->textstatus, entry->propstatus,
3769 entry->remotetextstatus, entry->remotepropstatus);
3770 #endif
3771 }
3772
3773 CString CGitStatusListCtrl::GetStatisticsString(bool simple)
3774 {
3775
3776 CString sNormal, sAdded, sDeleted, sModified, sConflicted, sUnversioned, sRenamed;
3777 WORD langID = (WORD)(DWORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
3778 TCHAR buf[MAX_STATUS_STRING_LENGTH];
3779 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_normal, buf, _countof(buf), langID);
3780 sNormal = buf;
3781 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_added, buf, _countof(buf), langID);
3782 sAdded = buf;
3783 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_deleted, buf, _countof(buf), langID);
3784 sDeleted = buf;
3785 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_modified, buf, _countof(buf), langID);
3786 sModified = buf;
3787 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_conflicted, buf, _countof(buf), langID);
3788 sConflicted = buf;
3789 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_unversioned, buf, _countof(buf), langID);
3790 sUnversioned = buf;
3791 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_replaced, buf, _countof(buf), langID);
3792 sRenamed = buf;
3793 CString sToolTip;
3794 if(simple)
3795 {
3796 sToolTip.Format(IDS_STATUSLIST_STATUSLINE1,
3797 this->m_nLineAdded,this->m_nLineDeleted,
3798 (LPCTSTR)sModified, m_nModified,
3799 (LPCTSTR)sAdded, m_nAdded,
3800 (LPCTSTR)sDeleted, m_nDeleted,
3801 (LPCTSTR)sRenamed, m_nRenamed
3802 );
3803 }
3804 else
3805 {
3806 sToolTip.Format(IDS_STATUSLIST_STATUSLINE2,
3807 this->m_nLineAdded,this->m_nLineDeleted,
3808 (LPCTSTR)sNormal, m_nNormal,
3809 (LPCTSTR)sUnversioned, m_nUnversioned,
3810 (LPCTSTR)sModified, m_nModified,
3811 (LPCTSTR)sAdded, m_nAdded,
3812 (LPCTSTR)sDeleted, m_nDeleted,
3813 (LPCTSTR)sConflicted, m_nConflicted
3814 );
3815 }
3816 CString sStats;
3817 sStats.Format(IDS_COMMITDLG_STATISTICSFORMAT, m_nSelected, GetItemCount());
3818 if (m_pStatLabel)
3819 {
3820 m_pStatLabel->SetWindowText(sStats);
3821 }
3822
3823 if (m_pSelectButton)
3824 {
3825 if (m_nSelected == 0)
3826 m_pSelectButton->SetCheck(BST_UNCHECKED);
3827 else if (m_nSelected != GetItemCount())
3828 m_pSelectButton->SetCheck(BST_INDETERMINATE);
3829 else
3830 m_pSelectButton->SetCheck(BST_CHECKED);
3831 }
3832
3833 if (m_pConfirmButton)
3834 {
3835 m_pConfirmButton->EnableWindow(m_nSelected>0);
3836 }
3837
3838 return sToolTip;
3839
3840
3841 }
3842
3843 CString CGitStatusListCtrl::GetCommonDirectory(bool bStrict)
3844 {
3845 if (!bStrict)
3846 {
3847 // not strict means that the selected folder has priority
3848 if (!m_StatusFileList.GetCommonDirectory().IsEmpty())
3849 return m_StatusFileList.GetCommonDirectory().GetWinPath();
3850 }
3851
3852 CTGitPath commonBaseDirectory;
3853 int nListItems = GetItemCount();
3854 for (int i=0; i<nListItems; ++i)
3855 {
3856 CTGitPath baseDirectory,*p= (CTGitPath*)this->GetItemData(i);
3857 ASSERT(p);
3858 if(p==NULL)
3859 continue;
3860 baseDirectory = p->GetDirectory();
3861
3862 if(commonBaseDirectory.IsEmpty())
3863 {
3864 commonBaseDirectory = baseDirectory;
3865 }
3866 else
3867 {
3868 if (commonBaseDirectory.GetWinPathString().GetLength() > baseDirectory.GetWinPathString().GetLength())
3869 {
3870 if (baseDirectory.IsAncestorOf(commonBaseDirectory))
3871 commonBaseDirectory = baseDirectory;
3872 }
3873 }
3874 }
3875 return g_Git.m_CurrentDir+CString(_T("\\"))+commonBaseDirectory.GetWinPath();
3876 }
3877
3878
3879 void CGitStatusListCtrl::SelectAll(bool bSelect, bool /*bIncludeNoCommits*/)
3880 {
3881 CWaitCursor waitCursor;
3882 // block here so the LVN_ITEMCHANGED messages
3883 // get ignored
3884 m_bBlock = TRUE;
3885 SetRedraw(FALSE);
3886
3887 int nListItems = GetItemCount();
3888 if (bSelect)
3889 m_nSelected = nListItems;
3890 else
3891 m_nSelected = 0;
3892
3893 for (int i=0; i<nListItems; ++i)
3894 {
3895 //FileEntry * entry = GetListEntry(i);
3896 //ASSERT(entry != NULL);
3897 CTGitPath *path = (CTGitPath *) GetItemData(i);
3898 if (path == NULL)
3899 continue;
3900 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))
3901 SetEntryCheck(path,i,bSelect);
3902 }
3903
3904 // unblock before redrawing
3905 m_bBlock = FALSE;
3906 SetRedraw(TRUE);
3907 GetStatisticsString();
3908 NotifyCheck();
3909 }
3910
3911 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR *pNMHDR, LRESULT *pResult)
3912 {
3913 LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast<LPNMLVGETINFOTIP>(pNMHDR);
3914 *pResult = 0;
3915 if (m_bBlock)
3916 return;
3917
3918 CTGitPath *entry=(CTGitPath *)GetItemData(pGetInfoTip->iItem);
3919
3920 if (entry)
3921 if (pGetInfoTip->cchTextMax > entry->GetGitPathString().GetLength() + g_Git.m_CurrentDir.GetLength())
3922 {
3923 CString str;
3924 str += g_Git.m_CurrentDir;
3925 str += _T("\\");
3926 str += entry->GetWinPathString();
3927
3928 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, str.GetBuffer(), str.GetLength());
3929 }
3930 }
3931
3932 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult)
3933 {
3934 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
3935
3936 // Take the default processing unless we set this to something else below.
3937 *pResult = CDRF_DODEFAULT;
3938
3939 // First thing - check the draw stage. If it's the control's prepaint
3940 // stage, then tell Windows we want messages for every item.
3941
3942 switch (pLVCD->nmcd.dwDrawStage)
3943 {
3944 case CDDS_PREPAINT:
3945 *pResult = CDRF_NOTIFYITEMDRAW;
3946 break;
3947 case CDDS_ITEMPREPAINT:
3948 {
3949 // This is the prepaint stage for an item. Here's where we set the
3950 // item's text color. Our return value will tell Windows to draw the
3951 // item itself, but it will use the new color we set here.
3952
3953 // Tell Windows to paint the control itself.
3954 *pResult = CDRF_DODEFAULT;
3955 if (m_bBlock)
3956 return;
3957
3958 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
3959
3960 if (m_arStatusArray.size() > (DWORD_PTR)pLVCD->nmcd.dwItemSpec)
3961 {
3962
3963 //FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);
3964 CTGitPath *entry=(CTGitPath *)GetItemData((int)pLVCD->nmcd.dwItemSpec);
3965 if (entry == NULL)
3966 return;
3967
3968 // coloring
3969 // ========
3970 // black : unversioned, normal
3971 // purple : added
3972 // blue : modified
3973 // brown : missing, deleted, replaced
3974 // green : merged (or potential merges)
3975 // red : conflicts or sure conflicts
3976 if(entry->m_Action & CTGitPath::LOGACTIONS_GRAY)
3977 {
3978 crText = RGB(128,128,128);
3979
3980 }
3981 else if(entry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
3982 {
3983 crText = m_Colors.GetColor(CColors::Conflict);
3984
3985 }
3986 else if(entry->m_Action & (CTGitPath::LOGACTIONS_MODIFIED))
3987 {
3988 crText = m_Colors.GetColor(CColors::Modified);
3989
3990 }
3991 else if(entry->m_Action & (CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))
3992 {
3993 crText = m_Colors.GetColor(CColors::Added);
3994 }
3995 else if(entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
3996 {
3997 crText = m_Colors.GetColor(CColors::DeletedNode);
3998 }
3999 else if(entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
4000 {
4001 crText = m_Colors.GetColor(CColors::RenamedNode);
4002 }
4003 else if(entry->m_Action & CTGitPath::LOGACTIONS_MERGED)
4004 {
4005 crText = m_Colors.GetColor(CColors::Merged);
4006 }
4007 else
4008 {
4009 crText = GetSysColor(COLOR_WINDOWTEXT);
4010 }
4011 // Store the color back in the NMLVCUSTOMDRAW struct.
4012 pLVCD->clrText = crText;
4013 }
4014 }
4015 break;
4016 }
4017 }
4018
4019 BOOL CGitStatusListCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
4020 {
4021 if (pWnd != this)
4022 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
4023 if (!m_bBlock)
4024 {
4025 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
4026 SetCursor(hCur);
4027 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
4028 }
4029 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
4030 SetCursor(hCur);
4031 return TRUE;
4032 }
4033
4034 void CGitStatusListCtrl::RemoveListEntry(int index)
4035 {
4036
4037 Locker lock(m_critSec);
4038 DeleteItem(index);
4039
4040 m_arStatusArray.erase(m_arStatusArray.begin()+index);
4041
4042 #if 0
4043 delete m_arStatusArray[m_arListArray[index]];
4044 m_arStatusArray.erase(m_arStatusArray.begin()+m_arListArray[index]);
4045 m_arListArray.erase(m_arListArray.begin()+index);
4046 for (int i=index; i< (int)m_arListArray.size(); ++i)
4047 {
4048 m_arListArray[i]--;
4049 }
4050 #endif
4051 }
4052
4053 ///< Set a checkbox on an entry in the listbox
4054 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync
4055 void CGitStatusListCtrl::SetEntryCheck(CTGitPath* pEntry, int listboxIndex, bool bCheck)
4056 {
4057 pEntry->m_Checked = bCheck;
4058 SetCheck(listboxIndex, bCheck);
4059 }
4060
4061 #if 0
4062 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry* parentEntry, bool bCheck)
4063 {
4064
4065 int nListItems = GetItemCount();
4066 for (int j=0; j< nListItems ; ++j)
4067 {
4068 FileEntry * childEntry = GetListEntry(j);
4069 ASSERT(childEntry != NULL);
4070 if (childEntry == NULL || childEntry == parentEntry)
4071 continue;
4072 if (childEntry->checked != bCheck)
4073 {
4074 if (parentEntry->path.IsAncestorOf(childEntry->path))
4075 {
4076 SetEntryCheck(childEntry,j,bCheck);
4077 if(bCheck)
4078 {
4079 m_nSelected++;
4080 }
4081 else
4082 {
4083 m_nSelected--;
4084 }
4085 }
4086 }
4087 }
4088
4089 }
4090 #endif
4091
4092 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList& pathList)
4093 {
4094
4095 pathList.Clear();
4096 int nListItems = GetItemCount();
4097 for (int i=0; i< nListItems; i++)
4098 {
4099 CTGitPath * entry = (CTGitPath*)GetItemData(i);
4100 ASSERT(entry != NULL);
4101 if (entry->m_Checked)
4102 {
4103 pathList.AddPath(*entry);
4104 }
4105 }
4106 pathList.SortByPathname();
4107
4108 }
4109
4110
4111 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)
4112 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList& pathList, bool /*bNoIgnored*/)
4113 {
4114 pathList.Clear();
4115
4116 POSITION pos = GetFirstSelectedItemPosition();
4117 int index;
4118 while ((index = GetNextSelectedItem(pos)) >= 0)
4119 {
4120 CTGitPath * entry = (CTGitPath*)GetItemData(index);
4121 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))
4122 // continue;
4123 pathList.AddPath(*entry);
4124 }
4125 }
4126
4127 UINT CGitStatusListCtrl::OnGetDlgCode()
4128 {
4129 // we want to process the return key and not have that one
4130 // routed to the default pushbutton
4131 return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS;
4132 }
4133
4134 void CGitStatusListCtrl::OnNMReturn(NMHDR * /*pNMHDR*/, LRESULT *pResult)
4135 {
4136 *pResult = 0;
4137 if (m_bBlock)
4138 return;
4139 POSITION pos = GetFirstSelectedItemPosition();
4140 while ( pos )
4141 {
4142 int index = GetNextSelectedItem(pos);
4143 CTGitPath *file=(CTGitPath*)GetItemData(index);
4144 if (file->m_Action == CTGitPath::LOGACTIONS_UNVER)
4145 {
4146 OpenFile(file, OPEN);
4147 }
4148 else
4149 {
4150 StartDiff(index);
4151 }
4152 }
4153 }
4154
4155 void CGitStatusListCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
4156 {
4157 // Since we catch all keystrokes (to have the enter key processed here instead
4158 // of routed to the default pushbutton) we have to make sure that other
4159 // keys like Tab and Esc still do what they're supposed to do
4160 // Tab = change focus to next/previous control
4161 // Esc = quit the dialog
4162 switch (nChar)
4163 {
4164 case (VK_TAB):
4165 {
4166 ::PostMessage(GetParent()->GetSafeHwnd(), WM_NEXTDLGCTL, GetKeyState(VK_SHIFT)&0x8000, 0);
4167 return;
4168 }
4169 break;
4170 case (VK_ESCAPE):
4171 {
4172 ::SendMessage(GetParent()->GetSafeHwnd(), WM_CLOSE, 0, 0);
4173 }
4174 break;
4175 }
4176
4177 CListCtrl::OnKeyDown(nChar, nRepCnt, nFlags);
4178 }
4179
4180 void CGitStatusListCtrl::PreSubclassWindow()
4181 {
4182 CListCtrl::PreSubclassWindow();
4183 EnableToolTips(TRUE);
4184 SetWindowTheme(GetSafeHwnd(), L"Explorer", NULL);
4185 }
4186
4187 INT_PTR CGitStatusListCtrl::OnToolHitTest(CPoint point, TOOLINFO* pTI) const
4188 {
4189 int row, col;
4190 RECT cellrect;
4191 row = CellRectFromPoint(point, &cellrect, &col );
4192
4193 if (row == -1)
4194 return -1;
4195
4196
4197 pTI->hwnd = m_hWnd;
4198 pTI->uId = (UINT)((row<<10)+(col&0x3ff)+1);
4199 pTI->lpszText = LPSTR_TEXTCALLBACK;
4200
4201 pTI->rect = cellrect;
4202
4203 return pTI->uId;
4204 }
4205
4206 int CGitStatusListCtrl::CellRectFromPoint(CPoint& point, RECT *cellrect, int *col) const
4207 {
4208 int colnum;
4209
4210 // Make sure that the ListView is in LVS_REPORT
4211 if ((GetWindowLong(m_hWnd, GWL_STYLE) & LVS_TYPEMASK) != LVS_REPORT)
4212 return -1;
4213
4214 // Get the top and bottom row visible
4215 int row = GetTopIndex();
4216 int bottom = row + GetCountPerPage();
4217 if (bottom > GetItemCount())
4218 bottom = GetItemCount();
4219
4220 // Get the number of columns
4221 CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
4222 int nColumnCount = pHeader->GetItemCount();
4223
4224 // Loop through the visible rows
4225 for ( ;row <=bottom;row++)
4226 {
4227 // Get bounding rect of item and check whether point falls in it.
4228 CRect rect;
4229 GetItemRect(row, &rect, LVIR_BOUNDS);
4230 if (rect.PtInRect(point))
4231 {
4232 // Now find the column
4233 for (colnum = 0; colnum < nColumnCount; colnum++)
4234 {
4235 int colwidth = GetColumnWidth(colnum);
4236 if (point.x >= rect.left && point.x <= (rect.left + colwidth))
4237 {
4238 RECT rectClient;
4239 GetClientRect(&rectClient);
4240 if (col)
4241 *col = colnum;
4242 rect.right = rect.left + colwidth;
4243
4244 // Make sure that the right extent does not exceed
4245 // the client area
4246 if (rect.right > rectClient.right)
4247 rect.right = rectClient.right;
4248 *cellrect = rect;
4249 return row;
4250 }
4251 rect.left += colwidth;
4252 }
4253 }
4254 }
4255 return -1;
4256 }
4257
4258 BOOL CGitStatusListCtrl::OnToolTipText(UINT /*id*/, NMHDR* /*pNMHDR*/, LRESULT* /*pResult*/)
4259 {
4260 #if 0
4261 TOOLTIPTEXTW* pTTTW = (TOOLTIPTEXTW*)pNMHDR;
4262 CString strTipText;
4263 UINT_PTR nID = pNMHDR->idFrom;
4264
4265 if (nID == 0)
4266 return FALSE;
4267
4268 UINT_PTR row = ((nID-1) >> 10) & 0x3fffff;
4269 UINT_PTR col = (nID-1) & 0x3ff;
4270
4271 if (col == 0)
4272 return FALSE; // no custom tooltip for the path, we use the infotip there!
4273
4274 // get the internal column from the visible columns
4275 int internalcol = 0;
4276 UINT_PTR currentcol = 0;
4277 for (; (currentcol != col)
4278 && (internalcol < m_ColumnManager.GetColumnCount()-1)
4279 ; ++internalcol)
4280 {
4281 if (m_ColumnManager.IsVisible (internalcol))
4282 currentcol++;
4283 }
4284
4285 AFX_MODULE_THREAD_STATE* pModuleThreadState = AfxGetModuleThreadState();
4286 CToolTipCtrl* pToolTip = pModuleThreadState->m_pToolTip;
4287 pToolTip->SendMessage(TTM_SETMAXTIPWIDTH, 0, 300);
4288
4289 *pResult = 0;
4290 if ((internalcol == 2)||(internalcol == 4))
4291 {
4292 FileEntry *fentry = GetListEntry(row);
4293 if (fentry)
4294 {
4295 if (fentry->copied)
4296 {
4297 CString url;
4298 url.Format(IDS_STATUSLIST_COPYFROM, (LPCTSTR)CPathUtils::PathUnescape(fentry->copyfrom_url), (LONG)fentry->copyfrom_rev);
4299 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);
4300 return TRUE;
4301 }
4302 if (fentry->switched)
4303 {
4304 CString url;
4305 url.Format(IDS_STATUSLIST_SWITCHEDTO, (LPCTSTR)CPathUtils::PathUnescape(fentry->url));
4306 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);
4307 return TRUE;
4308 }
4309 if (fentry->keeplocal)
4310 {
4311 lstrcpyn(pTTTW->szText, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_KEEPLOCAL)), 80);
4312 return TRUE;
4313 }
4314 }
4315 }
4316 #endif
4317 return FALSE;
4318 }
4319
4320 void CGitStatusListCtrl::OnPaint()
4321 {
4322 Default();
4323 if ((m_bBusy)||(m_bEmpty))
4324 {
4325 CString str;
4326 if (m_bBusy)
4327 {
4328 if (m_sBusy.IsEmpty())
4329 str.LoadString(IDS_STATUSLIST_BUSYMSG);
4330 else
4331 str = m_sBusy;
4332 }
4333 else
4334 {
4335 if (m_sEmpty.IsEmpty())
4336 str.LoadString(IDS_STATUSLIST_EMPTYMSG);
4337 else
4338 str = m_sEmpty;
4339 }
4340 COLORREF clrText = ::GetSysColor(COLOR_WINDOWTEXT);
4341 COLORREF clrTextBk;
4342 if (IsWindowEnabled())
4343 clrTextBk = ::GetSysColor(COLOR_WINDOW);
4344 else
4345 clrTextBk = ::GetSysColor(COLOR_3DFACE);
4346
4347 CRect rc;
4348 GetClientRect(&rc);
4349 CHeaderCtrl* pHC;
4350 pHC = GetHeaderCtrl();
4351 if (pHC != NULL)
4352 {
4353 CRect rcH;
4354 pHC->GetItemRect(0, &rcH);
4355 rc.top += rcH.bottom;
4356 }
4357 CDC* pDC = GetDC();
4358 {
4359 CMyMemDC memDC(pDC, &rc);
4360
4361 memDC.SetTextColor(clrText);
4362 memDC.SetBkColor(clrTextBk);
4363 memDC.FillSolidRect(rc, clrTextBk);
4364 rc.top += 10;
4365 CGdiObject * oldfont = memDC.SelectStockObject(DEFAULT_GUI_FONT);
4366 memDC.DrawText(str, rc, DT_CENTER | DT_VCENTER |
4367 DT_WORDBREAK | DT_NOPREFIX | DT_NOCLIP);
4368 memDC.SelectObject(oldfont);
4369 }
4370 ReleaseDC(pDC);
4371 }
4372 }
4373
4374 // prevent users from extending our hidden (size 0) columns
4375 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR *pNMHDR, LRESULT *pResult)
4376 {
4377 m_ColumnManager.OnHdnBegintrack(pNMHDR, pResult);
4378 }
4379
4380 // prevent any function from extending our hidden (size 0) columns
4381 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
4382 {
4383 if(!m_ColumnManager.OnHdnItemchanging(pNMHDR, pResult))
4384 Default();
4385 }
4386
4387 void CGitStatusListCtrl::OnDestroy()
4388 {
4389 SaveColumnWidths(true);
4390 CListCtrl::OnDestroy();
4391 }
4392
4393 void CGitStatusListCtrl::OnBeginDrag(NMHDR* /*pNMHDR*/, LRESULT* pResult)
4394 {
4395 #if 0
4396 Locker lock(m_critSec);
4397 CDropFiles dropFiles; // class for creating DROPFILES struct
4398
4399 int index;
4400 POSITION pos = GetFirstSelectedItemPosition();
4401 while ( (index = GetNextSelectedItem(pos)) >= 0 )
4402 {
4403 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
4404 CTGitPath path = fentry->GetPath();
4405 dropFiles.AddFile( path.GetWinPathString() );
4406 }
4407
4408 if ( dropFiles.GetCount()>0 )
4409 {
4410 m_bOwnDrag = true;
4411 dropFiles.CreateStructure();
4412 m_bOwnDrag = false;
4413 }
4414 #endif
4415 *pResult = 0;
4416 }
4417
4418 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry /* = false */)
4419 {
4420 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
4421 for (int col = 0; col <= maxcol; col++)
4422 if (m_ColumnManager.IsVisible (col))
4423 m_ColumnManager.ColumnResized (col);
4424
4425 if (bSaveToRegistry)
4426 m_ColumnManager.WriteSettings();
4427 }
4428
4429 bool CGitStatusListCtrl::EnableFileDrop()
4430 {
4431 m_bFileDropsEnabled = true;
4432 return true;
4433 }
4434
4435 bool CGitStatusListCtrl::HasPath(const CTGitPath& path)
4436 {
4437 for (size_t i=0; i < m_arStatusArray.size(); i++)
4438 {
4439 if (m_arStatusArray[i]->IsEquivalentTo(path))
4440 return true;
4441 }
4442
4443 return false;
4444 }
4445
4446 BOOL CGitStatusListCtrl::PreTranslateMessage(MSG* pMsg)
4447 {
4448 if (pMsg->message == WM_KEYDOWN)
4449 {
4450 switch (pMsg->wParam)
4451 {
4452 case 'A':
4453 {
4454 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
4455 {
4456 // select all entries
4457 for (int i=0; i<GetItemCount(); ++i)
4458 {
4459 SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
4460 }
4461 return TRUE;
4462 }
4463 }
4464 break;
4465 case 'C':
4466 case VK_INSERT:
4467 {
4468 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
4469 {
4470 // copy all selected paths to the clipboard
4471 if (GetAsyncKeyState(VK_SHIFT)&0x8000)
4472 CopySelectedEntriesToClipboard(GITSLC_COLSTATUS);
4473 else
4474 CopySelectedEntriesToClipboard(0);
4475 return TRUE;
4476 }
4477 }
4478 break;
4479 }
4480 }
4481
4482 return CListCtrl::PreTranslateMessage(pMsg);
4483 }
4484
4485 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols)
4486 {
4487
4488 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
4489 // WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
4490
4491 CString sClipboard;
4492 CString temp;
4493 //TCHAR buf[100];
4494 if (GetSelectedCount() == 0)
4495 return false;
4496
4497 // first add the column titles as the first line
4498 // We needn't head when only path copy
4499 //temp.LoadString(IDS_STATUSLIST_COLFILE);
4500 //sClipboard = temp;
4501
4502 DWORD selection = 0;
4503 for (int i = 0, count = m_ColumnManager.GetColumnCount(); i < count; ++i)
4504 if ( ((dwCols == -1) && m_ColumnManager.IsVisible (i))
4505 || ((dwCols != 1) && (i < 32) && ((dwCols & (1 << i)) != 0)))
4506 {
4507 sClipboard += _T("\t") + m_ColumnManager.GetName(i);
4508
4509 if (i < 32)
4510 selection += 1 << i;
4511 }
4512
4513 if(dwCols)
4514 sClipboard += _T("\r\n");
4515
4516 POSITION pos = GetFirstSelectedItemPosition();
4517 int index;
4518 while ((index = GetNextSelectedItem(pos)) >= 0)
4519 {
4520 CTGitPath * entry = (CTGitPath*)GetItemData(index);
4521 if(entry == NULL)
4522 continue;
4523
4524 sClipboard += entry->GetWinPathString();
4525 if (selection & GITSLC_COLFILENAME)
4526 {
4527 sClipboard += _T("\t")+entry->GetFileOrDirectoryName();
4528 }
4529 if (selection & GITSLC_COLEXT)
4530 {
4531 sClipboard += _T("\t")+entry->GetFileExtension();
4532 }
4533
4534 if (selection & GITSLC_COLSTATUS)
4535 {
4536 #if 0
4537 if (entry->isNested)
4538 {
4539 temp.LoadString(IDS_STATUSLIST_NESTED);
4540 }
4541 else
4542 {
4543 GitStatus::GetStatusString(hResourceHandle, entry->status, buf, _countof(buf), (WORD)langID);
4544 if ((entry->copied)&&(_tcslen(buf)>1))
4545 _tcscat_s(buf, 100, _T(" (+)"));
4546 if ((entry->switched)&&(_tcslen(buf)>1))
4547 _tcscat_s(buf, 100, _T(" (s)"));
4548 temp = buf;
4549 }
4550 #endif
4551 sClipboard += _T("\t")+entry->GetActionName();
4552 }
4553 #if 0
4554 if (selection & SVNSLC_COLTEXTSTATUS)
4555 {
4556
4557 if (entry->isNested)
4558 {
4559 temp.LoadString(IDS_STATUSLIST_NESTED);
4560 }
4561 else
4562 {
4563 GitStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, _countof(buf), (WORD)langID);
4564 if ((entry->copied)&&(_tcslen(buf)>1))
4565 _tcscat_s(buf, 100, _T(" (+)"));
4566 if ((entry->switched)&&(_tcslen(buf)>1))
4567 _tcscat_s(buf, 100, _T(" (s)"));
4568 temp = buf;
4569 }
4570 sClipboard += _T("\t")+temp;
4571 }
4572 #endif
4573 #if 0
4574 if (selection & SVNSLC_COLREMOTESTATUS)
4575 {
4576 if (entry->isNested)
4577 {
4578 temp.LoadString(IDS_STATUSLIST_NESTED);
4579 }
4580 else
4581 {
4582 GitStatus::GetStatusString(hResourceHandle, entry->remotestatus, buf, _countof(buf), (WORD)langID);
4583 if ((entry->copied)&&(_tcslen(buf)>1))
4584 _tcscat_s(buf, 100, _T(" (+)"));
4585 if ((entry->switched)&&(_tcslen(buf)>1))
4586 _tcscat_s(buf, 100, _T(" (s)"));
4587 temp = buf;
4588 }
4589 sClipboard += _T("\t")+temp;
4590 }
4591 if (selection & GitSLC_COLPROPSTATUS)
4592 {
4593 if (entry->isNested)
4594 {
4595 temp.Empty();
4596 }
4597 else
4598 {
4599 GitStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, _countof(buf), (WORD)langID);
4600 if ((entry->copied)&&(_tcslen(buf)>1))
4601 _tcscat_s(buf, 100, _T(" (+)"));
4602 if ((entry->switched)&&(_tcslen(buf)>1))
4603 _tcscat_s(buf, 100, _T(" (s)"));
4604 temp = buf;
4605 }
4606 sClipboard += _T("\t")+temp;
4607 }
4608 if (selection & SVNSLC_COLREMOTETEXT)
4609 {
4610 if (entry->isNested)
4611 {
4612 temp.Empty();
4613 }
4614 else
4615 {
4616 GitStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, _countof(buf), (WORD)langID);
4617 temp = buf;
4618 }
4619 sClipboard += _T("\t")+temp;
4620 }
4621 if (selection & SVNSLC_COLREMOTEPROP)
4622 {
4623 // SVNSLC_COLREMOTEPROP
4624 if (entry->isNested)
4625 {
4626 temp.Empty();
4627 }
4628 else
4629 {
4630 GitStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, _countof(buf), (WORD)langID);
4631 temp = buf;
4632 }
4633 sClipboard += _T("\t")+temp;
4634 }
4635 if (selection & SVNSLC_COLURL)
4636 sClipboard += _T("\t")+entry->url;
4637 if (selection & SVNSLC_COLLOCK)
4638 {
4639 if (!m_HeadRev.IsHead())
4640 {
4641 // we have contacted the repository
4642
4643 // decision-matrix
4644 // wc repository text
4645 // "" "" ""
4646 // "" UID1 owner
4647 // UID1 UID1 owner
4648 // UID1 "" lock has been broken
4649 // UID1 UID2 lock has been stolen
4650 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))
4651 {
4652 if (entry->lock_owner.IsEmpty())
4653 temp = entry->lock_remoteowner;
4654 else
4655 temp = entry->lock_owner;
4656 }
4657 else if (entry->lock_remotetoken.IsEmpty())
4658 {
4659 // broken lock
4660 temp.LoadString(IDS_STATUSLIST_LOCKBROKEN);
4661 }
4662 else
4663 {
4664 // stolen lock
4665 temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);
4666 }
4667 }
4668 else
4669 temp = entry->lock_owner;
4670 sClipboard += _T("\t")+temp;
4671 }
4672 if (selection & SVNSLC_COLLOCKCOMMENT)
4673 sClipboard += _T("\t")+entry->lock_comment;
4674 if (selection & SVNSLC_COLAUTHOR)
4675 sClipboard += _T("\t")+entry->last_commit_author;
4676 if (selection & SVNSLC_COLREVISION)
4677 {
4678 temp.Format(_T("%ld"), entry->last_commit_rev);
4679 if (entry->last_commit_rev == 0)
4680 temp.Empty();
4681 sClipboard += _T("\t")+temp;
4682 }
4683 if (selection & SVNSLC_COLREMOTEREVISION)
4684 {
4685 temp.Format(_T("%ld"), entry->remoterev);
4686 if (entry->remoterev == 0)
4687 temp.Empty();
4688 sClipboard += _T("\t")+temp;
4689 }
4690
4691 if (selection & SVNSLC_COLDATE)
4692 {
4693 TCHAR datebuf[SVN_DATE_BUFFER];
4694 apr_time_t date = entry->last_commit_date;
4695 SVN::formatDate(datebuf, date, true);
4696 if (date)
4697 temp = datebuf;
4698 else
4699 temp.Empty();
4700 sClipboard += _T("\t")+temp;
4701 }
4702 if (selection & SVNSLC_COLCOPYFROM)
4703 {
4704 if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)
4705 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());
4706 else
4707 temp = entry->copyfrom_url;
4708 sClipboard += _T("\t")+temp;
4709 }
4710
4711 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
4712 ; i < count
4713 ; ++i)
4714 {
4715 if ((dwCols == -1) && m_ColumnManager.IsVisible (i))
4716 {
4717 CString value
4718 = entry->present_props[m_ColumnManager.GetName(i)];
4719 sClipboard += _T("\t") + value;
4720 }
4721 }
4722 #endif
4723 if (selection & GITSLC_COLADD)
4724 {
4725 sClipboard += _T("\t")+entry->m_StatAdd;
4726 }
4727 if (selection & GITSLC_COLDEL)
4728 {
4729 sClipboard += _T("\t")+entry->m_StatDel;
4730 }
4731
4732 sClipboard += _T("\r\n");
4733 }
4734
4735 return CStringUtils::WriteAsciiStringToClipboard(sClipboard);
4736
4737 return TRUE;
4738
4739 }
4740
4741 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()
4742 {
4743 #if 0
4744 std::set<CString> changelists;
4745 POSITION pos = GetFirstSelectedItemPosition();
4746 int index;
4747 while ((index = GetNextSelectedItem(pos)) >= 0)
4748 {
4749 FileEntry * entry = GetListEntry(index);
4750 if (!entry->changelist.IsEmpty())
4751 changelists.insert(entry->changelist);
4752 }
4753 return changelists.size();
4754 #endif
4755 return 0;
4756 }
4757
4758 bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
4759 {
4760
4761 bool bHasGroups=false;
4762 int max =0;
4763
4764 for(int i=0;i< this->m_arStatusArray.size(); i++)
4765 {
4766 int ParentNo = m_arStatusArray[i]->m_ParentNo&PARENT_MASK;
4767 if( ParentNo > max)
4768 max=m_arStatusArray[i]->m_ParentNo&PARENT_MASK;
4769 }
4770
4771 if ( this->m_UnRevFileList.GetCount()>0 ||
4772 this->m_IgnoreFileList.GetCount()>0 ||
4773 max>0 || bForce)
4774 {
4775 bHasGroups = true;
4776 }
4777
4778 RemoveAllGroups();
4779 EnableGroupView(bHasGroups);
4780
4781 TCHAR groupname[1024];
4782 int groupindex = 0;
4783
4784 if(bHasGroups)
4785 {
4786 LVGROUP grp = {0};
4787 grp.cbSize = sizeof(LVGROUP);
4788 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
4789 groupindex=0;
4790
4791 //if(m_UnRevFileList.GetCount()>0)
4792 if(max >0)
4793 {
4794 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MERGEDFILES)), 1023);
4795 grp.pszHeader = groupname;
4796 grp.iGroupId = MERGE_MASK;
4797 grp.uAlign = LVGA_HEADER_LEFT;
4798 InsertGroup(0, &grp);
4799
4800 for(int i=0;i<=max;i++)
4801 {
4802 CString str;
4803 str.Format(IDS_STATUSLIST_GROUP_DIFFWITHPARENT, i+1);
4804 grp.pszHeader = str.GetBuffer();
4805 str.ReleaseBuffer();
4806 grp.iGroupId = i;
4807 grp.uAlign = LVGA_HEADER_LEFT;
4808 InsertGroup(i+1, &grp);
4809 }
4810 }
4811 else
4812 {
4813 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_MODIFIEDFILES)), 1023);
4814 grp.pszHeader = groupname;
4815 grp.iGroupId = groupindex;
4816 grp.uAlign = LVGA_HEADER_LEFT;
4817 InsertGroup(groupindex++, &grp);
4818
4819
4820 {
4821 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_NOTVERSIONEDFILES)), 1023);
4822 grp.pszHeader = groupname;
4823 grp.iGroupId = groupindex;
4824 grp.uAlign = LVGA_HEADER_LEFT;
4825 InsertGroup(groupindex++, &grp);
4826 }
4827
4828 //if(m_IgnoreFileList.GetCount()>0)
4829 {
4830 _tcsncpy_s(groupname, 1024, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_GROUP_IGNOREDFILES)), 1023);
4831 grp.pszHeader = groupname;
4832 grp.iGroupId = groupindex;
4833 grp.uAlign = LVGA_HEADER_LEFT;
4834 InsertGroup(groupindex++, &grp);
4835 }
4836 }
4837 }
4838
4839 #if 0
4840 m_bHasIgnoreGroup = false;
4841
4842 // now add the items which don't belong to a group
4843 LVGROUP grp = {0};
4844 grp.cbSize = sizeof(LVGROUP);
4845 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
4846 CString sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET));
4847 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
4848 grp.pszHeader = groupname;
4849 grp.iGroupId = groupindex;
4850 grp.uAlign = LVGA_HEADER_LEFT;
4851 InsertGroup(groupindex++, &grp);
4852
4853 for (std::map<CString,int>::iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
4854 {
4855 if (it->first.Compare(SVNSLC_IGNORECHANGELIST)!=0)
4856 {
4857 LVGROUP grp = {0};
4858 grp.cbSize = sizeof(LVGROUP);
4859 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
4860 _tcsncpy_s(groupname, 1024, it->first, 1023);
4861 grp.pszHeader = groupname;
4862 grp.iGroupId = groupindex;
4863 grp.uAlign = LVGA_HEADER_LEFT;
4864 it->second = InsertGroup(groupindex++, &grp);
4865 }
4866 else
4867 m_bHasIgnoreGroup = true;
4868 }
4869
4870 if (m_bHasIgnoreGroup)
4871 {
4872 // and now add the group 'ignore-on-commit'
4873 std::map<CString,int>::iterator it = m_changelists.find(SVNSLC_IGNORECHANGELIST);
4874 if (it != m_changelists.end())
4875 {
4876 grp.cbSize = sizeof(LVGROUP);
4877 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
4878 _tcsncpy_s(groupname, 1024, SVNSLC_IGNORECHANGELIST, 1023);
4879 grp.pszHeader = groupname;
4880 grp.iGroupId = groupindex;
4881 grp.uAlign = LVGA_HEADER_LEFT;
4882 it->second = InsertGroup(groupindex, &grp);
4883 }
4884 }
4885 #endif
4886 return bHasGroups;
4887 }
4888
4889 void CGitStatusListCtrl::NotifyCheck()
4890 {
4891 CWnd* pParent = GetParent();
4892 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
4893 {
4894 pParent->SendMessage(GITSLNM_CHECKCHANGED, m_nSelected);
4895 }
4896 }
4897
4898 int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash,CTGitPathList *list)
4899 {
4900 BYTE_VECTOR out;
4901 this->m_bBusy=TRUE;
4902 m_CurrentVersion=hash;
4903
4904 int count = 0;
4905 if(list == NULL)
4906 count = 1;
4907 else
4908 count = list->GetCount();
4909
4910 CString head = _T("HEAD");
4911 if(m_amend)
4912 head = _T("HEAD~1");
4913
4914 if(hash == GIT_REV_ZERO)
4915 {
4916 for(int i=0;i<count;i++)
4917 {
4918 BYTE_VECTOR cmdout;
4919 cmdout.clear();
4920 CString cmd;
4921 if(!g_Git.IsInitRepos())
4922 {
4923 // also list staged files which will be in the commit
4924 cmd=(_T("git.exe diff-index --cached --raw ") + head + _T(" --numstat -C -M -z"));
4925 g_Git.Run(cmd, &cmdout);
4926
4927 if(list == NULL)
4928 cmd=(_T("git.exe diff-index --raw ") + head + _T(" --numstat -C -M -z"));
4929 else
4930 cmd.Format(_T("git.exe diff-index --raw ") + head + _T(" --numstat -C -M -z -- \"%s\""),(*list)[i].GetGitPathString());
4931
4932 BYTE_VECTOR cmdErr;
4933 if(g_Git.Run(cmd, &cmdout, &cmdErr))
4934 {
4935 int last = cmdErr.RevertFind(0,-1);
4936 CString str;
4937 g_Git.StringAppend(&str, &cmdErr[last + 1], CP_UTF8, cmdErr.size() - last -1);
4938 CMessageBox::Show(NULL, str, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
4939 }
4940
4941 out.append(cmdout, 0);
4942 }
4943 else // Init Repository
4944 {
4945 //We will list all added file for init repository because commit will comit these
4946 //if(list == NULL)
4947 cmd=_T("git.exe ls-files -s -t -z");
4948 //else
4949 // cmd.Format(_T("git.exe ls-files -s -t -z -- \"%s\""),(*list)[i].GetGitPathString());
4950
4951 g_Git.Run(cmd, &cmdout);
4952 //out+=cmdout;
4953 out.append(cmdout,0);
4954 }
4955 }
4956
4957 if(g_Git.IsInitRepos())
4958 {
4959 m_StatusFileList.ParserFromLsFile(out);
4960 for(int i=0;i<m_StatusFileList.GetCount();i++)
4961 ((CTGitPath&)(m_StatusFileList[i])).m_Action=CTGitPath::LOGACTIONS_ADDED;
4962 }
4963 else
4964 this->m_StatusFileList.ParserFromLog(out);
4965
4966 //handle delete conflict case, when remote : modified, local : deleted.
4967 for(int i=0;i<count;i++)
4968 {
4969 BYTE_VECTOR cmdout;
4970 CString cmd;
4971
4972 if(list == NULL)
4973 cmd=_T("git.exe ls-files -u -t -z");
4974 else
4975 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),(*list)[i].GetGitPathString());
4976
4977 g_Git.Run(cmd, &cmdout);
4978
4979 CTGitPathList conflictlist;
4980 conflictlist.ParserFromLog(cmdout);
4981 for(int i=0;i<conflictlist.GetCount();i++)
4982 {
4983 CTGitPath *p=m_StatusFileList.LookForGitPath(conflictlist[i].GetGitPathString());
4984 if(p)
4985 p->m_Action|=CTGitPath::LOGACTIONS_UNMERGED;
4986 else
4987 m_StatusFileList.AddPath(conflictlist[i]);
4988 }
4989 }
4990
4991 // handle source files of file renames/moves (issue #860)
4992 // if a file gets renamed and the new file "git add"ed, diff-index doesn't list the source file anymore
4993 for(int i = 0; i < count; i++)
4994 {
4995 BYTE_VECTOR cmdout;
4996 CString cmd;
4997
4998 if(list == NULL)
4999 cmd = _T("git.exe ls-files -d -z");
5000 else
5001 cmd.Format(_T("git.exe ls-files -d -z -- \"%s\""),(*list)[i].GetGitPathString());
5002
5003 g_Git.Run(cmd, &cmdout);
5004
5005 CTGitPathList deletelist;
5006 deletelist.ParserFromLog(cmdout, true);
5007 for(int i = 0; i < deletelist.GetCount(); i++)
5008 {
5009 CTGitPath *p = m_StatusFileList.LookForGitPath(deletelist[i].GetGitPathString());
5010 if(!p)
5011 m_StatusFileList.AddPath(deletelist[i]);
5012 else if ((p->m_Action == CTGitPath::LOGACTIONS_ADDED || p->m_Action == CTGitPath::LOGACTIONS_REPLACED) && !p->Exists())
5013 {
5014 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)
5015 {
5016 g_Git.Run(_T("git.exe rm -f --cache -- \"") + p->GetWinPathString() + _T("\""), &cmdout);
5017 m_StatusFileList.RemoveItem(*p);
5018 }
5019 }
5020 }
5021 }
5022 }
5023 else
5024 {
5025 int count = 0;
5026 if(list == NULL)
5027 count = 1;
5028 else
5029 count = list->GetCount();
5030
5031 for(int i=0;i<count;i++)
5032 {
5033 BYTE_VECTOR cmdout;
5034 CString cmd;
5035 if(list == NULL)
5036 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M -z %s"),hash);
5037 else
5038 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M %s -z -- \"%s\""),hash,(*list)[i].GetGitPathString());
5039
5040 g_Git.Run(cmd, &cmdout, NULL);
5041
5042 out.append(cmdout);
5043 }
5044 this->m_StatusFileList.ParserFromLog(out);
5045
5046 }
5047
5048 for(int i=0;i<m_StatusFileList.GetCount();i++)
5049 {
5050 CTGitPath * gitpatch=(CTGitPath*)&m_StatusFileList[i];
5051 gitpatch->m_Checked = TRUE;
5052 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
5053 }
5054
5055 this->m_bBusy=FALSE;
5056 return 0;
5057 }
5058
5059 int CGitStatusListCtrl::UpdateWithGitPathList(CTGitPathList &list)
5060 {
5061 m_arStatusArray.clear();
5062 for(int i=0;i<list.GetCount();i++)
5063 {
5064 CTGitPath * gitpath=(CTGitPath*)&list[i];
5065
5066 if(gitpath ->m_Action & CTGitPath::LOGACTIONS_HIDE)
5067 continue;
5068
5069 gitpath->m_Checked = TRUE;
5070 m_arStatusArray.push_back((CTGitPath*)&list[i]);
5071 }
5072 return 0;
5073 }
5074
5075 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList *List)
5076 {
5077 this->m_UnRevFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER,List);
5078 for(int i=0;i<m_UnRevFileList.GetCount();i++)
5079 {
5080 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
5081 gitpatch->m_Checked = FALSE;
5082 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
5083 }
5084 return 0;
5085 }
5086
5087 int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList *List)
5088 {
5089 this->m_IgnoreFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER|CTGitPath::LOGACTIONS_IGNORE,List);
5090 for(int i=0;i<m_IgnoreFileList.GetCount();i++)
5091 {
5092 CTGitPath * gitpatch=(CTGitPath*)&m_IgnoreFileList[i];
5093 gitpatch->m_Checked = FALSE;
5094 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
5095 }
5096 return 0;
5097 }
5098 int CGitStatusListCtrl::UpdateFileList(int mask,bool once,CTGitPathList *List)
5099 {
5100 if(mask&CGitStatusListCtrl::FILELIST_MODIFY)
5101 {
5102 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_MODIFY)))
5103 {
5104 UpdateFileList(git_revnum_t(GIT_REV_ZERO),List);
5105 m_FileLoaded|=CGitStatusListCtrl::FILELIST_MODIFY;
5106 }
5107 }
5108 if(mask&CGitStatusListCtrl::FILELIST_UNVER)
5109 {
5110 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_UNVER)))
5111 {
5112 UpdateUnRevFileList(List);
5113 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
5114 }
5115 if(mask&CGitStatusListCtrl::FILELIST_IGNORE && (once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_IGNORE))))
5116 {
5117 UpdateIgnoreFileList(List);
5118 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
5119 }
5120 }
5121 return 0;
5122 }
5123
5124 void CGitStatusListCtrl::Clear()
5125 {
5126 m_FileLoaded=0;
5127 this->DeleteAllItems();
5128 this->m_arListArray.clear();
5129 this->m_arStatusArray.clear();
5130 this->m_changelists.clear();
5131 }
5132 //////////////////////////////////////////////////////////////////////////
5133 #if 0
5134 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium, DWORD * /*pdwEffect*/, POINTL pt)
5135 {
5136 if(pFmtEtc->cfFormat == CF_HDROP && medium.tymed == TYMED_HGLOBAL)
5137 {
5138 HDROP hDrop = (HDROP)GlobalLock(medium.hGlobal);
5139 if(hDrop != NULL)
5140 {
5141 TCHAR szFileName[MAX_PATH];
5142
5143 UINT cFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
5144
5145 POINT clientpoint;
5146 clientpoint.x = pt.x;
5147 clientpoint.y = pt.y;
5148 ScreenToClient(m_hTargetWnd, &clientpoint);
5149 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
5150 {
5151 CTSVNPathList changelistItems;
5152 for(UINT i = 0; i < cFiles; ++i)
5153 {
5154 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
5155 changelistItems.AddPath(CTSVNPath(szFileName));
5156 }
5157 // find the changelist name
5158 CString sChangelist;
5159 LONG_PTR nGroup = m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint);
5160 for (std::map<CString, int>::iterator it = m_pSVNStatusListCtrl->m_changelists.begin(); it != m_pSVNStatusListCtrl->m_changelists.end(); ++it)
5161 if (it->second == nGroup)
5162 sChangelist = it->first;
5163 if (!sChangelist.IsEmpty())
5164 {
5165 SVN git;
5166 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
5167 {
5168 for (int l=0; l<changelistItems.GetCount(); ++l)
5169 {
5170 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
5171 if (index >= 0)
5172 {
5173 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
5174 if (e)
5175 {
5176 e->changelist = sChangelist;
5177 if (!e->IsFolder())
5178 {
5179 if (m_pSVNStatusListCtrl->m_changelists.find(e->changelist)!=m_pSVNStatusListCtrl->m_changelists.end())
5180 m_pSVNStatusListCtrl->SetItemGroup(index, m_pSVNStatusListCtrl->m_changelists[e->changelist]);
5181 else
5182 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
5183 }
5184 }
5185 }
5186 else
5187 {
5188 HWND hParentWnd = GetParent(m_hTargetWnd);
5189 if (hParentWnd != NULL)
5190 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
5191 }
5192 }
5193 }
5194 else
5195 {
5196 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
5197 }
5198 }
5199 else
5200 {
5201 SVN git;
5202 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
5203 {
5204 for (int l=0; l<changelistItems.GetCount(); ++l)
5205 {
5206 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
5207 if (index >= 0)
5208 {
5209 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
5210 if (e)
5211 {
5212 e->changelist = sChangelist;
5213 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
5214 }
5215 }
5216 else
5217 {
5218 HWND hParentWnd = GetParent(m_hTargetWnd);
5219 if (hParentWnd != NULL)
5220 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
5221 }
5222 }
5223 }
5224 else
5225 {
5226 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
5227 }
5228 }
5229 }
5230 else
5231 {
5232 for(UINT i = 0; i < cFiles; ++i)
5233 {
5234 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
5235 HWND hParentWnd = GetParent(m_hTargetWnd);
5236 if (hParentWnd != NULL)
5237 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)szFileName);
5238 }
5239 }
5240 }
5241 GlobalUnlock(medium.hGlobal);
5242 }
5243 return true; //let base free the medium
5244 }
5245 HRESULT STDMETHODCALLTYPE CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect)
5246 {
5247 CIDropTarget::DragOver(grfKeyState, pt, pdwEffect);
5248 *pdwEffect = DROPEFFECT_COPY;
5249 if (m_pSVNStatusListCtrl)
5250 {
5251 POINT clientpoint;
5252 clientpoint.x = pt.x;
5253 clientpoint.y = pt.y;
5254 ScreenToClient(m_hTargetWnd, &clientpoint);
5255 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
5256 {
5257 *pdwEffect = DROPEFFECT_MOVE;
5258 }
5259 else if ((!m_pSVNStatusListCtrl->m_bFileDropsEnabled)||(m_pSVNStatusListCtrl->m_bOwnDrag))
5260 {
5261 *pdwEffect = DROPEFFECT_NONE;
5262 }
5263 }
5264 return S_OK;
5265 }f
5266
5267 #endif
5268
5269 void CGitStatusListCtrl::FileSaveAs(CTGitPath *path)
5270 {
5271 CString filename;
5272 filename.Format(_T("%s-%s%s"), path->GetBaseFilename(), this->m_CurrentVersion.Left(g_Git.GetShortHASHLength()), path->GetFileExtension());
5273 CFileDialog dlg(FALSE,NULL,
5274 filename,
5275 OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
5276 NULL);
5277 CString currentpath;
5278 currentpath=g_Git.m_CurrentDir+_T("\\");
5279 currentpath+=path->GetWinPathString();
5280
5281 dlg.m_ofn.lpstrInitialDir=currentpath.GetBuffer();
5282
5283 CString cmd,out;
5284 if(dlg.DoModal()==IDOK)
5285 {
5286 filename = dlg.GetPathName();
5287 if(m_CurrentVersion == GIT_REV_ZERO)
5288 {
5289 if(!CopyFile(g_Git.m_CurrentDir +_T("\\") + path->GetWinPath(),filename,false))
5290 {
5291 MessageBox(CFormatMessageWrapper(), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
5292 return;
5293 }
5294
5295 }
5296 else
5297 {
5298 if(g_Git.GetOneFile(m_CurrentVersion,*path,filename))
5299 {
5300 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, path->GetGitPathString(), m_CurrentVersion, filename);
5301 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
5302 return;
5303 }
5304 }
5305 }
5306
5307 }
5308
5309 int CGitStatusListCtrl::RevertSelectedItemToVersion()
5310 {
5311 if(this->m_CurrentVersion.IsEmpty())
5312 return 0;
5313 if(this->m_CurrentVersion == GIT_REV_ZERO)
5314 return 0;
5315
5316 POSITION pos = GetFirstSelectedItemPosition();
5317 int index;
5318 CString cmd,out;
5319 int count =0;
5320 while ((index = GetNextSelectedItem(pos)) >= 0)
5321 {
5322 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
5323 cmd.Format(_T("git.exe checkout %s -- \"%s\""),m_CurrentVersion,fentry->GetGitPathString());
5324 out.Empty();
5325 if (g_Git.Run(cmd, &out, CP_UTF8))
5326 if (MessageBox(out, _T("TortoiseGit"), MB_ICONEXCLAMATION | MB_OKCANCEL) == IDCANCEL)
5327 break;
5328 else
5329 count++;
5330 }
5331
5332 out.Format(IDS_STATUSLIST_FILESREVERTED, count, m_CurrentVersion);
5333 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
5334 return 0;
5335 }
5336
5337 void CGitStatusListCtrl::OpenFile(CTGitPath*filepath,int mode)
5338 {
5339 CString file;
5340 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
5341 {
5342 file= filepath->GetWinPath();
5343 }
5344 else
5345 {
5346 CString temppath;
5347 GetTempPath(temppath);
5348 file.Format(_T("%s%s_%s%s"),
5349 temppath,
5350 filepath->GetBaseFilename(),
5351 m_CurrentVersion.Left(g_Git.GetShortHASHLength()),
5352 filepath->GetFileExtension());
5353 CString cmd,out;
5354 if(g_Git.GetOneFile(m_CurrentVersion, *filepath, file))
5355 {
5356 out.Format(IDS_STATUSLIST_CHECKOUTFILEFAILED, filepath->GetGitPathString(), m_CurrentVersion, file);
5357 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
5358 return;
5359 }
5360
5361 }
5362 if(mode == ALTERNATIVEEDITOR)
5363 {
5364 CAppUtils::LaunchAlternativeEditor(file);
5365 return;
5366 }
5367 int ret = HINSTANCE_ERROR;
5368
5369 if(mode == OPEN )
5370 {
5371 ret = (int)ShellExecute(this->m_hWnd, NULL,file, NULL, NULL, SW_SHOW);
5372
5373 if (ret > HINSTANCE_ERROR)
5374 {
5375 return;
5376 }
5377 }
5378
5379 {
5380 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
5381 cmd += file;
5382 CAppUtils::LaunchApplication(cmd, NULL, false);
5383 }
5384
5385 }
Windows Explorer Extension to Operate Git