OSDN Git Service

ProgressDlg, Pull: Took m_GitStatus into account for detecting problems.
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / Commands / PullCommand.cpp
1 // TortoiseSVN - a Windows shell extension for easy version control\r
2 \r
3 // Copyright (C) 2007-2008 - TortoiseSVN\r
4 \r
5 // This program is free software; you can redistribute it and/or\r
6 // modify it under the terms of the GNU General Public License\r
7 // as published by the Free Software Foundation; either version 2\r
8 // of the License, or (at your option) any later version.\r
9 \r
10 // This program is distributed in the hope that it will be useful,\r
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of\r
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
13 // GNU General Public License for more details.\r
14 \r
15 // You should have received a copy of the GNU General Public License\r
16 // along with this program; if not, write to the Free Software Foundation,\r
17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.\r
18 //\r
19 #include "StdAfx.h"\r
20 #include "PullCommand.h"\r
21 \r
22 //#include "SVNProgressDlg.h"\r
23 #include "StringUtils.h"\r
24 #include "Hooks.h"\r
25 #include "MessageBox.h"\r
26 #include "PullFetchDlg.h"\r
27 #include "ProgressDlg.h"\r
28 #include "FileDiffDlg.h"\r
29 \r
30 bool PullCommand::Execute()\r
31 {\r
32         CPullFetchDlg dlg;\r
33         dlg.m_IsPull=TRUE;\r
34         if(dlg.DoModal()==IDOK)\r
35         {\r
36                 CString url;\r
37                 url=dlg.m_RemoteURL;\r
38                 CString cmd;\r
39                 CString hashOld = g_Git.GetHash(L"HEAD");\r
40                 cmd.Format(_T("git.exe pull \"%s\" %s"),url,dlg.m_RemoteBranchName);\r
41                 CProgressDlg progress;\r
42                 progress.m_GitCmd = cmd;\r
43                 progress.m_bAutoCloseOnSuccess = true;\r
44                 if(progress.DoModal()==IDOK)\r
45                 {\r
46                         CString hashNew = g_Git.GetHash(L"HEAD");\r
47 \r
48                         if(hashOld == hashNew)\r
49                         {\r
50                                 if(progress.m_GitStatus == 0)\r
51                                         CMessageBox::Show(NULL, L"Already up to date.", L"Pull", MB_OK | MB_ICONINFORMATION);\r
52                                 return TRUE;\r
53                         }\r
54 \r
55                         CFileDiffDlg dlg;\r
56                         dlg.SetDiff(NULL, hashNew, hashOld);\r
57                         dlg.DoModal();\r
58 \r
59                         return TRUE;\r
60                 }\r
61         }\r
62 #if 0\r
63         CCloneDlg dlg;\r
64         dlg.m_Directory=this->orgCmdLinePath.GetWinPathString();\r
65         if(dlg.DoModal()==IDOK)\r
66         {\r
67                 CString dir=dlg.m_Directory;\r
68                 CString url=dlg.m_URL;\r
69                 CString cmd;\r
70                 cmd.Format(_T("git.exe clone %s %s"),\r
71                                                 url,\r
72                                                 dir);\r
73                 CProgressDlg progress;\r
74                 progress.m_GitCmd=cmd;\r
75                 if(progress.DoModal()==IDOK)\r
76                         return TRUE;\r
77                 \r
78         }\r
79 #endif\r
80         return FALSE;\r
81 }\r