Mercurial > hg
view mercurial/utils/interfaceutil.py @ 39266:82555d7186d0
filemerge: make capability check for internal tools ignore merge-tools section
This is follow up of 4d7b11877dd0.
Before this patch, capability check of internal merge tools falls back
to _toolbool(), which examines configurations in "merge-tools" section.
But "hg help config" explicitly says that "merge-tools" section
configures external merge tools.
Therefore, this patch makes capability check for internal tools in
hascapability() always ignore configurations in merge-tools section.
In this patch, command line configurations below are added at tests in
tests/test-merge-tools.t, in order to confirm that explicit
configuration is intentionally ignored at tool selection.
--config merge-tools.:INTERNAL_TOOL.CAPABILITY=true
author | FUJIWARA Katsunori <foozy@lares.dti.ne.jp> |
---|---|
date | Wed, 22 Aug 2018 13:57:01 +0900 |
parents | 856f381ad74b |
children |
line wrap: on
line source
# 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