?  search:
summary | log | graphiclog1 | graphiclog2 | commit | commitdiff | tree | refs | edit | fork
blame | history | raw | HEAD
guess correct branch for push on log dialog
[TortoiseGit.git] / src / TortoiseProc / GitLogListAction.cpp
blobbb923d0305484de1ef345d60aae5a5542d739964
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 "SVNProgressDlg.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
379 CProgressDlg progress;
380 CString name;
381 if(branch->Find(_T("refs/heads/")) ==0 )
382 name = branch->Mid(11);
383 else
384 name = *branch;
385
386 progress.m_GitCmd.Format(_T("git.exe checkout %s"), name.GetString());
387 progress.DoModal();
388 }
389 ReloadHashMap();
390 Invalidate();
391 ::PostMessage(this->GetParent()->m_hWnd,MSG_REFLOG_CHANGED,0,0);
392 }
393 break;
394 case ID_RESET:
395 {
396 CString str = pSelLogEntry->m_CommitHash.ToString();
397 CAppUtils::GitReset(&str);
398 ReloadHashMap();
399 Invalidate();
400 }
401 break;
402 case ID_REBASE_PICK:
403 SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_PICK);
404 break;
405 case ID_REBASE_EDIT:
406 SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_EDIT);
407 break;
408 case ID_REBASE_SQUASH:
409 SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_SQUASH);
410 break;
411 case ID_REBASE_SKIP:
412 SetSelectedAction(CTGitPath::LOGACTIONS_REBASE_SKIP);
413 break;
414 case ID_COMBINE_COMMIT:
415 {
416 CString head;
417 CGitHash headhash;
418 CGitHash hashFirst,hashLast;
419
420 int headindex=GetHeadIndex();
421 if(headindex>=0) //incase show all branch, head is not the first commits.
422 {
423 head.Format(_T("HEAD~%d"),FirstSelect-headindex);
424 hashFirst=g_Git.GetHash(head);
425
426 head.Format(_T("HEAD~%d"),LastSelect-headindex);
427 hashLast=g_Git.GetHash(head);
428 }
429
430 GitRev* pFirstEntry = reinterpret_cast<GitRev*>(m_arShownList.GetAt(FirstSelect));
431 GitRev* pLastEntry = reinterpret_cast<GitRev*>(m_arShownList.GetAt(LastSelect));
432 if(pFirstEntry->m_CommitHash != hashFirst || pLastEntry->m_CommitHash != hashLast)
433 {
434 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);
435 break;
436 }
437
438 headhash=g_Git.GetHash(_T("HEAD"));
439
440 if(!g_Git.CheckCleanWorkTree())
441 {
442 CMessageBox::Show(NULL,_T("Combine needs a clean work tree"),_T("TortoiseGit"),MB_OK);
443 break;
444 }
445 CString cmd,out;
446
447 //Use throw to abort this process (reset back to original HEAD)
448 try
449 {
450 cmd.Format(_T("git.exe reset --hard %s"),pFirstEntry->m_CommitHash.ToString());
451 if(g_Git.Run(cmd,&out,CP_UTF8))
452 {
453 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
454 throw std::exception(CUnicodeUtils::GetUTF8(_T("Could not reset to first commit (first step) aborting...\r\n\r\n")+out));
455 }
456 cmd.Format(_T("git.exe reset --mixed %s"),hashLast.ToString());
457 if(g_Git.Run(cmd,&out,CP_UTF8))
458 {
459 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
460 throw std::exception(CUnicodeUtils::GetUTF8(_T("Could not reset to last commit (second step) aborting...\r\n\r\n")+out));
461 }
462
463 CTGitPathList PathList;
464 /* don't why must add --stat to get action status*/
465 /* first -z will be omitted by gitdll*/
466 if(g_Git.GetDiffPath(&PathList,&pFirstEntry->m_CommitHash,&hashLast,"-z --stat -r"))
467 {
468 CMessageBox::Show(NULL,_T("Get Diff file list error"),_T("TortoiseGit"),MB_OK);
469 throw std::exception(CUnicodeUtils::GetUTF8(_T("Could not get changed file list aborting...\r\n\r\n")+out));
470 }
471
472 for(int i=0;i<PathList.GetCount();i++)
473 {
474 if(PathList[i].m_Action & CTGitPath::LOGACTIONS_ADDED)
475 {
476 cmd.Format(_T("git.exe add -- \"%s\""), PathList[i].GetGitPathString());
477 if(g_Git.Run(cmd,&out,CP_ACP))
478 {
479 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
480 throw std::exception(CUnicodeUtils::GetUTF8(_T("Could not add new file aborting...\r\n\r\n")+out));
481
482 }
483 }
484 if(PathList[i].m_Action & CTGitPath::LOGACTIONS_DELETED)
485 {
486 cmd.Format(_T("git.exe rm -- \"%s\""), PathList[i].GetGitPathString());
487 if(g_Git.Run(cmd,&out,CP_ACP))
488 {
489 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
490 throw std::exception(CUnicodeUtils::GetUTF8(_T("Could not rm file aborting...\r\n\r\n")+out));
491 }
492 }
493 }
494
495 CCommitDlg dlg;
496 for(int i=FirstSelect;i<=LastSelect;i++)
497 {
498 GitRev* pRev = reinterpret_cast<GitRev*>(m_arShownList.GetAt(i));
499 dlg.m_sLogMessage+=pRev->GetSubject()+_T("\n")+pRev->GetBody();
500 dlg.m_sLogMessage+=_T("\n");
501 }
502 dlg.m_bWholeProject=true;
503 dlg.m_bSelectFilesForCommit = true;
504 dlg.m_bCommitAmend=true;
505 dlg.m_bNoPostActions=true;
506 dlg.m_AmendStr=dlg.m_sLogMessage;
507
508 if (dlg.DoModal() == IDOK)
509 {
510 if(pFirstEntry->m_CommitHash!=headhash)
511 {
512 //Commitrange firstEntry..headhash (from top of combine to original head) needs to be 'cherry-picked'
513 //on top of new commit.
514 //Use the rebase --onto command for it.
515 //
516 //All this can be done in one step using the following command:
517 //cmd.Format(_T("git.exe format-patch --stdout --binary --full-index -k %s..%s | git am -k -3"),
518 // pFirstEntry->m_CommitHash,
519 // headhash);
520 //But I am not sure if a '|' is going to work in a CreateProcess() call.
521 //
522 //Later the progress dialog could be used to execute these steps.
523
524 if(CherryPickFrom(pFirstEntry->m_CommitHash.ToString(),headhash))
525 {
526 CString msg;
527 msg.Format(_T("Error while cherry pick commits on top of combined commits. Aborting.\r\n\r\n"));
528 throw std::exception(CUnicodeUtils::GetUTF8(msg));
529 }
530 #if 0
531 CString currentBranch=g_Git.GetCurrentBranch();
532 cmd.Format(_T("git.exe rebase --onto \"%s\" %s %s"),
533 currentBranch,
534 pFirstEntry->m_CommitHash,
535 headhash);
536 if(g_Git.Run(cmd,&out,CP_UTF8)!=0)
537 {
538 CString msg;
539 msg.Format(_T("Error while rebasing commits on top of combined commits. Aborting.\r\n\r\n%s"),out);
540 // CMessageBox::Show(NULL,msg,_T("TortoiseGit"),MB_OK);
541 g_Git.Run(_T("git.exe rebase --abort"),&out,CP_UTF8);
542 throw std::exception(CUnicodeUtils::GetUTF8(msg));
543 }
544
545 //HEAD is now on <no branch>.
546 //The following steps are to get HEAD back on the original branch and reset the branch to the new HEAD
547 //To avoid 2 working copy changes, we could use git branch -f <original branch> <hash new head>
548 //And then git checkout <original branch>
549 //But I don't know if 'git branch -f' removes tracking options. So for now, do a checkout and a reset.
550
551 //Store new HEAD
552 CString newHead=g_Git.GetHash(CString(_T("HEAD")));
553
554 //Checkout working branch
555 cmd.Format(_T("git.exe checkout -f \"%s\""),currentBranch);
556 if(g_Git.Run(cmd,&out,CP_UTF8))
557 throw std::exception(CUnicodeUtils::GetUTF8(_T("Could not checkout original branch. Aborting...\r\n\r\n")+out));
558
559 //Reset to new HEAD
560 cmd.Format(_T("git.exe reset --hard %s"),newHead);
561 if(g_Git.Run(cmd,&out,CP_UTF8))
562 throw std::exception(CUnicodeUtils::GetUTF8(_T("Could not reset to new head. Aborting...\r\n\r\n")+out));
563 #endif
564 }
565 }
566 else
567 throw std::exception("User aborted the combine process");
568 }
569 catch(std::exception& e)
570 {
571 CMessageBox::Show(NULL,CUnicodeUtils::GetUnicode(CStringA(e.what())),_T("TortoiseGit: Combine error"),MB_OK|MB_ICONERROR);
572 cmd.Format(_T("git.exe reset --hard %s"),headhash.ToString());
573 out.Empty();
574 if(g_Git.Run(cmd,&out,CP_UTF8))
575 {
576 CMessageBox::Show(NULL,_T("Could not reset to original HEAD\r\n\r\n")+out,_T("TortoiseGit"),MB_OK);
577 }
578 }
579 Refresh();
580 }
581 break;
582
583 case ID_CHERRY_PICK:
584 if(!g_Git.CheckCleanWorkTree())
585 {
586 CMessageBox::Show(NULL,_T("Cherry Pick requires a clean working tree"),_T("TortoiseGit"),MB_OK);
587
588 }
589 else
590 {
591 CRebaseDlg dlg;
592 dlg.m_IsCherryPick = TRUE;
593 dlg.m_Upstream = this->m_CurrentBranch;
594 POSITION pos = GetFirstSelectedItemPosition();
595 while(pos)
596 {
597 int indexNext = GetNextSelectedItem(pos);
598 dlg.m_CommitList.m_logEntries.push_back( ((GitRev*)m_arShownList[indexNext])->m_CommitHash );
599 dlg.m_CommitList.m_LogCache.m_HashMap[((GitRev*)m_arShownList[indexNext])->m_CommitHash]=*(GitRev*)m_arShownList[indexNext];
600 dlg.m_CommitList.m_logEntries.GetGitRevAt(dlg.m_CommitList.m_logEntries.size()-1).GetAction(this) |= CTGitPath::LOGACTIONS_REBASE_PICK;
601 }
602
603 if(dlg.DoModal() == IDOK)
604 {
605 Refresh();
606 }
607 }
608 break;
609 case ID_REBASE_TO_VERSION:
610 if(!g_Git.CheckCleanWorkTree())
611 {
612 CMessageBox::Show(NULL,_T("Rebase requires a clean working tree"),_T("TortoiseGit"),MB_OK);
613
614 }
615 else
616 {
617 CRebaseDlg dlg;
618 dlg.m_Upstream = pSelLogEntry->m_CommitHash;
619
620 if(dlg.DoModal() == IDOK)
621 {
622 Refresh();
623 }
624 }
625
626 break;
627
628 case ID_STASH_APPLY:
629 CAppUtils::StashApply(pSelLogEntry->m_Ref);
630 break;
631
632 case ID_REFLOG_DEL:
633 {
634 CString str;
635 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?"),pSelLogEntry->m_Ref);
636 if(CMessageBox::Show(NULL, str, _T("TortoiseGit"), 1, IDI_QUESTION, _T("&Delete"), _T("&Abort")) == 1)
637 {
638 CString cmd,out;
639 cmd.Format(_T("git.exe reflog delete %s"),pSelLogEntry->m_Ref);
640 if(g_Git.Run(cmd,&out,CP_ACP))
641 {
642 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
643 }
644 ::PostMessage(this->GetParent()->m_hWnd,MSG_REFLOG_CHANGED,0,0);
645 }
646 }
647 break;
648 case ID_LOG:
649 {
650 CString cmd;
651 cmd = CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe");
652 cmd += _T(" /command:log");
653 cmd += _T(" /path:\"")+g_Git.m_CurrentDir+_T("\" ");
654 GitRev * r1 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(FirstSelect));
655 cmd += _T(" /endrev:")+r1->m_CommitHash.ToString();
656 CAppUtils::LaunchApplication(cmd,IDS_ERR_PROC,false);
657 }
658 break;
659 case ID_CREATE_PATCH:
660 {
661 int select=this->GetSelectedCount();
662 CString cmd;
663 cmd = CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe");
664 cmd += _T(" /command:formatpatch");
665
666 cmd += _T(" /path:\"")+g_Git.m_CurrentDir+_T("\" ");
667
668 GitRev * r1 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(FirstSelect));
669 GitRev * r2 = NULL;
670 if(select == 1)
671 {
672 cmd += _T(" /startrev:")+r1->m_CommitHash.ToString();
673 }
674 else
675 {
676 r2 = reinterpret_cast<GitRev*>(m_arShownList.GetAt(LastSelect));
677 if( this->m_IsOldFirst )
678 {
679 cmd += _T(" /startrev:")+r1->m_CommitHash.ToString()+_T("~1");
680 cmd += _T(" /endrev:")+r2->m_CommitHash.ToString();
681
682 }
683 else
684 {
685 cmd += _T(" /startrev:")+r2->m_CommitHash.ToString()+_T("~1");
686 cmd += _T(" /endrev:")+r1->m_CommitHash.ToString();
687 }
688
689 }
690
691 CAppUtils::LaunchApplication(cmd,IDS_ERR_PROC,false);
692 }
693 break;
694 case ID_PUSH:
695 {
696 CString guessAssociatedBranch;
697 if (m_HashMap[pSelLogEntry->m_CommitHash].size() > 0)
698 guessAssociatedBranch = m_HashMap[pSelLogEntry->m_CommitHash].at(0);
699 if (CAppUtils::Push(guessAssociatedBranch))
700 Refresh();
701 }
702 break;
703 case ID_DELETE:
704 {
705 int index = cmd>>16;
706 if( this->m_HashMap.find(pSelLogEntry->m_CommitHash) == m_HashMap.end() )
707 {
708 CMessageBox::Show(NULL,IDS_ERROR_NOREF,IDS_APPNAME,MB_OK|MB_ICONERROR);
709 return;
710 }
711 if( index >= m_HashMap[pSelLogEntry->m_CommitHash].size())
712 {
713 CMessageBox::Show(NULL,IDS_ERROR_INDEX,IDS_APPNAME,MB_OK|MB_ICONERROR);
714 return;
715 }
716 CString ref,msg;
717 ref=m_HashMap[pSelLogEntry->m_CommitHash][index];
718
719 msg=CString(_T("Do you really want to <ct=0x0000FF>delete</ct> <b>"))+ref;
720 msg+=_T("</b>?");
721 if( CMessageBox::Show(NULL, msg, _T("TortoiseGit"), 2, IDI_QUESTION, _T("&Delete"), _T("&Abort")) == 1 )
722 {
723 CString shortname;
724 CString cmd;
725 if(this->GetShortName(ref,shortname,_T("refs/heads/")))
726 {
727 cmd.Format(_T("git.exe branch -D -- %s"),shortname);
728 }
729
730 if(this->GetShortName(ref,shortname,_T("refs/remotes/")))
731 {
732 cmd.Format(_T("git.exe branch -r -D -- %s"),shortname);
733 }
734
735 if(this->GetShortName(ref,shortname,_T("refs/tags/")))
736 {
737 cmd.Format(_T("git.exe tag -d -- %s"),shortname);
738 }
739
740 if(this->GetShortName(ref,shortname,_T("refs/stash")))
741 {
742 if(CMessageBox::Show(NULL, _T("<ct=0x0000FF>Do you really want to delete <b>ALL</b> stash?</ct>"),
743 _T("TortoiseGit"), 2, IDI_QUESTION, _T("&Delete"), _T("&Abort")) == 1)
744 cmd.Format(_T("git.exe stash clear"));
745 else
746 return;
747 }
748
749 CString out;
750 if(g_Git.Run(cmd,&out,CP_UTF8))
751 {
752 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
753 }
754 this->ReloadHashMap();
755 CRect rect;
756 this->GetItemRect(FirstSelect,&rect,LVIR_BOUNDS);
757 this->InvalidateRect(rect);
758 }
759 }
760 break;
761
762 case ID_FINDENTRY:
763 {
764 m_nSearchIndex = GetSelectionMark();
765 if (m_nSearchIndex < 0)
766 m_nSearchIndex = 0;
767 if (m_pFindDialog)
768 {
769 break;
770 }
771 else
772 {
773 m_pFindDialog = new CFindDlg();
774 m_pFindDialog->Create(this);
775 }
776 }
777 break;
778 case ID_MERGEREV:
779 {
780 CString str = pSelLogEntry->m_CommitHash.ToString();
781 if (m_HashMap[pSelLogEntry->m_CommitHash].size() > 0)
782 str = m_HashMap[pSelLogEntry->m_CommitHash].at(0);
783 // we need an URL to complete this command, so error out if we can't get an URL
784 if(CAppUtils::Merge(&str))
785 {
786 this->Refresh();
787 }
788 }
789 break;
790 case ID_REVERTREV:
791 {
792 if(!this->RevertSelectedCommits())
793 this->Refresh();
794 }
795 break;
796 case ID_EDITNOTE:
797 {
798 CAppUtils::EditNote(pSelLogEntry);
799 this->SetItemState(FirstSelect, 0, LVIS_SELECTED);
800 this->SetItemState(FirstSelect, LVIS_SELECTED, LVIS_SELECTED);
801 }
802 break;
803 default:
804 //CMessageBox::Show(NULL,_T("Have not implemented"),_T("TortoiseGit"),MB_OK);
805 break;
806 #if 0
807
808 case ID_BLAMECOMPARE:
809 {
810 //user clicked on the menu item "compare with working copy"
811 //now first get the revision which is selected
812 if (PromptShown())
813 {
814 GitDiff diff(this, this->m_hWnd, true);
815 diff.SetHEADPeg(m_LogRevision);
816 diff.ShowCompare(m_path, GitRev::REV_BASE, m_path, revSelected, GitRev(), false, true);
817 }
818 else
819 CAppUtils::StartShowCompare(m_hWnd, m_path, GitRev::REV_BASE, m_path, revSelected, GitRev(), m_LogRevision, false, false, true);
820 }
821 break;
822 case ID_BLAMETWO:
823 {
824 //user clicked on the menu item "compare and blame revisions"
825 if (PromptShown())
826 {
827 GitDiff diff(this, this->m_hWnd, true);
828 diff.SetHEADPeg(m_LogRevision);
829 diff.ShowCompare(CTGitPath(pathURL), revSelected2, CTGitPath(pathURL), revSelected, GitRev(), false, true);
830 }
831 else
832 CAppUtils::StartShowCompare(m_hWnd, CTGitPath(pathURL), revSelected2, CTGitPath(pathURL), revSelected, GitRev(), m_LogRevision, false, false, true);
833 }
834 break;
835 case ID_BLAMEWITHPREVIOUS:
836 {
837 //user clicked on the menu item "Compare and Blame with previous revision"
838 if (PromptShown())
839 {
840 GitDiff diff(this, this->m_hWnd, true);
841 diff.SetHEADPeg(m_LogRevision);
842 diff.ShowCompare(CTGitPath(pathURL), revPrevious, CTGitPath(pathURL), revSelected, GitRev(), false, true);
843 }
844 else
845 CAppUtils::StartShowCompare(m_hWnd, CTGitPath(pathURL), revPrevious, CTGitPath(pathURL), revSelected, GitRev(), m_LogRevision, false, false, true);
846 }
847 break;
848
849 case ID_OPENWITH:
850 bOpenWith = true;
851 case ID_OPEN:
852 {
853 CProgressDlg progDlg;
854 progDlg.SetTitle(IDS_APPNAME);
855 progDlg.SetAnimation(IDR_DOWNLOAD);
856 CString sInfoLine;
857 sInfoLine.Format(IDS_PROGRESSGETFILEREVISION, m_path.GetWinPath(), (LPCTSTR)revSelected.ToString());
858 progDlg.SetLine(1, sInfoLine, true);
859 SetAndClearProgressInfo(&progDlg);
860 progDlg.ShowModeless(m_hWnd);
861 CTGitPath tempfile = CTempFiles::Instance().GetTempFilePath(false, m_path, revSelected);
862 bool bSuccess = true;
863 if (!Cat(m_path, GitRev(GitRev::REV_HEAD), revSelected, tempfile))
864 {
865 bSuccess = false;
866 // try again, but with the selected revision as the peg revision
867 if (!Cat(m_path, revSelected, revSelected, tempfile))
868 {
869 progDlg.Stop();
870 SetAndClearProgressInfo((HWND)NULL);
871 CMessageBox::Show(this->m_hWnd, GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
872 EnableOKButton();
873 break;
874 }
875 bSuccess = true;
876 }
877 if (bSuccess)
878 {
879 progDlg.Stop();
880 SetAndClearProgressInfo((HWND)NULL);
881 SetFileAttributes(tempfile.GetWinPath(), FILE_ATTRIBUTE_READONLY);
882 int ret = 0;
883 if (!bOpenWith)
884 ret = (int)ShellExecute(this->m_hWnd, NULL, tempfile.GetWinPath(), NULL, NULL, SW_SHOWNORMAL);
885 if ((ret <= HINSTANCE_ERROR)||bOpenWith)
886 {
887 CString cmd = _T("RUNDLL32 Shell32,OpenAs_RunDLL ");
888 cmd += tempfile.GetWinPathString() + _T(" ");
889 CAppUtils::LaunchApplication(cmd, NULL, false);
890 }
891 }
892 }
893 break;
894 case ID_BLAME:
895 {
896 CBlameDlg dlg;
897 dlg.EndRev = revSelected;
898 if (dlg.DoModal() == IDOK)
899 {
900 CBlame blame;
901 CString tempfile;
902 CString logfile;
903 tempfile = blame.BlameToTempFile(m_path, dlg.StartRev, dlg.EndRev, dlg.EndRev, logfile, _T(""), dlg.m_bIncludeMerge, TRUE, TRUE);
904 if (!tempfile.IsEmpty())
905 {
906 if (dlg.m_bTextView)
907 {
908 //open the default text editor for the result file
909 CAppUtils::StartTextViewer(tempfile);
910 }
911 else
912 {
913 CString sParams = _T("/path:\"") + m_path.GetGitPathString() + _T("\" ");
914 if(!CAppUtils::LaunchTortoiseBlame(tempfile, logfile, CPathUtils::GetFileNameFromPath(m_path.GetFileOrDirectoryName()),sParams))
915 {
916 break;
917 }
918 }
919 }
920 else
921 {
922 CMessageBox::Show(this->m_hWnd, blame.GetLastErrorMessage(), _T("TortoiseGit"), MB_ICONERROR);
923 }
924 }
925 }
926 break;
927 case ID_UPDATE:
928 {
929 CString sCmd;
930 CString url = _T("tgit:")+pathURL;
931 sCmd.Format(_T("%s /command:update /path:\"%s\" /rev:%ld"),
932 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")),
933 (LPCTSTR)m_path.GetWinPath(), (LONG)revSelected);
934 CAppUtils::LaunchApplication(sCmd, NULL, false);
935 }
936 break;
937
938 case ID_EDITLOG:
939 {
940 EditLogMessage(selIndex);
941 }
942 break;
943 case ID_EDITAUTHOR:
944 {
945 EditAuthor(selEntries);
946 }
947 break;
948 case ID_REVPROPS:
949 {
950 CEditPropertiesDlg dlg;
951 dlg.SetProjectProperties(&m_ProjectProperties);
952 CTGitPathList escapedlist;
953 dlg.SetPathList(CTGitPathList(CTGitPath(pathURL)));
954 dlg.SetRevision(revSelected);
955 dlg.RevProps(true);
956 dlg.DoModal();
957 }
958 break;
959
960 case ID_EXPORT:
961 {
962 CString sCmd;
963 sCmd.Format(_T("%s /command:export /path:\"%s\" /revision:%ld"),
964 (LPCTSTR)(CPathUtils::GetAppDirectory()+_T("TortoiseProc.exe")),
965 (LPCTSTR)pathURL, (LONG)revSelected);
966 CAppUtils::LaunchApplication(sCmd, NULL, false);
967 }
968 break;
969 case ID_VIEWREV:
970 {
971 CString url = m_ProjectProperties.sWebViewerRev;
972 url = GetAbsoluteUrlFromRelativeUrl(url);
973 url.Replace(_T("%REVISION%"), revSelected.ToString());
974 if (!url.IsEmpty())
975 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
976 }
977 break;
978 case ID_VIEWPATHREV:
979 {
980 CString relurl = pathURL;
981 CString sRoot = GetRepositoryRoot(CTGitPath(relurl));
982 relurl = relurl.Mid(sRoot.GetLength());
983 CString url = m_ProjectProperties.sWebViewerPathRev;
984 url = GetAbsoluteUrlFromRelativeUrl(url);
985 url.Replace(_T("%REVISION%"), revSelected.ToString());
986 url.Replace(_T("%PATH%"), relurl);
987 if (!url.IsEmpty())
988 ShellExecute(this->m_hWnd, _T("open"), url, NULL, NULL, SW_SHOWDEFAULT);
989 }
990 break;
991 #endif
992
993 } // switch (cmd)
994
995 theApp.DoWaitCursor(-1);
996 }
997
998 void CGitLogList::SetSelectedAction(int action)
999 {
1000 POSITION pos = GetFirstSelectedItemPosition();
1001 int index;
1002 while(pos)
1003 {
1004 index = GetNextSelectedItem(pos);
1005 ((GitRev*)m_arShownList[index])->GetAction(this) = action;
1006 CRect rect;
1007 this->GetItemRect(index,&rect,LVIR_BOUNDS);
1008 this->InvalidateRect(rect);
1009
1010 }
1011 }
1012 void CGitLogList::ShiftSelectedAction()
1013 {
1014 POSITION pos = GetFirstSelectedItemPosition();
1015 int index;
1016 while(pos)
1017 {
1018 index = GetNextSelectedItem(pos);
1019 int action = ((GitRev*)m_arShownList[index])->GetAction(this);
1020 switch (action)
1021 {
1022 case CTGitPath::LOGACTIONS_REBASE_PICK:
1023 action = CTGitPath::LOGACTIONS_REBASE_SKIP;
1024 break;
1025 case CTGitPath::LOGACTIONS_REBASE_SKIP:
1026 action= CTGitPath::LOGACTIONS_REBASE_EDIT;
1027 break;
1028 case CTGitPath::LOGACTIONS_REBASE_EDIT:
1029 action = CTGitPath::LOGACTIONS_REBASE_SQUASH;
1030 break;
1031 case CTGitPath::LOGACTIONS_REBASE_SQUASH:
1032 action= CTGitPath::LOGACTIONS_REBASE_PICK;
1033 break;
1034 }
1035 ((GitRev*)m_arShownList[index])->GetAction(this) = action;
1036 CRect rect;
1037 this->GetItemRect(index, &rect, LVIR_BOUNDS);
1038 this->InvalidateRect(rect);
1039 }
1040 }
Windows Explorer Extension to Operate Git