VCS: VcsBaseClient::vcsFullySynchronousExec returns a SynchronousProcessResponse

Change-Id: Ic155da2ed1fd36f1f91327ac90f34a5cad3c210e
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>

2 files changed, 7 insertions, 10 deletions

diff --git a/src/plugins/subversion/subversionclient.cpp b/src/plugins/subversion/subversionclient.cpp
index 12fdcdf4ba..93b4dcf5f4 100644
--- a/src/plugins/subversion/subversionclient.cpp
+++ b/src/plugins/subversion/subversionclient.cpp
@@ -138,14 +138,13 @@ QString SubversionClient::synchronousTopic(const QString &repository)
     QStringList args;
     args << QLatin1String("info");
 
-    QByteArray stdOut;
-    if (!vcsFullySynchronousExec(repository, args, &stdOut))
+    const SynchronousProcessResponse result = vcsFullySynchronousExec(repository, args);
+    if (result.result != SynchronousProcessResponse::Finished)
         return QString();
 
     const QString revisionString = QLatin1String("Revision: ");
     // stdOut is ASCII only (at least in those areas we care about).
-    QString output = commandOutputFromLocal8Bit(stdOut);
-    foreach (const QString &line, output.split(QLatin1Char('\n'))) {
+    foreach (const QString &line, result.stdOut().split(QLatin1Char('\n'))) {
         if (line.startsWith(revisionString))
             return QString::fromLatin1("r") + line.mid(revisionString.count());
     }
diff --git a/src/plugins/subversion/subversionplugin.cpp b/src/plugins/subversion/subversionplugin.cpp
index d5b0f90e4b..d52f10aa8a 100644
--- a/src/plugins/subversion/subversionplugin.cpp
+++ b/src/plugins/subversion/subversionplugin.cpp
@@ -877,21 +877,19 @@ SubversionResponse SubversionPlugin::runSvn(const QString &workingDir,
                                             int timeOutS, unsigned flags,
                                             QTextCodec *outputCodec) const
 {
-    const FileName executable = client()->vcsBinary();
     SubversionResponse response;
-    if (executable.isEmpty()) {
+    if (client()->vcsBinary().isEmpty()) {
         response.error = true;
         response.message =tr("No subversion executable specified.");
         return response;
     }
 
-    const SynchronousProcessResponse sp_resp =
-            VcsBasePlugin::runVcs(workingDir, executable, arguments, timeOutS,
-                                           flags, outputCodec);
+    const SynchronousProcessResponse sp_resp
+            = client()->vcsFullySynchronousExec(workingDir, arguments, flags, timeOutS, outputCodec);
 
     response.error = sp_resp.result != SynchronousProcessResponse::Finished;
     if (response.error)
-        response.message = sp_resp.exitMessage(executable.toString(), timeOutS);
+        response.message = sp_resp.exitMessage(client()->vcsBinary().toString(), timeOutS);
     response.stdErr = sp_resp.stdErr();
     response.stdOut = sp_resp.stdOut();
     return response;