| indygreg |
| hg-reviewers |
It works for flat manifests too. We just cannot use cg1 or cg2 if we
have subdirectory manifests.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| # 2 bytes of flags to apply to revision data. | # 2 bytes of flags to apply to revision data. | ||||
| 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, | bundlecaps=None, ellipses=False, | ||||
| shallow=False, ellipsisroots=None, fullnodes=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. | ||||
| useprevdelta controls whether revisions should always delta against | useprevdelta controls whether revisions should always delta against | ||||
| the previous revision in the changegroup. | the previous revision in the changegroup. | ||||
| builddeltaheader is a callable that constructs the header for a group | builddeltaheader is a callable that constructs the header for a group | ||||
| delta. | delta. | ||||
| manifestsend is a chunk to send after manifests have been fully emitted. | manifestsend is a chunk to send after manifests have been fully emitted. | ||||
| sendtreemanifests indicates whether tree manifests should be emitted. | |||||
| ellipses indicates whether ellipsis serving mode is enabled. | ellipses indicates whether ellipsis serving mode is enabled. | ||||
| 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 | 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 | store this rather than the set of nodes that should be ellipsis because | ||||
| for very large histories we expect this to be significantly smaller. | 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._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 | self._fullnodes = fullnodes | ||||
| if isinstance(store, manifest.manifestrevlog): | if isinstance(store, manifest.manifestrevlog): | ||||
| if not self._filematcher.visitdir(store._dir[:-1] or '.'): | if not self._filematcher.visitdir(store._dir[:-1] or '.'): | ||||
| return [] | return [] | ||||
| rr, rl = store.rev, store.linkrev | rr, rl = store.rev, store.linkrev | ||||
| return [n for n in missing if rl(rr(n)) not in commonrevs] | return [n for n in missing if rl(rr(n)) not in commonrevs] | ||||
| def _packmanifests(self, dir, mfnodes, lookuplinknode): | def _packmanifests(self, dir, mfnodes, lookuplinknode): | ||||
| """Pack flat manifests into a changegroup stream.""" | """Pack manifests into a changegroup stream. | ||||
| assert not dir | |||||
| for chunk in self.group(mfnodes, self._repo.manifestlog._revlog, | |||||
| lookuplinknode, units=_('manifests')): | |||||
| yield chunk | |||||
| def _packtreemanifests(self, dir, mfnodes, lookuplinknode): | |||||
| """Version of _packmanifests that operates on directory manifests. | |||||
| Encodes the directory name in the output so multiple manifests | Encodes the directory name in the output so multiple manifests | ||||
| can be sent. | can be sent. Multiple manifests is not supported by cg1 and cg2. | ||||
| """ | """ | ||||
| assert self.version == b'03' | |||||
| if dir: | if dir: | ||||
| assert self.version == b'03' | |||||
| yield self._fileheader(dir) | yield self._fileheader(dir) | ||||
| # TODO violates storage abstractions by assuming revlogs. | # TODO violates storage abstractions by assuming revlogs. | ||||
| dirlog = self._repo.manifestlog._revlog.dirlog(dir) | dirlog = self._repo.manifestlog._revlog.dirlog(dir) | ||||
| for chunk in self.group(mfnodes, dirlog, lookuplinknode, | for chunk in self.group(mfnodes, dirlog, lookuplinknode, | ||||
| units=_('manifests')): | units=_('manifests')): | ||||
| yield chunk | yield chunk | ||||
| f = dir + p | f = dir + p | ||||
| fclnodes = fnodes.setdefault(f, {}) | fclnodes = fnodes.setdefault(f, {}) | ||||
| fclnode = fclnodes.setdefault(n, clnode) | fclnode = fclnodes.setdefault(n, clnode) | ||||
| if clrevorder[clnode] < clrevorder[fclnode]: | if clrevorder[clnode] < clrevorder[fclnode]: | ||||
| fclnodes[n] = clnode | fclnodes[n] = clnode | ||||
| return clnode | return clnode | ||||
| return lookupmflinknode | return lookupmflinknode | ||||
| fn = (self._packtreemanifests if self._sendtreemanifests | |||||
| else self._packmanifests) | |||||
| size = 0 | size = 0 | ||||
| while tmfnodes: | while tmfnodes: | ||||
| dir, nodes = tmfnodes.popitem() | dir, nodes = tmfnodes.popitem() | ||||
| prunednodes = self._prune(dirlog(dir), nodes, commonrevs) | prunednodes = self._prune(dirlog(dir), nodes, commonrevs) | ||||
| if not dir or prunednodes: | if not dir or prunednodes: | ||||
| for x in fn(dir, prunednodes, makelookupmflinknode(dir, nodes)): | for x in self._packmanifests(dir, prunednodes, | ||||
| makelookupmflinknode(dir, nodes)): | |||||
| size += len(x) | size += len(x) | ||||
| yield x | yield x | ||||
| self._verbosenote(_('%8.i (manifests)\n') % size) | self._verbosenote(_('%8.i (manifests)\n') % size) | ||||
| yield self._manifestsend | yield self._manifestsend | ||||
| # The 'source' parameter is useful for extensions | # The 'source' parameter is useful for extensions | ||||
| def generatefiles(self, changedfiles, linknodes, commonrevs, source): | def generatefiles(self, changedfiles, linknodes, commonrevs, source): | ||||
| changedfiles = list(filter(self._filematcher, changedfiles)) | changedfiles = list(filter(self._filematcher, changedfiles)) | ||||
| 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, | |||||
| bundlecaps=bundlecaps, | bundlecaps=bundlecaps, | ||||
| ellipses=ellipses, | ellipses=ellipses, | ||||
| shallow=shallow, | shallow=shallow, | ||||
| ellipsisroots=ellipsisroots, | ellipsisroots=ellipsisroots, | ||||
| fullnodes=fullnodes) | fullnodes=fullnodes) | ||||
| def _makecg2packer(repo, filematcher, bundlecaps, ellipses=False, | def _makecg2packer(repo, filematcher, bundlecaps, ellipses=False, | ||||
| shallow=False, ellipsisroots=None, fullnodes=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, | |||||
| bundlecaps=bundlecaps, | bundlecaps=bundlecaps, | ||||
| ellipses=ellipses, | ellipses=ellipses, | ||||
| shallow=shallow, | shallow=shallow, | ||||
| ellipsisroots=ellipsisroots, | ellipsisroots=ellipsisroots, | ||||
| fullnodes=fullnodes) | fullnodes=fullnodes) | ||||
| def _makecg3packer(repo, filematcher, bundlecaps, ellipses=False, | def _makecg3packer(repo, filematcher, bundlecaps, ellipses=False, | ||||
| shallow=False, ellipsisroots=None, fullnodes=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, | |||||
| bundlecaps=bundlecaps, | bundlecaps=bundlecaps, | ||||
| ellipses=ellipses, | ellipses=ellipses, | ||||
| shallow=shallow, | shallow=shallow, | ||||
| ellipsisroots=ellipsisroots, | ellipsisroots=ellipsisroots, | ||||
| fullnodes=fullnodes) | fullnodes=fullnodes) | ||||
| _packermap = {'01': (_makecg1packer, cg1unpacker), | _packermap = {'01': (_makecg1packer, cg1unpacker), | ||||
| # cg2 adds support for exchanging generaldelta | # cg2 adds support for exchanging generaldelta | ||||