summaryrefslogtreecommitdiff
path: root/src/plugins/git/gitclient.h
diff options
context:
space:
mode:
authorOrgad Shaneh <orgad.shaneh@audiocodes.com>2014-06-24 10:53:03 +0300
committerOrgad Shaneh <orgads@gmail.com>2014-06-24 11:19:28 +0200
commitd6583f0f474df5ee9cc3a8ee061e9490167aa725 (patch)
tree802fdfbe38603191147860fe20deed1af1ea89ee /src/plugins/git/gitclient.h
parent281aa9e0d69d8ca8aa4e70bb755b4c5b3d58491b (diff)
downloadqt-creator-d6583f0f474df5ee9cc3a8ee061e9490167aa725.tar.gz
Git: Add on-demand branches expanding
Make "branches expanding" on demand and asynchronous. After "git show" there is clickable text: "Branches: <Expand>" in description. If user clicks this text then branches for commit is triggered and done asynchronously. Task-number: QTCREATORBUG-11293 Done-with: Przemyslaw Gorszkowski <pgorszkowski@gmail.com> Change-Id: I772cfef823d3f95e2b3060dfb5973157d81fc11a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/gitclient.h')
-rw-r--r--src/plugins/git/gitclient.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index 5602d175e5..1b20d75e2a 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -241,8 +241,6 @@ public:
QString synchronousTopRevision(const QString &workingDirectory, QString *errorMessage = 0);
void synchronousTagsForCommit(const QString &workingDirectory, const QString &revision,
QString &precedes, QString &follows);
- QStringList synchronousBranchesForCommit(const QString &workingDirectory,
- const QString &revision);
bool isRemoteCommit(const QString &workingDirectory, const QString &commit);
bool isFastForwardMerge(const QString &workingDirectory, const QString &branch);
@@ -349,6 +347,7 @@ private slots:
void slotChunkActionsRequested(QMenu *menu, int diffFileIndex, int chunkIndex);
void slotStageChunk();
void slotUnstageChunk();
+ void branchesForCommit(const QString &revision);
private:
QString makePatch(int diffFileIndex, int chunkIndex, bool revert) const;