Fixed issue #155: Fix SVN Rebase sets upstream as remotes/trunk
[TortoiseGit.git] / src / TortoiseProc / Commands / SVNRebaseCommand.cpp
blob7a08704a6f85da6d240e786e21017933daf2d464
1 // TortoiseGit - a Windows shell extension for easy version control
3 // Copyright (C) 2007-2008 - TortoiseGit
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.
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.
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.
19 #include "StdAfx.h"
20 #include "SVNRebaseCommand.h"
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"
30 bool SVNRebaseCommand::Execute()
32 bool bRet =false;
34 if(!g_Git.CheckCleanWorkTree())
36 if(CMessageBox::Show(NULL, IDS_ERROR_NOCLEAN_STASH,IDS_APPNAME,MB_YESNO|MB_ICONINFORMATION)==IDYES)
38 CString cmd,out;
39 cmd=_T("git.exe stash");
40 if(g_Git.Run(cmd,&out,CP_ACP))
42 CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK);
43 return false;
46 }else
48 return false;
52 CRebaseDlg dlg;
54 dlg.m_PreCmd=_T("git.exe svn fetch");
56 CString cmd,out;
57 cmd = _T("git.exe config svn-remote.svn.fetch");
59 if(!g_Git.Run(cmd,&out,CP_ACP))
61 if(out.Left(5) == _T(":refs"))
62 out=out.Mid(6);
63 int start = 0;
64 out=out.Tokenize(_T("\n"),start);
67 dlg.m_Upstream=out;
69 if(dlg.DoModal() == IDOK)
71 bRet=true;
73 return bRet;