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

VCS: Return the editor in VcsBaseClient::annotate

Browse Source 
Will be used in a follow-up commit for setting base line number
for limited range blame.

Change-Id: Ibae90f3ac982ebe9f53aa282f70c2c703e9eeb9d
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2016-06-13 19:57:45 +03:00
committed by Orgad Shaneh
parent 779f172581
commit 3845c833fc
8 changed files with 32 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/git/gitclient.cpp
View File

@@ -924,8 +924,9 @@ void GitClient::show(const QString &source, const QString &id, const QString &na
});
}
void GitClient::annotate(const QString &workingDir, const QString &file, const QString &revision,
int lineNumber, const QStringList &extraOptions)
VcsBaseEditorWidget *GitClient::annotate(
const QString &workingDir, const QString &file, const QString &revision,
int lineNumber, const QStringList &extraOptions)
{
const Id editorId = Git::Constants::GIT_BLAME_EDITOR_ID;
const QString id = VcsBaseEditor::getTitleId(workingDir, QStringList(file), revision);
@@ -954,6 +955,7 @@ void GitClient::annotate(const QString &workingDir, const QString &file, const Q
if (!revision.isEmpty())
arguments << revision;
vcsExec(workingDir, arguments, editor, false, 0, lineNumber);
return editor;
}
bool GitClient::synchronousCheckout(const QString &workingDirectory,