ProgressDlg, Pull: Took m_GitStatus into account for detecting problems.
[TortoiseGit.git] / src / TortoiseProc / Commands / PullCommand.cpp
blob33c69788c1665a935c15e3f9ecf43ce44c72d50c
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 "PullCommand.h"
22 //#include "SVNProgressDlg.h"
23 #include "StringUtils.h"
24 #include "Hooks.h"
25 #include "MessageBox.h"
26 #include "PullFetchDlg.h"
27 #include "ProgressDlg.h"
28 #include "FileDiffDlg.h"
30 bool PullCommand::Execute()
32 CPullFetchDlg dlg;
33 dlg.m_IsPull=TRUE;
34 if(dlg.DoModal()==IDOK)
36 CString url;
37 url=dlg.m_RemoteURL;
38 CString cmd;
39 CString hashOld = g_Git.GetHash(L"HEAD");
40 cmd.Format(_T("git.exe pull \"%s\" %s"),url,dlg.m_RemoteBranchName);
41 CProgressDlg progress;
42 progress.m_GitCmd = cmd;
43 progress.m_bAutoCloseOnSuccess = true;
44 if(progress.DoModal()==IDOK)
46 CString hashNew = g_Git.GetHash(L"HEAD");
48 if(hashOld == hashNew)
50 if(progress.m_GitStatus == 0)
51 CMessageBox::Show(NULL, L"Already up to date.", L"Pull", MB_OK | MB_ICONINFORMATION);
52 return TRUE;
55 CFileDiffDlg dlg;
56 dlg.SetDiff(NULL, hashNew, hashOld);
57 dlg.DoModal();
59 return TRUE;
62 #if 0
63 CCloneDlg dlg;
64 dlg.m_Directory=this->orgCmdLinePath.GetWinPathString();
65 if(dlg.DoModal()==IDOK)
67 CString dir=dlg.m_Directory;
68 CString url=dlg.m_URL;
69 CString cmd;
70 cmd.Format(_T("git.exe clone %s %s"),
71 url,
72 dir);
73 CProgressDlg progress;
74 progress.m_GitCmd=cmd;
75 if(progress.DoModal()==IDOK)
76 return TRUE;
79 #endif
80 return FALSE;