?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
Give up use git to filter commit
[TortoiseGit.git] / src / TortoiseProc / GitLogListAction.cpp
blobfa6aacf6414bd313256a5aec2ff6e1775f7e68d5
1 // GitLogList.cpp : implementation file
2 //
3 /*
4 Description: qgit revision list view
5
6 Author: Marco Costalba (C) 2005-2007
7
8 Copyright: See COPYING file that comes with this distribution
9
10 */
11 #include "stdafx.h"
12 #include "TortoiseProc.h"
13 #include "GitLogList.h"
14 #include "GitRev.h"
15 //#include "VssStyle.h"
16 #include "IconMenu.h"
17 // CGitLogList
18 #include "cursor.h"
19 #include "InputDlg.h"
20 #include "PropDlg.h"
21 #include "SVNProgressDlg.h"
22 #include "ProgressDlg.h"
23 #include "SysProgressDlg.h"
24 //#include "RepositoryBrowser.h"
25 //#include "CopyDlg.h"
26 //#include "StatGraphDlg.h"
27 #include "Logdlg.h"
28 #include "MessageBox.h"
29 #include "Registry.h"
30 #include "AppUtils.h"
31 #include "PathUtils.h"
32 #include "StringUtils.h"
33 #include "UnicodeUtils.h"
34 #include "TempFile.h"
35 //#include "GitInfo.h"
36 //#include "GitDiff.h"
37 #include "IconMenu.h"
38 //#include "RevisionRangeDlg.h"
39 //#include "BrowseFolder.h"
40 //#include "BlameDlg.h"
41 //#include "Blame.h"
42 //#include "GitHelpers.h"
43 #include "GitStatus.h"
44 //#include "LogDlgHelper.h"
45 //#include "CachedLogInfo.h"
46 //#include "RepositoryInfo.h"
47 //#include "EditPropertiesDlg.h"
48 #include "FileDiffDlg.h"
49 #include "CommitDlg.h"
50 #include "RebaseDlg.h"
51 #include "GitDiff.h"
52
53 IMPLEMENT_DYNAMIC(CGitLogList, CHintListCtrl)
54
55 int CGitLogList::RevertSelectedCommits()
56 {
57 CSysProgressDlg progress;
58 int ret = -1;
59
60 #if 0
61 if(!g_Git.CheckCleanWorkTree())
62 {
63 CMessageBox::Show(NULL,_T("Revert requires a clean working tree"),_T("TortoiseGit"),MB_OK);
64
65 }
66 #endif
67
68 if (progress.IsValid() && (this->GetSelectedCount() > 1) )
69 {
70 progress.SetTitle(_T("Revert Commit"));
71 progress.SetAnimation(IDR_MOVEANI);
72 progress.SetTime(true);
73 progress.ShowModeless(this);
74 }
75
76 POSITION pos = GetFirstSelectedItemPosition();
77 int i=0;
78 while(pos)
79 {
80 int index = GetNextSelectedItem(pos);
81 GitRev * r1 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(index));
82
83 if (progress.IsValid() && (this->GetSelectedCount() > 1) )
84 {
85 progress.FormatPathLine(1, _T("Revert %s"), r1->m_CommitHash.ToString());
86 progress.FormatPathLine(2, _T("%s"), r1->GetSubject());
87 progress.SetProgress(i, this->GetSelectedCount());
88 }
89 i++;
90
91 if(r1->m_CommitHash.IsEmpty())
92 continue;
93
94 CString cmd, output;
95 cmd.Format(_T("git.exe revert --no-edit --no-commit %s"), r1->m_CommitHash.ToString());
96 if(g_Git.Run(cmd, &output, CP_ACP))
97 {
98 CString str;
99 str=_T("Revert fail\n");
100 str+= cmd;
101 str+= _T("\n")+output;
102 if( GetSelectedCount() == 1)
103 CMessageBox::Show(NULL,str, _T("TortoiseGit"),MB_OK|MB_ICONERROR);
104 else
105 {
106 if(CMessageBox::Show(NULL, str, _T("TortoiseGit"),2, IDI_ERROR, _T("Skip"), _T("Abort")) ==2)
107 {
108 return ret;
109 }
110 }
111 }
112 else
113 {
114 ret =0;
115 }
116
117 if ((progress.IsValid())&&(progress.HasUserCancelled()))
118 break;
119 }
120 return ret;
121 }
122 int CGitLogList::CherryPickFrom(CString from, CString to)
123 {
124 CLogDataVector logs(&m_LogCache);
125 if(logs.ParserFromLog(NULL,-1,0,&from,&to))
126 return -1;
127
128 if(logs.size() == 0)
129 return 0;
130
131 CSysProgressDlg progress;
132 if (progress.IsValid())
133 {
134 progress.SetTitle(_T("Cherry Pick"));
135 progress.SetAnimation(IDR_MOVEANI);
136 progress.SetTime(true);
137 progress.ShowModeless(this);
138 }
139
140 for(int i=logs.size()-1;i>=0;i--)
141 {
142 if (progress.IsValid())
143 {
144 progress.FormatPathLine(1, _T("Pick up %s"), logs.GetGitRevAt(i).m_CommitHash.ToString());
145 progress.FormatPathLine(2, _T("%s"), logs.GetGitRevAt(i).GetSubject());
146 progress.SetProgress(logs.size()-i, logs.size());
147 }
148 if ((progress.IsValid())&&(progress.HasUserCancelled()))
149 {
150 //CMessageBox::Show(hwndExplorer, IDS_SVN_USERCANCELLED, IDS_APPNAME, MB_ICONINFORMATION);
151 throw std::exception(CUnicodeUtils::GetUTF8(_T("User canceled\r\n\r\n")));
152 return -1;
153 }
154 CString cmd,out;
155 cmd.Format(_T("git.exe cherry-pick %s"),logs.GetGitRevAt(i).m_CommitHash.ToString());
156 out.Empty();
157 if(g_Git.Run(cmd,&out,CP_UTF8))
158 {
159 throw std::exception(CUnicodeUtils::GetUTF8(CString(_T("Cherry Pick Failure\r\n\r\n"))+out));
160 return -1;
161 }
162 }
163
164 return 0;
165 }
166
167 void CGitLogList::ContextMenuAction(int cmd,int FirstSelect, int LastSelect, CMenu *popmenu)
168 {
169 POSITION pos = GetFirstSelectedItemPosition();
170 int indexNext = GetNextSelectedItem(pos);
171 if (indexNext < 0)
172 return;
173
174 GitRev* pSelLogEntry = reinterpret_cast<GitRev*>(m_arShownList.GetAt(indexNext));
175
176 theApp.DoWaitCursor(1);
177 switch (cmd&0xFFFF)
178 {
179 case ID_COMMIT:
180 {
181 CTGitPathList pathlist;
182 CTGitPathList selectedlist;
183 pathlist.AddPath(this->m_Path);
184 bool bSelectFilesForCommit = !!DWORD(CRegStdWORD(_T("Software\\TortoiseGit\\SelectFilesForCommit"), TRUE));
185 CString str;
186 CAppUtils::Commit(CString(),false,str,
187 pathlist,selectedlist,bSelectFilesForCommit);
188 //this->Refresh();
189 this->GetParent()->PostMessage(WM_COMMAND,ID_LOGDLG_REFRESH,0);
190 }
191 break;
192 case ID_GNUDIFF1:
193 {
194 CString tempfile=GetTempFile();
195 CString command;
196 GitRev * r1 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(FirstSelect));
197 if(!r1->m_CommitHash.IsEmpty())
198 {
199 CString merge;
200 CString hash2;
201 cmd >>= 16;
202 if( (cmd&0xFFFF) == 0xFFFF)
203 {
204 merge=_T("-m");
205 } else if((cmd&0xFFFF) == 0xFFFE)
206 {
207 merge=_T("-c");
208 }else
209 {
210 if(cmd > r1->m_ParentHash.size())
211 {
212 CString str;
213 str.Format(_T("%d parent does not exist"), cmd);
214 CMessageBox::Show(NULL,str,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
215 return;
216 }else
217 {
218 if(cmd>0)
219 hash2 = r1->m_ParentHash[cmd-1].ToString();
220 }
221 }
222 command.Format(_T("git.exe diff-tree %s -r -p --stat %s %s"),merge, r1->m_CommitHash.ToString(), hash2);
223 }else
224 command.Format(_T("git.exe diff -r -p --stat"));
225
226 g_Git.RunLogFile(command,tempfile);
227 CAppUtils::StartUnifiedDiffViewer(tempfile,r1->m_CommitHash.ToString().Left(6)+_T(":")+r1->GetSubject());
228 }
229 break;
230
231 case ID_GNUDIFF2:
232 {
233 CString tempfile=GetTempFile();
234 CString cmd;
235 GitRev * r1 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(FirstSelect));
236 GitRev * r2 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(LastSelect));
237
238 if( r1->m_CommitHash.IsEmpty()) {
239 cmd.Format(_T("git.exe diff -r -p --stat %s"),r2->m_CommitHash.ToString());
240 }else if( r2->m_CommitHash.IsEmpty()) {
241 cmd.Format(_T("git.exe diff -r -p --stat %s"),r1->m_CommitHash.ToString());
242 }else {
243 cmd.Format(_T("git.exe diff-tree -r -p --stat %s %s"),r2->m_CommitHash.ToString(),r1->m_CommitHash.ToString());
244 }
245
246 g_Git.RunLogFile(cmd,tempfile);
247 CAppUtils::StartUnifiedDiffViewer(tempfile,r2->m_CommitHash.ToString().Left(6)+_T(":")+r1->m_CommitHash.ToString().Left(6));
248
249 }
250 break;
251
252 case ID_COMPARETWO:
253 {
254 GitRev * r1 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(FirstSelect));
255 GitRev * r2 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(LastSelect));
256 CGitDiff::DiffCommit(this->m_Path, r1,r2);
257
258 }
259 break;
260
261
262 case ID_COMPARE:
263 {
264 GitRev * r1 = &m_wcRev;
265 GitRev * r2 = pSelLogEntry;
266
267 CGitDiff::DiffCommit(this->m_Path, r1,r2);
268
269 //user clicked on the menu item "compare with working copy"
270 //if (PromptShown())
271 //{
272 // GitDiff diff(this, m_hWnd, true);
273 // diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
274 // diff.SetHEADPeg(m_LogRevision);
275 // diff.ShowCompare(m_path, GitRev::REV_WC, m_path, revSelected);
276 //}
277 //else
278 // CAppUtils::StartShowCompare(m_hWnd, m_path, GitRev::REV_WC, m_path, revSelected, GitRev(), m_LogRevision, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
279 }
280 break;
281
282 case ID_COMPAREWITHPREVIOUS:
283 {
284
285 CFileDiffDlg dlg;
286
287 if(pSelLogEntry->m_ParentHash.size()>0)
288 //if(m_logEntries.m_HashMap[pSelLogEntry->m_ParentHash[0]]>=0)
289 {
290 cmd>>=16;
291 cmd&=0xFFFF;
292
293 if(cmd == 0)
294 cmd=1;
295
296 CGitDiff::DiffCommit(this->m_Path, pSelLogEntry->m_CommitHash.ToString(),pSelLogEntry->m_ParentHash[cmd-1].ToString());
297
298 }else
299 {
300 CMessageBox::Show(NULL,_T("No previous version"),_T("TortoiseGit"),MB_OK);
301 }
302 //if (PromptShown())
303 //{
304 // GitDiff diff(this, m_hWnd, true);
305 // diff.SetAlternativeTool(!!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
306 // diff.SetHEADPeg(m_LogRevision);
307 // diff.ShowCompare(CTGitPath(pathURL), revPrevious, CTGitPath(pathURL), revSelected);
308 //}
309 //else
310 // CAppUtils::StartShowCompare(m_hWnd, CTGitPath(pathURL), revPrevious, CTGitPath(pathURL), revSelected, GitRev(), m_LogRevision, !!(GetAsyncKeyState(VK_SHIFT) & 0x8000));
311 }
312 break;
313 case ID_COPYCLIPBOARD:
314 {
315 CopySelectionToClipBoard();
316 }
317 break;
318 case ID_COPYHASH:
319 {
320 CopySelectionToClipBoard(TRUE);
321 }
322 break;
323 case ID_EXPORT:
324 CAppUtils::Export(&pSelLogEntry->m_CommitHash.ToString());
325 break;
326 case ID_CREATE_BRANCH:
327 CAppUtils::CreateBranchTag(FALSE,&pSelLogEntry->m_CommitHash.ToString());
328 ReloadHashMap();
329 Invalidate();
330 break;
331 case ID_CREATE_TAG:
332 CAppUtils::CreateBranchTag(TRUE,&pSelLogEntry->m_CommitHash.ToString());
333 ReloadHashMap();
334 Invalidate();
335 ::PostMessage(this->GetParent()->m_hWnd,MSG_REFLOG_CHANGED,0,0);
336 break;
337 case ID_SWITCHTOREV:
338 CAppUtils::Switch(&pSelLogEntry->m_CommitHash.ToString());
339 ReloadHashMap();
340 Invalidate();
341 ::PostMessage(this->GetParent()->m_hWnd,MSG_REFLOG_CHANGED,0,0);
342 break;
343 case ID_SWITCHBRANCH:
344 if(popmenu)
345 {
346 CString *branch = (CString*)((CIconMenu*)popmenu)->GetMenuItemData(cmd);
347 if(branch)
348 {
349
350 CProgressDlg progress;
351 CString name;
352 if(branch->Find(_T("refs/heads/")) ==0 )
353 name = branch->Mid(11);
354 else
355 name = *branch;
356
357 progress.m_GitCmd.Format(_T("git.exe checkout %s"), name.GetString());
358 progress.DoModal();
359 }
360 ReloadHashMap();
361 Invalidate();
362 ::PostMessage(this->GetParent()->m_hWnd,MSG_REFLOG_CHANGED,0,0);
363 }
364 break;
365 case ID_RESET:
366 CAppUtils::GitReset(&pSelLogEntry->m_CommitHash.ToString());
367 ReloadHashMap();
368 Invalidate();
369 break;
370 case ID_REBASE_PICK:
371 SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_PICK);
372 break;
373 case ID_REBASE_EDIT:
374 SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_EDIT);
375 break;
376 case ID_REBASE_SQUASH:
377 SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_SQUASH);
378 break;
379 case ID_REBASE_SKIP:
380 SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_SKIP);
381 break;
382 case ID_COMBINE_COMMIT:
383 {
384 CString head;
385 CGitHash headhash;
386 CGitHash hashFirst,hashLast;
387
388 int headindex=GetHeadIndex();
389 if(headindex>=0) //incase show all branch, head is not the first commits.
390 {
391 head.Format(_T("HEAD~%d"),FirstSelect-headindex);
392 hashFirst=g_Git.GetHash(head);
393
394 head.Format(_T("HEAD~%d"),LastSelect-headindex);
395 hashLast=g_Git.GetHash(head);
396 }
397
398 GitRev* pFirstEntry = reinterpret_cast<GitRev*>(m_arShownList.GetAt(FirstSelect));
399 GitRev* pLastEntry = reinterpret_cast<GitRev*>(m_arShownList.GetAt(LastSelect));
400 if(pFirstEntry->m_CommitHash != hashFirst || pLastEntry->m_CommitHash != hashLast)
401 {
402 CMessageBox::Show(NULL,_T("Cannot combine commits now.\r\nMake sure you are viewing the log of your current branch and no filters are applied."),_T("TortoiseGit"),MB_OK);
403 break;
404 }
405
406 headhash=g_Git.GetHash(_T("HEAD"));
407
408 if(!g_Git.CheckCleanWorkTree())
409 {
410 CMessageBox::Show(NULL,_T("Combine needs a clean work tree"),_T("TortoiseGit"),MB_OK);
411 break;
412 }
413 CString cmd,out;
414
415 //Use throw to abort this process (reset back to original HEAD)
416 try
417 {
418 cmd.Format(_T("git.exe reset --hard %s"),pFirstEntry->m_CommitHash.ToString());
419 if(g_Git.Run(cmd,&out,CP_UTF8))
420 {
421 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
422 throw std::exception(CUnicodeUtils::GetUTF8(_T("Could not reset to first commit (first step) aborting...\r\n\r\n")+out));
423 }
424 cmd.Format(_T("git.exe reset --mixed %s"),hashLast.ToString());
425 if(g_Git.Run(cmd,&out,CP_UTF8))
426 {
427 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
428 throw std::exception(CUnicodeUtils::GetUTF8(_T("Could not reset to last commit (second step) aborting...\r\n\r\n")+out));
429 }
430 CCommitDlg dlg;
431 for(int i=FirstSelect;i<=LastSelect;i++)
432 {
433 GitRev* pRev = reinterpret_cast<GitRev*>(m_arShownList.GetAt(i));
434 dlg.m_sLogMessage+=pRev->GetSubject()+_T("\n")+pRev->GetBody();
435 dlg.m_sLogMessage+=_T("\n");
436 }
437 dlg.m_bWholeProject=true;
438 dlg.m_bSelectFilesForCommit = true;
439 dlg.m_bCommitAmend=true;
440 dlg.m_AmendStr=dlg.m_sLogMessage;
441
442 if (dlg.DoModal() == IDOK)
443 {
444 if(pFirstEntry->m_CommitHash!=headhash)
445 {
446 //Commitrange firstEntry..headhash (from top of combine to original head) needs to be 'cherry-picked'
447 //on top of new commit.
448 //Use the rebase --onto command for it.
449 //
450 //All this can be done in one step using the following command:
451 //cmd.Format(_T("git.exe format-patch --stdout --binary --full-index -k %s..%s | git am -k -3"),
452 // pFirstEntry->m_CommitHash,
453 // headhash);
454 //But I am not sure if a '|' is going to work in a CreateProcess() call.
455 //
456 //Later the progress dialog could be used to execute these steps.
457
458 if(CherryPickFrom(pFirstEntry->m_CommitHash.ToString(),headhash))
459 {
460 CString msg;
461 msg.Format(_T("Error while cherry pick commits on top of combined commits. Aborting.\r\n\r\n"));
462 throw std::exception(CUnicodeUtils::GetUTF8(msg));
463 }
464 #if 0
465 CString currentBranch=g_Git.GetCurrentBranch();
466 cmd.Format(_T("git.exe rebase --onto \"%s\" %s %s"),
467 currentBranch,
468 pFirstEntry->m_CommitHash,
469 headhash);
470 if(g_Git.Run(cmd,&out,CP_UTF8)!=0)
471 {
472 CString msg;
473 msg.Format(_T("Error while rebasing commits on top of combined commits. Aborting.\r\n\r\n%s"),out);
474 // CMessageBox::Show(NULL,msg,_T("TortoiseGit"),MB_OK);
475 g_Git.Run(_T("git.exe rebase --abort"),&out,CP_UTF8);
476 throw std::exception(CUnicodeUtils::GetUTF8(msg));
477 }
478
479 //HEAD is now on <no branch>.
480 //The following steps are to get HEAD back on the original branch and reset the branch to the new HEAD
481 //To avoid 2 working copy changes, we could use git branch -f <original branch> <hash new head>
482 //And then git checkout <original branch>
483 //But I don't know if 'git branch -f' removes tracking options. So for now, do a checkout and a reset.
484
485 //Store new HEAD
486 CString newHead=g_Git.GetHash(CString(_T("HEAD")));
487
488 //Checkout working branch
489 cmd.Format(_T("git.exe checkout -f \"%s\""),currentBranch);
490 if(g_Git.Run(cmd,&out,CP_UTF8))
491 throw std::exception(CUnicodeUtils::GetUTF8(_T("Could not checkout original branch. Aborting...\r\n\r\n")+out));
492
493 //Reset to new HEAD
494 cmd.Format(_T("git.exe reset --hard %s"),newHead);
495 if(g_Git.Run(cmd,&out,CP_UTF8))
496 throw std::exception(CUnicodeUtils::GetUTF8(_T("Could not reset to new head. Aborting...\r\n\r\n")+out));
497 #endif
498 }
499 }
500 else
501 throw std::exception("User aborted the combine process");
502 }
503 catch(std::exception& e)
504 {
505 CMessageBox::Show(NULL,CUnicodeUtils::GetUnicode(CStringA(e.what())),_T("TortoiseGit: Combine error"),MB_OK|MB_ICONERROR);
506 cmd.Format(_T("git.exe reset --hard %s"),headhash.ToString());
507 out.Empty();
508 if(g_Git.Run(cmd,&out,CP_UTF8))
509 {
510 CMessageBox::Show(NULL,_T("Could not reset to original HEAD\r\n\r\n")+out,_T("TortoiseGit"),MB_OK);
511 }
512 }
513 Refresh();
514 }
515 break;
516
517 case ID_CHERRY_PICK:
518 if(!g_Git.CheckCleanWorkTree())
519 {
520 CMessageBox::Show(NULL,_T("Cherry Pick requires a clean working tree"),_T("TortoiseGit"),MB_OK);
521
522 }else
523 {
524 CRebaseDlg dlg;
525 dlg.m_IsCherryPick = TRUE;
526 dlg.m_Upstream = this->m_CurrentBranch;
527 POSITION pos = GetFirstSelectedItemPosition();
528 while(pos)
529 {
530 int indexNext = GetNextSelectedItem(pos);
531 dlg.m_CommitList.m_logEntries.push_back( ((GitRev*)m_arShownList[indexNext])->m_CommitHash );
532 dlg.m_CommitList.m_LogCache.m_HashMap[((GitRev*)m_arShownList[indexNext])->m_CommitHash]=*(GitRev*)m_arShownList[indexNext];
533 dlg.m_CommitList.m_logEntries.GetGitRevAt(dlg.m_CommitList.m_logEntries.size()-1).GetAction(this) |= CTGitPath::LOGACTIONS_REBASE_PICK;
534 }
535
536 if(dlg.DoModal() == IDOK)
537 {
538 Refresh();
539 }
540 }
541 break;
542 case ID_REBASE_TO_VERSION:
543 if(!g_Git.CheckCleanWorkTree())
544 {
545 CMessageBox::Show(NULL,_T("Rebase requires a clean working tree"),_T("TortoiseGit"),MB_OK);
546
547 }else
548 {
549 CRebaseDlg dlg;
550 dlg.m_Upstream = pSelLogEntry->m_CommitHash;
551
552 if(dlg.DoModal() == IDOK)
553 {
554 Refresh();
555 }
556 }
557
558 break;
559
560 case ID_STASH_APPLY:
561 CAppUtils::StashApply(pSelLogEntry->m_Ref);
562 break;
563
564 case ID_REFLOG_DEL:
565 {
566 CString str;
567 str.Format(_T("Warning: %s will be permanently deleted. It can <ct=0x0000FF><b>NOT</b></ct> be recovered!\r\n \r\n Are you sure you want to continue?"),pSelLogEntry->m_Ref);
568 if(CMessageBox::Show(NULL,str,_T("TortoiseGit"),MB_YESNO|MB_ICONWARNING) == IDYES)
569 {
570 CString cmd,out;
571 cmd.Format(_T("git.exe reflog delete %s"),pSelLogEntry->m_Ref);
572 if(g_Git.Run(cmd,&out,CP_ACP))
573 {
574 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
575 }
576 ::PostMessage(this->GetParent()->m_hWnd,MSG_REFLOG_CHANGED,0,0);
577 }
578 }
579 break;
580 case ID_LOG:
581 {
582 CString cmd;
583 cmd = CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe");
584 cmd += _T(" /command:log");
585 cmd += _T(" /path:\"")+g_Git.m_CurrentDir+_T("\" ");
586 GitRev * r1 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(FirstSelect));
587 cmd += _T(" /endrev:")+r1->m_CommitHash.ToString();
588 CAppUtils::LaunchApplication(cmd,IDS_ERR_PROC,false);
589 }
590 break;
591 case ID_CREATE_PATCH:
592 {
593 int select=this->GetSelectedCount();
594 CString cmd;
595 cmd = CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe");
596 cmd += _T(" /command:formatpatch");
597
598 cmd += _T(" /path:\"")+g_Git.m_CurrentDir+_T("\" ");
599
600 GitRev * r1 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(FirstSelect));
601 GitRev * r2 = NULL;
602 if(select == 1)
603 {
604 cmd += _T(" /startrev:")+r1->m_CommitHash.ToString();
605 }
606 else
607 {
608 r2 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(LastSelect));
609 if( this->m_IsOldFirst )
610 {
611 cmd += _T(" /startrev:")+r1->m_CommitHash.ToString()+_T("~1");
612 cmd += _T(" /endrev:")+r2->m_CommitHash.ToString();
613
614 }else
615 {
616 cmd += _T(" /startrev:")+r2->m_CommitHash.ToString()+_T("~1");
617 cmd += _T(" /endrev:")+r1->m_CommitHash.ToString();
618 }
619
620 }
621
622 CAppUtils::LaunchApplication(cmd,IDS_ERR_PROC,false);
623 }
624 break;
625 case ID_DELETE:
626 {
627 int index = cmd>>16;
628 if( this->m_HashMap.find(pSelLogEntry->m_CommitHash) == m_HashMap.end() )
629 {
630 CMessageBox::Show(NULL,IDS_ERROR_NOREF,IDS_APPNAME,MB_OK|MB_ICONERROR);
631 return;
632 }
633 if( index >= m_HashMap[pSelLogEntry->m_CommitHash].size())
634 {
635 CMessageBox::Show(NULL,IDS_ERROR_INDEX,IDS_APPNAME,MB_OK|MB_ICONERROR);
636 return;
637 }
638 CString ref,msg;
639 ref=m_HashMap[pSelLogEntry->m_CommitHash][index];
640
641 msg=CString(_T("<ct=0x0000FF>Delete</ct> <b>"))+ref;
642 msg+=_T("</b>\n\n Are you sure?");
643 if( CMessageBox::Show(NULL,msg,_T("TortoiseGit"),MB_YESNO) == IDYES )
644 {
645 CString shortname;
646 CString cmd;
647 if(this->GetShortName(ref,shortname,_T("refs/heads/")))
648 {
649 cmd.Format(_T("git.exe branch -D %s"),shortname);
650 }
651
652 if(this->GetShortName(ref,shortname,_T("refs/remotes/")))
653 {
654 cmd.Format(_T("git.exe branch -r -D %s"),shortname);
655 }
656
657 if(this->GetShortName(ref,shortname,_T("refs/tags/")))
658 {
659 cmd.Format(_T("git.exe tag -d %s"),shortname);
660 }
661
662 if(this->GetShortName(ref,shortname,_T("refs/stash")))
663 {
664 if(CMessageBox::Show(NULL,_T("<ct=0x0000FF>Are you sure remove <b>ALL</b> stash?</ct>"),
665 _T("TortoiseGit"),MB_YESNO)==IDYES)
666 cmd.Format(_T("git.exe stash clear"));
667 else
668 return;
669 }
670
671 CString out;
672 if(g_Git.Run(cmd,&out,CP_UTF8))
673 {
674 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
675 }
676 this->ReloadHashMap();
677 CRect rect;
678 this->GetItemRect(FirstSelect,&rect,LVIR_BOUNDS);
679 this->InvalidateRect(rect);
680 }
681 }
682 break;
683
684 case ID_FINDENTRY:
685 {
686 m_nSearchIndex = GetSelectionMark();
687 if (m_nSearchIndex < 0)
688 m_nSearchIndex = 0;
689 if (m_pFindDialog)
690 {
691 break;
692 }
693 else
694 {
695 m_pFindDialog = new CFindDlg();
696 m_pFindDialog->Create(this);
697 }
698 }
699 break;
700 case ID_MERGEREV:
701 {
702 // we need an URL to complete this command, so error out if we can't get an URL
703 if(CAppUtils::Merge(&pSelLogEntry->m_CommitHash.ToString()))
704 {
705 this->Refresh();
706 }
707 }
708 break;
709 case ID_REVERTREV:
710 {
711 if(!this->RevertSelectedCommits())
712 this->Refresh();
713 }
714 break;
715 case ID_EDITNOTE:
716 {
717 CAppUtils::EditNote(pSelLogEntry);
718 this->SetItemState(FirstSelect, 0, LVIS_SELECTED);
719 this->SetItemState(FirstSelect, LVIS_SELECTED, LVIS_SELECTED);
720 }
721 break;
722 default:
723 //CMessageBox::Show(NULL,_T("Have not implemented"),_T("TortoiseGit"),MB_OK);
724 break;
725 #if 0
726
727 case ID_BLAMECOMPARE:
728 {
729 //user clicked on the menu item "compare with working copy"
730 //now first get the revision which is selected
731 if (PromptShown())
732 {
733 GitDiff diff(this, this->m_hWnd, true);
734 diff.SetHEADPeg(m_LogRevision);
735 diff.ShowCompare(m_path, GitRev::REV_BASE, m_path, revSelected, GitRev(), false, true);
736 }
737 else
738 CAppUtils::StartShowCompare(m_hWnd, m_path, GitRev::REV_BASE, m_path, revSelected, GitRev(), m_LogRevision, false, false, true);
739 }
740 break;
741 case ID_BLAMETWO:
742 {
743 //user clicked on the menu item "compare and blame revisions"
744 if (PromptShown())
745 {
746 GitDiff diff(this, this->m_hWnd, true);
747 diff.SetHEADPeg(m_LogRevision);
748 diff.ShowCompare(CTGitPath(pathURL), revSelected2, CTGitPath(pathURL), revSelected, GitRev(), false, true);
749 }
750 else
751 CAppUtils::StartShowCompare(m_hWnd, CTGitPath(pathURL), revSelected2, CTGitPath(pathURL), revSelected, GitRev(), m_LogRevision, false, false, true);
752 }
753 break;
754 case ID_BLAMEWITHPREVIOUS:
755 {
756 //user clicked on the menu item "Compare and Blame with previous revision"
757 if (PromptShown())
758 {
759 GitDiff diff(this, this->m_hWnd, true);
760 diff.SetHEADPeg(m_LogRevision);
761 diff.ShowCompare(CTGitPath(pathURL), revPrevious, CTGitPath(pathURL), revSelected, GitRev(), false, true);
762 }
763 else
764 CAppUtils::StartShowCompare(m_hWnd, CTGitPath(pathURL), revPrevious, CTGitPath(pathURL), revSelected, GitRev(), m_LogRevision, false, false, true);
765 }
766 break;
767
768 case ID_OPENWITH:
769 bOpenWith = true;
770 case ID_OPEN:
771 {
772 CProgressDlg progDlg;
773 progDlg.SetTitle(IDS_APPNAME);
774 progDlg.SetAnimation(IDR_DOWNLOAD);
775 CString sInfoLine;
776 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, m_path.GetWinPath(), (LPCTSTR)revSelected.ToString());
777 progDlg.SetLine(1, sInfoLine, true);
778 SetAndClearProgressInfo(&progDlg);
779 progDlg.ShowModeless(m_hWnd);
780 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, m_path, revSelected);
781 bool bSuccess = true;
782 if (!Cat(m_path, GitRev(GitRev::REV_HEAD), revSelected, tempfile))
783 {
784 bSuccess = false;
785 // try again, but with the selected revision as the peg revision
786 if (!Cat(m_path, revSelected, revSelected, tempfile))
787 {
788 progDlg.Stop();
789 SetAndClearProgressInfo((HWND)NULL);
790 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
791 EnableOKButton();
792 break;
793 }
794 bSuccess = true;
795 }
796 if (bSuccess)
797 {
798 progDlg.Stop();
799 SetAndClearProgressInfo((HWND)NULL);
800 SetFileAttributes(tempfile.GetWinPath(), FILE_ATTRIBUTE_READONLY);
801 int ret = 0;
802 if (!bOpenWith)
803 ret = (int)ShellExecute(this->m_hWnd, NULL, tempfile.GetWinPath(), NULL, NULL, SW_SHOWNORMAL);
804 if ((ret <= HINSTANCE_ERROR)||bOpenWith)
805 {
806 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
807 cmd += tempfile.GetWinPathString() + _T(" ");
808 CAppUtils::LaunchApplication(cmd, NULL, false);
809 }
810 }
811 }
812 break;
813 case ID_BLAME:
814 {
815 CBlameDlg dlg;
816 dlg.EndRev = revSelected;
817 if (dlg.DoModal() == IDOK)
818 {
819 CBlame blame;
820 CString tempfile;
821 CString logfile;
822 tempfile = blame.BlameToTempFile(m_path, dlg.StartRev, dlg.EndRev, dlg.EndRev, logfile, _T(""), dlg.m_bIncludeMerge, TRUE, TRUE);
823 if (!tempfile.IsEmpty())
824 {
825 if (dlg.m_bTextView)
826 {
827 //open the default text editor for the result file
828 CAppUtils::StartTextViewer(tempfile);
829 }
830 else
831 {
832 CString sParams = _T("/path:\"") + m_path.GetGitPathString() + _T("\" ");
833 if(!CAppUtils::LaunchTortoiseBlame(tempfile, logfile, CPathUtils::GetFileNameFromPath(m_path.GetFileOrDirectoryName()),sParams))
834 {
835 break;
836 }
837 }
838 }
839 else
840 {
841 CMessageBox::Show(this->m_hWnd, blame.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
842 }
843 }
844 }
845 break;
846 case ID_UPDATE:
847 {
848 CString sCmd;
849 CString url = _T("tgit:")+pathURL;
850 sCmd.Format(_T("%s /command:update /path:\"%s\" /rev:%ld"),
851 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")),
852 (LPCTSTR)m_path.GetWinPath(), (LONG)revSelected);
853 CAppUtils::LaunchApplication(sCmd, NULL, false);
854 }
855 break;
856
857 case ID_REPOBROWSE:
858 {
859 CString sCmd;
860 sCmd.Format(_T("%s /command:repobrowser /path:\"%s\" /rev:%s"),
861 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")),
862 (LPCTSTR)pathURL, (LPCTSTR)revSelected.ToString());
863
864 CAppUtils::LaunchApplication(sCmd, NULL, false);
865 }
866 break;
867 case ID_EDITLOG:
868 {
869 EditLogMessage(selIndex);
870 }
871 break;
872 case ID_EDITAUTHOR:
873 {
874 EditAuthor(selEntries);
875 }
876 break;
877 case ID_REVPROPS:
878 {
879 CEditPropertiesDlg dlg;
880 dlg.SetProjectProperties(&m_ProjectProperties);
881 CTGitPathList escapedlist;
882 dlg.SetPathList(CTGitPathList(CTGitPath(pathURL)));
883 dlg.SetRevision(revSelected);
884 dlg.RevProps(true);
885 dlg.DoModal();
886 }
887 break;
888
889 case ID_EXPORT:
890 {
891 CString sCmd;
892 sCmd.Format(_T("%s /command:export /path:\"%s\" /revision:%ld"),
893 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")),
894 (LPCTSTR)pathURL, (LONG)revSelected);
895 CAppUtils::LaunchApplication(sCmd, NULL, false);
896 }
897 break;
898 case ID_CHECKOUT:
899 {
900 CString sCmd;
901 CString url = _T("tgit:")+pathURL;
902 sCmd.Format(_T("%s /command:checkout /url:\"%s\" /revision:%ld"),
903 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")),
904 (LPCTSTR)url, (LONG)revSelected);
905 CAppUtils::LaunchApplication(sCmd, NULL, false);
906 }
907 break;
908 case ID_VIEWREV:
909 {
910 CString url = m_ProjectProperties.sWebViewerRev;
911 url = GetAbsoluteUrlFromRelativeUrl(url);
912 url.Replace(_T("%REVISION%"), revSelected.ToString());
913 if (!url.IsEmpty())
914 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
915 }
916 break;
917 case ID_VIEWPATHREV:
918 {
919 CString relurl = pathURL;
920 CString sRoot = GetRepositoryRoot(CTGitPath(relurl));
921 relurl = relurl.Mid(sRoot.GetLength());
922 CString url = m_ProjectProperties.sWebViewerPathRev;
923 url = GetAbsoluteUrlFromRelativeUrl(url);
924 url.Replace(_T("%REVISION%"), revSelected.ToString());
925 url.Replace(_T("%PATH%"), relurl);
926 if (!url.IsEmpty())
927 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
928 }
929 break;
930 #endif
931
932 } // switch (cmd)
933
934 theApp.DoWaitCursor(-1);
935 }
936
937 void CGitLogList::SetSelectedAction(int action)
938 {
939 POSITION pos = GetFirstSelectedItemPosition();
940 int index;
941 while(pos)
942 {
943 index = GetNextSelectedItem(pos);
944 ((GitRev*)m_arShownList[index])->GetAction(this) = action;
945 CRect rect;
946 this->GetItemRect(index,&rect,LVIR_BOUNDS);
947 this->InvalidateRect(rect);
948
949 }
950
951 }
Windows Explorer Extension to Operate Git