This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4013

exchange: make narrow ACL presence imply narrow=True
ClosedPublic

Authored by indygreg on Aug 1 2018, 1:03 PM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG98df52d5042c: exchange: make narrow ACL presence imply narrow=True
Summary

And refactor the logic for determining when to invoke our custom
changegroup part function so it is only conditional on
narrow being set. This makes it more obvious under which
conditions we should invoke the custom implementation.

Also use raw strings so **kwargs works on Python 3.

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
Mhgext/narrow/narrowbundle2.py (6 lines)
Mmercurial/exchange.py (6 lines)

Diff 9809

hgext/narrow/narrowbundle2.py

getbundleargs['excludepats'] = 'csv' getbundleargs['excludepats'] = 'csv'
getbundleargs['known'] = 'csv' getbundleargs['known'] = 'csv'
# Extend changegroup serving to handle requests from narrow clients. # Extend changegroup serving to handle requests from narrow clients.
origcgfn = exchange.getbundle2partsmapping['changegroup'] origcgfn = exchange.getbundle2partsmapping['changegroup']
def wrappedcgfn(*args, **kwargs): def wrappedcgfn(*args, **kwargs):
repo = args[1] repo = args[1]
if repo.ui.has_section(_NARROWACL_SECTION): if repo.ui.has_section(_NARROWACL_SECTION):
getbundlechangegrouppart_narrow( kwargs = exchange.applynarrowacl(repo, kwargs)
*args, **exchange.applynarrowacl(repo, kwargs))
elif kwargs.get(r'narrow', False): if kwargs.get(r'narrow', False):
getbundlechangegrouppart_narrow(*args, **kwargs) getbundlechangegrouppart_narrow(*args, **kwargs)
else: else:
origcgfn(*args, **kwargs) origcgfn(*args, **kwargs)
exchange.getbundle2partsmapping['changegroup'] = wrappedcgfn exchange.getbundle2partsmapping['changegroup'] = wrappedcgfn
# Extend changegroup receiver so client can fixup after widen requests. # Extend changegroup receiver so client can fixup after widen requests.
origcghandler = bundle2.parthandlermapping['changegroup'] origcghandler = bundle2.parthandlermapping['changegroup']
def wrappedcghandler(op, inpart): def wrappedcghandler(op, inpart):
origcghandler(op, inpart) origcghandler(op, inpart)
if util.safehasattr(op, '_widen_bundle'): if util.safehasattr(op, '_widen_bundle'):
handlechangegroup_widen(op, inpart) handlechangegroup_widen(op, inpart)
wrappedcghandler.params = origcghandler.params wrappedcghandler.params = origcghandler.params
bundle2.parthandlermapping['changegroup'] = wrappedcghandler bundle2.parthandlermapping['changegroup'] = wrappedcghandler

mercurial/exchange.py

if invalid_includes: if invalid_includes:
raise error.Abort( raise error.Abort(
_("The following includes are not accessible for {}: {}") _("The following includes are not accessible for {}: {}")
.format(username, invalid_includes)) .format(username, invalid_includes))
new_args = {} new_args = {}
new_args.update(kwargs) new_args.update(kwargs)
new_args['includepats'] = req_includes new_args[r'narrow'] = True
new_args[r'includepats'] = req_includes
if req_excludes: if req_excludes:
new_args['excludepats'] = req_excludes new_args[r'excludepats'] = req_excludes
return new_args return new_args
def _computeellipsis(repo, common, heads, known, match, depth=None): def _computeellipsis(repo, common, heads, known, match, depth=None):
"""Compute the shape of a narrowed DAG. """Compute the shape of a narrowed DAG.
Args: Args:
repo: The repository we're transferring. repo: The repository we're transferring.
common: The roots of the DAG range we're transferring. common: The roots of the DAG range we're transferring.