← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/mutabletree.py

  • Committer: Patch Queue Manager
  • Date: 2011-09-08 11:01:15 UTC
  • mfrom: (6123.1.16 gpg-typo)
  • Revision ID: pqm@cupuasso-20110908110115-gbb9benwkdksvzk5
(jelmer) Fix a typo (invalid format identifier) in an error message in
 bzrlib.gpg. (Jelmer Vernooij)

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/mutabletree.py
260
260
        :param more_warning: Details about what is happening.
261
261
        """
262
262
        if strict is None:
263
 
            strict = self.branch.get_config_stack().get(opt_name)
 
263
            strict = self.branch.get_config().get_user_option_as_bool(opt_name)
264
264
        if strict is not False:
265
265
            err_class = None
266
266
            if (self.has_changes()):
746
746
                # which is perhaps reasonable: adding a new reference is a
747
747
                # special operation and can have a special behaviour.  mbp
748
748
                # 20070306
749
 
                trace.warning("skipping nested tree %r", abspath)
 
749
                trace.mutter("%r is a nested bzr tree", abspath)
750
750
            else:
751
 
                this_ie = self._add_one_and_parent(parent_ie, directory, kind,
752
 
                    inv_path)
 
751
                this_ie = self._add_one_and_parent(parent_ie, directory, kind, inv_path)
753
752
 
754
753
            if kind == 'directory' and not sub_tree:
755
754
                if this_ie.kind != 'directory':