From e1c2f2837a351738808a9d79afb036b80c8e1271 Mon Sep 17 00:00:00 2001 From: Sven Strickroth Date: Sun, 27 Nov 2016 08:22:36 +0100 Subject: [PATCH] Start new TortoiseGitProc instance for showing log and filediff Signed-off-by: Sven Strickroth --- src/TortoiseProc/AppUtils.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/TortoiseProc/AppUtils.cpp b/src/TortoiseProc/AppUtils.cpp index 3e810c40d..fe2d25e28 100644 --- a/src/TortoiseProc/AppUtils.cpp +++ b/src/TortoiseProc/AppUtils.cpp @@ -50,7 +50,6 @@ #include "SVNDCommitDlg.h" #include "requestpulldlg.h" #include "PullFetchDlg.h" -#include "FileDiffDlg.h" #include "RebaseDlg.h" #include "PropKey.h" #include "StashSave.h" @@ -2484,15 +2483,15 @@ bool DoPull(const CString& url, bool bAutoLoad, BOOL bFetchTags, bool bNoFF, boo { postCmdList.emplace_back(IDI_DIFF, IDS_PROC_PULL_DIFFS, [&] { - CFileDiffDlg dlg; - dlg.SetDiff(nullptr, hashOld.ToString(), hashNew.ToString()); - dlg.DoModal(); + CString sCmd; + sCmd.Format(L"/command:showcompare /path:\"%s\" /revision1:%s /revision2:%s", (LPCTSTR)g_Git.m_CurrentDir, (LPCTSTR)hashOld.ToString(), (LPCTSTR)hashNew.ToString()); + CAppUtils::RunTortoiseGitProc(sCmd); }); postCmdList.emplace_back(IDI_LOG, IDS_PROC_PULL_LOG, [&] { - CLogDlg dlg; - dlg.SetParams(CTGitPath(L""), CTGitPath(L""), L"", hashOld.ToString() + L".." + hashNew.ToString(), 0); - dlg.DoModal(); + CString sCmd; + sCmd.Format(L"/command:log /path:\"%s\" /range:%s", (LPCTSTR)g_Git.m_CurrentDir, (LPCTSTR)(hashOld.ToString() + L".." + hashNew.ToString())); + CAppUtils::RunTortoiseGitProc(sCmd); }); } -- 2.11.4.GIT