comparison mercurial/revset.py @ 26716:c027641f8a83

revset: rename and test '_destmerge'

We make the name consistent with the one used by '_destupdate' and we ensure the
code is run by testing it (abort is expected and merge would).

26715:652dfb1eff14

def _destupdate(repo, subset, x):
    # experimental revset for update destination
    args = getargsdict(x, 'limit', 'clean check')
    return subset & baseset([destutil.destupdate(repo, **args)[0]])

def _mergedefaultdest(repo, subset, x):
    # ``_mergedefaultdest()``

    # default destination for merge.
    # # XXX: Currently private because I expect the signature to change.
    # # XXX: - taking rev as arguments,
    # # XXX: - bailing out in case of ambiguity vs returning all data.
    getargs(x, 0, 0, _("_mergedefaultdest takes no arguments"))
    return subset & baseset([destutil.destmerge(repo)])

def adds(repo, subset, x):
    """``adds(pattern)``

    s = subset
    return baseset([r for r in ls if r in s])

symbols = {
    "_destupdate": _destupdate,
    "_mergedefaultdest": _mergedefaultdest,
    "adds": adds,
    "all": getall,
    "ancestor": ancestor,
    "ancestors": ancestors,
    "_firstancestors": _firstancestors,

26716:c027641f8a83

def _destupdate(repo, subset, x):
    # experimental revset for update destination
    args = getargsdict(x, 'limit', 'clean check')
    return subset & baseset([destutil.destupdate(repo, **args)[0]])

def _destmerge(repo, subset, x):
    # experimental revset for merge destination
    getargs(x, 0, 0, _("_mergedefaultdest takes no arguments"))
    return subset & baseset([destutil.destmerge(repo)])

def adds(repo, subset, x):
    """``adds(pattern)``

    s = subset
    return baseset([r for r in ls if r in s])

symbols = {
    "_destupdate": _destupdate,
    "_destmerge": _destmerge,
    "adds": adds,
    "all": getall,
    "ancestor": ancestor,
    "ancestors": ancestors,
    "_firstancestors": _firstancestors,