comparison mercurial/changegroup.py @ 38899:7a154778fb46

changegroup: consolidate tree manifests sending into cg1packer

Previously, we overrode a method to control how manifests were
serialized. This method was redefined on cg3packer to send tree
manifests.

This commit moves the tree manifests sending variation to cg1packer
and teaches the cgpacker constructor to control which version to
use.

After these changes, cg3packer was empty. So it has been removed.

Differential Revision: https://phab.mercurial-scm.org/D4081

38898:67f37e8a5490

    # Iterable of chunks holding raw delta data.
    deltachunks = attr.ib()

class cg1packer(object):
    def __init__(self, repo, filematcher, version, builddeltaheader,
                 manifestsend,
                 bundlecaps=None):
        """Given a source repo, construct a bundler.

        filematcher is a matcher that matches on files to include in the
        changegroup. Used to facilitate sparse changegroups.

        builddeltaheader is a callable that constructs the header for a group
        delta.

        manifestsend is a chunk to send after manifests have been fully emitted.

        bundlecaps is optional and can be used to specify the set of
        capabilities which can be used to build the bundle. While bundlecaps is
        unused in core Mercurial, extensions rely on this feature to communicate
        capabilities to customize the changegroup packer.

        self._filematcher = filematcher

        self.version = version
        self._builddeltaheader = builddeltaheader
        self._manifestsend = manifestsend

        # Set of capabilities we can use to build the bundle.
        if bundlecaps is None:
            bundlecaps = set()
        self._bundlecaps = bundlecaps

    def _packmanifests(self, dir, mfnodes, lookuplinknode):
        """Pack flat manifests into a changegroup stream."""
        assert not dir
        for chunk in self.group(mfnodes, self._repo.manifestlog._revlog,
                                lookuplinknode, units=_('manifests')):
            yield chunk

    def generate(self, commonrevs, clnodes, fastpathlinkrev, source):
        '''yield a sequence of changegroup chunks (strings)'''
        repo = self._repo

                        if clrevorder[clnode] < clrevorder[fclnode]:
                            fclnodes[n] = clnode
                return clnode
            return lookupmflinknode

        size = 0
        while tmfnodes:
            dir, nodes = tmfnodes.popitem()
            prunednodes = self.prune(dirlog(dir), nodes, commonrevs)
            if not dir or prunednodes:
                for x in self._packmanifests(dir, prunednodes,
                                             makelookupmflinknode(dir, nodes)):
                    size += len(x)
                    yield x
        self._verbosenote(_('%8.i (manifests)\n') % size)
        yield self._manifestsend

            deltachunks=(diffheader, data),
        )

class cg2packer(cg1packer):
    def __init__(self, repo, filematcher, version, builddeltaheader,
                 manifestsend, bundlecaps=None):
        super(cg2packer, self).__init__(repo, filematcher, version,
                                        builddeltaheader, manifestsend,
                                        bundlecaps=bundlecaps)

        if self._reorder is None:
            # Since generaldelta is directly supported by cg2, reordering
            # generally doesn't help, so we disable it by default (treating

            base = dp
        if base != nullrev and not store.candelta(base, rev):
            base = nullrev
        return base

class cg3packer(cg2packer):
    def _packmanifests(self, dir, mfnodes, lookuplinknode):
        if dir:
            yield self.fileheader(dir)

        dirlog = self._repo.manifestlog._revlog.dirlog(dir)
        for chunk in self.group(mfnodes, dirlog, lookuplinknode,
                                units=_('manifests')):
            yield chunk

def _makecg1packer(repo, filematcher, bundlecaps):
    builddeltaheader = lambda d: _CHANGEGROUPV1_DELTA_HEADER.pack(
        d.node, d.p1node, d.p2node, d.linknode)

    return cg1packer(repo, filematcher, b'01', builddeltaheader,
                     manifestsend=b'',
                     bundlecaps=bundlecaps)

def _makecg2packer(repo, filematcher, bundlecaps):
    builddeltaheader = lambda d: _CHANGEGROUPV2_DELTA_HEADER.pack(
        d.node, d.p1node, d.p2node, d.basenode, d.linknode)

    return cg2packer(repo, filematcher, b'02', builddeltaheader,
                     manifestsend=b'',
                     bundlecaps=bundlecaps)

def _makecg3packer(repo, filematcher, bundlecaps):
    builddeltaheader = lambda d: _CHANGEGROUPV3_DELTA_HEADER.pack(
        d.node, d.p1node, d.p2node, d.basenode, d.linknode, d.flags)

    return cg3packer(repo, filematcher, b'03', builddeltaheader,
                     manifestsend=closechunk(),
                     bundlecaps=bundlecaps)

_packermap = {'01': (_makecg1packer, cg1unpacker),
             # cg2 adds support for exchanging generaldelta
             '02': (_makecg2packer, cg2unpacker),

38899:7a154778fb46

    # Iterable of chunks holding raw delta data.
    deltachunks = attr.ib()

class cg1packer(object):
    def __init__(self, repo, filematcher, version, builddeltaheader,
                 manifestsend, sendtreemanifests,
                 bundlecaps=None):
        """Given a source repo, construct a bundler.

        filematcher is a matcher that matches on files to include in the
        changegroup. Used to facilitate sparse changegroups.

        builddeltaheader is a callable that constructs the header for a group
        delta.

        manifestsend is a chunk to send after manifests have been fully emitted.

        sendtreemanifests indicates whether tree manifests should be emitted.

        bundlecaps is optional and can be used to specify the set of
        capabilities which can be used to build the bundle. While bundlecaps is
        unused in core Mercurial, extensions rely on this feature to communicate
        capabilities to customize the changegroup packer.

        self._filematcher = filematcher

        self.version = version
        self._builddeltaheader = builddeltaheader
        self._manifestsend = manifestsend
        self._sendtreemanifests = sendtreemanifests

        # Set of capabilities we can use to build the bundle.
        if bundlecaps is None:
            bundlecaps = set()
        self._bundlecaps = bundlecaps

    def _packmanifests(self, dir, mfnodes, lookuplinknode):
        """Pack flat 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
        can be sent.
        """
        assert self.version == b'03'

        if dir:
            yield self.fileheader(dir)

        # TODO violates storage abstractions by assuming revlogs.
        dirlog = self._repo.manifestlog._revlog.dirlog(dir)
        for chunk in self.group(mfnodes, dirlog, lookuplinknode,
                                units=_('manifests')):
            yield chunk

    def generate(self, commonrevs, clnodes, fastpathlinkrev, source):
        '''yield a sequence of changegroup chunks (strings)'''
        repo = self._repo

                        if clrevorder[clnode] < clrevorder[fclnode]:
                            fclnodes[n] = clnode
                return clnode
            return lookupmflinknode

        fn = (self._packtreemanifests if self._sendtreemanifests
              else self._packmanifests)
        size = 0
        while tmfnodes:
            dir, nodes = tmfnodes.popitem()
            prunednodes = self.prune(dirlog(dir), nodes, commonrevs)
            if not dir or prunednodes:
                for x in fn(dir, prunednodes, makelookupmflinknode(dir, nodes)):
                    size += len(x)
                    yield x
        self._verbosenote(_('%8.i (manifests)\n') % size)
        yield self._manifestsend

            deltachunks=(diffheader, data),
        )

class cg2packer(cg1packer):
    def __init__(self, repo, filematcher, version, builddeltaheader,
                 manifestsend, sendtreemanifests, bundlecaps=None):
        super(cg2packer, self).__init__(repo, filematcher, version,
                                        builddeltaheader, manifestsend,
                                        sendtreemanifests,
                                        bundlecaps=bundlecaps)

        if self._reorder is None:
            # Since generaldelta is directly supported by cg2, reordering
            # generally doesn't help, so we disable it by default (treating

            base = dp
        if base != nullrev and not store.candelta(base, rev):
            base = nullrev
        return base

def _makecg1packer(repo, filematcher, bundlecaps):
    builddeltaheader = lambda d: _CHANGEGROUPV1_DELTA_HEADER.pack(
        d.node, d.p1node, d.p2node, d.linknode)

    return cg1packer(repo, filematcher, b'01', builddeltaheader,
                     manifestsend=b'', sendtreemanifests=False,
                     bundlecaps=bundlecaps)

def _makecg2packer(repo, filematcher, bundlecaps):
    builddeltaheader = lambda d: _CHANGEGROUPV2_DELTA_HEADER.pack(
        d.node, d.p1node, d.p2node, d.basenode, d.linknode)

    return cg2packer(repo, filematcher, b'02', builddeltaheader,
                     manifestsend=b'', sendtreemanifests=False,
                     bundlecaps=bundlecaps)

def _makecg3packer(repo, filematcher, bundlecaps):
    builddeltaheader = lambda d: _CHANGEGROUPV3_DELTA_HEADER.pack(
        d.node, d.p1node, d.p2node, d.basenode, d.linknode, d.flags)

    return cg2packer(repo, filematcher, b'03', builddeltaheader,
                     manifestsend=closechunk(), sendtreemanifests=True,
                     bundlecaps=bundlecaps)

_packermap = {'01': (_makecg1packer, cg1unpacker),
             # cg2 adds support for exchanging generaldelta
             '02': (_makecg2packer, cg2unpacker),