diff -r 659f34b833b9 -r 600e64004eb5 mercurial/util.py --- a/mercurial/util.py Fri May 06 15:25:35 2011 +0200 +++ b/mercurial/util.py Fri May 06 15:31:09 2011 +0200 @@ -197,7 +197,7 @@ code = 0 if code: raise Abort(_("command '%s' failed: %s") % - (cmd, explain_exit(code))) + (cmd, explainexit(code))) fp = open(outname, 'rb') r = fp.read() fp.close() @@ -369,7 +369,7 @@ rc = 0 if rc and onerr: errmsg = '%s %s' % (os.path.basename(origcmd.split(None, 1)[0]), - explain_exit(rc)[0]) + explainexit(rc)[0]) if errprefix: errmsg = '%s: %s' % (errprefix, errmsg) try: