X-Git-Url: http://git.sourceforge.jp/view?p=tortoisegit%2FTortoiseGitJp.git;a=blobdiff_plain;f=src%2FTortoiseProc%2FCommands%2FDiffCommand.cpp;h=dd081f88e1696ce2ee65f252dcf209653061370d;hp=1f4ff697b7c1b908b640ae467bbf0adb079ad2af;hb=034e63ae380147b21a344cd03a63fd0b5ffc17d5;hpb=44411c5cd161cf6c06e91db6f3599d2b6a0278c1;ds=sidebyside

diff --git a/src/TortoiseProc/Commands/DiffCommand.cpp b/src/TortoiseProc/Commands/DiffCommand.cpp
index 1f4ff69..dd081f8 100644
--- a/src/TortoiseProc/Commands/DiffCommand.cpp
+++ b/src/TortoiseProc/Commands/DiffCommand.cpp
@@ -20,7 +20,7 @@
 #include "DiffCommand.h"
 #include "PathUtils.h"
 #include "AppUtils.h"
-//#include "ChangedDlg.h"
+#include "ChangedDlg.h"
 #include "GitDiff.h"
 #include "GitStatus.h"
 
@@ -29,20 +29,21 @@ bool DiffCommand::Execute()
 	bool bRet = false;
 	CString path2 = CPathUtils::GetLongPathname(parser.GetVal(_T("path2")));
 	bool bAlternativeTool = !!parser.HasKey(_T("alternative"));
-	bool bBlame = !!parser.HasKey(_T("blame"));
+//	bool bBlame = !!parser.HasKey(_T("blame"));
 	if (path2.IsEmpty())
 	{
 		if (cmdLinePath.IsDirectory())
 		{
-			//CChangedDlg dlg;
-			//dlg.m_pathList = CTSVNPathList(cmdLinePath);
-			//dlg.DoModal();
-			//bRet = true;
+			CChangedDlg dlg;
+			dlg.m_pathList = CTGitPathList(cmdLinePath);
+			dlg.DoModal();
+			bRet = true;
 		}
 		else
 		{
 			CGitDiff diff;
 			//diff.SetAlternativeTool(bAlternativeTool);
+#if 0
 			if ( parser.HasKey(_T("startrev")) && parser.HasKey(_T("endrev")) )
 			{
 				//SVNRev StartRevision = SVNRev(parser.GetLongVal(_T("startrev")));
@@ -50,9 +51,10 @@ bool DiffCommand::Execute()
 				//bRet = diff.ShowCompare(cmdLinePath, StartRevision, cmdLinePath, EndRevision, SVNRev(), false, bBlame);
 			}
 			else
+#endif
 			{
-				//svn_revnum_t baseRev = 0;
-				bRet = diff.Diff(&cmdLinePath,git_revnum_t(_T("HEAD")),git_revnum_t(GIT_REV_ZERO));
+				//git_revnum_t baseRev = 0;
+				bRet = diff.Diff(&cmdLinePath,&cmdLinePath,git_revnum_t(GIT_REV_ZERO),git_revnum_t(_T("HEAD")));
 			}
 		}
 	}