comparison mercurial/cmdutil.py @ 35643:668c5a527eff

log: simplify 'x or ancestors(x)' expression

'ancestors(x)' includes 'x'.

35642:e64baf32782a

    '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 (%(val)r or 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

35643:668c5a527eff

    '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