comparison mercurial/commands.py @ 46041:9c0db3671008

log: do not override other filtering and sorting options by --bookmark

This basically reimplements 0aa118f18d4b 'log: add bookmark option to
"hg log"'. Before, any other filtering options but --rev were ignored.
-G didn't work either since the ordering constraint wasn't enforced.

46040:9ee791f3278f

    if linerange:
        # TODO: should follow file history from logcmdutil._initialrevs(),
        # then filter the result by logcmdutil._makerevset() and --limit
        revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)

    if opts.get(b'bookmark'):
        cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
        bookmarks = opts.get(b'bookmark')
        bookmark = bookmarks[0]
        revs, differ = logcmdutil.get_bookmark_revs(repo, bookmark, walk_opts)

    getcopies = None
    if opts.get(b'copies'):
        endrev = None
        if revs:
            endrev = revs.max() + 1

46041:9c0db3671008

    if linerange:
        # TODO: should follow file history from logcmdutil._initialrevs(),
        # then filter the result by logcmdutil._makerevset() and --limit
        revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)

    getcopies = None
    if opts.get(b'copies'):
        endrev = None
        if revs:
            endrev = revs.max() + 1