comparison mercurial/revset.py @ 42457:43c8f72184f4

revset: fix merge() to fall back to changectx API if wdir specified

I have a code which basically runs "0:wdir() & <user-revset>", and it crashed
if merge() were passed in.

42456:d279e4f453c4

    """
    # i18n: "merge" is a keyword
    getargs(x, 0, 0, _("merge takes no arguments"))
    cl = repo.changelog
    nullrev = node.nullrev
    return subset.filter(lambda r: cl.parentrevs(r)[1] != nullrev,
                         condrepr='<merge>')

@predicate('branchpoint()', safe=True)
def branchpoint(repo, subset, x):
    """Changesets with more than one child.
    """

42457:43c8f72184f4

    """
    # i18n: "merge" is a keyword
    getargs(x, 0, 0, _("merge takes no arguments"))
    cl = repo.changelog
    nullrev = node.nullrev
    def ismerge(r):
        try:
            return cl.parentrevs(r)[1] != nullrev
        except error.WdirUnsupported:
            return bool(repo[r].p2())
    return subset.filter(ismerge, condrepr='<merge>')

@predicate('branchpoint()', safe=True)
def branchpoint(repo, subset, x):
    """Changesets with more than one child.
    """