src/TortoiseProc/Commands/SVNRebaseCommand.cpp

   1 // TortoiseGit - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2009-2013, 2015-2018 - TortoiseGit
   4
   5 // This program is free software; you can redistribute it and/or
   6 // modify it under the terms of the GNU General Public License
   7 // as published by the Free Software Foundation; either version 2
   8 // of the License, or (at your option) any later version.
   9
  10 // This program is distributed in the hope that it will be useful,
  11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
  12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  13 // GNU General Public License for more details.
  14
  15 // You should have received a copy of the GNU General Public License
  16 // along with this program; if not, write to the Free Software Foundation,
  17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  18 //
  19 #include "stdafx.h"
  20 #include "SVNRebaseCommand.h"
  21
  22 #include "SysProgressDlg.h"
  23 #include "ProgressDlg.h"
  24 #include "MessageBox.h"
  25 #include "Git.h"
  26 #include "RebaseDlg.h"
  27 #include "AppUtils.h"
  28
  29 bool SVNRebaseCommand::Execute()
  30 {
  31         bool isStash = false;
  32
  33         if(!g_Git.CheckCleanWorkTree())
  34         {
  35                 if (CMessageBox::Show(hwndExplorer, g_Git.m_CurrentDir + L"\r\n" + CString(MAKEINTRESOURCE(IDS_ERROR_NOCLEAN_STASH)), L"TortoiseGit", 1, IDI_QUESTION, CString(MAKEINTRESOURCE(IDS_STASHBUTTON)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON))) == 1)
  36                 {
  37                         CSysProgressDlg sysProgressDlg;
  38                         sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME)));
  39                         sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING)));
  40                         sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
  41                         sysProgressDlg.SetShowProgressBar(false);
  42                         sysProgressDlg.SetCancelMsg(IDS_PROGRS_INFOFAILED);
  43                         sysProgressDlg.ShowModeless((HWND)nullptr, true);
  44
  45                         CString out;
  46                         if (g_Git.Run(L"git.exe stash", &out, CP_UTF8))
  47                         {
  48                                 sysProgressDlg.Stop();
  49                                 MessageBox(hwndExplorer, out, L"TortoiseGit", MB_OK | MB_ICONERROR);
  50                                 return false;
  51                         }
  52                         sysProgressDlg.Stop();
  53                         isStash = true;
  54                 }
  55                 else
  56                 {
  57                         return false;
  58                 }
  59         }
  60
  61         CRebaseDlg dlg;
  62
  63 //      dlg.m_PreCmd=L"git.exe svn fetch";
  64
  65         CString out, err;
  66         if (!g_Git.Run(L"git.exe config svn-remote.svn.fetch", &out, &err, CP_UTF8))
  67         {
  68                 int start = out.Find(L':');
  69                 if( start >=0 )
  70                         out=out.Mid(start);
  71
  72                 if (CStringUtils::StartsWith(out, L":refs"))
  73                         out=out.Mid(6);
  74
  75                 start = 0;
  76                 out = out.Tokenize(L"\n", start);
  77         }
  78         else
  79         {
  80                 MessageBox(hwndExplorer, L"Could not get \"svn-remote.svn.fetch\" config value.\n" + out + L'\n' + err, L"TortoiseGit", MB_OK | MB_ICONERROR);
  81                 return false;
  82         }
  83
  84         dlg.m_Upstream=out;
  85
  86         CGitHash UpStreamOldHash,HeadHash,UpStreamNewHash;
  87         if (g_Git.GetHash(UpStreamOldHash, out))
  88         {
  89                 MessageBox(hwndExplorer, g_Git.GetGitLastErr(L"Could not get hash of SVN branch."), L"TortoiseGit", MB_ICONERROR);
  90                 return false;
  91         }
  92         if (g_Git.GetHash(HeadHash, L"HEAD"))
  93         {
  94                 MessageBox(hwndExplorer, g_Git.GetGitLastErr(L"Could not get HEAD hash."), L"TortoiseGit", MB_ICONERROR);
  95                 return false;
  96         }
  97         CProgressDlg progress;
  98         progress.m_GitCmd = L"git.exe svn fetch";
  99         progress.m_AutoClose = AUTOCLOSE_IF_NO_ERRORS;
 100
 101         if(progress.DoModal()!=IDOK)
 102                 return false;
 103
 104         if(progress.m_GitStatus)
 105                 return false;
 106
 107         if (g_Git.GetHash(UpStreamNewHash, out))
 108         {
 109                 MessageBox(hwndExplorer, g_Git.GetGitLastErr(L"Could not get upstream hash after fetching."), L"TortoiseGit", MB_ICONERROR);
 110                 return false;
 111         }
 112
 113         //everything updated
 114         if(UpStreamNewHash==HeadHash)
 115         {
 116                 MessageBox(hwndExplorer, g_Git.m_CurrentDir + L"\r\n" + CString(MAKEINTRESOURCE(IDS_PROC_EVERYTHINGUPDATED)), L"TortoiseGit", MB_OK | MB_ICONQUESTION);
 117                 if(isStash)
 118                         askIfUserWantsToStashPop();
 119
 120                 return true;
 121         }
 122
 123         //fast forward;
 124         if (g_Git.IsFastForward(L"HEAD", out))
 125         {
 126                 CProgressDlg progressReset;
 127                 CString cmd;
 128                 cmd.Format(L"git.exe reset --hard %s --", (LPCTSTR)out);
 129                 progressReset.m_GitCmd = cmd;
 130                 progressReset.m_AutoClose = AUTOCLOSE_IF_NO_ERRORS;
 131
 132                 if (progressReset.DoModal() != IDOK)
 133                         return false;
 134                 else
 135                 {
 136                         MessageBox(hwndExplorer, g_Git.m_CurrentDir + L"\r\n" + CString(MAKEINTRESOURCE(IDS_PROC_FASTFORWARD)) + L":\n" + progressReset.m_LogText, L"TortoiseGit", MB_OK | MB_ICONQUESTION);
 137                         if(isStash)
 138                                 askIfUserWantsToStashPop();
 139
 140                         return true;
 141                 }
 142         }
 143
 144         dlg.m_PostButtonTexts.Add(CString(MAKEINTRESOURCE(IDS_MENULOG)));
 145         //need rebase
 146         INT_PTR response = dlg.DoModal();
 147         if (response == IDOK || response == IDC_REBASE_POST_BUTTON)
 148         {
 149                 if(isStash)
 150                         askIfUserWantsToStashPop();
 151                 if (response == IDC_REBASE_POST_BUTTON)
 152                 {
 153                         CString cmd = L"/command:log";
 154                         cmd += L" /path:\"" + g_Git.m_CurrentDir + L'"';
 155                         CAppUtils::RunTortoiseGitProc(cmd);
 156                 }
 157                 return true;
 158         }
 159         return false;
 160 }
 161
 162 void SVNRebaseCommand::askIfUserWantsToStashPop()
 163 {
 164         if (MessageBox(hwndExplorer, g_Git.m_CurrentDir + L"\r\n" + CString(MAKEINTRESOURCE(IDS_DCOMMIT_STASH_POP)), L"TortoiseGit", MB_YESNO | MB_ICONINFORMATION) == IDYES)
 165                 CAppUtils::StashPop(hwndExplorer);
 166 }