Show More
@@ -3428,20 +3428,9 def log(ui, repo, *pats, **opts): | |||||
3428 | return logcmdutil.graphlog(ui, repo, revs, filematcher, opts) |
|
3428 | return logcmdutil.graphlog(ui, repo, revs, filematcher, opts) | |
3429 |
|
3429 | |||
3430 | if linerange: |
|
3430 | if linerange: | |
3431 |
revs, |
|
3431 | revs, filematcher, hunksfilter = logcmdutil.getlinerangerevs( | |
3432 | repo, revs, opts) |
|
3432 | repo, revs, opts) | |
3433 |
|
3433 | |||
3434 | if filematcher is not None: |
|
|||
3435 | basefilematcher = filematcher |
|
|||
3436 |
|
||||
3437 | def filematcher(rev): |
|
|||
3438 | files = (basefilematcher(rev).files() |
|
|||
3439 | + lrfilematcher(rev).files()) |
|
|||
3440 | return scmutil.matchfiles(repo, files) |
|
|||
3441 |
|
||||
3442 | elif filematcher is None: |
|
|||
3443 | filematcher = lrfilematcher |
|
|||
3444 |
|
||||
3445 | getrenamed = None |
|
3434 | getrenamed = None | |
3446 | if opts.get('copies'): |
|
3435 | if opts.get('copies'): | |
3447 | endrev = None |
|
3436 | endrev = None |
General Comments 0
You need to be logged in to leave comments.
Login now