src/TortoiseProc/Commands/SVNRebaseCommand.cpp

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