comparison mercurial/revsetlang.py @ 41297:b1ea90613af3 stable

revset: introduce an internal `_rev` predicate for '%d' usage

In 24a1f67bb75a, we aligned "%d" behavior on "%ld" one, invalid revisions got
silently ignored. However, soon after in 8aca89a694d4 and 26b0a7514f01, a side
effect changed the behavior of "%ld" to no longer silently filter invalid
revisions.

After discussion on the mailing list, it was decided to align on the new %ld
behavior:

https://www.mercurial-scm.org/pipermail/mercurial-devel/2019-January/127291.html

This changeset introduce a '_rev()' predicated that keep the benefit from
24a1f67bb75a while enforcing a more strict checking on the inputs.

41296:d82dd55024e7

    """
    return "'%s'" % stringutil.escapestr(pycompat.bytestr(s))

def _formatargtype(c, arg):
    if c == 'd':
        return 'rev(%d)' % int(arg)
    elif c == 's':
        return _quote(arg)
    elif c == 'r':
        if not isinstance(arg, bytes):
            raise TypeError

    and 'p' specifies a list of function parameters of that type.

    >>> formatspec(b'%r:: and %lr', b'10 or 11', (b"this()", b"that()"))
    '(10 or 11):: and ((this()) or (that()))'
    >>> formatspec(b'%d:: and not %d::', 10, 20)
    'rev(10):: and not rev(20)::'
    >>> formatspec(b'%ld or %ld', [], [1])
    "_list('') or rev(1)"
    >>> formatspec(b'keyword(%s)', b'foo\\xe9')
    "keyword('foo\\\\xe9')"
    >>> b = lambda: b'default'
    >>> b.branch = b
    >>> formatspec(b'branch(%b)', b)

41297:b1ea90613af3

    """
    return "'%s'" % stringutil.escapestr(pycompat.bytestr(s))

def _formatargtype(c, arg):
    if c == 'd':
        return '_rev(%d)' % int(arg)
    elif c == 's':
        return _quote(arg)
    elif c == 'r':
        if not isinstance(arg, bytes):
            raise TypeError

    and 'p' specifies a list of function parameters of that type.

    >>> formatspec(b'%r:: and %lr', b'10 or 11', (b"this()", b"that()"))
    '(10 or 11):: and ((this()) or (that()))'
    >>> formatspec(b'%d:: and not %d::', 10, 20)
    '_rev(10):: and not _rev(20)::'
    >>> formatspec(b'%ld or %ld', [], [1])
    "_list('') or _rev(1)"
    >>> formatspec(b'keyword(%s)', b'foo\\xe9')
    "keyword('foo\\\\xe9')"
    >>> b = lambda: b'default'
    >>> b.branch = b
    >>> formatspec(b'branch(%b)', b)