Mercurial > public > mercurial-scm > hg-stable
view mercurial/interfaces/util.py @ 48591:ad0c6bf6f02e
simplemerge: make minimize() a free function
IMO, `Merge3Text` should be about merging text without knowing about
conflict markers. "Conflict minimization" is about making conflict
markers smaller, so it should be moved out. This patch does that. I'll
refactor it next.
Differential Revision: https://phab.mercurial-scm.org/D11980
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Tue, 11 Jan 2022 22:03:55 -0800 |
parents | 687b865b95ad |
children | 6000f5b25c9b |
line wrap: on
line source
# 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