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

py3: iterate bytes as a byte string in dagparser.py

Augie Fackler - - Load All Authors

File last commit:

r30494:c1149533 default


                r34209:dfd009e5

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