comparison 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
comparison
equal deleted inserted replaced
536:5f04fa848f34 537:a4e699d32a9a
355 } else { 355 } else {
356 DEBUG << "HgRunner::finished: Command failed, exit code " 356 DEBUG << "HgRunner::finished: Command failed, exit code "
357 << procExitCode << ", exit status " << procExitStatus 357 << procExitCode << ", exit status " << procExitStatus
358 << ", stderr follows" << endl; 358 << ", stderr follows" << endl;
359 DEBUG << m_stderr << endl; 359 DEBUG << m_stderr << endl;
360 emit commandFailed(completedAction, m_stderr); 360 emit commandFailed(completedAction, m_stderr, m_stdout);
361 } 361 }
362 } 362 }
363 363
364 checkQueue(); 364 checkQueue();
365 } 365 }
493 bool interactive = false; 493 bool interactive = false;
494 QStringList params = action.params; 494 QStringList params = action.params;
495 495
496 if (action.workingDir.isEmpty()) { 496 if (action.workingDir.isEmpty()) {
497 // We require a working directory, never just operate in pwd 497 // We require a working directory, never just operate in pwd
498 emit commandFailed(action, "EasyMercurial: No working directory supplied, will not run Mercurial command without one"); 498 emit commandFailed(action, "EasyMercurial: No working directory supplied, will not run Mercurial command without one", "");
499 return; 499 return;
500 } 500 }
501 501
502 if (executable == "") { 502 if (executable == "") {
503 // This is a Hg command 503 // This is a Hg command