src/TortoiseProc/Commands/MergeCommand.cpp

   1 // TortoiseSVN - a Windows shell extension for easy version control
   2
   3 // Copyright (C) 2007-2008 - TortoiseSVN
   4
   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.
   9
  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.
  14
  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.
  18 //
  19 #include "StdAfx.h"
  20 #include "MergeCommand.h"
  21 #include "git.h"
  22 #include "MergeDlg.h"
  23 #include "MessageBox.h"
  24
  25 bool MergeCommand::Execute()
  26 {
  27         CMergeDlg dlg;
  28         if(dlg.DoModal()==IDOK)
  29         {
  30                 CString cmd;
  31                 CString noff;
  32                 CString squash;
  33
  34                 if(dlg.m_bNoFF)
  35                         noff=_T("--no-ff");
  36
  37                 if(dlg.m_bSquash)
  38                         squash=_T("--squash");
  39
  40                 cmd.Format(_T("git.exe merge %s %s %s"),
  41                         noff,
  42                         squash,
  43                         dlg.m_VersionName);
  44
  45                 CString output;
  46                 g_Git.Run(cmd,&output,CP_ACP);
  47
  48                 CMessageBox::Show(NULL,output,_T("TortoiseGit"),MB_OK);
  49         }
  50         return false;
  51 }