This is an archive of the discontinued Mercurial Phabricator instance.

Differential D9978

hooks: forbid ':' in hook name
ClosedPublic

Authored by marmoute on Feb 10 2021, 6:47 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG86b019899737: hooks: forbid ':' in hook name
rHG5cf00dc46073: hooks: forbid ':' in hook name
Summary

The : character is a special separator in the config and it seems same do to
the same for hooks. This is necessary to improve the experience around the
HGPLAIN behavior change in 5.7. See next changesets for details.

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

marmoute created this revision.Feb 10 2021, 6:47 PM
marmoute added a commit: rHG5cf00dc46073: hooks: forbid ':' in hook name.Feb 11 2021, 11:34 AM
This revision was not accepted when it landed; it landed in state Needs Review.
Closed by commit rHG5cf00dc46073: hooks: forbid ':' in hook name (authored by marmoute). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/configitems.py (2 lines)
Mmercurial/hook.py (6 lines)

Diff 25549

mercurial/configitems.py

coreconfigitem( coreconfigitem(
b'help', b'help',
br'hidden-topic\..*', br'hidden-topic\..*',
default=False, default=False,
generic=True, generic=True,
) )
coreconfigitem( coreconfigitem(
b'hooks', b'hooks',
b'.*', b'[^:]*',
default=dynamicdefault, default=dynamicdefault,
generic=True, generic=True,
) )
coreconfigitem( coreconfigitem(
b'hgweb-paths', b'hgweb-paths',
b'.*', b'.*',
default=list, default=list,
generic=True, generic=True,

mercurial/hook.py

# (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.')
or b':' in name
):
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