OSDN Git Service

Fixed issue #155: Fix SVN Rebase sets upstream as remotes/trunk
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / Commands / FetchCommand.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 "FetchCommand.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 "AppUtils.h"\r
29 #include "RebaseDlg.h"\r
30 \r
31 bool FetchCommand::Execute()\r
32 {\r
33         CPullFetchDlg dlg;\r
34         dlg.m_IsPull=FALSE;\r
35 \r
36         if(dlg.DoModal()==IDOK)\r
37         {\r
38                 if(dlg.m_bAutoLoad)\r
39                 {\r
40                         CAppUtils::LaunchPAgent(NULL,&dlg.m_RemoteURL);\r
41                 }\r
42 \r
43                 CString url;\r
44                 url=dlg.m_RemoteURL;\r
45                 CString cmd;\r
46                 cmd.Format(_T("git.exe fetch \"%s\" %s"),url, dlg.m_RemoteBranchName);\r
47                 CProgressDlg progress;\r
48 \r
49                 if(!dlg.m_bRebase)\r
50                 {\r
51                         progress.m_changeAbortButtonOnSuccessTo=_T("&Rebase");\r
52                 }else\r
53                 {\r
54                         progress.m_bAutoCloseOnSuccess = true;\r
55                 }\r
56 \r
57                 progress.m_GitCmd=cmd;\r
58                 int userResponse=progress.DoModal();\r
59 \r
60                 if( (userResponse==IDC_PROGRESS_BUTTON1) || ( progress.m_GitStatus ==0 && dlg.m_bRebase) )\r
61                 {\r
62                         CRebaseDlg dlg;\r
63                         dlg.m_PostButtonText=_T("Email &Patch...");\r
64                         int response = dlg.DoModal();\r
65                         if(response == IDOK)\r
66                         {\r
67                                 return TRUE;\r
68                         }\r
69                         if(response == IDC_REBASE_POST_BUTTON)\r
70                         {\r
71                                 CString cmd,out;\r
72                                 cmd.Format(_T("git.exe  format-patch -o \"%s\" %s..%s"),\r
73                                         g_Git.m_CurrentDir,\r
74                                         dlg.m_Upstream,dlg.m_Branch);\r
75                                 if(g_Git.Run(cmd,&out,CP_ACP))\r
76                                 {\r
77                                         CMessageBox::Show(NULL,out,_T("TortoiseGit"),MB_OK|MB_ICONERROR);\r
78                                         return FALSE;\r
79                                 }\r
80 \r
81                                 CAppUtils::SendPatchMail(cmd,out);\r
82                         }\r
83                         return TRUE;\r
84                 }\r
85         }\r
86 #if 0\r
87         CCloneDlg dlg;\r
88         dlg.m_Directory=this->orgCmdLinePath.GetWinPathString();\r
89         if(dlg.DoModal()==IDOK)\r
90         {\r
91                 CString dir=dlg.m_Directory;\r
92                 CString url=dlg.m_URL;\r
93                 CString cmd;\r
94                 cmd.Format(_T("git.exe clone %s %s"),\r
95                                                 url,\r
96                                                 dir);\r
97                 CProgressDlg progress;\r
98                 progress.m_GitCmd=cmd;\r
99                 if(progress.DoModal()==IDOK)\r
100                         return TRUE;\r
101                 \r
102         }\r
103 #endif\r
104         return FALSE;\r
105 }\r