upstream/mercurial-mirror Files · mercurial/interfaces/util.py

simplemerge: take arguments as annotated context objects...

simplemerge: take arguments as annotated context objects The labels we put in conflict markers are formatted so the part before the ':' (typically says things like "local") is padded so the ':' is aligned among the labels. That means that if you specify a long label for "base" but the conflict marker style is "merge" (i.e. 2-way), the other two will have unwanted padding. We often don't specify a label for the base, so we don't notice the problem (and it may very well be that it didn't exist before my D11972). I think the best fix is to pass the labels along with the context objects, so the low-level code that switches on the marker style to use (i.e. `simplemerge`) can do the formatting. This patch starts doing that by passing a fully-formatted label to `simplemerge`. A coming patch will move the formatting to `simplemerge`. Differential Revision: https://phab.mercurial-scm.org/D12013

Augie Fackler - - Load All Authors

File last commit:

r43347:687b865b default


                r49427:77e24ee8

default

Download file

             util.py
        
                    38 lines
            
             | 1.0 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / interfaces / util.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # util.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(b'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__=b''):

                  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

				# util.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(b'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__=b''):
				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