merge original branch.

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

diff --git a/src/TortoiseProc/SyncDlg.cpp b/src/TortoiseProc/SyncDlg.cpp
index 3869925..5ac5dc8 100644 (file)
--- a/src/TortoiseProc/SyncDlg.cpp
+++ b/src/TortoiseProc/SyncDlg.cpp
@@ -190,7 +190,24 @@ void CSyncDlg::OnBnClickedButtonPull()
                }\r
        }\r
 \r
+       ///Remote Update\r
+       if(CurrentEntry == 3)\r
+       {\r
+               m_CurrentCmd = GIT_COMMAND_REMOTE;\r
+               cmd=_T("git.exe remote update");\r
+               m_GitCmdList.push_back(cmd);\r
 \r
+               m_pThread = AfxBeginThread(ProgressThreadEntry, this, THREAD_PRIORITY_NORMAL,0,CREATE_SUSPENDED);\r
+               if (m_pThread==NULL)\r
+               {\r
+               //              ReportError(CString(MAKEINTRESOURCE(IDS_ERR_THREADSTARTFAILED)));\r
+               }\r
+               else\r
+               {\r
+                       m_pThread->m_bAutoDelete = TRUE;\r
+                       m_pThread->ResumeThread();\r
+               }\r
+       }\r
        \r
 }\r
 \r
@@ -631,6 +648,7 @@ BOOL CSyncDlg::OnInitDialog()
        this->m_ctrlPull.AddEntry(CString(_T("&Pull")));\r
        this->m_ctrlPull.AddEntry(CString(_T("Fetc&h")));\r
        this->m_ctrlPull.AddEntry(CString(_T("Fetch&&Re&base")));\r
+       this->m_ctrlPull.AddEntry(CString(_T("Remote Update")));\r
 \r
        this->m_ctrlSubmodule.AddEntry(CString(_T("Submodule Update")));\r
        this->m_ctrlSubmodule.AddEntry(CString(_T("Submodule Init")));\r
@@ -837,6 +855,12 @@ LRESULT CSyncDlg::OnProgressUpdateUI(WPARAM wParam,LPARAM lParam)
                        EnableControlButton(true);\r
                        SwitchToInput();\r
                }\r
+               if(this->m_CurrentCmd == GIT_COMMAND_REMOTE)\r
+               {\r
+                       this->FetchOutList(true);\r
+                       EnableControlButton(true);\r
+                       SwitchToInput();\r
+               }\r
        }\r
 \r
        if(lParam != 0)\r