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

Vcs: Add vcsBinary and vcsTimeout methods to VcsBaseClient

Browse Source 
Change-Id: I966a76ee4c1e5c45ac7332613e90cf511afc584c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Tobias Hunger
2015-03-25 12:30:07 +01:00
parent 65cd5381d9
commit f44161bb9a
14 changed files with 93 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/mercurial/mercurialclient.cpp
View File

@@ -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());