Fixed issue #187: Allow start new rebase after finish rebase

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / RebaseDlg.h

diff --git a/src/TortoiseProc/RebaseDlg.h b/src/TortoiseProc/RebaseDlg.h
index af18158..19e818f 100644 (file)
--- a/src/TortoiseProc/RebaseDlg.h
+++ b/src/TortoiseProc/RebaseDlg.h
@@ -8,6 +8,7 @@
 #include "HistoryCombo.h"\r
 #include "Balloon.h"\r
 #include "GitLogList.h"\r
+#include "MenuButton.h"\r
 // CRebaseDlg dialog\r
 #define IDC_REBASE_TAB 0x1000000\r
 \r
@@ -37,6 +38,10 @@ public:
                REBASE_ABORT,\r
                REBASE_FINISH,\r
                REBASE_CONFLICT,\r
+               REBASE_EDIT,\r
+               REBASE_SQUASH_EDIT,\r
+               REBASE_SQUASH_CONFLICT,\r
+               REBASE_DONE,\r
        };\r
 \r
 protected:\r
@@ -55,6 +60,7 @@ protected:
        void LoadBranchInfo();\r
        void FetchLogList();\r
        void SetAllRebaseAction(int action);\r
+       void OnCancel();\r
 \r
        CRect                           m_DlgOrigRect;\r
        CRect                           m_CommitListOrigRect;\r
@@ -72,9 +78,22 @@ protected:
        static UINT RebaseThreadEntry(LPVOID pVoid){return ((CRebaseDlg *)pVoid)->RebaseThread();};\r
        BOOL IsEnd();\r
 \r
+       BOOL m_IsFastForward;\r
+\r
        CString m_OrigBranchHash;\r
        CString m_OrigUpstreamHash;\r
 \r
+       int VerifyNoConflict();\r
+       CString GetRebaseModeName(int rebasemode);\r
+\r
+       CString m_SquashMessage;\r
+\r
+       int CheckNextCommitIsSquash();\r
+       int GetCurrentCommitID();\r
+       int FinishRebase();\r
+\r
+       CMenuButton m_PostButton;\r
+\r
 public:\r
    \r
     afx_msg void OnBnClickedPickAll();\r
@@ -91,9 +110,14 @@ public:
     CStatic m_CtrlStatusText;\r
        CBalloon                        m_tooltips;\r
 \r
+       CString m_PreCmd;\r
+\r
     BOOL m_bPickAll;\r
     BOOL m_bSquashAll;\r
     BOOL m_bEditAll;\r
+       \r
+       BOOL m_bForce;\r
+       CStringArray m_PostButtonTexts;\r
 \r
        CSplitterControl        m_wndSplitter;\r
        CMFCTabCtrl m_ctrlTabCtrl;\r
@@ -104,6 +128,11 @@ public:
 \r
        CHistoryCombo m_BranchCtrl;\r
        CHistoryCombo m_UpstreamCtrl;\r
+       \r
+       CString           m_Upstream;\r
+       CString           m_Branch;\r
+\r
+       BOOL              m_IsCherryPick;\r
 \r
        REBASE_STAGE       m_RebaseStage;\r
 \r
@@ -114,4 +143,8 @@ public:
        int  m_CurrentRebaseIndex;\r
        int  StateAction();\r
        int  GoNext();\r
+       afx_msg void OnBnClickedButtonBrowse();\r
+       afx_msg void OnBnClickedRebaseCheckForce();\r
+       afx_msg void OnStnClickedStatusStatic();\r
+       afx_msg void OnBnClickedRebasePostButton();\r
 };\r