comparison mercurial/chgserver.py @ 47293:7a769ac49637

errors: catch the new Error class in scmutil and chgserver Differential Revision: https://phab.mercurial-scm.org/D10739
author Martin von Zweigbergk <martinvonz@google.com>
date Tue, 18 May 2021 21:45:59 -0700
parents 33c0c25d0b0f
children 227bbb078c2c
comparison
equal deleted inserted replaced
47292:5a75be916316 47293:7a769ac49637
513 # configuration 513 # configuration
514 self.ui.error(_(b"abort: %s\n") % stringutil.forcebytestr(inst)) 514 self.ui.error(_(b"abort: %s\n") % stringutil.forcebytestr(inst))
515 if inst.hint: 515 if inst.hint:
516 self.ui.error(_(b"(%s)\n") % inst.hint) 516 self.ui.error(_(b"(%s)\n") % inst.hint)
517 errorraised = True 517 errorraised = True
518 except error.Abort as inst: 518 except error.Error as inst:
519 if inst.detailed_exit_code is not None: 519 if inst.detailed_exit_code is not None:
520 detailed_exit_code = inst.detailed_exit_code 520 detailed_exit_code = inst.detailed_exit_code
521 self.ui.error(inst.format()) 521 self.ui.error(inst.format())
522 errorraised = True 522 errorraised = True
523 523