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

unshelve: disable unshelve during merge (issue5123)...

unshelve: disable unshelve during merge (issue5123) As stated in the issue5123, unshelve can destroy the second parent of the context when tried to unshelve with an uncommitted merge. This patch makes unshelve to abort when called with an uncommitted merge. See how shelve.mergefiles works. Commit structure looks like this: ``` ... -> pctx -> tmpwctx -> shelvectx / / second merge parent pctx = parent before merging working context(first merge parent) tmpwctx = commited working directory after merge(with two parents) shelvectx = shelved context ``` shelve.mergefiles first updates to pctx then it reverts shelvectx to pctx with: ``` cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), *pathtofiles(repo, files), **{'no_backup': True}) ``` Reverting tmpwctx files that were merged from second parent to pctx makes them added because they are not in pctx. Changing this revert operation is crucial to restore parents after unshelve. This is a complicated issue as this is not fixing a regression. Thus, for the time being, unshelve during an uncommitted merge can be aborted. (Details taken from http://mercurial.808500.n3.nabble.com/PATCH-V3-shelve-restore-parents-after-unshelve-issue5123-tt4036858.html#a4037408) Differential Revision: https://phab.mercurial-scm.org/D6169

Gregory Szorc - - Load All Authors

File last commit:

r41238:e7a2cc84 default


                r42217:03f6480b

default

Download file

             constants.py
        
                    56 lines
            
             | 1.8 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 (

          repository,

          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

      # Shared across v1 and v2.

      FLAG_INLINE_DATA = (1 << 16)

      # Only used by v1, implied by v2.

      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 = FLAG_INLINE_DATA

      # revlog index flags

      # 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

      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 (
				repository,
				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
				# Shared across v1 and v2.
				FLAG_INLINE_DATA = (1 << 16)
				# Only used by v1, implied by v2.
				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 = FLAG_INLINE_DATA

				# revlog index flags

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