OSDN Git Service
(root)
/
tortoisegit
/
TortoiseGitJp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Improvements to Diff of modified version against head
[tortoisegit/TortoiseGitJp.git]
/
src
/
TortoiseProc
/
Commands
/
DiffCommand.cpp
diff --git
a/src/TortoiseProc/Commands/DiffCommand.cpp
b/src/TortoiseProc/Commands/DiffCommand.cpp
index
1f4ff69
..
dd081f8
100644
(file)
--- a/
src/TortoiseProc/Commands/DiffCommand.cpp
+++ b/
src/TortoiseProc/Commands/DiffCommand.cpp
@@
-20,7
+20,7
@@
#include "DiffCommand.h"
\r
#include "PathUtils.h"
\r
#include "AppUtils.h"
\r
#include "DiffCommand.h"
\r
#include "PathUtils.h"
\r
#include "AppUtils.h"
\r
-
//
#include "ChangedDlg.h"
\r
+#include "ChangedDlg.h"
\r
#include "GitDiff.h"
\r
#include "GitStatus.h"
\r
\r
#include "GitDiff.h"
\r
#include "GitStatus.h"
\r
\r
@@
-29,20
+29,21
@@
bool DiffCommand::Execute()
bool bRet = false;
\r
CString path2 = CPathUtils::GetLongPathname(parser.GetVal(_T("path2")));
\r
bool bAlternativeTool = !!parser.HasKey(_T("alternative"));
\r
bool bRet = false;
\r
CString path2 = CPathUtils::GetLongPathname(parser.GetVal(_T("path2")));
\r
bool bAlternativeTool = !!parser.HasKey(_T("alternative"));
\r
-
bool bBlame = !!parser.HasKey(_T("blame"));
\r
+
//
bool bBlame = !!parser.HasKey(_T("blame"));
\r
if (path2.IsEmpty())
\r
{
\r
if (cmdLinePath.IsDirectory())
\r
{
\r
if (path2.IsEmpty())
\r
{
\r
if (cmdLinePath.IsDirectory())
\r
{
\r
-
//
CChangedDlg dlg;
\r
-
//dlg.m_pathList = CTSVN
PathList(cmdLinePath);
\r
-
//
dlg.DoModal();
\r
-
//
bRet = true;
\r
+ CChangedDlg dlg;
\r
+
dlg.m_pathList = CTGit
PathList(cmdLinePath);
\r
+ dlg.DoModal();
\r
+ bRet = true;
\r
}
\r
else
\r
{
\r
CGitDiff diff;
\r
//diff.SetAlternativeTool(bAlternativeTool);
\r
}
\r
else
\r
{
\r
CGitDiff diff;
\r
//diff.SetAlternativeTool(bAlternativeTool);
\r
+#if 0
\r
if ( parser.HasKey(_T("startrev")) && parser.HasKey(_T("endrev")) )
\r
{
\r
//SVNRev StartRevision = SVNRev(parser.GetLongVal(_T("startrev")));
\r
if ( parser.HasKey(_T("startrev")) && parser.HasKey(_T("endrev")) )
\r
{
\r
//SVNRev StartRevision = SVNRev(parser.GetLongVal(_T("startrev")));
\r
@@
-50,9
+51,10
@@
bool DiffCommand::Execute()
//bRet = diff.ShowCompare(cmdLinePath, StartRevision, cmdLinePath, EndRevision, SVNRev(), false, bBlame);
\r
}
\r
else
\r
//bRet = diff.ShowCompare(cmdLinePath, StartRevision, cmdLinePath, EndRevision, SVNRev(), false, bBlame);
\r
}
\r
else
\r
+#endif
\r
{
\r
{
\r
- //
svn
_revnum_t baseRev = 0;
\r
- bRet = diff.Diff(&cmdLinePath,
git_revnum_t(_T("HEAD")),git_revnum_t(GIT_REV_ZERO
));
\r
+ //
git
_revnum_t baseRev = 0;
\r
+ bRet = diff.Diff(&cmdLinePath,
&cmdLinePath,git_revnum_t(GIT_REV_ZERO),git_revnum_t(_T("HEAD")
));
\r
}
\r
}
\r
}
\r
}
\r
}
\r
}
\r