mercurial/cmdutil.py
branchstable
changeset 22166 ac7a3b2a85e3
parent 21966 be94ed4baa5d
child 22167 d4bc38f6eab7
equal deleted inserted replaced
22147:9ac98c2aa95c 22166:ac7a3b2a85e3
  1490             if stopiteration:
  1490             if stopiteration:
  1491                 break
  1491                 break
  1492 
  1492 
  1493     return iterate()
  1493     return iterate()
  1494 
  1494 
  1495 def _makelogfilematcher(repo, files, followfirst):
  1495 def _makefollowlogfilematcher(repo, files, followfirst):
  1496     # When displaying a revision with --patch --follow FILE, we have
  1496     # When displaying a revision with --patch --follow FILE, we have
  1497     # to know which file of the revision must be diffed. With
  1497     # to know which file of the revision must be diffed. With
  1498     # --follow, we want the names of the ancestors of FILE in the
  1498     # --follow, we want the names of the ancestors of FILE in the
  1499     # revision, stored in "fcache". "fcache" is populated by
  1499     # revision, stored in "fcache". "fcache" is populated by
  1500     # reproducing the graph traversal already done by --follow revset
  1500     # reproducing the graph traversal already done by --follow revset
  1630     filematcher = None
  1630     filematcher = None
  1631     if opts.get('patch') or opts.get('stat'):
  1631     if opts.get('patch') or opts.get('stat'):
  1632         if follow and not match.always():
  1632         if follow and not match.always():
  1633             # _makelogfilematcher expects its files argument to be relative to
  1633             # _makelogfilematcher expects its files argument to be relative to
  1634             # the repo root, so use match.files(), not pats.
  1634             # the repo root, so use match.files(), not pats.
  1635             filematcher = _makelogfilematcher(repo, match.files(), followfirst)
  1635             filematcher = _makefollowlogfilematcher(repo, match.files(),
       
  1636                                                     followfirst)
  1636         else:
  1637         else:
  1637             filematcher = lambda rev: match
  1638             filematcher = lambda rev: match
  1638 
  1639 
  1639     expr = []
  1640     expr = []
  1640     for op, val in opts.iteritems():
  1641     for op, val in opts.iteritems():