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

  • Committer: Jelmer Vernooij
  • Date: 2017-06-10 00:17:06 UTC
  • mto: (6670.4.8 move-bzr)
  • mto: This revision was merged to the branch mainline in revision 6681.
  • Revision ID: jelmer@jelmer.uk-20170610001706-xn6jiuev350246mr
Rename a number of attributes from bzrdir to controldir.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_upgrade.py
46
46
        b.set_bound_location('file:///GH')
47
47
        b.set_push_location('file:///IJ')
48
48
        target = controldir.format_registry.make_bzrdir('dirstate-with-subtree')
49
 
        converter = b.bzrdir._format.get_converter(target)
50
 
        converter.convert(b.bzrdir, None)
 
49
        converter = b.controldir._format.get_converter(target)
 
50
        converter.convert(b.controldir, None)
51
51
        new_branch = branch.Branch.open(self.get_url('branch'))
52
52
        self.assertIs(new_branch.__class__, branch.BzrBranch6)
53
53
        self.assertEqual('CD', new_branch.last_revision())
57
57
        self.assertEqual('file:///IJ', branch_config.get('push_location'))
58
58
 
59
59
        b2 = self.make_branch('branch2', format='knit')
60
 
        converter = b2.bzrdir._format.get_converter(target)
61
 
        converter.convert(b2.bzrdir, None)
 
60
        converter = b2.controldir._format.get_converter(target)
 
61
        converter.convert(b2.controldir, None)
62
62
        b2 = branch.Branch.open(self.get_url('branch'))
63
63
        self.assertIs(b2.__class__, branch.BzrBranch6)
64
64
 
66
66
        b = self.make_branch('branch', format='1.9')
67
67
        target = controldir.format_registry.make_bzrdir('1.9')
68
68
        target.set_branch_format(branch.BzrBranchFormat8())
69
 
        converter = b.bzrdir._format.get_converter(target)
70
 
        converter.convert(b.bzrdir, None)
 
69
        converter = b.controldir._format.get_converter(target)
 
70
        converter.convert(b.controldir, None)
71
71
        b = branch.Branch.open(self.get_url('branch'))
72
72
        self.assertIs(b.__class__, branch.BzrBranch8)
73
73
        self.assertEqual({}, b._get_all_reference_info())
76
76
        # test that asking for an upgrade from knit to dirstate works.
77
77
        tree = self.make_branch_and_tree('tree', format='knit')
78
78
        target = controldir.format_registry.make_bzrdir('dirstate')
79
 
        converter = tree.bzrdir._format.get_converter(target)
80
 
        converter.convert(tree.bzrdir, None)
 
79
        converter = tree.controldir._format.get_converter(target)
 
80
        converter.convert(tree.controldir, None)
81
81
        new_tree = workingtree.WorkingTree.open('tree')
82
82
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
83
83
        self.assertEqual('null:', new_tree.last_revision())
89
89
        self.build_tree(['tree/file'])
90
90
        tree.add(['file'], ['file-id'])
91
91
        target = controldir.format_registry.make_bzrdir('dirstate')
92
 
        converter = tree.bzrdir._format.get_converter(target)
93
 
        converter.convert(tree.bzrdir, None)
 
92
        converter = tree.controldir._format.get_converter(target)
 
93
        converter.convert(tree.controldir, None)
94
94
        new_tree = workingtree.WorkingTree.open('tree')
95
95
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
96
96
        self.assertEqual('null:', new_tree.last_revision())
100
100
        tree = self.make_branch_and_tree('tree', format='knit')
101
101
        rev_id = tree.commit('first post')
102
102
        target = controldir.format_registry.make_bzrdir('dirstate')
103
 
        converter = tree.bzrdir._format.get_converter(target)
104
 
        converter.convert(tree.bzrdir, None)
 
103
        converter = tree.controldir._format.get_converter(target)
 
104
        converter.convert(tree.controldir, None)
105
105
        new_tree = workingtree.WorkingTree.open('tree')
106
106
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
107
107
        self.assertEqual(rev_id, new_tree.last_revision())
112
112
    def test_convert_knit_merges_dirstate(self):
113
113
        tree = self.make_branch_and_tree('tree', format='knit')
114
114
        rev_id = tree.commit('first post')
115
 
        merge_tree = tree.bzrdir.sprout('tree2').open_workingtree()
 
115
        merge_tree = tree.controldir.sprout('tree2').open_workingtree()
116
116
        rev_id2 = tree.commit('second post')
117
117
        rev_id3 = merge_tree.commit('second merge post')
118
118
        tree.merge_from_branch(merge_tree.branch)
119
119
        target = controldir.format_registry.make_bzrdir('dirstate')
120
 
        converter = tree.bzrdir._format.get_converter(target)
121
 
        converter.convert(tree.bzrdir, None)
 
120
        converter = tree.controldir._format.get_converter(target)
 
121
        converter.convert(tree.controldir, None)
122
122
        new_tree = workingtree.WorkingTree.open('tree')
123
123
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
124
124
        self.assertEqual(rev_id2, new_tree.last_revision())
135
135
 
136
136
    def make_standalone_branch(self):
137
137
        wt = self.make_branch_and_tree("branch1", format=self.from_format)
138
 
        return wt.bzrdir
 
138
        return wt.controldir
139
139
 
140
140
    def test_upgrade_standalone_branch(self):
141
141
        control = self.make_standalone_branch()
174
174
            format=self.from_format)
175
175
        b2 = controldir.ControlDir.create_branch_convenience("repo/branch2",
176
176
            format=self.from_format)
177
 
        return repo.bzrdir
 
177
        return repo.controldir
178
178
 
179
179
    def test_upgrade_repo_with_branches(self):
180
180
        control = self.make_repo_with_branches()