comparison mercurial/revlog.py @ 30743:2df983125d37

revlog: add 'raw' argument to revision and _addrevision

This patch introduces a new 'raw' argument (defaults to False) to revlog's
revision() and _addrevision() methods.
When the 'raw' argument is set to True, it indicates the revision data should be
handled as raw data by the flagprocessor.

Note: Given revlog.addgroup() calls are restricted to changegroup generation, we
can always set raw to True when calling revlog._addrevision() from
revlog.addgroup().

30742:d3e2d39b97ea

            return str(self._chunk(rev2))

        return mdiff.textdiff(self.revision(rev1),
                              self.revision(rev2))

    def revision(self, nodeorrev, _df=None):
        """return an uncompressed revision of a given node or revision
        number.

        _df is an existing file handle to read from. It is meant to only be
        used internally.
        """
        if isinstance(nodeorrev, int):
            rev = nodeorrev
            node = self.node(rev)
        else:

            return False

        return True

    def _addrevision(self, node, text, transaction, link, p1, p2, flags,
                     cachedelta, ifh, dfh, alwayscache=False):
        """internal function to add revisions to the log

        see addrevision for argument descriptions.
        invariants:
        - text is optional (can be None); if not set, cachedelta must be set.
          if both are set, they must correspond to each other.
        """
        btext = [text]
        def buildtext():
            if btext[0] is not None:
                return btext[0]

            else:
                if self._inline:
                    fh = ifh
                else:
                    fh = dfh
                basetext = self.revision(self.node(baserev), _df=fh)
                btext[0] = mdiff.patch(basetext, delta)
            try:
                self.checkhash(btext[0], node, p1=p1, p2=p2)
                if flags & REVIDX_ISCENSORED:
                    raise RevlogError(_('node %s is not censored') % node)
            except CensoredNodeError:

                # We assume consumers of addrevisioncb will want to retrieve
                # the added revision, which will require a call to
                # revision(). revision() will fast path if there is a cache
                # hit. So, we tell _addrevision() to always cache in this case.
                chain = self._addrevision(node, None, transaction, link,
                                          p1, p2, flags, (baserev, delta),
                                          ifh, dfh,
                                          alwayscache=bool(addrevisioncb))

                if addrevisioncb:
                    addrevisioncb(self, chain)

                if not dfh and not self._inline:

30743:2df983125d37

            return str(self._chunk(rev2))

        return mdiff.textdiff(self.revision(rev1),
                              self.revision(rev2))

    def revision(self, nodeorrev, _df=None, raw=False):
        """return an uncompressed revision of a given node or revision
        number.

        _df - an existing file handle to read from. (internal-only)
        raw - an optional argument specifying if the revision data is to be
        treated as raw data when applying flag transforms. 'raw' should be set
        to True when generating changegroups or in debug commands.
        """
        if isinstance(nodeorrev, int):
            rev = nodeorrev
            node = self.node(rev)
        else:

            return False

        return True

    def _addrevision(self, node, text, transaction, link, p1, p2, flags,
                     cachedelta, ifh, dfh, alwayscache=False, raw=False):
        """internal function to add revisions to the log

        see addrevision for argument descriptions.
        invariants:
        - text is optional (can be None); if not set, cachedelta must be set.
          if both are set, they must correspond to each other.
        - raw is optional; if set to True, it indicates the revision data is to
          be treated by _processflags() as raw. It is usually set by changegroup
          generation and debug commands.
        """
        btext = [text]
        def buildtext():
            if btext[0] is not None:
                return btext[0]

            else:
                if self._inline:
                    fh = ifh
                else:
                    fh = dfh
                basetext = self.revision(self.node(baserev), _df=fh, raw=raw)
                btext[0] = mdiff.patch(basetext, delta)

            try:
                self.checkhash(btext[0], node, p1=p1, p2=p2)
                if flags & REVIDX_ISCENSORED:
                    raise RevlogError(_('node %s is not censored') % node)
            except CensoredNodeError:

                # We assume consumers of addrevisioncb will want to retrieve
                # the added revision, which will require a call to
                # revision(). revision() will fast path if there is a cache
                # hit. So, we tell _addrevision() to always cache in this case.
                # We're only using addgroup() in the context of changegroup
                # generation so the revision data can always be handled as raw
                # by the flagprocessor.
                chain = self._addrevision(node, None, transaction, link,
                                          p1, p2, flags, (baserev, delta),
                                          ifh, dfh,
                                          alwayscache=bool(addrevisioncb),
                                          raw=True)

                if addrevisioncb:
                    addrevisioncb(self, chain)

                if not dfh and not self._inline: