src/TortoiseProc/Commands/PullCommand.cpp

   1 // TortoiseGit - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2008-2012 - TortoiseGit
   4 // Copyright (C) 2007-2008 - TortoiseSVN
   5
   6 // This program is free software; you can redistribute it and/or
   7 // modify it under the terms of the GNU General Public License
   8 // as published by the Free Software Foundation; either version 2
   9 // of the License, or (at your option) any later version.
  10
  11 // This program is distributed in the hope that it will be useful,
  12 // but WITHOUT ANY WARRANTY; without even the implied warranty of
  13 // MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  14 // GNU General Public License for more details.
  15
  16 // You should have received a copy of the GNU General Public License
  17 // along with this program; if not, write to the Free Software Foundation,
  18 // 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  19 //
  20 #include "StdAfx.h"
  21 #include "PullCommand.h"
  22
  23 //#include "SVNProgressDlg.h"
  24 #include "StringUtils.h"
  25 #include "Hooks.h"
  26 #include "MessageBox.h"
  27 #include "PullFetchDlg.h"
  28 #include "ProgressDlg.h"
  29 #include "FileDiffDlg.h"
  30 #include "AppUtils.h"
  31 #include "LogDlg.h"
  32 #include "AppUtils.h"
  33 #include "ChangedDlg.h"
  34
  35 bool PullCommand::Execute()
  36 {
  37         if (!GitAdminDir().HasAdminDir(g_Git.m_CurrentDir)) {
  38                 CMessageBox::Show(hwndExplorer, IDS_NOWORKINGCOPY, IDS_APPNAME, MB_ICONERROR);
  39                 return false;
  40         }
  41
  42         CPullFetchDlg dlg;
  43         dlg.m_IsPull=TRUE;
  44         if(dlg.DoModal()==IDOK)
  45         {
  46                 CString url;
  47                 url=dlg.m_RemoteURL;
  48
  49                 if(dlg.m_bAutoLoad)
  50                 {
  51                         CAppUtils::LaunchPAgent(NULL,&dlg.m_RemoteURL);
  52                 }
  53
  54                 CString cmd;
  55                 CString hashOld;
  56                 try
  57                 {
  58                         hashOld = g_Git.GetHash(_T("HEAD"));
  59                 }
  60                 catch (char* msg)
  61                 {
  62                         CString err(msg);
  63                         MessageBox(NULL, _T("Could not get HEAD hash.\nlibgit reports:\n") + err, _T("TortoiseGit"), MB_ICONERROR);
  64                         ExitProcess(1);
  65                 }
  66                 CString cmdRebase;
  67                 if(dlg.m_bRebase)
  68                         cmdRebase = "--rebase ";
  69
  70                 CString noff;
  71                 CString ffonly;
  72                 CString squash;
  73                 CString nocommit;
  74                 if(dlg.m_bNoFF)
  75                         noff=_T("--no-ff");
  76
  77                 if (dlg.m_bFFonly)
  78                         ffonly = _T("--ff-only");
  79
  80                 if(dlg.m_bSquash)
  81                         squash=_T("--squash");
  82
  83                 if(dlg.m_bNoCommit)
  84                         nocommit=_T("--no-commit");
  85
  86                 int ver = CAppUtils::GetMsysgitVersion();
  87
  88                 if(ver >= 0x01070203) //above 1.7.0.2
  89                         cmdRebase += _T("--progress ");
  90
  91                 cmd.Format(_T("git.exe pull -v %s %s %s %s %s \"%s\" %s"), cmdRebase, noff, ffonly, squash, nocommit, url, dlg.m_RemoteBranchName);
  92                 CProgressDlg progress;
  93                 progress.m_GitCmd = cmd;
  94                 progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_PROC_PULL_DIFFS)));
  95                 progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_PROC_PULL_LOG)));
  96
  97                 CTGitPath gitPath = g_Git.m_CurrentDir;
  98                 if (gitPath.HasSubmodules())
  99                         progress.m_PostCmdList.Add(CString(MAKEINTRESOURCE(IDS_PROC_SUBMODULESUPDATE)));
 100
 101                 //progress.m_PostCmdList.Add(_T("Show Conflict"));
 102
 103                 if (parser.HasVal(_T("closeonend")))
 104                         progress.m_bAutoCloseOnSuccess = !!parser.GetLongVal(_T("closeonend"));
 105
 106                 int ret = progress.DoModal();
 107
 108                 if (ret == IDOK && progress.m_GitStatus == 1 && progress.m_LogText.Find(_T("CONFLICT")) >= 0 && CMessageBox::Show(NULL, IDS_SEECHANGES, IDS_APPNAME, MB_YESNO | MB_ICONINFORMATION) == IDYES)
 109                 {
 110                         CChangedDlg dlg;
 111                         dlg.m_pathList.AddPath(CTGitPath());
 112                         dlg.DoModal();
 113
 114                         return FALSE;
 115                 }
 116
 117                 CString hashNew = g_Git.GetHash(L"HEAD");
 118
 119                 if( ret == IDC_PROGRESS_BUTTON1)
 120                 {
 121                         if(hashOld == hashNew)
 122                         {
 123                                 if(progress.m_GitStatus == 0)
 124                                         CMessageBox::Show(NULL, IDS_UPTODATE, IDS_APPNAME, MB_OK | MB_ICONINFORMATION);
 125                                 return TRUE;
 126                         }
 127
 128                         CFileDiffDlg dlg;
 129                         dlg.SetDiff(NULL, hashNew, hashOld);
 130                         dlg.DoModal();
 131
 132                         return TRUE;
 133                 }
 134                 else if ( ret == IDC_PROGRESS_BUTTON1 +1 )
 135                 {
 136                         if(hashOld == hashNew)
 137                         {
 138                                 if(progress.m_GitStatus == 0)
 139                                         CMessageBox::Show(NULL, IDS_UPTODATE, IDS_APPNAME, MB_OK | MB_ICONINFORMATION);
 140                                 return TRUE;
 141                         }
 142
 143
 144                         CLogDlg dlg;
 145
 146                         //dlg.SetParams(cmdLinePath);
 147                         dlg.SetParams(CTGitPath(_T("")),CTGitPath(_T("")),_T(""), hashOld, hashNew, 0);
 148                         //      dlg.SetIncludeMerge(!!parser.HasKey(_T("merge")));
 149                         //      val = parser.GetVal(_T("propspath"));
 150                         //      if (!val.IsEmpty())
 151                         //              dlg.SetProjectPropertiesPath(CTSVNPath(val));
 152                         dlg.DoModal();
 153
 154
 155                 }
 156                 else if (ret == IDC_PROGRESS_BUTTON1 + 2 && gitPath.HasSubmodules())
 157                 {
 158                         CString sCmd;
 159                         sCmd.Format(_T("/command:subupdate /bkpath:\"%s\""), g_Git.m_CurrentDir);
 160
 161                         CAppUtils::RunTortoiseProc(sCmd);
 162                 }
 163         }
 164
 165         return FALSE;
 166 }