OSDN Git Service

Fixed issue #116: SVN Rebase doesn't work
authorFrank Li <lznuaa@gmail.com>
Mon, 13 Jul 2009 16:00:33 +0000 (00:00 +0800)
committerFrank Li <lznuaa@gmail.com>
Mon, 13 Jul 2009 16:00:33 +0000 (00:00 +0800)
Signed-off-by: Frank Li <lznuaa@gmail.com>
src/TortoiseProc/Commands/SVNRebaseCommand.cpp
src/TortoiseProc/RebaseDlg.cpp

index 0dcfc05..09ee763 100644 (file)
@@ -51,7 +51,7 @@ bool SVNRebaseCommand::Execute()
 \r
        CRebaseDlg dlg;\r
        \r
 \r
        CRebaseDlg dlg;\r
        \r
-       dlg.m_PreCmd=_T("git.exe fetch");\r
+       dlg.m_PreCmd=_T("git.exe svn fetch");\r
        dlg.m_Upstream=_T("remotes/trunk");\r
 \r
        if(dlg.DoModal() == IDOK)\r
        dlg.m_Upstream=_T("remotes/trunk");\r
 \r
        if(dlg.DoModal() == IDOK)\r
index 74aaf91..7772a95 100644 (file)
@@ -8,6 +8,7 @@
 #include "MessageBox.h"\r
 #include "UnicodeUtils.h"\r
 #include "BrowseRefsDlg.h"\r
 #include "MessageBox.h"\r
 #include "UnicodeUtils.h"\r
 #include "BrowseRefsDlg.h"\r
+#include "ProgressDlg.h"\r
 // CRebaseDlg dialog\r
 \r
 IMPLEMENT_DYNAMIC(CRebaseDlg, CResizableStandAloneDialog)\r
 // CRebaseDlg dialog\r
 \r
 IMPLEMENT_DYNAMIC(CRebaseDlg, CResizableStandAloneDialog)\r
@@ -175,6 +176,14 @@ BOOL CRebaseDlg::OnInitDialog()
 \r
        this->SetControlEnable();\r
 \r
 \r
        this->SetControlEnable();\r
 \r
+       if(!this->m_PreCmd.IsEmpty())\r
+       {\r
+               CProgressDlg progress;\r
+               progress.m_GitCmd=m_PreCmd;\r
+               progress.m_bAutoCloseOnSuccess=true;\r
+               progress.DoModal();\r
+       }\r
+\r
        if(m_IsCherryPick)\r
        {\r
                this->m_BranchCtrl.SetCurSel(-1);\r
        if(m_IsCherryPick)\r
        {\r
                this->m_BranchCtrl.SetCurSel(-1);\r