summaryrefslogtreecommitdiff
path: root/src/plugins/mercurial/mercurialclient.h
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-01-08 09:44:07 +0100
committerFriedemann Kleint <Friedemann.Kleint@nokia.com>2010-01-08 09:44:07 +0100
commitda6463ee2f856cea6086f8a4938a371a81f75fdf (patch)
tree2de603f6abed02adf7d3562c6f75091d6714e6b1 /src/plugins/mercurial/mercurialclient.h
parente8195c0766d6b9bde3f529ff670765304f0ae104 (diff)
downloadqt-creator-da6463ee2f856cea6086f8a4938a371a81f75fdf.tar.gz
VCS[Mercurial]: Implement annotate previous as for git.
Task-number: QTCREATORBUG-503
Diffstat (limited to 'src/plugins/mercurial/mercurialclient.h')
-rw-r--r--src/plugins/mercurial/mercurialclient.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/src/plugins/mercurial/mercurialclient.h b/src/plugins/mercurial/mercurialclient.h
index 0a59b83a1d..53fc0e58d0 100644
--- a/src/plugins/mercurial/mercurialclient.h
+++ b/src/plugins/mercurial/mercurialclient.h
@@ -64,6 +64,16 @@ public:
bool remove(const QString &workingDir, const QString &fileName);
bool manifestSync(const QString &repository, const QString &filename);
QString branchQuerySync(const QString &repositoryRoot);
+ bool parentRevisionsSync(const QString &workingDirectory,
+ const QString &file /* = QString() */,
+ const QString &revision,
+ QStringList *parents);
+ bool shortDescriptionSync(const QString &workingDirectory, const QString &revision,
+ const QString &format /* = QString() */, QString *description);
+ bool shortDescriptionSync(const QString &workingDirectory, const QString &revision,
+ QString *description);
+ bool shortDescriptionsSync(const QString &workingDirectory, const QStringList &revisions,
+ QStringList *descriptions);
void annotate(const QString &workingDir, const QString &files,
const QString revision = QString(), int lineNumber = -1);
void diff(const QString &workingDir, const QStringList &files = QStringList());
@@ -95,7 +105,7 @@ public slots:
private slots:
void statusParser(const QByteArray &data);
- void slotAnnotateRevisionRequested(const QString &source, const QString &change, int lineNumber);
+ void slotAnnotateRevisionRequested(const QString &source, QString change, int lineNumber);
private:
bool executeHgSynchronously(const QString &workingDir,