##// END OF EJS Templates
rebase: filter out descendants of divergence-causing commits earlier...
rebase: filter out descendants of divergence-causing commits earlier `hg rebase` treats obsolete commits differently depending what has happened to the commit: 1) Obsolete commit without non-obsolete successors: Skipped, and a note is printed ("it has no successor"). 2) Obsolete commit with a successor in the destination (ancestor of it): Skipped, and a note is printed ("already in destination"). 3) Obsolete commit with a successor in the rebase set: The commit and its descendants are skipped, and a note is printed ("not rebasing <commit> and its descendants as this would cause divergence"), unless `allowdivergence` config set. 4) Obsolete commit with a successor elsewhere: Error ("this rebase will cause divergences"), unless `allowdivergence` config set. Before this patch, we did all those checks up front, except for (3), which was checked later. The later check consisted of two parts: 1) filtering out of descendants, and 2) conditionally printing message if the `allowdivergence` config was not set. This patch makes it so we do the filtering early. A consequence of filtering out divergence-causing commits earlier is that we rebase commits in slightly different order, which has some impact on tests. Differential Revision: https://phab.mercurial-scm.org/D10249

File last commit:

r37195:68ee6182 default
r47590:535de0e3 default
Show More
__init__.py
93 lines | 3.0 KiB | text/x-python | PythonLexer
Gregory Szorc
thirdparty: vendor zope.interface 4.4.3...
r37193 ##############################################################################
#
# Copyright (c) 2001, 2002 Zope Foundation and Contributors.
# All Rights Reserved.
#
# This software is subject to the provisions of the Zope Public License,
# Version 2.1 (ZPL). A copy of the ZPL should accompany this distribution.
# THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
# WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
# WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
# FOR A PARTICULAR PURPOSE.
#
##############################################################################
"""Interfaces
This package implements the Python "scarecrow" proposal.
The package exports two objects, `Interface` and `Attribute` directly. It also
exports several helper methods. Interface is used to create an interface with
a class statement, as in:
class IMyInterface(Interface):
'''Interface documentation
'''
def meth(arg1, arg2):
'''Documentation for meth
'''
# Note that there is no self argument
To find out what you can do with interfaces, see the interface
interface, `IInterface` in the `interfaces` module.
The package has several public modules:
o `declarations` provides utilities to declare interfaces on objects. It
also provides a wide range of helpful utilities that aid in managing
declared interfaces. Most of its public names are however imported here.
o `document` has a utility for documenting an interface as structured text.
o `exceptions` has the interface-defined exceptions
o `interfaces` contains a list of all public interfaces for this package.
o `verify` has utilities for verifying implementations of interfaces.
See the module doc strings for more information.
"""
Gregory Szorc
thirdparty: port zope.interface to relative imports...
r37195
from __future__ import absolute_import
Gregory Szorc
thirdparty: vendor zope.interface 4.4.3...
r37193 __docformat__ = 'restructuredtext'
Gregory Szorc
thirdparty: port zope.interface to relative imports...
r37195 from .interface import Interface
from .interface import _wire
Gregory Szorc
thirdparty: vendor zope.interface 4.4.3...
r37193
# Need to actually get the interface elements to implement the right interfaces
_wire()
del _wire
Gregory Szorc
thirdparty: port zope.interface to relative imports...
r37195 from .declarations import Declaration
from .declarations import alsoProvides
from .declarations import classImplements
from .declarations import classImplementsOnly
from .declarations import classProvides
from .declarations import directlyProvidedBy
from .declarations import directlyProvides
from .declarations import implementedBy
from .declarations import implementer
from .declarations import implementer_only
from .declarations import implements
from .declarations import implementsOnly
from .declarations import moduleProvides
from .declarations import named
from .declarations import noLongerProvides
from .declarations import providedBy
from .declarations import provider
from .exceptions import Invalid
from .interface import Attribute
from .interface import invariant
from .interface import taggedValue
Gregory Szorc
thirdparty: vendor zope.interface 4.4.3...
r37193
# The following are to make spec pickles cleaner
Gregory Szorc
thirdparty: port zope.interface to relative imports...
r37195 from .declarations import Provides
Gregory Szorc
thirdparty: vendor zope.interface 4.4.3...
r37193
Gregory Szorc
thirdparty: port zope.interface to relative imports...
r37195 from .interfaces import IInterfaceDeclaration
Gregory Szorc
thirdparty: vendor zope.interface 4.4.3...
r37193
moduleProvides(IInterfaceDeclaration)
__all__ = ('Interface', 'Attribute') + tuple(IInterfaceDeclaration)