upstream/mercurial-mirror Files · mercurial/requirements.py

revert: remove dangerous `parents` argument from `cmdutil.revert()`...

revert: remove dangerous `parents` argument from `cmdutil.revert()` As we found out the hard way (thanks to spectral@ for figuring it out!), `cmdutil.revert()`'s `parents` argument must be `repo.dirstate.parents()` or things may go wrong. We had an extension that passed in the target commit as the first parent. The `hg split` command from the evolve extension seems to have made the same mistake, but I haven't looked carefully. The problem is that `cmdutil._performrevert()` calls `dirstate.normal()` on reverted files if the commit to revert to equals the first parent. So if you pass in `ctx=foo` and `parents=(foo.node(), nullid)`, then `dirstate.normal()` will be called for the revert files, even though they might not be clean in the working copy. There doesn't seem to be any reason, other than a tiny performance benefit, to passing the `parents` around instead of looking them up again in `cmdutil._performrevert()`, so that's what this patch does. Differential Revision: https://phab.mercurial-scm.org/D8925

Pulkit Goyal - - Load All Authors

File last commit:

r45934:bd56597b default


                r45935:8c466bcb

default

Download file

             requirements.py
        
                    51 lines
            
             | 2.1 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / requirements.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # requirements.py - objects and functions related to repository requirements

      #

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

      #

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

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

      from __future__ import absolute_import

      # When narrowing is finalized and no longer subject to format changes,

      # we should move this to just "narrow" or similar.

      NARROW_REQUIREMENT = b'narrowhg-experimental'

      # Enables sparse working directory usage

      SPARSE_REQUIREMENT = b'exp-sparse'

      # Enables the internal phase which is used to hide changesets instead

      # of stripping them

      INTERNAL_PHASE_REQUIREMENT = b'internal-phase'

      # Stores manifest in Tree structure

      TREEMANIFEST_REQUIREMENT = b'treemanifest'

      # Increment the sub-version when the revlog v2 format changes to lock out old

      # clients.

      REVLOGV2_REQUIREMENT = b'exp-revlogv2.1'

      # A repository with the sparserevlog feature will have delta chains that

      # can spread over a larger span. Sparse reading cuts these large spans into

      # pieces, so that each piece isn't too big.

      # Without the sparserevlog capability, reading from the repository could use

      # huge amounts of memory, because the whole span would be read at once,

      # including all the intermediate revisions that aren't pertinent for the chain.

      # This is why once a repository has enabled sparse-read, it becomes required.

      SPARSEREVLOG_REQUIREMENT = b'sparserevlog'

      # A repository with the sidedataflag requirement will allow to store extra

      # information for revision without altering their original hashes.

      SIDEDATA_REQUIREMENT = b'exp-sidedata-flag'

      # A repository with the the copies-sidedata-changeset requirement will store

      # copies related information in changeset's sidedata.

      COPIESSDC_REQUIREMENT = b'exp-copies-sidedata-changeset'

      # The repository use persistent nodemap for the changelog and the manifest.

      NODEMAP_REQUIREMENT = b'persistent-nodemap'

      # List of requirements which are working directory specific

      # These requirements cannot be shared between repositories if they

      # share the same store

      WORKING_DIR_REQUIREMENTS = {SPARSE_REQUIREMENT}

	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

				# requirements.py - objects and functions related to repository requirements
				#
				# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				from __future__ import absolute_import

				# When narrowing is finalized and no longer subject to format changes,
				# we should move this to just "narrow" or similar.
				NARROW_REQUIREMENT = b'narrowhg-experimental'

				# Enables sparse working directory usage
				SPARSE_REQUIREMENT = b'exp-sparse'

				# Enables the internal phase which is used to hide changesets instead
				# of stripping them
				INTERNAL_PHASE_REQUIREMENT = b'internal-phase'

				# Stores manifest in Tree structure
				TREEMANIFEST_REQUIREMENT = b'treemanifest'

				# Increment the sub-version when the revlog v2 format changes to lock out old
				# clients.
				REVLOGV2_REQUIREMENT = b'exp-revlogv2.1'

				# A repository with the sparserevlog feature will have delta chains that
				# can spread over a larger span. Sparse reading cuts these large spans into
				# pieces, so that each piece isn't too big.
				# Without the sparserevlog capability, reading from the repository could use
				# huge amounts of memory, because the whole span would be read at once,
				# including all the intermediate revisions that aren't pertinent for the chain.
				# This is why once a repository has enabled sparse-read, it becomes required.
				SPARSEREVLOG_REQUIREMENT = b'sparserevlog'

				# A repository with the sidedataflag requirement will allow to store extra
				# information for revision without altering their original hashes.
				SIDEDATA_REQUIREMENT = b'exp-sidedata-flag'

				# A repository with the the copies-sidedata-changeset requirement will store
				# copies related information in changeset's sidedata.
				COPIESSDC_REQUIREMENT = b'exp-copies-sidedata-changeset'

				# The repository use persistent nodemap for the changelog and the manifest.
				NODEMAP_REQUIREMENT = b'persistent-nodemap'

				# List of requirements which are working directory specific
				# These requirements cannot be shared between repositories if they
				# share the same store
				WORKING_DIR_REQUIREMENTS = {SPARSE_REQUIREMENT}