comparison mercurial/revlog.py @ 41204:e3cfe0702eac

revlog: inline opener options logic into _loadindex()

We always call _loadindex() during __init__. But we also call
_loadindex() as part of censorrevision(). Before, when reloading
the index during censorrevision(), we would lose the configured
mmapindexthreshold setting from the opener. By inlining the
logic in _loadindex(), we ensure that opener options are always
respected when loading the index.

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

41203:d0de4fdd87aa

        self._flagprocessors = dict(_flagprocessors)

        # 2-tuple of file handles being used for active writing.
        self._writinghandles = None

        mmapindexthreshold = None
        opts = getattr(opener, 'options', {}) or {}

        if 'revlogv2' in opts:
            versionflags = REVLOGV2 | FLAG_INLINE_DATA
        elif 'revlogv1' in opts:
            versionflags = REVLOGV1 | FLAG_INLINE_DATA

                                      'greater than 0') % self._chunkcachesize)
        elif self._chunkcachesize & (self._chunkcachesize - 1):
            raise error.RevlogError(_('revlog chunk cache size %r is not a '
                                      'power of 2') % self._chunkcachesize)

        self._loadindex(versionflags, mmapindexthreshold)

    def _loadindex(self, versionflags, mmapindexthreshold):
        indexdata = ''
        self._initempty = True
        try:
            with self._indexfp() as f:
                if (mmapindexthreshold is not None and

        self.opener.rename(newrl.indexfile, self.indexfile)
        if not self._inline:
            self.opener.rename(newrl.datafile, self.datafile)

        self.clearcaches()
        self._loadindex(self.version, None)

    def verifyintegrity(self, state):
        """Verifies the integrity of the revlog.

        Yields ``revlogproblem`` instances describing problems that are

41204:e3cfe0702eac

        self._flagprocessors = dict(_flagprocessors)

        # 2-tuple of file handles being used for active writing.
        self._writinghandles = None

        self._loadindex()

    def _loadindex(self):
        mmapindexthreshold = None
        opts = getattr(self.opener, 'options', {}) or {}

        if 'revlogv2' in opts:
            versionflags = REVLOGV2 | FLAG_INLINE_DATA
        elif 'revlogv1' in opts:
            versionflags = REVLOGV1 | FLAG_INLINE_DATA

                                      'greater than 0') % self._chunkcachesize)
        elif self._chunkcachesize & (self._chunkcachesize - 1):
            raise error.RevlogError(_('revlog chunk cache size %r is not a '
                                      'power of 2') % self._chunkcachesize)

        indexdata = ''
        self._initempty = True
        try:
            with self._indexfp() as f:
                if (mmapindexthreshold is not None and

        self.opener.rename(newrl.indexfile, self.indexfile)
        if not self._inline:
            self.opener.rename(newrl.datafile, self.datafile)

        self.clearcaches()
        self._loadindex()

    def verifyintegrity(self, state):
        """Verifies the integrity of the revlog.

        Yields ``revlogproblem`` instances describing problems that are