comparison hgext/graphlog.py @ 16157:4a828d3bc04a

graphlog: --branch and --only-branch are the same

Handling the aliasing in fancyopts would be cleaner but I do not want to make
this change for stable.

16152:816211dfa3a5

        'date':        ('date($)', None),
        'branch':      ('branch($)', ' or '),
        'exclude':     ('not file($)', ' and '),
        'include':     ('file($)', ' and '),
        'keyword':     ('keyword($)', ' or '),
        'only_branch': ('branch($)', ' and '),
        'prune':       ('not ($ or ancestors($))', ' and '),
        'user':        ('user($)', ' or '),
        }
    optrevset = []
    revset = []
    for op, val in opts.iteritems():
        if not val:
            continue

16157:4a828d3bc04a

        'date':        ('date($)', None),
        'branch':      ('branch($)', ' or '),
        'exclude':     ('not file($)', ' and '),
        'include':     ('file($)', ' and '),
        'keyword':     ('keyword($)', ' or '),
        'prune':       ('not ($ or ancestors($))', ' and '),
        'user':        ('user($)', ' 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 = dict(opts)
        opts['branch'] = opts['branch'] + opts.pop('only_branch')

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