comparison hgext/graphlog.py @ 16173:9178d284b880

graphlog: implement --follow with file arguments

16172:db75321c7a0e

def check_unsupported_flags(pats, opts):
    for op in ["follow_first", "copies", "newest_first"]:
        if op in opts and opts[op]:
            raise util.Abort(_("-G/--graph option is incompatible with --%s")
                             % op.replace("_", "-"))
    if pats and opts.get('follow'):
        raise util.Abort(_("-G/--graph option is incompatible with --follow "
                           "with file argument"))

def revset(repo, pats, opts):
    """Return revset str built of revisions, log options and file patterns.
    """
    opt2revset = {

        '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 '),
        }

    # branch and only_branch are really aliases and must be handled at
    # the same time
    if 'branch' in opts and 'only_branch' in opts:
        opts['branch'] = opts['branch'] + opts.pop('only_branch')

    # pats/include/exclude are passed to match.match() directly in
    # _matchfile() revset but walkchangerevs() builds its matcher with
    # scmutil.match(). The difference is input pats are globbed on
    # platforms without shell expansion (windows).
    match, pats = scmutil.matchandpats(repo[None], pats, opts)
    slowpath = match.anypats() or (match.files() and opts.get('removed'))
    if not slowpath:
        for f in match.files():
            filelog = repo.file(f)
            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 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():
        if not val:
            continue

16173:9178d284b880

def check_unsupported_flags(pats, opts):
    for op in ["follow_first", "copies", "newest_first"]:
        if op in opts and opts[op]:
            raise util.Abort(_("-G/--graph option is incompatible with --%s")
                             % op.replace("_", "-"))

def revset(repo, pats, opts):
    """Return revset str built of revisions, log options and file patterns.
    """
    opt2revset = {

        'only_merges': ('merge()', None),
        'removed':     ('removes("*")', None),
        'date':        ('date(%(val)r)', None),
        'branch':      ('branch(%(val)r)', ' or '),
        '_patslog':    ('filelog(%(val)r)', ' or '),
        '_patsfollow': ('follow(%(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 '),
        }

    # branch and only_branch are really aliases and must be handled at
    # the same time
    if 'branch' in opts and 'only_branch' in opts:
        opts['branch'] = opts['branch'] + opts.pop('only_branch')

    follow = opts.get('follow')
    if 'follow' in opts:
        del opts['follow']
    # pats/include/exclude are passed to match.match() directly in
    # _matchfile() revset but walkchangerevs() builds its matcher with
    # scmutil.match(). The difference is input pats are globbed on
    # platforms without shell expansion (windows).
    pctx = repo[None]
    match, pats = scmutil.matchandpats(pctx, pats, opts)
    slowpath = match.anypats() or (match.files() and opts.get('removed'))
    if not slowpath:
        for f in match.files():
            if follow and f not in pctx:
                raise util.Abort(_('cannot follow file not in parent '
                                   'revision: "%s"') % f)
            filelog = repo.file(f)
            if not len(filelog):
                # A zero count may be a directory or deleted file, so
                # try to find matching entries on the slow path.
                if follow:
                    raise util.Abort(
                        _('cannot follow nonexistent file: "%s"') % f)
                slowpath = True
    if slowpath:
        # See cmdutil.walkchangerevs() slow path.
        #
        if follow:
            raise util.Abort(_('can only follow copies/renames for explicit '
                               'filenames'))
        # 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 opts.get('exclude', []):
            matchargs.append('x:' + p)
        matchargs = ','.join(('%r' % p) for p in matchargs)
        opts['rev'] = opts.get('rev', []) + ['_matchfiles(%s)' % matchargs]
    else:
        if follow:
            if pats:
                opts['_patsfollow'] = list(pats)
            else:
                opts['follow'] = True
        else:
            opts['_patslog'] = list(pats)

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