upstream/mercurial-mirror Files · hgext/remotefilelog/shallowverifier.py

rebase: skip obsolete commits even if they have pruned successors...

rebase: skip obsolete commits even if they have pruned successors Issue 5782 reported that `hg rebase -r <obsolete commit with pruned successor>` failed with an error saying that it would cause divergence. Commit (rebase: do not consider extincts for divergence detection (issue5782), 2018-02-09) fixed it by letting you rebase the commit. However, that fix seems inconsistent with how we handle `hg rebase -r <pruned commit>`. To me, it should make no difference whether a commit is pruned itself or if it has (only) pruned successors. This patch changes it so we treat these two kinds of commits the same way. I let the message we print remain "note: not rebasing <commit>, it has no successor" even though that last part is not technically correct for commits with pruned successors. I doubt it will confuse users. Differential Revision: https://phab.mercurial-scm.org/D10240

Augie Fackler - - Load All Authors

File last commit:

r43347:687b865b default


                r47559:32399d08

default

Download file

             shallowverifier.py
        
                    19 lines
            
             | 625 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / remotefilelog / shallowverifier.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # shallowverifier.py - shallow repository verifier

      #

      # Copyright 2015 Facebook, Inc.

      #

      # 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

      from mercurial.i18n import _

      from mercurial import verify

      class shallowverifier(verify.verifier):

          def _verifyfiles(self, filenodes, filelinkrevs):

              """Skips files verification since repo's not guaranteed to have them"""

              self.repo.ui.status(

                  _(b"skipping filelog check since remotefilelog is used\n")

              )

              return 0, 0

	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

				# shallowverifier.py - shallow repository verifier
				#
				# Copyright 2015 Facebook, Inc.
				#
				# 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

				from mercurial.i18n import _
				from mercurial import verify


				class shallowverifier(verify.verifier):
				def _verifyfiles(self, filenodes, filelinkrevs):
				"""Skips files verification since repo's not guaranteed to have them"""
				self.repo.ui.status(
				_(b"skipping filelog check since remotefilelog is used\n")
				)
				return 0, 0