Mercurial > hg > easyhg

changeset 143:f61f032b06f9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Fix another use of stderr as identifier
author Chris Cannam
date Wed, 01 Dec 2010 11:54:01 +0000
parents 46bf2a4a1fc8
children 0ad212075b36 644bd31e8301
files grapher.cpp mainwindow.cpp
diffstat 2 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- 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));
         }
 
--- 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>"))
              : "");