← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: John Arbash Meinel
  • Date: 2011-09-12 18:40:02 UTC
  • mfrom: (6132 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6133.
  • Revision ID: john@arbash-meinel.com-20110912184002-o23eu21fdgp35h2q
Merge bzr.dev, resolve release-notes (aka NEWS) conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tree.py
35
35
    rules,
36
36
    trace,
37
37
    )
38
 
from bzrlib.i18n import gettext
39
38
""")
40
39
 
41
40
from bzrlib.decorators import needs_read_lock
632
631
        prefs = self.iter_search_rules([path], filter_pref_names).next()
633
632
        stk = filters._get_filter_stack_for(prefs)
634
633
        if 'filters' in debug.debug_flags:
635
 
            trace.note(gettext("*** {0} content-filter: {1} => {2!r}").format(path,prefs,stk))
 
634
            trace.note("*** %s content-filter: %s => %r" % (path,prefs,stk))
636
635
        return stk
637
636
 
638
637
    def _content_filter_stack_provider(self):