upstream/mercurial-mirror Files · mercurial/utils/interfaceutil.py

resolve: add option to warn/abort on -m with unresolved conflict markers...

resolve: add option to warn/abort on -m with unresolved conflict markers When a user is dropped out of Mercurial to a terminal to resolve files, we emit messages like: conflicts while merging file1! (edit, then use 'hg resolve --mark') conflicts while merging file2! (edit, then use 'hg resolve --mark') We don't mention a file name in the hint, so some users might do something like `$EDITOR file1; hg resolve --mark`, see that it says "(no more unresolved files)" and forget to deal with file2 before running the next command. Even if we did mention a file name in the hint, it's too easy to forget it (maybe the merge spans a couple days or something). This option lets us inform the user that they might have missed something. In the scenario above, the output would be something like: warning: the following files still have conflict markers: file2 (no more unresolved files) Differential Revision: https://phab.mercurial-scm.org/D4035

Gregory Szorc - - Load All Authors

File last commit:

r37828:856f381a stable


                r38829:6c8e3c84

default

Download file

             interfaceutil.py
        
                    40 lines
            
             | 1.1 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / utils / interfaceutil.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # interfaceutil.py - Utilities for declaring interfaces.

      #

      # Copyright 2018 Gregory Szorc <gregory.szorc@gmail.com>

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      # zope.interface imposes a run-time cost due to module import overhead and

      # bookkeeping for declaring interfaces. So, we use stubs for various

      # zope.interface primitives unless instructed otherwise.

      from __future__ import absolute_import

      from .. import (

          encoding,

      )

      if encoding.environ.get('HGREALINTERFACES'):

          from ..thirdparty.zope import (

              interface as zi,

          )

          Attribute = zi.Attribute

          Interface = zi.Interface

          implementer = zi.implementer

      else:

          class Attribute(object):

              def __init__(self, __name__, __doc__=''):

                  pass

          class Interface(object):

              def __init__(self, name, bases=(), attrs=None, __doc__=None,

                       __module__=None):

                  pass

          def implementer(*ifaces):

              def wrapper(cls):

                  return cls

              return wrapper

	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

				# interfaceutil.py - Utilities for declaring interfaces.
				#
				# Copyright 2018 Gregory Szorc <gregory.szorc@gmail.com>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				# zope.interface imposes a run-time cost due to module import overhead and
				# bookkeeping for declaring interfaces. So, we use stubs for various
				# zope.interface primitives unless instructed otherwise.

				from __future__ import absolute_import

				from .. import (
				encoding,
				)

				if encoding.environ.get('HGREALINTERFACES'):
				from ..thirdparty.zope import (
				interface as zi,
				)

				Attribute = zi.Attribute
				Interface = zi.Interface
				implementer = zi.implementer
				else:
				class Attribute(object):
				def __init__(self, __name__, __doc__=''):
				pass

				class Interface(object):
				def __init__(self, name, bases=(), attrs=None, __doc__=None,
				__module__=None):
				pass

				def implementer(*ifaces):
				def wrapper(cls):
				return cls

				return wrapper