Git: Support annotate revision for renamed files

Change-Id: I6993cdd6f91f29b6f4e990cc5ba332ff63f7ed9f
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

4 files changed, 29 insertions, 2 deletions

diff --git a/src/plugins/git/giteditor.cpp b/src/plugins/git/giteditor.cpp
index 181172e36e..4f0b8314c6 100644
--- a/src/plugins/git/giteditor.cpp
+++ b/src/plugins/git/giteditor.cpp
@@ -366,5 +366,19 @@ bool GitEditor::supportChangeLinks() const
             || (editor()->id() == Git::Constants::GIT_REBASE_EDITOR_ID);
 }
 
+QString GitEditor::fileNameForLine(int line) const
+{
+    // 7971b6e7 share/qtcreator/dumper/dumper.py   (hjk
+    QTextBlock block = document()->findBlockByLineNumber(line - 1);
+    QTC_ASSERT(block.isValid(), return source());
+    static QRegExp renameExp(QLatin1String("^" CHANGE_PATTERN "\\s+([^(]+)"));
+    if (renameExp.indexIn(block.text()) != -1) {
+        const QString fileName = renameExp.cap(1).trimmed();
+        if (!fileName.isEmpty())
+            return fileName;
+    }
+    return source();
+}
+
 } // namespace Internal
 } // namespace Git
diff --git a/src/plugins/git/giteditor.h b/src/plugins/git/giteditor.h
index 1ed80c7ccf..84b5399221 100644
--- a/src/plugins/git/giteditor.h
+++ b/src/plugins/git/giteditor.h
@@ -74,6 +74,7 @@ private:
     void addChangeActions(QMenu *menu, const QString &change);
     QString revisionSubject(const QTextBlock &inBlock) const;
     bool supportChangeLinks() const;
+    QString fileNameForLine(int line) const;
 
     mutable QRegExp m_changeNumberPattern;
     QString m_currentChange;
diff --git a/src/plugins/vcsbase/vcsbaseeditor.cpp b/src/plugins/vcsbase/vcsbaseeditor.cpp
index a7be34a5a9..fe72592fb1 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.cpp
+++ b/src/plugins/vcsbase/vcsbaseeditor.cpp
@@ -684,6 +684,12 @@ bool VcsBaseEditorWidget::supportChangeLinks() const
     }
 }
 
+QString VcsBaseEditorWidget::fileNameForLine(int line) const
+{
+    Q_UNUSED(line);
+    return source();
+}
+
 void VcsBaseEditorWidget::init()
 {
     d->m_editor = editor();
@@ -1414,8 +1420,13 @@ void VcsBaseEditorWidget::addDiffActions(QMenu *, const DiffChunk &)
 void VcsBaseEditorWidget::slotAnnotateRevision()
 {
     if (const QAction *a = qobject_cast<const QAction *>(sender())) {
-        QFileInfo fi(source());
-        emit annotateRevisionRequested(fi.absolutePath(), fi.fileName(),
+        const int currentLine = editor()->currentLine();
+        const QString fileName = fileNameForLine(currentLine);
+        QString workingDirectory = d->m_workingDirectory;
+        if (workingDirectory.isEmpty())
+            workingDirectory = QFileInfo(fileName).absolutePath();
+        emit annotateRevisionRequested(workingDirectory,
+                                       QDir(workingDirectory).relativeFilePath(fileName),
                                        a->data().toString(), currentLine);
     }
 }
diff --git a/src/plugins/vcsbase/vcsbaseeditor.h b/src/plugins/vcsbase/vcsbaseeditor.h
index b932defb33..7c0654dae6 100644
--- a/src/plugins/vcsbase/vcsbaseeditor.h
+++ b/src/plugins/vcsbase/vcsbaseeditor.h
@@ -107,6 +107,7 @@ protected:
     // Pattern for log entry. hash/revision number must be in the first capture group
     void setLogEntryPattern(const QRegExp &pattern);
     virtual bool supportChangeLinks() const;
+    virtual QString fileNameForLine(int line) const;
 
 public:
     virtual void init();