diff options
| author | hjk <hjk@qt.io> | 2020-02-03 17:54:41 +0100 |
|---|---|---|
| committer | hjk <hjk@qt.io> | 2020-02-04 07:11:41 +0000 |
| commit | 85d9756c006dd5020fce07194b58157cd35626a2 (patch) | |
| tree | a95f2597839af1d7e822710b931cb4de8e3b4ab4 /src/plugins/subversion | |
| parent | 481a00c298f4aa3348ca034a74defcf95f07d0c4 (diff) | |
VcsBase: More use of settings instead of client when it suffices
Client::vcsBinary() maps directly to Settings::binaryPath()
except for git can be replaced by that in non-generic settings.
Change-Id: I245659d3c423361e87c92e8995fa3476d798cc7b
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Diffstat (limited to 'src/plugins/subversion')
| -rw-r--r-- | src/plugins/subversion/subversionplugin.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp index c489977a5b..dbdc47fd06 100644 --- a/src/plugins/subversion/subversionplugin.cpp +++ b/src/plugins/subversion/subversionplugin.cpp @@ -1018,7 +1018,7 @@ SubversionResponse SubversionPluginPrivate::runSvn(const QString &workingDir, QTextCodec *outputCodec) const { SubversionResponse response; - if (m_client->vcsBinary().isEmpty()) { + if (m_settings.binaryPath().isEmpty()) { response.error = true; response.message =tr("No subversion executable specified."); return response; @@ -1029,7 +1029,7 @@ SubversionResponse SubversionPluginPrivate::runSvn(const QString &workingDir, response.error = sp_resp.result != SynchronousProcessResponse::Finished; if (response.error) - response.message = sp_resp.exitMessage(m_client->vcsBinary().toString(), timeOutS); + response.message = sp_resp.exitMessage(m_settings.binaryPath().toString(), timeOutS); response.stdErr = sp_resp.stdErr(); response.stdOut = sp_resp.stdOut(); return response; @@ -1222,7 +1222,7 @@ bool SubversionPluginPrivate::isVcsFileOrDirectory(const Utils::FilePath &fileNa bool SubversionPluginPrivate::isConfigured() const { - const Utils::FilePath binary = m_client->vcsBinary(); + const Utils::FilePath binary = m_settings.binaryPath(); if (binary.isEmpty()) return false; QFileInfo fi = binary.toFileInfo(); @@ -1296,7 +1296,7 @@ Core::ShellCommand *SubversionPluginPrivate::createInitialCheckoutCommand(const args << extraArgs << url << localName; auto command = new VcsBase::VcsCommand(baseDirectory.toString(), m_client->processEnvironment()); - command->addJob({m_client->vcsBinary(), args}, -1); + command->addJob({m_settings.binaryPath(), args}, -1); return command; } |