bool PrevDiffCommand::Execute()
{
if (!GitAdminDir::HasAdminDir(g_Git.m_CurrentDir))
{
CMessageBox::Show(GetExplorerHWND(), IDS_NOWORKINGCOPY, IDS_APPNAME, MB_ICONERROR);
return false;
}
bool bAlternativeTool = !!parser.HasKey(L"alternative");
bool bUnified = !!parser.HasKey(L"unified");
if (this->orgCmdLinePath.IsDirectory())
{
CFileDiffDlg dlg;
theApp.m_pMainWnd = &dlg;
dlg.m_strRev1 = L"HEAD~1";
dlg.m_strRev2 = GIT_REV_ZERO;
dlg.m_sFilter = this->cmdLinePath.GetGitPathString();
dlg.DoModal();
return true;
}
CLogDataVector revs;
CLogCache cache;
revs.m_pLogCache = &cache;
revs.ParserFromLog(&cmdLinePath, 2, CGit::LOG_INFO_ONLY_HASH);
if (revs.size() != 2)
{
CMessageBox::Show(GetExplorerHWND(), IDS_ERR_NOPREVREVISION, IDS_APPNAME, MB_ICONERROR);
return false;
}
return !!CGitDiff::Diff(GetExplorerHWND(), &cmdLinePath, &cmdLinePath, GIT_REV_ZERO, revs.GetGitRevAt(1).m_CommitHash.ToString(), false, bUnified, 0, bAlternativeTool);
}
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;
}
