From 903fc1b1ba7b537c593de2d6097fa34ff470d4d7 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Fri, 14 Oct 2022 16:59:39 +0300 Subject: [PATCH] VCS: Fix blaming previous revisions for renamed files For example, run Git Blame on logchangedialog.cpp, then right-click a hash and choose Blame or Blame Parent. Amends 424fd7c557907c03cb957fadc90cd81f87063f5d. Change-Id: I4cf502f73e18fecde9c9b37d1f7ca8648c07932a Reviewed-by: Jarek Kobus --- src/plugins/vcsbase/vcsbaseeditor.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp index cdba88327e2..fe56d6c10f9 100644 --- a/src/plugins/vcsbase/vcsbaseeditor.cpp +++ b/src/plugins/vcsbase/vcsbaseeditor.cpp @@ -1454,9 +1454,10 @@ void VcsBaseEditorWidget::slotAnnotateRevision(const QString &change) const FilePath workingDirectory = d->m_workingDirectory.isEmpty() ? VcsManager::findTopLevelForDirectory(fileName.parentDir()) : d->m_workingDirectory; - emit annotateRevisionRequested(workingDirectory, - fileName.relativeChildPath(workingDirectory).toString(), - change, currentLine); + const FilePath relativePath = fileName.isRelativePath() + ? fileName + : fileName.relativeChildPath(workingDirectory; + emit annotateRevisionRequested(workingDirectory, relativePath.toString(), change, currentLine); } QStringList VcsBaseEditorWidget::annotationPreviousVersions(const QString &) const