feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Report current branch

Browse Source 
Change-Id: Ied5ac2749b111d3b646080311ac6b52b3f86dc33
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Mathias Hasselmann
2012-10-18 21:30:06 +02:00
committed by Orgad Shaneh
parent fd6d0d8c29
commit c9b45c0d61
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/plugins/git/gitversioncontrol.cpp
View File

@@ -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.

1
src/plugins/git/gitversioncontrol.h
View File

@@ -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 &);