OSDN Git Service

Fixed issue #155: Fix SVN Rebase sets upstream as remotes/trunk
[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 #include "AppUtils.h"\r
30 \r
31 bool PullCommand::Execute()\r
32 {\r
33         CPullFetchDlg dlg;\r
34         dlg.m_IsPull=TRUE;\r
35         if(dlg.DoModal()==IDOK)\r
36         {\r
37                 CString url;\r
38                 url=dlg.m_RemoteURL;\r
39 \r
40                 if(dlg.m_bAutoLoad)\r
41                 {\r
42                         CAppUtils::LaunchPAgent(NULL,&dlg.m_RemoteURL);\r
43                 }\r
44                 \r
45                 CString cmd;\r
46                 CString hashOld = g_Git.GetHash(L"HEAD");\r
47                 CString cmdRebase;\r
48                 if(dlg.m_bRebase)\r
49                         cmdRebase = "--rebase ";\r
50                 cmd.Format(_T("git.exe pull %s\"%s\" %s"),cmdRebase, url, dlg.m_RemoteBranchName);\r
51                 CProgressDlg progress;\r
52                 progress.m_GitCmd = cmd;\r
53                 progress.m_bAutoCloseOnSuccess = true;\r
54                 if(progress.DoModal()==IDOK)\r
55                 {\r
56                         CString hashNew = g_Git.GetHash(L"HEAD");\r
57 \r
58                         if(hashOld == hashNew)\r
59                         {\r
60                                 if(progress.m_GitStatus == 0)\r
61                                         CMessageBox::Show(NULL, L"Already up to date.", L"Pull", MB_OK | MB_ICONINFORMATION);\r
62                                 return TRUE;\r
63                         }\r
64 \r
65                         CFileDiffDlg dlg;\r
66                         dlg.SetDiff(NULL, hashNew, hashOld);\r
67                         dlg.DoModal();\r
68 \r
69                         return TRUE;\r
70                 }\r
71         }\r
72 #if 0\r
73         CCloneDlg dlg;\r
74         dlg.m_Directory=this->orgCmdLinePath.GetWinPathString();\r
75         if(dlg.DoModal()==IDOK)\r
76         {\r
77                 CString dir=dlg.m_Directory;\r
78                 CString url=dlg.m_URL;\r
79                 CString cmd;\r
80                 cmd.Format(_T("git.exe clone %s %s"),\r
81                                                 url,\r
82                                                 dir);\r
83                 CProgressDlg progress;\r
84                 progress.m_GitCmd=cmd;\r
85                 if(progress.DoModal()==IDOK)\r
86                         return TRUE;\r
87                 \r
88         }\r
89 #endif\r
90         return FALSE;\r
91 }\r