?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
dropped unused TSVN settings
[TortoiseGit.git] / src / Git / GitStatusListCtrl.cpp
blobf8d58a3e4f868f8d024c91b17776014a3f6265b8
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 XPorLater = false;
1725 OSVERSIONINFOEX inf;
1726 SecureZeroMemory(&inf, sizeof(OSVERSIONINFOEX));
1727 inf.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX);
1728 GetVersionEx((OSVERSIONINFO *)&inf);
1729 WORD fullver = MAKEWORD(inf.dwMinorVersion, inf.dwMajorVersion);
1730 if (fullver >= 0x0501)
1731 XPorLater = true;
1732 //bool bShift = !!(GetAsyncKeyState(VK_SHIFT) & 0x8000);
1733 CTGitPath * filepath;
1734
1735 int selIndex = GetSelectionMark();
1736 if ((point.x == -1) && (point.y == -1))
1737 {
1738 CRect rect;
1739 GetItemRect(selIndex, &rect, LVIR_LABEL);
1740 ClientToScreen(&rect);
1741 point = rect.CenterPoint();
1742 }
1743 if ((GetSelectedCount() == 0)&&(XPorLater)&&(m_bHasCheckboxes))
1744 {
1745 // nothing selected could mean the context menu is requested for
1746 // a group header
1747 OnContextMenuGroup(pWnd, point);
1748 }
1749 else if (selIndex >= 0)
1750 {
1751 //FileEntry * entry = GetListEntry(selIndex);
1752
1753 filepath = (CTGitPath * )GetItemData(selIndex);
1754
1755 ASSERT(filepath != NULL);
1756 if (filepath == NULL)
1757 return;
1758
1759 //const CTGitPath& filepath = entry->path;
1760 int wcStatus = filepath->m_Action;
1761 // entry is selected, now show the popup menu
1762 Locker lock(m_critSec);
1763 CIconMenu popup;
1764 CMenu changelistSubMenu;
1765 CMenu ignoreSubMenu;
1766 if (popup.CreatePopupMenu())
1767 {
1768 //Add Menu for version controlled file
1769
1770 if (GetSelectedCount() > 0 && wcStatus & CTGitPath::LOGACTIONS_UNMERGED)
1771 {
1772 if (GetSelectedCount() == 1 && (m_dwContextMenus & GITSLC_POPCONFLICT)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1773 {
1774 popup.AppendMenuIcon(IDGITLC_EDITCONFLICT, IDS_MENUCONFLICT, IDI_CONFLICT);
1775 }
1776 if (m_dwContextMenus & GITSLC_POPRESOLVE)
1777 {
1778 popup.AppendMenuIcon(IDGITLC_RESOLVECONFLICT, IDS_STATUSLIST_CONTEXT_RESOLVED, IDI_RESOLVE);
1779 }
1780 if ((m_dwContextMenus & GITSLC_POPRESOLVE)/*&&(entry->textstatus == git_wc_status_conflicted)*/)
1781 {
1782 popup.AppendMenuIcon(IDGITLC_RESOLVETHEIRS, IDS_SVNPROGRESS_MENUUSETHEIRS, IDI_RESOLVE);
1783 popup.AppendMenuIcon(IDGITLC_RESOLVEMINE, IDS_SVNPROGRESS_MENUUSEMINE, IDI_RESOLVE);
1784 }
1785 if ((m_dwContextMenus & GITSLC_POPCONFLICT)||(m_dwContextMenus & GITSLC_POPRESOLVE))
1786 popup.AppendMenu(MF_SEPARATOR);
1787 }
1788
1789 if (GetSelectedCount() > 0)
1790 {
1791 if (wcStatus & CTGitPath::LOGACTIONS_UNVER)
1792 if (m_dwContextMenus & GITSLC_POPADD)
1793 {
1794 //if ( entry->IsFolder() )
1795 //{
1796 // popup.AppendMenuIcon(IDSVNLC_ADD_RECURSIVE, IDS_STATUSLIST_CONTEXT_ADD_RECURSIVE, IDI_ADD);
1797 //}
1798 //else
1799 {
1800 popup.AppendMenuIcon(IDGITLC_ADD, IDS_STATUSLIST_CONTEXT_ADD, IDI_ADD);
1801 }
1802 }
1803 }
1804
1805 if (!(wcStatus &CTGitPath::LOGACTIONS_UNVER))
1806 {
1807 if ( (m_dwContextMenus & GITSLC_POPCOMPAREWITHBASE) && GetSelectedCount()>0)
1808 {
1809 if(filepath->m_ParentNo & MERGE_MASK)
1810 popup.AppendMenuIcon(IDGITLC_COMPARE, IDS_TREE_DIFF, IDI_DIFF);
1811 else
1812 popup.AppendMenuIcon(IDGITLC_COMPARE, IDS_LOG_COMPAREWITHBASE, IDI_DIFF);
1813
1814 popup.SetDefaultItem(IDGITLC_COMPARE, FALSE);
1815 }
1816
1817 if ((m_dwContextMenus & this->GetContextMenuBit(IDGITLC_COMPAREWC)) && GetSelectedCount()>0)
1818 {
1819 if( (!m_CurrentVersion.IsEmpty()) && m_CurrentVersion != GIT_REV_ZERO)
1820 popup.AppendMenuIcon(IDGITLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
1821 }
1822 //Select one items
1823 if (GetSelectedCount() == 1)
1824 {
1825 bool bEntryAdded = false;
1826 //if (entry->remotestatus <= git_wc_status_normal)
1827 //{
1828 // if (wcStatus > git_wc_status_normal)
1829 // {
1830 // if ((m_dwContextMenus & SVNSLC_POPGNUDIFF)&&(wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing))
1831 // {
1832 if(!g_Git.IsInitRepos() && (m_dwContextMenus&GITSLC_POPGNUDIFF))
1833 {
1834 popup.AppendMenuIcon(IDGITLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1835
1836 bEntryAdded = true;
1837 }
1838 // }
1839 // }
1840 //
1841 //}
1842 //else if (wcStatus != git_wc_status_deleted)
1843 //{
1844 // if (m_dwContextMenus & SVNSLC_POPCOMPARE)
1845 // {
1846 // popup.AppendMenuIcon(IDSVNLC_COMPAREWC, IDS_LOG_POPUP_COMPARE, IDI_DIFF);
1847 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
1848 // bEntryAdded = true;
1849 // }
1850 // if (m_dwContextMenus & SVNSLC_POPGNUDIFF)
1851 // {
1852 // popup.AppendMenuIcon(IDSVNLC_GNUDIFF1, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1853 // bEntryAdded = true;
1854 // }
1855 //}
1856 if (bEntryAdded)
1857 popup.AppendMenu(MF_SEPARATOR);
1858 }
1859 //else if (GetSelectedCount() > 1)
1860 //{
1861 // if (m_dwContextMenus & SVNSLC_POPCOMMIT)
1862 // {
1863 // popup.AppendMenuIcon(IDSVNLC_COMMIT, IDS_STATUSLIST_CONTEXT_COMMIT, IDI_COMMIT);
1864 // popup.SetDefaultItem(IDSVNLC_COMPARE, FALSE);
1865 // }
1866 //}
1867 }
1868
1869 if( (!this->m_Rev1.IsEmpty()) || (!this->m_Rev1.IsEmpty()) )
1870 {
1871 if(GetSelectedCount() == 1)
1872 {
1873 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_COMPARETWO))
1874 {
1875 popup.AppendMenuIcon(IDGITLC_COMPARETWO, IDS_LOG_POPUP_COMPARETWO, IDI_DIFF);
1876 popup.SetDefaultItem(IDGITLC_COMPARETWO, FALSE);
1877 }
1878 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_GNUDIFF2))
1879 {
1880 popup.AppendMenuIcon(IDGITLC_GNUDIFF2, IDS_LOG_POPUP_GNUDIFF, IDI_DIFF);
1881 }
1882 }
1883 }
1884
1885 //Select Multi item
1886 if (GetSelectedCount() > 0)
1887 {
1888 if ((GetSelectedCount() == 2) && (m_dwContextMenus & this->GetContextMenuBit(GITSLC_POPCOMPARETWOFILES)))
1889 {
1890 POSITION pos = GetFirstSelectedItemPosition();
1891 int index = GetNextSelectedItem(pos);
1892 if (index >= 0)
1893 {
1894 CTGitPath * entry2 = NULL;
1895 bool bothItemsAreFiles = true;
1896 entry2 = (CTGitPath * )GetItemData(index);
1897 if (entry2)
1898 bothItemsAreFiles = !entry2->IsDirectory();
1899 index = GetNextSelectedItem(pos);
1900 if (index >= 0)
1901 {
1902 entry2 = (CTGitPath * )GetItemData(index);
1903 if (entry2)
1904 bothItemsAreFiles = bothItemsAreFiles && !entry2->IsDirectory();
1905 if (bothItemsAreFiles)
1906 popup.AppendMenuIcon(IDGITLC_COMPARETWOFILES, IDS_STATUSLIST_CONTEXT_COMPARETWOFILES, IDI_DIFF);
1907 }
1908 }
1909 }
1910 // if ((GetSelectedCount() == 2)&&(m_dwContextMenus & SVNSLC_POPREPAIRMOVE))
1911 // {
1912 // POSITION pos = GetFirstSelectedItemPosition();
1913 // int index = GetNextSelectedItem(pos);
1914 // if (index >= 0)
1915 // {
1916 // FileEntry * entry = GetListEntry(index);
1917 // git_wc_status_kind status1 = git_wc_status_none;
1918 // git_wc_status_kind status2 = git_wc_status_none;
1919 // if (entry)
1920 // status1 = entry->status;
1921 // index = GetNextSelectedItem(pos);
1922 // if (index >= 0)
1923 // {
1924 // entry = GetListEntry(index);
1925 // if (entry)
1926 // status2 = entry->status;
1927 // if ((status1 == git_wc_status_missing && status2 == git_wc_status_unversioned) ||
1928 // (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned))
1929 // {
1930 // popup.AppendMenuIcon(IDSVNLC_REPAIRMOVE, IDS_STATUSLIST_CONTEXT_REPAIRMOVE);
1931 // }
1932 // }
1933 // }
1934 // }
1935 // if (wcStatus > git_wc_status_normal)
1936 // {
1937 // if (m_dwContextMenus & SVNSLC_POPREVERT)
1938 // {
1939 // // reverting missing folders is not possible
1940 // if (!entry->IsFolder() || (wcStatus != git_wc_status_missing))
1941 // {
1942 // popup.AppendMenuIcon(IDSVNLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
1943 // }
1944 // }
1945 // }
1946 // if (entry->remotestatus > git_wc_status_normal)
1947 // {
1948 // if (m_dwContextMenus & SVNSLC_POPUPDATE)
1949 // {
1950 // popup.AppendMenuIcon(IDSVNLC_UPDATE, IDS_MENUUPDATE, IDI_UPDATE);
1951 // }
1952 // }
1953 }
1954
1955 if ( (GetSelectedCount() >0 ) && (!(wcStatus & CTGitPath::LOGACTIONS_UNVER)))
1956 {
1957 if ((m_dwContextMenus & GITSLC_POPREVERT) && (this->m_CurrentVersion.IsEmpty() || this->m_CurrentVersion == GIT_REV_ZERO))
1958 {
1959 popup.AppendMenuIcon(IDGITLC_REVERT, IDS_MENUREVERT, IDI_REVERT);
1960 }
1961
1962 if ((m_dwContextMenus & GetContextMenuBit(IDGITLC_REVERTTOREV)) && ( !this->m_CurrentVersion.IsEmpty() )
1963 && this->m_CurrentVersion != GIT_REV_ZERO && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1964 {
1965 popup.AppendMenuIcon(IDGITLC_REVERTTOREV, IDS_LOG_POPUP_REVERTTOREV, IDI_REVERT);
1966 }
1967 }
1968
1969 if ((GetSelectedCount() == 1)&&(!(wcStatus & CTGitPath::LOGACTIONS_UNVER))
1970 &&(!(wcStatus & CTGitPath::LOGACTIONS_IGNORE)))
1971 {
1972 if (m_dwContextMenus & GITSLC_POPSHOWLOG)
1973 {
1974 popup.AppendMenuIcon(IDGITLC_LOG, IDS_REPOBROWSE_SHOWLOG, IDI_LOG);
1975 }
1976 if (m_dwContextMenus & GITSLC_POPBLAME && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1977 {
1978 popup.AppendMenuIcon(IDGITLC_BLAME, IDS_MENUBLAME, IDI_BLAME);
1979 }
1980 }
1981 // if ((wcStatus != git_wc_status_deleted)&&(wcStatus != git_wc_status_missing) && (GetSelectedCount() == 1))
1982 if ( (GetSelectedCount() == 1) )
1983 {
1984 if (m_dwContextMenus & this->GetContextMenuBit(IDGITLC_SAVEAS) && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1985 {
1986 popup.AppendMenuIcon(IDGITLC_SAVEAS, IDS_LOG_POPUP_SAVE, IDI_SAVEAS);
1987 }
1988
1989 if (m_dwContextMenus & GITSLC_POPOPEN && ! filepath->IsDirectory() && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
1990 {
1991 popup.AppendMenuIcon(IDGITLC_VIEWREV, IDS_LOG_POPUP_VIEWREV);
1992 popup.AppendMenuIcon(IDGITLC_OPEN, IDS_REPOBROWSE_OPEN, IDI_OPEN);
1993 popup.AppendMenuIcon(IDGITLC_OPENWITH, IDS_LOG_POPUP_OPENWITH, IDI_OPEN);
1994 if (wcStatus &CTGitPath::LOGACTIONS_UNVER) {
1995 popup.SetDefaultItem(IDGITLC_OPEN, FALSE);
1996 }
1997 }
1998
1999 if (m_dwContextMenus & GITSLC_POPEXPLORE && !(wcStatus & CTGitPath::LOGACTIONS_DELETED))
2000 {
2001 popup.AppendMenuIcon(IDGITLC_EXPLORE, IDS_STATUSLIST_CONTEXT_EXPLORE, IDI_EXPLORER);
2002 }
2003
2004 }
2005 if (GetSelectedCount() > 0)
2006 {
2007 // if (((wcStatus == git_wc_status_unversioned)||(wcStatus == git_wc_status_ignored))&&(m_dwContextMenus & SVNSLC_POPDELETE))
2008 // {
2009 // popup.AppendMenuIcon(IDSVNLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
2010 // }
2011 // 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))
2012 // {
2013 // if (bShift)
2014 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVEKEEP, IDI_DELETE);
2015 // else
2016 // popup.AppendMenuIcon(IDGitLC_REMOVE, IDS_MENUREMOVE, IDI_DELETE);
2017 // }
2018 if ((wcStatus & CTGitPath::LOGACTIONS_UNVER)/*||(wcStatus == git_wc_status_deleted)*/)
2019 {
2020 if (m_dwContextMenus & GITSLC_POPDELETE)
2021 {
2022 popup.AppendMenuIcon(IDGITLC_DELETE, IDS_MENUREMOVE, IDI_DELETE);
2023 }
2024 }
2025 if ( (wcStatus & CTGitPath::LOGACTIONS_UNVER || wcStatus & CTGitPath::LOGACTIONS_DELETED) )
2026 {
2027 if (m_dwContextMenus & GITSLC_POPIGNORE)
2028 {
2029
2030 CTGitPathList ignorelist;
2031 FillListOfSelectedItemPaths(ignorelist);
2032 //check if all selected entries have the same extension
2033 bool bSameExt = true;
2034 CString sExt;
2035 for (int i=0; i<ignorelist.GetCount(); ++i)
2036 {
2037 if (sExt.IsEmpty() && (i==0))
2038 sExt = ignorelist[i].GetFileExtension();
2039 else if (sExt.CompareNoCase(ignorelist[i].GetFileExtension())!=0)
2040 bSameExt = false;
2041 }
2042 if (bSameExt)
2043 {
2044 if (ignoreSubMenu.CreateMenu())
2045 {
2046 CString ignorepath;
2047 if (ignorelist.GetCount()==1)
2048 ignorepath = ignorelist[0].GetFileOrDirectoryName();
2049 else
2050 ignorepath.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
2051 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_IGNORE, ignorepath);
2052 ignorepath = _T("*")+sExt;
2053 ignoreSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDGITLC_IGNOREMASK, ignorepath);
2054 CString temp;
2055 temp.LoadString(IDS_MENUIGNORE);
2056 popup.InsertMenu((UINT)-1, MF_BYPOSITION | MF_POPUP, (UINT_PTR)ignoreSubMenu.m_hMenu, temp);
2057 }
2058 }
2059 else
2060 {
2061 CString temp;
2062 if (ignorelist.GetCount()==1)
2063 {
2064 temp.LoadString(IDS_MENUIGNORE);
2065 }
2066 else
2067 {
2068 temp.Format(IDS_MENUIGNOREMULTIPLE, ignorelist.GetCount());
2069 }
2070 popup.AppendMenuIcon(IDGITLC_IGNORE, temp, IDI_IGNORE);
2071 }
2072 }
2073 }
2074 }
2075
2076
2077
2078 if (GetSelectedCount() > 0)
2079 {
2080 #if 0
2081 if ((!entry->IsFolder())&&(wcStatus >= git_wc_status_normal)
2082 &&(wcStatus!=git_wc_status_missing)&&(wcStatus!=git_wc_status_deleted)
2083 &&(wcStatus!=git_wc_status_added))
2084 {
2085 popup.AppendMenu(MF_SEPARATOR);
2086 if ((entry->lock_token.IsEmpty())&&(!entry->IsFolder()))
2087 {
2088 if (m_dwContextMenus & SVNSLC_POPLOCK)
2089 {
2090 popup.AppendMenuIcon(IDSVNLC_LOCK, IDS_MENU_LOCK, IDI_LOCK);
2091 }
2092 }
2093 if ((!entry->lock_token.IsEmpty())&&(!entry->IsFolder()))
2094 {
2095 if (m_dwContextMenus & SVNSLC_POPUNLOCK)
2096 {
2097 popup.AppendMenuIcon(IDSVNLC_UNLOCK, IDS_MENU_UNLOCK, IDI_UNLOCK);
2098 }
2099 }
2100 }
2101
2102 if ((!entry->IsFolder())&&((!entry->lock_token.IsEmpty())||(!entry->lock_remotetoken.IsEmpty())))
2103 {
2104 if (m_dwContextMenus & SVNSLC_POPUNLOCKFORCE)
2105 {
2106 popup.AppendMenuIcon(IDSVNLC_UNLOCKFORCE, IDS_MENU_UNLOCKFORCE, IDI_UNLOCK);
2107 }
2108 }
2109
2110 if (wcStatus != git_wc_status_missing && wcStatus != git_wc_status_deleted &&wcStatus!=git_wc_status_unversioned)
2111 {
2112 popup.AppendMenu(MF_SEPARATOR);
2113 popup.AppendMenuIcon(IDSVNLC_PROPERTIES, IDS_STATUSLIST_CONTEXT_PROPERTIES, IDI_PROPERTIES);
2114 }
2115 #endif
2116 popup.AppendMenu(MF_SEPARATOR);
2117 popup.AppendMenuIcon(IDGITLC_COPY, IDS_STATUSLIST_CONTEXT_COPY, IDI_COPYCLIP);
2118 popup.AppendMenuIcon(IDGITLC_COPYEXT, IDS_STATUSLIST_CONTEXT_COPYEXT, IDI_COPYCLIP);
2119 #if 0
2120 if ((m_dwContextMenus & SVNSLC_POPCHANGELISTS)&&(XPorLater)
2121 &&(wcStatus != git_wc_status_unversioned)&&(wcStatus != git_wc_status_none))
2122 {
2123 popup.AppendMenu(MF_SEPARATOR);
2124 // changelist commands
2125 size_t numChangelists = GetNumberOfChangelistsInSelection();
2126 if (numChangelists > 0)
2127 {
2128 popup.AppendMenuIcon(IDSVNLC_REMOVEFROMCS, IDS_STATUSLIST_CONTEXT_REMOVEFROMCS);
2129 }
2130 if ((!entry->IsFolder())&&(changelistSubMenu.CreateMenu()))
2131 {
2132 CString temp;
2133 temp.LoadString(IDS_STATUSLIST_CONTEXT_CREATECS);
2134 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATECS, temp);
2135
2136 if (entry->changelist.Compare(SVNSLC_IGNORECHANGELIST))
2137 {
2138 changelistSubMenu.AppendMenu(MF_SEPARATOR);
2139 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, IDSVNLC_CREATEIGNORECS, SVNSLC_IGNORECHANGELIST);
2140 }
2141
2142 if (m_changelists.size() > 0)
2143 {
2144 // find the changelist names
2145 bool bNeedSeparator = true;
2146 int cmdID = IDSVNLC_MOVETOCS;
2147 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
2148 {
2149 if ((entry->changelist.Compare(it->first))&&(it->first.Compare(SVNSLC_IGNORECHANGELIST)))
2150 {
2151 if (bNeedSeparator)
2152 {
2153 changelistSubMenu.AppendMenu(MF_SEPARATOR);
2154 bNeedSeparator = false;
2155 }
2156 changelistSubMenu.AppendMenu(MF_STRING | MF_ENABLED, cmdID, it->first);
2157 cmdID++;
2158 }
2159 }
2160 }
2161 temp.LoadString(IDS_STATUSLIST_CONTEXT_MOVETOCS);
2162 popup.AppendMenu(MF_POPUP|MF_STRING, (UINT_PTR)changelistSubMenu.GetSafeHmenu(), temp);
2163 }
2164 }
2165 #endif
2166 }
2167
2168 int cmd = popup.TrackPopupMenu(TPM_RETURNCMD | TPM_LEFTALIGN | TPM_NONOTIFY, point.x, point.y, this, 0);
2169
2170 m_bBlock = TRUE;
2171 AfxGetApp()->DoWaitCursor(1);
2172 //int iItemCountBeforeMenuCmd = GetItemCount();
2173 //bool bForce = false;
2174 switch (cmd)
2175 {
2176 case IDGITLC_VIEWREV:
2177 OpenFile(filepath, ALTERNATIVEEDITOR);
2178 break;
2179 case IDGITLC_OPEN:
2180 OpenFile(filepath,OPEN);
2181 break;
2182 case IDGITLC_OPENWITH:
2183 OpenFile(filepath,OPEN_WITH);
2184 break;
2185 case IDGITLC_EXPLORE:
2186 {
2187 ShellExecute(this->m_hWnd, _T("explore"), filepath->GetDirectory().GetWinPath(), NULL, NULL, SW_SHOW);
2188 }
2189 break;
2190
2191 // Compare current version and work copy.
2192 case IDGITLC_COMPAREWC:
2193 {
2194 POSITION pos = GetFirstSelectedItemPosition();
2195 while ( pos )
2196 {
2197 int index = GetNextSelectedItem(pos);
2198 StartDiffWC(index);
2199 }
2200 }
2201 break;
2202 // Compare with base version. when current version is zero, compare workcopy and HEAD.
2203 case IDGITLC_COMPARE:
2204 {
2205 POSITION pos = GetFirstSelectedItemPosition();
2206 while ( pos )
2207 {
2208 int index = GetNextSelectedItem(pos);
2209 StartDiff(index);
2210 }
2211 }
2212 break;
2213 case IDGITLC_COMPARETWO:
2214 {
2215 POSITION pos = GetFirstSelectedItemPosition();
2216 while ( pos )
2217 {
2218 int index = GetNextSelectedItem(pos);
2219 StartDiffTwo(index);
2220 }
2221 }
2222 break;
2223 case IDGITLC_COMPARETWOFILES:
2224 {
2225 POSITION pos = GetFirstSelectedItemPosition();
2226 CTGitPath * firstfilepath, * secondfilepath;
2227 if (pos)
2228 {
2229 firstfilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
2230 secondfilepath = (CTGitPath * )GetItemData(GetNextSelectedItem(pos));
2231 }
2232 ASSERT(firstfilepath != NULL && secondfilepath != NULL);
2233 CString sCmd;
2234 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);
2235 CAppUtils::LaunchApplication(sCmd, NULL, false);
2236 }
2237 break;
2238 case IDGITLC_GNUDIFF1:
2239 {
2240 // SVNDiff diff(NULL, this->m_hWnd, true);
2241 //
2242 // if (entry->remotestatus <= git_wc_status_normal)
2243 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
2244 // else
2245 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
2246 if(m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
2247 {
2248 CString fromwhere;
2249 if(m_amend)
2250 fromwhere = _T("~1");
2251 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,GitRev::GetWorkingCopy(),
2252 *filepath,GitRev::GetHead()+fromwhere);
2253 }
2254 else
2255 {
2256 if((filepath->m_ParentNo&(PARENT_MASK|MERGE_MASK)) ==0)
2257 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,m_CurrentVersion+_T("~1"),
2258 *filepath,m_CurrentVersion);
2259 else
2260 {
2261 CString str;
2262 if(filepath->m_ParentNo & MERGE_MASK)
2263 {
2264 }
2265 else
2266 {
2267 str.Format(_T("%s^%d"),m_CurrentVersion,(filepath->m_ParentNo&PARENT_MASK)+1);
2268 }
2269
2270 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,m_CurrentVersion,
2271 *filepath,str, false,false,false,
2272 !!(filepath->m_ParentNo & MERGE_MASK));
2273 }
2274 }
2275 }
2276 break;
2277 case IDGITLC_GNUDIFF2:
2278 {
2279 // SVNDiff diff(NULL, this->m_hWnd, true);
2280 //
2281 // if (entry->remotestatus <= git_wc_status_normal)
2282 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
2283 // else
2284 // CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
2285
2286 CAppUtils::StartShowUnifiedDiff(m_hWnd,*filepath,m_Rev1,
2287 *filepath,m_Rev2);
2288 }
2289 break;
2290
2291 case IDGITLC_ADD:
2292 { // The add went ok, but we now need to run through the selected items again
2293 // and update their status
2294 std::vector<int> selectIndex;
2295
2296 POSITION pos = GetFirstSelectedItemPosition();
2297 int index;
2298 while ((index = GetNextSelectedItem(pos)) >= 0)
2299 {
2300 selectIndex.push_back(index);
2301 }
2302 for(int i=0;i<selectIndex.size();i++)
2303 {
2304 index=selectIndex[i];
2305
2306 CTGitPath * path=(CTGitPath*)GetItemData(index);
2307 ASSERT(path);
2308 if(path == NULL)
2309 continue;
2310 CString cmd;
2311 cmd.Format(_T("git.exe add -f -- \"%s\""), path->GetGitPathString());
2312 CString output;
2313 if (!g_Git.Run(cmd, &output, NULL, CP_ACP))
2314 {
2315 path->m_Action = CTGitPath::LOGACTIONS_ADDED;
2316 SetEntryCheck(path,index,true);
2317
2318 SetItemGroup(index,0);
2319 this->m_StatusFileList.AddPath(*path);
2320 this->m_UnRevFileList.RemoveItem(*path);
2321 this->m_IgnoreFileList.RemoveItem(*path);
2322
2323 Show(this->m_dwShow,0,true,true,true);
2324 }
2325 }
2326
2327 }
2328 break;
2329
2330 case IDGITLC_DELETE:
2331 {
2332 //Collect paths
2333 std::vector<int> selectIndex;
2334
2335 POSITION pos = GetFirstSelectedItemPosition();
2336 int index;
2337 while ((index = GetNextSelectedItem(pos)) >= 0)
2338 {
2339 selectIndex.push_back(index);
2340 }
2341
2342 //Create file-list ('\0' separated) for SHFileOperation
2343 CString filelist;
2344 for(int i=0;i<selectIndex.size();i++)
2345 {
2346 index=selectIndex[i];
2347
2348 CTGitPath * path=(CTGitPath*)GetItemData(index);
2349 ASSERT(path);
2350 if(path == NULL)
2351 continue;
2352
2353 filelist += path->GetWinPathString();
2354 filelist += _T("|");
2355 }
2356 filelist += _T("|");
2357 int len = filelist.GetLength();
2358 TCHAR * buf = new TCHAR[len+2];
2359 _tcscpy_s(buf, len+2, filelist);
2360 for (int i=0; i<len; ++i)
2361 if (buf[i] == '|')
2362 buf[i] = 0;
2363 SHFILEOPSTRUCT fileop;
2364 fileop.hwnd = this->m_hWnd;
2365 fileop.wFunc = FO_DELETE;
2366 fileop.pFrom = buf;
2367 fileop.pTo = NULL;
2368 fileop.fFlags = FOF_NO_CONNECTED_ELEMENTS | ((GetAsyncKeyState(VK_SHIFT) & 0x8000) ? 0 : FOF_ALLOWUNDO);
2369 fileop.lpszProgressTitle = _T("deleting file");
2370 int result = SHFileOperation(&fileop);
2371 delete [] buf;
2372
2373 if ( (result==0) && (!fileop.fAnyOperationsAborted) )
2374 {
2375 SetRedraw(FALSE);
2376 POSITION pos = NULL;
2377 while ((pos = GetFirstSelectedItemPosition()) != 0)
2378 {
2379 int index = GetNextSelectedItem(pos);
2380 if (GetCheck(index))
2381 m_nSelected--;
2382 m_nTotal--;
2383
2384 RemoveListEntry(index);
2385 }
2386 SetRedraw(TRUE);
2387 }
2388 }
2389 break;
2390
2391 case IDGITLC_BLAME:
2392 {
2393 CAppUtils::LaunchTortoiseBlame(g_Git.m_CurrentDir+_T("\\")+filepath->GetWinPath(), m_CurrentVersion);
2394 }
2395 break;
2396
2397 case IDGITLC_LOG:
2398 {
2399 CString sCmd;
2400 sCmd.Format(_T("\"%s\" /command:log /path:\"%s\""),
2401 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), g_Git.m_CurrentDir+_T("\\")+filepath->GetWinPath());
2402
2403 CAppUtils::LaunchApplication(sCmd, NULL, false);
2404 }
2405 break;
2406
2407 case IDGITLC_EDITCONFLICT:
2408 {
2409 CAppUtils::ConflictEdit(*filepath,false,this->m_bIsRevertTheirMy);
2410 break;
2411 }
2412 case IDGITLC_RESOLVETHEIRS: //follow up
2413 case IDGITLC_RESOLVEMINE: //follow up
2414 case IDGITLC_RESOLVECONFLICT:
2415 {
2416 if (CMessageBox::Show(m_hWnd, IDS_PROC_RESOLVE, IDS_APPNAME, MB_ICONQUESTION | MB_YESNO)==IDYES)
2417 {
2418 POSITION pos = GetFirstSelectedItemPosition();
2419 while (pos != 0)
2420 {
2421 int index;
2422 index = GetNextSelectedItem(pos);
2423 CTGitPath * fentry =(CTGitPath*) this->GetItemData(index);
2424 if(fentry == NULL)
2425 continue;
2426 CString gitcmd,output;
2427 output.Empty();
2428
2429 if ( ((!this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVETHEIRS) ||
2430 ((this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVEMINE) )
2431 {
2432 gitcmd.Format(_T("git.exe checkout-index -f --stage=3 -- \"%s\""),fentry->GetGitPathString());
2433 if(g_Git.Run(gitcmd,&output,CP_ACP))
2434 {
2435 CMessageBox::Show(m_hWnd, output, _T("TortoiseGit"), MB_ICONERROR);
2436 continue;
2437 }
2438 }
2439 output.Empty();
2440 if ( ((!this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVEMINE) ||
2441 ((this->m_bIsRevertTheirMy)&&cmd == IDGITLC_RESOLVETHEIRS) )
2442 {
2443 gitcmd.Format(_T("git.exe checkout-index -f --stage=2 -- \"%s\""),fentry->GetGitPathString());
2444 if(g_Git.Run(gitcmd,&output,CP_ACP))
2445 {
2446 CMessageBox::Show(m_hWnd, output, _T("TortoiseGit"), MB_ICONERROR);
2447 continue;
2448 }
2449
2450 }
2451 output.Empty();
2452 if ( fentry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
2453 {
2454 gitcmd.Format(_T("git.exe add -f -- \"%s\""),fentry->GetGitPathString());
2455 if(g_Git.Run(gitcmd,&output,CP_ACP))
2456 {
2457 CMessageBox::Show(m_hWnd, output, _T("TortoiseGit"), MB_ICONERROR);
2458 }
2459 else
2460 {
2461 fentry->m_Action |= CTGitPath::LOGACTIONS_MODIFIED;
2462 fentry->m_Action &=~CTGitPath::LOGACTIONS_UNMERGED;
2463 }
2464 }
2465
2466 CAppUtils::RemoveTempMergeFile(*fentry);
2467
2468 }
2469 Show(m_dwShow, 0, m_bShowFolders,0,true);
2470 }
2471 }
2472 break;
2473
2474 case IDGITLC_IGNORE:
2475 {
2476 CTGitPathList ignorelist;
2477 //std::vector<CString> toremove;
2478 FillListOfSelectedItemPaths(ignorelist, true);
2479 SetRedraw(FALSE);
2480
2481 if(!CAppUtils::IgnoreFile(ignorelist,false))
2482 break;
2483
2484 for(int i=0;i<ignorelist.GetCount();i++)
2485 {
2486 int nListboxEntries = GetItemCount();
2487 for (int nItem=0; nItem<nListboxEntries; ++nItem)
2488 {
2489 CTGitPath *path=(CTGitPath*)GetItemData(nItem);
2490 if (path->GetGitPathString()==ignorelist[i].GetGitPathString())
2491 {
2492 RemoveListEntry(nItem);
2493 break;
2494 }
2495 }
2496 }
2497 SetRedraw(TRUE);
2498 }
2499 #if 0
2500 CTSVNPathList ignorelist;
2501 std::vector<CString> toremove;
2502 FillListOfSelectedItemPaths(ignorelist, true);
2503 SetRedraw(FALSE);
2504 for (int j=0; j<ignorelist.GetCount(); ++j)
2505 {
2506 int nListboxEntries = GetItemCount();
2507 for (int i=0; i<nListboxEntries; ++i)
2508 {
2509 if (GetListEntry(i)->GetPath().IsEquivalentTo(ignorelist[j]))
2510 {
2511 selIndex = i;
2512 break;
2513 }
2514 }
2515 CString name = CPathUtils::PathPatternEscape(ignorelist[j].GetFileOrDirectoryName());
2516 CTSVNPath parentfolder = ignorelist[j].GetContainingDirectory();
2517 SVNProperties props(parentfolder, SVNRev::REV_WC, false);
2518 CStringA value;
2519 for (int i=0; i<props.GetCount(); i++)
2520 {
2521 CString propname(props.GetItemName(i).c_str());
2522 if (propname.CompareNoCase(_T("git:ignore"))==0)
2523 {
2524 stdstring stemp;
2525 // treat values as normal text even if they're not
2526 value = (char *)props.GetItemValue(i).c_str();
2527 }
2528 }
2529 if (value.IsEmpty())
2530 value = name;
2531 else
2532 {
2533 value = value.Trim("\n\r");
2534 value += "\n";
2535 value += name;
2536 value.Remove('\r');
2537 }
2538 if (!props.Add(_T("git:ignore"), (LPCSTR)value))
2539 {
2540 CString temp;
2541 temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
2542 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
2543 break;
2544 }
2545 if (GetCheck(selIndex))
2546 m_nSelected--;
2547 m_nTotal--;
2548
2549 // now, if we ignored a folder, remove all its children
2550 if (ignorelist[j].IsDirectory())
2551 {
2552 for (int i=0; i<(int)m_arListArray.size(); ++i)
2553 {
2554 FileEntry * entry = GetListEntry(i);
2555 if (entry->status == git_wc_status_unversioned)
2556 {
2557 if (!ignorelist[j].IsEquivalentTo(entry->GetPath())&&(ignorelist[j].IsAncestorOf(entry->GetPath())))
2558 {
2559 entry->status = git_wc_status_ignored;
2560 entry->textstatus = git_wc_status_ignored;
2561 if (GetCheck(i))
2562 m_nSelected--;
2563 toremove.push_back(entry->GetPath().GetSVNPathString());
2564 }
2565 }
2566 }
2567 }
2568
2569 CTSVNPath basepath = m_arStatusArray[m_arListArray[selIndex]]->basepath;
2570
2571 FileEntry * entry = m_arStatusArray[m_arListArray[selIndex]];
2572 if ( entry->status == git_wc_status_unversioned ) // keep "deleted" items
2573 toremove.push_back(entry->GetPath().GetSVNPathString());
2574
2575 if (!m_bIgnoreRemoveOnly)
2576 {
2577 SVNStatus status;
2578 git_wc_status2_t * s;
2579 CTSVNPath gitPath;
2580 s = status.GetFirstFileStatus(parentfolder, gitPath, false, git_depth_empty);
2581 // first check if the folder isn't already present in the list
2582 bool bFound = false;
2583 nListboxEntries = GetItemCount();
2584 for (int i=0; i<nListboxEntries; ++i)
2585 {
2586 FileEntry * entry = GetListEntry(i);
2587 if (entry->path.IsEquivalentTo(gitPath))
2588 {
2589 bFound = true;
2590 break;
2591 }
2592 }
2593 if (!bFound)
2594 {
2595 if (s!=0)
2596 {
2597 FileEntry * entry = new FileEntry();
2598 entry->path = gitPath;
2599 entry->basepath = basepath;
2600 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);
2601 entry->textstatus = s->text_status;
2602 entry->propstatus = s->prop_status;
2603 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);
2604 entry->remotetextstatus = s->repos_text_status;
2605 entry->remotepropstatus = s->repos_prop_status;
2606 entry->inunversionedfolder = FALSE;
2607 entry->checked = true;
2608 entry->inexternal = false;
2609 entry->direct = false;
2610 entry->isfolder = true;
2611 entry->last_commit_date = 0;
2612 entry->last_commit_rev = 0;
2613 entry->remoterev = 0;
2614 if (s->entry)
2615 {
2616 if (s->entry->url)
2617 {
2618 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));
2619 }
2620 }
2621 if (s->entry && s->entry->present_props)
2622 {
2623 entry->present_props = s->entry->present_props;
2624 }
2625 m_arStatusArray.push_back(entry);
2626 m_arListArray.push_back(m_arStatusArray.size()-1);
2627 AddEntry(entry, langID, GetItemCount());
2628 }
2629 }
2630 }
2631 }
2632 for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)
2633 {
2634 int nListboxEntries = GetItemCount();
2635 for (int i=0; i<nListboxEntries; ++i)
2636 {
2637 if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)
2638 {
2639 RemoveListEntry(i);
2640 break;
2641 }
2642 }
2643 }
2644 SetRedraw(TRUE);
2645 }
2646 #endif
2647 break;
2648 case IDGITLC_IGNOREMASK:
2649 {
2650 CString common;
2651 CString ext=filepath->GetFileExtension();
2652 CTGitPathList ignorelist;
2653 FillListOfSelectedItemPaths(ignorelist, true);
2654 SetRedraw(FALSE);
2655
2656 CAppUtils::IgnoreFile(ignorelist,true);
2657
2658 common=ignorelist.GetCommonRoot().GetGitPathString();
2659
2660 for (int i=0; i< GetItemCount(); ++i)
2661 {
2662 CTGitPath *path=(CTGitPath*)GetItemData(i);
2663 if(!( path->m_Action & CTGitPath::LOGACTIONS_UNVER))
2664 continue;
2665 if( path->GetGitPathString().Left(common.GetLength()) == common )
2666 {
2667 if (path->GetFileExtension()==ext)
2668 {
2669 RemoveListEntry(i);
2670 i--; // remove index i at item, new one will replace.
2671 }
2672 }
2673 }
2674
2675 CWnd* pParent = GetParent();
2676 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2677 {
2678 pParent->SendMessage(GITSLNM_NEEDSREFRESH);
2679 }
2680
2681 SetRedraw(TRUE);
2682 }
2683 #if 0
2684 std::set<CTSVNPath> parentlist;
2685 for (int i=0; i<ignorelist.GetCount(); ++i)
2686 {
2687 parentlist.insert(ignorelist[i].GetContainingDirectory());
2688 }
2689 std::set<CTSVNPath>::iterator it;
2690 std::vector<CString> toremove;
2691
2692 for (it = parentlist.begin(); it != parentlist.end(); ++it)
2693 {
2694 CTSVNPath parentFolder = (*it).GetDirectory();
2695 SVNProperties props(parentFolder, SVNRev::REV_WC, false);
2696 CStringA value;
2697 for (int i=0; i<props.GetCount(); i++)
2698 {
2699 CString propname(props.GetItemName(i).c_str());
2700 if (propname.CompareNoCase(_T("git:ignore"))==0)
2701 {
2702 stdstring stemp;
2703 // treat values as normal text even if they're not
2704 value = (char *)props.GetItemValue(i).c_str();
2705 }
2706 }
2707 if (value.IsEmpty())
2708 value = name;
2709 else
2710 {
2711 value = value.Trim("\n\r");
2712 value += "\n";
2713 value += name;
2714 value.Remove('\r');
2715 }
2716 if (!props.Add(_T("git:ignore"), (LPCSTR)value))
2717 {
2718 CString temp;
2719 temp.Format(IDS_ERR_FAILEDIGNOREPROPERTY, (LPCTSTR)name);
2720 CMessageBox::Show(this->m_hWnd, temp, _T("TortoiseGit"), MB_ICONERROR);
2721 }
2722 else
2723 {
2724 CTSVNPath basepath;
2725 int nListboxEntries = GetItemCount();
2726 for (int i=0; i<nListboxEntries; ++i)
2727 {
2728 FileEntry * entry = GetListEntry(i);
2729 ASSERT(entry != NULL);
2730 if (entry == NULL)
2731 continue;
2732 if (basepath.IsEmpty())
2733 basepath = entry->basepath;
2734 // since we ignored files with a mask (e.g. *.exe)
2735 // we have to find find all files in the same
2736 // folder (IsAncestorOf() returns TRUE for _all_ children,
2737 // not just the immediate ones) which match the
2738 // mask and remove them from the list too.
2739 if ((entry->status == git_wc_status_unversioned)&&(parentFolder.IsAncestorOf(entry->path)))
2740 {
2741 CString f = entry->path.GetSVNPathString();
2742 if (f.Mid(parentFolder.GetSVNPathString().GetLength()).Find('/')<=0)
2743 {
2744 if (CStringUtils::WildCardMatch(name, f))
2745 {
2746 if (GetCheck(i))
2747 m_nSelected--;
2748 m_nTotal--;
2749 toremove.push_back(f);
2750 }
2751 }
2752 }
2753 }
2754 if (!m_bIgnoreRemoveOnly)
2755 {
2756 SVNStatus status;
2757 git_wc_status2_t * s;
2758 CTSVNPath gitPath;
2759 s = status.GetFirstFileStatus(parentFolder, gitPath, false, git_depth_empty);
2760 if (s!=0)
2761 {
2762 // first check if the folder isn't already present in the list
2763 bool bFound = false;
2764 for (int i=0; i<nListboxEntries; ++i)
2765 {
2766 FileEntry * entry = GetListEntry(i);
2767 if (entry->path.IsEquivalentTo(gitPath))
2768 {
2769 bFound = true;
2770 break;
2771 }
2772 }
2773 if (!bFound)
2774 {
2775 FileEntry * entry = new FileEntry();
2776 entry->path = gitPath;
2777 entry->basepath = basepath;
2778 entry->status = SVNStatus::GetMoreImportant(s->text_status, s->prop_status);
2779 entry->textstatus = s->text_status;
2780 entry->propstatus = s->prop_status;
2781 entry->remotestatus = SVNStatus::GetMoreImportant(s->repos_text_status, s->repos_prop_status);
2782 entry->remotetextstatus = s->repos_text_status;
2783 entry->remotepropstatus = s->repos_prop_status;
2784 entry->inunversionedfolder = false;
2785 entry->checked = true;
2786 entry->inexternal = false;
2787 entry->direct = false;
2788 entry->isfolder = true;
2789 entry->last_commit_date = 0;
2790 entry->last_commit_rev = 0;
2791 entry->remoterev = 0;
2792 if (s->entry)
2793 {
2794 if (s->entry->url)
2795 {
2796 entry->url = CUnicodeUtils::GetUnicode(CPathUtils::PathUnescape(s->entry->url));
2797 }
2798 }
2799 if (s->entry && s->entry->present_props)
2800 {
2801 entry->present_props = s->entry->present_props;
2802 }
2803 m_arStatusArray.push_back(entry);
2804 m_arListArray.push_back(m_arStatusArray.size()-1);
2805 AddEntry(entry, langID, GetItemCount());
2806 }
2807 }
2808 }
2809 }
2810 }
2811 for (std::vector<CString>::iterator it = toremove.begin(); it != toremove.end(); ++it)
2812 {
2813 int nListboxEntries = GetItemCount();
2814 for (int i=0; i<nListboxEntries; ++i)
2815 {
2816 if (GetListEntry(i)->path.GetSVNPathString().Compare(*it)==0)
2817 {
2818 RemoveListEntry(i);
2819 break;
2820 }
2821 }
2822 }
2823 SetRedraw(TRUE);
2824 }
2825 #endif
2826 break;
2827
2828 case IDGITLC_REVERT:
2829 {
2830 // If at least one item is not in the status "added"
2831 // we ask for a confirmation
2832 BOOL bConfirm = FALSE;
2833 POSITION pos = GetFirstSelectedItemPosition();
2834 int index;
2835 while ((index = GetNextSelectedItem(pos)) >= 0)
2836 {
2837 //FileEntry * fentry = GetListEntry(index);
2838 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
2839 if(fentry && fentry->m_Action &CTGitPath::LOGACTIONS_MODIFIED )
2840 {
2841 bConfirm = TRUE;
2842 break;
2843 }
2844 }
2845
2846 CString str;
2847 str.Format(IDS_PROC_WARNREVERT,GetSelectedCount());
2848
2849 if (!bConfirm || CMessageBox::Show(this->m_hWnd, str, _T("TortoiseGit"), MB_YESNO | MB_ICONQUESTION)==IDYES)
2850 {
2851 CTGitPathList targetList;
2852 FillListOfSelectedItemPaths(targetList);
2853
2854 // make sure that the list is reverse sorted, so that
2855 // children are removed before any parents
2856 targetList.SortByPathname(true);
2857
2858 // put all reverted files in the trashbin, except the ones with 'added'
2859 // status because they are not restored by the revert.
2860 CTGitPathList delList;
2861 POSITION pos = GetFirstSelectedItemPosition();
2862 int index;
2863 while ((index = GetNextSelectedItem(pos)) >= 0)
2864 {
2865 CTGitPath *entry=(CTGitPath *)GetItemData(index);
2866 if (entry&&(!(entry->m_Action& CTGitPath::LOGACTIONS_ADDED))
2867 && (!(entry->m_Action& CTGitPath::LOGACTIONS_REPLACED)))
2868 {
2869 CTGitPath fullpath;
2870 fullpath.SetFromWin(g_Git.m_CurrentDir+_T("\\")+entry->GetWinPath());
2871 delList.AddPath(fullpath);
2872 }
2873 }
2874 if (DWORD(CRegDWORD(_T("Software\\TortoiseGit\\RevertWithRecycleBin"), TRUE)))
2875 delList.DeleteAllFiles(true);
2876
2877 CString revertToCommit = _T("HEAD");
2878 if (m_amend)
2879 revertToCommit = _T("HEAD~1");
2880 if (g_Git.Revert(revertToCommit, targetList))
2881 {
2882 CMessageBox::Show(this->m_hWnd, _T("Revert Fail"), _T("TortoiseGit"), MB_ICONERROR);
2883 }
2884 else
2885 {
2886 bool updateStatusList = false;
2887 for(int i=0;i<targetList.GetCount();i++)
2888 {
2889 int nListboxEntries = GetItemCount();
2890 for (int nItem=0; nItem<nListboxEntries; ++nItem)
2891 {
2892 CTGitPath *path=(CTGitPath*)GetItemData(nItem);
2893 if (path->GetGitPathString()==targetList[i].GetGitPathString())
2894 {
2895 if(path->m_Action & CTGitPath::LOGACTIONS_ADDED)
2896 {
2897 path->m_Action = CTGitPath::LOGACTIONS_UNVER;
2898 SetEntryCheck(path,nItem,false);
2899 updateStatusList = true;
2900 SetItemGroup(nItem,1);
2901 this->m_StatusFileList.RemoveItem(*path);
2902 this->m_UnRevFileList.AddPath(*path);
2903 //this->m_IgnoreFileList.RemoveItem(*path);
2904
2905 }
2906 else
2907 {
2908 RemoveListEntry(nItem);
2909 }
2910 break;
2911 }
2912 }
2913 }
2914 SetRedraw(TRUE);
2915 SaveColumnWidths();
2916 Show(m_dwShow, 0, m_bShowFolders,updateStatusList,true);
2917 NotifyCheck();
2918 }
2919 }
2920 }
2921 break;
2922
2923 case IDGITLC_COPY:
2924 CopySelectedEntriesToClipboard(0);
2925 break;
2926 case IDGITLC_COPYEXT:
2927 CopySelectedEntriesToClipboard((DWORD)-1);
2928 break;
2929
2930 case IDGITLC_SAVEAS:
2931 FileSaveAs(filepath);
2932 break;
2933
2934 case IDGITLC_REVERTTOREV:
2935 RevertSelectedItemToVersion();
2936 break;
2937 #if 0
2938 case IDSVNLC_PROPERTIES:
2939 {
2940 CTSVNPathList targetList;
2941 FillListOfSelectedItemPaths(targetList);
2942 CEditPropertiesDlg dlg;
2943 dlg.SetPathList(targetList);
2944 dlg.DoModal();
2945 if (dlg.HasChanged())
2946 {
2947 // since the user might have changed/removed/added
2948 // properties recursively, we don't really know
2949 // which items have changed their status.
2950 // So tell the parent to do a refresh.
2951 CWnd* pParent = GetParent();
2952 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
2953 {
2954 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
2955 }
2956 }
2957 }
2958 break;
2959 case IDSVNLC_COMMIT:
2960 {
2961 CTSVNPathList targetList;
2962 FillListOfSelectedItemPaths(targetList);
2963 CTSVNPath tempFile = CTempFiles::Instance().GetTempFilePath(false);
2964 VERIFY(targetList.WriteToFile(tempFile.GetWinPathString()));
2965 CString commandline = CPathUtils::GetAppDirectory();
2966 commandline += _T("TortoiseProc.exe /command:commit /pathfile:\"");
2967 commandline += tempFile.GetWinPathString();
2968 commandline += _T("\"");
2969 commandline += _T(" /deletepathfile");
2970 CAppUtils::LaunchApplication(commandline, NULL, false);
2971 }
2972 break;
2973
2974 case IDSVNLC_COMPAREWC:
2975 {
2976 POSITION pos = GetFirstSelectedItemPosition();
2977 while ( pos )
2978 {
2979 int index = GetNextSelectedItem(pos);
2980 FileEntry * entry = GetListEntry(index);
2981 ASSERT(entry != NULL);
2982 if (entry == NULL)
2983 continue;
2984 SVNDiff diff(NULL, m_hWnd, true);
2985 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
2986 git_revnum_t baseRev = entry->Revision;
2987 diff.DiffFileAgainstBase(
2988 entry->path, baseRev, entry->textstatus, entry->propstatus);
2989 }
2990 }
2991 break;
2992 case IDSVNLC_GNUDIFF1:
2993 {
2994 SVNDiff diff(NULL, this->m_hWnd, true);
2995
2996 if (entry->remotestatus <= git_wc_status_normal)
2997 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_BASE, entry->path, SVNRev::REV_WC);
2998 else
2999 CAppUtils::StartShowUnifiedDiff(m_hWnd, entry->path, SVNRev::REV_WC, entry->path, SVNRev::REV_HEAD);
3000 }
3001 break;
3002 case IDSVNLC_UPDATE:
3003 {
3004 CTSVNPathList targetList;
3005 FillListOfSelectedItemPaths(targetList);
3006 bool bAllExist = true;
3007 for (int i=0; i<targetList.GetCount(); ++i)
3008 {
3009 if (!targetList[i].Exists())
3010 {
3011 bAllExist = false;
3012 break;
3013 }
3014 }
3015 if (bAllExist)
3016 {
3017 CSVNProgressDlg dlg;
3018 dlg.SetCommand(CSVNProgressDlg::SVNProgress_Update);
3019 dlg.SetPathList(targetList);
3020 dlg.SetRevision(SVNRev::REV_HEAD);
3021 dlg.DoModal();
3022 }
3023 else
3024 {
3025 CString sTempFile = CTempFiles::Instance().GetTempFilePath(false).GetWinPathString();
3026 targetList.WriteToFile(sTempFile, false);
3027 CString sCmd;
3028 sCmd.Format(_T("\"%s\" /command:update /rev /pathfile:\"%s\" /deletepathfile"),
3029 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")), (LPCTSTR)sTempFile);
3030
3031 CAppUtils::LaunchApplication(sCmd, NULL, false);
3032 }
3033 }
3034 break;
3035
3036 case IDSVNLC_REMOVE:
3037 {
3038 SVN git;
3039 CTSVNPathList itemsToRemove;
3040 FillListOfSelectedItemPaths(itemsToRemove);
3041
3042 // We must sort items before removing, so that files are always removed
3043 // *before* their parents
3044 itemsToRemove.SortByPathname(true);
3045
3046 bool bSuccess = false;
3047 if (git.Remove(itemsToRemove, FALSE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))
3048 {
3049 bSuccess = true;
3050 }
3051 else
3052 {
3053 if ((git.Err->apr_err == SVN_ERR_UNVERSIONED_RESOURCE) ||
3054 (git.Err->apr_err == SVN_ERR_CLIENT_MODIFIED))
3055 {
3056 CString msg, yes, no, yestoall;
3057 msg.Format(IDS_PROC_REMOVEFORCE, (LPCTSTR)git.GetLastErrorMessage());
3058 yes.LoadString(IDS_MSGBOX_YES);
3059 no.LoadString(IDS_MSGBOX_NO);
3060 yestoall.LoadString(IDS_PROC_YESTOALL);
3061 UINT ret = CMessageBox::Show(m_hWnd, msg, _T("TortoiseGit"), 2, IDI_ERROR, yes, no, yestoall);
3062 if ((ret == 1)||(ret==3))
3063 {
3064 if (!git.Remove(itemsToRemove, TRUE, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000)))
3065 {
3066 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
3067 }
3068 else
3069 bSuccess = true;
3070 }
3071 }
3072 else
3073 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
3074 }
3075 if (bSuccess)
3076 {
3077 // The remove went ok, but we now need to run through the selected items again
3078 // and update their status
3079 POSITION pos = GetFirstSelectedItemPosition();
3080 int index;
3081 std::vector<int> entriesToRemove;
3082 while ((index = GetNextSelectedItem(pos)) >= 0)
3083 {
3084 FileEntry * e = GetListEntry(index);
3085 if (!bShift &&
3086 ((e->textstatus == git_wc_status_unversioned)||
3087 (e->textstatus == git_wc_status_none)||
3088 (e->textstatus == git_wc_status_ignored)))
3089 {
3090 if (GetCheck(index))
3091 m_nSelected--;
3092 m_nTotal--;
3093 entriesToRemove.push_back(index);
3094 }
3095 else
3096 {
3097 e->textstatus = git_wc_status_deleted;
3098 e->status = git_wc_status_deleted;
3099 SetEntryCheck(e,index,true);
3100 }
3101 }
3102 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)
3103 {
3104 RemoveListEntry(*it);
3105 }
3106 }
3107 SaveColumnWidths();
3108 Show(m_dwShow, 0, m_bShowFolders);
3109 NotifyCheck();
3110 }
3111 break;
3112 case IDSVNLC_DELETE:
3113 {
3114 CTSVNPathList pathlist;
3115 FillListOfSelectedItemPaths(pathlist);
3116 pathlist.RemoveChildren();
3117 CString filelist;
3118 for (INT_PTR i=0; i<pathlist.GetCount(); ++i)
3119 {
3120 filelist += pathlist[i].GetWinPathString();
3121 filelist += _T("|");
3122 }
3123 filelist += _T("|");
3124 int len = filelist.GetLength();
3125 TCHAR * buf = new TCHAR[len+2];
3126 _tcscpy_s(buf, len+2, filelist);
3127 for (int i=0; i<len; ++i)
3128 if (buf[i] == '|')
3129 buf[i] = 0;
3130 SHFILEOPSTRUCT fileop;
3131 fileop.hwnd = this->m_hWnd;
3132 fileop.wFunc = FO_DELETE;
3133 fileop.pFrom = buf;
3134 fileop.pTo = NULL;
3135 fileop.fFlags = FOF_NO_CONNECTED_ELEMENTS | ((GetAsyncKeyState(VK_SHIFT) & 0x8000) ? 0 : FOF_ALLOWUNDO);
3136 fileop.lpszProgressTitle = _T("deleting file");
3137 int result = SHFileOperation(&fileop);
3138 delete [] buf;
3139
3140 if ( (result==0) && (!fileop.fAnyOperationsAborted) )
3141 {
3142 SetRedraw(FALSE);
3143 POSITION pos = NULL;
3144 CTSVNPathList deletedlist; // to store list of deleted folders
3145 while ((pos = GetFirstSelectedItemPosition()) != 0)
3146 {
3147 int index = GetNextSelectedItem(pos);
3148 if (GetCheck(index))
3149 m_nSelected--;
3150 m_nTotal--;
3151 FileEntry * fentry = GetListEntry(index);
3152 if ((fentry)&&(fentry->isfolder))
3153 deletedlist.AddPath(fentry->path);
3154 RemoveListEntry(index);
3155 }
3156 // now go through the list of deleted folders
3157 // and remove all their children from the list too!
3158 int nListboxEntries = GetItemCount();
3159 for (int folderindex = 0; folderindex < deletedlist.GetCount(); ++folderindex)
3160 {
3161 CTSVNPath folderpath = deletedlist[folderindex];
3162 for (int i=0; i<nListboxEntries; ++i)
3163 {
3164 FileEntry * entry = GetListEntry(i);
3165 if (folderpath.IsAncestorOf(entry->path))
3166 {
3167 RemoveListEntry(i--);
3168 nListboxEntries--;
3169 }
3170 }
3171 }
3172 SetRedraw(TRUE);
3173 }
3174 }
3175 break;
3176
3177
3178 case IDSVNLC_ADD:
3179 {
3180 SVN git;
3181 CTSVNPathList itemsToAdd;
3182 FillListOfSelectedItemPaths(itemsToAdd);
3183
3184 // We must sort items before adding, so that folders are always added
3185 // *before* any of their children
3186 itemsToAdd.SortByPathname();
3187
3188 ProjectProperties props;
3189 props.ReadPropsPathList(itemsToAdd);
3190 if (git.Add(itemsToAdd, &props, git_depth_empty, TRUE, TRUE, TRUE))
3191 {
3192 // The add went ok, but we now need to run through the selected items again
3193 // and update their status
3194 POSITION pos = GetFirstSelectedItemPosition();
3195 int index;
3196 while ((index = GetNextSelectedItem(pos)) >= 0)
3197 {
3198 FileEntry * e = GetListEntry(index);
3199 e->textstatus = git_wc_status_added;
3200 e->propstatus = git_wc_status_none;
3201 e->status = git_wc_status_added;
3202 SetEntryCheck(e,index,true);
3203 }
3204 }
3205 else
3206 {
3207 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
3208 }
3209 SaveColumnWidths();
3210 Show(m_dwShow, 0, m_bShowFolders);
3211 NotifyCheck();
3212 }
3213 break;
3214 case IDSVNLC_ADD_RECURSIVE:
3215 {
3216 CTSVNPathList itemsToAdd;
3217 FillListOfSelectedItemPaths(itemsToAdd);
3218
3219 CAddDlg dlg;
3220 dlg.m_pathList = itemsToAdd;
3221 if (dlg.DoModal() == IDOK)
3222 {
3223 if (dlg.m_pathList.GetCount() == 0)
3224 break;
3225 CSVNProgressDlg progDlg;
3226 progDlg.SetCommand(CSVNProgressDlg::SVNProgress_Add);
3227 progDlg.SetPathList(dlg.m_pathList);
3228 ProjectProperties props;
3229 props.ReadPropsPathList(dlg.m_pathList);
3230 progDlg.SetProjectProperties(props);
3231 progDlg.SetItemCount(dlg.m_pathList.GetCount());
3232 progDlg.DoModal();
3233
3234 // refresh!
3235 CWnd* pParent = GetParent();
3236 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
3237 {
3238 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
3239 }
3240 }
3241 }
3242 break;
3243
3244 case IDSVNLC_REPAIRMOVE:
3245 {
3246 POSITION pos = GetFirstSelectedItemPosition();
3247 int index = GetNextSelectedItem(pos);
3248 FileEntry * entry1 = NULL;
3249 FileEntry * entry2 = NULL;
3250 if (index >= 0)
3251 {
3252 entry1 = GetListEntry(index);
3253 git_wc_status_kind status1 = git_wc_status_none;
3254 git_wc_status_kind status2 = git_wc_status_none;
3255 if (entry1)
3256 {
3257 status1 = entry1->status;
3258 index = GetNextSelectedItem(pos);
3259 if (index >= 0)
3260 {
3261 entry2 = GetListEntry(index);
3262 if (entry2)
3263 {
3264 status2 = entry2->status;
3265 if (status2 == git_wc_status_missing && status1 == git_wc_status_unversioned)
3266 {
3267 FileEntry * tempentry = entry1;
3268 entry1 = entry2;
3269 entry2 = tempentry;
3270 }
3271 // entry1 was renamed to entry2 but outside of Subversion
3272 // fix this by moving entry2 back to entry1 first,
3273 // then do an git-move from entry1 to entry2
3274 if (MoveFile(entry2->GetPath().GetWinPath(), entry1->GetPath().GetWinPath()))
3275 {
3276 SVN git;
3277 if (!git.Move(CTSVNPathList(entry1->GetPath()), entry2->GetPath(), TRUE))
3278 {
3279 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
3280 }
3281 else
3282 {
3283 // check the previously unversioned item
3284 entry1->checked = true;
3285 // fixing the move was successful. We have to adjust the new status of the
3286 // files.
3287 // Since we don't know if the moved/renamed file had local modifications or not,
3288 // we can't guess the new status. That means we have to refresh...
3289 CWnd* pParent = GetParent();
3290 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
3291 {
3292 pParent->SendMessage(SVNSLNM_NEEDSREFRESH);
3293 }
3294 }
3295 }
3296 else
3297 {
3298 LPVOID lpMsgBuf;
3299 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER |
3300 FORMAT_MESSAGE_FROM_SYSTEM |
3301 FORMAT_MESSAGE_IGNORE_INSERTS,
3302 NULL,
3303 GetLastError(),
3304 MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT), // Default language
3305 (LPTSTR) &lpMsgBuf,
3306 0,
3307 NULL
3308 );
3309 MessageBox((LPCTSTR)lpMsgBuf, _T("Error"), MB_OK | MB_ICONINFORMATION );
3310 LocalFree( lpMsgBuf );
3311 }
3312 }
3313 }
3314 }
3315 }
3316 }
3317 break;
3318 case IDSVNLC_REMOVEFROMCS:
3319 {
3320 CTSVNPathList changelistItems;
3321 FillListOfSelectedItemPaths(changelistItems);
3322 SVN git;
3323 SetRedraw(FALSE);
3324 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
3325 {
3326 // The changelists were removed, but we now need to run through the selected items again
3327 // and update their changelist
3328 POSITION pos = GetFirstSelectedItemPosition();
3329 int index;
3330 std::vector<int> entriesToRemove;
3331 while ((index = GetNextSelectedItem(pos)) >= 0)
3332 {
3333 FileEntry * e = GetListEntry(index);
3334 if (e)
3335 {
3336 e->changelist.Empty();
3337 if (e->status == git_wc_status_normal)
3338 {
3339 // remove the entry completely
3340 entriesToRemove.push_back(index);
3341 }
3342 else
3343 SetItemGroup(index, 0);
3344 }
3345 }
3346 for (std::vector<int>::reverse_iterator it = entriesToRemove.rbegin(); it != entriesToRemove.rend(); ++it)
3347 {
3348 RemoveListEntry(*it);
3349 }
3350 // TODO: Should we go through all entries here and check if we also could
3351 // remove the changelist from m_changelists ?
3352 }
3353 else
3354 {
3355 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
3356 }
3357 SetRedraw(TRUE);
3358 }
3359 break;
3360 case IDSVNLC_CREATEIGNORECS:
3361 CreateChangeList(SVNSLC_IGNORECHANGELIST);
3362 break;
3363 case IDSVNLC_CREATECS:
3364 {
3365 CCreateChangelistDlg dlg;
3366 if (dlg.DoModal() == IDOK)
3367 {
3368 CreateChangeList(dlg.m_sName);
3369 }
3370 }
3371 break;
3372 default:
3373 {
3374 if (cmd < IDSVNLC_MOVETOCS)
3375 break;
3376 CTSVNPathList changelistItems;
3377 FillListOfSelectedItemPaths(changelistItems);
3378
3379 // find the changelist name
3380 CString sChangelist;
3381 int cmdID = IDSVNLC_MOVETOCS;
3382 SetRedraw(FALSE);
3383 for (std::map<CString, int>::const_iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
3384 {
3385 if ((it->first.Compare(SVNSLC_IGNORECHANGELIST))&&(entry->changelist.Compare(it->first)))
3386 {
3387 if (cmd == cmdID)
3388 {
3389 sChangelist = it->first;
3390 }
3391 cmdID++;
3392 }
3393 }
3394 if (!sChangelist.IsEmpty())
3395 {
3396 SVN git;
3397 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
3398 {
3399 // The changelists were moved, but we now need to run through the selected items again
3400 // and update their changelist
3401 POSITION pos = GetFirstSelectedItemPosition();
3402 int index;
3403 while ((index = GetNextSelectedItem(pos)) >= 0)
3404 {
3405 FileEntry * e = GetListEntry(index);
3406 e->changelist = sChangelist;
3407 if (!e->IsFolder())
3408 {
3409 if (m_changelists.find(e->changelist)!=m_changelists.end())
3410 SetItemGroup(index, m_changelists[e->changelist]);
3411 else
3412 SetItemGroup(index, 0);
3413 }
3414 }
3415 }
3416 else
3417 {
3418 CMessageBox::Show(m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
3419 }
3420 }
3421 SetRedraw(TRUE);
3422 }
3423 break;
3424 #endif
3425
3426 } // switch (cmd)
3427 m_bBlock = FALSE;
3428 AfxGetApp()->DoWaitCursor(-1);
3429 GetStatisticsString();
3430 //int iItemCountAfterMenuCmd = GetItemCount();
3431 //if (iItemCountAfterMenuCmd != iItemCountBeforeMenuCmd)
3432 //{
3433 // CWnd* pParent = GetParent();
3434 // if (NULL != pParent && NULL != pParent->GetSafeHwnd())
3435 // {
3436 // pParent->SendMessage(SVNSLNM_ITEMCOUNTCHANGED);
3437 // }
3438 //}
3439 } // if (popup.CreatePopupMenu())
3440 } // if (selIndex >= 0)
3441
3442 }
3443
3444 void CGitStatusListCtrl::OnContextMenuHeader(CWnd * pWnd, CPoint point)
3445 {
3446 Locker lock(m_critSec);
3447 m_ColumnManager.OnContextMenuHeader(pWnd,point,!!IsGroupViewEnabled());
3448 }
3449
3450 void CGitStatusListCtrl::OnContextMenu(CWnd* pWnd, CPoint point)
3451 {
3452
3453 if (pWnd == this)
3454 {
3455 OnContextMenuList(pWnd, point);
3456 } // if (pWnd == this)
3457 else if (pWnd == GetHeaderCtrl())
3458 {
3459 OnContextMenuHeader(pWnd, point);
3460 }
3461 }
3462
3463 void CGitStatusListCtrl::OnNMDblclk(NMHDR *pNMHDR, LRESULT *pResult)
3464 {
3465
3466 Locker lock(m_critSec);
3467 LPNMLISTVIEW pNMLV = reinterpret_cast<LPNMLISTVIEW>(pNMHDR);
3468 *pResult = 0;
3469 if (m_bBlock)
3470 return;
3471
3472 if (pNMLV->iItem < 0)
3473 {
3474 if (!IsGroupViewEnabled())
3475 return;
3476 POINT pt;
3477 DWORD ptW = GetMessagePos();
3478 pt.x = GET_X_LPARAM(ptW);
3479 pt.y = GET_Y_LPARAM(ptW);
3480 ScreenToClient(&pt);
3481 int group = GetGroupFromPoint(&pt);
3482 if (group < 0)
3483 return;
3484 // check/uncheck the whole group depending on the check-state
3485 // of the first item in the group
3486 m_bBlock = true;
3487 bool bCheck = false;
3488 bool bFirst = false;
3489 LVITEM lv;
3490 for (int i=0; i<GetItemCount(); ++i)
3491 {
3492 SecureZeroMemory(&lv, sizeof(LVITEM));
3493 lv.mask = LVIF_GROUPID;
3494 lv.iItem = i;
3495 GetItem(&lv);
3496 if (lv.iGroupId == group)
3497 {
3498 CTGitPath *entry=(CTGitPath*)GetItemData(i);
3499
3500 if (!bFirst)
3501 {
3502 bCheck = !GetCheck(i);
3503 bFirst = true;
3504 }
3505 if (entry)
3506 {
3507 bool bOldCheck = !!GetCheck(i);
3508 SetEntryCheck(entry, i, bCheck);
3509 if (bCheck != bOldCheck)
3510 {
3511 if (bCheck)
3512 m_nSelected++;
3513 else
3514 m_nSelected--;
3515 }
3516 }
3517 }
3518 }
3519 GetStatisticsString();
3520 m_bBlock = false;
3521 NotifyCheck();
3522 return;
3523 }
3524
3525 CTGitPath *file=(CTGitPath*)GetItemData(pNMLV->iItem);
3526
3527 if (file->m_Action == CTGitPath::LOGACTIONS_UNVER) {
3528 OpenFile(file, OPEN);
3529 return;
3530 }
3531 if( file->m_Action&CTGitPath::LOGACTIONS_UNMERGED )
3532 {
3533 CAppUtils::ConflictEdit(*file,false,m_bIsRevertTheirMy);
3534
3535 }
3536 else
3537 {
3538 if( (!m_Rev1.IsEmpty()) || (!m_Rev1.IsEmpty())) // m_Rev1 twice???
3539 StartDiffTwo(pNMLV->iItem);
3540 else
3541 StartDiff(pNMLV->iItem);
3542 }
3543
3544 }
3545 void CGitStatusListCtrl::StartDiffTwo(int fileindex)
3546 {
3547 if(fileindex<0)
3548 return;
3549
3550 CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);
3551
3552 CGitDiff::Diff(&file1,&file1,
3553 m_Rev1,
3554 m_Rev2);
3555
3556 }
3557 void CGitStatusListCtrl::StartDiffWC(int fileindex)
3558 {
3559 if(fileindex<0)
3560 return;
3561
3562 CString Ver;
3563 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
3564 return;
3565
3566 CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);
3567
3568 CGitDiff::Diff(&file1,&file1, GIT_REV_ZERO, m_CurrentVersion);
3569
3570 }
3571
3572 void CGitStatusListCtrl::StartDiff(int fileindex)
3573 {
3574 if(fileindex<0)
3575 return;
3576
3577 CTGitPath file1=*(CTGitPath*)GetItemData(fileindex);
3578 CTGitPath file2;
3579 if(file1.m_Action & (CTGitPath::LOGACTIONS_REPLACED|CTGitPath::LOGACTIONS_COPY))
3580 {
3581 file2.SetFromGit(file1.GetGitOldPathString());
3582 }
3583 else
3584 {
3585 file2=file1;
3586 }
3587
3588 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion== GIT_REV_ZERO)
3589 {
3590 CString fromwhere;
3591 if(m_amend && (file1.m_Action & CTGitPath::LOGACTIONS_ADDED) == 0)
3592 fromwhere = _T("~1");
3593 if( g_Git.IsInitRepos())
3594 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
3595 GIT_REV_ZERO);
3596 else if( file1.m_Action&CTGitPath::LOGACTIONS_ADDED )
3597 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
3598 m_CurrentVersion+fromwhere,true);
3599 else if( file1.m_Action&CTGitPath::LOGACTIONS_DELETED )
3600 CGitDiff::DiffNull((CTGitPath*)GetItemData(fileindex),
3601 GitRev::GetHead()+fromwhere,false);
3602 else
3603 CGitDiff::Diff(&file1,&file2,
3604 CString(GIT_REV_ZERO),
3605 GitRev::GetHead()+fromwhere);
3606 }
3607 else
3608 {
3609 GitRev rev;
3610 CString fromwhere = m_CurrentVersion+_T("~1");
3611 if(m_amend)
3612 fromwhere = m_CurrentVersion+_T("~2");
3613 if(rev.GetCommit(fromwhere) || (file1.m_Action == file1.LOGACTIONS_ADDED))
3614 {
3615 CGitDiff::DiffNull(&file1,m_CurrentVersion,true);
3616
3617 }
3618 else if (file1.m_Action == file1.LOGACTIONS_DELETED)
3619 {
3620 CGitDiff::DiffNull(&file1,fromwhere,false);
3621 }
3622 else
3623 {
3624 if( file1.m_ParentNo & MERGE_MASK)
3625 {
3626
3627 CTGitPath base,theirs, mine;
3628
3629 CTGitPath merge=file1;
3630 CTGitPath directory = merge.GetDirectory();
3631
3632 mine.SetFromGit(CAppUtils::GetMergeTempFile(_T("LOCAL"),merge));
3633 theirs.SetFromGit(CAppUtils::GetMergeTempFile(_T("REMOTE"),merge));
3634 base.SetFromGit(CAppUtils::GetMergeTempFile(_T("BASE"),merge));
3635
3636 CFile tempfile;
3637 //create a empty file, incase stage is not three
3638 tempfile.Open(mine.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
3639 tempfile.Close();
3640 tempfile.Open(theirs.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
3641 tempfile.Close();
3642 tempfile.Open(base.GetWinPathString(),CFile::modeCreate|CFile::modeReadWrite);
3643 tempfile.Close();
3644
3645 merge.SetFromGit(merge.GetGitPathString()+_T("Merged"));
3646
3647 int parent1=-1, parent2 =-1;
3648 for(int i=0;i<this->m_arStatusArray.size();i++)
3649 {
3650 if(m_arStatusArray[i]->GetGitPathString() == file1.GetGitPathString())
3651 {
3652 if(m_arStatusArray[i]->m_ParentNo & MERGE_MASK)
3653 {
3654 }
3655 else
3656 {
3657 if(parent1<0)
3658 {
3659 parent1 = m_arStatusArray[i]->m_ParentNo & PARENT_MASK;
3660 }
3661 else if (parent2 <0)
3662 {
3663 parent2 = m_arStatusArray[i]->m_ParentNo & PARENT_MASK;
3664 }
3665 }
3666 }
3667 }
3668
3669 if(g_Git.GetOneFile(m_CurrentVersion, file1, (CString&)merge.GetWinPathString()))
3670 {
3671 CMessageBox::Show(NULL, _T("Fail to get merge file"), _T("TortoiseGit"),MB_OK|MB_ICONERROR);
3672 }
3673
3674 if(parent1>=0)
3675 {
3676 CString str;
3677 str.Format(_T("%s^%d"),this->m_CurrentVersion, parent1+1);
3678
3679 if(g_Git.GetOneFile(str, file1, (CString&)mine.GetWinPathString()))
3680 {
3681 CMessageBox::Show(NULL, _T("Fail to get merge file"), _T("TortoiseGit"),MB_OK|MB_ICONERROR);
3682 }
3683 }
3684
3685 if(parent2>=0)
3686 {
3687 CString str;
3688 str.Format(_T("%s^%d"),this->m_CurrentVersion, parent2+1);
3689
3690 if(g_Git.GetOneFile(str, file1, (CString&)theirs.GetWinPathString()))
3691 {
3692 CMessageBox::Show(NULL, _T("Fail to get merge file"), _T("TortoiseGit"),MB_OK|MB_ICONERROR);
3693 }
3694 }
3695
3696 if(parent1>=0 && parent2>=0)
3697 {
3698 CString cmd, output;
3699 cmd.Format(_T("git.exe merge-base %s^%d %s^%d"), this->m_CurrentVersion, parent1+1,
3700 this->m_CurrentVersion,parent2+1);
3701
3702 if(g_Git.Run(cmd, &output, NULL, CP_ACP))
3703 {
3704 }
3705 else
3706 {
3707 if(g_Git.GetOneFile(output.Left(40), file1, (CString&)base.GetWinPathString()))
3708 {
3709 CMessageBox::Show(NULL, _T("Fail to get base file"), _T("TortoiseGit"),MB_OK|MB_ICONERROR);
3710 }
3711 }
3712 }
3713 CAppUtils::StartExtMerge(base, theirs, mine, merge,_T("BASE"),_T("REMOTE"),_T("LOCAL"));
3714
3715 }
3716 else
3717 {
3718 CString str;
3719 if( (file1.m_ParentNo&PARENT_MASK) == 0)
3720 {
3721 str = _T("~1");
3722 }
3723 else
3724 {
3725 str.Format(_T("^%d"), (file1.m_ParentNo&PARENT_MASK)+1);
3726 }
3727 CGitDiff::Diff(&file1,&file2,
3728 m_CurrentVersion,
3729 m_CurrentVersion+str);
3730 }
3731 }
3732 }
3733 #if 0
3734 if (fileindex < 0)
3735 return;
3736 FileEntry * entry = GetListEntry(fileindex);
3737 ASSERT(entry != NULL);
3738 if (entry == NULL)
3739 return;
3740 if (((entry->status == git_wc_status_normal)&&(entry->remotestatus <= git_wc_status_normal))||
3741 (entry->status == git_wc_status_unversioned)||(entry->status == git_wc_status_none))
3742 {
3743 int ret = (int)ShellExecute(this->m_hWnd, NULL, entry->path.GetWinPath(), NULL, NULL, SW_SHOW);
3744 if (ret <= HINSTANCE_ERROR)
3745 {
3746 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
3747 cmd += entry->path.GetWinPathString();
3748 CAppUtils::LaunchApplication(cmd, NULL, false);
3749 }
3750 return;
3751 }
3752
3753 GitDiff diff(NULL, m_hWnd, true);
3754 diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
3755 diff.DiffWCFile(
3756 entry->path, entry->textstatus, entry->propstatus,
3757 entry->remotetextstatus, entry->remotepropstatus);
3758 #endif
3759 }
3760
3761 CString CGitStatusListCtrl::GetStatisticsString(bool simple)
3762 {
3763
3764 CString sNormal, sAdded, sDeleted, sModified, sConflicted, sUnversioned, sRenamed;
3765 WORD langID = (WORD)(DWORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
3766 TCHAR buf[MAX_STATUS_STRING_LENGTH];
3767 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_normal, buf, _countof(buf), langID);
3768 sNormal = buf;
3769 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_added, buf, _countof(buf), langID);
3770 sAdded = buf;
3771 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_deleted, buf, _countof(buf), langID);
3772 sDeleted = buf;
3773 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_modified, buf, _countof(buf), langID);
3774 sModified = buf;
3775 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_conflicted, buf, _countof(buf), langID);
3776 sConflicted = buf;
3777 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_unversioned, buf, _countof(buf), langID);
3778 sUnversioned = buf;
3779 GitStatus::GetStatusString(AfxGetResourceHandle(), git_wc_status_replaced, buf, _countof(buf), langID);
3780 sRenamed = buf;
3781 CString sToolTip;
3782 if(simple)
3783 {
3784 sToolTip.Format(_T("line: %d(+) %d(-) files: %s = %d\n%s = %d\n%s = %d\n%s = %d"),
3785 this->m_nLineAdded,this->m_nLineDeleted,
3786 (LPCTSTR)sModified, m_nModified,
3787 (LPCTSTR)sAdded, m_nAdded,
3788 (LPCTSTR)sDeleted, m_nDeleted,
3789 (LPCTSTR)sRenamed, m_nRenamed
3790 );
3791 }
3792 else
3793 {
3794 sToolTip.Format(_T("line: %d(+) %d(-) files: %s = %d\n%s = %d\n%s = %d\n%s = %d\n%s = %d\n%s = %d"),
3795 this->m_nLineAdded,this->m_nLineDeleted,
3796 (LPCTSTR)sNormal, m_nNormal,
3797 (LPCTSTR)sUnversioned, m_nUnversioned,
3798 (LPCTSTR)sModified, m_nModified,
3799 (LPCTSTR)sAdded, m_nAdded,
3800 (LPCTSTR)sDeleted, m_nDeleted,
3801 (LPCTSTR)sConflicted, m_nConflicted
3802 );
3803 }
3804 CString sStats;
3805 sStats.Format(IDS_COMMITDLG_STATISTICSFORMAT, m_nSelected, GetItemCount());
3806 if (m_pStatLabel)
3807 {
3808 m_pStatLabel->SetWindowText(sStats);
3809 }
3810
3811 if (m_pSelectButton)
3812 {
3813 if (m_nSelected == 0)
3814 m_pSelectButton->SetCheck(BST_UNCHECKED);
3815 else if (m_nSelected != GetItemCount())
3816 m_pSelectButton->SetCheck(BST_INDETERMINATE);
3817 else
3818 m_pSelectButton->SetCheck(BST_CHECKED);
3819 }
3820
3821 if (m_pConfirmButton)
3822 {
3823 m_pConfirmButton->EnableWindow(m_nSelected>0);
3824 }
3825
3826 return sToolTip;
3827
3828
3829 }
3830
3831 CString CGitStatusListCtrl::GetCommonDirectory(bool bStrict)
3832 {
3833 if (!bStrict)
3834 {
3835 // not strict means that the selected folder has priority
3836 if (!m_StatusFileList.GetCommonDirectory().IsEmpty())
3837 return m_StatusFileList.GetCommonDirectory().GetWinPath();
3838 }
3839
3840 CTGitPath commonBaseDirectory;
3841 int nListItems = GetItemCount();
3842 for (int i=0; i<nListItems; ++i)
3843 {
3844 CTGitPath baseDirectory,*p= (CTGitPath*)this->GetItemData(i);
3845 ASSERT(p);
3846 if(p==NULL)
3847 continue;
3848 baseDirectory = p->GetDirectory();
3849
3850 if(commonBaseDirectory.IsEmpty())
3851 {
3852 commonBaseDirectory = baseDirectory;
3853 }
3854 else
3855 {
3856 if (commonBaseDirectory.GetWinPathString().GetLength() > baseDirectory.GetWinPathString().GetLength())
3857 {
3858 if (baseDirectory.IsAncestorOf(commonBaseDirectory))
3859 commonBaseDirectory = baseDirectory;
3860 }
3861 }
3862 }
3863 return g_Git.m_CurrentDir+CString(_T("\\"))+commonBaseDirectory.GetWinPath();
3864 }
3865
3866
3867 void CGitStatusListCtrl::SelectAll(bool bSelect, bool /*bIncludeNoCommits*/)
3868 {
3869 CWaitCursor waitCursor;
3870 // block here so the LVN_ITEMCHANGED messages
3871 // get ignored
3872 m_bBlock = TRUE;
3873 SetRedraw(FALSE);
3874
3875 int nListItems = GetItemCount();
3876 if (bSelect)
3877 m_nSelected = nListItems;
3878 else
3879 m_nSelected = 0;
3880
3881 for (int i=0; i<nListItems; ++i)
3882 {
3883 //FileEntry * entry = GetListEntry(i);
3884 //ASSERT(entry != NULL);
3885 CTGitPath *path = (CTGitPath *) GetItemData(i);
3886 if (path == NULL)
3887 continue;
3888 //if ((bIncludeNoCommits)||(entry->GetChangeList().Compare(SVNSLC_IGNORECHANGELIST)))
3889 SetEntryCheck(path,i,bSelect);
3890 }
3891
3892 // unblock before redrawing
3893 m_bBlock = FALSE;
3894 SetRedraw(TRUE);
3895 GetStatisticsString();
3896 NotifyCheck();
3897 }
3898
3899 void CGitStatusListCtrl::OnLvnGetInfoTip(NMHDR *pNMHDR, LRESULT *pResult)
3900 {
3901 LPNMLVGETINFOTIP pGetInfoTip = reinterpret_cast<LPNMLVGETINFOTIP>(pNMHDR);
3902 *pResult = 0;
3903 if (m_bBlock)
3904 return;
3905
3906 CTGitPath *entry=(CTGitPath *)GetItemData(pGetInfoTip->iItem);
3907
3908 if (entry)
3909 if (pGetInfoTip->cchTextMax > entry->GetGitPathString().GetLength() + g_Git.m_CurrentDir.GetLength())
3910 {
3911 CString str;
3912 str += g_Git.m_CurrentDir;
3913 str += _T("\\");
3914 str += entry->GetWinPathString();
3915
3916 _tcsncpy_s(pGetInfoTip->pszText, pGetInfoTip->cchTextMax, str.GetBuffer(), str.GetLength());
3917 }
3918 }
3919
3920 void CGitStatusListCtrl::OnNMCustomdraw(NMHDR *pNMHDR, LRESULT *pResult)
3921 {
3922 NMLVCUSTOMDRAW* pLVCD = reinterpret_cast<NMLVCUSTOMDRAW*>( pNMHDR );
3923
3924 // Take the default processing unless we set this to something else below.
3925 *pResult = CDRF_DODEFAULT;
3926
3927 // First thing - check the draw stage. If it's the control's prepaint
3928 // stage, then tell Windows we want messages for every item.
3929
3930 switch (pLVCD->nmcd.dwDrawStage)
3931 {
3932 case CDDS_PREPAINT:
3933 *pResult = CDRF_NOTIFYITEMDRAW;
3934 break;
3935 case CDDS_ITEMPREPAINT:
3936 {
3937 // This is the prepaint stage for an item. Here's where we set the
3938 // item's text color. Our return value will tell Windows to draw the
3939 // item itself, but it will use the new color we set here.
3940
3941 // Tell Windows to paint the control itself.
3942 *pResult = CDRF_DODEFAULT;
3943 if (m_bBlock)
3944 return;
3945
3946 COLORREF crText = GetSysColor(COLOR_WINDOWTEXT);
3947
3948 if (m_arStatusArray.size() > (DWORD_PTR)pLVCD->nmcd.dwItemSpec)
3949 {
3950
3951 //FileEntry * entry = GetListEntry((int)pLVCD->nmcd.dwItemSpec);
3952 CTGitPath *entry=(CTGitPath *)GetItemData((int)pLVCD->nmcd.dwItemSpec);
3953 if (entry == NULL)
3954 return;
3955
3956 // coloring
3957 // ========
3958 // black : unversioned, normal
3959 // purple : added
3960 // blue : modified
3961 // brown : missing, deleted, replaced
3962 // green : merged (or potential merges)
3963 // red : conflicts or sure conflicts
3964 if(entry->m_Action & CTGitPath::LOGACTIONS_GRAY)
3965 {
3966 crText = RGB(128,128,128);
3967
3968 }
3969 else if(entry->m_Action & CTGitPath::LOGACTIONS_UNMERGED)
3970 {
3971 crText = m_Colors.GetColor(CColors::Conflict);
3972
3973 }
3974 else if(entry->m_Action & (CTGitPath::LOGACTIONS_MODIFIED))
3975 {
3976 crText = m_Colors.GetColor(CColors::Modified);
3977
3978 }
3979 else if(entry->m_Action & (CTGitPath::LOGACTIONS_ADDED|CTGitPath::LOGACTIONS_COPY))
3980 {
3981 crText = m_Colors.GetColor(CColors::Added);
3982 }
3983 else if(entry->m_Action & CTGitPath::LOGACTIONS_DELETED)
3984 {
3985 crText = m_Colors.GetColor(CColors::DeletedNode);
3986 }
3987 else if(entry->m_Action & CTGitPath::LOGACTIONS_REPLACED)
3988 {
3989 crText = m_Colors.GetColor(CColors::RenamedNode);
3990 }
3991 else if(entry->m_Action & CTGitPath::LOGACTIONS_MERGED)
3992 {
3993 crText = m_Colors.GetColor(CColors::Merged);
3994 }
3995 else
3996 {
3997 crText = GetSysColor(COLOR_WINDOWTEXT);
3998 }
3999 // Store the color back in the NMLVCUSTOMDRAW struct.
4000 pLVCD->clrText = crText;
4001 }
4002 }
4003 break;
4004 }
4005 }
4006
4007 BOOL CGitStatusListCtrl::OnSetCursor(CWnd* pWnd, UINT nHitTest, UINT message)
4008 {
4009 if (pWnd != this)
4010 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
4011 if (!m_bBlock)
4012 {
4013 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_ARROW));
4014 SetCursor(hCur);
4015 return CListCtrl::OnSetCursor(pWnd, nHitTest, message);
4016 }
4017 HCURSOR hCur = LoadCursor(NULL, MAKEINTRESOURCE(IDC_WAIT));
4018 SetCursor(hCur);
4019 return TRUE;
4020 }
4021
4022 void CGitStatusListCtrl::RemoveListEntry(int index)
4023 {
4024
4025 Locker lock(m_critSec);
4026 DeleteItem(index);
4027
4028 m_arStatusArray.erase(m_arStatusArray.begin()+index);
4029
4030 #if 0
4031 delete m_arStatusArray[m_arListArray[index]];
4032 m_arStatusArray.erase(m_arStatusArray.begin()+m_arListArray[index]);
4033 m_arListArray.erase(m_arListArray.begin()+index);
4034 for (int i=index; i< (int)m_arListArray.size(); ++i)
4035 {
4036 m_arListArray[i]--;
4037 }
4038 #endif
4039 }
4040
4041 ///< Set a checkbox on an entry in the listbox
4042 // NEVER, EVER call SetCheck directly, because you'll end-up with the checkboxes and the 'checked' flag getting out of sync
4043 void CGitStatusListCtrl::SetEntryCheck(CTGitPath* pEntry, int listboxIndex, bool bCheck)
4044 {
4045 pEntry->m_Checked = bCheck;
4046 SetCheck(listboxIndex, bCheck);
4047 }
4048
4049 #if 0
4050 void CGitStatusListCtrl::SetCheckOnAllDescendentsOf(const FileEntry* parentEntry, bool bCheck)
4051 {
4052
4053 int nListItems = GetItemCount();
4054 for (int j=0; j< nListItems ; ++j)
4055 {
4056 FileEntry * childEntry = GetListEntry(j);
4057 ASSERT(childEntry != NULL);
4058 if (childEntry == NULL || childEntry == parentEntry)
4059 continue;
4060 if (childEntry->checked != bCheck)
4061 {
4062 if (parentEntry->path.IsAncestorOf(childEntry->path))
4063 {
4064 SetEntryCheck(childEntry,j,bCheck);
4065 if(bCheck)
4066 {
4067 m_nSelected++;
4068 }
4069 else
4070 {
4071 m_nSelected--;
4072 }
4073 }
4074 }
4075 }
4076
4077 }
4078 #endif
4079
4080 void CGitStatusListCtrl::WriteCheckedNamesToPathList(CTGitPathList& pathList)
4081 {
4082
4083 pathList.Clear();
4084 int nListItems = GetItemCount();
4085 for (int i=0; i< nListItems; i++)
4086 {
4087 CTGitPath * entry = (CTGitPath*)GetItemData(i);
4088 ASSERT(entry != NULL);
4089 if (entry->m_Checked)
4090 {
4091 pathList.AddPath(*entry);
4092 }
4093 }
4094 pathList.SortByPathname();
4095
4096 }
4097
4098
4099 /// Build a path list of all the selected items in the list (NOTE - SELECTED, not CHECKED)
4100 void CGitStatusListCtrl::FillListOfSelectedItemPaths(CTGitPathList& pathList, bool /*bNoIgnored*/)
4101 {
4102 pathList.Clear();
4103
4104 POSITION pos = GetFirstSelectedItemPosition();
4105 int index;
4106 while ((index = GetNextSelectedItem(pos)) >= 0)
4107 {
4108 CTGitPath * entry = (CTGitPath*)GetItemData(index);
4109 //if ((bNoIgnored)&&(entry->status == git_wc_status_ignored))
4110 // continue;
4111 pathList.AddPath(*entry);
4112 }
4113 }
4114
4115 UINT CGitStatusListCtrl::OnGetDlgCode()
4116 {
4117 // we want to process the return key and not have that one
4118 // routed to the default pushbutton
4119 return CListCtrl::OnGetDlgCode() | DLGC_WANTALLKEYS;
4120 }
4121
4122 void CGitStatusListCtrl::OnNMReturn(NMHDR * /*pNMHDR*/, LRESULT *pResult)
4123 {
4124 *pResult = 0;
4125 if (m_bBlock)
4126 return;
4127 POSITION pos = GetFirstSelectedItemPosition();
4128 while ( pos )
4129 {
4130 int index = GetNextSelectedItem(pos);
4131 CTGitPath *file=(CTGitPath*)GetItemData(index);
4132 if (file->m_Action == CTGitPath::LOGACTIONS_UNVER)
4133 {
4134 OpenFile(file, OPEN);
4135 }
4136 else
4137 {
4138 StartDiff(index);
4139 }
4140 }
4141 }
4142
4143 void CGitStatusListCtrl::OnKeyDown(UINT nChar, UINT nRepCnt, UINT nFlags)
4144 {
4145 // Since we catch all keystrokes (to have the enter key processed here instead
4146 // of routed to the default pushbutton) we have to make sure that other
4147 // keys like Tab and Esc still do what they're supposed to do
4148 // Tab = change focus to next/previous control
4149 // Esc = quit the dialog
4150 switch (nChar)
4151 {
4152 case (VK_TAB):
4153 {
4154 ::PostMessage(GetParent()->GetSafeHwnd(), WM_NEXTDLGCTL, GetKeyState(VK_SHIFT)&0x8000, 0);
4155 return;
4156 }
4157 break;
4158 case (VK_ESCAPE):
4159 {
4160 ::SendMessage(GetParent()->GetSafeHwnd(), WM_CLOSE, 0, 0);
4161 }
4162 break;
4163 }
4164
4165 CListCtrl::OnKeyDown(nChar, nRepCnt, nFlags);
4166 }
4167
4168 void CGitStatusListCtrl::PreSubclassWindow()
4169 {
4170 CListCtrl::PreSubclassWindow();
4171 EnableToolTips(TRUE);
4172 SetWindowTheme(GetSafeHwnd(), L"Explorer", NULL);
4173 }
4174
4175 INT_PTR CGitStatusListCtrl::OnToolHitTest(CPoint point, TOOLINFO* pTI) const
4176 {
4177 int row, col;
4178 RECT cellrect;
4179 row = CellRectFromPoint(point, &cellrect, &col );
4180
4181 if (row == -1)
4182 return -1;
4183
4184
4185 pTI->hwnd = m_hWnd;
4186 pTI->uId = (UINT)((row<<10)+(col&0x3ff)+1);
4187 pTI->lpszText = LPSTR_TEXTCALLBACK;
4188
4189 pTI->rect = cellrect;
4190
4191 return pTI->uId;
4192 }
4193
4194 int CGitStatusListCtrl::CellRectFromPoint(CPoint& point, RECT *cellrect, int *col) const
4195 {
4196 int colnum;
4197
4198 // Make sure that the ListView is in LVS_REPORT
4199 if ((GetWindowLong(m_hWnd, GWL_STYLE) & LVS_TYPEMASK) != LVS_REPORT)
4200 return -1;
4201
4202 // Get the top and bottom row visible
4203 int row = GetTopIndex();
4204 int bottom = row + GetCountPerPage();
4205 if (bottom > GetItemCount())
4206 bottom = GetItemCount();
4207
4208 // Get the number of columns
4209 CHeaderCtrl* pHeader = (CHeaderCtrl*)GetDlgItem(0);
4210 int nColumnCount = pHeader->GetItemCount();
4211
4212 // Loop through the visible rows
4213 for ( ;row <=bottom;row++)
4214 {
4215 // Get bounding rect of item and check whether point falls in it.
4216 CRect rect;
4217 GetItemRect(row, &rect, LVIR_BOUNDS);
4218 if (rect.PtInRect(point))
4219 {
4220 // Now find the column
4221 for (colnum = 0; colnum < nColumnCount; colnum++)
4222 {
4223 int colwidth = GetColumnWidth(colnum);
4224 if (point.x >= rect.left && point.x <= (rect.left + colwidth))
4225 {
4226 RECT rectClient;
4227 GetClientRect(&rectClient);
4228 if (col)
4229 *col = colnum;
4230 rect.right = rect.left + colwidth;
4231
4232 // Make sure that the right extent does not exceed
4233 // the client area
4234 if (rect.right > rectClient.right)
4235 rect.right = rectClient.right;
4236 *cellrect = rect;
4237 return row;
4238 }
4239 rect.left += colwidth;
4240 }
4241 }
4242 }
4243 return -1;
4244 }
4245
4246 BOOL CGitStatusListCtrl::OnToolTipText(UINT /*id*/, NMHDR* /*pNMHDR*/, LRESULT* /*pResult*/)
4247 {
4248 #if 0
4249 TOOLTIPTEXTW* pTTTW = (TOOLTIPTEXTW*)pNMHDR;
4250 CString strTipText;
4251 UINT_PTR nID = pNMHDR->idFrom;
4252
4253 if (nID == 0)
4254 return FALSE;
4255
4256 UINT_PTR row = ((nID-1) >> 10) & 0x3fffff;
4257 UINT_PTR col = (nID-1) & 0x3ff;
4258
4259 if (col == 0)
4260 return FALSE; // no custom tooltip for the path, we use the infotip there!
4261
4262 // get the internal column from the visible columns
4263 int internalcol = 0;
4264 UINT_PTR currentcol = 0;
4265 for (; (currentcol != col)
4266 && (internalcol < m_ColumnManager.GetColumnCount()-1)
4267 ; ++internalcol)
4268 {
4269 if (m_ColumnManager.IsVisible (internalcol))
4270 currentcol++;
4271 }
4272
4273 AFX_MODULE_THREAD_STATE* pModuleThreadState = AfxGetModuleThreadState();
4274 CToolTipCtrl* pToolTip = pModuleThreadState->m_pToolTip;
4275 pToolTip->SendMessage(TTM_SETMAXTIPWIDTH, 0, 300);
4276
4277 *pResult = 0;
4278 if ((internalcol == 2)||(internalcol == 4))
4279 {
4280 FileEntry *fentry = GetListEntry(row);
4281 if (fentry)
4282 {
4283 if (fentry->copied)
4284 {
4285 CString url;
4286 url.Format(IDS_STATUSLIST_COPYFROM, (LPCTSTR)CPathUtils::PathUnescape(fentry->copyfrom_url), (LONG)fentry->copyfrom_rev);
4287 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);
4288 return TRUE;
4289 }
4290 if (fentry->switched)
4291 {
4292 CString url;
4293 url.Format(IDS_STATUSLIST_SWITCHEDTO, (LPCTSTR)CPathUtils::PathUnescape(fentry->url));
4294 lstrcpyn(pTTTW->szText, (LPCTSTR)url, 80);
4295 return TRUE;
4296 }
4297 if (fentry->keeplocal)
4298 {
4299 lstrcpyn(pTTTW->szText, (LPCTSTR)CString(MAKEINTRESOURCE(IDS_STATUSLIST_KEEPLOCAL)), 80);
4300 return TRUE;
4301 }
4302 }
4303 }
4304 #endif
4305 return FALSE;
4306 }
4307
4308 void CGitStatusListCtrl::OnPaint()
4309 {
4310 Default();
4311 if ((m_bBusy)||(m_bEmpty))
4312 {
4313 CString str;
4314 if (m_bBusy)
4315 {
4316 if (m_sBusy.IsEmpty())
4317 str.LoadString(IDS_STATUSLIST_BUSYMSG);
4318 else
4319 str = m_sBusy;
4320 }
4321 else
4322 {
4323 if (m_sEmpty.IsEmpty())
4324 str.LoadString(IDS_STATUSLIST_EMPTYMSG);
4325 else
4326 str = m_sEmpty;
4327 }
4328 COLORREF clrText = ::GetSysColor(COLOR_WINDOWTEXT);
4329 COLORREF clrTextBk;
4330 if (IsWindowEnabled())
4331 clrTextBk = ::GetSysColor(COLOR_WINDOW);
4332 else
4333 clrTextBk = ::GetSysColor(COLOR_3DFACE);
4334
4335 CRect rc;
4336 GetClientRect(&rc);
4337 CHeaderCtrl* pHC;
4338 pHC = GetHeaderCtrl();
4339 if (pHC != NULL)
4340 {
4341 CRect rcH;
4342 pHC->GetItemRect(0, &rcH);
4343 rc.top += rcH.bottom;
4344 }
4345 CDC* pDC = GetDC();
4346 {
4347 CMyMemDC memDC(pDC, &rc);
4348
4349 memDC.SetTextColor(clrText);
4350 memDC.SetBkColor(clrTextBk);
4351 memDC.FillSolidRect(rc, clrTextBk);
4352 rc.top += 10;
4353 CGdiObject * oldfont = memDC.SelectStockObject(DEFAULT_GUI_FONT);
4354 memDC.DrawText(str, rc, DT_CENTER | DT_VCENTER |
4355 DT_WORDBREAK | DT_NOPREFIX | DT_NOCLIP);
4356 memDC.SelectObject(oldfont);
4357 }
4358 ReleaseDC(pDC);
4359 }
4360 }
4361
4362 // prevent users from extending our hidden (size 0) columns
4363 void CGitStatusListCtrl::OnHdnBegintrack(NMHDR *pNMHDR, LRESULT *pResult)
4364 {
4365 m_ColumnManager.OnHdnBegintrack(pNMHDR, pResult);
4366 }
4367
4368 // prevent any function from extending our hidden (size 0) columns
4369 void CGitStatusListCtrl::OnHdnItemchanging(NMHDR *pNMHDR, LRESULT *pResult)
4370 {
4371 if(!m_ColumnManager.OnHdnItemchanging(pNMHDR, pResult))
4372 Default();
4373 }
4374
4375 void CGitStatusListCtrl::OnDestroy()
4376 {
4377 SaveColumnWidths(true);
4378 CListCtrl::OnDestroy();
4379 }
4380
4381 void CGitStatusListCtrl::OnBeginDrag(NMHDR* /*pNMHDR*/, LRESULT* pResult)
4382 {
4383 #if 0
4384 Locker lock(m_critSec);
4385 CDropFiles dropFiles; // class for creating DROPFILES struct
4386
4387 int index;
4388 POSITION pos = GetFirstSelectedItemPosition();
4389 while ( (index = GetNextSelectedItem(pos)) >= 0 )
4390 {
4391 FileEntry * fentry = m_arStatusArray[m_arListArray[index]];
4392 CTGitPath path = fentry->GetPath();
4393 dropFiles.AddFile( path.GetWinPathString() );
4394 }
4395
4396 if ( dropFiles.GetCount()>0 )
4397 {
4398 m_bOwnDrag = true;
4399 dropFiles.CreateStructure();
4400 m_bOwnDrag = false;
4401 }
4402 #endif
4403 *pResult = 0;
4404 }
4405
4406 void CGitStatusListCtrl::SaveColumnWidths(bool bSaveToRegistry /* = false */)
4407 {
4408 int maxcol = ((CHeaderCtrl*)(GetDlgItem(0)))->GetItemCount()-1;
4409 for (int col = 0; col <= maxcol; col++)
4410 if (m_ColumnManager.IsVisible (col))
4411 m_ColumnManager.ColumnResized (col);
4412
4413 if (bSaveToRegistry)
4414 m_ColumnManager.WriteSettings();
4415 }
4416
4417 bool CGitStatusListCtrl::EnableFileDrop()
4418 {
4419 m_bFileDropsEnabled = true;
4420 return true;
4421 }
4422
4423 bool CGitStatusListCtrl::HasPath(const CTGitPath& path)
4424 {
4425 for (size_t i=0; i < m_arStatusArray.size(); i++)
4426 {
4427 if (m_arStatusArray[i]->IsEquivalentTo(path))
4428 return true;
4429 }
4430
4431 return false;
4432 }
4433
4434 BOOL CGitStatusListCtrl::PreTranslateMessage(MSG* pMsg)
4435 {
4436 if (pMsg->message == WM_KEYDOWN)
4437 {
4438 switch (pMsg->wParam)
4439 {
4440 case 'A':
4441 {
4442 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
4443 {
4444 // select all entries
4445 for (int i=0; i<GetItemCount(); ++i)
4446 {
4447 SetItemState(i, LVIS_SELECTED, LVIS_SELECTED);
4448 }
4449 return TRUE;
4450 }
4451 }
4452 break;
4453 case 'C':
4454 case VK_INSERT:
4455 {
4456 if (GetAsyncKeyState(VK_CONTROL)&0x8000)
4457 {
4458 // copy all selected paths to the clipboard
4459 if (GetAsyncKeyState(VK_SHIFT)&0x8000)
4460 CopySelectedEntriesToClipboard(GITSLC_COLSTATUS);
4461 else
4462 CopySelectedEntriesToClipboard(0);
4463 return TRUE;
4464 }
4465 }
4466 break;
4467 }
4468 }
4469
4470 return CListCtrl::PreTranslateMessage(pMsg);
4471 }
4472
4473 bool CGitStatusListCtrl::CopySelectedEntriesToClipboard(DWORD dwCols)
4474 {
4475
4476 static CString ponly(MAKEINTRESOURCE(IDS_STATUSLIST_PROPONLY));
4477 static HINSTANCE hResourceHandle(AfxGetResourceHandle());
4478 // WORD langID = (WORD)CRegStdDWORD(_T("Software\\TortoiseGit\\LanguageID"), GetUserDefaultLangID());
4479
4480 CString sClipboard;
4481 CString temp;
4482 //TCHAR buf[100];
4483 if (GetSelectedCount() == 0)
4484 return false;
4485
4486 // first add the column titles as the first line
4487 // We needn't head when only path copy
4488 //temp.LoadString(IDS_STATUSLIST_COLFILE);
4489 //sClipboard = temp;
4490
4491 DWORD selection = 0;
4492 for (int i = 0, count = m_ColumnManager.GetColumnCount(); i < count; ++i)
4493 if ( ((dwCols == -1) && m_ColumnManager.IsVisible (i))
4494 || ((dwCols != 1) && (i < 32) && ((dwCols & (1 << i)) != 0)))
4495 {
4496 sClipboard += _T("\t") + m_ColumnManager.GetName(i);
4497
4498 if (i < 32)
4499 selection += 1 << i;
4500 }
4501
4502 if(dwCols)
4503 sClipboard += _T("\r\n");
4504
4505 POSITION pos = GetFirstSelectedItemPosition();
4506 int index;
4507 while ((index = GetNextSelectedItem(pos)) >= 0)
4508 {
4509 CTGitPath * entry = (CTGitPath*)GetItemData(index);
4510 if(entry == NULL)
4511 continue;
4512
4513 sClipboard += entry->GetWinPathString();
4514 if (selection & GITSLC_COLFILENAME)
4515 {
4516 sClipboard += _T("\t")+entry->GetFileOrDirectoryName();
4517 }
4518 if (selection & GITSLC_COLEXT)
4519 {
4520 sClipboard += _T("\t")+entry->GetFileExtension();
4521 }
4522
4523 if (selection & GITSLC_COLSTATUS)
4524 {
4525 #if 0
4526 if (entry->isNested)
4527 {
4528 temp.LoadString(IDS_STATUSLIST_NESTED);
4529 }
4530 else
4531 {
4532 GitStatus::GetStatusString(hResourceHandle, entry->status, buf, _countof(buf), (WORD)langID);
4533 if ((entry->copied)&&(_tcslen(buf)>1))
4534 _tcscat_s(buf, 100, _T(" (+)"));
4535 if ((entry->switched)&&(_tcslen(buf)>1))
4536 _tcscat_s(buf, 100, _T(" (s)"));
4537 if ((entry->status == entry->propstatus)&&
4538 (entry->status != git_wc_status_normal)&&
4539 (entry->status != git_wc_status_unversioned)&&
4540 (!GitStatus::IsImportant(entry->textstatus)))
4541 _tcscat_s(buf, 100, ponly);
4542 temp = buf;
4543 }
4544 #endif
4545 sClipboard += _T("\t")+entry->GetActionName();
4546 }
4547 #if 0
4548 if (selection & SVNSLC_COLTEXTSTATUS)
4549 {
4550
4551 if (entry->isNested)
4552 {
4553 temp.LoadString(IDS_STATUSLIST_NESTED);
4554 }
4555 else
4556 {
4557 GitStatus::GetStatusString(hResourceHandle, entry->textstatus, buf, _countof(buf), (WORD)langID);
4558 if ((entry->copied)&&(_tcslen(buf)>1))
4559 _tcscat_s(buf, 100, _T(" (+)"));
4560 if ((entry->switched)&&(_tcslen(buf)>1))
4561 _tcscat_s(buf, 100, _T(" (s)"));
4562 temp = buf;
4563 }
4564 sClipboard += _T("\t")+temp;
4565 }
4566 #endif
4567 #if 0
4568 if (selection & SVNSLC_COLREMOTESTATUS)
4569 {
4570 if (entry->isNested)
4571 {
4572 temp.LoadString(IDS_STATUSLIST_NESTED);
4573 }
4574 else
4575 {
4576 GitStatus::GetStatusString(hResourceHandle, entry->remotestatus, buf, _countof(buf), (WORD)langID);
4577 if ((entry->copied)&&(_tcslen(buf)>1))
4578 _tcscat_s(buf, 100, _T(" (+)"));
4579 if ((entry->switched)&&(_tcslen(buf)>1))
4580 _tcscat_s(buf, 100, _T(" (s)"));
4581 if ((entry->remotestatus == entry->remotepropstatus)&&
4582 (entry->remotestatus != git_wc_status_none)&&
4583 (entry->remotestatus != git_wc_status_normal)&&
4584 (entry->remotestatus != git_wc_status_unversioned)&&
4585 (!SVNStatus::IsImportant(entry->remotetextstatus)))
4586 _tcscat_s(buf, 100, ponly);
4587 temp = buf;
4588 }
4589 sClipboard += _T("\t")+temp;
4590 }
4591 if (selection & GitSLC_COLPROPSTATUS)
4592 {
4593 if (entry->isNested)
4594 {
4595 temp.Empty();
4596 }
4597 else
4598 {
4599 GitStatus::GetStatusString(hResourceHandle, entry->propstatus, buf, _countof(buf), (WORD)langID);
4600 if ((entry->copied)&&(_tcslen(buf)>1))
4601 _tcscat_s(buf, 100, _T(" (+)"));
4602 if ((entry->switched)&&(_tcslen(buf)>1))
4603 _tcscat_s(buf, 100, _T(" (s)"));
4604 temp = buf;
4605 }
4606 sClipboard += _T("\t")+temp;
4607 }
4608 if (selection & SVNSLC_COLREMOTETEXT)
4609 {
4610 if (entry->isNested)
4611 {
4612 temp.Empty();
4613 }
4614 else
4615 {
4616 GitStatus::GetStatusString(hResourceHandle, entry->remotetextstatus, buf, _countof(buf), (WORD)langID);
4617 temp = buf;
4618 }
4619 sClipboard += _T("\t")+temp;
4620 }
4621 if (selection & SVNSLC_COLREMOTEPROP)
4622 {
4623 // SVNSLC_COLREMOTEPROP
4624 if (entry->isNested)
4625 {
4626 temp.Empty();
4627 }
4628 else
4629 {
4630 GitStatus::GetStatusString(hResourceHandle, entry->remotepropstatus, buf, _countof(buf), (WORD)langID);
4631 temp = buf;
4632 }
4633 sClipboard += _T("\t")+temp;
4634 }
4635 if (selection & SVNSLC_COLURL)
4636 sClipboard += _T("\t")+entry->url;
4637 if (selection & SVNSLC_COLLOCK)
4638 {
4639 if (!m_HeadRev.IsHead())
4640 {
4641 // we have contacted the repository
4642
4643 // decision-matrix
4644 // wc repository text
4645 // "" "" ""
4646 // "" UID1 owner
4647 // UID1 UID1 owner
4648 // UID1 "" lock has been broken
4649 // UID1 UID2 lock has been stolen
4650 if (entry->lock_token.IsEmpty() || (entry->lock_token.Compare(entry->lock_remotetoken)==0))
4651 {
4652 if (entry->lock_owner.IsEmpty())
4653 temp = entry->lock_remoteowner;
4654 else
4655 temp = entry->lock_owner;
4656 }
4657 else if (entry->lock_remotetoken.IsEmpty())
4658 {
4659 // broken lock
4660 temp.LoadString(IDS_STATUSLIST_LOCKBROKEN);
4661 }
4662 else
4663 {
4664 // stolen lock
4665 temp.Format(IDS_STATUSLIST_LOCKSTOLEN, (LPCTSTR)entry->lock_remoteowner);
4666 }
4667 }
4668 else
4669 temp = entry->lock_owner;
4670 sClipboard += _T("\t")+temp;
4671 }
4672 if (selection & SVNSLC_COLLOCKCOMMENT)
4673 sClipboard += _T("\t")+entry->lock_comment;
4674 if (selection & SVNSLC_COLAUTHOR)
4675 sClipboard += _T("\t")+entry->last_commit_author;
4676 if (selection & SVNSLC_COLREVISION)
4677 {
4678 temp.Format(_T("%ld"), entry->last_commit_rev);
4679 if (entry->last_commit_rev == 0)
4680 temp.Empty();
4681 sClipboard += _T("\t")+temp;
4682 }
4683 if (selection & SVNSLC_COLREMOTEREVISION)
4684 {
4685 temp.Format(_T("%ld"), entry->remoterev);
4686 if (entry->remoterev == 0)
4687 temp.Empty();
4688 sClipboard += _T("\t")+temp;
4689 }
4690
4691 if (selection & SVNSLC_COLDATE)
4692 {
4693 TCHAR datebuf[SVN_DATE_BUFFER];
4694 apr_time_t date = entry->last_commit_date;
4695 SVN::formatDate(datebuf, date, true);
4696 if (date)
4697 temp = datebuf;
4698 else
4699 temp.Empty();
4700 sClipboard += _T("\t")+temp;
4701 }
4702 if (selection & SVNSLC_COLCOPYFROM)
4703 {
4704 if (m_sURL.Compare(entry->copyfrom_url.Left(m_sURL.GetLength()))==0)
4705 temp = entry->copyfrom_url.Mid(m_sURL.GetLength());
4706 else
4707 temp = entry->copyfrom_url;
4708 sClipboard += _T("\t")+temp;
4709 }
4710
4711 for ( int i = SVNSLC_NUMCOLUMNS, count = m_ColumnManager.GetColumnCount()
4712 ; i < count
4713 ; ++i)
4714 {
4715 if ((dwCols == -1) && m_ColumnManager.IsVisible (i))
4716 {
4717 CString value
4718 = entry->present_props[m_ColumnManager.GetName(i)];
4719 sClipboard += _T("\t") + value;
4720 }
4721 }
4722 #endif
4723 if (selection & GITSLC_COLADD)
4724 {
4725 sClipboard += _T("\t")+entry->m_StatAdd;
4726 }
4727 if (selection & GITSLC_COLDEL)
4728 {
4729 sClipboard += _T("\t")+entry->m_StatDel;
4730 }
4731
4732 sClipboard += _T("\r\n");
4733 }
4734
4735 return CStringUtils::WriteAsciiStringToClipboard(sClipboard);
4736
4737 return TRUE;
4738
4739 }
4740
4741 size_t CGitStatusListCtrl::GetNumberOfChangelistsInSelection()
4742 {
4743 #if 0
4744 std::set<CString> changelists;
4745 POSITION pos = GetFirstSelectedItemPosition();
4746 int index;
4747 while ((index = GetNextSelectedItem(pos)) >= 0)
4748 {
4749 FileEntry * entry = GetListEntry(index);
4750 if (!entry->changelist.IsEmpty())
4751 changelists.insert(entry->changelist);
4752 }
4753 return changelists.size();
4754 #endif
4755 return 0;
4756 }
4757
4758 bool CGitStatusListCtrl::PrepareGroups(bool bForce /* = false */)
4759 {
4760
4761 bool bHasGroups=false;
4762 int max =0;
4763
4764 for(int i=0;i< this->m_arStatusArray.size(); i++)
4765 {
4766 int ParentNo = m_arStatusArray[i]->m_ParentNo&PARENT_MASK;
4767 if( ParentNo > max)
4768 max=m_arStatusArray[i]->m_ParentNo&PARENT_MASK;
4769 }
4770
4771 if ( this->m_UnRevFileList.GetCount()>0 ||
4772 this->m_IgnoreFileList.GetCount()>0 ||
4773 max>0 || bForce)
4774 {
4775 bHasGroups = true;
4776 }
4777
4778 RemoveAllGroups();
4779 EnableGroupView(bHasGroups);
4780
4781 TCHAR groupname[1024];
4782 int groupindex = 0;
4783
4784 if(bHasGroups)
4785 {
4786 LVGROUP grp = {0};
4787 grp.cbSize = sizeof(LVGROUP);
4788 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
4789 groupindex=0;
4790
4791 //if(m_UnRevFileList.GetCount()>0)
4792 if(max >0)
4793 {
4794 grp.pszHeader = _T("Merged Files");
4795 grp.iGroupId = MERGE_MASK;
4796 grp.uAlign = LVGA_HEADER_LEFT;
4797 InsertGroup(0, &grp);
4798
4799 for(int i=0;i<=max;i++)
4800 {
4801 CString str;
4802 str.Format(_T("Diff with parent %d"), i+1);
4803 //_tcsncpy_s(groupname, 1024, (LPCTSTR)_T("Not Versioned"), 1023);
4804 grp.pszHeader = str.GetBuffer();
4805 grp.iGroupId = i;
4806 grp.uAlign = LVGA_HEADER_LEFT;
4807 InsertGroup(i+1, &grp);
4808 }
4809 }
4810 else
4811 {
4812 CString sUnassignedName(_T("Modified File"));
4813 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
4814 grp.pszHeader = groupname;
4815 grp.iGroupId = groupindex;
4816 grp.uAlign = LVGA_HEADER_LEFT;
4817 InsertGroup(groupindex++, &grp);
4818
4819
4820 {
4821 _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("Not Versioned"), 1023);
4822 grp.pszHeader = groupname;
4823 grp.iGroupId = groupindex;
4824 grp.uAlign = LVGA_HEADER_LEFT;
4825 InsertGroup(groupindex++, &grp);
4826 }
4827
4828 //if(m_IgnoreFileList.GetCount()>0)
4829 {
4830 _tcsncpy_s(groupname, 1024, (LPCTSTR)_T("Ignored"), 1023);
4831 grp.pszHeader = groupname;
4832 grp.iGroupId = groupindex;
4833 grp.uAlign = LVGA_HEADER_LEFT;
4834 InsertGroup(groupindex++, &grp);
4835 }
4836 }
4837 }
4838
4839 #if 0
4840 m_bHasIgnoreGroup = false;
4841
4842 // now add the items which don't belong to a group
4843 LVGROUP grp = {0};
4844 grp.cbSize = sizeof(LVGROUP);
4845 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
4846 CString sUnassignedName(MAKEINTRESOURCE(IDS_STATUSLIST_UNASSIGNED_CHANGESET));
4847 _tcsncpy_s(groupname, 1024, (LPCTSTR)sUnassignedName, 1023);
4848 grp.pszHeader = groupname;
4849 grp.iGroupId = groupindex;
4850 grp.uAlign = LVGA_HEADER_LEFT;
4851 InsertGroup(groupindex++, &grp);
4852
4853 for (std::map<CString,int>::iterator it = m_changelists.begin(); it != m_changelists.end(); ++it)
4854 {
4855 if (it->first.Compare(SVNSLC_IGNORECHANGELIST)!=0)
4856 {
4857 LVGROUP grp = {0};
4858 grp.cbSize = sizeof(LVGROUP);
4859 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
4860 _tcsncpy_s(groupname, 1024, it->first, 1023);
4861 grp.pszHeader = groupname;
4862 grp.iGroupId = groupindex;
4863 grp.uAlign = LVGA_HEADER_LEFT;
4864 it->second = InsertGroup(groupindex++, &grp);
4865 }
4866 else
4867 m_bHasIgnoreGroup = true;
4868 }
4869
4870 if (m_bHasIgnoreGroup)
4871 {
4872 // and now add the group 'ignore-on-commit'
4873 std::map<CString,int>::iterator it = m_changelists.find(SVNSLC_IGNORECHANGELIST);
4874 if (it != m_changelists.end())
4875 {
4876 grp.cbSize = sizeof(LVGROUP);
4877 grp.mask = LVGF_ALIGN | LVGF_GROUPID | LVGF_HEADER;
4878 _tcsncpy_s(groupname, 1024, SVNSLC_IGNORECHANGELIST, 1023);
4879 grp.pszHeader = groupname;
4880 grp.iGroupId = groupindex;
4881 grp.uAlign = LVGA_HEADER_LEFT;
4882 it->second = InsertGroup(groupindex, &grp);
4883 }
4884 }
4885 #endif
4886 return bHasGroups;
4887 }
4888
4889 void CGitStatusListCtrl::NotifyCheck()
4890 {
4891 CWnd* pParent = GetParent();
4892 if (NULL != pParent && NULL != pParent->GetSafeHwnd())
4893 {
4894 pParent->SendMessage(GITSLNM_CHECKCHANGED, m_nSelected);
4895 }
4896 }
4897
4898 int CGitStatusListCtrl::UpdateFileList(git_revnum_t hash,CTGitPathList *list)
4899 {
4900 BYTE_VECTOR out;
4901 this->m_bBusy=TRUE;
4902 m_CurrentVersion=hash;
4903
4904 int count = 0;
4905 if(list == NULL)
4906 count = 1;
4907 else
4908 count = list->GetCount();
4909
4910 CString head = _T("HEAD");
4911 if(m_amend)
4912 head = _T("HEAD~1");
4913
4914 if(hash == GIT_REV_ZERO)
4915 {
4916 for(int i=0;i<count;i++)
4917 {
4918 BYTE_VECTOR cmdout;
4919 cmdout.clear();
4920 CString cmd;
4921 if(!g_Git.IsInitRepos())
4922 {
4923 // also list staged files which will be in the commit
4924 cmd=(_T("git.exe diff-index --cached --raw ") + head + _T(" --numstat -C -M -z"));
4925 g_Git.Run(cmd, &cmdout);
4926
4927 if(list == NULL)
4928 cmd=(_T("git.exe diff-index --raw ") + head + _T(" --numstat -C -M -z"));
4929 else
4930 cmd.Format(_T("git.exe diff-index --raw ") + head + _T(" --numstat -C -M -z -- \"%s\""),(*list)[i].GetGitPathString());
4931
4932 BYTE_VECTOR cmdErr;
4933 if(g_Git.Run(cmd, &cmdout, &cmdErr))
4934 {
4935 int last = cmdErr.RevertFind(0,-1);
4936 if(last > 0)
4937 {
4938 CString str;
4939 g_Git.StringAppend(&str, &cmdErr[last+1], CP_ACP, cmdErr.size() - last -1);
4940 CMessageBox::Show(NULL,str, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
4941 }
4942 else
4943 {
4944 cmdout.clear();
4945 CString strout, err;
4946 if (g_Git.Run(_T("git.exe rev-parse --revs-only ") + head, &strout, &err, CP_UTF8))
4947 {
4948 CMessageBox::Show(NULL, strout + L"\n" + err, _T("TortoiseGit"), MB_OK);
4949 return -1;
4950 }
4951 if(strout.IsEmpty() && err.IsEmpty())
4952 break; //this is initial repository, there are no any history
4953
4954 CMessageBox::Show(NULL, strout + L"\n" + err, _T("TortoiseGit"), MB_OK);
4955 return -1;
4956 }
4957 }
4958
4959 out.append(cmdout, 0);
4960 }
4961 else // Init Repository
4962 {
4963 //We will list all added file for init repository because commit will comit these
4964 //if(list == NULL)
4965 cmd=_T("git.exe ls-files -s -t -z");
4966 //else
4967 // cmd.Format(_T("git.exe ls-files -s -t -z -- \"%s\""),(*list)[i].GetGitPathString());
4968
4969 g_Git.Run(cmd, &cmdout);
4970 //out+=cmdout;
4971 out.append(cmdout,0);
4972 }
4973 }
4974
4975 if(g_Git.IsInitRepos())
4976 {
4977 m_StatusFileList.ParserFromLsFile(out);
4978 for(int i=0;i<m_StatusFileList.GetCount();i++)
4979 ((CTGitPath&)(m_StatusFileList[i])).m_Action=CTGitPath::LOGACTIONS_ADDED;
4980 }
4981 else
4982 this->m_StatusFileList.ParserFromLog(out);
4983
4984 //handle delete conflict case, when remote : modified, local : deleted.
4985 for(int i=0;i<count;i++)
4986 {
4987 BYTE_VECTOR cmdout;
4988 CString cmd;
4989
4990 if(list == NULL)
4991 cmd=_T("git.exe ls-files -u -t -z");
4992 else
4993 cmd.Format(_T("git.exe ls-files -u -t -z -- \"%s\""),(*list)[i].GetGitPathString());
4994
4995 g_Git.Run(cmd, &cmdout);
4996
4997 CTGitPathList conflictlist;
4998 conflictlist.ParserFromLog(cmdout);
4999 for(int i=0;i<conflictlist.GetCount();i++)
5000 {
5001 CTGitPath *p=m_StatusFileList.LookForGitPath(conflictlist[i].GetGitPathString());
5002 if(p)
5003 p->m_Action|=CTGitPath::LOGACTIONS_UNMERGED;
5004 else
5005 m_StatusFileList.AddPath(conflictlist[i]);
5006 }
5007 }
5008
5009 // handle source files of file renames/moves (issue #860)
5010 // if a file gets renamed and the new file "git add"ed, diff-index doesn't list the source file anymore
5011 for(int i = 0; i < count; i++)
5012 {
5013 BYTE_VECTOR cmdout;
5014 CString cmd;
5015
5016 if(list == NULL)
5017 cmd = _T("git.exe ls-files -d -z");
5018 else
5019 cmd.Format(_T("git.exe ls-files -d -z -- \"%s\""),(*list)[i].GetGitPathString());
5020
5021 g_Git.Run(cmd, &cmdout);
5022
5023 CTGitPathList deletelist;
5024 deletelist.ParserFromLog(cmdout, true);
5025 for(int i = 0; i < deletelist.GetCount(); i++)
5026 {
5027 CTGitPath *p = m_StatusFileList.LookForGitPath(deletelist[i].GetGitPathString());
5028 if(!p)
5029 m_StatusFileList.AddPath(deletelist[i]);
5030 }
5031 }
5032 }
5033 else
5034 {
5035 int count = 0;
5036 if(list == NULL)
5037 count = 1;
5038 else
5039 count = list->GetCount();
5040
5041 for(int i=0;i<count;i++)
5042 {
5043 BYTE_VECTOR cmdout;
5044 CString cmd;
5045 if(list == NULL)
5046 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M -z %s"),hash);
5047 else
5048 cmd.Format(_T("git.exe diff-tree --raw --numstat -C -M %s -z -- \"%s\""),hash,(*list)[i].GetGitPathString());
5049
5050 g_Git.Run(cmd, &cmdout, NULL);
5051
5052 out.append(cmdout);
5053 }
5054 this->m_StatusFileList.ParserFromLog(out);
5055
5056 }
5057
5058 for(int i=0;i<m_StatusFileList.GetCount();i++)
5059 {
5060 CTGitPath * gitpatch=(CTGitPath*)&m_StatusFileList[i];
5061 gitpatch->m_Checked = TRUE;
5062 m_arStatusArray.push_back((CTGitPath*)&m_StatusFileList[i]);
5063 }
5064
5065 this->m_bBusy=FALSE;
5066 return 0;
5067 }
5068
5069 int CGitStatusListCtrl::UpdateWithGitPathList(CTGitPathList &list)
5070 {
5071 m_arStatusArray.clear();
5072 for(int i=0;i<list.GetCount();i++)
5073 {
5074 CTGitPath * gitpath=(CTGitPath*)&list[i];
5075
5076 if(gitpath ->m_Action & CTGitPath::LOGACTIONS_HIDE)
5077 continue;
5078
5079 gitpath->m_Checked = TRUE;
5080 m_arStatusArray.push_back((CTGitPath*)&list[i]);
5081 }
5082 return 0;
5083 }
5084
5085 int CGitStatusListCtrl::UpdateUnRevFileList(CTGitPathList *List)
5086 {
5087 this->m_UnRevFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER,List);
5088 for(int i=0;i<m_UnRevFileList.GetCount();i++)
5089 {
5090 CTGitPath * gitpatch=(CTGitPath*)&m_UnRevFileList[i];
5091 gitpatch->m_Checked = FALSE;
5092 m_arStatusArray.push_back((CTGitPath*)&m_UnRevFileList[i]);
5093 }
5094 return 0;
5095 }
5096
5097 int CGitStatusListCtrl::UpdateIgnoreFileList(CTGitPathList *List)
5098 {
5099 this->m_IgnoreFileList.FillUnRev(CTGitPath::LOGACTIONS_UNVER|CTGitPath::LOGACTIONS_IGNORE,List);
5100 for(int i=0;i<m_IgnoreFileList.GetCount();i++)
5101 {
5102 CTGitPath * gitpatch=(CTGitPath*)&m_IgnoreFileList[i];
5103 gitpatch->m_Checked = FALSE;
5104 m_arStatusArray.push_back((CTGitPath*)&m_IgnoreFileList[i]);
5105 }
5106 return 0;
5107 }
5108 int CGitStatusListCtrl::UpdateFileList(int mask,bool once,CTGitPathList *List)
5109 {
5110 if(mask&CGitStatusListCtrl::FILELIST_MODIFY)
5111 {
5112 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_MODIFY)))
5113 {
5114 UpdateFileList(git_revnum_t(GIT_REV_ZERO),List);
5115 m_FileLoaded|=CGitStatusListCtrl::FILELIST_MODIFY;
5116 }
5117 }
5118 if(mask&CGitStatusListCtrl::FILELIST_UNVER)
5119 {
5120 if(once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_UNVER)))
5121 {
5122 UpdateUnRevFileList(List);
5123 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
5124 }
5125 if(mask&CGitStatusListCtrl::FILELIST_IGNORE && (once || (!(m_FileLoaded&CGitStatusListCtrl::FILELIST_IGNORE))))
5126 {
5127 UpdateIgnoreFileList(List);
5128 m_FileLoaded|=CGitStatusListCtrl::FILELIST_UNVER;
5129 }
5130 }
5131 return 0;
5132 }
5133
5134 void CGitStatusListCtrl::Clear()
5135 {
5136 m_FileLoaded=0;
5137 this->DeleteAllItems();
5138 this->m_arListArray.clear();
5139 this->m_arStatusArray.clear();
5140 this->m_changelists.clear();
5141 }
5142 //////////////////////////////////////////////////////////////////////////
5143 #if 0
5144 bool CGitStatusListCtrlDropTarget::OnDrop(FORMATETC* pFmtEtc, STGMEDIUM& medium, DWORD * /*pdwEffect*/, POINTL pt)
5145 {
5146 if(pFmtEtc->cfFormat == CF_HDROP && medium.tymed == TYMED_HGLOBAL)
5147 {
5148 HDROP hDrop = (HDROP)GlobalLock(medium.hGlobal);
5149 if(hDrop != NULL)
5150 {
5151 TCHAR szFileName[MAX_PATH];
5152
5153 UINT cFiles = DragQueryFile(hDrop, 0xFFFFFFFF, NULL, 0);
5154
5155 POINT clientpoint;
5156 clientpoint.x = pt.x;
5157 clientpoint.y = pt.y;
5158 ScreenToClient(m_hTargetWnd, &clientpoint);
5159 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
5160 {
5161 CTSVNPathList changelistItems;
5162 for(UINT i = 0; i < cFiles; ++i)
5163 {
5164 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
5165 changelistItems.AddPath(CTSVNPath(szFileName));
5166 }
5167 // find the changelist name
5168 CString sChangelist;
5169 LONG_PTR nGroup = m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint);
5170 for (std::map<CString, int>::iterator it = m_pSVNStatusListCtrl->m_changelists.begin(); it != m_pSVNStatusListCtrl->m_changelists.end(); ++it)
5171 if (it->second == nGroup)
5172 sChangelist = it->first;
5173 if (!sChangelist.IsEmpty())
5174 {
5175 SVN git;
5176 if (git.AddToChangeList(changelistItems, sChangelist, git_depth_empty))
5177 {
5178 for (int l=0; l<changelistItems.GetCount(); ++l)
5179 {
5180 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
5181 if (index >= 0)
5182 {
5183 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
5184 if (e)
5185 {
5186 e->changelist = sChangelist;
5187 if (!e->IsFolder())
5188 {
5189 if (m_pSVNStatusListCtrl->m_changelists.find(e->changelist)!=m_pSVNStatusListCtrl->m_changelists.end())
5190 m_pSVNStatusListCtrl->SetItemGroup(index, m_pSVNStatusListCtrl->m_changelists[e->changelist]);
5191 else
5192 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
5193 }
5194 }
5195 }
5196 else
5197 {
5198 HWND hParentWnd = GetParent(m_hTargetWnd);
5199 if (hParentWnd != NULL)
5200 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
5201 }
5202 }
5203 }
5204 else
5205 {
5206 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
5207 }
5208 }
5209 else
5210 {
5211 SVN git;
5212 if (git.RemoveFromChangeList(changelistItems, CStringArray(), git_depth_empty))
5213 {
5214 for (int l=0; l<changelistItems.GetCount(); ++l)
5215 {
5216 int index = m_pSVNStatusListCtrl->GetIndex(changelistItems[l]);
5217 if (index >= 0)
5218 {
5219 CSVNStatusListCtrl::FileEntry * e = m_pSVNStatusListCtrl->GetListEntry(index);
5220 if (e)
5221 {
5222 e->changelist = sChangelist;
5223 m_pSVNStatusListCtrl->SetItemGroup(index, 0);
5224 }
5225 }
5226 else
5227 {
5228 HWND hParentWnd = GetParent(m_hTargetWnd);
5229 if (hParentWnd != NULL)
5230 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)changelistItems[l].GetWinPath());
5231 }
5232 }
5233 }
5234 else
5235 {
5236 CMessageBox::Show(m_pSVNStatusListCtrl->m_hWnd, git.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
5237 }
5238 }
5239 }
5240 else
5241 {
5242 for(UINT i = 0; i < cFiles; ++i)
5243 {
5244 DragQueryFile(hDrop, i, szFileName, sizeof(szFileName));
5245 HWND hParentWnd = GetParent(m_hTargetWnd);
5246 if (hParentWnd != NULL)
5247 ::SendMessage(hParentWnd, CSVNStatusListCtrl::SVNSLNM_ADDFILE, 0, (LPARAM)szFileName);
5248 }
5249 }
5250 }
5251 GlobalUnlock(medium.hGlobal);
5252 }
5253 return true; //let base free the medium
5254 }
5255 HRESULT STDMETHODCALLTYPE CSVNStatusListCtrlDropTarget::DragOver(DWORD grfKeyState, POINTL pt, DWORD __RPC_FAR *pdwEffect)
5256 {
5257 CIDropTarget::DragOver(grfKeyState, pt, pdwEffect);
5258 *pdwEffect = DROPEFFECT_COPY;
5259 if (m_pSVNStatusListCtrl)
5260 {
5261 POINT clientpoint;
5262 clientpoint.x = pt.x;
5263 clientpoint.y = pt.y;
5264 ScreenToClient(m_hTargetWnd, &clientpoint);
5265 if ((m_pSVNStatusListCtrl->IsGroupViewEnabled())&&(m_pSVNStatusListCtrl->GetGroupFromPoint(&clientpoint) >= 0))
5266 {
5267 *pdwEffect = DROPEFFECT_MOVE;
5268 }
5269 else if ((!m_pSVNStatusListCtrl->m_bFileDropsEnabled)||(m_pSVNStatusListCtrl->m_bOwnDrag))
5270 {
5271 *pdwEffect = DROPEFFECT_NONE;
5272 }
5273 }
5274 return S_OK;
5275 }f
5276
5277 #endif
5278
5279 void CGitStatusListCtrl::FileSaveAs(CTGitPath *path)
5280 {
5281 CString filename;
5282 filename.Format(_T("%s-%s%s"),path->GetBaseFilename(),this->m_CurrentVersion.Left(6),path->GetFileExtension());
5283 CFileDialog dlg(FALSE,NULL,
5284 filename,
5285 OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT,
5286 NULL);
5287 CString currentpath;
5288 currentpath=g_Git.m_CurrentDir+_T("\\");
5289 currentpath+=path->GetWinPathString();
5290
5291 dlg.m_ofn.lpstrInitialDir=currentpath.GetBuffer();
5292
5293 CString cmd,out;
5294 if(dlg.DoModal()==IDOK)
5295 {
5296 filename = dlg.GetPathName();
5297 if(m_CurrentVersion == GIT_REV_ZERO)
5298 {
5299 if(!CopyFile(g_Git.m_CurrentDir +_T("\\") + path->GetWinPath(),filename,false))
5300 {
5301 LPVOID lpMsgBuf=NULL;
5302 FormatMessage(FORMAT_MESSAGE_ALLOCATE_BUFFER|FORMAT_MESSAGE_FROM_SYSTEM,
5303 NULL,GetLastError(),MAKELANGID(LANG_NEUTRAL, SUBLANG_DEFAULT),
5304 (LPTSTR)&lpMsgBuf,
5305 0,NULL);
5306 CMessageBox::Show(NULL,(TCHAR *)lpMsgBuf,_T("TortoiseGit"),MB_OK);
5307 LocalFree(lpMsgBuf);
5308 return;
5309 }
5310
5311 }
5312 else
5313 {
5314 if(g_Git.GetOneFile(m_CurrentVersion,*path,filename))
5315 {
5316 out.Format(_T("Fail checkout one file %s;%s"),m_CurrentVersion, path->GetWinPath());
5317 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
5318 return;
5319 }
5320 }
5321 }
5322
5323 }
5324
5325 int CGitStatusListCtrl::RevertSelectedItemToVersion()
5326 {
5327 if(this->m_CurrentVersion.IsEmpty())
5328 return 0;
5329 if(this->m_CurrentVersion == GIT_REV_ZERO)
5330 return 0;
5331
5332 POSITION pos = GetFirstSelectedItemPosition();
5333 int index;
5334 CString cmd,out;
5335 int count =0;
5336 while ((index = GetNextSelectedItem(pos)) >= 0)
5337 {
5338 CTGitPath *fentry=(CTGitPath*)GetItemData(index);
5339 cmd.Format(_T("git.exe checkout %s -- \"%s\""),m_CurrentVersion,fentry->GetGitPathString());
5340 out.Empty();
5341 if(g_Git.Run(cmd,&out,CP_ACP))
5342 {
5343 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
5344 }
5345 count++;
5346 }
5347
5348 out.Format(_T("%d files revert to %s"),count,m_CurrentVersion.Left(6));
5349 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
5350 return 0;
5351 }
5352
5353 void CGitStatusListCtrl::OpenFile(CTGitPath*filepath,int mode)
5354 {
5355 CString file;
5356 if(this->m_CurrentVersion.IsEmpty() || m_CurrentVersion == GIT_REV_ZERO)
5357 {
5358 file= filepath->GetWinPath();
5359 }
5360 else
5361 {
5362 CString temppath;
5363 GetTempPath(temppath);
5364 file.Format(_T("%s%s_%s%s"),
5365 temppath,
5366 filepath->GetBaseFilename(),
5367 m_CurrentVersion.Left(6),
5368 filepath->GetFileExtension());
5369 CString cmd,out;
5370 if(g_Git.GetOneFile(m_CurrentVersion, *filepath, file))
5371 {
5372 out.Format(_T("Fail checkout file %s to %s\n"), filepath->GetGitPathString(), file);
5373 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
5374 return;
5375 }
5376
5377 }
5378 if(mode == ALTERNATIVEEDITOR)
5379 {
5380 CAppUtils::LaunchAlternativeEditor(file);
5381 return;
5382 }
5383 int ret = HINSTANCE_ERROR;
5384
5385 if(mode == OPEN )
5386 {
5387 ret = (int)ShellExecute(this->m_hWnd, NULL,file, NULL, NULL, SW_SHOW);
5388
5389 if (ret > HINSTANCE_ERROR)
5390 {
5391 return;
5392 }
5393 }
5394
5395 {
5396 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
5397 cmd += file;
5398 CAppUtils::LaunchApplication(cmd, NULL, false);
5399 }
5400
5401 }
Windows Explorer Extension to Operate Git