← Back to branch summary

~jelmer/bzr/integrated

« back to all changes in this revision

Viewing changes to bzrlib/filter_tree.py

  • Committer: Patch Queue Manager
  • Date: 2012-08-02 15:17:43 UTC
  • mfrom: (6549.2.1 filtre-tree-bug)
  • Revision ID: pqm@pqm.ubuntu.com-20120802151743-ht3zipt6g7dgmk2v
(vila) Fix bug in filter_tree.ContentFilterTree.get_file_text (Vincent
 Ladeuil)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/filter_tree.py
46
46
 
47
47
    def get_file_text(self, file_id, path=None):
48
48
        chunks = self.backing_tree.get_file_lines(file_id, path)
49
 
        filters = self.filter_stack_callback(path)
50
49
        if path is None:
51
50
            path = self.backing_tree.id2path(file_id)
 
51
        filters = self.filter_stack_callback(path)
52
52
        context = ContentFilterContext(path, self, None)
53
53
        contents = filtered_output_bytes(chunks, filters, context)
54
54
        content = ''.join(contents)