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

Git: Add enqueueJob method to GitClient

Browse Source 
That makes it more similar to the VcsBaseClient.

Change-Id: Iabdd177d0734a6c1001c9bc5c5a0e2375ec169bc
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-03-25 16:02:06 +01:00
parent 5c8af1a490
commit 3718dfce98
3 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1584,13 +1584,12 @@ void GitClient::branchesForCommit(const QString &revision)
QString workingDirectory = controller->baseDirectory();
auto command = new VcsCommand(vcsBinary(), workingDirectory, processEnvironment());
command->setCodec(getSourceCodec(currentDocumentPath()));
command->setCookie(workingDirectory);
connect(command, &VcsCommand::output, controller,
&DiffEditorController::informationForCommitReceived);
command->addJob(arguments, -1);
command->setCookie(workingDirectory);
command->execute();
enqueueJob(command, arguments);
}
bool GitClient::isRemoteCommit(const QString &workingDirectory, const QString &commit)
@@ -2007,6 +2006,12 @@ VcsCommand *GitClient::createCommand(const QString &workingDirectory, VcsBaseEdi
return command;
}
void GitClient::enqueueJob(VcsCommand *cmd, const QStringList &args, ExitCodeInterpreter *interpreter)
{
cmd->addJob(args, vcsTimeout(), interpreter);
cmd->execute();
}
// Execute a single command
VcsCommand *GitClient::executeGit(const QString &workingDirectory,
const QStringList &arguments,
@@ -2019,9 +2024,8 @@ VcsCommand *GitClient::executeGit(const QString &workingDirectory,
VcsCommand *command = createCommand(workingDirectory, editor,
useOutputToWindow ? VcsWindowOutputBind : NoOutputBind);
command->setCookie(editorLineNumber);
command->addJob(arguments, vcsTimeout() * 1000);
command->addFlags(additionalFlags);
command->execute();
enqueueJob(command, arguments);
return command;
}
@@ -3137,9 +3141,8 @@ void GitClient::asyncCommand(const QString &workingDirectory, const QStringList
new ConflictHandler(command, workingDirectory, gitCommand);
if (hasProgress)
command->setProgressParser(new GitProgressParser);
command->addJob(arguments, -1);
command->execute();
command->setCookie(workingDirectory);
enqueueJob(command, arguments);
}
bool GitClient::synchronousRevert(const QString &workingDirectory, const QString &commit)

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

@@ -61,7 +61,10 @@ namespace VcsBase {
class VcsBaseEditorParameterWidget;
}
namespace Utils { struct SynchronousProcessResponse; }
namespace Utils {
class ExitCodeInterpreter;
struct SynchronousProcessResponse;
} // namespace Utils
namespace DiffEditor {
class DiffEditorDocument;
@@ -385,6 +388,8 @@ private:
VcsBase::VcsCommand *createCommand(const QString &workingDirectory,
VcsBase::VcsBaseEditorWidget *editor = 0,
JobOutputBindMode mode = NoOutputBind);
void enqueueJob(VcsBase::VcsCommand *cmd, const QStringList &args,
Utils::ExitCodeInterpreter *interpreter = 0);
VcsBase::VcsCommand *executeGit(const QString &workingDirectory,
const QStringList &arguments,