merge original branch.

[tortoisegit/TortoiseGitJp.git] / src / TortoiseProc / GitDiff.cpp

diff --git a/src/TortoiseProc/GitDiff.cpp b/src/TortoiseProc/GitDiff.cpp
index f30b89e..b68a9c1 100644 (file)
--- a/src/TortoiseProc/GitDiff.cpp
+++ b/src/TortoiseProc/GitDiff.cpp
@@ -5,6 +5,7 @@
 #include "gittype.h"\r
 #include "resource.h"\r
 #include "MessageBox.h"\r
+#include "FileDiffDlg.h"\r
 \r
 CGitDiff::CGitDiff(void)\r
 {\r
@@ -230,3 +231,30 @@ int CGitDiff::Diff(CTGitPath * pPath,CTGitPath * pPath2, git_revnum_t & rev1, gi
        return 0;\r
 }\r
 \r
+int CGitDiff::DiffCommit(CTGitPath &path, GitRev *r1, GitRev *r2)\r
+{\r
+       if( path.GetWinPathString().IsEmpty() || path.IsDirectory() )\r
+       {\r
+               CFileDiffDlg dlg;\r
+               dlg.SetDiff(NULL,*r1,*r2);\r
+               dlg.DoModal();\r
+       }else\r
+       {\r
+               Diff(&path,&path,r1->m_CommitHash.ToString(),r2->m_CommitHash.ToString());\r
+       }\r
+       return 0;\r
+}\r
+\r
+int CGitDiff::DiffCommit(CTGitPath &path, CString &r1, CString &r2)\r
+{\r
+       if( path.GetWinPathString().IsEmpty() || path.IsDirectory() )\r
+       {\r
+               CFileDiffDlg dlg;\r
+               dlg.SetDiff(NULL,r1,r2);\r
+               dlg.DoModal();\r
+       }else\r
+       {\r
+               Diff(&path,&path,r1,r2);\r
+       }\r
+       return 0;\r
+}
\ No newline at end of file