Merge remote-tracking branch 'origin/4.1'

Change-Id: Ieaddc6093d10c08a54acb9b57cbbfe022bc3c038

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);
@@ -93,16 +70,9 @@ bool MergeTool::start(const QString &workingDirectory, const QStringList &files)
     return true;
 }
 
-MergeTool::FileState MergeTool::waitAndReadStatus(QString &extraInfo)
+MergeTool::FileState MergeTool::parseStatus(const QByteArray &line, QString &extraInfo)
 {
-    QByteArray state;
-    for (int i = 0; i < 5; ++i) {
-        if (m_process->canReadLine()) {
-            state = m_process->readLine().trimmed();
-            break;
-        }
-        m_process->waitForReadyRead(500);
-    }
+    QByteArray state = line.trimmed();
     // "  {local}: modified file"
     // "  {remote}: deleted"
     if (!state.isEmpty()) {
@@ -209,8 +179,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,25 +192,27 @@ 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) {
             m_mergeType = mergeType(line.left(index));
             int quote = line.indexOf('\'');
             m_fileName = QString::fromLocal8Bit(line.mid(quote + 1, line.lastIndexOf('\'') - quote - 1));
-            m_localState = waitAndReadStatus(m_localInfo);
-            m_remoteState = waitAndReadStatus(m_remoteInfo);
+        } else if (line.startsWith("  {local}")) {
+            m_localState = parseStatus(line, m_localInfo);
+        } else if (line.startsWith("  {remote}")) {
+            m_remoteState = parseStatus(line, m_remoteInfo);
             chooseAction();
         } else if (line.startsWith("Was the merge successful")) {
             prompt(tr("Unchanged File"), tr("Was the merge successful?"));
@@ -266,5 +237,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

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,14 +67,15 @@ private:
     void prompt(const QString &title, const QString &question);
     void readData();
     void done();
+    void write(const QByteArray &bytes);
 
-    FileState waitAndReadStatus(QString &extraInfo);
+    FileState parseStatus(const QByteArray &line, QString &extraInfo);
     QString mergeTypeName();
     QString stateName(FileState state, const QString &extraInfo);
     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;