This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4455

py3: handle keyword arguments correctly in hgext/acl.py
ClosedPublic

Authored by pulkit on Sep 4 2018, 11:17 AM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG3694c9aaf5e4: py3: handle keyword arguments correctly in hgext/acl.py
Summary

The keys of keyword arguments on python 3 should be str, so when we try to get
some key from them, we must make sure we are using str.

  1. skip-blame because just b'' prefix

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

pulkit created this revision.Sep 4 2018, 11:17 AM
Closed by commit rHG3694c9aaf5e4: py3: handle keyword arguments correctly in hgext/acl.py (authored by pulkit). · Explain WhySep 4 2018, 12:29 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/acl.py (6 lines)

Diff 10745

hgext/acl.py

ui.debug('acl: checking access for user "%s"\n' % user) ui.debug('acl: checking access for user "%s"\n' % user)
if hooktype == 'prepushkey': if hooktype == 'prepushkey':
_pkhook(ui, repo, hooktype, node, source, user, **kwargs) _pkhook(ui, repo, hooktype, node, source, user, **kwargs)
else: else:
_txnhook(ui, repo, hooktype, node, source, user, **kwargs) _txnhook(ui, repo, hooktype, node, source, user, **kwargs)
def _pkhook(ui, repo, hooktype, node, source, user, **kwargs): def _pkhook(ui, repo, hooktype, node, source, user, **kwargs):
if kwargs['namespace'] == 'bookmarks': if kwargs[r'namespace'] == 'bookmarks':
bookmark = kwargs['key'] bookmark = kwargs[r'key']
ctx = kwargs['new'] ctx = kwargs[r'new']
allowbookmarks = buildmatch(ui, None, user, 'acl.allow.bookmarks') allowbookmarks = buildmatch(ui, None, user, 'acl.allow.bookmarks')
denybookmarks = buildmatch(ui, None, user, 'acl.deny.bookmarks') denybookmarks = buildmatch(ui, None, user, 'acl.deny.bookmarks')
if denybookmarks and denybookmarks(bookmark): if denybookmarks and denybookmarks(bookmark):
raise error.Abort(_('acl: user "%s" denied on bookmark "%s"' raise error.Abort(_('acl: user "%s" denied on bookmark "%s"'
' (changeset "%s")') ' (changeset "%s")')
% (user, bookmark, ctx)) % (user, bookmark, ctx))
if allowbookmarks and not allowbookmarks(bookmark): if allowbookmarks and not allowbookmarks(bookmark):