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