aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/vcsbase/vcsbaseclient.cpp
diff options
context:
space:
mode:
authorTobias Hunger <[email protected]>2015-04-10 16:10:46 +0200
committerTobias Hunger <[email protected]>2015-04-14 11:22:00 +0000
commit5954506d19b0f26129d6dbf7a9dcf925d3b56262 (patch)
treeda748c28e98891e9805386b7105aa3525b1eb833 /src/plugins/vcsbase/vcsbaseclient.cpp
parent085d4a900d26724c237721da98a382d8bb92d6b4 (diff)
Vcs: Move vcsSynchronousExec into VcsBaseClientImpl
Use it in favor of git's synchronousGit method. Change-Id: I1fc8031cb6d258073b64163aeeeaeac84443fb8c Reviewed-by: Orgad Shaneh <[email protected]>
Diffstat (limited to 'src/plugins/vcsbase/vcsbaseclient.cpp')
-rw-r--r--src/plugins/vcsbase/vcsbaseclient.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp
index a717fa5f081..6454486980c 100644
--- a/src/plugins/vcsbase/vcsbaseclient.cpp
+++ b/src/plugins/vcsbase/vcsbaseclient.cpp
@@ -400,13 +400,13 @@ bool VcsBaseClient::synchronousPush(const QString &workingDir,
return resp.result == Utils::SynchronousProcessResponse::Finished;
}
-Utils::SynchronousProcessResponse VcsBaseClient::vcsSynchronousExec(const QString &workingDirectory,
- const QStringList &args,
- unsigned flags,
- QTextCodec *outputCodec) const
+Utils::SynchronousProcessResponse VcsBaseClientImpl::vcsSynchronousExec(const QString &workingDir,
+ const QStringList &args,
+ unsigned flags,
+ QTextCodec *outputCodec) const
{
- return VcsBasePlugin::runVcs(workingDirectory, vcsBinary(), args, vcsTimeoutS(), flags,
- outputCodec);
+ return VcsBasePlugin::runVcs(workingDir, vcsBinary(), args, vcsTimeoutS(), flags,
+ outputCodec, processEnvironment());
}
void VcsBaseClient::annotate(const QString &workingDir, const QString &file,