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