Add url error message at syncdlg

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

diff --git a/src/TortoiseProc/SyncDlg.cpp b/src/TortoiseProc/SyncDlg.cpp
index 2ba67e9..0d5c108 100644 (file)
--- a/src/TortoiseProc/SyncDlg.cpp
+++ b/src/TortoiseProc/SyncDlg.cpp
@@ -63,6 +63,8 @@ BEGIN_MESSAGE_MAP(CSyncDlg, CResizableStandAloneDialog)
        ON_BN_CLICKED(IDC_BUTTON_EMAIL, &CSyncDlg::OnBnClickedButtonEmail)\r
        ON_BN_CLICKED(IDC_BUTTON_MANAGE, &CSyncDlg::OnBnClickedButtonManage)\r
        BRANCH_COMBOX_EVENT\r
+       ON_NOTIFY(CBEN_ENDEDIT, IDC_COMBOBOXEX_URL, &CSyncDlg::OnCbenEndeditComboboxexUrl)\r
+       ON_CBN_EDITCHANGE(IDC_COMBOBOXEX_URL, &CSyncDlg::OnCbnEditchangeComboboxexUrl)\r
 END_MESSAGE_MAP()\r
 \r
 \r
@@ -108,6 +110,29 @@ BOOL CSyncDlg::OnInitDialog()
        }\r
        m_ctrlTabCtrl.SetResizeMode(CMFCTabCtrl::RESIZE_NO);\r
 \r
+       DWORD dwStyle =LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | LVS_OWNERDATA | WS_BORDER | WS_TABSTOP;\r
+\r
+       if( !m_OutLogList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_OUT_LOGLIST))\r
+       {\r
+               TRACE0("Failed to create output commits window\n");\r
+               return FALSE;      // fail to create\r
+\r
+       }\r
+       m_ctrlTabCtrl.InsertTab(&m_OutLogList,_T("Out Commits"),0);\r
+\r
+       m_OutLogList.InsertGitColumn();\r
+\r
+       dwStyle = LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP |LVS_SINGLESEL |WS_CHILD | WS_VISIBLE;\r
+       \r
+       if( !m_OutChangeFileList.Create(dwStyle,rectDummy,&m_ctrlTabCtrl,IDC_OUT_CHANGELIST))\r
+       {\r
+               TRACE0("Failed to create output change files window\n");\r
+               return FALSE;      // fail to create\r
+       }\r
+       m_ctrlTabCtrl.InsertTab(&m_OutChangeFileList,_T("Out ChangeList"),1);\r
+\r
+       m_OutChangeFileList.Init(SVNSLC_COLEXT | SVNSLC_COLSTATUS |SVNSLC_COLADD|SVNSLC_COLDEL , _T("RebaseDlg"),(SVNSLC_POPALL ^ SVNSLC_POPCOMMIT),false);\r
+\r
        this->m_tooltips.Create(this);\r
 \r
        AddAnchor(IDC_SYNC_TAB,TOP_LEFT,BOTTOM_RIGHT);\r
@@ -163,6 +188,8 @@ BOOL CSyncDlg::OnInitDialog()
        EnableSaveRestore(_T("SyncDlg"));\r
 \r
        this->LoadBranchInfo();\r
+\r
+       \r
        return TRUE;  // return TRUE unless you set the focus to a control\r
        // EXCEPTION: OCX Property Pages should return FALSE\r
 }\r
@@ -179,3 +206,71 @@ BOOL CSyncDlg::PreTranslateMessage(MSG* pMsg)
        m_tooltips.RelayEvent(pMsg);\r
        return __super::PreTranslateMessage(pMsg);\r
 }\r
+void CSyncDlg::FetchOutList()\r
+{\r
+       m_OutChangeFileList.Clear();\r
+       this->m_OutLogList.Clear();\r
+\r
+       CString remote;\r
+       this->m_ctrlURL.GetWindowText(remote);\r
+       CString remotebranch;\r
+       this->m_ctrlRemoteBranch.GetWindowText(remotebranch);\r
+       remotebranch=remote+_T("/")+remotebranch;\r
+\r
+       if(IsURL())\r
+       {\r
+               CString str;\r
+               str=_T("Don't know what will push befause you enter URL");\r
+               m_OutLogList.ShowText(str);\r
+               this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,FALSE);\r
+               m_OutLocalBranch.Empty();\r
+               m_OutRemoteBranch.Empty();\r
+               return ;\r
+       \r
+       }else if(g_Git.GetHash(remotebranch).GetLength()<40)\r
+       {\r
+               CString str;\r
+               str.Format(_T("Don't know what will push befause unkown \"%s\""),remotebranch);\r
+               m_OutLogList.ShowText(str);\r
+               this->m_ctrlTabCtrl.ShowTab(m_OutChangeFileList.GetDlgCtrlID()-1,FALSE);\r
+               m_OutLocalBranch.Empty();\r
+               m_OutRemoteBranch.Empty();\r
+               return ;\r
+       }\r
+       else\r
+       {\r
+               CString localbranch;\r
+               localbranch=this->m_ctrlLocalBranch.GetString();\r
+\r
+               if(localbranch != m_OutLocalBranch && m_OutRemoteBranch != remotebranch)\r
+               {\r
+                       m_OutLogList.ClearText();\r
+                       m_OutLogList.FillGitLog(NULL,CGit::     LOG_INFO_STAT| CGit::LOG_INFO_FILESTATE | CGit::LOG_INFO_SHOW_MERGEDFILE,\r
+                               &remotebranch,&localbranch);\r
+               }\r
+               this->m_OutLocalBranch=localbranch;\r
+               this->m_OutRemoteBranch=remotebranch;\r
+       }\r
+\r
+}\r
+\r
+bool CSyncDlg::IsURL()\r
+{\r
+       CString str;\r
+       this->m_ctrlURL.GetWindowText(str);\r
+       if(str.Find(_T('\\'))>=0 || str.Find(_T('/'))>=0)\r
+               return true;\r
+       else\r
+               return false;\r
+}\r
+void CSyncDlg::OnCbenEndeditComboboxexUrl(NMHDR *pNMHDR, LRESULT *pResult)\r
+{\r
+       // TODO: Add your control notification handler code here\r
+       *pResult = 0;\r
+}\r
+\r
+void CSyncDlg::OnCbnEditchangeComboboxexUrl()\r
+{\r
+       this->FetchOutList();\r
+       // TODO: Add your control notification handler code here\r
+}\r