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

Git: Do not hang on Continue Cherry-Pick/Revert

Browse Source 
...after conflicts resolving

Change-Id: I02637e19d1f5b595b2c63d8e001c0df6af94a347
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-12-23 09:32:59 +02:00
committed by Orgad Shaneh
parent 3330b695fa
commit df9299fd24
3 changed files with 31 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3521,21 +3521,39 @@ bool GitClient::canRebase(const QString &workingDirectory) const
return true;
}
void GitClient::rebase(const QString &workingDirectory, const QString &baseBranch)
void GitClient::rebase(const QString &workingDirectory, const QString &argument)
{
asyncCommand(workingDirectory, QStringList() << QLatin1String("rebase") << argument, true);
}
void GitClient::cherryPick(const QString &workingDirectory, const QString &argument)
{
asyncCommand(workingDirectory, QStringList() << QLatin1String("cherry-pick") << argument);
}
void GitClient::revert(const QString &workingDirectory, const QString &argument)
{
asyncCommand(workingDirectory, QStringList() << QLatin1String("revert") << argument);
}
// Executes a command asynchronously. Work tree is expected to be clean.
// Stashing is handled prior to this call.
void GitClient::asyncCommand(const QString &workingDirectory, const QStringList &arguments,
bool hasProgress)
{
// Git might request an editor, so this must be done asynchronously
// and without timeout
QString gitCommand = QLatin1String("rebase");
QStringList arguments;
arguments << gitCommand << baseBranch;
QString gitCommand = arguments.first();
outputWindow()->appendCommand(workingDirectory,
settings()->stringValue(GitSettings::binaryPathKey),
arguments);
VcsBase::Command *command = createCommand(workingDirectory, 0, true);
new ConflictHandler(command, workingDirectory, gitCommand);
command->setProgressParser(new ProgressParser);
if (hasProgress)
command->setProgressParser(new ProgressParser);
command->addJob(arguments, -1);
command->execute();
command->setCookie(workingDirectory);
}
bool GitClient::synchronousRevert(const QString &workingDirectory, const QString &commit)
@@ -3577,12 +3595,7 @@ void GitClient::interactiveRebase(const QString &workingDirectory, const QString
outputWindow()->appendCommand(workingDirectory, settings()->stringValue(GitSettings::binaryPathKey), arguments);
if (fixup)
m_disableEditor = true;
VcsBase::Command *command = createCommand(workingDirectory, 0, true);
new ConflictHandler(command, workingDirectory, QLatin1String("rebase"));
command->setProgressParser(new ProgressParser);
command->addJob(arguments, -1);
command->execute();
command->setCookie(workingDirectory);
asyncCommand(workingDirectory, arguments, true);
if (fixup)
m_disableEditor = false;
}

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

@@ -254,7 +254,11 @@ public:
bool synchronousMerge(const QString &workingDirectory, const QString &branch,
bool allowFastForward = true);
bool canRebase(const QString &workingDirectory) const;
void rebase(const QString &workingDirectory, const QString &baseBranch);
void rebase(const QString &workingDirectory, const QString &argument);
void cherryPick(const QString &workingDirectory, const QString &argument);
void revert(const QString &workingDirectory, const QString &argument);
void asyncCommand(const QString &workingDirectory, const QStringList &arguments,
bool hasProgress = false);
bool synchronousRevert(const QString &workingDirectory, const QString &commit);
bool synchronousCherryPick(const QString &workingDirectory, const QString &commit);
void interactiveRebase(const QString &workingDirectory, const QString &commit, bool fixup);

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

@@ -1206,9 +1206,9 @@ void GitPlugin::continueOrAbortCommand()
else if (action == m_continueRebaseAction)
m_gitClient->rebase(state.topLevel(), QLatin1String("--continue"));
else if (action == m_continueCherryPickAction)
m_gitClient->synchronousCherryPick(state.topLevel(), QLatin1String("--continue"));
m_gitClient->cherryPick(state.topLevel(), QLatin1String("--continue"));
else if (action == m_continueRevertAction)
m_gitClient->synchronousRevert(state.topLevel(), QLatin1String("--continue"));
m_gitClient->revert(state.topLevel(), QLatin1String("--continue"));
updateContinueAndAbortCommands();
}