upstream/mercurial-mirror Files · hgext/strip.py

cmdutil: fix newandmodified file accounting for --interactive commits...

cmdutil: fix newandmodified file accounting for --interactive commits `originalchunks` is a misleading name, because it only contains header objects, which are flattened to selected hunks by the filter function. As such, `chunks not in originalchunks` is always True and misleading, because hunk objects never compare equal to header objects. This change fixes the internal naming and removes the useless parameter from the method. This change also fixes issue6533, by considering the filtered headers, rather than the hunks, when determining new and modified files. If a file is renamed + edited, and the edited hunks are deselected (but the file is not), the filtered chunks will contain a header for the file (because it's .special()) but but no hunks. Differential Revision: https://phab.mercurial-scm.org/D10936

Valentin Gatien-Baron - - Load All Authors

File last commit:

r46477:d7a508a7 default


                r48365:00ae1fb6

default

Download file

             strip.py
        
                    22 lines
            
             | 953 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / strip.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      """strip changesets and their descendants from history (DEPRECATED)

      The functionality of this extension has been included in core Mercurial

      since version 5.7. Please use :hg:`debugstrip ...` instead.

      This extension allows you to strip changesets and all their descendants from the

      repository. See the command help for details.

      """

      from __future__ import absolute_import

      from mercurial import commands

      # Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for

      # extensions which SHIP WITH MERCURIAL. Non-mainline extensions should

      # be specifying the version(s) of Mercurial they are tested with, or

      # leave the attribute unspecified.

      testedwith = b'ships-with-hg-core'

      # This is a bit ugly, but a uisetup function that defines strip as an

      # alias for debugstrip would override any user alias for strip,

      # including aliases like "strip = strip --no-backup".

      commands.command.rename(old=b'debugstrip', new=b'debugstrip|strip')

	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

				"""strip changesets and their descendants from history (DEPRECATED)

				The functionality of this extension has been included in core Mercurial
				since version 5.7. Please use :hg:`debugstrip ...` instead.

				This extension allows you to strip changesets and all their descendants from the
				repository. See the command help for details.
				"""
				from __future__ import absolute_import

				from mercurial import commands

				# Note for extension authors: ONLY specify testedwith = 'ships-with-hg-core' for
				# extensions which SHIP WITH MERCURIAL. Non-mainline extensions should
				# be specifying the version(s) of Mercurial they are tested with, or
				# leave the attribute unspecified.
				testedwith = b'ships-with-hg-core'

				# This is a bit ugly, but a uisetup function that defines strip as an
				# alias for debugstrip would override any user alias for strip,
				# including aliases like "strip = strip --no-backup".
				commands.command.rename(old=b'debugstrip', new=b'debugstrip\|strip')