Mercurial > hg
changeset 43729:1d1232c0726f
wireprotov1server: capture Abort type before accessing the `hint` attribute
Although the previous code worked, pytypes complained because `exc` is caught
above as `BundleValueError, Abort, PushRaced`, and the other two don't have this
attribute.
Differential Revision: https://phab.mercurial-scm.org/D7463
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Wed, 20 Nov 2019 09:55:59 -0500 |
| parents | 4330851947fb |
| children | d18cf63e1dbd |
| files | mercurial/wireprotov1server.py |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/mercurial/wireprotov1server.py Wed Nov 20 08:55:24 2019 +0100 +++ b/mercurial/wireprotov1server.py Wed Nov 20 09:55:59 2019 -0500 @@ -679,7 +679,7 @@ if not getattr(exc, 'duringunbundle2', False): try: raise - except error.Abort: + except error.Abort as exc: # The old code we moved used procutil.stderr directly. # We did not change it to minimise code change. # This need to be moved to something proper.