This is an archive of the discontinued Mercurial Phabricator instance.

Differential D7377

commands: log --line-range is incompatible with --copies
AbandonedPublic

Authored by durin42 on Nov 13 2019, 10:50 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Summary

This was (to my surprise) detected by pytype.

Diff Detail

Repository
rHG Mercurial
Lint
Lint Skipped
Unit
Unit Tests Skipped

Event Timeline

durin42 created this revision.Nov 13 2019, 10:50 PM
dlax added a subscriber: dlax.EditedNov 14 2019, 3:51 AM

Nice pytype catch!

That's a bug, I think. logcmdutil.getlinerangerevs() should return revs as a smartset, not as list. I sent a fix.

durin42 abandoned this revision.Nov 14 2019, 4:17 PM

@dlax seems to have fixed the underlying issue here. :)

Revision Contents
Changeset List

PathPackages
Mmercurial/commands.py (5 lines)

Diff 18061

mercurial/commands.py

if linerange and not opts.get(b'follow'): if linerange and not opts.get(b'follow'):
raise error.Abort(_(b'--line-range requires --follow')) raise error.Abort(_(b'--line-range requires --follow'))
if linerange and pats: if linerange and pats:
# TODO: take pats as patterns with no line-range filter # TODO: take pats as patterns with no line-range filter
raise error.Abort( raise error.Abort(
_(b'FILE arguments are not compatible with --line-range option') _(b'FILE arguments are not compatible with --line-range option')
) )
copies = opts.get(b'copies')
if linerange and copies:
raise error.Abort(_(b'--line-range is incompatible with --copies'))
repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn') repo = scmutil.unhidehashlikerevs(repo, opts.get(b'rev'), b'nowarn')
revs, differ = logcmdutil.getrevs(repo, pats, opts) revs, differ = logcmdutil.getrevs(repo, pats, opts)
if linerange: if linerange:
# TODO: should follow file history from logcmdutil._initialrevs(), # TODO: should follow file history from logcmdutil._initialrevs(),
# then filter the result by logcmdutil._makerevset() and --limit # then filter the result by logcmdutil._makerevset() and --limit
revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts) revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts)
getcopies = None getcopies = None
if opts.get(b'copies'): if copies:
endrev = None endrev = None
if revs: if revs:
endrev = revs.max() + 1 endrev = revs.max() + 1
getcopies = scmutil.getcopiesfn(repo, endrev=endrev) getcopies = scmutil.getcopiesfn(repo, endrev=endrev)
ui.pager(b'log') ui.pager(b'log')
displayer = logcmdutil.changesetdisplayer( displayer = logcmdutil.changesetdisplayer(
ui, repo, opts, differ, buffered=True ui, repo, opts, differ, buffered=True