SyncDlg Show Conflict when pull

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

diff --git a/src/TortoiseProc/SyncDlg.h b/src/TortoiseProc/SyncDlg.h
index 7f54c3b..32957a9 100644 (file)
--- a/src/TortoiseProc/SyncDlg.h
+++ b/src/TortoiseProc/SyncDlg.h
@@ -34,8 +34,9 @@
 #define IDC_CMD_LOG                    0x1\r
 #define IDC_IN_LOGLIST         0x2\r
 #define IDC_IN_CHANGELIST      0x3\r
-#define IDC_OUT_LOGLIST                0x4\r
-#define IDC_OUT_CHANGELIST     0x5\r
+#define IDC_IN_CONFLICT                0x4\r
+#define IDC_OUT_LOGLIST                0x5\r
+#define IDC_OUT_CHANGELIST     0x6\r
 \r
 class CSyncDlg : public CResizableStandAloneDialog,public CBranchCombox\r
 {\r
@@ -71,6 +72,7 @@ protected:
        CGitStatusListCtrl m_OutChangeFileList;\r
        CGitStatusListCtrl m_InChangeFileList;\r
        CGitStatusListCtrl m_ConflictFileList;\r
+       \r
        CRichEditCtrl      m_ctrlCmdOut;\r
 \r
        CTGitPathList   m_arOutChangeList;\r
@@ -112,6 +114,8 @@ protected:
        CString m_OutLocalBranch;\r
        CString m_OutRemoteBranch;\r
        \r
+       CString m_oldHash;\r
+\r
        void ShowProgressCtrl(bool bShow=true);\r
        void ShowInputCtrl(bool bShow=true);\r
        void SwitchToRun(){ShowProgressCtrl(true);ShowInputCtrl(false);EnableControlButton(false);}\r
@@ -119,6 +123,14 @@ protected:
        \r
        LRESULT OnProgressUpdateUI(WPARAM wParam,LPARAM lParam);\r
 \r
+       void UpateCombox()\r
+       {\r
+               this->m_strLocalBranch = this->m_ctrlLocalBranch.GetString();\r
+               this->m_ctrlRemoteBranch.GetWindowText(this->m_strRemoteBranch);\r
+               this->m_ctrlURL.GetWindowText(this->m_strURL);\r
+               m_strRemoteBranch=m_strRemoteBranch.Trim();\r
+       }\r
+\r
        void AddDiffFileList(CGitStatusListCtrl *pCtrlList, CTGitPathList *pGitList,\r
                                                        CString &rev1,CString &rev2)\r
        {\r
@@ -130,6 +142,8 @@ protected:
                return;\r
        }\r
 \r
+       void PullComplete();\r
+\r
        DECLARE_MESSAGE_MAP()\r
 public:\r
        BOOL m_bAutoLoadPuttyKey;\r
@@ -157,4 +171,5 @@ public:
        afx_msg void OnCbnEditchangeComboboxexUrl();\r
 \r
        void EnableControlButton(bool bEnabled=true);\r
+       afx_msg void OnBnClickedButtonCommit();\r
 };\r