upstream/mercurial-mirror Files · mercurial/mergeutil.py

context: remove basectx.__int__ (API)...

context: remove basectx.__int__ (API) basectx is the only type in the repo having __int__ implemented. This magic method can result in unexpected coercion. Furthermore, having it implemented is wrong for some contexts, since rev() may return None in some cases. Previous commits removed known cases in core where contexts are coerced to integers. So let's delete basectx.__int__. This commit is a bit dangerous. While the test suite passes, there are likely still some callers in core that rely on __int__ that don't have test coverage. An alternative would be to issue a deprecation warning and let this bake for a few releases. .. api:: context.basectx no longer implements __int__. Context instances will no longer cast to ints. Consumers should call ``ctx.rev()`` instead. Differential Revision: https://phab.mercurial-scm.org/D2433

Augie Fackler - - Load All Authors

File last commit:

r30494:c1149533 default


                r36429:38f48050

default

Download file

             mergeutil.py
        
                    22 lines
            
             | 701 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / mergeutil.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Augie Fackler
    
checkunresolved: move to new package to help avoid import cycles...

              r30494
            
      # mergeutil.py - help for merge processing in mercurial

      #

      # Copyright 2005-2007 Matt Mackall <mpm@selenic.com>

      #

      # 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 .i18n import _

      from . import (

          error,

      )

      def checkunresolved(ms):

          if list(ms.unresolved()):

              raise error.Abort(_("unresolved merge conflicts "

                                  "(see 'hg help resolve')"))

          if ms.mdstate() != 's' or list(ms.driverresolved()):

              raise error.Abort(_('driver-resolved merge conflicts'),

                                hint=_('run "hg resolve --all" to resolve'))

	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

Augie Fackler checkunresolved: move to new package to help avoid import cycles...	r30494	# mergeutil.py - help for merge processing in mercurial
		#
		# Copyright 2005-2007 Matt Mackall <mpm@selenic.com>
		#
		# 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 .i18n import _

		from . import (
		error,
		)

		def checkunresolved(ms):
		if list(ms.unresolved()):
		raise error.Abort(_("unresolved merge conflicts "
		"(see 'hg help resolve')"))
		if ms.mdstate() != 's' or list(ms.driverresolved()):
		raise error.Abort(_('driver-resolved merge conflicts'),
		hint=_('run "hg resolve --all" to resolve'))