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

8
src/plugins/mercurial/mercurialclient.cpp
View File

@@ -299,13 +299,13 @@ void MercurialClient::outgoing(const QString &repositoryRoot)
enqueueJob(cmd, args);
}
void MercurialClient::annotate(const QString &workingDir, const QString &file,
const QString &revision, int lineNumber,
const QStringList &extraOptions)
VcsBaseEditorWidget *MercurialClient::annotate(
const QString &workingDir, const QString &file, const QString &revision,
int lineNumber, const QStringList &extraOptions)
{
QStringList args(extraOptions);
args << QLatin1String("-u") << QLatin1String("-c") << QLatin1String("-d");
VcsBaseClient::annotate(workingDir, file, revision, lineNumber, args);
return VcsBaseClient::annotate(workingDir, file, revision, lineNumber, args);
}
void MercurialClient::commit(const QString &repositoryRoot, const QStringList &files,

6
src/plugins/mercurial/mercurialclient.h
View File

@@ -57,9 +57,9 @@ public:
void outgoing(const QString &repositoryRoot);
bool managesFile(const QString &workingDirectory, const QString &fileName) const;
void annotate(const QString &workingDir, const QString &file,
const QString &revision = QString(), int lineNumber = -1,
const QStringList &extraOptions = QStringList()) override;
VcsBase::VcsBaseEditorWidget *annotate(
const QString &workingDir, const QString &file, const QString &revision = QString(),
int lineNumber = -1, const QStringList &extraOptions = QStringList()) override;
void commit(const QString &repositoryRoot, const QStringList &files,
const QString &commitMessageFile,
const QStringList &extraOptions = QStringList()) override;