| durin42 | |
| martinvonz |
| hg-reviewers |
This is a part of moving more narrow related bits to core.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/narrow/narrowbundle2.py (34 lines) | |||
| M | hgext/narrow/narrowwirepeer.py (4 lines) | |||
| M | mercurial/bundle2.py (34 lines) |
| _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 widen_bundle(repo, diffmatcher, common, known, cgversion, ellipses): | |||||
| """generates bundle2 for widening a narrow clone | |||||
| repo is the localrepository instance | |||||
| diffmatcher is a differencemacther of '(newincludes, newexcludes) - | |||||
| (oldincludes, oldexcludes)' | |||||
| common is set of common heads between server and client | |||||
| known is a set of revs known on the client side (used in ellipses) | |||||
| cgversion is the changegroup version to send | |||||
| ellipses is boolean value telling whether to send ellipses data or not | |||||
| returns bundle2 of the data required for extending | |||||
| """ | |||||
| bundler = bundle2.bundle20(repo.ui) | |||||
| commonnodes = set() | |||||
| cl = repo.changelog | |||||
| for r in repo.revs("::%ln", common): | |||||
| commonnodes.add(cl.node(r)) | |||||
| if commonnodes: | |||||
| # XXX: we should only send the filelogs (and treemanifest). user | |||||
| # already has the changelog and manifest | |||||
| packer = changegroup.getbundler(cgversion, repo, | |||||
| filematcher=diffmatcher, | |||||
| fullnodes=commonnodes) | |||||
| cgdata = packer.generate(set([nullid]), list(commonnodes), False, | |||||
| 'narrow_widen', changelog=False) | |||||
| part = bundler.newpart('changegroup', data=cgdata) | |||||
| part.addparam('version', cgversion) | |||||
| if 'treemanifest' in repo.requirements: | |||||
| part.addparam('treemanifest', '1') | |||||
| return bundler | |||||
| # Serve a changegroup for a client with a narrow clone. | # Serve a changegroup for a client with a narrow clone. | ||||
| def getbundlechangegrouppart_narrow(bundler, repo, source, | def getbundlechangegrouppart_narrow(bundler, repo, source, | ||||
| bundlecaps=None, b2caps=None, heads=None, | bundlecaps=None, b2caps=None, heads=None, | ||||
| common=None, **kwargs): | common=None, **kwargs): | ||||
| assert repo.ui.configbool('experimental', 'narrowservebrokenellipses') | assert repo.ui.configbool('experimental', 'narrowservebrokenellipses') | ||||
| 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 | ||||
| narrowspec, | narrowspec, | ||||
| pycompat, | pycompat, | ||||
| wireprotoserver, | wireprotoserver, | ||||
| wireprototypes, | wireprototypes, | ||||
| wireprotov1peer, | wireprotov1peer, | ||||
| wireprotov1server, | wireprotov1server, | ||||
| ) | ) | ||||
| from . import narrowbundle2 | |||||
| def uisetup(): | def uisetup(): | ||||
| extensions.wrapfunction(wireprotov1server, '_capabilities', addnarrowcap) | extensions.wrapfunction(wireprotov1server, '_capabilities', addnarrowcap) | ||||
| wireprotov1peer.wirepeer.narrow_widen = peernarrowwiden | wireprotov1peer.wirepeer.narrow_widen = peernarrowwiden | ||||
| def addnarrowcap(orig, repo, proto): | def addnarrowcap(orig, repo, proto): | ||||
| """add the narrow capability to the server""" | """add the narrow capability to the server""" | ||||
| caps = orig(repo, proto) | caps = orig(repo, proto) | ||||
| caps.append(wireprotoserver.NARROWCAP) | caps.append(wireprotoserver.NARROWCAP) | ||||
| ellipses = bool(ellipses) | ellipses = bool(ellipses) | ||||
| cgversion = cgversion | cgversion = cgversion | ||||
| newmatch = narrowspec.match(repo.root, include=newincludes, | newmatch = narrowspec.match(repo.root, include=newincludes, | ||||
| exclude=newexcludes) | exclude=newexcludes) | ||||
| oldmatch = narrowspec.match(repo.root, include=oldincludes, | oldmatch = narrowspec.match(repo.root, include=oldincludes, | ||||
| exclude=oldexcludes) | exclude=oldexcludes) | ||||
| diffmatch = matchmod.differencematcher(newmatch, oldmatch) | diffmatch = matchmod.differencematcher(newmatch, oldmatch) | ||||
| bundler = narrowbundle2.widen_bundle(repo, diffmatch, common, known, | bundler = bundle2.widen_bundle(repo, diffmatch, common, known, | ||||
| cgversion, ellipses) | cgversion, ellipses) | ||||
| except error.Abort as exc: | except error.Abort as exc: | ||||
| bundler = bundle2.bundle20(repo.ui) | bundler = bundle2.bundle20(repo.ui) | ||||
| manargs = [('message', pycompat.bytestr(exc))] | manargs = [('message', pycompat.bytestr(exc))] | ||||
| advargs = [] | advargs = [] | ||||
| if exc.hint is not None: | if exc.hint is not None: | ||||
| advargs.append(('hint', exc.hint)) | advargs.append(('hint', exc.hint)) | ||||
| bundler.addpart(bundle2.bundlepart('error:abort', manargs, advargs)) | bundler.addpart(bundle2.bundlepart('error:abort', manargs, advargs)) | ||||
| repo = op.repo | repo = op.repo | ||||
| if len(repo): | if len(repo): | ||||
| msg = _('cannot apply stream clone to non empty repository') | msg = _('cannot apply stream clone to non empty repository') | ||||
| raise error.Abort(msg) | raise error.Abort(msg) | ||||
| repo.ui.debug('applying stream bundle\n') | repo.ui.debug('applying stream bundle\n') | ||||
| streamclone.applybundlev2(repo, part, filecount, bytecount, | streamclone.applybundlev2(repo, part, filecount, bytecount, | ||||
| requirements) | requirements) | ||||
| def widen_bundle(repo, diffmatcher, common, known, cgversion, ellipses): | |||||
| """generates bundle2 for widening a narrow clone | |||||
| repo is the localrepository instance | |||||
| diffmatcher is a differencemacther of '(newincludes, newexcludes) - | |||||
| (oldincludes, oldexcludes)' | |||||
| common is set of common heads between server and client | |||||
| known is a set of revs known on the client side (used in ellipses) | |||||
| cgversion is the changegroup version to send | |||||
| ellipses is boolean value telling whether to send ellipses data or not | |||||
| returns bundle2 of the data required for extending | |||||
| """ | |||||
| bundler = bundle20(repo.ui) | |||||
| commonnodes = set() | |||||
| cl = repo.changelog | |||||
| for r in repo.revs("::%ln", common): | |||||
| commonnodes.add(cl.node(r)) | |||||
| if commonnodes: | |||||
| # XXX: we should only send the filelogs (and treemanifest). user | |||||
| # already has the changelog and manifest | |||||
| packer = changegroup.getbundler(cgversion, repo, | |||||
| filematcher=diffmatcher, | |||||
| fullnodes=commonnodes) | |||||
| cgdata = packer.generate(set([nodemod.nullid]), list(commonnodes), | |||||
| False, 'narrow_widen', changelog=False) | |||||
| part = bundler.newpart('changegroup', data=cgdata) | |||||
| part.addparam('version', cgversion) | |||||
| if 'treemanifest' in repo.requirements: | |||||
| part.addparam('treemanifest', '1') | |||||
| return bundler | |||||