Mercurial > public > mercurial-scm > hg

comparison mercurial/util.py @ 14234:600e64004eb5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rename explain_exit to explainexit
author Adrian Buehlmann <adrian@cadifra.com>
date Fri, 06 May 2011 15:31:09 +0200
parents d51630301241
children b9e1b041744f
comparison
equal deleted inserted replaced
14233:659f34b833b9 14234:600e64004eb5
195 code = os.system(cmd) 195 code = os.system(cmd)
196 if sys.platform == 'OpenVMS' and code & 1: 196 if sys.platform == 'OpenVMS' and code & 1:
197 code = 0 197 code = 0
198 if code: 198 if code:
199 raise Abort(_("command '%s' failed: %s") % 199 raise Abort(_("command '%s' failed: %s") %
200 (cmd, explain_exit(code))) 200 (cmd, explainexit(code)))
201 fp = open(outname, 'rb') 201 fp = open(outname, 'rb')
202 r = fp.read() 202 r = fp.read()
203 fp.close() 203 fp.close()
204 return r 204 return r
205 finally: 205 finally:
367 rc = proc.returncode 367 rc = proc.returncode
368 if sys.platform == 'OpenVMS' and rc & 1: 368 if sys.platform == 'OpenVMS' and rc & 1:
369 rc = 0 369 rc = 0
370 if rc and onerr: 370 if rc and onerr:
371 errmsg = '%s %s' % (os.path.basename(origcmd.split(None, 1)[0]), 371 errmsg = '%s %s' % (os.path.basename(origcmd.split(None, 1)[0]),
372 explain_exit(rc)[0]) 372 explainexit(rc)[0])
373 if errprefix: 373 if errprefix:
374 errmsg = '%s: %s' % (errprefix, errmsg) 374 errmsg = '%s: %s' % (errprefix, errmsg)
375 try: 375 try:
376 onerr.warn(errmsg + '\n') 376 onerr.warn(errmsg + '\n')
377 except AttributeError: 377 except AttributeError: