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

rebase: filter out descendants of divergence-causing commits earlier...

rebase: filter out descendants of divergence-causing commits earlier `hg rebase` treats obsolete commits differently depending what has happened to the commit: 1) Obsolete commit without non-obsolete successors: Skipped, and a note is printed ("it has no successor"). 2) Obsolete commit with a successor in the destination (ancestor of it): Skipped, and a note is printed ("already in destination"). 3) Obsolete commit with a successor in the rebase set: The commit and its descendants are skipped, and a note is printed ("not rebasing <commit> and its descendants as this would cause divergence"), unless `allowdivergence` config set. 4) Obsolete commit with a successor elsewhere: Error ("this rebase will cause divergences"), unless `allowdivergence` config set. Before this patch, we did all those checks up front, except for (3), which was checked later. The later check consisted of two parts: 1) filtering out of descendants, and 2) conditionally printing message if the `allowdivergence` config was not set. This patch makes it so we do the filtering early. A consequence of filtering out divergence-causing commits earlier is that we rebase commits in slightly different order, which has some impact on tests. Differential Revision: https://phab.mercurial-scm.org/D10249

Valentin Gatien-Baron - - Load All Authors

File last commit:

r47080:bb3a5c0d default


                r47590:535de0e3

default

Download file

             purge.py
        
                    32 lines
            
             | 1.4 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / purge.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # Copyright (C) 2006 - Marco Barisione <marco@barisione.org>

      #

      # This is a small extension for Mercurial (https://mercurial-scm.org/)

      # that removes files not known to mercurial

      #

      # This program was inspired by the "cvspurge" script contained in CVS

      # utilities (http://www.red-bean.com/cvsutils/).

      #

      # For help on the usage of "hg purge" use:

      #  hg help purge

      #

      # This program is free software; you can redistribute it and/or modify

      # it under the terms of the GNU General Public License as published by

      # the Free Software Foundation; either version 2 of the License, or

      # (at your option) any later version.

      #

      # This program is distributed in the hope that it will be useful,

      # but WITHOUT ANY WARRANTY; without even the implied warranty of

      # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

      # GNU General Public License for more details.

      #

      # You should have received a copy of the GNU General Public License

      # along with this program; if not, see <http://www.gnu.org/licenses/>.

      '''command to delete untracked files from the working directory (DEPRECATED)

      The functionality of this extension has been included in core Mercurial since

      version 5.7. Please use :hg:`purge ...` instead. :hg:`purge --confirm` is now the default, unless the extension is enabled for backward compatibility.

      '''

      # This empty extension looks pointless, but core mercurial checks if it's loaded

      # to implement the slightly different behavior documented above.

	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

				# Copyright (C) 2006 - Marco Barisione <marco@barisione.org>
				#
				# This is a small extension for Mercurial (https://mercurial-scm.org/)
				# that removes files not known to mercurial
				#
				# This program was inspired by the "cvspurge" script contained in CVS
				# utilities (http://www.red-bean.com/cvsutils/).
				#
				# For help on the usage of "hg purge" use:
				# hg help purge
				#
				# This program is free software; you can redistribute it and/or modify
				# it under the terms of the GNU General Public License as published by
				# the Free Software Foundation; either version 2 of the License, or
				# (at your option) any later version.
				#
				# This program is distributed in the hope that it will be useful,
				# but WITHOUT ANY WARRANTY; without even the implied warranty of
				# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
				# GNU General Public License for more details.
				#
				# You should have received a copy of the GNU General Public License
				# along with this program; if not, see <http://www.gnu.org/licenses/>.

				'''command to delete untracked files from the working directory (DEPRECATED)

				The functionality of this extension has been included in core Mercurial since
				version 5.7. Please use :hg:`purge ...` instead. :hg:`purge --confirm` is now the default, unless the extension is enabled for backward compatibility.
				'''

				# This empty extension looks pointless, but core mercurial checks if it's loaded
				# to implement the slightly different behavior documented above.