comparison mercurial/bundlerepo.py @ 50200:197204dba8a2

bundlerepo: apply phase data stored in the bundle instead of assuming `draft`

The phase information contained in the changegroup part and the explicit
`phase-heads` part are now taken in account.

Initial changes and test by Matt Harbison, code rework by Pierre-Yves David.

50199:21f876895dfe

        if isinstance(bundle, bundle2.unbundle20):
            self._bundlefile = bundle

            cgpart = None
            for part in bundle.iterparts(seekable=True):
                if part.type == b'changegroup':
                    if cgpart:
                        raise NotImplementedError(
                            b"can't process multiple changegroups"
                        )
                    cgpart = part

        )

    def _handle_bundle2_cg_part(self, bundle, part):
        assert part.type == b'changegroup'
        cgstream = part
        version = part.params.get(b'version', b'01')
        legalcgvers = changegroup.supportedincomingversions(self)
        if version not in legalcgvers:
            msg = _(b'Unsupported changegroup version: %s')
            raise error.Abort(msg % version)

        self.firstnewrev = self.changelog.repotiprev + 1
        phases.retractboundary(
            self,
            None,
            phases.draft,
            [ctx.node() for ctx in self[self.firstnewrev :]],
        )

    def _writetempbundle(self, readfn, suffix, header=b''):
        """Write a temporary file to disk"""
        fdtemp, temp = self.vfs.mkstemp(prefix=b"hg-bundle-", suffix=suffix)
        self.tempfile = temp

50200:197204dba8a2

        if isinstance(bundle, bundle2.unbundle20):
            self._bundlefile = bundle

            cgpart = None
            for part in bundle.iterparts(seekable=True):
                if part.type == b'phase-heads':
                    self._handle_bundle2_phase_part(bundle, part)
                elif part.type == b'changegroup':
                    if cgpart:
                        raise NotImplementedError(
                            b"can't process multiple changegroups"
                        )
                    cgpart = part

        )

    def _handle_bundle2_cg_part(self, bundle, part):
        assert part.type == b'changegroup'
        cgstream = part
        targetphase = part.params.get(b'targetphase')
        try:
            targetphase = int(targetphase)
        except TypeError:
            pass
        if targetphase is None:
            targetphase = phases.draft
        if targetphase not in phases.allphases:
            m = _(b'unsupported targetphase: %d')
            m %= targetphase
            raise error.Abort(m)
        version = part.params.get(b'version', b'01')
        legalcgvers = changegroup.supportedincomingversions(self)
        if version not in legalcgvers:
            msg = _(b'Unsupported changegroup version: %s')
            raise error.Abort(msg % version)

        self.firstnewrev = self.changelog.repotiprev + 1
        phases.retractboundary(
            self,
            None,
            targetphase,
            [ctx.node() for ctx in self[self.firstnewrev :]],
        )

    def _handle_bundle2_phase_part(self, bundle, part):
        assert part.type == b'phase-heads'

        unfi = self.unfiltered()
        headsbyphase = phases.binarydecode(part)
        phases.updatephases(unfi, lambda: None, headsbyphase)

    def _writetempbundle(self, readfn, suffix, header=b''):
        """Write a temporary file to disk"""
        fdtemp, temp = self.vfs.mkstemp(prefix=b"hg-bundle-", suffix=suffix)
        self.tempfile = temp