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