comparison hgext3rd/topic/compat.py @ 5665:dd9dba7c1d00

compat: make topics compatible across change to cmdutil.commitstatus()

`cmdutil.commitstatus()` was changed in
https://phab.mercurial-scm.org/D9257 so it has a new `tip`
argument. This patch adds compatibility with that. It was harder than
I expected because the callers all pass the arguments as positional,
so we can't look for `opts` or `tip` in the `kwargs`. I instead
extracted much of the override to a helper. I think the result is
okay.

5647:c2fab88e6d60

Compatibility module
"""
from __future__ import absolute_import

from mercurial import (
    pycompat,
    registrar,
    util,
)

    if util.safehasattr(repo._phasecache, 'nonpublicphaseroots'):
        return repo._phasecache.nonpublicphaseroots(repo)
    return set().union(
        *[roots for roots in repo._phasecache.phaseroots[1:] if roots]
    )

5665:dd9dba7c1d00

Compatibility module
"""
from __future__ import absolute_import

from mercurial import (
    cmdutil,
    extensions,
    pycompat,
    registrar,
    util,
)

    if util.safehasattr(repo._phasecache, 'nonpublicphaseroots'):
        return repo._phasecache.nonpublicphaseroots(repo)
    return set().union(
        *[roots for roots in repo._phasecache.phaseroots[1:] if roots]
    )

def overridecommitstatus(overridefn):
    if r'tip' in cmdutil.commitstatus.__code__.co_varnames:
        extensions.wrapfunction(cmdutil, 'commitstatus', overridefn)
    else:
        # hg <= 5.6 (976b26bdd0d8)
        def _override(orig, repo, node, branch, bheads=None, opts=None):
            def _orig(repo, node, branch, bheads=None, tip=None, opts=None):
                return orig(repo, node, branch, bheads=bheads, opts=opts)
            return overridefn(_orig, repo, node, branch, bheads=bheads, tip=None, opts=opts)
        extensions.wrapfunction(cmdutil, 'commitstatus', _override)