?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Fixed warning
[TortoiseGit.git] / src / TortoiseProc / GitLogListAction.cpp
blob37dcb49e1d1b0e22b055356a851bdc96bf7e20c1
1 // TortoiseGit - a Windows shell extension for easy version control
2
3 // Copyright (C) 2008-2012 - TortoiseGit
4 // Copyright (C) 2011-2012 - Sven Strickroth <email@cs-ware.de>
5 // Copyright (C) 2005-2007 Marco Costalba
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 // GitLogList.cpp : implementation file
22 //
23 #include "stdafx.h"
24 #include "TortoiseProc.h"
25 #include "GitLogList.h"
26 #include "GitRev.h"
27 //#include "VssStyle.h"
28 #include "IconMenu.h"
29 // CGitLogList
30 #include "cursor.h"
31 #include "InputDlg.h"
32 #include "GITProgressDlg.h"
33 #include "ProgressDlg.h"
34 #include "SysProgressDlg.h"
35 //#include "RepositoryBrowser.h"
36 //#include "CopyDlg.h"
37 //#include "StatGraphDlg.h"
38 #include "Logdlg.h"
39 #include "MessageBox.h"
40 #include "Registry.h"
41 #include "AppUtils.h"
42 #include "PathUtils.h"
43 #include "StringUtils.h"
44 #include "UnicodeUtils.h"
45 #include "TempFile.h"
46 //#include "GitInfo.h"
47 //#include "GitDiff.h"
48 //#include "RevisionRangeDlg.h"
49 //#include "BrowseFolder.h"
50 //#include "BlameDlg.h"
51 //#include "Blame.h"
52 //#include "GitHelpers.h"
53 #include "GitStatus.h"
54 //#include "LogDlgHelper.h"
55 //#include "CachedLogInfo.h"
56 //#include "RepositoryInfo.h"
57 //#include "EditPropertiesDlg.h"
58 #include "FileDiffDlg.h"
59 #include "CommitDlg.h"
60 #include "RebaseDlg.h"
61 #include "GitDiff.h"
62 #include "../TGitCache/CacheInterface.h"
63
64 IMPLEMENT_DYNAMIC(CGitLogList, CHintListCtrl)
65
66 int CGitLogList::RevertSelectedCommits(int parent)
67 {
68 CSysProgressDlg progress;
69 int ret = -1;
70
71 #if 0
72 if(!g_Git.CheckCleanWorkTree())
73 {
74 CMessageBox::Show(NULL, IDS_PROC_NOCLEAN, IDS_APPNAME, MB_OK);
75
76 }
77 #endif
78
79 if (this->GetSelectedCount() > 1)
80 {
81 progress.SetTitle(CString(MAKEINTRESOURCE(IDS_PROGS_TITLE_REVERTCOMMIT)));
82 progress.SetAnimation(IDR_MOVEANI);
83 progress.SetTime(true);
84 progress.ShowModeless(this);
85 }
86
87 CBlockCacheForPath cacheBlock(g_Git.m_CurrentDir);
88
89 POSITION pos = GetFirstSelectedItemPosition();
90 int i=0;
91 while(pos)
92 {
93 int index = GetNextSelectedItem(pos);
94 GitRev * r1 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(index));
95
96 if (progress.IsVisible())
97 {
98 progress.FormatNonPathLine(1, IDS_PROC_REVERTCOMMIT, r1->m_CommitHash.ToString());
99 progress.FormatNonPathLine(2, _T("%s"), r1->GetSubject());
100 progress.SetProgress(i, this->GetSelectedCount());
101 }
102 i++;
103
104 if(r1->m_CommitHash.IsEmpty())
105 continue;
106
107 CString cmd, output, merge;
108 if (parent)
109 merge.Format(_T("-m %d "), parent);
110 cmd.Format(_T("git.exe revert --no-edit --no-commit %s%s"), merge, r1->m_CommitHash.ToString());
111 if (g_Git.Run(cmd, &output, CP_UTF8))
112 {
113 CString str;
114 str.LoadString(IDS_SVNACTION_FAILEDREVERT);
115 str += _T("\n");
116 str+= cmd;
117 str+= _T("\n")+output;
118 if( GetSelectedCount() == 1)
119 CMessageBox::Show(NULL, str, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
120 else
121 {
122 if(CMessageBox::Show(NULL, str, _T("TortoiseGit"),2 , IDI_ERROR, CString(MAKEINTRESOURCE(IDS_SKIPBUTTON)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON))) == 2)
123 {
124 return ret;
125 }
126 }
127 }
128 else
129 {
130 ret =0;
131 }
132
133 if (progress.HasUserCancelled())
134 break;
135 }
136 return ret;
137 }
138 int CGitLogList::CherryPickFrom(CString from, CString to)
139 {
140 CLogDataVector logs(&m_LogCache);
141 if(logs.ParserFromLog(NULL,-1,0,&from,&to))
142 return -1;
143
144 if (logs.empty())
145 return 0;
146
147 CSysProgressDlg progress;
148 progress.SetTitle(CString(MAKEINTRESOURCE(IDS_PROGS_TITLE_CHERRYPICK)));
149 progress.SetAnimation(IDR_MOVEANI);
150 progress.SetTime(true);
151 progress.ShowModeless(this);
152
153 CBlockCacheForPath cacheBlock(g_Git.m_CurrentDir);
154
155 for (int i = (int)logs.size() - 1; i >= 0; i--)
156 {
157 if (progress.IsVisible())
158 {
159 progress.FormatNonPathLine(1, IDS_PROC_PICK, logs.GetGitRevAt(i).m_CommitHash.ToString());
160 progress.FormatNonPathLine(2, _T("%s"), logs.GetGitRevAt(i).GetSubject());
161 progress.SetProgress64(logs.size() - i, logs.size());
162 }
163 if (progress.HasUserCancelled())
164 {
165 throw std::exception(CUnicodeUtils::GetUTF8(CString(MAKEINTRESOURCE(IDS_SVN_USERCANCELLED))));
166 return -1;
167 }
168 CString cmd,out;
169 cmd.Format(_T("git.exe cherry-pick %s"),logs.GetGitRevAt(i).m_CommitHash.ToString());
170 out.Empty();
171 if(g_Git.Run(cmd,&out,CP_UTF8))
172 {
173 throw std::exception(CUnicodeUtils::GetUTF8(CString(MAKEINTRESOURCE(IDS_PROC_CHERRYPICKFAILED)) + _T(":\r\n\r\n") + out));
174 return -1;
175 }
176 }
177
178 return 0;
179 }
180
181 void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect, CMenu *popmenu)
182 {
183 POSITION pos = GetFirstSelectedItemPosition();
184 int indexNext = GetNextSelectedItem(pos);
185 if (indexNext < 0)
186 return;
187
188 GitRev* pSelLogEntry = reinterpret_cast<GitRev*>(m_arShownList.GetAt(indexNext));
189
190 theApp.DoWaitCursor(1);
191 switch (cmd&0xFFFF)
192 {
193 case ID_COMMIT:
194 {
195 CTGitPathList pathlist;
196 CTGitPathList selectedlist;
197 pathlist.AddPath(this->m_Path);
198 bool bSelectFilesForCommit = !!DWORD(CRegStdDWORD(_T("Software\\TortoiseGit\\SelectFilesForCommit"), TRUE));
199 CString str;
200 CAppUtils::Commit(CString(),false,str,
201 pathlist,selectedlist,bSelectFilesForCommit);
202 //this->Refresh();
203 this->GetParent()->PostMessage(WM_COMMAND,ID_LOGDLG_REFRESH,0);
204 }
205 break;
206 case ID_GNUDIFF1: // compare with WC, unified
207 {
208 CString tempfile=GetTempFile();
209 CString command;
210 GitRev * r1 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(FirstSelect));
211 if(!r1->m_CommitHash.IsEmpty())
212 {
213 CString merge;
214 CString hash2;
215 cmd >>= 16;
216 if( (cmd&0xFFFF) == 0xFFFF)
217 {
218 merge=_T("-m");
219 }
220 else if((cmd&0xFFFF) == 0xFFFE)
221 {
222 merge=_T("-c");
223 }
224 else
225 {
226 if(cmd > r1->m_ParentHash.size())
227 {
228 CString str;
229 str.Format(IDS_PROC_NOPARENT, cmd);
230 MessageBox(str, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
231 return;
232 }
233 else
234 {
235 if(cmd>0)
236 hash2 = r1->m_ParentHash[cmd-1].ToString();
237 }
238 }
239 command.Format(_T("git.exe diff-tree %s -r -p --stat %s %s"), merge, hash2, r1->m_CommitHash.ToString());
240 }
241 else
242 command.Format(_T("git.exe diff -r -p --stat"));
243
244 g_Git.RunLogFile(command,tempfile);
245 CAppUtils::StartUnifiedDiffViewer(tempfile, r1->m_CommitHash.ToString().Left(g_Git.GetShortHASHLength()) + _T(":") + r1->GetSubject());
246 }
247 break;
248
249 case ID_GNUDIFF2: // compare two revisions, unified
250 {
251 CString tempfile=GetTempFile();
252 CString cmd;
253 GitRev * r1 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(FirstSelect));
254 GitRev * r2 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(LastSelect));
255
256 if( r1->m_CommitHash.IsEmpty()) {
257 cmd.Format(_T("git.exe diff -r -p --stat %s"),r2->m_CommitHash.ToString());
258 }
259 else if( r2->m_CommitHash.IsEmpty()) {
260 cmd.Format(_T("git.exe diff -r -p --stat %s"),r1->m_CommitHash.ToString());
261 }
262 else
263 {
264 cmd.Format(_T("git.exe diff-tree -r -p --stat %s %s"),r2->m_CommitHash.ToString(),r1->m_CommitHash.ToString());
265 }
266
267 g_Git.RunLogFile(cmd,tempfile);
268 CAppUtils::StartUnifiedDiffViewer(tempfile, r2->m_CommitHash.ToString().Left(g_Git.GetShortHASHLength()) + _T(":") + r1->m_CommitHash.ToString().Left(g_Git.GetShortHASHLength()));
269
270 }
271 break;
272
273 case ID_COMPARETWO: // compare two revisions
274 {
275 GitRev * r1 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(FirstSelect));
276 GitRev * r2 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(LastSelect));
277 if (m_Path.IsDirectory() || !(m_ShowMask & CGit::LOG_INFO_FOLLOW))
278 CGitDiff::DiffCommit(this->m_Path, r1,r2);
279 else
280 {
281 CString path1 = m_Path.GetGitPathString();
282 // start with 1 (0 = working copy changes)
283 for (int i = 1; i < FirstSelect; i++)
284 {
285 GitRev * first = reinterpret_cast<GitRev*>(m_arShownList.GetAt(i));
286 CTGitPathList list = first->GetFiles(NULL);
287 CTGitPath * file = list.LookForGitPath(path1);
288 if (file && !file->GetGitOldPathString().IsEmpty())
289 path1 = file->GetGitOldPathString();
290 }
291 CString path2 = path1;
292 for (int i = FirstSelect; i < LastSelect; i++)
293 {
294 GitRev * first = reinterpret_cast<GitRev*>(m_arShownList.GetAt(i));
295 CTGitPathList list = first->GetFiles(NULL);
296 CTGitPath * file = list.LookForGitPath(path2);
297 if (file && !file->GetGitOldPathString().IsEmpty())
298 path2 = file->GetGitOldPathString();
299 }
300 CGitDiff::DiffCommit(CTGitPath(path1), CTGitPath(path2), r1, r2);
301 }
302
303 }
304 break;
305
306 case ID_COMPARE: // compare revision with WC
307 {
308 GitRev * r1 = &m_wcRev;
309 GitRev * r2 = pSelLogEntry;
310
311 if (m_Path.IsDirectory() || !(m_ShowMask & CGit::LOG_INFO_FOLLOW))
312 CGitDiff::DiffCommit(this->m_Path, r1,r2);
313 else
314 {
315 CString path1 = m_Path.GetGitPathString();
316 // start with 1 (0 = working copy changes)
317 for (int i = 1; i < FirstSelect; i++)
318 {
319 GitRev * first = reinterpret_cast<GitRev*>(m_arShownList.GetAt(i));
320 CTGitPathList list = first->GetFiles(NULL);
321 CTGitPath * file = list.LookForGitPath(path1);
322 if (file && !file->GetGitOldPathString().IsEmpty())
323 path1 = file->GetGitOldPathString();
324 }
325 CGitDiff::DiffCommit(m_Path, CTGitPath(path1), r1, r2);
326 }
327
328 //user clicked on the menu item "compare with working copy"
329 //if (PromptShown())
330 //{
331 // GitDiff diff(this, m_hWnd, true);
332 // diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
333 // diff.SetHEADPeg(m_LogRevision);
334 // diff.ShowCompare(m_path, GitRev::REV_WC, m_path, revSelected);
335 //}
336 //else
337 // CAppUtils::StartShowCompare(m_hWnd, m_path, GitRev::REV_WC, m_path, revSelected, GitRev(), m_LogRevision, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
338 }
339 break;
340
341 case ID_COMPAREWITHPREVIOUS:
342 {
343 CFileDiffDlg dlg;
344
345 if (!pSelLogEntry->m_ParentHash.empty())
346 //if(m_logEntries.m_HashMap[pSelLogEntry->m_ParentHash[0]]>=0)
347 {
348 cmd>>=16;
349 cmd&=0xFFFF;
350
351 if(cmd == 0)
352 cmd=1;
353
354 if (m_Path.IsDirectory() || !(m_ShowMask & CGit::LOG_INFO_FOLLOW))
355 CGitDiff::DiffCommit(m_Path, pSelLogEntry->m_CommitHash.ToString(), pSelLogEntry->m_ParentHash[cmd - 1].ToString());
356 else
357 {
358 CString path1 = m_Path.GetGitPathString();
359 // start with 1 (0 = working copy changes)
360 for (int i = 1; i < indexNext; i++)
361 {
362 GitRev * first = reinterpret_cast<GitRev*>(m_arShownList.GetAt(i));
363 CTGitPathList list = first->GetFiles(NULL);
364 CTGitPath * file = list.LookForGitPath(path1);
365 if (file && !file->GetGitOldPathString().IsEmpty())
366 path1 = file->GetGitOldPathString();
367 }
368 CString path2 = path1;
369 GitRev * first = reinterpret_cast<GitRev*>(m_arShownList.GetAt(indexNext));
370 CTGitPathList list = first->GetFiles(NULL);
371 CTGitPath * file = list.LookForGitPath(path2);
372 if (file && !file->GetGitOldPathString().IsEmpty())
373 path2 = file->GetGitOldPathString();
374
375 CGitDiff::DiffCommit(CTGitPath(path1), CTGitPath(path2), pSelLogEntry->m_CommitHash.ToString(), pSelLogEntry->m_ParentHash[cmd - 1].ToString());
376 }
377 }
378 else
379 {
380 CMessageBox::Show(NULL, IDS_PROC_NOPREVIOUSVERSION, IDS_APPNAME, MB_OK);
381 }
382 //if (PromptShown())
383 //{
384 // GitDiff diff(this, m_hWnd, true);
385 // diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
386 // diff.SetHEADPeg(m_LogRevision);
387 // diff.ShowCompare(CTGitPath(pathURL), revPrevious, CTGitPath(pathURL), revSelected);
388 //}
389 //else
390 // CAppUtils::StartShowCompare(m_hWnd, CTGitPath(pathURL), revPrevious, CTGitPath(pathURL), revSelected, GitRev(), m_LogRevision, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
391 }
392 break;
393 case ID_COPYCLIPBOARD:
394 {
395 CopySelectionToClipBoard();
396 }
397 break;
398 case ID_COPYCLIPBOARDMESSAGES:
399 {
400 if ((GetAsyncKeyState(VK_SHIFT) & 0x8000) != 0)
401 CopySelectionToClipBoard(ID_COPY_SUBJECT);
402 else
403 CopySelectionToClipBoard(ID_COPY_MESSAGE);
404 }
405 break;
406 case ID_COPYHASH:
407 {
408 CopySelectionToClipBoard(ID_COPY_HASH);
409 }
410 break;
411 case ID_EXPORT:
412 {
413 CString str=pSelLogEntry->m_CommitHash.ToString();
414 CAppUtils::Export(&str);
415 }
416 break;
417 case ID_CREATE_BRANCH:
418 case ID_CREATE_TAG:
419 {
420 CString str = pSelLogEntry->m_CommitHash.ToString();
421 // try to guess remote branch in order to enable tracking
422 for (int i = 0; i < m_HashMap[pSelLogEntry->m_CommitHash].size(); i++)
423 {
424 if (m_HashMap[pSelLogEntry->m_CommitHash][i].Find(_T("refs/remotes/")) == 0)
425 {
426 str = m_HashMap[pSelLogEntry->m_CommitHash][i];
427 break;
428 }
429 }
430 CAppUtils::CreateBranchTag((cmd&0xFFFF) == ID_CREATE_TAG, &str);
431 ReloadHashMap();
432 Invalidate();
433 ::PostMessage(this->GetParent()->m_hWnd,MSG_REFLOG_CHANGED,0,0);
434 }
435 break;
436 case ID_SWITCHTOREV:
437 {
438 CString str = pSelLogEntry->m_CommitHash.ToString();
439 // try to guess remote branch in order to recommend good branch name and tracking
440 for (int i = 0; i < m_HashMap[pSelLogEntry->m_CommitHash].size(); i++)
441 {
442 if (m_HashMap[pSelLogEntry->m_CommitHash][i].Find(_T("refs/remotes/")) == 0)
443 {
444 str = m_HashMap[pSelLogEntry->m_CommitHash][i];
445 break;
446 }
447 }
448 CAppUtils::Switch(str);
449 }
450 ReloadHashMap();
451 Invalidate();
452 ::PostMessage(this->GetParent()->m_hWnd,MSG_REFLOG_CHANGED,0,0);
453 break;
454 case ID_SWITCHBRANCH:
455 if(popmenu)
456 {
457 CString *branch = (CString*)((CIconMenu*)popmenu)->GetMenuItemData(cmd);
458 if(branch)
459 {
460 CString name;
461 if(branch->Find(_T("refs/heads/")) ==0 )
462 name = branch->Mid(11);
463 else
464 name = *branch;
465
466 CAppUtils::PerformSwitch(name);
467 }
468 ReloadHashMap();
469 Invalidate();
470 ::PostMessage(this->GetParent()->m_hWnd,MSG_REFLOG_CHANGED,0,0);
471 }
472 break;
473 case ID_RESET:
474 {
475 CString str = pSelLogEntry->m_CommitHash.ToString();
476 if (CAppUtils::GitReset(&str))
477 {
478 ResetWcRev(true);
479 ReloadHashMap();
480 Invalidate();
481 }
482 }
483 break;
484 case ID_REBASE_PICK:
485 SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_PICK);
486 break;
487 case ID_REBASE_EDIT:
488 SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_EDIT);
489 break;
490 case ID_REBASE_SQUASH:
491 SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_SQUASH);
492 break;
493 case ID_REBASE_SKIP:
494 SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_SKIP);
495 break;
496 case ID_COMBINE_COMMIT:
497 {
498 CString head;
499 CGitHash headhash;
500 CGitHash hashFirst,hashLast;
501
502 int headindex=GetHeadIndex();
503 if(headindex>=0) //incase show all branch, head is not the first commits.
504 {
505 head.Format(_T("HEAD~%d"),FirstSelect-headindex);
506 hashFirst=g_Git.GetHash(head);
507
508 head.Format(_T("HEAD~%d"),LastSelect-headindex);
509 hashLast=g_Git.GetHash(head);
510 }
511
512 GitRev* pFirstEntry = reinterpret_cast<GitRev*>(m_arShownList.GetAt(FirstSelect));
513 GitRev* pLastEntry = reinterpret_cast<GitRev*>(m_arShownList.GetAt(LastSelect));
514 if(pFirstEntry->m_CommitHash != hashFirst || pLastEntry->m_CommitHash != hashLast)
515 {
516 CMessageBox::Show(NULL, IDS_PROC_CANNOTCOMBINE, IDS_APPNAME, MB_OK);
517 break;
518 }
519
520 GitRev lastRevision;
521 try
522 {
523 lastRevision.GetParentFromHash(hashLast);
524 }
525 catch (char* msg)
526 {
527 CString err(msg);
528 MessageBox(_T("Could not get parent(s) of ") + hashLast.ToString() + _T(".\nlibgit reports:\n") + err, _T("TortoiseGit"), MB_ICONERROR);
529 break;
530 }
531
532 headhash=g_Git.GetHash(_T("HEAD"));
533
534 if(!g_Git.CheckCleanWorkTree())
535 {
536 CMessageBox::Show(NULL, IDS_PROC_NOCLEAN, IDS_APPNAME, MB_OK);
537 break;
538 }
539 CString cmd,out;
540
541 //Use throw to abort this process (reset back to original HEAD)
542 try
543 {
544 cmd.Format(_T("git.exe reset --hard %s"),pFirstEntry->m_CommitHash.ToString());
545 if(g_Git.Run(cmd,&out,CP_UTF8))
546 {
547 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
548 throw std::exception(CUnicodeUtils::GetUTF8(CString(MAKEINTRESOURCE(IDS_PROC_COMBINE_ERRORSTEP1)) + _T("\r\n\r\n") + out));
549 }
550 cmd.Format(_T("git.exe reset --mixed %s"),hashLast.ToString());
551 if(g_Git.Run(cmd,&out,CP_UTF8))
552 {
553 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
554 throw std::exception(CUnicodeUtils::GetUTF8(CString(MAKEINTRESOURCE(IDS_PROC_COMBINE_ERRORSTEP2)) + _T("\r\n\r\n")+out));
555 }
556
557 CTGitPathList PathList;
558 /* don't why must add --stat to get action status*/
559 /* first -z will be omitted by gitdll*/
560 if(g_Git.GetDiffPath(&PathList,&pFirstEntry->m_CommitHash,&hashLast,"-z --stat -r"))
561 {
562 CMessageBox::Show(NULL,_T("Get Diff file list error"),_T("TortoiseGit"),MB_OK);
563 throw std::exception(CUnicodeUtils::GetUTF8(_T("Could not get changed file list aborting...\r\n\r\n")+out));
564 }
565
566 for(int i=0;i<PathList.GetCount();i++)
567 {
568 if(PathList[i].m_Action & CTGitPath::LOGACTIONS_ADDED)
569 {
570 cmd.Format(_T("git.exe add -- \"%s\""), PathList[i].GetGitPathString());
571 if (g_Git.Run(cmd, &out, CP_UTF8))
572 {
573 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
574 throw std::exception(CUnicodeUtils::GetUTF8(_T("Could not add new file aborting...\r\n\r\n")+out));
575
576 }
577 }
578 if(PathList[i].m_Action & CTGitPath::LOGACTIONS_DELETED)
579 {
580 cmd.Format(_T("git.exe rm -- \"%s\""), PathList[i].GetGitPathString());
581 if (g_Git.Run(cmd, &out, CP_UTF8))
582 {
583 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
584 throw std::exception(CUnicodeUtils::GetUTF8(_T("Could not rm file aborting...\r\n\r\n")+out));
585 }
586 }
587 }
588
589 CCommitDlg dlg;
590 for(int i=FirstSelect;i<=LastSelect;i++)
591 {
592 GitRev* pRev = reinterpret_cast<GitRev*>(m_arShownList.GetAt(i));
593 dlg.m_sLogMessage+=pRev->GetSubject()+_T("\n")+pRev->GetBody();
594 dlg.m_sLogMessage+=_T("\n");
595 }
596 dlg.m_bWholeProject=true;
597 dlg.m_bSelectFilesForCommit = true;
598 dlg.m_bForceCommitAmend=true;
599 if (lastRevision.ParentsCount() != 1)
600 {
601 CMessageBox::Show(NULL, _T("The following commit dialog can only show changes of oldest commit if it has exactly one parent. This is not the case right now."), _T("TortoiseGit"),MB_OK);
602 dlg.m_bAmendDiffToLastCommit = TRUE;
603 }
604 else
605 dlg.m_bAmendDiffToLastCommit = FALSE;
606 dlg.m_bNoPostActions=true;
607 dlg.m_AmendStr=dlg.m_sLogMessage;
608
609 if (dlg.DoModal() == IDOK)
610 {
611 if(pFirstEntry->m_CommitHash!=headhash)
612 {
613 //Commitrange firstEntry..headhash (from top of combine to original head) needs to be 'cherry-picked'
614 //on top of new commit.
615 //Use the rebase --onto command for it.
616 //
617 //All this can be done in one step using the following command:
618 //cmd.Format(_T("git.exe format-patch --stdout --binary --full-index -k %s..%s | git am -k -3"),
619 // pFirstEntry->m_CommitHash,
620 // headhash);
621 //But I am not sure if a '|' is going to work in a CreateProcess() call.
622 //
623 //Later the progress dialog could be used to execute these steps.
624
625 if(CherryPickFrom(pFirstEntry->m_CommitHash.ToString(),headhash))
626 {
627 CString msg;
628 msg.Format(_T("Error while cherry pick commits on top of combined commits. Aborting.\r\n\r\n"));
629 throw std::exception(CUnicodeUtils::GetUTF8(msg));
630 }
631 #if 0
632 CString currentBranch=g_Git.GetCurrentBranch();
633 cmd.Format(_T("git.exe rebase --onto \"%s\" %s %s"),
634 currentBranch,
635 pFirstEntry->m_CommitHash,
636 headhash);
637 if(g_Git.Run(cmd,&out,CP_UTF8)!=0)
638 {
639 CString msg;
640 msg.Format(_T("Error while rebasing commits on top of combined commits. Aborting.\r\n\r\n%s"),out);
641 // CMessageBox::Show(NULL,msg,_T("TortoiseGit"),MB_OK);
642 g_Git.Run(_T("git.exe rebase --abort"),&out,CP_UTF8);
643 throw std::exception(CUnicodeUtils::GetUTF8(msg));
644 }
645
646 //HEAD is now on <no branch>.
647 //The following steps are to get HEAD back on the original branch and reset the branch to the new HEAD
648 //To avoid 2 working copy changes, we could use git branch -f <original branch> <hash new head>
649 //And then git checkout <original branch>
650 //But I don't know if 'git branch -f' removes tracking options. So for now, do a checkout and a reset.
651
652 //Store new HEAD
653 CString newHead=g_Git.GetHash(CString(_T("HEAD")));
654
655 //Checkout working branch
656 cmd.Format(_T("git.exe checkout -f \"%s\""),currentBranch);
657 if(g_Git.Run(cmd,&out,CP_UTF8))
658 throw std::exception(CUnicodeUtils::GetUTF8(_T("Could not checkout original branch. Aborting...\r\n\r\n")+out));
659
660 //Reset to new HEAD
661 cmd.Format(_T("git.exe reset --hard %s"),newHead);
662 if(g_Git.Run(cmd,&out,CP_UTF8))
663 throw std::exception(CUnicodeUtils::GetUTF8(_T("Could not reset to new head. Aborting...\r\n\r\n")+out));
664 #endif
665 }
666 }
667 else
668 throw std::exception(CUnicodeUtils::GetUTF8(CString(MAKEINTRESOURCE(IDS_SVN_USERCANCELLED))));
669 }
670 catch(std::exception& e)
671 {
672 CMessageBox::Show(NULL, CUnicodeUtils::GetUnicode(CStringA(e.what())), _T("TortoiseGit"), MB_OK | MB_ICONERROR);
673 cmd.Format(_T("git.exe reset --hard %s"),headhash.ToString());
674 out.Empty();
675 if(g_Git.Run(cmd,&out,CP_UTF8))
676 {
677 CMessageBox::Show(NULL, CString(MAKEINTRESOURCE(IDS_PROC_COMBINE_ERRORRESETHEAD)) + _T("\r\n\r\n") + out, _T("TortoiseGit"), MB_OK);
678 }
679 }
680 Refresh();
681 }
682 break;
683
684 case ID_CHERRY_PICK:
685 if(!g_Git.CheckCleanWorkTree())
686 {
687 CMessageBox::Show(NULL, IDS_PROC_NOCLEAN, IDS_APPNAME, MB_OK);
688
689 }
690 else
691 {
692 CRebaseDlg dlg;
693 dlg.m_IsCherryPick = TRUE;
694 dlg.m_Upstream = this->m_CurrentBranch;
695 POSITION pos = GetFirstSelectedItemPosition();
696 while(pos)
697 {
698 int indexNext = GetNextSelectedItem(pos);
699 dlg.m_CommitList.m_logEntries.push_back( ((GitRev*)m_arShownList[indexNext])->m_CommitHash );
700 dlg.m_CommitList.m_LogCache.m_HashMap[((GitRev*)m_arShownList[indexNext])->m_CommitHash]=*(GitRev*)m_arShownList[indexNext];
701 dlg.m_CommitList.m_logEntries.GetGitRevAt(dlg.m_CommitList.m_logEntries.size()-1).GetAction(this) |= CTGitPath::LOGACTIONS_REBASE_PICK;
702 }
703
704 if(dlg.DoModal() == IDOK)
705 {
706 Refresh();
707 }
708 }
709 break;
710 case ID_REBASE_TO_VERSION:
711 if(!g_Git.CheckCleanWorkTree())
712 {
713 CMessageBox::Show(NULL, IDS_PROC_NOCLEAN, IDS_APPNAME, MB_OK);
714
715 }
716 else
717 {
718 CRebaseDlg dlg;
719 dlg.m_Upstream = pSelLogEntry->m_CommitHash;
720
721 if(dlg.DoModal() == IDOK)
722 {
723 Refresh();
724 }
725 }
726
727 break;
728
729 case ID_STASH_SAVE:
730 if (CAppUtils::StashSave())
731 Refresh();
732 break;
733
734 case ID_STASH_POP:
735 if (CAppUtils::StashPop())
736 Refresh();
737 break;
738
739 case ID_STASH_LIST:
740 CAppUtils::RunTortoiseProc(_T("/command:reflog /ref:refs/stash"));
741 break;
742
743 case ID_REFLOG_STASH_APPLY:
744 if (CAppUtils::StashApply(pSelLogEntry->m_Ref))
745 Refresh();
746 break;
747
748 case ID_REFLOG_DEL:
749 {
750 CString str;
751 if (GetSelectedCount() > 1)
752 str.Format(IDS_PROC_DELETENREFS, GetSelectedCount());
753 else
754 str.Format(IDS_PROC_DELETEREF, pSelLogEntry->m_Ref);
755
756 if (CMessageBox::Show(NULL, str, _T("TortoiseGit"), 1, IDI_QUESTION, CString(MAKEINTRESOURCE(IDS_DELETEBUTTON)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON))) == 2)
757 return;
758
759 POSITION pos = GetFirstSelectedItemPosition();
760 while (pos)
761 {
762 CString ref = ((GitRev *)m_arShownList[GetNextSelectedItem(pos)])->m_Ref;
763 if (ref.Find(_T("refs/")) == 0)
764 ref = ref.Mid(5);
765 int refpos = ref.ReverseFind('{');
766 if (refpos > 0 && ref.Mid(refpos, 2) != _T("@{"))
767 ref = ref.Left(refpos) + _T("@")+ ref.Mid(refpos);
768
769 CString cmd, out;
770 if (ref.Find(_T("stash")) == 0)
771 cmd.Format(_T("git.exe stash drop %s"), ref);
772 else
773 cmd.Format(_T("git.exe reflog delete %s"), ref);
774
775 if (g_Git.Run(cmd, &out, CP_UTF8))
776 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
777
778 ::PostMessage(this->GetParent()->m_hWnd,MSG_REFLOG_CHANGED,0,0);
779 }
780 }
781 break;
782 case ID_LOG:
783 {
784 CString cmd = _T("/command:log");
785 cmd += _T(" /path:\"")+g_Git.m_CurrentDir+_T("\" ");
786 GitRev * r1 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(FirstSelect));
787 cmd += _T(" /endrev:")+r1->m_CommitHash.ToString();
788 CAppUtils::RunTortoiseProc(cmd);
789 }
790 break;
791 case ID_CREATE_PATCH:
792 {
793 int select=this->GetSelectedCount();
794 CString cmd = _T("/command:formatpatch");
795 cmd += _T(" /path:\"")+g_Git.m_CurrentDir+_T("\" ");
796
797 GitRev * r1 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(FirstSelect));
798 GitRev * r2 = NULL;
799 if(select == 1)
800 {
801 cmd += _T(" /startrev:")+r1->m_CommitHash.ToString();
802 }
803 else
804 {
805 r2 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(LastSelect));
806 if( this->m_IsOldFirst )
807 {
808 cmd += _T(" /startrev:")+r1->m_CommitHash.ToString()+_T("~1");
809 cmd += _T(" /endrev:")+r2->m_CommitHash.ToString();
810
811 }
812 else
813 {
814 cmd += _T(" /startrev:")+r2->m_CommitHash.ToString()+_T("~1");
815 cmd += _T(" /endrev:")+r1->m_CommitHash.ToString();
816 }
817
818 }
819
820 CAppUtils::RunTortoiseProc(cmd);
821 }
822 break;
823 case ID_BISECTSTART:
824 {
825 GitRev * first = reinterpret_cast<GitRev*>(m_arShownList.GetAt(FirstSelect));
826 GitRev * last = reinterpret_cast<GitRev*>(m_arShownList.GetAt(LastSelect));
827 ASSERT(first != NULL && last != NULL);
828
829 CString firstBad = first->m_CommitHash.ToString();
830 if (!m_HashMap[first->m_CommitHash].empty())
831 firstBad = m_HashMap[first->m_CommitHash].at(0);
832 CString lastGood = last->m_CommitHash.ToString();
833 if (!m_HashMap[last->m_CommitHash].empty())
834 lastGood = m_HashMap[last->m_CommitHash].at(0);
835
836 if (CAppUtils::BisectStart(lastGood, firstBad))
837 Refresh();
838 }
839 break;
840 case ID_REPOBROWSE:
841 {
842 CString sCmd;
843 sCmd.Format(_T("/command:repobrowser /path:\"%s\" /rev:%s"), g_Git.m_CurrentDir, pSelLogEntry->m_CommitHash.ToString());
844 CAppUtils::RunTortoiseProc(sCmd);
845 }
846 break;
847 case ID_PUSH:
848 {
849 CString guessAssociatedBranch;
850 if (!m_HashMap[pSelLogEntry->m_CommitHash].empty())
851 guessAssociatedBranch = m_HashMap[pSelLogEntry->m_CommitHash].at(0);
852 if (CAppUtils::Push(guessAssociatedBranch))
853 Refresh();
854 }
855 break;
856 case ID_FETCH:
857 {
858 if (CAppUtils::Fetch(_T(""), true))
859 Refresh();
860 }
861 break;
862 case ID_SHOWBRANCHES:
863 {
864 CString cmd;
865 cmd.Format(_T("git.exe branch -a --contains %s"), pSelLogEntry->m_CommitHash.ToString());
866 CProgressDlg progress;
867 progress.m_GitCmd = cmd;
868 progress.DoModal();
869 }
870 break;
871 case ID_DELETE:
872 {
873 CString *branch = (CString*)((CIconMenu*)popmenu)->GetMenuItemData(cmd);
874 if (!branch)
875 {
876 CMessageBox::Show(NULL,IDS_ERROR_NOREF,IDS_APPNAME,MB_OK|MB_ICONERROR);
877 return;
878 }
879 CString shortname;
880 CString cmd;
881 if (this->GetShortName(*branch, shortname, _T("refs/remotes/")))
882 {
883 CString msg;
884 msg.Format(IDS_PROC_DELETEREMOTEBRANCH, *branch);
885 int result = CMessageBox::Show(NULL, msg, _T("TortoiseGit"), 3, IDI_QUESTION, CString(MAKEINTRESOURCE(IDS_PROC_DELETEREMOTEBRANCH_LOCALREMOTE)), CString(MAKEINTRESOURCE(IDS_PROC_DELETEREMOTEBRANCH_LOCAL)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON)));
886 if (result == 1)
887 {
888 CString remoteName = shortname.Left(shortname.Find('/'));
889 shortname = shortname.Mid(shortname.Find('/') + 1);
890 if(CAppUtils::IsSSHPutty())
891 CAppUtils::LaunchPAgent(NULL, &remoteName);
892
893 cmd.Format(L"git.exe push \"%s\" :refs/heads/%s", remoteName, shortname);
894 }
895 else if (result == 2)
896 cmd.Format(_T("git.exe branch -r -D -- %s"), shortname);
897 else
898 return;
899 }
900 else if (this->GetShortName(*branch, shortname, _T("refs/stash")))
901 {
902 if (CMessageBox::Show(NULL, IDS_PROC_DELETEALLSTASH, IDS_APPNAME, 2, IDI_QUESTION, IDS_DELETEBUTTON, IDS_ABORTBUTTON) == 1)
903 cmd.Format(_T("git.exe stash clear"));
904 else
905 return;
906 }
907 else
908 {
909 CString msg;
910 msg.Format(IDS_PROC_DELETEBRANCHTAG, *branch);
911 if (CMessageBox::Show(NULL, msg, _T("TortoiseGit"), 2, IDI_QUESTION, CString(MAKEINTRESOURCE(IDS_DELETEBUTTON)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON))) == 1)
912 {
913 if(this->GetShortName(*branch,shortname,_T("refs/heads/")))
914 {
915 cmd.Format(_T("git.exe branch -D -- %s"),shortname);
916 }
917
918 if(this->GetShortName(*branch,shortname,_T("refs/tags/")))
919 {
920 cmd.Format(_T("git.exe tag -d -- %s"),shortname);
921 }
922 }
923 }
924 if (!cmd.IsEmpty())
925 {
926 CString out;
927 if(g_Git.Run(cmd,&out,CP_UTF8))
928 {
929 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
930 }
931 this->ReloadHashMap();
932 CRect rect;
933 this->GetItemRect(FirstSelect,&rect,LVIR_BOUNDS);
934 this->InvalidateRect(rect);
935 }
936 }
937 break;
938
939 case ID_FINDENTRY:
940 {
941 m_nSearchIndex = GetSelectionMark();
942 if (m_nSearchIndex < 0)
943 m_nSearchIndex = 0;
944 if (m_pFindDialog)
945 {
946 break;
947 }
948 else
949 {
950 m_pFindDialog = new CFindDlg();
951 m_pFindDialog->Create(this);
952 }
953 }
954 break;
955 case ID_MERGEREV:
956 {
957 CString str = pSelLogEntry->m_CommitHash.ToString();
958 if (!m_HashMap[pSelLogEntry->m_CommitHash].empty())
959 str = m_HashMap[pSelLogEntry->m_CommitHash].at(0);
960 // we need an URL to complete this command, so error out if we can't get an URL
961 if(CAppUtils::Merge(&str))
962 {
963 this->Refresh();
964 }
965 }
966 break;
967 case ID_REVERTREV:
968 {
969 int parent = 0;
970 if (GetSelectedCount() == 1)
971 {
972 parent = cmd >> 16;
973 if (parent > pSelLogEntry->m_ParentHash.size())
974 {
975 CString str;
976 str.Format(IDS_PROC_NOPARENT, parent);
977 MessageBox(str, _T("TortoiseGit"), MB_OK | MB_ICONERROR);
978 return;
979 }
980 }
981
982 if (!this->RevertSelectedCommits(parent))
983 {
984 if (CMessageBox::Show(m_hWnd, IDS_REVREVERTED, IDS_APPNAME, 1, IDI_QUESTION, IDS_OKBUTTON, IDS_COMMITBUTTON) == 2)
985 {
986 CTGitPathList pathlist;
987 CTGitPathList selectedlist;
988 pathlist.AddPath(this->m_Path);
989 bool bSelectFilesForCommit = !!DWORD(CRegStdDWORD(_T("Software\\TortoiseGit\\SelectFilesForCommit"), TRUE));
990 CString str;
991 CAppUtils::Commit(CString(), false, str, pathlist, selectedlist, bSelectFilesForCommit);
992 }
993 this->Refresh();
994 }
995 }
996 break;
997 case ID_EDITNOTE:
998 {
999 CAppUtils::EditNote(pSelLogEntry);
1000 this->SetItemState(FirstSelect, 0, LVIS_SELECTED);
1001 this->SetItemState(FirstSelect, LVIS_SELECTED, LVIS_SELECTED);
1002 }
1003 break;
1004 default:
1005 //CMessageBox::Show(NULL,_T("Have not implemented"),_T("TortoiseGit"),MB_OK);
1006 break;
1007 #if 0
1008
1009 case ID_BLAMECOMPARE:
1010 {
1011 //user clicked on the menu item "compare with working copy"
1012 //now first get the revision which is selected
1013 if (PromptShown())
1014 {
1015 GitDiff diff(this, this->m_hWnd, true);
1016 diff.SetHEADPeg(m_LogRevision);
1017 diff.ShowCompare(m_path, GitRev::REV_BASE, m_path, revSelected, GitRev(), false, true);
1018 }
1019 else
1020 CAppUtils::StartShowCompare(m_hWnd, m_path, GitRev::REV_BASE, m_path, revSelected, GitRev(), m_LogRevision, false, false, true);
1021 }
1022 break;
1023 case ID_BLAMEWITHPREVIOUS:
1024 {
1025 //user clicked on the menu item "Compare and Blame with previous revision"
1026 if (PromptShown())
1027 {
1028 GitDiff diff(this, this->m_hWnd, true);
1029 diff.SetHEADPeg(m_LogRevision);
1030 diff.ShowCompare(CTGitPath(pathURL), revPrevious, CTGitPath(pathURL), revSelected, GitRev(), false, true);
1031 }
1032 else
1033 CAppUtils::StartShowCompare(m_hWnd, CTGitPath(pathURL), revPrevious, CTGitPath(pathURL), revSelected, GitRev(), m_LogRevision, false, false, true);
1034 }
1035 break;
1036
1037 case ID_OPENWITH:
1038 bOpenWith = true;
1039 case ID_OPEN:
1040 {
1041 CProgressDlg progDlg;
1042 progDlg.SetTitle(IDS_APPNAME);
1043 progDlg.SetAnimation(IDR_DOWNLOAD);
1044 CString sInfoLine;
1045 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, m_path.GetWinPath(), (LPCTSTR)revSelected.ToString());
1046 progDlg.SetLine(1, sInfoLine, true);
1047 SetAndClearProgressInfo(&progDlg);
1048 progDlg.ShowModeless(m_hWnd);
1049 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, m_path, revSelected);
1050 bool bSuccess = true;
1051 if (!Cat(m_path, GitRev(GitRev::REV_HEAD), revSelected, tempfile))
1052 {
1053 bSuccess = false;
1054 // try again, but with the selected revision as the peg revision
1055 if (!Cat(m_path, revSelected, revSelected, tempfile))
1056 {
1057 progDlg.Stop();
1058 SetAndClearProgressInfo((HWND)NULL);
1059 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
1060 EnableOKButton();
1061 break;
1062 }
1063 bSuccess = true;
1064 }
1065 if (bSuccess)
1066 {
1067 progDlg.Stop();
1068 SetAndClearProgressInfo((HWND)NULL);
1069 SetFileAttributes(tempfile.GetWinPath(), FILE_ATTRIBUTE_READONLY);
1070 int ret = 0;
1071 if (!bOpenWith)
1072 ret = (int)ShellExecute(this->m_hWnd, NULL, tempfile.GetWinPath(), NULL, NULL, SW_SHOWNORMAL);
1073 if ((ret <= HINSTANCE_ERROR)||bOpenWith)
1074 {
1075 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
1076 cmd += tempfile.GetWinPathString() + _T(" ");
1077 CAppUtils::LaunchApplication(cmd, NULL, false);
1078 }
1079 }
1080 }
1081 break;
1082 case ID_BLAME:
1083 {
1084 CBlameDlg dlg;
1085 dlg.EndRev = revSelected;
1086 if (dlg.DoModal() == IDOK)
1087 {
1088 CBlame blame;
1089 CString tempfile;
1090 CString logfile;
1091 tempfile = blame.BlameToTempFile(m_path, dlg.StartRev, dlg.EndRev, dlg.EndRev, logfile, _T(""), dlg.m_bIncludeMerge, TRUE, TRUE);
1092 if (!tempfile.IsEmpty())
1093 {
1094 if (dlg.m_bTextView)
1095 {
1096 //open the default text editor for the result file
1097 CAppUtils::StartTextViewer(tempfile);
1098 }
1099 else
1100 {
1101 CString sParams = _T("/path:\"") + m_path.GetGitPathString() + _T("\" ");
1102 if(!CAppUtils::LaunchTortoiseBlame(tempfile, logfile, CPathUtils::GetFileNameFromPath(m_path.GetFileOrDirectoryName()),sParams))
1103 {
1104 break;
1105 }
1106 }
1107 }
1108 else
1109 {
1110 CMessageBox::Show(this->m_hWnd, blame.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
1111 }
1112 }
1113 }
1114 break;
1115 case ID_EXPORT:
1116 {
1117 CString sCmd;
1118 sCmd.Format(_T("%s /command:export /path:\"%s\" /revision:%ld"),
1119 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")),
1120 (LPCTSTR)pathURL, (LONG)revSelected);
1121 CAppUtils::LaunchApplication(sCmd, NULL, false);
1122 }
1123 break;
1124 case ID_VIEWREV:
1125 {
1126 CString url = m_ProjectProperties.sWebViewerRev;
1127 url = GetAbsoluteUrlFromRelativeUrl(url);
1128 url.Replace(_T("%REVISION%"), revSelected.ToString());
1129 if (!url.IsEmpty())
1130 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
1131 }
1132 break;
1133 case ID_VIEWPATHREV:
1134 {
1135 CString relurl = pathURL;
1136 CString sRoot = GetRepositoryRoot(CTGitPath(relurl));
1137 relurl = relurl.Mid(sRoot.GetLength());
1138 CString url = m_ProjectProperties.sWebViewerPathRev;
1139 url = GetAbsoluteUrlFromRelativeUrl(url);
1140 url.Replace(_T("%REVISION%"), revSelected.ToString());
1141 url.Replace(_T("%PATH%"), relurl);
1142 if (!url.IsEmpty())
1143 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
1144 }
1145 break;
1146 #endif
1147
1148 } // switch (cmd)
1149
1150 theApp.DoWaitCursor(-1);
1151 }
1152
1153 void CGitLogList::SetSelectedAction(int action)
1154 {
1155 POSITION pos = GetFirstSelectedItemPosition();
1156 int index;
1157 while(pos)
1158 {
1159 index = GetNextSelectedItem(pos);
1160 ((GitRev*)m_arShownList[index])->GetAction(this) = action;
1161 CRect rect;
1162 this->GetItemRect(index,&rect,LVIR_BOUNDS);
1163 this->InvalidateRect(rect);
1164
1165 }
1166 }
1167 void CGitLogList::ShiftSelectedAction()
1168 {
1169 POSITION pos = GetFirstSelectedItemPosition();
1170 int index;
1171 while(pos)
1172 {
1173 index = GetNextSelectedItem(pos);
1174 int action = ((GitRev*)m_arShownList[index])->GetAction(this);
1175 switch (action)
1176 {
1177 case CTGitPath::LOGACTIONS_REBASE_PICK:
1178 action = CTGitPath::LOGACTIONS_REBASE_SKIP;
1179 break;
1180 case CTGitPath::LOGACTIONS_REBASE_SKIP:
1181 action= CTGitPath::LOGACTIONS_REBASE_EDIT;
1182 break;
1183 case CTGitPath::LOGACTIONS_REBASE_EDIT:
1184 action = CTGitPath::LOGACTIONS_REBASE_SQUASH;
1185 break;
1186 case CTGitPath::LOGACTIONS_REBASE_SQUASH:
1187 action= CTGitPath::LOGACTIONS_REBASE_PICK;
1188 break;
1189 }
1190 ((GitRev*)m_arShownList[index])->GetAction(this) = action;
1191 CRect rect;
1192 this->GetItemRect(index, &rect, LVIR_BOUNDS);
1193 this->InvalidateRect(rect);
1194 }
1195 }
Windows Explorer Extension to Operate Git