aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/mercurial
diff options
context:
space:
mode:
authorTobias Hunger <tobias.hunger@theqtcompany.com>2015-03-25 12:30:07 +0100
committerTobias Hunger <tobias.hunger@theqtcompany.com>2015-03-26 14:20:54 +0000
commitf44161bb9ac960ee8b0a804fbf6b3ca167138a9a (patch)
treedf8d314f94dd1e14771b5823cd87549bf4ffdc23 /src/plugins/mercurial
parent65cd5381d96812546cb4b775785aa63483b4aa8c (diff)
Vcs: Add vcsBinary and vcsTimeout methods to VcsBaseClient
Change-Id: I966a76ee4c1e5c45ac7332613e90cf511afc584c Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/mercurial')
-rw-r--r--src/plugins/mercurial/mercurialclient.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp
index 1f51137eed..11d82b4ec0 100644
--- a/src/plugins/mercurial/mercurialclient.cpp
+++ b/src/plugins/mercurial/mercurialclient.cpp
@@ -160,14 +160,12 @@ bool MercurialClient::synchronousPull(const QString &workingDir, const QString &
VcsBasePlugin::SshPasswordPrompt
| VcsBasePlugin::ShowStdOutInLogWindow
| VcsBasePlugin::ShowSuccessMessage;
- const FileName binary = settings()->binaryPath();
- const int timeoutSec = settings()->value(settings()->timeoutKey).toInt();
// cause mercurial doesn`t understand LANG
QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
env.insert(QLatin1String("LANGUAGE"), QLatin1String("C"));
const SynchronousProcessResponse resp = VcsBasePlugin::runVcs(
- workingDir, binary, args, timeoutSec * 1000, flags, 0, env);
+ workingDir, vcsBinary(), args, vcsTimeout() * 1000, flags, 0, env);
const bool ok = resp.result == SynchronousProcessResponse::Finished;
parsePullOutput(resp.stdOut.trimmed());