← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

  • Committer: Martin Packman
  • Date: 2012-01-05 09:50:04 UTC
  • mfrom: (6424 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6426.
  • Revision ID: martin.packman@canonical.com-20120105095004-mia9xb7y0efmto0v
Merge bzr.dev to resolve conflicts in bzrlib.builtins

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
19
19
See MutableTree for more details.
20
20
"""
21
21
 
 
22
from __future__ import absolute_import
22
23
 
23
24
from bzrlib.lazy_import import lazy_import
24
25
lazy_import(globals(), """
71
72
    conformance tests for - rather we are testing MemoryTree specifically, and
72
73
    interface testing implementations of WorkingTree.
73
74
 
74
 
    A mutable tree always has an associated Branch and BzrDir object - the
 
75
    A mutable tree always has an associated Branch and ControlDir object - the
75
76
    branch and bzrdir attributes.
76
77
    """
77
78
    def __init__(self, *args, **kw):
260
261
        :param more_warning: Details about what is happening.
261
262
        """
262
263
        if strict is None:
263
 
            strict = self.branch.get_config().get_user_option_as_bool(opt_name)
 
264
            strict = self.branch.get_config_stack().get(opt_name)
264
265
        if strict is not False:
265
266
            err_class = None
266
267
            if (self.has_changes()):
746
747
                # which is perhaps reasonable: adding a new reference is a
747
748
                # special operation and can have a special behaviour.  mbp
748
749
                # 20070306
749
 
                trace.mutter("%r is a nested bzr tree", abspath)
 
750
                trace.warning("skipping nested tree %r", abspath)
750
751
            else:
751
 
                this_ie = self._add_one_and_parent(parent_ie, directory, kind, inv_path)
 
752
                this_ie = self._add_one_and_parent(parent_ie, directory, kind,
 
753
                    inv_path)
752
754
 
753
755
            if kind == 'directory' and not sub_tree:
754
756
                if this_ie.kind != 'directory':