| durin42 | |
| martinvonz |
| hg-reviewers |
This will make the code in narrowwirepeer.py more better for further
refactoring.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/narrow/narrowwirepeer.py (6 lines) | |||
| M | mercurial/bundle2.py (6 lines) |
| known = wireprototypes.decodelist(known) | known = wireprototypes.decodelist(known) | ||||
| known = {nodemod.bin(n) for n in known} | known = {nodemod.bin(n) for n in known} | ||||
| if ellipses == '0': | if ellipses == '0': | ||||
| ellipses = False | ellipses = False | ||||
| else: | else: | ||||
| ellipses = bool(ellipses) | ellipses = bool(ellipses) | ||||
| cgversion = cgversion | cgversion = cgversion | ||||
| bundler = bundle2.bundle20(repo.ui) | |||||
| if not ellipses: | if not ellipses: | ||||
| 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) | ||||
| bundler = bundle2.widen_bundle(repo, oldmatch, newmatch, common, | bundle2.widen_bundle(bundler, repo, oldmatch, newmatch, common, | ||||
| known, cgversion, ellipses) | known, cgversion, ellipses) | ||||
| else: | else: | ||||
| bundler = bundle2.bundle20(repo.ui) | |||||
| narrowbundle2.generateellipsesbundle2(bundler, repo, oldincludes, | narrowbundle2.generateellipsesbundle2(bundler, repo, oldincludes, | ||||
| oldexcludes, newincludes, newexcludes, cgversion, common, | oldexcludes, newincludes, newexcludes, cgversion, common, | ||||
| list(common), known, None) | list(common), known, None) | ||||
| 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: | ||||
| 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, oldmatcher, newmatcher, common, known, cgversion, | def widen_bundle(bundler, repo, oldmatcher, newmatcher, common, | ||||
| ellipses): | known, cgversion, ellipses): | ||||
| """generates bundle2 for widening a narrow clone | """generates bundle2 for widening a narrow clone | ||||
| bundler is the bundle to which data should be added | |||||
| repo is the localrepository instance | repo is the localrepository instance | ||||
| oldmatcher matches what the client already has | oldmatcher matches what the client already has | ||||
| newmatcher matches what the client needs (including what it already has) | newmatcher matches what the client needs (including what it already has) | ||||
| common is set of common heads between server and client | common is set of common heads between server and client | ||||
| known is a set of revs known on the client side (used in ellipses) | known is a set of revs known on the client side (used in ellipses) | ||||
| cgversion is the changegroup version to send | cgversion is the changegroup version to send | ||||
| ellipses is boolean value telling whether to send ellipses data or not | ellipses is boolean value telling whether to send ellipses data or not | ||||
| returns bundle2 of the data required for extending | returns bundle2 of the data required for extending | ||||
| """ | """ | ||||
| bundler = bundle20(repo.ui) | |||||
| commonnodes = set() | commonnodes = set() | ||||
| cl = repo.changelog | cl = repo.changelog | ||||
| for r in repo.revs("::%ln", common): | for r in repo.revs("::%ln", common): | ||||
| commonnodes.add(cl.node(r)) | commonnodes.add(cl.node(r)) | ||||
| if commonnodes: | if commonnodes: | ||||
| # XXX: we should only send the filelogs (and treemanifest). user | # XXX: we should only send the filelogs (and treemanifest). user | ||||
| # already has the changelog and manifest | # already has the changelog and manifest | ||||
| packer = changegroup.getbundler(cgversion, repo, | packer = changegroup.getbundler(cgversion, repo, | ||||