comparison mercurial/cmdutil.py @ 35644:7a0a90d63a8c

log: use revsetlang.formatspec() to concatenate list expression

This rewrites 'not ancestors(x) and not ...' as 'not (ancestors(x) or ...)'
so we can use '%lr'. 'isinstance(val, list)' is replaced with 'listop' to
make sure 'listop' is applied.

35643:668c5a527eff

    pathutil,
    pycompat,
    registrar,
    revlog,
    revset,
    scmutil,
    smartset,
    templatekw,
    templater,
    util,

    '_fancestors':      ('_firstancestors(%(val)s)', None),
    '_descendants':     ('descendants(%(val)s)', None),
    '_fdescendants':    ('_firstdescendants(%(val)s)', None),
    '_matchfiles':      ('_matchfiles(%(val)s)', None),
    'date':             ('date(%(val)r)', None),
    'branch':           ('branch(%(val)r)', ' or '),
    '_patslog':         ('filelog(%(val)r)', ' or '),
    '_patsfollow':      ('follow(%(val)r)', ' or '),
    '_patsfollowfirst': ('_followfirst(%(val)r)', ' or '),
    'keyword':          ('keyword(%(val)r)', ' or '),
    'prune':            ('not ancestors(%(val)r)', ' and '),
    'user':             ('user(%(val)r)', ' or '),
}

def _makelogrevset(repo, pats, opts, revs):
    """Return (expr, filematcher) where expr is a revset string built
    from log options and file patterns or None. If --stat or --patch

    for op, val in sorted(opts.iteritems()):
        if not val:
            continue
        if op not in _opt2logrevset:
            continue
        revop, andor = _opt2logrevset[op]
        if '%(val)' not in revop:
            expr.append(revop)
        else:
            if not isinstance(val, list):
                e = revop % {'val': val}
            else:
                e = '(' + andor.join((revop % {'val': v}) for v in val) + ')'
            expr.append(e)

    if expr:
        expr = '(' + ' and '.join(expr) + ')'
    else:

35644:7a0a90d63a8c

    pathutil,
    pycompat,
    registrar,
    revlog,
    revset,
    revsetlang,
    scmutil,
    smartset,
    templatekw,
    templater,
    util,

    '_fancestors':      ('_firstancestors(%(val)s)', None),
    '_descendants':     ('descendants(%(val)s)', None),
    '_fdescendants':    ('_firstdescendants(%(val)s)', None),
    '_matchfiles':      ('_matchfiles(%(val)s)', None),
    'date':             ('date(%(val)r)', None),
    'branch':           ('branch(%(val)r)', '%lr'),
    '_patslog':         ('filelog(%(val)r)', '%lr'),
    '_patsfollow':      ('follow(%(val)r)', '%lr'),
    '_patsfollowfirst': ('_followfirst(%(val)r)', '%lr'),
    'keyword':          ('keyword(%(val)r)', '%lr'),
    'prune':            ('ancestors(%(val)r)', 'not %lr'),
    'user':             ('user(%(val)r)', '%lr'),
}

def _makelogrevset(repo, pats, opts, revs):
    """Return (expr, filematcher) where expr is a revset string built
    from log options and file patterns or None. If --stat or --patch

    for op, val in sorted(opts.iteritems()):
        if not val:
            continue
        if op not in _opt2logrevset:
            continue
        revop, listop = _opt2logrevset[op]
        if '%(val)' not in revop:
            expr.append(revop)
        else:
            if not listop:
                e = revop % {'val': val}
            else:
                e = [revop % {'val': v} for v in val]
                e = revsetlang.formatspec(listop, e)
            expr.append(e)

    if expr:
        expr = '(' + ' and '.join(expr) + ')'
    else: