comparison hgrunner.cpp @ 110:0f039d3cc38e

* Separate out the hgrunner output into stdout and stderr again (merging them was a failed experiment)

     env.insert("LANG", "en_US.utf8");
     env.insert("LC_ALL", "en_US.utf8");
     env.insert("HGPLAIN", "1");
     m_proc->setProcessEnvironment(env);
 
-    m_proc->setProcessChannelMode(QProcess::MergedChannels);
-
     setTextVisible(false);
     setVisible(false);
     m_isRunning = false;
 
-    m_output.clear();
-
     connect(m_proc, SIGNAL(started()), this, SLOT(started()));
     connect(m_proc, SIGNAL(finished(int, QProcess::ExitStatus)),
             this, SLOT(finished(int, QProcess::ExitStatus)));
-    connect(m_proc, SIGNAL(readyRead()), this, SLOT(dataReady()));
+    connect(m_proc, SIGNAL(readyReadStandardOutput()),
+            this, SLOT(dataReadyStdout()));
+    connect(m_proc, SIGNAL(readyReadStandardError()),
+            this, SLOT(dataReadyStderr()));
 }
 
 HgRunner::~HgRunner()
 {
     if (m_ptySlaveFilename != "") {

     if (realmRe.indexIn(text) >= 0) {
         noteRealm(realmRe.cap(1));
     }
 }
 
-void HgRunner::dataReady()
-{
-    DEBUG << "dataReady" << endl;
-    QString chunk = QString::fromUtf8(m_proc->readAll());
-    m_output += chunk;
+void HgRunner::dataReadyStdout()
+{
+    DEBUG << "dataReadyStdout" << endl;
+    QString chunk = QString::fromUtf8(m_proc->readAllStandardOutput());
+    m_stdout += chunk;
+    checkPrompts(chunk);
+}
+
+void HgRunner::dataReadyStderr()
+{
+    DEBUG << "dataReadyStderr" << endl;
+    QString chunk = QString::fromUtf8(m_proc->readAllStandardError());
+    m_stderr += chunk;
     checkPrompts(chunk);
 }
 
 void HgRunner::finished(int procExitCode, QProcess::ExitStatus procExitStatus)
 {

         DEBUG << "HgRunner::finished: WARNING: completed action is ACT_NONE" << endl;
     }
 
     if (procExitCode == 0 && procExitStatus == QProcess::NormalExit) {
         DEBUG << "HgRunner::finished: Command completed successfully" << endl;
-        //!!! NB this is all output not stdout as it should be
-        emit commandCompleted(completedAction, m_output);
+        emit commandCompleted(completedAction, m_stdout);
     } else {
         DEBUG << "HgRunner::finished: Command failed" << endl;
-        //!!! NB this is all output not stderr as it should be
-        emit commandFailed(completedAction, m_output);
+        emit commandFailed(completedAction, m_stderr);
     }
 
     checkQueue();
 }
 /*

 #endif
 
     m_isRunning = true;
     setRange(0, 0);
     show();
-    m_output.clear();
+    m_stdout.clear();
+    m_stderr.clear();
     m_realm = "";
     m_userName = "";
 
     if (!action.workingDir.isEmpty()) {
         m_proc->setWorkingDirectory(action.workingDir);