# HG changeset patch
# User Chris Cannam
# Date 1291204441 0
# Node ID f61f032b06f9ab58e572018688ff7533b2814424
# Parent  46bf2a4a1fc83ed33db9b510439649ce887721f7
 * Fix another use of stderr as identifier

diff -r 46bf2a4a1fc8 -r f61f032b06f9 grapher.cpp
--- a/grapher.cpp	Wed Dec 01 11:50:04 2010 +0000
+++ b/grapher.cpp	Wed Dec 01 11:54:01 2010 +0000
@@ -338,6 +338,7 @@
             throw LayoutException("Changeset has no ID");
         }
         if (m_changesets.contains(id)) {
+            DEBUG << "Duplicate changeset ID " << id << " in Grapher::layout()" << endl;
             throw LayoutException(QString("Duplicate changeset ID %1").arg(id));
         }
 
diff -r 46bf2a4a1fc8 -r f61f032b06f9 mainwindow.cpp
--- a/mainwindow.cpp	Wed Dec 01 11:50:04 2010 +0000
+++ b/mainwindow.cpp	Wed Dec 01 11:54:01 2010 +0000
@@ -1124,7 +1124,7 @@
     QMessageBox::information(this, "Pull complete", report);
 }
 
-void MainWindow::commandFailed(HgAction action, QString stderr)
+void MainWindow::commandFailed(HgAction action, QString output)
 {
     DEBUG << "MainWindow::commandFailed" << endl;
 
@@ -1137,7 +1137,7 @@
     case ACT_INCOMING:
         // returns non-zero code if the check was successful but there
         // are no changes pending
-        if (stderr.trimmed() == "") showIncoming("");
+        if (output.trimmed() == "") showIncoming("");
         return;
     case ACT_FOLDERDIFF:
     case ACT_FILEDIFF:
@@ -1162,9 +1162,9 @@
                          "<code>%1</code>"
                          "%2</qt>")
         .arg(command)
-        .arg((stderr.trimmed() != "") ?
+        .arg((output.trimmed() != "") ?
              tr("<p>Its output said:</p><code>%1</code>")
-             .arg(xmlEncode(stderr.left(800))
+             .arg(xmlEncode(output.left(800))
                   .replace("\n", "<br>"))
              : "");