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

patch: include flag-only file changes in "special" while filtering patch (issue5864)...

patch: include flag-only file changes in "special" while filtering patch (issue5864) This patch fix the issue5864 (or maybe issue5865 too) which occurs during split (or I should say at the time of filtering the hunks in interactive mode) where user hits a not ending loop of "no changes to record". And it's not only the case for split it will happen in every interactive case for e.g. `hg commit -i` or `hg uncommit -i` After looking into code I found that when filtering we have some notation called "special" for the file headers which doesn't contain any hunk and just contain the header (for e.g. newly added empty file or deleted file) where the user cannot change the content of operation. And I think we can put this "flag-only" file change in that same bucket of "special". But I doubt a bit about the case when a file have flag change and atleast one hunk then user won't be able to separate the flag change from hunks. Changed test file reflect the fixed behaviour. Differential Revision: https://phab.mercurial-scm.org/D6058

Gregory Szorc - - Load All Authors

File last commit:

r41238:e7a2cc84 default


                r42148:6308aa82

default

Download file

             constants.py
        
                    56 lines
            
             | 1.8 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / revlogutils / constants.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Boris Feld
    
revlog: split constants into a new `revlogutils.constants` module...

              r39365
            
      # 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 (

        Gregory Szorc
    
repository: define and use revision flag constants...

              r40083
            
          repository,

        Boris Feld
    
revlog: split constants into a new `revlogutils.constants` module...

              r39365
            
          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

        Gregory Szorc
    
revlog: always enable generaldelta on version 2 revlogs...

              r41238
            
      # Shared across v1 and v2.

        Boris Feld
    
revlog: split constants into a new `revlogutils.constants` module...

              r39365
            
      FLAG_INLINE_DATA = (1 << 16)

        Gregory Szorc
    
revlog: always enable generaldelta on version 2 revlogs...

              r41238
            
      # Only used by v1, implied by v2.

        Boris Feld
    
revlog: split constants into a new `revlogutils.constants` module...

              r39365
            
      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

        Gregory Szorc
    
revlog: always enable generaldelta on version 2 revlogs...

              r41238
            
      REVLOGV2_FLAGS = FLAG_INLINE_DATA

        Boris Feld
    
revlog: split constants into a new `revlogutils.constants` module...

              r39365
            
      # revlog index flags

        Gregory Szorc
    
repository: define and use revision flag constants...

              r40083
            
      # For historical reasons, revlog's internal flags were exposed via the

      # wire protocol and are even exposed in parts of the storage APIs.

      # revision has censor metadata, must be verified

      REVIDX_ISCENSORED = repository.REVISION_FLAG_CENSORED

      # revision hash does not match data (narrowhg)

      REVIDX_ELLIPSIS = repository.REVISION_FLAG_ELLIPSIS

      # revision data is stored externally

      REVIDX_EXTSTORED = repository.REVISION_FLAG_EXTSTORED

        Boris Feld
    
revlog: split constants into a new `revlogutils.constants` module...

              r39365
            
      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

        Boris Feld
    
sparse-revlog: set max delta chain length to on thousand...

              r39542
            
      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

Boris Feld revlog: split constants into a new `revlogutils.constants` module...	r39365	# 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 (
Gregory Szorc repository: define and use revision flag constants...	r40083	repository,
Boris Feld revlog: split constants into a new `revlogutils.constants` module...	r39365	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
Gregory Szorc revlog: always enable generaldelta on version 2 revlogs...	r41238	# Shared across v1 and v2.
Boris Feld revlog: split constants into a new `revlogutils.constants` module...	r39365	FLAG_INLINE_DATA = (1 << 16)
Gregory Szorc revlog: always enable generaldelta on version 2 revlogs...	r41238	# Only used by v1, implied by v2.
Boris Feld revlog: split constants into a new `revlogutils.constants` module...	r39365	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
Gregory Szorc revlog: always enable generaldelta on version 2 revlogs...	r41238	REVLOGV2_FLAGS = FLAG_INLINE_DATA
Boris Feld revlog: split constants into a new `revlogutils.constants` module...	r39365
		# revlog index flags
Gregory Szorc repository: define and use revision flag constants...	r40083
		# For historical reasons, revlog's internal flags were exposed via the
		# wire protocol and are even exposed in parts of the storage APIs.

		# revision has censor metadata, must be verified
		REVIDX_ISCENSORED = repository.REVISION_FLAG_CENSORED
		# revision hash does not match data (narrowhg)
		REVIDX_ELLIPSIS = repository.REVISION_FLAG_ELLIPSIS
		# revision data is stored externally
		REVIDX_EXTSTORED = repository.REVISION_FLAG_EXTSTORED
Boris Feld revlog: split constants into a new `revlogutils.constants` module...	r39365	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
Boris Feld sparse-revlog: set max delta chain length to on thousand...	r39542
		SPARSE_REVLOG_MAX_CHAIN_LENGTH = 1000