This is an archive of the discontinued Mercurial Phabricator instance.

Differential D4007

exchange: move disabling of rev-branch-cache bundle part out of narrow
ClosedPublic

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

Details

Reviewers
durin42
Group Reviewers
hg-reviewers
Commits
rHG9b64b73d702b: exchange: move disabling of rev-branch-cache bundle part out of narrow
rHGaf9d27b81ca6: exchange: move disabling of rev-branch-cache bundle part out of narrow
rHGab765bc4f232: exchange: move disabling of rev-branch-cache bundle part out of narrow
Summary

I'm attempting to refactor changegroup code in order to better
support alternate storage backends. The narrow extension is
performing a lot of monkeypatching to this code and it is making
it difficult to reason about how everything works. I'm reasonably
certain I would be unable to abstract storage without requiring
extensive rework of narrow. I believe it is less effort to move
narrow code into core so it can be accounted for when changegroup
code is refactored. So I'll be doing that.

The first part of this is integrating the disabling of the
cache:rev-branch-cache bundle2 part into core. This doesn't seem
like it is related to changegroup, but narrow's modifications to
changegroup are invasive and also require taking its code for
bundle generation and exchange into core in order for the changegroup
code to work.

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

indygreg created this revision.Aug 1 2018, 1:03 PM
durin42 accepted this revision.Aug 1 2018, 4:49 PM
This revision is now accepted and ready to land.Aug 1 2018, 4:49 PM
Closed by commit rHGab765bc4f232: exchange: move disabling of rev-branch-cache bundle part out of narrow (authored by indygreg). · Explain WhyAug 1 2018, 5:24 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mhgext/narrow/narrowbundle2.py (13 lines)
Mmercurial/exchange.py (9 lines)

Diff 9747

hgext/narrow/narrowbundle2.py

getbundlechangegrouppart_narrow( getbundlechangegrouppart_narrow(
*args, **applyacl_narrow(repo, kwargs)) *args, **applyacl_narrow(repo, kwargs))
elif kwargs.get(r'narrow', False): elif 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
# disable rev branch cache exchange when serving a narrow bundle
# (currently incompatible with that part)
origrbcfn = exchange.getbundle2partsmapping['cache:rev-branch-cache']
def wrappedcgfn(*args, **kwargs):
repo = args[1]
if repo.ui.has_section(_NARROWACL_SECTION):
return
elif kwargs.get(r'narrow', False):
return
else:
origrbcfn(*args, **kwargs)
exchange.getbundle2partsmapping['cache:rev-branch-cache'] = 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

) )
from .utils import ( from .utils import (
stringutil, stringutil,
) )
urlerr = util.urlerr urlerr = util.urlerr
urlreq = util.urlreq urlreq = util.urlreq
_NARROWACL_SECTION = 'narrowhgacl'
# Maps bundle version human names to changegroup versions. # Maps bundle version human names to changegroup versions.
_bundlespeccgversions = {'v1': '01', _bundlespeccgversions = {'v1': '01',
'v2': '02', 'v2': '02',
'packed1': 's1', 'packed1': 's1',
'bundle2': '02', #legacy 'bundle2': '02', #legacy
} }
# Maps bundle version with content opts to choose which part to bundle # Maps bundle version with content opts to choose which part to bundle
2) number of open heads 2) number of open heads
3) number of closed heads 3) number of closed heads
4) open heads nodes 4) open heads nodes
5) closed heads nodes 5) closed heads nodes
""" """
# Don't send unless: # Don't send unless:
# - changeset are being exchanged, # - changeset are being exchanged,
# - the client supports it. # - the client supports it.
if not (kwargs.get(r'cg', True)) or 'rev-branch-cache' not in b2caps: # - narrow bundle isn't in play (not currently compatible).
if (not kwargs.get(r'cg', True)
or 'rev-branch-cache' not in b2caps
or kwargs.get(r'narrow', False)
or repo.ui.has_section(_NARROWACL_SECTION)):
return return
outgoing = _computeoutgoing(repo, heads, common) outgoing = _computeoutgoing(repo, heads, common)
bundle2.addpartrevbranchcache(repo, bundler, outgoing) bundle2.addpartrevbranchcache(repo, bundler, outgoing)
def check_heads(repo, their_heads, context): def check_heads(repo, their_heads, context):
"""check if the heads of a repo have been modified """check if the heads of a repo have been modified
Used by peer for unbundling. Used by peer for unbundling.
""" """