comparison mercurial/changegroup.py @ 38898:67f37e8a5490

changegroup: pass end of manifests marker into constructor

cg3 inserts a custom marker in the stream once all manifests
have been transferred. This is currently abstracted out by
overriding a method.

Let's pass the end of manifests marker in as an argument to avoid
the extra method.

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

38897:bd64b8b8f0dd

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

class cg1packer(object):
    def __init__(self, repo, filematcher, version, builddeltaheader,
                 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.

        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.

        assert filematcher
        self._filematcher = filematcher

        self.version = version
        self._builddeltaheader = builddeltaheader

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

        """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 _manifestsdone(self):
        return ''

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

                for x in self._packmanifests(dir, prunednodes,
                                             makelookupmflinknode(dir, nodes)):
                    size += len(x)
                    yield x
        self._verbosenote(_('%8.i (manifests)\n') % size)
        yield self._manifestsdone()

    # The 'source' parameter is useful for extensions
    def generatefiles(self, changedfiles, linknodes, commonrevs, source):
        changedfiles = list(filter(self._filematcher, changedfiles))

            deltachunks=(diffheader, data),
        )

class cg2packer(cg1packer):
    def __init__(self, repo, filematcher, version, builddeltaheader,
                 bundlecaps=None):
        super(cg2packer, self).__init__(repo, filematcher, version,
                                        builddeltaheader,
                                        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

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

    def _manifestsdone(self):
        return self.close()

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,
                     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,
                     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,
                     bundlecaps=bundlecaps)

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

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.

        assert filematcher
        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

        """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
        cl = repo.changelog

                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

    # The 'source' parameter is useful for extensions
    def generatefiles(self, changedfiles, linknodes, commonrevs, source):
        changedfiles = list(filter(self._filematcher, changedfiles))

            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

        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),