diff options
| author | Eike Ziller <[email protected]> | 2016-10-27 12:10:03 +0200 |
|---|---|---|
| committer | Eike Ziller <[email protected]> | 2016-10-27 12:10:26 +0200 |
| commit | cf47f3e8074bcea183312bf3f31c43fe54bd7daa (patch) | |
| tree | 84122eae55b8c6e0fe9f322c387490703fd37bb3 /src/plugins/vcsbase/vcsbaseclient.cpp | |
| parent | e0ee142f8d11f1fa068de6c32d1eff0a599ec336 (diff) | |
| parent | c777bd32bc9dd2d1129630b029111d0e2a50099f (diff) | |
Merge remote-tracking branch 'origin/4.2'
Change-Id: Ia346d86ad5fabe9d91454ea642cbeac5ec862699
Diffstat (limited to 'src/plugins/vcsbase/vcsbaseclient.cpp')
| -rw-r--r-- | src/plugins/vcsbase/vcsbaseclient.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index aae750dc318..aa0204cc757 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -175,6 +175,18 @@ QString VcsBaseClientImpl::stripLastNewline(const QString &in) return in; } +Utils::SynchronousProcessResponse +VcsBaseClientImpl::vcsFullySynchronousExec(const QString &workingDir, const Utils::FileName &binary, + const QStringList &args, unsigned flags, + int timeoutS, QTextCodec *codec) const +{ + VcsCommand command(workingDir, processEnvironment()); + command.addFlags(flags); + if (codec) + command.setCodec(codec); + return command.runCommand(binary, args, (timeoutS > 0) ? timeoutS : vcsTimeoutS()); +} + void VcsBaseClientImpl::resetCachedVcsInfo(const QString &workingDir) { Core::VcsManager::resetVersionControlForDirectory(workingDir); @@ -197,11 +209,7 @@ Utils::SynchronousProcessResponse VcsBaseClientImpl::vcsFullySynchronousExec(const QString &workingDir, const QStringList &args, unsigned flags, int timeoutS, QTextCodec *codec) const { - VcsCommand command(workingDir, processEnvironment()); - command.addFlags(flags); - if (codec) - command.setCodec(codec); - return command.runCommand(vcsBinary(), args, (timeoutS > 0) ? timeoutS : vcsTimeoutS()); + return vcsFullySynchronousExec(workingDir, vcsBinary(), args, flags, timeoutS, codec); } VcsCommand *VcsBaseClientImpl::vcsExec(const QString &workingDirectory, const QStringList &arguments, |