feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Enable Show for file in a specified revision

Browse Source 
Fixes: QTCREATORBUG-24689
Change-Id: Ic4ceb1c59f39009c28be7f34ee62f65fd41506c1
Reviewed-by: André Hartmann <aha_1980@gmx.de>
This commit is contained in:
Orgad Shaneh
2020-09-25 17:24:51 +03:00
committed by Orgad Shaneh
parent 91d3800ec3
commit eb6a2f2b89
5 changed files with 64 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/plugins/git/gitgrep.cpp
View File

@@ -316,25 +316,9 @@ IEditor *GitGrep::openEditor(const SearchResultItem &item,
return nullptr;
const QString path = QDir::fromNativeSeparators(item.path.first());
const QString topLevel = parameters.additionalParameters.toString();
const QString relativePath = QDir(topLevel).relativeFilePath(path);
const QByteArray content = m_client->synchronousShow(topLevel, params.ref + ":./" + relativePath);
if (content.isEmpty())
return nullptr;
QByteArray fileContent;
if (TextFileFormat::readFileUTF8(path, nullptr, &fileContent, nullptr)
== TextFileFormat::ReadSuccess) {
if (fileContent == content)
return nullptr; // open the file for read/write
}
const QString documentId = QLatin1String(Git::Constants::GIT_PLUGIN)
+ QLatin1String(".GitShow.") + params.id()
+ QLatin1String(".") + relativePath;
QString title = tr("Git Show %1:%2").arg(params.ref).arg(relativePath);
IEditor *editor = EditorManager::openEditorWithContents(Id(), &title, content, documentId,
EditorManager::DoNotSwitchToDesignMode);
IEditor *editor = m_client->openShowEditor(
topLevel, params.ref, path, GitClient::ShowEditor::OnlyIfDifferent);
editor->gotoLine(item.mainRange.begin.line, item.mainRange.begin.column);
editor->document()->setTemporary(true);
return editor;
}