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

Git: Use stash pop instead of apply...

Browse Source 
... when the stash should be removed on successful pop

Change-Id: I39b2c01b0a518d3c70bcb8dc898191cca6d3e84d
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-01-22 21:02:20 +02:00
committed by Orgad Shaneh
parent 53443616e5
commit daef1fbb88
5 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -207,10 +207,7 @@ void BranchDialog::checkout()
if (!stashMessage.isEmpty() && branchCheckoutDialog.moveLocalChangesToNextBranch())
gitClient->stashPop(m_repository);
else if (branchCheckoutDialog.popStashOfNextBranch())
gitClient->synchronousStashRestore(m_repository, stashName);
if (branchCheckoutDialog.hasStashForNextBranch())
gitClient->synchronousStashRemove(m_repository, stashName);
gitClient->synchronousStashRestore(m_repository, stashName, true);
}
enableButtons();
}

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

@@ -2282,12 +2282,13 @@ void GitClient::stashPop(const QString &workingDirectory)
bool GitClient::synchronousStashRestore(const QString &workingDirectory,
const QString &stash,
bool pop,
const QString &branch /* = QString()*/,
QString *errorMessage)
{
QStringList arguments(QLatin1String("stash"));
if (branch.isEmpty())
arguments << QLatin1String("apply") << stash;
arguments << QLatin1String(pop ? "pop" : "apply") << stash;
else
arguments << QLatin1String("branch") << branch << stash;
QByteArray outputText;

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

@@ -150,6 +150,7 @@ public:
QString *errorMessage = 0);
bool synchronousStashRestore(const QString &workingDirectory,
const QString &stash,
bool pop = false,
const QString &branch = QString(),
QString *errorMessage = 0);
bool synchronousStashRemove(const QString &workingDirectory,

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

@@ -218,7 +218,7 @@ bool GitVersionControl::vcsRestoreSnapshot(const QString &topLevel, const QStrin
QString stashName;
success = m_client->stashNameFromMessage(topLevel, name, &stashName)
&& m_client->synchronousReset(topLevel)
&& m_client->synchronousStashRestore(topLevel, stashName);
&& m_client->synchronousStashRestore(topLevel, stashName, true);
}
} while (false);
return success;

4
src/plugins/git/stashdialog.cpp
View File

@@ -338,7 +338,7 @@ void StashDialog::restoreCurrent()
// Make sure repository is not modified, restore. The command will
// output to window on success.
const bool success = promptForRestore(&name, 0, &errorMessage)
&& gitClient()->synchronousStashRestore(m_repository, name, QString(), &errorMessage);
&& gitClient()->synchronousStashRestore(m_repository, name, false, QString(), &errorMessage);
if (success) {
refresh(m_repository, true); // Might have stashed away local changes.
} else {
@@ -355,7 +355,7 @@ void StashDialog::restoreCurrentInBranch()
QString branch;
QString name = m_model->at(index).name;
const bool success = promptForRestore(&name, &branch, &errorMessage)
&& gitClient()->synchronousStashRestore(m_repository, name, branch, &errorMessage);
&& gitClient()->synchronousStashRestore(m_repository, name, false, branch, &errorMessage);
if (success) {
refresh(m_repository, true); // git deletes the stash, unfortunately.
} else {