1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
|
# Copyright (C) 2005-2011 Canonical Ltd
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
"""Tests for upgrade of old trees.
This file contains canned versions of some old trees, which are instantiated
and then upgraded to the new format."""
# TODO queue for upgrade:
# test the error message when upgrading an unknown BzrDir format.
from bzrlib import (
branch,
controldir,
tests,
upgrade,
workingtree,
workingtree_4,
)
class TestUpgrade(tests.TestCaseWithTransport):
def test_upgrade_rich_root(self):
tree = self.make_branch_and_tree('tree', format='rich-root')
rev_id = tree.commit('first post')
upgrade.upgrade('tree')
def test_convert_branch5_branch6(self):
b = self.make_branch('branch', format='knit')
b._set_revision_history(['CD'])
b.set_parent('file:///EF')
b.set_bound_location('file:///GH')
b.set_push_location('file:///IJ')
target = controldir.format_registry.make_bzrdir('dirstate-with-subtree')
converter = b.bzrdir._format.get_converter(target)
converter.convert(b.bzrdir, None)
new_branch = branch.Branch.open(self.get_url('branch'))
self.assertIs(new_branch.__class__, branch.BzrBranch6)
self.assertEqual('CD', new_branch.last_revision())
self.assertEqual('file:///EF', new_branch.get_parent())
self.assertEqual('file:///GH', new_branch.get_bound_location())
branch_config = new_branch.get_config_stack()
self.assertEqual('file:///IJ', branch_config.get('push_location'))
b2 = self.make_branch('branch2', format='knit')
converter = b2.bzrdir._format.get_converter(target)
converter.convert(b2.bzrdir, None)
b2 = branch.Branch.open(self.get_url('branch'))
self.assertIs(b2.__class__, branch.BzrBranch6)
def test_convert_branch7_branch8(self):
b = self.make_branch('branch', format='1.9')
target = controldir.format_registry.make_bzrdir('1.9')
target.set_branch_format(branch.BzrBranchFormat8())
converter = b.bzrdir._format.get_converter(target)
converter.convert(b.bzrdir, None)
b = branch.Branch.open(self.get_url('branch'))
self.assertIs(b.__class__, branch.BzrBranch8)
self.assertEqual({}, b._get_all_reference_info())
def test_convert_knit_dirstate_empty(self):
# test that asking for an upgrade from knit to dirstate works.
tree = self.make_branch_and_tree('tree', format='knit')
target = controldir.format_registry.make_bzrdir('dirstate')
converter = tree.bzrdir._format.get_converter(target)
converter.convert(tree.bzrdir, None)
new_tree = workingtree.WorkingTree.open('tree')
self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
self.assertEqual('null:', new_tree.last_revision())
def test_convert_knit_dirstate_content(self):
# smoke test for dirstate conversion: we call dirstate primitives,
# and its there that the core logic is tested.
tree = self.make_branch_and_tree('tree', format='knit')
self.build_tree(['tree/file'])
tree.add(['file'], ['file-id'])
target = controldir.format_registry.make_bzrdir('dirstate')
converter = tree.bzrdir._format.get_converter(target)
converter.convert(tree.bzrdir, None)
new_tree = workingtree.WorkingTree.open('tree')
self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
self.assertEqual('null:', new_tree.last_revision())
def test_convert_knit_one_parent_dirstate(self):
# test that asking for an upgrade from knit to dirstate works.
tree = self.make_branch_and_tree('tree', format='knit')
rev_id = tree.commit('first post')
target = controldir.format_registry.make_bzrdir('dirstate')
converter = tree.bzrdir._format.get_converter(target)
converter.convert(tree.bzrdir, None)
new_tree = workingtree.WorkingTree.open('tree')
self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
self.assertEqual(rev_id, new_tree.last_revision())
for path in ['basis-inventory-cache', 'inventory', 'last-revision',
'pending-merges', 'stat-cache']:
self.assertPathDoesNotExist('tree/.bzr/checkout/' + path)
def test_convert_knit_merges_dirstate(self):
tree = self.make_branch_and_tree('tree', format='knit')
rev_id = tree.commit('first post')
merge_tree = tree.bzrdir.sprout('tree2').open_workingtree()
rev_id2 = tree.commit('second post')
rev_id3 = merge_tree.commit('second merge post')
tree.merge_from_branch(merge_tree.branch)
target = controldir.format_registry.make_bzrdir('dirstate')
converter = tree.bzrdir._format.get_converter(target)
converter.convert(tree.bzrdir, None)
new_tree = workingtree.WorkingTree.open('tree')
self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
self.assertEqual(rev_id2, new_tree.last_revision())
self.assertEqual([rev_id2, rev_id3], new_tree.get_parent_ids())
for path in ['basis-inventory-cache', 'inventory', 'last-revision',
'pending-merges', 'stat-cache']:
self.assertPathDoesNotExist('tree/.bzr/checkout/' + path)
class TestSmartUpgrade(tests.TestCaseWithTransport):
from_format = controldir.format_registry.make_bzrdir("pack-0.92")
to_format = controldir.format_registry.make_bzrdir("2a")
def make_standalone_branch(self):
wt = self.make_branch_and_tree("branch1", format=self.from_format)
return wt.bzrdir
def test_upgrade_standalone_branch(self):
control = self.make_standalone_branch()
tried, worked, issues = upgrade.smart_upgrade(
[control], format=self.to_format)
self.assertLength(1, tried)
self.assertEqual(tried[0], control)
self.assertLength(1, worked)
self.assertEqual(worked[0], control)
self.assertLength(0, issues)
self.assertPathExists('branch1/backup.bzr.~1~')
self.assertEqual(control.open_repository()._format,
self.to_format._repository_format)
def test_upgrade_standalone_branch_cleanup(self):
control = self.make_standalone_branch()
tried, worked, issues = upgrade.smart_upgrade(
[control], format=self.to_format, clean_up=True)
self.assertLength(1, tried)
self.assertEqual(tried[0], control)
self.assertLength(1, worked)
self.assertEqual(worked[0], control)
self.assertLength(0, issues)
self.assertPathExists('branch1')
self.assertPathExists('branch1/.bzr')
self.assertPathDoesNotExist('branch1/backup.bzr.~1~')
self.assertEqual(control.open_repository()._format,
self.to_format._repository_format)
def make_repo_with_branches(self):
repo = self.make_repository('repo', shared=True,
format=self.from_format)
# Note: self.make_branch() always creates a new repo at the location
# so we need to avoid using that here ...
b1 = controldir.ControlDir.create_branch_convenience("repo/branch1",
format=self.from_format)
b2 = controldir.ControlDir.create_branch_convenience("repo/branch2",
format=self.from_format)
return repo.bzrdir
def test_upgrade_repo_with_branches(self):
control = self.make_repo_with_branches()
tried, worked, issues = upgrade.smart_upgrade(
[control], format=self.to_format)
self.assertLength(3, tried)
self.assertEqual(tried[0], control)
self.assertLength(3, worked)
self.assertEqual(worked[0], control)
self.assertLength(0, issues)
self.assertPathExists('repo/backup.bzr.~1~')
self.assertPathExists('repo/branch1/backup.bzr.~1~')
self.assertPathExists('repo/branch2/backup.bzr.~1~')
self.assertEqual(control.open_repository()._format,
self.to_format._repository_format)
b1 = branch.Branch.open('repo/branch1')
self.assertEqual(b1._format, self.to_format._branch_format)
def test_upgrade_repo_with_branches_cleanup(self):
control = self.make_repo_with_branches()
tried, worked, issues = upgrade.smart_upgrade(
[control], format=self.to_format, clean_up=True)
self.assertLength(3, tried)
self.assertEqual(tried[0], control)
self.assertLength(3, worked)
self.assertEqual(worked[0], control)
self.assertLength(0, issues)
self.assertPathExists('repo')
self.assertPathExists('repo/.bzr')
self.assertPathDoesNotExist('repo/backup.bzr.~1~')
self.assertPathDoesNotExist('repo/branch1/backup.bzr.~1~')
self.assertPathDoesNotExist('repo/branch2/backup.bzr.~1~')
self.assertEqual(control.open_repository()._format,
self.to_format._repository_format)
b1 = branch.Branch.open('repo/branch1')
self.assertEqual(b1._format, self.to_format._branch_format)
|