Rev 6550: Fix obvious bug, the filter stack needs the path to not be None. in file:///home/vila/src/bzr/cleanup/filtre-tree-bug/

Vincent Ladeuil v.ladeuil+lp at free.fr
Thu Aug 2 14:14:36 UTC 2012


At file:///home/vila/src/bzr/cleanup/filtre-tree-bug/

------------------------------------------------------------
revno: 6550
revision-id: v.ladeuil+lp at free.fr-20120802141436-pa7qqfq0qj3t4oup
parent: pqm at pqm.ubuntu.com-20120801095449-yzevoszth5odzgjk
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: filtre-tree-bug
timestamp: Thu 2012-08-02 16:14:36 +0200
message:
  Fix obvious bug, the filter stack needs the path to not be None.
-------------- next part --------------
=== 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)



More information about the bazaar-commits mailing list