| hg-reviewers |
And with this change, the narrow packer no longer defines
any addition attributes on packer instances!
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | mercurial/changegroup.py (42 lines) |
| 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 |
| flags = attr.ib() | flags = attr.ib() | ||||
| # Iterable of chunks holding raw delta data. | # Iterable of chunks holding raw delta data. | ||||
| deltachunks = attr.ib() | deltachunks = attr.ib() | ||||
| class cgpacker(object): | class cgpacker(object): | ||||
| def __init__(self, repo, filematcher, version, allowreorder, | def __init__(self, repo, filematcher, version, allowreorder, | ||||
| useprevdelta, builddeltaheader, manifestsend, | useprevdelta, builddeltaheader, manifestsend, | ||||
| sendtreemanifests, bundlecaps=None, ellipses=False, | sendtreemanifests, bundlecaps=None, ellipses=False, | ||||
| shallow=False, ellipsisroots=None): | shallow=False, ellipsisroots=None, fullnodes=None): | ||||
| """Given a source repo, construct a bundler. | """Given a source repo, construct a bundler. | ||||
| filematcher is a matcher that matches on files to include in the | filematcher is a matcher that matches on files to include in the | ||||
| changegroup. Used to facilitate sparse changegroups. | changegroup. Used to facilitate sparse changegroups. | ||||
| allowreorder controls whether reordering of revisions is allowed. | allowreorder controls whether reordering of revisions is allowed. | ||||
| This value is used when ``bundle.reorder`` is ``auto`` or isn't | This value is used when ``bundle.reorder`` is ``auto`` or isn't | ||||
| set. | set. | ||||
| bundlecaps is optional and can be used to specify the set of | bundlecaps is optional and can be used to specify the set of | ||||
| capabilities which can be used to build the bundle. While bundlecaps is | capabilities which can be used to build the bundle. While bundlecaps is | ||||
| unused in core Mercurial, extensions rely on this feature to communicate | unused in core Mercurial, extensions rely on this feature to communicate | ||||
| capabilities to customize the changegroup packer. | capabilities to customize the changegroup packer. | ||||
| shallow indicates whether shallow data might be sent. The packer may | shallow indicates whether shallow data might be sent. The packer may | ||||
| need to pack file contents not introduced by the changes being packed. | need to pack file contents not introduced by the changes being packed. | ||||
| fullnodes is the list of nodes which should not be ellipsis nodes. We | |||||
| store this rather than the set of nodes that should be ellipsis because | |||||
| for very large histories we expect this to be significantly smaller. | |||||
| """ | """ | ||||
| assert filematcher | assert filematcher | ||||
| self._filematcher = filematcher | self._filematcher = filematcher | ||||
| self.version = version | self.version = version | ||||
| self._useprevdelta = useprevdelta | self._useprevdelta = useprevdelta | ||||
| self._builddeltaheader = builddeltaheader | self._builddeltaheader = builddeltaheader | ||||
| self._manifestsend = manifestsend | self._manifestsend = manifestsend | ||||
| self._sendtreemanifests = sendtreemanifests | self._sendtreemanifests = sendtreemanifests | ||||
| self._ellipses = ellipses | self._ellipses = ellipses | ||||
| # Set of capabilities we can use to build the bundle. | # Set of capabilities we can use to build the bundle. | ||||
| if bundlecaps is None: | if bundlecaps is None: | ||||
| bundlecaps = set() | bundlecaps = set() | ||||
| self._bundlecaps = bundlecaps | self._bundlecaps = bundlecaps | ||||
| self._isshallow = shallow | self._isshallow = shallow | ||||
| self._fullnodes = fullnodes | |||||
| # Maps ellipsis revs to their roots at the changelog level. | # Maps ellipsis revs to their roots at the changelog level. | ||||
| self._precomputedellipsis = ellipsisroots | self._precomputedellipsis = ellipsisroots | ||||
| # experimental config: bundle.reorder | # experimental config: bundle.reorder | ||||
| reorder = repo.ui.config('bundle', 'reorder') | reorder = repo.ui.config('bundle', 'reorder') | ||||
| if reorder == 'auto': | if reorder == 'auto': | ||||
| self._reorder = allowreorder | self._reorder = allowreorder | ||||
| c = cl.read(x) | c = cl.read(x) | ||||
| clrevorder[x] = len(clrevorder) | clrevorder[x] = len(clrevorder) | ||||
| if self._ellipses: | if self._ellipses: | ||||
| # Only update mfs if x is going to be sent. Otherwise we | # Only update mfs if x is going to be sent. Otherwise we | ||||
| # end up with bogus linkrevs specified for manifests and | # end up with bogus linkrevs specified for manifests and | ||||
| # we skip some manifest nodes that we should otherwise | # we skip some manifest nodes that we should otherwise | ||||
| # have sent. | # have sent. | ||||
| if (x in self._full_nodes | if (x in self._fullnodes | ||||
| or cl.rev(x) in self._precomputedellipsis): | or cl.rev(x) in self._precomputedellipsis): | ||||
| n = c[0] | n = c[0] | ||||
| # Record the first changeset introducing this manifest | # Record the first changeset introducing this manifest | ||||
| # version. | # version. | ||||
| mfs.setdefault(n, x) | mfs.setdefault(n, x) | ||||
| # Set this narrow-specific dict so we have the lowest | # Set this narrow-specific dict so we have the lowest | ||||
| # manifest revnum to look up for this cl revnum. (Part of | # manifest revnum to look up for this cl revnum. (Part of | ||||
| # mapping changelog ellipsis parents to manifest ellipsis | # mapping changelog ellipsis parents to manifest ellipsis | ||||
| linkrev = rev | linkrev = rev | ||||
| self._clrevtolocalrev[linkrev] = rev | self._clrevtolocalrev[linkrev] = rev | ||||
| else: | else: | ||||
| linkrev = self._clnodetorev[linknode] | linkrev = self._clnodetorev[linknode] | ||||
| self._clrevtolocalrev[linkrev] = rev | self._clrevtolocalrev[linkrev] = rev | ||||
| # This is a node to send in full, because the changeset it | # This is a node to send in full, because the changeset it | ||||
| # corresponds to was a full changeset. | # corresponds to was a full changeset. | ||||
| if linknode in self._full_nodes: | if linknode in self._fullnodes: | ||||
| return self._revisiondeltanormal(store, rev, prev, linknode) | return self._revisiondeltanormal(store, rev, prev, linknode) | ||||
| # At this point, a node can either be one we should skip or an | # At this point, a node can either be one we should skip or an | ||||
| # ellipsis. If it's not an ellipsis, bail immediately. | # ellipsis. If it's not an ellipsis, bail immediately. | ||||
| if linkrev not in self._precomputedellipsis: | if linkrev not in self._precomputedellipsis: | ||||
| return | return | ||||
| linkparents = self._precomputedellipsis[linkrev] | linkparents = self._precomputedellipsis[linkrev] | ||||
| # entry will have been relevant, so we need to skip some changelog | # entry will have been relevant, so we need to skip some changelog | ||||
| # nodes even after ellipsis-izing. | # nodes even after ellipsis-izing. | ||||
| walk = [clrev] | walk = [clrev] | ||||
| while walk: | while walk: | ||||
| p = walk[0] | p = walk[0] | ||||
| walk = walk[1:] | walk = walk[1:] | ||||
| if p in self._clrevtolocalrev: | if p in self._clrevtolocalrev: | ||||
| return self._clrevtolocalrev[p] | return self._clrevtolocalrev[p] | ||||
| elif p in self._full_nodes: | elif p in self._fullnodes: | ||||
| walk.extend([pp for pp in self._repo.changelog.parentrevs(p) | walk.extend([pp for pp in self._repo.changelog.parentrevs(p) | ||||
| if pp != nullrev]) | if pp != nullrev]) | ||||
| elif p in self._precomputedellipsis: | elif p in self._precomputedellipsis: | ||||
| walk.extend([pp for pp in self._precomputedellipsis[p] | walk.extend([pp for pp in self._precomputedellipsis[p] | ||||
| if pp != nullrev]) | if pp != nullrev]) | ||||
| else: | else: | ||||
| # In this case, we've got an ellipsis with parents | # In this case, we've got an ellipsis with parents | ||||
| # outside the current bundle (likely an | # outside the current bundle (likely an | ||||
| p2node=p2n, | p2node=p2n, | ||||
| basenode=nullid, | basenode=nullid, | ||||
| linknode=linknode, | linknode=linknode, | ||||
| flags=flags, | flags=flags, | ||||
| deltachunks=(diffheader, data), | deltachunks=(diffheader, data), | ||||
| ) | ) | ||||
| def _makecg1packer(repo, filematcher, bundlecaps, ellipses=False, | def _makecg1packer(repo, filematcher, bundlecaps, ellipses=False, | ||||
| shallow=False, ellipsisroots=None): | shallow=False, ellipsisroots=None, fullnodes=None): | ||||
| builddeltaheader = lambda d: _CHANGEGROUPV1_DELTA_HEADER.pack( | builddeltaheader = lambda d: _CHANGEGROUPV1_DELTA_HEADER.pack( | ||||
| d.node, d.p1node, d.p2node, d.linknode) | d.node, d.p1node, d.p2node, d.linknode) | ||||
| return cgpacker(repo, filematcher, b'01', | return cgpacker(repo, filematcher, b'01', | ||||
| useprevdelta=True, | useprevdelta=True, | ||||
| allowreorder=None, | allowreorder=None, | ||||
| builddeltaheader=builddeltaheader, | builddeltaheader=builddeltaheader, | ||||
| manifestsend=b'', | manifestsend=b'', | ||||
| sendtreemanifests=False, | sendtreemanifests=False, | ||||
| bundlecaps=bundlecaps, | bundlecaps=bundlecaps, | ||||
| ellipses=ellipses, | ellipses=ellipses, | ||||
| shallow=shallow, | shallow=shallow, | ||||
| ellipsisroots=ellipsisroots) | ellipsisroots=ellipsisroots, | ||||
| fullnodes=fullnodes) | |||||
| def _makecg2packer(repo, filematcher, bundlecaps, ellipses=False, | def _makecg2packer(repo, filematcher, bundlecaps, ellipses=False, | ||||
| shallow=False, ellipsisroots=None): | shallow=False, ellipsisroots=None, fullnodes=None): | ||||
| builddeltaheader = lambda d: _CHANGEGROUPV2_DELTA_HEADER.pack( | builddeltaheader = lambda d: _CHANGEGROUPV2_DELTA_HEADER.pack( | ||||
| d.node, d.p1node, d.p2node, d.basenode, d.linknode) | d.node, d.p1node, d.p2node, d.basenode, d.linknode) | ||||
| # Since generaldelta is directly supported by cg2, reordering | # Since generaldelta is directly supported by cg2, reordering | ||||
| # generally doesn't help, so we disable it by default (treating | # generally doesn't help, so we disable it by default (treating | ||||
| # bundle.reorder=auto just like bundle.reorder=False). | # bundle.reorder=auto just like bundle.reorder=False). | ||||
| return cgpacker(repo, filematcher, b'02', | return cgpacker(repo, filematcher, b'02', | ||||
| useprevdelta=False, | useprevdelta=False, | ||||
| allowreorder=False, | allowreorder=False, | ||||
| builddeltaheader=builddeltaheader, | builddeltaheader=builddeltaheader, | ||||
| manifestsend=b'', | manifestsend=b'', | ||||
| sendtreemanifests=False, | sendtreemanifests=False, | ||||
| bundlecaps=bundlecaps, | bundlecaps=bundlecaps, | ||||
| ellipses=ellipses, | ellipses=ellipses, | ||||
| shallow=shallow, | shallow=shallow, | ||||
| ellipsisroots=ellipsisroots) | ellipsisroots=ellipsisroots, | ||||
| fullnodes=fullnodes) | |||||
| def _makecg3packer(repo, filematcher, bundlecaps, ellipses=False, | def _makecg3packer(repo, filematcher, bundlecaps, ellipses=False, | ||||
| shallow=False, ellipsisroots=None): | shallow=False, ellipsisroots=None, fullnodes=None): | ||||
| builddeltaheader = lambda d: _CHANGEGROUPV3_DELTA_HEADER.pack( | builddeltaheader = lambda d: _CHANGEGROUPV3_DELTA_HEADER.pack( | ||||
| d.node, d.p1node, d.p2node, d.basenode, d.linknode, d.flags) | d.node, d.p1node, d.p2node, d.basenode, d.linknode, d.flags) | ||||
| return cgpacker(repo, filematcher, b'03', | return cgpacker(repo, filematcher, b'03', | ||||
| useprevdelta=False, | useprevdelta=False, | ||||
| allowreorder=False, | allowreorder=False, | ||||
| builddeltaheader=builddeltaheader, | builddeltaheader=builddeltaheader, | ||||
| manifestsend=closechunk(), | manifestsend=closechunk(), | ||||
| sendtreemanifests=True, | sendtreemanifests=True, | ||||
| bundlecaps=bundlecaps, | bundlecaps=bundlecaps, | ||||
| ellipses=ellipses, | ellipses=ellipses, | ||||
| shallow=shallow, | shallow=shallow, | ||||
| ellipsisroots=ellipsisroots) | ellipsisroots=ellipsisroots, | ||||
| fullnodes=fullnodes) | |||||
| _packermap = {'01': (_makecg1packer, cg1unpacker), | _packermap = {'01': (_makecg1packer, cg1unpacker), | ||||
| # cg2 adds support for exchanging generaldelta | # cg2 adds support for exchanging generaldelta | ||||
| '02': (_makecg2packer, cg2unpacker), | '02': (_makecg2packer, cg2unpacker), | ||||
| # cg3 adds support for exchanging revlog flags and treemanifests | # cg3 adds support for exchanging revlog flags and treemanifests | ||||
| '03': (_makecg3packer, cg3unpacker), | '03': (_makecg3packer, cg3unpacker), | ||||
| } | } | ||||
| # support changegroup 02. | # support changegroup 02. | ||||
| versions = supportedoutgoingversions(repo) | versions = supportedoutgoingversions(repo) | ||||
| if 'generaldelta' in repo.requirements: | if 'generaldelta' in repo.requirements: | ||||
| versions.discard('01') | versions.discard('01') | ||||
| assert versions | assert versions | ||||
| return min(versions) | return min(versions) | ||||
| def getbundler(version, repo, bundlecaps=None, filematcher=None, | def getbundler(version, repo, bundlecaps=None, filematcher=None, | ||||
| ellipses=False, shallow=False, ellipsisroots=None): | ellipses=False, shallow=False, ellipsisroots=None, | ||||
| fullnodes=None): | |||||
| assert version in supportedoutgoingversions(repo) | assert version in supportedoutgoingversions(repo) | ||||
| if filematcher is None: | if filematcher is None: | ||||
| filematcher = matchmod.alwaysmatcher(repo.root, '') | filematcher = matchmod.alwaysmatcher(repo.root, '') | ||||
| if version == '01' and not filematcher.always(): | if version == '01' and not filematcher.always(): | ||||
| raise error.ProgrammingError('version 01 changegroups do not support ' | raise error.ProgrammingError('version 01 changegroups do not support ' | ||||
| 'sparse file matchers') | 'sparse file matchers') | ||||
| if ellipses and version in (b'01', b'02'): | if ellipses and version in (b'01', b'02'): | ||||
| raise error.Abort( | raise error.Abort( | ||||
| _('ellipsis nodes require at least cg3 on client and server, ' | _('ellipsis nodes require at least cg3 on client and server, ' | ||||
| 'but negotiated version %s') % version) | 'but negotiated version %s') % version) | ||||
| # Requested files could include files not in the local store. So | # Requested files could include files not in the local store. So | ||||
| # filter those out. | # filter those out. | ||||
| filematcher = matchmod.intersectmatchers(repo.narrowmatch(), | filematcher = matchmod.intersectmatchers(repo.narrowmatch(), | ||||
| filematcher) | filematcher) | ||||
| fn = _packermap[version][0] | fn = _packermap[version][0] | ||||
| return fn(repo, filematcher, bundlecaps, ellipses=ellipses, | return fn(repo, filematcher, bundlecaps, ellipses=ellipses, | ||||
| shallow=shallow, ellipsisroots=ellipsisroots) | shallow=shallow, ellipsisroots=ellipsisroots, | ||||
| fullnodes=fullnodes) | |||||
| def getunbundler(version, fh, alg, extras=None): | def getunbundler(version, fh, alg, extras=None): | ||||
| return _packermap[version][1](fh, alg, extras=extras) | return _packermap[version][1](fh, alg, extras=extras) | ||||
| def _changegroupinfo(repo, nodes, source): | def _changegroupinfo(repo, nodes, source): | ||||
| if repo.ui.verbose or source == 'bundle': | if repo.ui.verbose or source == 'bundle': | ||||
| repo.ui.status(_("%d changesets found\n") % len(nodes)) | repo.ui.status(_("%d changesets found\n") % len(nodes)) | ||||
| if repo.ui.debugflag: | if repo.ui.debugflag: | ||||
| # We wrap cg1packer.revchunk, using a side channel to pass | # We wrap cg1packer.revchunk, using a side channel to pass | ||||
| # relevant_nodes into that area. Then if linknode isn't in the | # relevant_nodes into that area. Then if linknode isn't in the | ||||
| # set, we know we have an ellipsis node and we should defer | # set, we know we have an ellipsis node and we should defer | ||||
| # sending that node's data. We override close() to detect | # sending that node's data. We override close() to detect | ||||
| # pending ellipsis nodes and flush them. | # pending ellipsis nodes and flush them. | ||||
| packer = getbundler(version, repo, filematcher=match, | packer = getbundler(version, repo, filematcher=match, | ||||
| ellipses=True, | ellipses=True, | ||||
| shallow=depth is not None, | shallow=depth is not None, | ||||
| ellipsisroots=ellipsisroots) | ellipsisroots=ellipsisroots, | ||||
| # Give the packer the list of nodes which should not be | fullnodes=relevant_nodes) | ||||
| # 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 | |||||
| return packer.generate(common, visitnodes, False, source) | return packer.generate(common, visitnodes, False, source) | ||||