Rev 6551: (vila) Fix bug in filter_tree.ContentFilterTree.get_file_text (Vincent in file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

[Patch Queue Manager]

At file:///srv/pqm.bazaar-vcs.org/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 6551 [merge]
revision-id: pqm at pqm.ubuntu.com-20120802151743-ht3zipt6g7dgmk2v
parent: pqm at pqm.ubuntu.com-20120802142237-yjnpeqh1d55kb2sw
parent: v.ladeuil+lp at free.fr-20120802141436-pa7qqfq0qj3t4oup
committer: Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2012-08-02 15:17:43 +0000
message:
  (vila) Fix bug in filter_tree.ContentFilterTree.get_file_text (Vincent
   Ladeuil)
modified:
  bzrlib/filter_tree.py          filter_tree.py-20110614035703-dpvxzqjyrhoc47mt-1
=== modified file 'bzrlib/filter_tree.py'
--- a/bzrlib/filter_tree.py	2011-12-19 13:23:58 +0000
+++ b/bzrlib/filter_tree.py	2012-08-02 14:14:36 +0000
@@ -46,9 +46,9 @@
 
     def get_file_text(self, file_id, path=None):
         chunks = self.backing_tree.get_file_lines(file_id, path)
-        filters = self.filter_stack_callback(path)
         if path is None:
             path = self.backing_tree.id2path(file_id)
+        filters = self.filter_stack_callback(path)
         context = ContentFilterContext(path, self, None)
         contents = filtered_output_bytes(chunks, filters, context)
         content = ''.join(contents)