OSDN Git Service

Fixed issue #155: Fix SVN Rebase sets upstream as remotes/trunk
[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / Commands / PrevDiffCommand.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 "PrevDiffCommand.h"\r
21 #include "GitDiff.h"\r
22 #include "GitStatus.h"\r
23 #include "MessageBox.h"\r
24 #include "ChangedDlg.h"\r
25 #include "LogDlgHelper.h"\r
26 #include "CommonResource.h"\r
27 \r
28 bool PrevDiffCommand::Execute()\r
29 {\r
30         bool bRet = false;\r
31         bool bAlternativeTool = !!parser.HasKey(_T("alternative"));\r
32         if (cmdLinePath.IsDirectory())\r
33         {\r
34                 CChangedDlg dlg;\r
35                 dlg.m_pathList = CTGitPathList(cmdLinePath);\r
36                 dlg.DoModal();\r
37                 bRet = true;\r
38         }\r
39         else\r
40         {\r
41                 CGitDiff diff;\r
42 //              diff.SetAlternativeTool(bAlternativeTool);\r
43                 GitStatus st;\r
44                 st.GetStatus(cmdLinePath);\r
45 \r
46                 if (1)\r
47                 {\r
48                         CString hash;\r
49                         CString logout;\r
50                 \r
51                         CLogDataVector revs;\r
52         \r
53                         revs.ParserShortLog(&cmdLinePath,hash,2);\r
54                         if( revs.size() == 0)\r
55                         {\r
56                                 CMessageBox::Show(hWndExplorer, IDS_ERR_NOPREVREVISION, IDS_APPNAME, MB_ICONERROR);\r
57                                 return FALSE;\r
58                         }\r
59 \r
60                         if( revs.size() == 1 )\r
61                         {\r
62                                 CGitDiff diff;\r
63                                 bRet = (diff.DiffNull(&cmdLinePath,revs[0].m_CommitHash) != 0);\r
64                         }\r
65 \r
66                         if( revs.size() == 2 )\r
67                         {\r
68                                 CGitDiff diff;\r
69                                 bRet = diff.Diff(&cmdLinePath,&cmdLinePath, revs[0].m_CommitHash, revs[1].m_CommitHash, false);\r
70                         }\r
71                 }\r
72                 else\r
73                 {\r
74                         //if (st.GetLastErrorMsg().IsEmpty())\r
75                         {\r
76                                 CMessageBox::Show(hWndExplorer, IDS_ERR_NOPREVREVISION, IDS_APPNAME, MB_ICONERROR);\r
77                         }\r
78                         //else\r
79                         //{\r
80                         //      CMessageBox::Show(hWndExplorer, IDS_ERR_NOSTATUS, IDS_APPNAME, MB_ICONERROR);\r
81                         //s}\r
82                 }\r
83         }\r
84         return bRet;\r
85 }\r