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.
20 #include "SVNRebaseCommand.h"
22 #include "SysProgressDlg.h"
23 #include "ProgressDlg.h"
24 #include "MessageBox.h"
25 #include "RenameDlg.h"
27 #include "ShellUpdater.h"
28 #include "rebasedlg.h"
30 bool SVNRebaseCommand::Execute()
34 if(!g_Git
.CheckCleanWorkTree())
36 if(CMessageBox::Show(NULL
, IDS_ERROR_NOCLEAN_STASH
,IDS_APPNAME
,MB_YESNO
|MB_ICONINFORMATION
)==IDYES
)
39 cmd
=_T("git.exe stash");
40 if(g_Git
.Run(cmd
,&out
,CP_ACP
))
42 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
);
54 // dlg.m_PreCmd=_T("git.exe svn fetch");
57 cmd
= _T("git.exe config svn-remote.svn.fetch");
59 if(!g_Git
.Run(cmd
,&out
,CP_ACP
))
61 int start
= out
.Find(_T(':'));
65 if(out
.Left(5) == _T(":refs"))
69 out
=out
.Tokenize(_T("\n"),start
);
72 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
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;
85 if(progress
.DoModal()!=IDOK
)
88 if(progress
.m_GitStatus
)
91 UpStreamNewHash
=g_Git
.GetHash(out
);
94 if(UpStreamNewHash
==HeadHash
)
96 CMessageBox::Show(NULL
,_T("Everything Updated"),_T("TortoiseGit"),MB_OK
);
98 askIfUserWantsToStashPop();
105 if(g_Git
.IsFastForward(CString(_T("HEAD")),out
))
107 cmd
.Format(_T("git.exe reset --hard %s"),out
);
108 if(g_Git
.Run(cmd
,&ff
,CP_ACP
))
110 CMessageBox::Show(NULL
,ff
,_T("TortoiseGit"),MB_OK
|MB_ICONERROR
);
114 CMessageBox::Show(NULL
,CString(_T("Fast Forward: "))+ff
,_T("TortoiseGit"),MB_OK
);
116 askIfUserWantsToStashPop();
123 if(dlg
.DoModal() == IDOK
)
130 void SVNRebaseCommand::askIfUserWantsToStashPop()
132 if(CMessageBox::Show(NULL
, IDS_DCOMMIT_STASH_POP
, IDS_APPNAME
, MB_YESNO
|MB_ICONINFORMATION
) == IDYES
)
135 cmd
=_T("git.exe stash pop");
136 if(g_Git
.Run(cmd
,&out
,CP_ACP
))
138 CMessageBox::Show(NULL
,out
,_T("TortoiseGit"), MB_OK
);