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

Git - command in progress in Topic

Browse Source 
Change-Id: I83a00e9677924efc244a91d20cdded77ee9cdff0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Petar Perisin
2013-04-19 07:58:45 +02:00
parent 311ca8cd01
commit 44f14351b4
2 changed files with 22 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/git/gitclient.cpp
View File

@@ -1264,6 +1264,20 @@ QString GitClient::synchronousTopic(const QString &workingDirectory)
if (!branch.isEmpty()) if (!branch.isEmpty())
return data.topic = branch; return data.topic = branch;
switch (checkCommandInProgressInGitDir(gitDir)) {
case Rebase:
case RebaseMerge:
return data.topic = tr("Rebasing");
case Revert:
return data.topic = tr("Reverting");
case CherryPick:
return data.topic = tr("Cherry Picking");
case Merge:
return data.topic = tr("Merging");
default:
break;
}
// Detached HEAD, try a tag or remote branch // Detached HEAD, try a tag or remote branch
QStringList references; QStringList references;
if (!synchronousHeadRefs(workingDirectory, &references)) if (!synchronousHeadRefs(workingDirectory, &references))
@@ -1892,10 +1906,8 @@ GitClient::StatusResult GitClient::gitStatus(const QString &workingDirectory, St
return StatusUnchanged; return StatusUnchanged;
} }
GitClient::CommandInProgress GitClient::checkCommandInProgress(const QString &workingDirectory) GitClient::CommandInProgress GitClient::checkCommandInProgressInGitDir(const QString &gitDir)
{ {
QString gitDir = findGitDirForRepository(workingDirectory);
if (QFile::exists(gitDir + QLatin1String("/MERGE_HEAD"))) if (QFile::exists(gitDir + QLatin1String("/MERGE_HEAD")))
return Merge; return Merge;
else if (QFile::exists(gitDir + QLatin1String("/rebase-apply/rebasing"))) else if (QFile::exists(gitDir + QLatin1String("/rebase-apply/rebasing")))
@@ -1910,6 +1922,11 @@ GitClient::CommandInProgress GitClient::checkCommandInProgress(const QString &wo
return NoCommand; return NoCommand;
} }
GitClient::CommandInProgress GitClient::checkCommandInProgress(const QString &workingDirectory)
{
return checkCommandInProgressInGitDir(findGitDirForRepository(workingDirectory));
}
void GitClient::continueCommandIfNeeded(const QString &workingDirectory) void GitClient::continueCommandIfNeeded(const QString &workingDirectory)
{ {
switch (checkCommandInProgress(workingDirectory)) { switch (checkCommandInProgress(workingDirectory)) {

2
src/plugins/git/gitclient.h
View File

@@ -281,6 +281,8 @@ public:
QString *errorMessage = 0); QString *errorMessage = 0);
CommandInProgress checkCommandInProgress(const QString &workingDirectory); CommandInProgress checkCommandInProgress(const QString &workingDirectory);
CommandInProgress checkCommandInProgressInGitDir(const QString &gitDir);
void continueCommandIfNeeded(const QString &workingDirectory); void continueCommandIfNeeded(const QString &workingDirectory);
void continuePreviousGitCommand(const QString &workingDirectory, const QString &msgBoxTitle, QString msgBoxText, void continuePreviousGitCommand(const QString &workingDirectory, const QString &msgBoxTitle, QString msgBoxText,
const QString &buttonName, const QString &gitCommand, bool requireChanges = true); const QString &buttonName, const QString &gitCommand, bool requireChanges = true);