comparison mercurial/revset.py @ 12935:98b79c892768

revset: fix p1, p2 and parents in dirstate case (a5f7f1e9340e)

- Handle 'subset' argument
- Stop returning the null rev from p1 and parents, as in the non-dirstate case
- Order parents as in the non-dirstate case (ascending revs)

12933:7a2bca0b1e70

def p1(repo, subset, x):
    """``p1([set])``
    First parent of changesets in set, or the working directory.
    """
    if x is None:
        return [repo[x].parents()[0].rev()]

    ps = set()
    cl = repo.changelog
    for r in getset(repo, range(len(repo)), x):
        ps.add(cl.parentrevs(r)[0])

    Second parent of changesets in set, or the working directory.
    """
    if x is None:
        ps = repo[x].parents()
        try:
            return [ps[1].rev()]
        except IndexError:
            return []

    ps = set()
    cl = repo.changelog

    """``parents([set])``
    The set of all parents for all changesets in set, or the working directory.
    """
    repo.ui.debug(repr(x), '\n')
    if x is None:
        return [r.rev() for r in repo[x].parents()]

    ps = set()
    cl = repo.changelog
    for r in getset(repo, range(len(repo)), x):
        ps.update(cl.parentrevs(r))

12935:98b79c892768

def p1(repo, subset, x):
    """``p1([set])``
    First parent of changesets in set, or the working directory.
    """
    if x is None:
        p = repo[x].parents()[0].rev()
        return [r for r in subset if r == p]

    ps = set()
    cl = repo.changelog
    for r in getset(repo, range(len(repo)), x):
        ps.add(cl.parentrevs(r)[0])

    Second parent of changesets in set, or the working directory.
    """
    if x is None:
        ps = repo[x].parents()
        try:
            p = ps[1].rev()
            return [r for r in subset if r == p]
        except IndexError:
            return []

    ps = set()
    cl = repo.changelog

    """``parents([set])``
    The set of all parents for all changesets in set, or the working directory.
    """
    repo.ui.debug(repr(x), '\n')
    if x is None:
        ps = tuple(p.rev() for p in repo[x].parents())
        return [r for r in subset if r in ps]

    ps = set()
    cl = repo.changelog
    for r in getset(repo, range(len(repo)), x):
        ps.update(cl.parentrevs(r))