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