From 246f8e9aaf1f859f32d4ed00a2a9663afa4b3213 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Tue, 22 Jan 2013 20:21:54 +0200 Subject: [PATCH] Git: Fix indentation in ensureStash() Change-Id: I5243fce895ae21a2b07cb9e0d98a60d69f848b10 Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 60 +++++++++++++++++------------------ 1 file changed, 30 insertions(+), 30 deletions(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 1fb2a931a0c..13a060dc0e5 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1278,22 +1278,22 @@ QString GitClient::synchronousStash(const QString &workingDirectory, const QStri QString errorMessage; switch (gitStatus(workingDirectory, StatusMode(NoUntracked | NoSubmodules), 0, &errorMessage)) { case StatusChanged: { - message = creatorStashMessage(messageKeyword); - do { - if ((flags & StashPromptDescription)) { - if (!inputText(Core::ICore::mainWindow(), - tr("Stash Description"), tr("Description:"), &message)) - break; - } - if (!executeSynchronousStash(workingDirectory, message)) + message = creatorStashMessage(messageKeyword); + do { + if ((flags & StashPromptDescription)) { + if (!inputText(Core::ICore::mainWindow(), + tr("Stash Description"), tr("Description:"), &message)) break; - if ((flags & StashImmediateRestore) - && !synchronousStashRestore(workingDirectory, QLatin1String("stash@{0}"))) - break; - success = true; - } while (false); - } + } + if (!executeSynchronousStash(workingDirectory, message)) + break; + if ((flags & StashImmediateRestore) + && !synchronousStashRestore(workingDirectory, QLatin1String("stash@{0}"))) + break; + success = true; + } while (false); break; + } case StatusUnchanged: if (unchanged) *unchanged = true; @@ -1583,11 +1583,11 @@ GitClient::StashResult GitClient::ensureStash(const QString &workingDirectory, c QString statusOutput; switch (gitStatus(workingDirectory, StatusMode(NoUntracked | NoSubmodules), &statusOutput, errorMessage)) { - case StatusChanged: + case StatusChanged: break; - case StatusUnchanged: + case StatusUnchanged: return StashUnchanged; - case StatusFailed: + case StatusFailed: return StashFailed; } @@ -1595,19 +1595,19 @@ GitClient::StashResult GitClient::ensureStash(const QString &workingDirectory, c tr("Would you like to stash your changes?"), statusOutput, QMessageBox::Yes, QMessageBox::Yes|QMessageBox::No|QMessageBox::Cancel); switch (answer) { - case QMessageBox::Cancel: - return StashCanceled; - case QMessageBox::Yes: { - const QString stashMessage = creatorStashMessage(keyword); - if (!executeSynchronousStash(workingDirectory, stashMessage, errorMessage)) - return StashFailed; - if (message) - *message = stashMessage; - break; - } - case QMessageBox::No: // At your own risk, so. - return NotStashed; - } + case QMessageBox::Cancel: + return StashCanceled; + case QMessageBox::Yes: { + const QString stashMessage = creatorStashMessage(keyword); + if (!executeSynchronousStash(workingDirectory, stashMessage, errorMessage)) + return StashFailed; + if (message) + *message = stashMessage; + break; + } + case QMessageBox::No: // At your own risk, so. + return NotStashed; + } return Stashed; }