Rev 2747: Ensure mutter_callsite is not directly called on a lazy_load object, to make the stacklevel parameter work correctly. in http://people.ubuntu.com/~robertc/baz2.0/devil

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/devil

------------------------------------------------------------
revno: 2747
revision-id: robertc at robertcollins.net-20070824021547-ov2abtu3buhgzsuz
parent: robertc at robertcollins.net-20070823213656-055xdmkyesohby3u
committer: Robert Collins <robertc at robertcollins.net>
branch nick: devil
timestamp: Fri 2007-08-24 12:15:47 +1000
message:
  Ensure mutter_callsite is not directly called on a lazy_load object, to make the stacklevel parameter work correctly.
modified:
  bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
=== modified file 'bzrlib/index.py'
--- a/bzrlib/index.py	2007-08-23 21:36:56 +0000
+++ b/bzrlib/index.py	2007-08-24 02:15:47 +0000
@@ -29,7 +29,8 @@
 
 from bzrlib.lazy_import import lazy_import
 lazy_import(globals(), """
-from bzrlib.trace import mutter, mutter_callsite
+from bzrlib import trace
+from bzrlib.trace import mutter
 """)
 from bzrlib import debug, errors
 
@@ -323,7 +324,8 @@
             the most efficient order for the index.
         """
         if 'evil' in debug.debug_flags:
-            mutter_callsite(2, "iter_all_entries scales with size of history.")
+            trace.mutter_callsite(2,
+                "iter_all_entries scales with size of history.")
         if self._nodes is None:
             self._buffer_all()
         if self.node_ref_lists:
@@ -613,7 +615,8 @@
             efficient order for the index (in this case dictionary hash order).
         """
         if 'evil' in debug.debug_flags:
-            mutter_callsite(2, "iter_all_entries scales with size of history.")
+            trace.mutter_callsite(2,
+                "iter_all_entries scales with size of history.")
         if self.reference_lists:
             for key, (absent, references, value) in self._nodes.iteritems():
                 if not absent:

=== modified file 'bzrlib/knit.py'
--- a/bzrlib/knit.py	2007-08-23 21:36:56 +0000
+++ b/bzrlib/knit.py	2007-08-24 02:15:47 +0000
@@ -74,8 +74,8 @@
 lazy_import(globals(), """
 from bzrlib import (
     pack,
+    trace,
     )
-from bzrlib.trace import mutter_callsite
 """)
 from bzrlib import (
     cache_utf8,
@@ -634,13 +634,13 @@
     def versions(self):
         """See VersionedFile.versions."""
         if 'evil' in debug.debug_flags:
-            mutter_callsite(2, "versions scales with size of history")
+            trace.mutter_callsite(2, "versions scales with size of history")
         return self._index.get_versions()
 
     def has_version(self, version_id):
         """See VersionedFile.has_version."""
         if 'evil' in debug.debug_flags:
-            mutter_callsite(2, "has_version is a LBYL scenario")
+            trace.mutter_callsite(2, "has_version is a LBYL scenario")
         version_id = osutils.safe_revision_id(version_id)
         return self._index.has_version(version_id)
 

=== modified file 'bzrlib/workingtree_4.py'
--- a/bzrlib/workingtree_4.py	2007-08-23 21:36:56 +0000
+++ b/bzrlib/workingtree_4.py	2007-08-24 02:15:47 +0000
@@ -56,6 +56,7 @@
     revision as _mod_revision,
     revisiontree,
     textui,
+    trace,
     transform,
     urlutils,
     xml5,
@@ -63,7 +64,6 @@
     )
 import bzrlib.branch
 from bzrlib.transport import get_transport
-from bzrlib.trace import mutter_callsite
 import bzrlib.ui
 """)
 
@@ -434,7 +434,7 @@
     def _get_inventory(self):
         """Get the inventory for the tree. This is only valid within a lock."""
         if 'evil' in debug.debug_flags:
-            mutter_callsite(2,
+            trace.mutter_callsite(2,
                 "accessing .inventory forces a size of tree translation.")
         if self._inventory is not None:
             return self._inventory