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

Git: make ensureStash dialog more clear.

Browse Source 
Change-Id: I19ecde462d7a8a5fb00caa0414a9833ecab5057b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Petar Perisin
2013-03-16 15:12:28 +01:00
parent 39d000430e
commit 93e51c186a
5 changed files with 69 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/plugins/git/gitplugin.cpp
View File

@@ -724,7 +724,7 @@ void GitPlugin::startRebase()
if (workingDirectory.isEmpty() || !m_gitClient->canRebase(workingDirectory))
return;
GitClient::StashGuard stashGuard(workingDirectory, QLatin1String("Rebase-i"));
if (stashGuard.stashingFailed(true))
if (stashGuard.stashingFailed())
return;
stashGuard.preventPop();
LogChangeDialog dialog(false);
@@ -778,7 +778,7 @@ void GitPlugin::startChangeRelatedAction()
}
GitClient::StashGuard stashGuard(workingDirectory, command);
if (stashGuard.stashingFailed(true))
if (stashGuard.stashingFailed())
return;
if (!(m_gitClient->*commandFunction)(workingDirectory, change))
@@ -1009,8 +1009,9 @@ void GitPlugin::pull()
}
}
GitClient::StashGuard stashGuard(topLevel, QLatin1String("Pull"));
if (stashGuard.stashingFailed(false) || (rebase && (stashGuard.result() == GitClient::NotStashed)))
GitClient::StashGuard stashGuard(topLevel, QLatin1String("Pull"),
rebase ? Default : AllowUnstashed);
if (stashGuard.stashingFailed())
return;
if (!m_gitClient->synchronousPull(topLevel, rebase))
stashGuard.preventPop();
@@ -1137,8 +1138,8 @@ void GitPlugin::promptApplyPatch()
void GitPlugin::applyPatch(const QString &workingDirectory, QString file)
{
// Ensure user has been notified about pending changes
GitClient::StashGuard stashGuard(workingDirectory, QLatin1String("Apply-Patch"));
if (stashGuard.stashingFailed(false))
GitClient::StashGuard stashGuard(workingDirectory, QLatin1String("Apply-Patch"), AllowUnstashed);
if (stashGuard.stashingFailed())
return;
// Prompt for file
if (file.isEmpty()) {
@@ -1168,7 +1169,7 @@ void GitPlugin::stash()
const VcsBase::VcsBasePluginState state = currentState();
QTC_ASSERT(state.hasTopLevel(), return);
QString id;
gitClient()->ensureStash(state.topLevel(), QString(), false, &id);
gitClient()->ensureStash(state.topLevel(), QString(), NoPrompt, &id);
if (!id.isEmpty() && m_stashDialog)
m_stashDialog->refresh(state.topLevel(), true);
}