Mercurial > hg-stable
changeset 47304: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 | 5a75be916316 |
| children | 93a0abe098e7 |
| files | mercurial/chgserver.py mercurial/scmutil.py |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/chgserver.py Tue May 18 21:32:12 2021 -0700 +++ b/mercurial/chgserver.py Tue May 18 21:45:59 2021 -0700 @@ -515,7 +515,7 @@ if inst.hint: self.ui.error(_(b"(%s)\n") % inst.hint) errorraised = True - except error.Abort as inst: + except error.Error as inst: if inst.detailed_exit_code is not None: detailed_exit_code = inst.detailed_exit_code self.ui.error(inst.format())
--- a/mercurial/scmutil.py Tue May 18 21:32:12 2021 -0700 +++ b/mercurial/scmutil.py Tue May 18 21:45:59 2021 -0700 @@ -205,7 +205,7 @@ detailed_exit_code = 50 except error.WdirUnsupported: ui.error(_(b"abort: working directory revision cannot be specified\n")) - except error.Abort as inst: + except error.Error as inst: if inst.detailed_exit_code is not None: detailed_exit_code = inst.detailed_exit_code if inst.coarse_exit_code is not None: