summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMathias Hasselmann <mathias@openismus.com>2012-10-18 21:30:06 +0200
committerOrgad Shaneh <orgads@gmail.com>2012-11-16 14:11:24 +0100
commitc9b45c0d6129c0ea3c38c91beebdd4816658d495 (patch)
treeede5bb68c109ae61be32ee7e4b2306c96646eb6d /src
parentfd6d0d8c294b7d80fe97363c2e32050d8de66bc9 (diff)
downloadqt-creator-c9b45c0d6129c0ea3c38c91beebdd4816658d495.tar.gz
Git: Report current branch
Change-Id: Ied5ac2749b111d3b646080311ac6b52b3f86dc33 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/git/gitversioncontrol.cpp7
-rw-r--r--src/plugins/git/gitversioncontrol.h1
2 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/git/gitversioncontrol.cpp b/src/plugins/git/gitversioncontrol.cpp
index eaa8c77370..692e7fd38e 100644
--- a/src/plugins/git/gitversioncontrol.cpp
+++ b/src/plugins/git/gitversioncontrol.cpp
@@ -140,7 +140,12 @@ QString GitVersionControl::vcsGetRepositoryURL(const QString &directory)
return m_client->vcsGetRepositoryURL(directory);
}
-/* Snapshots are implement using stashes, relying on stash messages for
+QString GitVersionControl::vcsTopic(const QString &directory)
+{
+ return m_client->synchronousBranch(directory);
+}
+
+/* Snapshots are implemented using stashes, relying on stash messages for
* naming as the actual stash names (stash{n}) are rotated as one adds stashes.
* Note that the snapshot interface does not care whether we have an unmodified
* repository state, in which case git refuses to stash.
diff --git a/src/plugins/git/gitversioncontrol.h b/src/plugins/git/gitversioncontrol.h
index 20d2b2f87a..7f502f897c 100644
--- a/src/plugins/git/gitversioncontrol.h
+++ b/src/plugins/git/gitversioncontrol.h
@@ -64,6 +64,7 @@ public:
bool vcsRemoveSnapshot(const QString &topLevel, const QString &name);
bool vcsAnnotate(const QString &file, int line);
+ QString vcsTopic(const QString &directory);
void emitFilesChanged(const QStringList &);
void emitRepositoryChanged(const QString &);