diff src/hgrunner.cpp @ 537:a4e699d32a9a

gah! hg 2.1 changes push and pull so as to return failure codes on success, if there was nothing to push or pull
author Chris Cannam
date Fri, 10 Feb 2012 13:08:07 +0000
parents cd3dd285d0ff
children 533519ebc0cb
line wrap: on
line diff
--- a/src/hgrunner.cpp	Fri Nov 25 09:34:55 2011 +0000
+++ b/src/hgrunner.cpp	Fri Feb 10 13:08:07 2012 +0000
@@ -357,7 +357,7 @@
                   << procExitCode << ", exit status " << procExitStatus
                   << ", stderr follows" << endl;
             DEBUG << m_stderr << endl;
-            emit commandFailed(completedAction, m_stderr);
+            emit commandFailed(completedAction, m_stderr, m_stdout);
         }
     }
 
@@ -495,7 +495,7 @@
 
     if (action.workingDir.isEmpty()) {
         // We require a working directory, never just operate in pwd
-        emit commandFailed(action, "EasyMercurial: No working directory supplied, will not run Mercurial command without one");
+        emit commandFailed(action, "EasyMercurial: No working directory supplied, will not run Mercurial command without one", "");
         return;
     }