From c64b3f98827905b215a9ff95e4fa750596414db7 Mon Sep 17 00:00:00 2001
From: Orgad Shaneh <orgad.shaneh@audiocodes.com>
Date: Tue, 20 Sep 2016 11:05:03 +0300
Subject: [PATCH] Git: Do not rely on QProcess::readData/writeData in MergeTool

readData always returns 0 in Qt 5.7 (unless the process is not
running)...

Instead, write to the VCS output pane when reading from/writing to the
process.

Change-Id: Ie832d813d5a859b4ff5841fd2888783833c97945
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
---
 src/plugins/git/mergetool.cpp | 45 ++++++++++++-----------------------
 src/plugins/git/mergetool.h   |  5 ++--
 2 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/src/plugins/git/mergetool.cpp b/src/plugins/git/mergetool.cpp
index c5f5117487c..53edac70691 100644
--- a/src/plugins/git/mergetool.cpp
+++ b/src/plugins/git/mergetool.cpp
@@ -42,29 +42,6 @@ using namespace VcsBase;
 namespace Git {
 namespace Internal {
 
-class MergeToolProcess : public QProcess
-{
-public:
-    MergeToolProcess(QObject *parent = 0) : QProcess(parent)
-    { }
-
-protected:
-    qint64 readData(char *data, qint64 maxlen) override
-    {
-        qint64 res = QProcess::readData(data, maxlen);
-        if (res > 0)
-            VcsOutputWindow::append(QString::fromLocal8Bit(data, int(res)));
-        return res;
-    }
-
-    qint64 writeData(const char *data, qint64 len) override
-    {
-        if (len > 0)
-            VcsOutputWindow::append(QString::fromLocal8Bit(data, int(len)));
-        return QProcess::writeData(data, len);
-    }
-};
-
 MergeTool::MergeTool(QObject *parent) : QObject(parent)
 { }
 
@@ -77,7 +54,7 @@ bool MergeTool::start(const QString &workingDirectory, const QStringList &files)
 {
     QStringList arguments;
     arguments << "mergetool" << "-y" << files;
-    m_process = new MergeToolProcess(this);
+    m_process = new QProcess(this);
     m_process->setWorkingDirectory(workingDirectory);
     const Utils::FileName binary = GitPlugin::client()->vcsBinary();
     VcsOutputWindow::appendCommand(workingDirectory, binary, arguments);
@@ -98,7 +75,9 @@ MergeTool::FileState MergeTool::waitAndReadStatus(QString &extraInfo)
     QByteArray state;
     for (int i = 0; i < 5; ++i) {
         if (m_process->canReadLine()) {
-            state = m_process->readLine().trimmed();
+            const QByteArray line = m_process->readLine();
+            VcsOutputWindow::append(QString::fromLocal8Bit(line));
+            QByteArray state = line.trimmed();
             break;
         }
         m_process->waitForReadyRead(500);
@@ -209,8 +188,7 @@ void MergeTool::chooseAction()
         key = QVariant('a'); // abort
     ba.append(key.toChar().toLatin1());
     ba.append('\n');
-    m_process->write(ba);
-    m_process->waitForBytesWritten();
+    write(ba);
 }
 
 void MergeTool::addButton(QMessageBox *msgBox, const QString &text, char key)
@@ -223,17 +201,17 @@ void MergeTool::prompt(const QString &title, const QString &question)
     if (QMessageBox::question(Core::ICore::dialogParent(), title, question,
                               QMessageBox::Yes | QMessageBox::No,
                               QMessageBox::No) == QMessageBox::Yes) {
-        m_process->write("y\n");
+        write("y\n");
     } else {
-        m_process->write("n\n");
+        write("n\n");
     }
-    m_process->waitForBytesWritten();
 }
 
 void MergeTool::readData()
 {
     while (m_process->bytesAvailable()) {
         QByteArray line = m_process->canReadLine() ? m_process->readLine() : m_process->readAllStandardOutput();
+        VcsOutputWindow::append(QString::fromLocal8Bit(line));
         // {Normal|Deleted|Submodule|Symbolic link} merge conflict for 'foo.cpp'
         int index = line.indexOf(" merge conflict for ");
         if (index != -1) {
@@ -266,5 +244,12 @@ void MergeTool::done()
     deleteLater();
 }
 
+void MergeTool::write(const QByteArray &bytes)
+{
+    m_process->write(bytes);
+    m_process->waitForBytesWritten();
+    VcsOutputWindow::append(QString::fromLocal8Bit(bytes));
+}
+
 } // namespace Internal
 } // namespace Git
diff --git a/src/plugins/git/mergetool.h b/src/plugins/git/mergetool.h
index 3acdd83adbc..d9a54e24a0b 100644
--- a/src/plugins/git/mergetool.h
+++ b/src/plugins/git/mergetool.h
@@ -30,12 +30,12 @@
 
 QT_BEGIN_NAMESPACE
 class QMessageBox;
+class QProcess;
 QT_END_NAMESPACE
 
 namespace Git {
 namespace Internal {
 
-class MergeToolProcess;
 class GitClient;
 
 class MergeTool : public QObject
@@ -67,6 +67,7 @@ private:
     void prompt(const QString &title, const QString &question);
     void readData();
     void done();
+    void write(const QByteArray &bytes);
 
     FileState waitAndReadStatus(QString &extraInfo);
     QString mergeTypeName();
@@ -74,7 +75,7 @@ private:
     void chooseAction();
     void addButton(QMessageBox *msgBox, const QString &text, char key);
 
-    MergeToolProcess *m_process = nullptr;
+    QProcess *m_process = nullptr;
     MergeType m_mergeType = NormalMerge;
     QString m_fileName;
     FileState m_localState = UnknownState;