1 // TortoiseSVN - a Windows shell extension for easy version control
\r
3 // Copyright (C) 2007-2008 - TortoiseSVN
\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
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
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
20 #include "ResolveCommand.h"
\r
22 #include "ResolveDlg.h"
\r
23 #include "SVNProgressDlg.h"
\r
25 bool ResolveCommand::Execute()
\r
28 dlg.m_pathList = pathList;
\r
30 if (!parser.HasKey(_T("noquestion")))
\r
31 ret = dlg.DoModal();
\r
34 if (dlg.m_pathList.GetCount())
\r
37 CGitProgressDlg progDlg(CWnd::FromHandle(hWndExplorer));
\r
38 theApp.m_pMainWnd = &progDlg;
\r
39 progDlg.SetCommand(CGitProgressDlg::GitProgress_Resolve);
\r
40 if (parser.HasVal(_T("closeonend")))
\r
41 progDlg.SetAutoClose(parser.GetLongVal(_T("closeonend")));
\r
42 progDlg.SetOptions(parser.HasKey(_T("skipcheck")) ? ProgOptSkipConflictCheck : ProgOptNone);
\r
43 progDlg.SetPathList(dlg.m_pathList);
\r
45 return !progDlg.DidErrorsOccur();
\r