416
416
# and hits manually refilled. Could do this again if it was
417
417
# for a good reason, otherwise cache might want purging.
418
418
outputter = opts.outputter
419
for fp, fc, entry in tree.list_files(include_root=False,
419
for fp, fc, fkind, entry in tree.list_files(include_root=False,
420
420
from_dir=from_dir, recursive=opts.recursive):
422
422
if _skip_file(opts.include, opts.exclude, fp):
425
if fc == 'V' and entry.kind == 'file':
425
if fc == 'V' and fkind == 'file':
426
426
tree_path = osutils.pathjoin(from_dir if from_dir else '', fp)
427
427
if revno is not None:
428
428
# If old result is valid, print results immediately.
429
429
# Otherwise, add file info to to_grep so that the
430
430
# loop later will get chunks and grep them
431
cache_id = tree.get_file_revision(tree_path, entry.file_id)
431
cache_id = tree.get_file_revision(tree_path)
432
432
if cache_id in outputter.cache:
433
433
# GZ 2010-06-05: Not really sure caching and re-outputting
434
434
# the old path is really the right thing,
added
removed
breezy/plugins/grep/grep.py
