Mercurial > public > mercurial-scm > hg

comparison mercurial/commands.py @ 36006:f113ac0750f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
log: drop dead code to concatenate --line-range patterns and pats It's disabled since 2e45bbd3db7b, and the current implementation is unlikely to be reused.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 21 Jan 2018 15:50:24 +0900
parents dd77e36eabb6
children 29b83c08afe0
comparison
equal deleted inserted replaced
36005:dd77e36eabb6 36006:f113ac0750f3
3426 if linerange: 3426 if linerange:
3427 raise error.Abort(_('graph not supported with line range patterns')) 3427 raise error.Abort(_('graph not supported with line range patterns'))
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, lrfilematcher, hunksfilter = logcmdutil.getlinerangerevs( 3431 revs, filematcher, hunksfilter = logcmdutil.getlinerangerevs(
3432 repo, revs, opts) 3432 repo, revs, opts)
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 3433
3445 getrenamed = None 3434 getrenamed = None
3446 if opts.get('copies'): 3435 if opts.get('copies'):
3447 endrev = None 3436 endrev = None
3448 if opts.get('rev'): 3437 if opts.get('rev'):