Show More
@@ -3414,6 +3414,7 b' def log(ui, repo, *pats, **opts):' | |||||
3414 | raise error.Abort(_('--line-range requires --follow')) |
|
3414 | raise error.Abort(_('--line-range requires --follow')) | |
3415 |
|
3415 | |||
3416 | if linerange and pats: |
|
3416 | if linerange and pats: | |
|
3417 | # TODO: take pats as patterns with no line-range filter | |||
3417 | raise error.Abort( |
|
3418 | raise error.Abort( | |
3418 | _('FILE arguments are not compatible with --line-range option') |
|
3419 | _('FILE arguments are not compatible with --line-range option') | |
3419 | ) |
|
3420 | ) | |
@@ -3421,6 +3422,8 b' def log(ui, repo, *pats, **opts):' | |||||
3421 | repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn') |
|
3422 | repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn') | |
3422 | revs, differ = logcmdutil.getrevs(repo, pats, opts) |
|
3423 | revs, differ = logcmdutil.getrevs(repo, pats, opts) | |
3423 | if linerange: |
|
3424 | if linerange: | |
|
3425 | # TODO: should follow file history from logcmdutil._initialrevs(), | |||
|
3426 | # then filter the result by logcmdutil._makerevset() and --limit | |||
3424 | revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts) |
|
3427 | revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts) | |
3425 |
|
3428 | |||
3426 | getrenamed = None |
|
3429 | getrenamed = None |
General Comments 0
You need to be logged in to leave comments.
Login now