src/TortoiseProc/Commands/SVNRebaseCommand.cpp

   1 // TortoiseGit - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2009-2013 - 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 "RenameDlg.h"
  26 #include "Git.h"
  27 #include "ShellUpdater.h"
  28 #include "rebasedlg.h"
  29 #include "SysProgressDlg.h"
  30 #include "AppUtils.h"
  31
  32 bool SVNRebaseCommand::Execute()
  33 {
  34         bool isStash = false;
  35
  36         if(!g_Git.CheckCleanWorkTree())
  37         {
  38                 if (CMessageBox::Show(NULL, g_Git.m_CurrentDir + _T("\r\n") + CString(MAKEINTRESOURCE(IDS_ERROR_NOCLEAN_STASH)), _T("TortoiseGit"), 1, IDI_QUESTION, CString(MAKEINTRESOURCE(IDS_STASHBUTTON)), CString(MAKEINTRESOURCE(IDS_ABORTBUTTON))) == 1)
  39                 {
  40                         CSysProgressDlg sysProgressDlg;
  41                         sysProgressDlg.SetTitle(CString(MAKEINTRESOURCE(IDS_APPNAME)));
  42                         sysProgressDlg.SetLine(1, CString(MAKEINTRESOURCE(IDS_PROC_STASHRUNNING)));
  43                         sysProgressDlg.SetLine(2, CString(MAKEINTRESOURCE(IDS_PROGRESSWAIT)));
  44                         sysProgressDlg.SetShowProgressBar(false);
  45                         sysProgressDlg.SetCancelMsg(IDS_PROGRS_INFOFAILED);
  46                         sysProgressDlg.ShowModeless((HWND)NULL, true);
  47
  48                         CString cmd,out;
  49                         cmd=_T("git.exe stash");
  50                         if (g_Git.Run(cmd, &out, CP_UTF8))
  51                         {
  52                                 sysProgressDlg.Stop();
  53                                 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
  54                                 return false;
  55                         }
  56                         sysProgressDlg.Stop();
  57                         isStash = true;
  58                 }
  59                 else
  60                 {
  61                         return false;
  62                 }
  63         }
  64
  65         CRebaseDlg dlg;
  66
  67 //      dlg.m_PreCmd=_T("git.exe svn fetch");
  68
  69         CString cmd, out, err;
  70         cmd = _T("git.exe config svn-remote.svn.fetch");
  71
  72         if (!g_Git.Run(cmd, &out, &err, CP_UTF8))
  73         {
  74                 int start = out.Find(_T(':'));
  75                 if( start >=0 )
  76                         out=out.Mid(start);
  77
  78                 if(out.Left(5) == _T(":refs"))
  79                         out=out.Mid(6);
  80
  81                 start = 0;
  82                 out=out.Tokenize(_T("\n"),start);
  83         }
  84         else
  85         {
  86                 CMessageBox::Show(NULL, out + L"\n" + err, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
  87                 return false;
  88         }
  89
  90         dlg.m_Upstream=out;
  91
  92         CGitHash UpStreamOldHash,HeadHash,UpStreamNewHash;
  93         if (g_Git.GetHash(UpStreamOldHash, out))
  94         {
  95                 MessageBox(hwndExplorer, g_Git.GetGitLastErr(_T("Could not get hash of SVN branch.")), _T("TortoiseGit"), MB_ICONERROR);
  96                 return false;
  97         }
  98         if (g_Git.GetHash(HeadHash, _T("HEAD")))
  99         {
 100                 MessageBox(hwndExplorer, g_Git.GetGitLastErr(_T("Could not get HEAD hash.")), _T("TortoiseGit"), MB_ICONERROR);
 101                 return false;
 102         }
 103         CProgressDlg progress;
 104         progress.m_GitCmd=_T("git.exe svn fetch");
 105         progress.m_AutoClose = AUTOCLOSE_IF_NO_ERRORS;
 106
 107         if(progress.DoModal()!=IDOK)
 108         {
 109                 ::DeleteFile(g_Git.m_CurrentDir + _T("\\sys$command"));
 110                 return false;
 111         }
 112         ::DeleteFile(g_Git.m_CurrentDir + _T("\\sys$command"));
 113
 114         if(progress.m_GitStatus)
 115                 return false;
 116
 117         if (g_Git.GetHash(UpStreamNewHash, out))
 118         {
 119                 MessageBox(hwndExplorer, g_Git.GetGitLastErr(_T("Could not get upstream hash after fetching.")), _T("TortoiseGit"), MB_ICONERROR);
 120                 return false;
 121         }
 122
 123         //everything updated
 124         if(UpStreamNewHash==HeadHash)
 125         {
 126                 CMessageBox::Show(NULL, g_Git.m_CurrentDir + _T("\r\n") + CString(MAKEINTRESOURCE(IDS_PROC_EVERYTHINGUPDATED)), _T("TortoiseGit"), MB_OK);
 127                 if(isStash)
 128                         askIfUserWantsToStashPop();
 129
 130                 return true;
 131         }
 132
 133         //fast forward;
 134         if(g_Git.IsFastForward(CString(_T("HEAD")),out))
 135         {
 136                 CProgressDlg progressReset;
 137                 cmd.Format(_T("git.exe reset --hard %s --"), out);
 138                 progressReset.m_GitCmd = cmd;
 139                 progressReset.m_AutoClose = AUTOCLOSE_IF_NO_ERRORS;
 140
 141                 if (progressReset.DoModal() != IDOK)
 142                         return false;
 143                 else
 144                 {
 145                         MessageBox(NULL, g_Git.m_CurrentDir + _T("\r\n") + CString(MAKEINTRESOURCE(IDS_PROC_FASTFORWARD)) + _T(":\n") + progressReset.m_LogText, _T("TortoiseGit"), MB_OK);
 146                         if(isStash)
 147                                 askIfUserWantsToStashPop();
 148
 149                         return true;
 150                 }
 151         }
 152
 153         dlg.m_PostButtonTexts.Add(CString(MAKEINTRESOURCE(IDS_MENULOG)));
 154         //need rebase
 155         INT_PTR response = dlg.DoModal();
 156         if (response == IDOK || response == IDC_REBASE_POST_BUTTON)
 157         {
 158                 if(isStash)
 159                         askIfUserWantsToStashPop();
 160                 if (response == IDC_REBASE_POST_BUTTON)
 161                 {
 162                         CString cmd = _T("/command:log");
 163                         cmd += _T(" /path:\"") + g_Git.m_CurrentDir + _T("\"");
 164                         CAppUtils::RunTortoiseGitProc(cmd);
 165                 }
 166                 return true;
 167         }
 168         return false;
 169 }
 170
 171 void SVNRebaseCommand::askIfUserWantsToStashPop()
 172 {
 173         if (CMessageBox::Show(NULL, g_Git.m_CurrentDir + _T("\r\n") + CString(MAKEINTRESOURCE(IDS_DCOMMIT_STASH_POP)), _T("TortoiseGit"), MB_YESNO|MB_ICONINFORMATION) == IDYES)
 174         {
 175                 CAppUtils::StashPop();
 176         }
 177 }