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

Git - couple fixes in branch based auto stash

Browse Source 
- do not start stash scope when creating auto stash
- return if reset fails

Change-Id: I471abc1d430351192c46ac78041949ba81f11b09
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Petar Perisin
2013-07-11 22:53:38 +02:00
parent f45a01b203
commit 771fe03cfe
1 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/git/branchdialog.cpp
View File

@@ -192,15 +192,17 @@ void BranchDialog::checkout()
m_model->checkoutBranch(idx); m_model->checkoutBranch(idx);
} else if (branchCheckoutDialog.exec() == QDialog::Accepted && m_model) { } else if (branchCheckoutDialog.exec() == QDialog::Accepted && m_model) {
QString stashMessage; if (branchCheckoutDialog.makeStashOfCurrentBranch()) {
if (branchCheckoutDialog.makeStashOfCurrentBranch() if (!gitClient->executeSynchronousStash(m_repository,
|| branchCheckoutDialog.moveLocalChangesToNextBranch()) { currentBranch + QLatin1String("-AutoStash"))) {
return;
if (!gitClient->beginStashScope(m_repository, currentBranch + QLatin1String("-AutoStash"), NoPrompt)) }
} else if (branchCheckoutDialog.moveLocalChangesToNextBranch()) {
if (!gitClient->beginStashScope(m_repository, QLatin1String("Checkout"), NoPrompt))
return; return;
stashMessage = gitClient->stashInfo(m_repository).stashMessage();
} else if (branchCheckoutDialog.discardLocalChanges()) { } else if (branchCheckoutDialog.discardLocalChanges()) {
gitClient->synchronousReset(m_repository); if (!gitClient->synchronousReset(m_repository))
return;
} }
m_model->checkoutBranch(idx); m_model->checkoutBranch(idx);
@@ -214,7 +216,7 @@ void BranchDialog::checkout()
} }
} }
if (!stashMessage.isEmpty() && branchCheckoutDialog.moveLocalChangesToNextBranch()) if (branchCheckoutDialog.moveLocalChangesToNextBranch())
gitClient->endStashScope(m_repository); gitClient->endStashScope(m_repository);
else if (branchCheckoutDialog.popStashOfNextBranch()) else if (branchCheckoutDialog.popStashOfNextBranch())
gitClient->synchronousStashRestore(m_repository, stashName, true); gitClient->synchronousStashRestore(m_repository, stashName, true);