/breezy/unstable

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy/unstable

« back to all changes in this revision

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

  • Committer: Jelmer Vernooij
  • Date: 2017-05-24 01:39:33 UTC
  • mfrom: (3815.3776.6)
  • Revision ID: jelmer@jelmer.uk-20170524013933-ir4y4tqtrsiz2ka2
New upstream snapshot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
 
19
19
from __future__ import absolute_import
20
20
 
21
 
from cStringIO import StringIO
22
 
 
23
 
from bzrlib import (
 
21
from ... import (
24
22
    conflicts as _mod_conflicts,
25
23
    errors,
26
24
    inventory,
29
27
    transform,
30
28
    xml5,
31
29
    )
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 (
 
30
from ...decorators import needs_read_lock
 
31
from ...mutabletree import MutableTree
 
32
from ...sixish import (
 
33
    BytesIO,
 
34
    )
 
35
from ...transport.local import LocalTransport
 
36
from ...workingtree import (
36
37
    WorkingTreeFormat,
37
38
    )
38
 
from bzrlib.workingtree_3 import (
 
39
from ...workingtree_3 import (
39
40
    PreDirStateWorkingTree,
40
41
    )
41
42
 
73
74
        since BzrDirFormat6 and BzrDirFormat5 cannot represent dirs with
74
75
        no working tree.  (See bug #43064).
75
76
        """
76
 
        sio = StringIO()
 
77
        sio = BytesIO()
77
78
        inv = inventory.Inventory()
78
79
        xml5.serializer_v5.write_inventory(inv, sio, working=True)
79
80
        sio.seek(0)
120
121
 
121
122
    def __init__(self):
122
123
        super(WorkingTreeFormat2, self).__init__()
123
 
        from bzrlib.plugins.weave_fmt.bzrdir import BzrDirFormat6
 
124
        from breezy.plugins.weave_fmt.bzrdir import BzrDirFormat6
124
125
        self._matchingbzrdir = BzrDirFormat6()
125
126
 
126
127
    def open(self, a_bzrdir, _found=False):