/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/plugins/weave_fmt/workingtree.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-21 19:09:26 UTC
  • mfrom: (6622.1.36 breezy)
  • Revision ID: jelmer@jelmer.uk-20170521190926-5vtz8xaf0e9ylrpc
Merge rename to breezy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/weave_fmt/workingtree.py
20
20
 
21
21
from cStringIO import StringIO
22
22
 
23
 
from bzrlib import (
 
23
from breezy import (
24
24
    conflicts as _mod_conflicts,
25
25
    errors,
26
26
    inventory,
29
29
    transform,
30
30
    xml5,
31
31
    )
32
 
from bzrlib.decorators import needs_read_lock
33
 
from bzrlib.mutabletree import MutableTree
34
 
from bzrlib.transport.local import LocalTransport
35
 
from bzrlib.workingtree import (
 
32
from breezy.decorators import needs_read_lock
 
33
from breezy.mutabletree import MutableTree
 
34
from breezy.transport.local import LocalTransport
 
35
from breezy.workingtree import (
36
36
    WorkingTreeFormat,
37
37
    )
38
 
from bzrlib.workingtree_3 import (
 
38
from breezy.workingtree_3 import (
39
39
    PreDirStateWorkingTree,
40
40
    )
41
41
 
120
120
 
121
121
    def __init__(self):
122
122
        super(WorkingTreeFormat2, self).__init__()
123
 
        from bzrlib.plugins.weave_fmt.bzrdir import BzrDirFormat6
 
123
        from breezy.plugins.weave_fmt.bzrdir import BzrDirFormat6
124
124
        self._matchingbzrdir = BzrDirFormat6()
125
125
 
126
126
    def open(self, a_bzrdir, _found=False):