Skip to content
Snippets Groups Projects
Commit c9b45c0d authored by Mathias Hasselmann's avatar Mathias Hasselmann Committed by Orgad Shaneh
Browse files

Git: Report current branch


Change-Id: Ied5ac2749b111d3b646080311ac6b52b3f86dc33
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent fd6d0d8c
No related branches found
No related tags found
No related merge requests found
...@@ -140,7 +140,12 @@ QString GitVersionControl::vcsGetRepositoryURL(const QString &directory) ...@@ -140,7 +140,12 @@ QString GitVersionControl::vcsGetRepositoryURL(const QString &directory)
return m_client->vcsGetRepositoryURL(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. * 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 * Note that the snapshot interface does not care whether we have an unmodified
* repository state, in which case git refuses to stash. * repository state, in which case git refuses to stash.
......
...@@ -64,6 +64,7 @@ public: ...@@ -64,6 +64,7 @@ public:
bool vcsRemoveSnapshot(const QString &topLevel, const QString &name); bool vcsRemoveSnapshot(const QString &topLevel, const QString &name);
bool vcsAnnotate(const QString &file, int line); bool vcsAnnotate(const QString &file, int line);
QString vcsTopic(const QString &directory);
void emitFilesChanged(const QStringList &); void emitFilesChanged(const QStringList &);
void emitRepositoryChanged(const QString &); void emitRepositoryChanged(const QString &);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment