# HG changeset patch
# User Chris Cannam
# Date 1329241382 0
# Node ID 4edb47f8c3a338862fd68acf5ff5a36e9a1170e3
# Parent  3944da037ab84ef3631f8a9efd7d567c8f009325
Same for stdout

diff -r 3944da037ab8 -r 4edb47f8c3a3 src/mainwindow.cpp
--- a/src/mainwindow.cpp	Tue Feb 14 17:41:43 2012 +0000
+++ b/src/mainwindow.cpp	Tue Feb 14 17:43:02 2012 +0000
@@ -1983,7 +1983,7 @@
     m_commandSequenceInProgress = true;
 }
 
-void MainWindow::commandFailed(HgAction action, QString stdErr, QString stdout)
+void MainWindow::commandFailed(HgAction action, QString stdErr, QString stdOut)
 {
     DEBUG << "MainWindow::commandFailed" << endl;
 
@@ -2066,10 +2066,10 @@
         } else if (stdErr.contains("entry cancelled")) {
             // ignore this, user cancelled username or password dialog
             return;
-        } else if (stdErr.contains("no changes found") || stdout.contains("no changes found")) {
+        } else if (stdErr.contains("no changes found") || stdOut.contains("no changes found")) {
             // success: hg 2.1 starts returning failure code for empty pull/push
             m_commandSequenceInProgress = true; // there may be further commands
-            commandCompleted(action, stdout);
+            commandCompleted(action, stdOut);
             return;
         }
         break; // go on to default report
@@ -2083,10 +2083,10 @@
         } else if (stdErr.contains("entry cancelled")) {
             // ignore this, user cancelled username or password dialog
             return;
-        } else if (stdErr.contains("no changes found") || stdout.contains("no changes found")) {
+        } else if (stdErr.contains("no changes found") || stdOut.contains("no changes found")) {
             // success: hg 2.1 starts returning failure code for empty pull/push
             m_commandSequenceInProgress = true; // there may be further commands
-            commandCompleted(action, stdout);
+            commandCompleted(action, stdOut);
             return;
         }
         break; // go on to default report