| durin42 |
| hg-reviewers |
The behavior here is not ideal, as the function constructs a
packer then adds attributes to it. This will be cleaned up in
subsequent commits. Moving this code is necessary to move the
remainder of the bundle2-level changegroup part generation code
into core.
| Lint Skipped |
| Unit Tests Skipped |
| Path | Packages | |||
|---|---|---|---|---|
| M | hgext/narrow/narrowbundle2.py (38 lines) | |||
| M | mercurial/changegroup.py (33 lines) |
| Commit | Parents | Author | Summary | Date |
|---|---|---|---|---|
| Gregory Szorc | Jul 28 2018, 8:59 PM |
| Status | Author | Revision | |
|---|---|---|---|
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg | ||
| Closed | indygreg |
| _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 _packellipsischangegroup(repo, common, match, relevant_nodes, | |||||
| ellipsisroots, visitnodes, depth, source, version): | |||||
| if version in ('01', '02'): | |||||
| raise error.Abort( | |||||
| 'ellipsis nodes require at least cg3 on client and server, ' | |||||
| 'but negotiated version %s' % version) | |||||
| # We wrap cg1packer.revchunk, using a side channel to pass | |||||
| # relevant_nodes into that area. Then if linknode isn't in the | |||||
| # set, we know we have an ellipsis node and we should defer | |||||
| # sending that node's data. We override close() to detect | |||||
| # pending ellipsis nodes and flush them. | |||||
| packer = changegroup.getbundler(version, repo, | |||||
| filematcher=match) | |||||
| # Give the packer the list of nodes which should not be | |||||
| # ellipsis nodes. We store this rather than the set of nodes | |||||
| # that should be an ellipsis because for very large histories | |||||
| # we expect this to be significantly smaller. | |||||
| packer.full_nodes = relevant_nodes | |||||
| # Maps ellipsis revs to their roots at the changelog level. | |||||
| packer.precomputed_ellipsis = ellipsisroots | |||||
| # Maps CL revs to per-revlog revisions. Cleared in close() at | |||||
| # the end of each group. | |||||
| packer.clrev_to_localrev = {} | |||||
| packer.next_clrev_to_localrev = {} | |||||
| # Maps changelog nodes to changelog revs. Filled in once | |||||
| # during changelog stage and then left unmodified. | |||||
| packer.clnode_to_rev = {} | |||||
| packer.changelog_done = False | |||||
| # If true, informs the packer that it is serving shallow content and might | |||||
| # need to pack file contents not introduced by the changes being packed. | |||||
| packer.is_shallow = depth is not None | |||||
| return packer.generate(common, visitnodes, False, source) | |||||
| # 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 | ||||
| for r in deadrevs: | for r in deadrevs: | ||||
| yield _KILLNODESIGNAL | yield _KILLNODESIGNAL | ||||
| yield repo.changelog.node(r) | yield repo.changelog.node(r) | ||||
| yield _DONESIGNAL | yield _DONESIGNAL | ||||
| bundler.newpart(_CHANGESPECPART, data=genkills()) | bundler.newpart(_CHANGESPECPART, data=genkills()) | ||||
| newvisit, newfull, newellipsis = exchange._computeellipsis( | newvisit, newfull, newellipsis = exchange._computeellipsis( | ||||
| repo, set(), common, known, newmatch) | repo, set(), common, known, newmatch) | ||||
| if newvisit: | if newvisit: | ||||
| cg = _packellipsischangegroup( | cg = changegroup._packellipsischangegroup( | ||||
| repo, common, newmatch, newfull, newellipsis, | repo, common, newmatch, newfull, newellipsis, | ||||
| newvisit, depth, source, version) | newvisit, depth, source, version) | ||||
| part = bundler.newpart('changegroup', data=cg) | part = bundler.newpart('changegroup', data=cg) | ||||
| part.addparam('version', version) | part.addparam('version', version) | ||||
| if 'treemanifest' in repo.requirements: | if 'treemanifest' in repo.requirements: | ||||
| part.addparam('treemanifest', '1') | part.addparam('treemanifest', '1') | ||||
| visitnodes, relevant_nodes, ellipsisroots = exchange._computeellipsis( | visitnodes, relevant_nodes, ellipsisroots = exchange._computeellipsis( | ||||
| repo, common, heads, set(), newmatch, depth=depth) | repo, common, heads, set(), newmatch, depth=depth) | ||||
| repo.ui.debug('Found %d relevant revs\n' % len(relevant_nodes)) | repo.ui.debug('Found %d relevant revs\n' % len(relevant_nodes)) | ||||
| if visitnodes: | if visitnodes: | ||||
| cg = _packellipsischangegroup( | cg = changegroup._packellipsischangegroup( | ||||
| repo, common, newmatch, relevant_nodes, ellipsisroots, | repo, common, newmatch, relevant_nodes, ellipsisroots, | ||||
| visitnodes, depth, source, version) | visitnodes, depth, source, version) | ||||
| part = bundler.newpart('changegroup', data=cg) | part = bundler.newpart('changegroup', data=cg) | ||||
| part.addparam('version', version) | part.addparam('version', version) | ||||
| if 'treemanifest' in repo.requirements: | if 'treemanifest' in repo.requirements: | ||||
| part.addparam('treemanifest', '1') | part.addparam('treemanifest', '1') | ||||
| @bundle2.parthandler(_SPECPART, (_SPECPART_INCLUDE, _SPECPART_EXCLUDE)) | @bundle2.parthandler(_SPECPART, (_SPECPART_INCLUDE, _SPECPART_EXCLUDE)) | ||||
| try: | try: | ||||
| fl.rev(n) | fl.rev(n) | ||||
| except error.LookupError: | except error.LookupError: | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _('missing file data for %s:%s - run hg verify') % | _('missing file data for %s:%s - run hg verify') % | ||||
| (f, hex(n))) | (f, hex(n))) | ||||
| return revisions, files | return revisions, files | ||||
| def _packellipsischangegroup(repo, common, match, relevant_nodes, | |||||
| ellipsisroots, visitnodes, depth, source, version): | |||||
| if version in ('01', '02'): | |||||
| raise error.Abort( | |||||
| 'ellipsis nodes require at least cg3 on client and server, ' | |||||
| 'but negotiated version %s' % version) | |||||
| # We wrap cg1packer.revchunk, using a side channel to pass | |||||
| # relevant_nodes into that area. Then if linknode isn't in the | |||||
| # set, we know we have an ellipsis node and we should defer | |||||
| # sending that node's data. We override close() to detect | |||||
| # pending ellipsis nodes and flush them. | |||||
| packer = getbundler(version, repo, filematcher=match) | |||||
| # Give the packer the list of nodes which should not be | |||||
| # ellipsis nodes. We store this rather than the set of nodes | |||||
| # that should be an ellipsis because for very large histories | |||||
| # we expect this to be significantly smaller. | |||||
| packer.full_nodes = relevant_nodes | |||||
| # Maps ellipsis revs to their roots at the changelog level. | |||||
| packer.precomputed_ellipsis = ellipsisroots | |||||
| # Maps CL revs to per-revlog revisions. Cleared in close() at | |||||
| # the end of each group. | |||||
| packer.clrev_to_localrev = {} | |||||
| packer.next_clrev_to_localrev = {} | |||||
| # Maps changelog nodes to changelog revs. Filled in once | |||||
| # during changelog stage and then left unmodified. | |||||
| packer.clnode_to_rev = {} | |||||
| packer.changelog_done = False | |||||
| # If true, informs the packer that it is serving shallow content and might | |||||
| # need to pack file contents not introduced by the changes being packed. | |||||
| packer.is_shallow = depth is not None | |||||
| return packer.generate(common, visitnodes, False, source) | |||||