← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/workingtree_4.py

(jelmer) Move VersionedFile-specific reconcile tests to
 bzrlib.tests.per_repository_vf. (Jelmer Vernooij)

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
34
35
from bzrlib import (
35
36
    bzrdir,
36
37
    cache_utf8,
45
46
    transform,
46
47
    views,
47
48
    )
 
49
import bzrlib.branch
 
50
import bzrlib.ui
48
51
""")
49
52
 
50
53
from bzrlib.decorators import needs_read_lock, needs_write_lock
59
62
    realpath,
60
63
    safe_unicode,
61
64
    )
 
65
from bzrlib.trace import mutter
62
66
from bzrlib.transport.local import LocalTransport
63
67
from bzrlib.tree import InterTree
64
68
from bzrlib.tree import Tree
81
85
        self._format = _format
82
86
        self.bzrdir = _bzrdir
83
87
        basedir = safe_unicode(basedir)
84
 
        trace.mutter("opening working tree %r", basedir)
 
88
        mutter("opening working tree %r", basedir)
85
89
        self._branch = branch
86
90
        self.basedir = realpath(basedir)
87
91
        # if branch is at our basedir and is a format 6 or less