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