comparison mercurial/revset.py @ 26143:42bb1812686f

revset: fix resolving strings from a list

When using multiple revsets that get optimized into a list (like
hg log -r r1235 -r r1237 in hgsubversion), the revset list code was assuming the
strings were resolvable via repo[X]. hgsubversion and other extensions override
def stringset() to allow processing different revision identifiers (such as
r1235 or g<githash>), and there for the _list() implementation was circumventing
that resolution.

The fix is to just call stringset(). The default implementaiton does the same
thing that _list was already doing (namely repo[X]).

This has always been broken, but it was recently exposed by 4ee4f7415095 which
made "--rev X --rev Y" produce a combined revset "X | Y".

26142:7332bf4ae959

        try:
            # fast path for integer revision
            r = int(t)
            if str(r) != t or r not in cl:
                raise ValueError
        except ValueError:
            r = repo[t].rev()
        if r in seen:
            continue
        if (r in subset
            or r == node.nullrev and isinstance(subset, fullreposet)):
            ls.append(r)
        seen.add(r)
    return baseset(ls)

# for internal use
def _intlist(repo, subset, x):
    s = getstring(x, "internal error")

26143:42bb1812686f

        try:
            # fast path for integer revision
            r = int(t)
            if str(r) != t or r not in cl:
                raise ValueError
            revs = [r]
        except ValueError:
            revs = stringset(repo, subset, t)

        for r in revs:
            if r in seen:
                continue
            if (r in subset
                or r == node.nullrev and isinstance(subset, fullreposet)):
                ls.append(r)
            seen.add(r)
    return baseset(ls)

# for internal use
def _intlist(repo, subset, x):
    s = getstring(x, "internal error")