diff options
| author | Tobias Hunger <[email protected]> | 2015-04-10 14:44:17 +0200 |
|---|---|---|
| committer | Tobias Hunger <[email protected]> | 2015-04-13 10:47:08 +0000 |
| commit | 7719fb669cc522e2b1846b05e22fb1d0a6317963 (patch) | |
| tree | cf1edd663f9b65dc21eb523573be9ce7a0a26a39 /src/plugins/vcsbase/vcsbaseclient.cpp | |
| parent | a55fb4a378644ab641f0663c8f2577f48a905491 (diff) | |
Vcs: Standardize on second based timeouts
Change-Id: Ia273fda05a4c4a1934819f26e5dc1b6b80a89f6f
Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/vcsbase/vcsbaseclient.cpp')
| -rw-r--r-- | src/plugins/vcsbase/vcsbaseclient.cpp | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index 75760e3150a..2120adf094d 100644 --- a/src/plugins/vcsbase/vcsbaseclient.cpp +++ b/src/plugins/vcsbase/vcsbaseclient.cpp @@ -142,7 +142,7 @@ VcsCommand *VcsBaseClientImpl::createCommand(const QString &workingDirectory, JobOutputBindMode mode) const { auto cmd = new VcsCommand(vcsBinary(), workingDirectory, processEnvironment()); - cmd->setDefaultTimeout(vcsTimeout()); + cmd->setDefaultTimeoutS(vcsTimeoutS()); if (editor) d->bindCommandToEditor(cmd, editor); if (mode == VcsWindowOutputBind) { @@ -159,7 +159,7 @@ VcsCommand *VcsBaseClientImpl::createCommand(const QString &workingDirectory, void VcsBaseClientImpl::enqueueJob(VcsCommand *cmd, const QStringList &args, Utils::ExitCodeInterpreter *interpreter) { - cmd->addJob(args, vcsTimeout(), interpreter); + cmd->addJob(args, vcsTimeoutS(), interpreter); cmd->execute(); } @@ -188,7 +188,7 @@ void VcsBaseClientImpl::annotateRevisionRequested(const QString &workingDirector annotate(workingDirectory, file, changeCopy, line); } -int VcsBaseClientImpl::vcsTimeout() const +int VcsBaseClientImpl::vcsTimeoutS() const { return settings().intValue(VcsBaseClientSettings::timeoutKey); } @@ -394,11 +394,11 @@ bool VcsBaseClient::vcsFullySynchronousExec(const QString &workingDir, vcsProcess.closeWriteChannel(); QByteArray stdErr; - if (!Utils::SynchronousProcess::readDataFromProcess(vcsProcess, vcsTimeout() * 1000, + if (!Utils::SynchronousProcess::readDataFromProcess(vcsProcess, vcsTimeoutS() * 1000, output, &stdErr, true)) { Utils::SynchronousProcess::stopProcess(vcsProcess); VcsOutputWindow::appendError(tr("Timed out after %1s waiting for the process %2 to finish.") - .arg(vcsTimeout()).arg(binary.toUserOutput())); + .arg(vcsTimeoutS()).arg(binary.toUserOutput())); return false; } if (!stdErr.isEmpty()) @@ -412,8 +412,8 @@ Utils::SynchronousProcessResponse VcsBaseClient::vcsSynchronousExec(const QStrin unsigned flags, QTextCodec *outputCodec) const { - return VcsBasePlugin::runVcs(workingDirectory, vcsBinary(), args, vcsTimeout() * 1000, - flags, outputCodec); + return VcsBasePlugin::runVcs(workingDirectory, vcsBinary(), args, vcsTimeoutS(), flags, + outputCodec); } void VcsBaseClient::annotate(const QString &workingDir, const QString &file, |