From 88bc6df12f6e037bc5973b38a538b5748c25acc4 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 25 Apr 2012 10:55:04 +0300 Subject: [PATCH] Gerrit: Make patch display behave like git diff Change-Id: If6b0b449d29b43a2eb6a135504c12caaf6fcd43b Reviewed-by: Friedemann Kleint --- src/plugins/git/gerrit/gerritplugin.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/src/plugins/git/gerrit/gerritplugin.cpp b/src/plugins/git/gerrit/gerritplugin.cpp index 79362839a5a..c52a6f5a16b 100644 --- a/src/plugins/git/gerrit/gerritplugin.cpp +++ b/src/plugins/git/gerrit/gerritplugin.cpp @@ -39,7 +39,9 @@ #include #include #include +#include #include +#include #include #include @@ -212,15 +214,23 @@ void FetchContext::processFinished(int exitCode, QProcess::ExitStatus es) break; case WritePatchFileState: switch (m_fetchMode) { - case FetchDisplay: + case FetchDisplay: { m_patchFileName = m_patchFile->fileName(); m_patchFile->close(); m_patchFile.reset(); m_state = DoneState; m_progress.reportFinished(); - Core::EditorManager::instance()->openEditor(m_patchFileName); + QString title = QString(QLatin1String("Gerrit patch %1/%2")) + .arg(m_change->number).arg(m_change->currentPatchSet.patchSetNumber); + Core::IEditor *editor = Core::EditorManager::instance()->openEditor( + m_patchFileName, Git::Constants::GIT_DIFF_EDITOR_ID); + VcsBase::VcsBaseEditorWidget *vcsEditor = VcsBase::VcsBaseEditorWidget::getVcsBaseEditor(editor); + vcsEditor->setDiffBaseDirectory(m_repository); + vcsEditor->setForceReadOnly(true); + vcsEditor->setDisplayName(title); deleteLater(); break; + } default: break; }