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

absorb: be more specific when erroring out on merge commit...

absorb: be more specific when erroring out on merge commit When you have a merge commit checked out and run `hg absorb`, it would tell you abort: no mutable changeset to change That makes it sound like the problem is public commits when isn't really. Let's be more specific in this case. There was already a test case that test this, so that now prints the new message. I added a new test case that shows the old message (when a public commit is checked out). Differential Revision: https://phab.mercurial-scm.org/D6354

Augie Fackler - - Load All Authors

File last commit:

r40530:3a333a58 default


                r42452:b3fc78c0

default

Download file

             shallowverifier.py
        
                    17 lines
            
             | 614 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(

                  _("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(
				_("skipping filelog check since remotefilelog is used\n"))
				return 0, 0