mercurial/commands.py
changeset 36005 dd77e36eabb6
parent 36003 fcde8946c553
child 36006 f113ac0750f3
equal deleted inserted replaced
36004:d4c210ee894f 36005:dd77e36eabb6
  3429 
  3429 
  3430     if linerange:
  3430     if linerange:
  3431         revs, lrfilematcher, hunksfilter = logcmdutil.getlinerangerevs(
  3431         revs, lrfilematcher, hunksfilter = logcmdutil.getlinerangerevs(
  3432             repo, revs, opts)
  3432             repo, revs, opts)
  3433 
  3433 
  3434         if filematcher is not None and lrfilematcher is not None:
  3434         if filematcher is not None:
  3435             basefilematcher = filematcher
  3435             basefilematcher = filematcher
  3436 
  3436 
  3437             def filematcher(rev):
  3437             def filematcher(rev):
  3438                 files = (basefilematcher(rev).files()
  3438                 files = (basefilematcher(rev).files()
  3439                          + lrfilematcher(rev).files())
  3439                          + lrfilematcher(rev).files())