diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-08-28 11:32:33 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-08-30 10:11:56 +0200 |
| commit | f2e4b2b9c84cc965bf6f3229ada0074449297ae0 (patch) | |
| tree | f086d22c44a181900c329a5338115cfef9c8deb2 /src/plugins/git/gitclient.cpp | |
| parent | 80194f4ef42af25782746dd28a82b848b151d0c7 (diff) | |
| download | qt-creator-f2e4b2b9c84cc965bf6f3229ada0074449297ae0.tar.gz | |
VCS: Invert Command -> runVcs dependency
* Unclutter runVcs
* Enable more dynamic signal/slot usage in Command
Change-Id: Ie97b17078778b0c86b74d5725a78e766828ac6d8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 54c7e23021..c7e5dfeac7 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -2253,7 +2253,6 @@ VcsBase::Command *GitClient::executeGit(const QString &workingDirectory, outputWindow()->appendCommand(workingDirectory, settings()->stringValue(GitSettings::binaryPathKey), arguments); VcsBase::Command *command = createCommand(workingDirectory, editor, useOutputToWindow, editorLineNumber); command->addJob(arguments, settings()->intValue(GitSettings::timeoutKey)); - command->setUnixTerminalDisabled(false); if (expectChanges) command->addFlags(VcsBasePlugin::ExpectRepoChanges); command->execute(); @@ -2320,8 +2319,7 @@ Utils::SynchronousProcessResponse GitClient::synchronousGit(const QString &worki { return VcsBasePlugin::runVcs(workingDirectory, gitBinaryPath(), gitArguments, settings()->intValue(GitSettings::timeoutKey) * 1000, - processEnvironment(), VcsBase::VcsBasePlugin::sshPrompt(), - flags, outputCodec); + flags, outputCodec, processEnvironment()); } bool GitClient::fullySynchronousGit(const QString &workingDirectory, @@ -2330,10 +2328,11 @@ bool GitClient::fullySynchronousGit(const QString &workingDirectory, QByteArray* errorText, unsigned flags) const { - return VcsBasePlugin::runFullySynchronous(workingDirectory, gitBinaryPath(), gitArguments, - processEnvironment(), outputText, errorText, - settings()->intValue(GitSettings::timeoutKey) * 1000, - flags); + VcsBase::Command command(gitBinaryPath(), workingDirectory, processEnvironment()); + command.addFlags(flags); + return command.runFullySynchronous(gitArguments, + settings()->intValue(GitSettings::timeoutKey) * 1000, + outputText, errorText); } void GitClient::updateSubmodulesIfNeeded(const QString &workingDirectory, bool prompt) |