Mercurial > hg > easyhg

changeset 546:4edb47f8c3a3 fswatcher

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Same for stdout
author Chris Cannam
date Tue, 14 Feb 2012 17:43:02 +0000
parents 3944da037ab8
children 9f91d1b2ed51
files src/mainwindow.cpp
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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