mercurial/commands.py
changeset 46041 9c0db3671008
parent 46014 b86608e97fa8
child 46077 7a2b67e6b680
equal deleted inserted replaced
46040:9ee791f3278f 46041:9c0db3671008
  4634     if linerange:
  4634     if linerange:
  4635         # TODO: should follow file history from logcmdutil._initialrevs(),
  4635         # TODO: should follow file history from logcmdutil._initialrevs(),
  4636         # then filter the result by logcmdutil._makerevset() and --limit
  4636         # then filter the result by logcmdutil._makerevset() and --limit
  4637         revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
  4637         revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
  4638 
  4638 
  4639     if opts.get(b'bookmark'):
       
  4640         cmdutil.check_at_most_one_arg(opts, b'rev', b'bookmark')
       
  4641         bookmarks = opts.get(b'bookmark')
       
  4642         bookmark = bookmarks[0]
       
  4643         revs, differ = logcmdutil.get_bookmark_revs(repo, bookmark, walk_opts)
       
  4644 
       
  4645     getcopies = None
  4639     getcopies = None
  4646     if opts.get(b'copies'):
  4640     if opts.get(b'copies'):
  4647         endrev = None
  4641         endrev = None
  4648         if revs:
  4642         if revs:
  4649             endrev = revs.max() + 1
  4643             endrev = revs.max() + 1