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

Git: Support stash --keep-index

Browse Source 
Task-number: QTCREATORBUG-13587
Change-Id: I23f62b961df73872ae980d95b91a3285c0e367c1
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>
This commit is contained in:
Orgad Shaneh
2015-02-04 22:39:00 +02:00
committed by Orgad Shaneh
parent c9df079885
commit 42e0ea62f6
4 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -502,6 +502,11 @@ bool GitPlugin::initialize(const QStringList &arguments, QString *errorMessage)
context, true, SLOT(stash()));
action->setToolTip(tr("Saves the current state of your work and resets the repository."));
action = createRepositoryAction(stashMenu, tr("Stash Unstaged Files"), "Git.StashUnstaged",
context, true, SLOT(stashUnstaged()));
action->setToolTip(tr("Saves the current state of your unstaged files and resets the repository "
"to its staged state."));
action = createRepositoryAction(stashMenu, tr("Take Snapshot..."), "Git.StashSnapshot",
context, true, SLOT(stashSnapshot()));
action->setToolTip(tr("Saves the current state of your work."));
@@ -1259,7 +1264,7 @@ void GitPlugin::applyPatch(const QString &workingDirectory, QString file)
m_gitClient->endStashScope(workingDirectory);
}
void GitPlugin::stash()
void GitPlugin::stash(bool unstagedOnly)
{
if (!DocumentManager::saveAllModifiedDocuments())
return;
@@ -1268,11 +1273,16 @@ void GitPlugin::stash()
QTC_ASSERT(state.hasTopLevel(), return);
const QString topLevel = state.topLevel();
m_gitClient->executeSynchronousStash(topLevel);
m_gitClient->executeSynchronousStash(topLevel, QString(), unstagedOnly);
if (m_stashDialog)
m_stashDialog->refresh(topLevel, true);
}
void GitPlugin::stashUnstaged()
{
stash(true);
}
void GitPlugin::stashSnapshot()
{
// Prompt for description, restore immediately and keep on working.