void CFileDiffDlg::DoDiff(int selIndex, bool blame)
{
CGitDiff diff;
CTGitPath* fd2 = m_arFilteredList[selIndex];
CTGitPath* fd1 = fd2;
if (m_rev1.m_CommitHash.IsEmpty() && g_Git.IsInitRepos())
{
CGitDiff::DiffNull(fd2, GIT_REV_ZERO);
return;
}
if (fd2->m_Action & CTGitPath::LOGACTIONS_ADDED)
{
CGitDiff::DiffNull(fd2, m_rev1.m_CommitHash.ToString(), true);
return;
}
if (fd2->m_Action & CTGitPath::LOGACTIONS_DELETED)
{
CGitDiff::DiffNull(fd2, m_rev2.m_CommitHash.ToString(), false);
return;
}
if (fd2->m_Action & CTGitPath::LOGACTIONS_REPLACED)
fd1 = new CTGitPath(fd2->GetGitOldPathString());
diff.Diff(fd2, fd1, this->m_rev1.m_CommitHash.ToString(), this->m_rev2.m_CommitHash.ToString(), blame, FALSE);
if (fd1 != fd2)
delete fd1;
}
void CFileDiffDlg::DoDiff(int selIndex, bool blame)
{
CGitDiff diff;
CTGitPath* fd2 = m_arFilteredList[selIndex];
CTGitPath* fd1 = fd2;
if (fd2->m_Action & CTGitPath::LOGACTIONS_REPLACED)
fd1 = new CTGitPath(fd2->GetGitOldPathString());
diff.Diff(fd2, fd1, this->m_rev1.m_CommitHash.ToString(), this->m_rev2.m_CommitHash.ToString(), blame, FALSE);
}
bool PrevDiffCommand::Execute()
{
bool bRet = false;
//bool bAlternativeTool = !!parser.HasKey(_T("alternative"));
if (this->orgCmdLinePath.IsDirectory())
{
CFileDiffDlg dlg;
dlg.m_strRev1 = GIT_REV_ZERO;
dlg.m_strRev2 = _T("HEAD~1");
dlg.m_sFilter = this->cmdLinePath.GetGitPathString();
//dlg.m_pathList = CTGitPathList(cmdLinePath);
dlg.DoModal();
bRet = true;
}
else
{
GitStatus st;
st.GetStatus(cmdLinePath);
if (1)
{
CString hash;
CString logout;
CLogDataVector revs;
CLogCache cache;
revs.m_pLogCache=&cache;
revs.ParserFromLog(&cmdLinePath,2,CGit::LOG_INFO_ONLY_HASH);
if( revs.size() != 2)
{
CMessageBox::Show(hWndExplorer, IDS_ERR_NOPREVREVISION, IDS_APPNAME, MB_ICONERROR);
bRet = false;
}
else
{
CGitDiff diff;
bRet = !!diff.Diff(&cmdLinePath,&cmdLinePath, GIT_REV_ZERO, revs.GetGitRevAt(1).m_CommitHash.ToString());
}
}
else
{
//if (st.GetLastErrorMsg().IsEmpty())
{
CMessageBox::Show(hWndExplorer, IDS_ERR_NOPREVREVISION, IDS_APPNAME, MB_ICONERROR);
}
//else
//{
// CMessageBox::Show(hWndExplorer, IDS_ERR_NOSTATUS, IDS_APPNAME, MB_ICONERROR);
//s}
}
}
return bRet;
}
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"));
if (path2.IsEmpty())
{
if (this->orgCmdLinePath.IsDirectory())
{
CChangedDlg dlg;
dlg.m_pathList = CTGitPathList(cmdLinePath);
dlg.DoModal();
bRet = true;
}
else
{
CGitDiff diff;
//diff.SetAlternativeTool(bAlternativeTool);
if ( parser.HasKey(_T("startrev")) && parser.HasKey(_T("endrev")) )
{
bRet = !!diff.Diff(&cmdLinePath,&cmdLinePath,git_revnum_t(parser.GetVal(_T("startrev"))),git_revnum_t(parser.GetVal(_T("endrev"))));
}
else
{
// check if it is a newly added (but uncommitted) file
git_wc_status_kind status = git_wc_status_none;
CString topDir;
if (orgCmdLinePath.HasAdminDir(&topDir))
GitStatus::GetFileStatus(topDir, cmdLinePath.GetWinPathString(), &status, true);
if (status == git_wc_status_added)
cmdLinePath.m_Action = cmdLinePath.LOGACTIONS_ADDED;
bRet = !!diff.Diff(&cmdLinePath,&cmdLinePath,git_revnum_t(GIT_REV_ZERO),git_revnum_t(_T("HEAD")));
}
}
}
else
bRet = CAppUtils::StartExtDiff(
path2, orgCmdLinePath.GetWinPathString(), CString(), CString(),
CString(), CString(), git_revnum_t(GIT_REV_ZERO), git_revnum_t(GIT_REV_ZERO),
CAppUtils::DiffFlags().AlternativeTool(bAlternativeTool));
return bRet;
}
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"));
if (path2.IsEmpty())
{
if (cmdLinePath.IsDirectory())
{
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")));
//SVNRev EndRevision = SVNRev(parser.GetLongVal(_T("endrev")));
//bRet = diff.ShowCompare(cmdLinePath, StartRevision, cmdLinePath, EndRevision, SVNRev(), false, bBlame);
}
else
#endif
{
//git_revnum_t baseRev = 0;
bRet = diff.Diff(&cmdLinePath,&cmdLinePath,git_revnum_t(GIT_REV_ZERO),git_revnum_t(_T("HEAD")));
}
}
}
else
bRet = CAppUtils::StartExtDiff(
path2, orgCmdLinePath.GetWinPathString(), CString(), CString(),
CAppUtils::DiffFlags().AlternativeTool(bAlternativeTool));
return bRet;
}
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"));
if (path2.IsEmpty())
{
if (this->orgCmdLinePath.IsDirectory())
{
CChangedDlg dlg;
dlg.m_pathList = CTGitPathList(cmdLinePath);
dlg.DoModal();
bRet = true;
}
else
{
if (cmdLinePath.IsEmpty())
return false;
CGitDiff diff;
//diff.SetAlternativeTool(bAlternativeTool);
if ( parser.HasKey(_T("startrev")) && parser.HasKey(_T("endrev")) )
{
if (parser.HasKey(_T("unified")))
bRet = !!CAppUtils::StartShowUnifiedDiff(nullptr, cmdLinePath, git_revnum_t(parser.GetVal(_T("endrev"))), cmdLinePath, git_revnum_t(parser.GetVal(_T("startrev"))), bAlternativeTool);
else
bRet = !!diff.Diff(&cmdLinePath, &cmdLinePath, git_revnum_t(parser.GetVal(_T("startrev"))), git_revnum_t(parser.GetVal(_T("endrev"))), false, parser.HasKey(_T("unified")) == TRUE, parser.GetLongVal(_T("line")), bAlternativeTool);
}
else
{
// check if it is a newly added (but uncommitted) file
git_wc_status_kind status = git_wc_status_none;
CString topDir;
if (orgCmdLinePath.HasAdminDir(&topDir))
{
CBlockCacheForPath cacheBlock(topDir);
CAutoIndex index;
CString adminDir;
GitAdminDir::GetAdminDirPath(topDir, adminDir);
if (!git_index_open(index.GetPointer(), CUnicodeUtils::GetUTF8(adminDir + _T("index"))))
g_Git.Run(_T("git.exe update-index -- \"") + cmdLinePath.GetGitPathString() + _T("\""), nullptr); // make sure we get the right status
GitStatus::GetFileStatus(topDir, cmdLinePath.GetWinPathString(), &status, true);
if (index)
git_index_write(index);
}
if (status == git_wc_status_added)
{
if (!g_Git.IsInitRepos())
{
// this might be a rename, try to find original name
BYTE_VECTOR cmdout;
g_Git.Run(_T("git.exe diff-index --raw HEAD -M -C -z --"), &cmdout);
CTGitPathList changedFiles;
changedFiles.ParserFromLog(cmdout);
for (int i = 0; i < changedFiles.GetCount(); ++i)
{
if (changedFiles[i].GetGitPathString() == cmdLinePath.GetGitPathString())
{
if (!changedFiles[i].GetGitOldPathString().IsEmpty())
{
CTGitPath oldPath(changedFiles[i].GetGitOldPathString());
if (parser.HasKey(_T("unified")))
return !!CAppUtils::StartShowUnifiedDiff(nullptr, cmdLinePath, git_revnum_t(_T("HEAD")), cmdLinePath, git_revnum_t(GIT_REV_ZERO), bAlternativeTool);
return !!diff.Diff(&cmdLinePath, &oldPath, git_revnum_t(GIT_REV_ZERO), git_revnum_t(_T("HEAD")), false, parser.HasKey(_T("unified")) == TRUE, parser.GetLongVal(_T("line")), bAlternativeTool);
}
break;
}
}
}
cmdLinePath.m_Action = cmdLinePath.LOGACTIONS_ADDED;
}
if (parser.HasKey(_T("unified")))
bRet = !!CAppUtils::StartShowUnifiedDiff(nullptr, cmdLinePath, git_revnum_t(_T("HEAD")), cmdLinePath, git_revnum_t(GIT_REV_ZERO), bAlternativeTool);
else
bRet = !!diff.Diff(&cmdLinePath, &cmdLinePath, git_revnum_t(GIT_REV_ZERO), git_revnum_t(_T("HEAD")), false, parser.HasKey(_T("unified")) == TRUE, parser.GetLongVal(_T("line")), bAlternativeTool);
}
}
}
else
{
CGitDiff diff;
if ( parser.HasKey(_T("startrev")) && parser.HasKey(_T("endrev")) && path2.Left(g_Git.m_CurrentDir.GetLength() + 1) == g_Git.m_CurrentDir + _T("\\"))
{
CTGitPath tgitPath2 = path2.Mid(g_Git.m_CurrentDir.GetLength() + 1);
bRet = !!diff.Diff(&tgitPath2, &cmdLinePath, git_revnum_t(parser.GetVal(_T("startrev"))), git_revnum_t(parser.GetVal(_T("endrev"))), false, parser.HasKey(_T("unified")) == TRUE, parser.GetLongVal(_T("line")), bAlternativeTool);
}
else
{
bRet = CAppUtils::StartExtDiff(
path2, orgCmdLinePath.GetWinPathString(), CString(), CString(),
CString(), CString(), git_revnum_t(GIT_REV_ZERO), git_revnum_t(GIT_REV_ZERO),
CAppUtils::DiffFlags().AlternativeTool(bAlternativeTool), parser.GetLongVal(_T("line")));
}
}
return bRet;
}
void CFileDiffDlg::DoDiff(int selIndex, bool blame)
{
CGitDiff diff;
CTGitPath* fd = m_arFilteredList[selIndex];
diff.Diff(fd, fd,this->m_rev1.m_CommitHash.ToString(), this->m_rev2.m_CommitHash.ToString(), blame, FALSE);
}
