From 0cdb20ec37ed3eec5845b0684e55139d4067b80f Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Mon, 17 Feb 2014 22:45:54 +0200 Subject: [PATCH] Mercurial: Show current branch in project tree and window title Task-number: QTCREATORBUG-11388 Change-Id: I55c966b5026e435d0fa4d24607b7b4a3c6d9e3dc Reviewed-by: Nikita Baryshnikov Reviewed-by: Tobias Hunger --- src/plugins/mercurial/mercurialcontrol.cpp | 5 +++++ src/plugins/mercurial/mercurialcontrol.h | 1 + 2 files changed, 6 insertions(+) diff --git a/src/plugins/mercurial/mercurialcontrol.cpp b/src/plugins/mercurial/mercurialcontrol.cpp index 753b3c71366..0dd8711dda0 100644 --- a/src/plugins/mercurial/mercurialcontrol.cpp +++ b/src/plugins/mercurial/mercurialcontrol.cpp @@ -136,6 +136,11 @@ bool MercurialControl::vcsAnnotate(const QString &file, int line) return true; } +QString MercurialControl::vcsTopic(const QString &directory) +{ + return mercurialClient->branchQuerySync(directory); +} + bool MercurialControl::sccManaged(const QString &filename) { const QFileInfo fi(filename); diff --git a/src/plugins/mercurial/mercurialcontrol.h b/src/plugins/mercurial/mercurialcontrol.h index 067dcf1c787..a5a1d1c8f1a 100644 --- a/src/plugins/mercurial/mercurialcontrol.h +++ b/src/plugins/mercurial/mercurialcontrol.h @@ -65,6 +65,7 @@ public: QString vcsGetRepositoryURL(const QString &directory); bool sccManaged(const QString &filename); bool vcsAnnotate(const QString &file, int line); + QString vcsTopic(const QString &directory); public slots: // To be connected to the HgTask's success signal to emit the repository/