This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4424

narrow: rename getbundlechangegrouppart_nonellipsis function
ClosedPublic

Authored by pulkit on Aug 30 2018, 6:30 AM.

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG3433e8f39905: narrow: rename getbundlechangegrouppart_nonellipsis function
Summary

The function is renamed to getbundlechangegrouppart_widen as per suggestion in
D4383. The motivation is such that we can evolve the function into a handler for
new wire-protocol command.

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 (8 lines)

Diff 10675

hgext/narrow/narrowbundle2.py

_MFHEADERSIZE = struct.calcsize(_ELIDEDMFHEADER) _MFHEADERSIZE = struct.calcsize(_ELIDEDMFHEADER)
# When advertising capabilities, always include narrow clone support. # When advertising capabilities, always include narrow clone support.
def getrepocaps_narrow(orig, repo, **kwargs): def getrepocaps_narrow(orig, repo, **kwargs):
caps = orig(repo, **kwargs) caps = orig(repo, **kwargs)
caps[NARROWCAP] = ['v0'] caps[NARROWCAP] = ['v0']
return caps return caps
def getbundlechangegrouppart_nonellipsis(bundler, repo, source, bundlecaps=None, def getbundlechangegrouppart_widen(bundler, repo, source, bundlecaps=None,
b2caps=None, heads=None, common=None, b2caps=None, heads=None, common=None,
**kwargs): **kwargs):
"""Handling changegroup changegroup generation on the server when user """Handling changegroup changegroup generation on the server when user
is widening their narrowspec""" is widening their narrowspec"""
cgversions = b2caps.get('changegroup') cgversions = b2caps.get('changegroup')
if cgversions: # 3.1 and 3.2 ship with an empty value if cgversions: # 3.1 and 3.2 ship with an empty value
cgversions = [v for v in cgversions cgversions = [v for v in cgversions
if v in changegroup.supportedoutgoingversions(repo)] if v in changegroup.supportedoutgoingversions(repo)]
if not cgversions: if not cgversions:
repo = args[1] repo = args[1]
if repo.ui.has_section(_NARROWACL_SECTION): if repo.ui.has_section(_NARROWACL_SECTION):
kwargs = exchange.applynarrowacl(repo, kwargs) kwargs = exchange.applynarrowacl(repo, kwargs)
if (kwargs.get(r'narrow', False) and if (kwargs.get(r'narrow', False) and
repo.ui.configbool('experimental', 'narrowservebrokenellipses')): repo.ui.configbool('experimental', 'narrowservebrokenellipses')):
getbundlechangegrouppart_narrow(*args, **kwargs) getbundlechangegrouppart_narrow(*args, **kwargs)
elif kwargs.get(r'widen', False) and kwargs.get(r'narrow', False): elif kwargs.get(r'widen', False) and kwargs.get(r'narrow', False):
getbundlechangegrouppart_nonellipsis(*args, **kwargs) getbundlechangegrouppart_widen(*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