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