comparison mercurial/revlog.py @ 31750:f319981c24c9

revlog: rename some "text"s to "rawtext"

This makes code easier to understand. "_addrevision" is left untouched - it
will be changed in a later patch.

31749:17d0dab7b2b6

            if self._cache[0] == node:
                return self._cache[2]
            cachedrev = self._cache[1]

        # look up what we need to read
        text = None
        if rev is None:
            rev = self.rev(node)

        chain, stopped = self._deltachain(rev, stoprev=cachedrev)
        if stopped:
            text = self._cache[2]

        # drop cache to save memory
        self._cache = None

        bins = self._chunks(chain, df=_df)
        if text is None:
            text = bytes(bins[0])
            bins = bins[1:]

        text = mdiff.patches(text, bins)

        text, validatehash = self._processflags(text, self.flags(rev), 'read',
                                                raw=raw)
        if validatehash:
            self.checkhash(text, node, rev=rev)

        self._cache = (node, rev, text)
        return text

                              % self.indexfile)

        if flags:
            node = node or self.hash(text, p1, p2)

        newtext, validatehash = self._processflags(text, flags, 'write')

        # If the flag processor modifies the revision data, ignore any provided
        # cachedelta.
        if newtext != text:
            cachedelta = None
        text = newtext

        if len(text) > _maxentrysize:
            raise RevlogError(
                _("%s: size of %d bytes exceeds maximum revlog storage of 2GiB")
                % (self.indexfile, len(text)))

        node = node or self.hash(text, p1, p2)
        if node in self.nodemap:
            return node

        if validatehash:
            self.checkhash(text, node, p1=p1, p2=p2)

        dfh = None
        if not self._inline:
            dfh = self.opener(self.datafile, "a+")
        ifh = self.opener(self.indexfile, "a+", checkambig=self._checkambig)
        try:
            return self._addrevision(node, text, transaction, link, p1, p2,
                                     flags, cachedelta, ifh, dfh)
        finally:
            if dfh:
                dfh.close()
            ifh.close()

31750:f319981c24c9

            if self._cache[0] == node:
                return self._cache[2]
            cachedrev = self._cache[1]

        # look up what we need to read
        rawtext = None
        if rev is None:
            rev = self.rev(node)

        chain, stopped = self._deltachain(rev, stoprev=cachedrev)
        if stopped:
            rawtext = self._cache[2]

        # drop cache to save memory
        self._cache = None

        bins = self._chunks(chain, df=_df)
        if rawtext is None:
            rawtext = bytes(bins[0])
            bins = bins[1:]

        rawtext = mdiff.patches(rawtext, bins)

        text, validatehash = self._processflags(rawtext, self.flags(rev),
                                                'read', raw=raw)
        if validatehash:
            self.checkhash(text, node, rev=rev)

        self._cache = (node, rev, text)
        return text

                              % self.indexfile)

        if flags:
            node = node or self.hash(text, p1, p2)

        rawtext, validatehash = self._processflags(text, flags, 'write')

        # If the flag processor modifies the revision data, ignore any provided
        # cachedelta.
        if rawtext != text:
            cachedelta = None

        if len(rawtext) > _maxentrysize:
            raise RevlogError(
                _("%s: size of %d bytes exceeds maximum revlog storage of 2GiB")
                % (self.indexfile, len(rawtext)))

        node = node or self.hash(rawtext, p1, p2)
        if node in self.nodemap:
            return node

        if validatehash:
            self.checkhash(rawtext, node, p1=p1, p2=p2)

        dfh = None
        if not self._inline:
            dfh = self.opener(self.datafile, "a+")
        ifh = self.opener(self.indexfile, "a+", checkambig=self._checkambig)
        try:
            return self._addrevision(node, rawtext, transaction, link, p1, p2,
                                     flags, cachedelta, ifh, dfh)
        finally:
            if dfh:
                dfh.close()
            ifh.close()