/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/tests/test_bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2017-06-08 23:30:31 UTC
  • mto: This revision was merged to the branch mainline in revision 6690.
  • Revision ID: jelmer@jelmer.uk-20170608233031-3qavls2o7a1pqllj
Update imports.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_bzrdir.py
25
25
 
26
26
from .. import (
27
27
    branch,
28
 
    bzrbranch,
29
 
    bzrdir,
30
28
    config,
31
29
    controldir,
32
30
    errors,
39
37
    transport as _mod_transport,
40
38
    urlutils,
41
39
    win32utils,
 
40
    )
 
41
from ..bzr import (
 
42
    branch as bzrbranch,
 
43
    bzrdir,
42
44
    workingtree_3,
43
45
    workingtree_4,
44
46
    )
45
47
import breezy.branch
46
 
import breezy.bzrbranch
47
 
from ..branchfmt.fullhistory import BzrBranchFormat5
 
48
import breezy.bzr.branch
 
49
from ..bzr.fullhistory import BzrBranchFormat5
48
50
from ..errors import (
49
51
    NotBranchError,
50
52
    NoColocatedBranchSupport,
111
113
            'branch6',
112
114
            'breezy.repofmt.knitrepo.RepositoryFormatKnit3',
113
115
            'Experimental successor to knit.  Use at your own risk.',
114
 
            branch_format='breezy.bzrbranch.BzrBranchFormat6',
 
116
            branch_format='breezy.bzr.branch.BzrBranchFormat6',
115
117
            experimental=True)
116
118
        bzrdir.register_metadir(my_format_registry,
117
119
            'hidden format',
118
120
            'breezy.repofmt.knitrepo.RepositoryFormatKnit3',
119
121
            'Experimental successor to knit.  Use at your own risk.',
120
 
            branch_format='breezy.bzrbranch.BzrBranchFormat6', hidden=True)
 
122
            branch_format='breezy.bzr.branch.BzrBranchFormat6', hidden=True)
121
123
        my_format_registry.register('hiddendeprecated', DeprecatedBzrDirFormat,
122
124
            'Old format.  Slower and does not support things. ', hidden=True)
123
125
        my_format_registry.register_lazy('hiddenlazy', 'breezy.tests.test_bzrdir',
139
141
            knitrepo.RepositoryFormatKnit1)
140
142
        my_bzrdir = my_format_registry.make_bzrdir('branch6')
141
143
        self.assertIsInstance(my_bzrdir.get_branch_format(),
142
 
                              breezy.bzrbranch.BzrBranchFormat6)
 
144
                              breezy.bzr.branch.BzrBranchFormat6)
143
145
 
144
146
    def test_get_help(self):
145
147
        my_format_registry = self.make_format_registry()
510
512
        # Make stackable source branch with an unstackable repo format.
511
513
        source_bzrdir = self.make_bzrdir('source')
512
514
        knitpack_repo.RepositoryFormatKnitPack1().initialize(source_bzrdir)
513
 
        source_branch = breezy.bzrbranch.BzrBranchFormat7().initialize(
 
515
        source_branch = breezy.bzr.branch.BzrBranchFormat7().initialize(
514
516
            source_bzrdir)
515
517
        # Make a directory with a default stacking policy
516
518
        parent_bzrdir = self.make_bzrdir('parent')