forked from qt-creator/qt-creator
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 424fd7c557
.
Change-Id: I4cf502f73e18fecde9c9b37d1f7ca8648c07932a
Reviewed-by: Jarek Kobus <jaroslaw.kobus@qt.io>
This commit is contained in:
committed by
Orgad Shaneh
parent
9b61e484be
commit
903fc1b1ba
@@ -1454,9 +1454,10 @@ void VcsBaseEditorWidget::slotAnnotateRevision(const QString &change)
|
|||||||
const FilePath workingDirectory = d->m_workingDirectory.isEmpty()
|
const FilePath workingDirectory = d->m_workingDirectory.isEmpty()
|
||||||
? VcsManager::findTopLevelForDirectory(fileName.parentDir())
|
? VcsManager::findTopLevelForDirectory(fileName.parentDir())
|
||||||
: d->m_workingDirectory;
|
: d->m_workingDirectory;
|
||||||
emit annotateRevisionRequested(workingDirectory,
|
const FilePath relativePath = fileName.isRelativePath()
|
||||||
fileName.relativeChildPath(workingDirectory).toString(),
|
? fileName
|
||||||
change, currentLine);
|
: fileName.relativeChildPath(workingDirectory;
|
||||||
|
emit annotateRevisionRequested(workingDirectory, relativePath.toString(), change, currentLine);
|
||||||
}
|
}
|
||||||
|
|
||||||
QStringList VcsBaseEditorWidget::annotationPreviousVersions(const QString &) const
|
QStringList VcsBaseEditorWidget::annotationPreviousVersions(const QString &) const
|
||||||
|
Reference in New Issue
Block a user