/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/grep/grep.py

  • Committer: Jelmer Vernooij
  • Date: 2017-11-19 18:35:20 UTC
  • mfrom: (6809.4.27 swap-arguments)
  • Revision ID: jelmer@jelmer.uk-20171119183520-fmw89uw30e0tbhwz
Merge lp:~jelmer/brz/swap-arguments.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/grep/grep.py
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(fid)
 
431
                cache_id = tree.get_file_revision(fp, fid)
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,
455
455
        for (path, fid), chunks in tree.iter_files_bytes(to_grep):
456
456
            path = _make_display_path(relpath, path)
457
457
            _file_grep(chunks[0], path, opts, revno, path_prefix,
458
 
                tree.get_file_revision(fid, path))
 
458
                tree.get_file_revision(path, fid))
459
459
 
460
460
 
461
461
def _make_display_path(relpath, path):
478
478
    """
479
479
 
480
480
    path = _make_display_path(relpath, path)
481
 
    file_text = tree.get_file_text(id)
 
481
    file_text = tree.get_file_text(relpath, id)
482
482
    _file_grep(file_text, path, opts, revno, path_prefix)
483
483
 
484
484