~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tree.py

  • Committer: Jonathan Riddell
  • Date: 2011-09-16 11:13:47 UTC
  • mto: This revision was merged to the branch mainline in revision 6144.
  • Revision ID: jriddell@canonical.com-20110916111347-fyjk426bkl0jrbfu
gettext() show_warning usage

Show diffs side-by-side

added added

removed removed

Lines of Context:
35
35
    rules,
36
36
    trace,
37
37
    )
 
38
from bzrlib.i18n import gettext
38
39
""")
39
40
 
40
41
from bzrlib.decorators import needs_read_lock
58
59
    trees or versioned trees.
59
60
    """
60
61
 
 
62
    def has_versioned_directories(self):
 
63
        """Whether this tree can contain explicitly versioned directories.
 
64
 
 
65
        This defaults to True, but some implementations may want to override
 
66
        it.
 
67
        """
 
68
        return True
 
69
 
61
70
    def changes_from(self, other, want_unchanged=False, specific_files=None,
62
71
        extra_trees=None, require_versioned=False, include_root=False,
63
72
        want_unversioned=False):
623
632
        prefs = self.iter_search_rules([path], filter_pref_names).next()
624
633
        stk = filters._get_filter_stack_for(prefs)
625
634
        if 'filters' in debug.debug_flags:
626
 
            trace.note("*** %s content-filter: %s => %r" % (path,prefs,stk))
 
635
            trace.note(gettext("*** {0} content-filter: {1} => {2!r}").format(path,prefs,stk))
627
636
        return stk
628
637
 
629
638
    def _content_filter_stack_provider(self):