This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7463

wireprotov1server: capture Abort type before accessing the `hint` attribute
ClosedPublic

Authored by mharbison72 on Nov 20 2019, 10:27 PM.

Details

Reviewers
dlax
pulkit
Group Reviewers
hg-reviewers
Commits
rHG1d1232c0726f: wireprotov1server: capture Abort type before accessing the `hint` attribute
Summary

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.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireprotov1server.py (2 lines)

Diff 18259

mercurial/wireprotov1server.py

finally: finally:
cleanup() cleanup()
except (error.BundleValueError, error.Abort, error.PushRaced) as exc: except (error.BundleValueError, error.Abort, error.PushRaced) as exc:
# handle non-bundle2 case first # handle non-bundle2 case first
if not getattr(exc, 'duringunbundle2', False): if not getattr(exc, 'duringunbundle2', False):
try: try:
raise raise
except error.Abort: except error.Abort as exc:
# The old code we moved used procutil.stderr directly. # The old code we moved used procutil.stderr directly.
# We did not change it to minimise code change. # We did not change it to minimise code change.
# This need to be moved to something proper. # This need to be moved to something proper.
# Feel free to do it. # Feel free to do it.
procutil.stderr.write(b"abort: %s\n" % exc) procutil.stderr.write(b"abort: %s\n" % exc)
if exc.hint is not None: if exc.hint is not None:
procutil.stderr.write(b"(%s)\n" % exc.hint) procutil.stderr.write(b"(%s)\n" % exc.hint)
procutil.stderr.flush() procutil.stderr.flush()