comparison hgext/graphlog.py @ 16409:2cbd7dd0cc1f

graphlog: fix --follow-first --rev combinations

This solves a similar problem than the previous --follow/--rev patch. This time
we need changelog.ancestors()/descendants() filtering on first parent.
Duplicating the code looked better than introducing keyword arguments. Besides,
the ancestors() version was already implemented in follow() revset.

16408:d74099ac2ac1

    are not passed filematcher is None. Otherwise it is a callable
    taking a revision number and returning a match objects filtering
    the files to be detailed when displaying the revision.
    """
    opt2revset = {
        'follow_first':     ('_followfirst()', None),
        'no_merges':        ('not merge()', None),
        'only_merges':      ('merge()', None),
        '_ancestors':       ('ancestors(%(val)s)', None),
        '_descendants':     ('descendants(%(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 '),

    opts = dict(opts)
    # follow or not follow?
    follow = opts.get('follow') or opts.get('follow_first')
    followfirst = opts.get('follow_first')
    if 'follow_first' in opts:
        del opts['follow_first']
    # --follow with FILE behaviour depends on revs...
    startrev = revs[0]
    followdescendants = len(revs) > 1 and revs[0] < revs[1]

    # branch and only_branch are really aliases and must be handled at

        if follow:
            if followfirst:
                if pats:
                    opts['_patsfollowfirst'] = list(pats)
                else:
                    opts['follow_first'] = True
            else:
                if pats:
                    opts['_patsfollow'] = list(pats)
                else:
                    if followdescendants:

16409:2cbd7dd0cc1f

    are not passed filematcher is None. Otherwise it is a callable
    taking a revision number and returning a match objects filtering
    the files to be detailed when displaying the revision.
    """
    opt2revset = {
        'no_merges':        ('not merge()', None),
        'only_merges':      ('merge()', None),
        '_ancestors':       ('ancestors(%(val)s)', None),
        '_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 '),

    opts = dict(opts)
    # follow or not follow?
    follow = opts.get('follow') or opts.get('follow_first')
    followfirst = opts.get('follow_first')
    # --follow with FILE behaviour depends on revs...
    startrev = revs[0]
    followdescendants = len(revs) > 1 and revs[0] < revs[1]

    # branch and only_branch are really aliases and must be handled at

        if follow:
            if followfirst:
                if pats:
                    opts['_patsfollowfirst'] = list(pats)
                else:
                    if followdescendants:
                        opts['_fdescendants'] = str(startrev)
                    else:
                        opts['_fancestors'] = str(startrev)
            else:
                if pats:
                    opts['_patsfollow'] = list(pats)
                else:
                    if followdescendants: