comparison hgext/graphlog.py @ 16161:5a627b49b4d9

graphlog: paths/-I/-X handling requires a new revset

The filtering logic of match objects cannot be reproduced with the existing
revsets as it operates at changeset files level. A changeset touching "a" and
"b" is matched by "-I a -X b" but not by "file(a) and not file(b)".

To solve this, a new internal "_matchfiles(...)" revset is introduced. It works
like "file(x)" but accepts more than one argument and its arguments are
prefixed with "p:", "i:" and "x:" to be used as patterns, include patterns or
exclude patterns respectively.

The _matchfiles revset is kept private for now:
- There are probably smarter ways to pass the arguments in a user-friendly way
- A "rev:" argument is likely appear at some point to emulate log command
  behaviour with regard to filesets: they are evaluated for the parent revision
  and applied everywhere instead of being reevaluated for each revision.

16160:1bfc7ba8b404

        'no_merges':   ('not merge()', None),
        'only_merges': ('merge()', None),
        'removed':     ('removes("*")', None),
        'date':        ('date(%(val)r)', None),
        'branch':      ('branch(%(val)r)', ' or '),
        'exclude':     ('not file(%(val)r)', ' and '),
        'include':     ('file(%(val)r)', ' and '),
        '_pats':       ('file(%(val)r)', ' or '),
        '_patslog':    ('filelog(%(val)r)', ' or '),
        'keyword':     ('keyword(%(val)r)', ' or '),
        'prune':       ('not (%(val)r or ancestors(%(val)r))', ' and '),
        'user':        ('user(%(val)r)', ' or '),
        'rev':         ('%(val)s', ' or '),

            if not len(filelog):
                # A zero count may be a directory or deleted file, so
                # try to find matching entries on the slow path.
                slowpath = True
    if slowpath:
        # See cmdutil.walkchangerevs() slow path
        opts['_pats'] = list(pats)
    else:
        opts['_patslog'] = list(pats)

    revset = []
    for op, val in opts.iteritems():

16161:5a627b49b4d9

        'no_merges':   ('not merge()', None),
        'only_merges': ('merge()', None),
        'removed':     ('removes("*")', None),
        'date':        ('date(%(val)r)', None),
        'branch':      ('branch(%(val)r)', ' or '),
        '_patslog':    ('filelog(%(val)r)', ' or '),
        'keyword':     ('keyword(%(val)r)', ' or '),
        'prune':       ('not (%(val)r or ancestors(%(val)r))', ' and '),
        'user':        ('user(%(val)r)', ' or '),
        'rev':         ('%(val)s', ' or '),

            if not len(filelog):
                # A zero count may be a directory or deleted file, so
                # try to find matching entries on the slow path.
                slowpath = True
    if slowpath:
        # See cmdutil.walkchangerevs() slow path.
        #
        # pats/include/exclude cannot be represented as separate
        # revset expressions as their filtering logic applies at file
        # level. For instance "-I a -X a" matches a revision touching
        # "a" and "b" while "file(a) and not file(b)" does not.
        matchargs = []
        for p in pats:
            matchargs.append('p:' + p)
        for p in opts.get('include', []):
            matchargs.append('i:' + p)
        for p in opts.get('exclude', []):
            matchargs.append('x:' + p)
        matchargs = ','.join(('%r' % p) for p in matchargs)
        opts['rev'] = opts.get('rev', []) + ['_matchfiles(%s)' % matchargs]
    else:
        opts['_patslog'] = list(pats)

    revset = []
    for op, val in opts.iteritems():