← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

  • Committer: Jelmer Vernooij
  • Date: 2011-04-05 01:12:15 UTC
  • mto: This revision was merged to the branch mainline in revision 5757.
  • Revision ID: jelmer@samba.org-20110405011215-8g6izwf3uz8v4174
Remove some unnecessary imports, clean up lazy imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/workingtree_4.py
31
31
import errno
32
32
import stat
33
33
 
34
 
import bzrlib
35
34
from bzrlib import (
36
35
    bzrdir,
37
36
    cache_utf8,
42
41
    osutils,
43
42
    revision as _mod_revision,
44
43
    revisiontree,
45
 
    trace,
46
44
    transform,
47
45
    views,
48
46
    )
49
 
import bzrlib.branch
50
 
import bzrlib.ui
51
47
""")
52
48
 
53
49
from bzrlib.decorators import needs_read_lock, needs_write_lock
62
58
    realpath,
63
59
    safe_unicode,
64
60
    )
65
 
from bzrlib.trace import mutter
 
61
from bzrlib.trace import mutter, mutter_callsite
66
62
from bzrlib.transport.local import LocalTransport
67
63
from bzrlib.tree import InterTree
68
64
from bzrlib.tree import Tree
393
389
    def _get_inventory(self):
394
390
        """Get the inventory for the tree. This is only valid within a lock."""
395
391
        if 'evil' in debug.debug_flags:
396
 
            trace.mutter_callsite(2,
 
392
            mutter_callsite(2,
397
393
                "accessing .inventory forces a size of tree translation.")
398
394
        if self._inventory is not None:
399
395
            return self._inventory