4611 raise error.InputError( |
4618 raise error.InputError( |
4612 _(b'FILE arguments are not compatible with --line-range option') |
4619 _(b'FILE arguments are not compatible with --line-range option') |
4613 ) |
4620 ) |
4614 |
4621 |
4615 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn') |
4622 repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn') |
4616 revs, differ = logcmdutil.getrevs( |
4623 walk_opts = logcmdutil.parseopts(ui, pats, opts) |
4617 repo, logcmdutil.parseopts(ui, pats, opts) |
4624 revs, differ = logcmdutil.getrevs(repo, walk_opts) |
4618 ) |
|
4619 if linerange: |
4625 if linerange: |
4620 # TODO: should follow file history from logcmdutil._initialrevs(), |
4626 # TODO: should follow file history from logcmdutil._initialrevs(), |
4621 # then filter the result by logcmdutil._makerevset() and --limit |
4627 # then filter the result by logcmdutil._makerevset() and --limit |
4622 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts) |
4628 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts) |
|
4629 |
|
4630 if opts.get(b'bookmark'): |
|
4631 cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark') |
|
4632 bookmarks = opts.get(b'bookmark') |
|
4633 bookmark = bookmarks[0] |
|
4634 revs, differ = logcmdutil.get_bookmark_revs(repo, bookmark, walk_opts) |
4623 |
4635 |
4624 getcopies = None |
4636 getcopies = None |
4625 if opts.get(b'copies'): |
4637 if opts.get(b'copies'): |
4626 endrev = None |
4638 endrev = None |
4627 if revs: |
4639 if revs: |