This is an archive of the discontinued Mercurial Phabricator instance.

Differential D8526

py3: change default priority and length used for sorting hooks to be compatible with python 3
AbandonedPublic

Authored by charlesetc on May 14 2020, 11:18 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

The call to sorted(hooks.values()) can on line 213 of hooks.py can raise when using
python 3. For instance, when hooks.values is `[(0, 2, b'post-commit.check-status', b''),
(None, None, b'changegroup.app-hooks', <object object at 0x7f5279885590>)]`, the error is
TypeError: '<' not supported between instances of 'NoneType' and 'int'

This fix keeps the same order that was used in python 2 without relying on comparison with
None.

Diff Detail

Repository
rHG Mercurial
Branch
default
Lint
No Linters Available
Unit
No Unit Test Coverage

Event Timeline

charlesetc created this revision.May 14 2020, 11:18 PM
charlesetc abandoned this revision.May 14 2020, 11:21 PM

Sorry about opening two by accident - refer to D8527

Revision Contents
Changeset List

PathPackages
Mmercurial/hook.py (4 lines)

Diff 21388

mercurial/hook.py

def _allhooks(ui): def _allhooks(ui):
"""return a list of (hook-id, cmd) pairs sorted by priority""" """return a list of (hook-id, cmd) pairs sorted by priority"""
hooks = _hookitems(ui) hooks = _hookitems(ui)
# Be careful in this section, propagating the real commands from untrusted # Be careful in this section, propagating the real commands from untrusted
# sources would create a security vulnerability, make sure anything altered # sources would create a security vulnerability, make sure anything altered
# in that section uses "_fromuntrusted" as its command. # in that section uses "_fromuntrusted" as its command.
untrustedhooks = _hookitems(ui, _untrusted=True) untrustedhooks = _hookitems(ui, _untrusted=True)
for name, value in untrustedhooks.items(): for name, value in untrustedhooks.items():
trustedvalue = hooks.get(name, (None, None, name, _fromuntrusted)) trustedvalue = hooks.get(name, ((), (), name, _fromuntrusted))
if value != trustedvalue: if value != trustedvalue:
(lp, lo, lk, lv) = trustedvalue (lp, lo, lk, lv) = trustedvalue
hooks[name] = (lp, lo, lk, _fromuntrusted) hooks[name] = (lp, lo, lk, _fromuntrusted)
# (end of the security sensitive section) # (end of the security sensitive section)
return [(k, v) for p, o, k, v in sorted(hooks.values())] return [(k, v) for p, o, k, v in sorted(hooks.values())]
def _hookitems(ui, _untrusted=False): def _hookitems(ui, _untrusted=False):
"""return all hooks items ready to be sorted""" """return all hooks items ready to be sorted"""
hooks = {} hooks = {}
for name, cmd in ui.configitems(b'hooks', untrusted=_untrusted): for name, cmd in ui.configitems(b'hooks', untrusted=_untrusted):
if name.startswith(b'priority.') or name.startswith(b'tonative.'): if name.startswith(b'priority.') or name.startswith(b'tonative.'):
continue continue
priority = ui.configint(b'hooks', b'priority.%s' % name, 0) priority = ui.configint(b'hooks', b'priority.%s' % name, 0)
hooks[name] = (-priority, len(hooks), name, cmd) hooks[name] = ((-priority,), (len(hooks),), name, cmd)
return hooks return hooks
_redirect = False _redirect = False
def redirect(state): def redirect(state):
global _redirect global _redirect