upstream/mercurial-mirror Files · mercurial/revlogutils/constants.py

revlog: use proper version comparison during verify...

revlog: use proper version comparison during verify Verify appears to want to compare the changelog's revlog version number with the version number of filelogs and error if they are different. But what it was actually doing was comparing the full 32-bit header integer, which contains 2 shorts: 1 for the revlog version number and 1 for feature flags. This commit tweaks the verification code so it only looks at the version number component of the header and emits a warning if they differ. The new code is more robust because it accounts for future revlog version numbers without them needing to be special cased. Differential Revision: https://phab.mercurial-scm.org/D4704

Boris Feld - - Load All Authors

File last commit:

r39542:b66ea3fc default


                r39881:e6d3d39c

default

Download file

             constants.py
        
                    46 lines
            
             | 1.5 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / revlogutils / constants.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # revlogdeltas.py - constant used for revlog logic

      #

      # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>

      # Copyright 2018 Octobus <contact@octobus.net>

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      """Helper class to compute deltas stored inside revlogs"""

      from __future__ import absolute_import

      from .. import (

          util,

      )

      # revlog header flags

      REVLOGV0 = 0

      REVLOGV1 = 1

      # Dummy value until file format is finalized.

      # Reminder: change the bounds check in revlog.__init__ when this is changed.

      REVLOGV2 = 0xDEAD

      FLAG_INLINE_DATA = (1 << 16)

      FLAG_GENERALDELTA = (1 << 17)

      REVLOG_DEFAULT_FLAGS = FLAG_INLINE_DATA

      REVLOG_DEFAULT_FORMAT = REVLOGV1

      REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_FORMAT | REVLOG_DEFAULT_FLAGS

      REVLOGV1_FLAGS = FLAG_INLINE_DATA | FLAG_GENERALDELTA

      REVLOGV2_FLAGS = REVLOGV1_FLAGS

      # revlog index flags

      REVIDX_ISCENSORED = (1 << 15) # revision has censor metadata, must be verified

      REVIDX_ELLIPSIS = (1 << 14) # revision hash does not match data (narrowhg)

      REVIDX_EXTSTORED = (1 << 13) # revision data is stored externally

      REVIDX_DEFAULT_FLAGS = 0

      # stable order in which flags need to be processed and their processors applied

      REVIDX_FLAGS_ORDER = [

          REVIDX_ISCENSORED,

          REVIDX_ELLIPSIS,

          REVIDX_EXTSTORED,

      ]

      REVIDX_KNOWN_FLAGS = util.bitsfrom(REVIDX_FLAGS_ORDER)

      # bitmark for flags that could cause rawdata content change

      REVIDX_RAWTEXT_CHANGING_FLAGS = REVIDX_ISCENSORED | REVIDX_EXTSTORED

      SPARSE_REVLOG_MAX_CHAIN_LENGTH = 1000

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# revlogdeltas.py - constant used for revlog logic
				#
				# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
				# Copyright 2018 Octobus <contact@octobus.net>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.
				"""Helper class to compute deltas stored inside revlogs"""

				from __future__ import absolute_import

				from .. import (
				util,
				)

				# revlog header flags
				REVLOGV0 = 0
				REVLOGV1 = 1
				# Dummy value until file format is finalized.
				# Reminder: change the bounds check in revlog.__init__ when this is changed.
				REVLOGV2 = 0xDEAD
				FLAG_INLINE_DATA = (1 << 16)
				FLAG_GENERALDELTA = (1 << 17)
				REVLOG_DEFAULT_FLAGS = FLAG_INLINE_DATA
				REVLOG_DEFAULT_FORMAT = REVLOGV1
				REVLOG_DEFAULT_VERSION = REVLOG_DEFAULT_FORMAT \| REVLOG_DEFAULT_FLAGS
				REVLOGV1_FLAGS = FLAG_INLINE_DATA \| FLAG_GENERALDELTA
				REVLOGV2_FLAGS = REVLOGV1_FLAGS

				# revlog index flags
				REVIDX_ISCENSORED = (1 << 15) # revision has censor metadata, must be verified
				REVIDX_ELLIPSIS = (1 << 14) # revision hash does not match data (narrowhg)
				REVIDX_EXTSTORED = (1 << 13) # revision data is stored externally
				REVIDX_DEFAULT_FLAGS = 0
				# stable order in which flags need to be processed and their processors applied
				REVIDX_FLAGS_ORDER = [
				REVIDX_ISCENSORED,
				REVIDX_ELLIPSIS,
				REVIDX_EXTSTORED,
				]
				REVIDX_KNOWN_FLAGS = util.bitsfrom(REVIDX_FLAGS_ORDER)
				# bitmark for flags that could cause rawdata content change
				REVIDX_RAWTEXT_CHANGING_FLAGS = REVIDX_ISCENSORED \| REVIDX_EXTSTORED

				SPARSE_REVLOG_MAX_CHAIN_LENGTH = 1000