comparison hgext/mq.py @ 51125:4224b1aa7ad8 stable

branching: merge default into stable for 6.6rc0

51117:f6bb9d1c230c

    hex,
    nullrev,
    short,
)
from mercurial.pycompat import (
    delattr,
    getattr,
    open,
)
from mercurial import (
    cmdutil,
    commands,

        repo._phasedefaults.append(mqphasedefaults)


def mqimport(orig, ui, repo, *args, **kwargs):
    if util.safehasattr(repo, b'abortifwdirpatched') and not kwargs.get(
        'no_commit', False
    ):
        repo.abortifwdirpatched(
            _(b'cannot import over an applied patch'), kwargs.get('force')
        )

51125:4224b1aa7ad8

    hex,
    nullrev,
    short,
)
from mercurial.pycompat import (
    open,
)
from mercurial import (
    cmdutil,
    commands,

        repo._phasedefaults.append(mqphasedefaults)


def mqimport(orig, ui, repo, *args, **kwargs):
    if hasattr(repo, 'abortifwdirpatched') and not kwargs.get(
        'no_commit', False
    ):
        repo.abortifwdirpatched(
            _(b'cannot import over an applied patch'), kwargs.get('force')
        )