src/TortoiseProc/Commands/SVNRebaseCommand.cpp

   1 // TortoiseGit - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2009-2012 - 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
  30 bool SVNRebaseCommand::Execute()
  31 {
  32         bool isStash = false;
  33
  34         if(!g_Git.CheckCleanWorkTree())
  35         {
  36                 if(CMessageBox::Show(NULL,      IDS_ERROR_NOCLEAN_STASH,IDS_APPNAME,MB_YESNO|MB_ICONINFORMATION)==IDYES)
  37                 {
  38                         CString cmd,out;
  39                         cmd=_T("git.exe stash");
  40                         if (g_Git.Run(cmd, &out, CP_UTF8))
  41                         {
  42                                 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
  43                                 return false;
  44                         }
  45                         isStash = true;
  46                 }
  47                 else
  48                 {
  49                         return false;
  50                 }
  51         }
  52
  53         CRebaseDlg dlg;
  54
  55 //      dlg.m_PreCmd=_T("git.exe svn fetch");
  56
  57         CString cmd, out, err;
  58         cmd = _T("git.exe config svn-remote.svn.fetch");
  59
  60         if (!g_Git.Run(cmd, &out, &err, CP_UTF8))
  61         {
  62                 int start = out.Find(_T(':'));
  63                 if( start >=0 )
  64                         out=out.Mid(start);
  65
  66                 if(out.Left(5) == _T(":refs"))
  67                         out=out.Mid(6);
  68
  69                 start = 0;
  70                 out=out.Tokenize(_T("\n"),start);
  71         }
  72         else
  73         {
  74                 CMessageBox::Show(NULL, out + L"\n" + err, _T("TortoiseGit"), MB_OK|MB_ICONERROR);
  75                 return false;
  76         }
  77
  78         dlg.m_Upstream=out;
  79
  80         CGitHash UpStreamOldHash,HeadHash,UpStreamNewHash;
  81         UpStreamOldHash=g_Git.GetHash(out);
  82         HeadHash = g_Git.GetHash(_T("HEAD"));
  83         CProgressDlg progress;
  84         progress.m_GitCmd=_T("git.exe svn fetch");
  85         progress.m_bAutoCloseOnSuccess = true;
  86
  87         if(progress.DoModal()!=IDOK)
  88                 return false;
  89
  90         if(progress.m_GitStatus)
  91                 return false;
  92
  93         UpStreamNewHash=g_Git.GetHash(out);
  94
  95         //everything updated
  96         if(UpStreamNewHash==HeadHash)
  97         {
  98                 CMessageBox::Show(NULL, IDS_PROC_EVERYTHINGUPDATED, IDS_APPNAME, MB_OK);
  99                 if(isStash)
 100                         askIfUserWantsToStashPop();
 101
 102                 return true;
 103         }
 104
 105         //fast forward;
 106         if(g_Git.IsFastForward(CString(_T("HEAD")),out))
 107         {
 108                 CProgressDlg progressReset;
 109                 cmd.Format(_T("git.exe reset --hard %s"), out);
 110                 progressReset.m_GitCmd = cmd;
 111                 progressReset.m_bAutoCloseOnSuccess = true;
 112
 113                 if (progressReset.DoModal() != IDOK)
 114                         return false;
 115                 else
 116                 {
 117                         MessageBox(NULL, CString(MAKEINTRESOURCE(IDS_PROC_FASTFORWARD)) + _T(":\n") + progressReset.m_LogText, _T("TortoiseGit"), MB_OK);
 118                         if(isStash)
 119                                 askIfUserWantsToStashPop();
 120
 121                         return true;
 122                 }
 123         }
 124
 125         //need rebase
 126         if(dlg.DoModal() == IDOK)
 127         {
 128                 if(isStash)
 129                         askIfUserWantsToStashPop();
 130                 return true;
 131         }
 132         return false;
 133 }
 134
 135 void SVNRebaseCommand::askIfUserWantsToStashPop()
 136 {
 137         if(CMessageBox::Show(NULL, IDS_DCOMMIT_STASH_POP, IDS_APPNAME, MB_YESNO|MB_ICONINFORMATION) == IDYES)
 138         {
 139                 CString cmd,out;
 140                 cmd=_T("git.exe stash pop");
 141                 if (g_Git.Run(cmd, &out, CP_UTF8))
 142                 {
 143                         CMessageBox::Show(NULL,out,_T("TortoiseGit"), MB_OK);
 144                 }
 145         }
 146 }