##// END OF EJS Templates
tests: add `hg log -G` output when there are merge conflicts...
tests: add `hg log -G` output when there are merge conflicts The next commit will change the behavior for these. I've used slightly different commands in the different tests to match the surrounding style. Differential Revision: https://phab.mercurial-scm.org/D8042

File last commit:

r43347:687b865b default
r44818:ab632e27 default
Show More
util.py
38 lines | 1.0 KiB | text/x-python | PythonLexer
# 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