REBASE_EDIT,\r
REBASE_SQUASH_EDIT,\r
REBASE_SQUASH_CONFLICT,\r
+ REBASE_DONE,\r
};\r
\r
protected:\r
void LoadBranchInfo();\r
void FetchLogList();\r
void SetAllRebaseAction(int action);\r
+ void OnCancel();\r
\r
CRect m_DlgOrigRect;\r
CRect m_CommitListOrigRect;\r
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
\r
int CheckNextCommitIsSquash();\r
int GetCurrentCommitID();\r
+ int FinishRebase();\r
\r
public:\r
\r
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
+ CString m_PostButtonText;\r
\r
CSplitterControl m_wndSplitter;\r
CMFCTabCtrl m_ctrlTabCtrl;\r
\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
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