3417 raise error.Abort( |
3417 raise error.Abort( |
3418 _('FILE arguments are not compatible with --line-range option') |
3418 _('FILE arguments are not compatible with --line-range option') |
3419 ) |
3419 ) |
3420 |
3420 |
3421 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn') |
3421 repo = scmutil.unhidehashlikerevs(repo, opts.get('rev'), 'nowarn') |
3422 revs, filematcher = logcmdutil.getrevs(repo, pats, opts) |
3422 revs, differ = logcmdutil.getrevs(repo, pats, opts) |
3423 hunksfilter = None |
|
3424 |
3423 |
3425 if opts.get('graph'): |
3424 if opts.get('graph'): |
3426 if linerange: |
3425 if linerange: |
3427 raise error.Abort(_('graph not supported with line range patterns')) |
3426 raise error.Abort(_('graph not supported with line range patterns')) |
3428 return logcmdutil.graphlog(ui, repo, revs, filematcher, opts) |
3427 return logcmdutil.graphlog(ui, repo, revs, differ, opts) |
3429 |
3428 |
3430 if linerange: |
3429 if linerange: |
3431 revs, filematcher, hunksfilter = logcmdutil.getlinerangerevs( |
3430 revs, differ = logcmdutil.getlinerangerevs(repo, revs, opts) |
3432 repo, revs, opts) |
|
3433 |
3431 |
3434 getrenamed = None |
3432 getrenamed = None |
3435 if opts.get('copies'): |
3433 if opts.get('copies'): |
3436 endrev = None |
3434 endrev = None |
3437 if opts.get('rev'): |
3435 if opts.get('rev'): |
3438 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 |
3436 endrev = scmutil.revrange(repo, opts.get('rev')).max() + 1 |
3439 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) |
3437 getrenamed = templatekw.getrenamedfn(repo, endrev=endrev) |
3440 |
3438 |
3441 ui.pager('log') |
3439 ui.pager('log') |
3442 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, |
3440 displayer = logcmdutil.changesetdisplayer(ui, repo, opts, differ, |
3443 makefilematcher=filematcher, |
|
3444 makehunksfilter=hunksfilter, |
|
3445 buffered=True) |
3441 buffered=True) |
3446 for rev in revs: |
3442 for rev in revs: |
3447 ctx = repo[rev] |
3443 ctx = repo[rev] |
3448 copies = None |
3444 copies = None |
3449 if getrenamed is not None and rev: |
3445 if getrenamed is not None and rev: |