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

remotefilelog: include file contents in bundles produced during strip...

remotefilelog: include file contents in bundles produced during strip `hg strip` and other things that use repair.strip (such as the narrow extension's `hg tracked --removeinclude`) will "save" some commits that have a higher revision number than the oldest commit we're stripping, but aren't actually descended from any of the commits that we're stripping. It saves them in a bundle, and then reapplies them to the repo. Remotefilelog doesn't generally participate in strip, it doesn't contribute files to either the backup bundle or the "saved" bundle, and doesn't adjust linknodes when commits are stripped. This can break things like push, which rely on the linknodes. This change makes it so that remotefilelog includes files in these bundles during strip operations. During reapplication, the files are reapplied from the bundle, and the linknode is properly updated. Differential Revision: https://phab.mercurial-scm.org/D10320

Valentin Gatien-Baron - - Load All Authors

File last commit:

r46477:d7a508a7 default


                r47606:47a95277

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')