src/TortoiseProc/GitLogListAction.cpp

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