/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/branch.py

  • Committer: Jelmer Vernooij
  • Date: 2017-05-22 00:56:52 UTC
  • mfrom: (6621.2.26 py3_pokes)
  • Revision ID: jelmer@jelmer.uk-20170522005652-yjahcr9hwmjkno7n
Merge Python3 porting work ('py3 pokes')

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/weave_fmt/branch.py
18
18
 
19
19
from __future__ import absolute_import
20
20
 
21
 
from breezy import (
 
21
from ... import (
22
22
    errors,
23
23
    lockable_files,
24
24
    )
25
25
 
26
 
from breezy.decorators import (
 
26
from ...decorators import (
27
27
    needs_read_lock,
28
28
    needs_write_lock,
29
29
    only_raises,
30
30
    )
31
 
from breezy.lock import LogicalLockResult
32
 
from breezy.trace import mutter
 
31
from ...lock import LogicalLockResult
 
32
from ...trace import mutter
33
33
 
34
 
from breezy.branch import (
 
34
from ...branch import (
35
35
    BranchFormat,
36
36
    BranchWriteLockResult,
37
37
    )
38
 
from breezy.branchfmt.fullhistory import (
 
38
from ...branchfmt.fullhistory import (
39
39
    FullHistoryBzrBranch,
40
40
    )
41
41
 
95
95
    def _get_checkout_format(self, lightweight=False):
96
96
        """Return the most suitable metadir for a checkout of this branch.
97
97
        """
98
 
        from breezy.plugins.weave_fmt.repository import RepositoryFormat7
99
 
        from breezy.bzrdir import BzrDirMetaFormat1
 
98
        from .repository import RepositoryFormat7
 
99
        from ...bzrdir import BzrDirMetaFormat1
100
100
        format = BzrDirMetaFormat1()
101
101
        if lightweight:
102
102
            format.set_branch_format(self._format)
179
179
 
180
180
    def __init__(self):
181
181
        super(BzrBranchFormat4, self).__init__()
182
 
        from breezy.plugins.weave_fmt.bzrdir import (
 
182
        from .bzrdir import (
183
183
            BzrDirFormat4, BzrDirFormat5, BzrDirFormat6,
184
184
            )
185
185
        self._matchingbzrdir = BzrDirFormat6()