comparison mercurial/revlog.py @ 36744:33275ab5e837 stable

revlog: do not use delta for lfs revisions

This is similar to what we have done for changegroups. It is needed to make
sure the delta application code path can assume deltas are always against
vanilla (ex. non-LFS) rawtext so the next fix becomes possible.

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

36743:d031609b3cb7

        deltainfo = None
        for candidaterevs in self._getcandidaterevs(p1, p2, cachedelta):
            nominateddeltas = []
            for candidaterev in candidaterevs:
                candidatedelta = self._builddeltainfo(revinfo, candidaterev, fh)
                if revlog._isgooddeltainfo(candidatedelta, revinfo.textlen):
                    nominateddeltas.append(candidatedelta)
            if nominateddeltas:
                deltainfo = min(nominateddeltas, key=lambda x: x.deltalen)

        if deltacomputer is None:
            deltacomputer = _deltacomputer(self)

        revinfo = _revisioninfo(node, p1, p2, btext, textlen, cachedelta, flags)
        deltainfo = deltacomputer.finddeltainfo(revinfo, fh)

        if deltainfo is not None:
            base = deltainfo.base
            chainbase = deltainfo.chainbase
            data = deltainfo.data

36744:33275ab5e837

        deltainfo = None
        for candidaterevs in self._getcandidaterevs(p1, p2, cachedelta):
            nominateddeltas = []
            for candidaterev in candidaterevs:
                # no delta for rawtext-changing revs (see "candelta" for why)
                if revlog.flags(candidaterev) & REVIDX_RAWTEXT_CHANGING_FLAGS:
                    continue
                candidatedelta = self._builddeltainfo(revinfo, candidaterev, fh)
                if revlog._isgooddeltainfo(candidatedelta, revinfo.textlen):
                    nominateddeltas.append(candidatedelta)
            if nominateddeltas:
                deltainfo = min(nominateddeltas, key=lambda x: x.deltalen)

        if deltacomputer is None:
            deltacomputer = _deltacomputer(self)

        revinfo = _revisioninfo(node, p1, p2, btext, textlen, cachedelta, flags)

        # no delta for flag processor revision (see "candelta" for why)
        # not calling candelta since only one revision needs test, also to
        # avoid overhead fetching flags again.
        if flags & REVIDX_RAWTEXT_CHANGING_FLAGS:
            deltainfo = None
        else:
            deltainfo = deltacomputer.finddeltainfo(revinfo, fh)

        if deltainfo is not None:
            base = deltainfo.base
            chainbase = deltainfo.chainbase
            data = deltainfo.data