~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/index.py

  • Committer: Robert Collins
  • Date: 2007-08-24 02:15:47 UTC
  • mto: (2592.3.107 repository)
  • mto: This revision was merged to the branch mainline in revision 2746.
  • Revision ID: robertc@robertcollins.net-20070824021547-ov2abtu3buhgzsuz
Ensure mutter_callsite is not directly called on a lazy_load object, to make the stacklevel parameter work correctly.

Show diffs side-by-side

added added

removed removed

Lines of Context:
29
29
 
30
30
from bzrlib.lazy_import import lazy_import
31
31
lazy_import(globals(), """
32
 
from bzrlib.trace import mutter, mutter_callsite
 
32
from bzrlib import trace
 
33
from bzrlib.trace import mutter
33
34
""")
34
35
from bzrlib import debug, errors
35
36
 
323
324
            the most efficient order for the index.
324
325
        """
325
326
        if 'evil' in debug.debug_flags:
326
 
            mutter_callsite(2, "iter_all_entries scales with size of history.")
 
327
            trace.mutter_callsite(2,
 
328
                "iter_all_entries scales with size of history.")
327
329
        if self._nodes is None:
328
330
            self._buffer_all()
329
331
        if self.node_ref_lists:
613
615
            efficient order for the index (in this case dictionary hash order).
614
616
        """
615
617
        if 'evil' in debug.debug_flags:
616
 
            mutter_callsite(2, "iter_all_entries scales with size of history.")
 
618
            trace.mutter_callsite(2,
 
619
                "iter_all_entries scales with size of history.")
617
620
        if self.reference_lists:
618
621
            for key, (absent, references, value) in self._nodes.iteritems():
619
622
                if not absent: