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

Git: Show active branch next to command in progress

Browse Source 
Revised topic is "master (MERGING)" instead of MERGING

This should also fix topic getting stuck as REBASING

Change-Id: I934643f5b4e632318495f141536c666f775bd15d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-08-26 22:31:01 +03:00
committed by Orgad Shaneh
parent 969f9628db
commit afcb9b2c41
3 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -124,7 +124,11 @@ QString GitVersionControl::vcsGetRepositoryURL(const QString &directory)
QString GitVersionControl::vcsTopic(const QString &directory)
{
return m_client->synchronousTopic(directory);
QString topic = m_client->synchronousTopic(directory);
const QString commandInProgress = m_client->commandInProgressDescription(directory);
if (!commandInProgress.isEmpty())
topic += QLatin1String(" (") + commandInProgress + QLatin1Char(')');
return topic;
}
/* Snapshots are implemented using stashes, relying on stash messages for