Correct Handle case when patch file is not in repository path.
[TortoiseGit.git] / src / TortoiseProc / Commands / ImportPatchCommand.cpp
blobf289e7378b33b4c82d8dfa1a2229e3864de957c2
1 // TortoiseSVN - a Windows shell extension for easy version control
3 // Copyright (C) 2007-2008 - TortoiseSVN
5 // This program is free software; you can redistribute it and/or
6 // modify it under the terms of the GNU General Public License
7 // as published by the Free Software Foundation; either version 2
8 // of the License, or (at your option) any later version.
10 // This program is distributed in the hope that it will be useful,
11 // but WITHOUT ANY WARRANTY; without even the implied warranty of
12 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 // GNU General Public License for more details.
15 // You should have received a copy of the GNU General Public License
16 // along with this program; if not, write to the Free Software Foundation,
17 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
19 #include "StdAfx.h"
20 #include "ImportPatchCommand.h"
22 #include "MessageBox.h"
23 #include "ImportPatchDlg.h"
24 #include "InputLogDlg.h"
25 #include "Git.h"
26 #include "DirFileEnum.h"
27 #include "ShellUpdater.h"
28 #include "AppUtils.h"
30 bool ImportPatchCommand::Execute()
32 CImportPatchDlg dlg;
33 // dlg.m_bIsTag=TRUE;
34 CString cmd;
35 CString output;
37 if(!this->orgCmdLinePath.IsAdminDir())
39 CString str=CAppUtils::ChooseRepository((CString*)&orgCmdLinePath.GetWinPathString());
40 CTGitPath path;
41 path.SetFromWin(str);
43 if(!path.HasAdminDir())
45 CString format;
46 format.LoadString(IDS_ERR_NOT_REPOSITORY);
47 CString err;
48 err.Format(format,str);
49 CMessageBox::Show(NULL,err,_T("TortoiseGit"),MB_OK|MB_ICONERROR);
50 return FALSE;
52 g_Git.m_CurrentDir=str;
55 for(int i=0;i<this->pathList.GetCount();i++)
57 if(!pathList[i].IsDirectory())
59 dlg.m_PathList.AddPath(pathList[i]);
63 if(dlg.DoModal()==IDOK)
65 for(int i=0;i<dlg.m_PathList.GetCount();i++)
67 cmd.Format(_T("git.exe am \"%s\""),dlg.m_PathList[i].GetGitPathString());
69 if(g_Git.Run(cmd,&output,CP_ACP))
71 CMessageBox::Show(NULL,output,_T("TortoiseGit"),MB_OK);
72 return FALSE;
76 CMessageBox::Show(NULL,CString(_T("Patch applied: "))+output,_T("TortoiseGit"),MB_OK);
77 return TRUE;
80 return FALSE;