3 #include "AppUtils.h"
\r
5 CGitDiff::CGitDiff(void)
\r
9 CGitDiff::~CGitDiff(void)
\r
13 int CGitDiff::Diff(CTGitPath * pPath, git_revnum_t & rev1, git_revnum_t & rev2, bool blame, bool unified)
\r
16 GetTempPath(temppath);
\r
20 if(rev1 != GIT_REV_ZERO )
\r
22 file1.Format(_T("%s%s_%s%s"),
\r
24 pPath->GetBaseFilename(),
\r
26 pPath->GetFileExtension());
\r
27 cmd.Format(_T("git.cmd cat-file -p %s:%s"),rev1,pPath->GetGitPathString());
\r
28 g_Git.RunLogFile(cmd,file1);
\r
31 file1=pPath->GetWinPathString();
\r
35 if(rev2 != GIT_REV_ZERO)
\r
38 file2.Format(_T("%s\\%s_%s%s"),
\r
40 pPath->GetBaseFilename(),
\r
42 pPath->GetFileExtension());
\r
43 cmd.Format(_T("git.cmd cat-file -p %s:%s"),rev2,pPath->GetGitPathString());
\r
44 g_Git.RunLogFile(cmd,file2);
\r
47 file2=pPath->GetWinPathString();
\r
50 CAppUtils::DiffFlags flags;
\r
51 CAppUtils::StartExtDiff(file1,file2,
\r
52 pPath->GetGitPathString()+_T(":")+rev1.Left(6),
\r
53 pPath->GetGitPathString()+_T(":")+rev2.Left(6)
\r