This is an archive of the discontinued Mercurial Phabricator instance.

Differential D1996

wireproto: remove unnecessary exception trapping
ClosedPublic

Authored by indygreg on Feb 1 2018, 6:37 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHGae79cf6f9c82: wireproto: remove unnecessary exception trapping
Summary

The try..except error.Abort was added in 8474be4412ca back in

  1. The intent was to ensure a failing pushkey hook didn't crash

the server.

Since that changeset, repo.pushkey() and the hooks mechanism is
now much more robust about trapping errors itself. As such, we no
longer need this try..except block. So it has been removed.

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.

Event Timeline

indygreg created this revision.Feb 1 2018, 6:37 PM
durin42 accepted this revision.Feb 7 2018, 5:06 PM
This revision is now accepted and ready to land.Feb 7 2018, 5:06 PM
Closed by commit rHGae79cf6f9c82: wireproto: remove unnecessary exception trapping (authored by indygreg). · Explain WhyFeb 7 2018, 5:41 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/wireproto.py (7 lines)

Diff 5304

mercurial/wireproto.py

pass # binary, leave unmodified pass # binary, leave unmodified
else: else:
new = encoding.tolocal(new) # normal path new = encoding.tolocal(new) # normal path
if util.safehasattr(proto, 'restore'): if util.safehasattr(proto, 'restore'):
proto.redirect() proto.redirect()
try:
r = repo.pushkey(encoding.tolocal(namespace), encoding.tolocal(key), r = repo.pushkey(encoding.tolocal(namespace), encoding.tolocal(key),
encoding.tolocal(old), new) or False encoding.tolocal(old), new) or False
except error.Abort:
r = False
output = proto.restore() output = proto.restore()
return '%s\n%s' % (int(r), output) return '%s\n%s' % (int(r), output)
r = repo.pushkey(encoding.tolocal(namespace), encoding.tolocal(key), r = repo.pushkey(encoding.tolocal(namespace), encoding.tolocal(key),
encoding.tolocal(old), new) encoding.tolocal(old), new)
return '%s\n' % int(r) return '%s\n' % int(r)