OSDN Git Service

Fixed issue #155: Fix SVN Rebase sets upstream as remotes/trunk
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / Commands / DiffCommand.cpp
1 // TortoiseSVN - a Windows shell extension for easy version control\r
2 \r
3 // Copyright (C) 2007-2008 - TortoiseSVN\r
4 \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
9 \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
14 \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
18 //\r
19 #include "StdAfx.h"\r
20 #include "DiffCommand.h"\r
21 #include "PathUtils.h"\r
22 #include "AppUtils.h"\r
23 #include "ChangedDlg.h"\r
24 #include "GitDiff.h"\r
25 #include "GitStatus.h"\r
26 \r
27 bool DiffCommand::Execute()\r
28 {\r
29         bool bRet = false;\r
30         CString path2 = CPathUtils::GetLongPathname(parser.GetVal(_T("path2")));\r
31         bool bAlternativeTool = !!parser.HasKey(_T("alternative"));\r
32 //      bool bBlame = !!parser.HasKey(_T("blame"));\r
33         if (path2.IsEmpty())\r
34         {\r
35                 if (cmdLinePath.IsDirectory())\r
36                 {\r
37                         CChangedDlg dlg;\r
38                         dlg.m_pathList = CTGitPathList(cmdLinePath);\r
39                         dlg.DoModal();\r
40                         bRet = true;\r
41                 }\r
42                 else\r
43                 {\r
44                         CGitDiff diff;\r
45                         //diff.SetAlternativeTool(bAlternativeTool);\r
46 #if 0\r
47                         if ( parser.HasKey(_T("startrev")) && parser.HasKey(_T("endrev")) )\r
48                         {\r
49                                 //SVNRev StartRevision = SVNRev(parser.GetLongVal(_T("startrev")));\r
50                                 //SVNRev EndRevision = SVNRev(parser.GetLongVal(_T("endrev")));\r
51                                 //bRet = diff.ShowCompare(cmdLinePath, StartRevision, cmdLinePath, EndRevision, SVNRev(), false, bBlame);\r
52                         }\r
53                         else\r
54 #endif\r
55                         {\r
56                                 //git_revnum_t baseRev = 0;\r
57                                 bRet = diff.Diff(&cmdLinePath,&cmdLinePath,git_revnum_t(GIT_REV_ZERO),git_revnum_t(_T("HEAD")));\r
58                         }\r
59                 }\r
60         } \r
61         else\r
62                 bRet = CAppUtils::StartExtDiff(\r
63                         path2, orgCmdLinePath.GetWinPathString(), CString(), CString(),\r
64                         CAppUtils::DiffFlags().AlternativeTool(bAlternativeTool));\r
65         return bRet;\r
66 }