diff options
| author | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-04-10 16:10:46 +0200 |
|---|---|---|
| committer | Tobias Hunger <tobias.hunger@theqtcompany.com> | 2015-04-14 11:22:00 +0000 |
| commit | 5954506d19b0f26129d6dbf7a9dcf925d3b56262 (patch) | |
| tree | da748c28e98891e9805386b7105aa3525b1eb833 /src/plugins/vcsbase | |
| parent | 085d4a900d26724c237721da98a382d8bb92d6b4 (diff) | |
Vcs: Move vcsSynchronousExec into VcsBaseClientImpl
Use it in favor of git's synchronousGit method.
Change-Id: I1fc8031cb6d258073b64163aeeeaeac84443fb8c
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/vcsbase')
| -rw-r--r-- | src/plugins/vcsbase/vcsbaseclient.cpp | 12 | ||||
| -rw-r--r-- | src/plugins/vcsbase/vcsbaseclient.h | 14 |
2 files changed, 13 insertions, 13 deletions
diff --git a/src/plugins/vcsbase/vcsbaseclient.cpp b/src/plugins/vcsbase/vcsbaseclient.cpp index a717fa5f08..6454486980 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, diff --git a/src/plugins/vcsbase/vcsbaseclient.h b/src/plugins/vcsbase/vcsbaseclient.h index 559b0c929a..eaf8f28da2 100644 --- a/src/plugins/vcsbase/vcsbaseclient.h +++ b/src/plugins/vcsbase/vcsbaseclient.h @@ -115,6 +115,13 @@ protected: QByteArray *outputData, QByteArray *errorData = 0, unsigned flags = 0) const; + // Synchronous VCS execution using Utils::SynchronousProcess, with + // log windows updating (using VcsBasePlugin::runVcs with flags) + Utils::SynchronousProcessResponse vcsSynchronousExec(const QString &workingDir, + const QStringList &args, + unsigned flags = 0, + QTextCodec *outputCodec = 0) const; + private: void saveSettings(); void commandFinishedGotoLine(QWidget*); @@ -226,13 +233,6 @@ protected: QString vcsEditorTitle(const QString &vcsCmd, const QString &sourceId) const; - // Synchronous VCS execution using Utils::SynchronousProcess, with - // log windows updating (using VcsBasePlugin::runVcs with flags) - Utils::SynchronousProcessResponse vcsSynchronousExec(const QString &workingDir, - const QStringList &args, - unsigned flags = 0, - QTextCodec *outputCodec = 0) const; - private: void statusParser(const QString&); |