comparison mercurial/revsetlang.py @ 35560:3a8810c1b9bc

revsetlang: use iterator to track current argument in formatspec()

35559:a480551bd1b4

        m = l // 2
        return '(%s or %s)' % (listexp(s[:m], t), listexp(s[m:], t))

    expr = pycompat.bytestr(expr)
    ret = []
    pos = 0
    arg = 0
    while pos < len(expr):
        q = expr.find('%', pos)
        if q < 0:
            ret.append(expr[pos:])
            break

        pos = q + 1
        d = expr[pos]
        if d == '%':
            ret.append(d)
        elif d in 'dsnbr':
            ret.append(argtype(d, args[arg]))
            arg += 1
        elif d == 'l':
            # a list of some type
            pos += 1
            d = expr[pos]
            ret.append(listexp(list(args[arg]), d))
            arg += 1
        else:
            raise error.Abort(_('unexpected revspec format character %s') % d)
        pos += 1

    return ''.join(ret)

35560:3a8810c1b9bc

        m = l // 2
        return '(%s or %s)' % (listexp(s[:m], t), listexp(s[m:], t))

    expr = pycompat.bytestr(expr)
    argiter = iter(args)
    ret = []
    pos = 0
    while pos < len(expr):
        q = expr.find('%', pos)
        if q < 0:
            ret.append(expr[pos:])
            break

        pos = q + 1
        d = expr[pos]
        if d == '%':
            ret.append(d)
        elif d in 'dsnbr':
            ret.append(argtype(d, next(argiter)))
        elif d == 'l':
            # a list of some type
            pos += 1
            d = expr[pos]
            ret.append(listexp(list(next(argiter)), d))
        else:
            raise error.Abort(_('unexpected revspec format character %s') % d)
        pos += 1

    return ''.join(ret)