comparison mercurial/revlog.py @ 42998:8a31294fa25c

upgrade: fix DELTAREUSEFULLADD implementation in revlog.clone

If we do a full addition, we need to start from the full text.

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

42997:6510c7830838

            # (Possibly) reuse the delta from the revlog if allowed and
            # the revlog chunk is a delta.
            cachedelta = None
            rawtext = None
            if (deltareuse != self.DELTAREUSEFULLADD and destrevlog._lazydelta):
                dp = self.deltaparent(rev)
                if dp != nullrev:
                    cachedelta = (dp, bytes(self._chunk(rev)))

            if not cachedelta:
                rawtext = self.rawdata(rev)


            if deltareuse == self.DELTAREUSEFULLADD:
                destrevlog.addrevision(rawtext, tr, linkrev, p1, p2,
                                       cachedelta=cachedelta,
                                       node=node, flags=flags,
                                       deltacomputer=deltacomputer)
            else:
                ifh = destrevlog.opener(destrevlog.indexfile, 'a+',
                                        checkambig=False)
                dfh = None
                if not destrevlog._inline:
                    dfh = destrevlog.opener(destrevlog.datafile, 'a+')

42998:8a31294fa25c

            # (Possibly) reuse the delta from the revlog if allowed and
            # the revlog chunk is a delta.
            cachedelta = None
            rawtext = None
            if deltareuse == self.DELTAREUSEFULLADD:
                text = self.revision(rev)
                destrevlog.addrevision(text, tr, linkrev, p1, p2,
                                       cachedelta=cachedelta,
                                       node=node, flags=flags,
                                       deltacomputer=deltacomputer)
            else:
                if destrevlog._lazydelta:
                    dp = self.deltaparent(rev)
                    if dp != nullrev:
                        cachedelta = (dp, bytes(self._chunk(rev)))

                if not cachedelta:
                    rawtext = self.rawdata(rev)

                ifh = destrevlog.opener(destrevlog.indexfile, 'a+',
                                        checkambig=False)
                dfh = None
                if not destrevlog._inline:
                    dfh = destrevlog.opener(destrevlog.datafile, 'a+')