comparison mercurial/changegroup.py @ 49766:152d9c011bcd

changegroup: add `delta_base_reuse_policy` argument

The argument available through function from changegroup.apply to
`revlog.apply` allow to override the revlog configuration in terms of
delta-base-reuse policy when searching for a delta to store a revision.

It will be put to use in the next changesets.

49765:4188e75af983

        revmap,
        trp,
        prog,
        addrevisioncb=None,
        debug_info=None,
    ):
        self.callback = prog.increment
        # no need to check for empty manifest group here:
        # if the result of the merge of 1 and 2 is the same in 3 and 4,
        # no new manifest will be created and the manifest group will

            deltas,
            revmap,
            trp,
            addrevisioncb=addrevisioncb,
            debug_info=debug_info,
        )
        prog.complete()
        self.callback = None

    def apply(

        srctype,
        url,
        targetphase=phases.draft,
        expectedtotal=None,
        sidedata_categories=None,
    ):
        """Add the changegroup returned by source.read() to this repo.
        srctype is a string like 'push', 'pull', or 'unbundle'.  url is
        the URL of the repo where this changegroup is coming from.

        - fewer heads than before: -1-removed heads (-2..-n)
        - number of heads stays the same: 1

        `sidedata_categories` is an optional set of the remote's sidedata wanted
        categories.
        """
        repo = repo.unfiltered()

        debug_info = None
        if repo.ui.configbool(b'debug', b'unbundling-stats'):

                trp,
                alwayscache=True,
                addrevisioncb=onchangelog,
                duplicaterevisioncb=ondupchangelog,
                debug_info=debug_info,
            ):
                repo.ui.develwarn(
                    b'applied empty changelog from changegroup',
                    config=b'warn-empty-changegroup',
                )

                revmap,
                trp,
                progress,
                addrevisioncb=on_manifest_rev,
                debug_info=debug_info,
            )

            needfiles = {}
            if repo.ui.configbool(b'server', b'validate'):
                cl = repo.changelog

                trp,
                efiles,
                needfiles,
                addrevisioncb=on_filelog_rev,
                debug_info=debug_info,
            )

            if sidedata_helpers:
                if revlog_constants.KIND_CHANGELOG in sidedata_helpers[1]:
                    cl.rewrite_sidedata(

        revmap,
        trp,
        prog,
        addrevisioncb=None,
        debug_info=None,
    ):
        super(cg3unpacker, self)._unpackmanifests(
            repo,
            revmap,
            trp,
            prog,
            addrevisioncb=addrevisioncb,
            debug_info=debug_info,
        )
        for chunkdata in iter(self.filelogheader, {}):
            # If we get here, there are directory manifests in the changegroup
            d = chunkdata[b"filename"]
            repo.ui.debug(b"adding %s revisions\n" % d)

                deltas,
                revmap,
                trp,
                addrevisioncb=addrevisioncb,
                debug_info=debug_info,
            ):
                raise error.Abort(_(b"received dir revlog group is empty"))


class cg4unpacker(cg3unpacker):

    trp,
    expectedfiles,
    needfiles,
    addrevisioncb=None,
    debug_info=None,
):
    revisions = 0
    files = 0
    progress = repo.ui.makeprogress(
        _(b'files'), unit=_(b'files'), total=expectedfiles

                deltas,
                revmap,
                trp,
                addrevisioncb=addrevisioncb,
                debug_info=debug_info,
            )
            if not added:
                raise error.Abort(_(b"received file revlog group is empty"))
        except error.CensoredBaseError as e:
            raise error.Abort(_(b"received delta base is censored: %s") % e)

49766:152d9c011bcd

        revmap,
        trp,
        prog,
        addrevisioncb=None,
        debug_info=None,
        delta_base_reuse_policy=None,
    ):
        self.callback = prog.increment
        # no need to check for empty manifest group here:
        # if the result of the merge of 1 and 2 is the same in 3 and 4,
        # no new manifest will be created and the manifest group will

            deltas,
            revmap,
            trp,
            addrevisioncb=addrevisioncb,
            debug_info=debug_info,
            delta_base_reuse_policy=delta_base_reuse_policy,
        )
        prog.complete()
        self.callback = None

    def apply(

        srctype,
        url,
        targetphase=phases.draft,
        expectedtotal=None,
        sidedata_categories=None,
        delta_base_reuse_policy=None,
    ):
        """Add the changegroup returned by source.read() to this repo.
        srctype is a string like 'push', 'pull', or 'unbundle'.  url is
        the URL of the repo where this changegroup is coming from.

        - fewer heads than before: -1-removed heads (-2..-n)
        - number of heads stays the same: 1

        `sidedata_categories` is an optional set of the remote's sidedata wanted
        categories.

        `delta_base_reuse_policy` is an optional argument, when set to a value
        it will control the way the delta contained into the bundle are reused
        when applied in the revlog.

        See `DELTA_BASE_REUSE_*` entry in mercurial.revlogutils.constants.
        """
        repo = repo.unfiltered()

        debug_info = None
        if repo.ui.configbool(b'debug', b'unbundling-stats'):

                trp,
                alwayscache=True,
                addrevisioncb=onchangelog,
                duplicaterevisioncb=ondupchangelog,
                debug_info=debug_info,
                delta_base_reuse_policy=delta_base_reuse_policy,
            ):
                repo.ui.develwarn(
                    b'applied empty changelog from changegroup',
                    config=b'warn-empty-changegroup',
                )

                revmap,
                trp,
                progress,
                addrevisioncb=on_manifest_rev,
                debug_info=debug_info,
                delta_base_reuse_policy=delta_base_reuse_policy,
            )

            needfiles = {}
            if repo.ui.configbool(b'server', b'validate'):
                cl = repo.changelog

                trp,
                efiles,
                needfiles,
                addrevisioncb=on_filelog_rev,
                debug_info=debug_info,
                delta_base_reuse_policy=delta_base_reuse_policy,
            )

            if sidedata_helpers:
                if revlog_constants.KIND_CHANGELOG in sidedata_helpers[1]:
                    cl.rewrite_sidedata(

        revmap,
        trp,
        prog,
        addrevisioncb=None,
        debug_info=None,
        delta_base_reuse_policy=None,
    ):
        super(cg3unpacker, self)._unpackmanifests(
            repo,
            revmap,
            trp,
            prog,
            addrevisioncb=addrevisioncb,
            debug_info=debug_info,
            delta_base_reuse_policy=delta_base_reuse_policy,
        )
        for chunkdata in iter(self.filelogheader, {}):
            # If we get here, there are directory manifests in the changegroup
            d = chunkdata[b"filename"]
            repo.ui.debug(b"adding %s revisions\n" % d)

                deltas,
                revmap,
                trp,
                addrevisioncb=addrevisioncb,
                debug_info=debug_info,
                delta_base_reuse_policy=delta_base_reuse_policy,
            ):
                raise error.Abort(_(b"received dir revlog group is empty"))


class cg4unpacker(cg3unpacker):

    trp,
    expectedfiles,
    needfiles,
    addrevisioncb=None,
    debug_info=None,
    delta_base_reuse_policy=None,
):
    revisions = 0
    files = 0
    progress = repo.ui.makeprogress(
        _(b'files'), unit=_(b'files'), total=expectedfiles

                deltas,
                revmap,
                trp,
                addrevisioncb=addrevisioncb,
                debug_info=debug_info,
                delta_base_reuse_policy=delta_base_reuse_policy,
            )
            if not added:
                raise error.Abort(_(b"received file revlog group is empty"))
        except error.CensoredBaseError as e:
            raise error.Abort(_(b"received delta base is censored: %s") % e)