/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/filter_tree.py

  • Committer: Jelmer Vernooij
  • Date: 2018-03-24 17:48:04 UTC
  • mfrom: (6921 work)
  • mto: This revision was merged to the branch mainline in revision 6923.
  • Revision ID: jelmer@jelmer.uk-20180324174804-xf22o05byoj12x1q
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/filter_tree.py
47
47
    def get_file_text(self, path, file_id=None):
48
48
        chunks = self.backing_tree.get_file_lines(path, file_id)
49
49
        filters = self.filter_stack_callback(path)
50
 
        context = ContentFilterContext(path, self, None)
 
50
        context = ContentFilterContext(path, self)
51
51
        contents = filtered_output_bytes(chunks, filters, context)
52
52
        content = ''.join(contents)
53
53
        return content
58
58
    def is_executable(self, path, file_id=None):
59
59
        return self.backing_tree.is_executable(path, file_id)
60
60
 
61
 
    def iter_entries_by_dir(self, specific_file_ids=None, yield_parents=None):
 
61
    def iter_entries_by_dir(self, specific_files=None, yield_parents=None):
62
62
        # NB: This simply returns the parent tree's entries; the length may be
63
63
        # wrong but it can't easily be calculated without filtering the whole
64
64
        # text.  Currently all callers cope with this; perhaps they should be
65
65
        # updated to a narrower interface that only provides things guaranteed
66
66
        # cheaply available across all trees. -- mbp 20110705
67
67
        return self.backing_tree.iter_entries_by_dir(
68
 
            specific_file_ids=specific_file_ids,
 
68
            specific_files=specific_files,
69
69
            yield_parents=yield_parents)
70
70
 
71
71
    def lock_read(self):