19
19
This file contains canned versions of some old trees, which are instantiated
20
20
and then upgraded to the new format."""
22
# TODO queue for upgrade:
23
# test the error message when upgrading an unknown BzrDir format.
30
branch as _mod_branch,
26
from bzrlib.selftest import TestCase, TestCaseInTempDir
38
27
from bzrlib.branch import Branch
39
from bzrlib.tests import TestCaseWithTransport
40
from bzrlib.transport import get_transport
28
from bzrlib.revision import is_ancestor
41
29
from bzrlib.upgrade import upgrade
44
class TestUpgrade(TestCaseWithTransport):
30
from bzrlib.selftest.treeshape import build_tree_contents
33
class TestUpgrade(TestCaseInTempDir):
46
35
def test_build_tree(self):
47
36
"""Test tree-building test helper"""
48
self.build_tree_contents(_upgrade1_template)
37
build_tree_contents(_upgrade1_template)
49
38
self.failUnlessExists('foo')
50
39
self.failUnlessExists('.bzr/README')
52
41
def test_upgrade_simple(self):
53
"""Upgrade simple v0.0.4 format to latest format"""
42
"""Upgrade simple v0.0.4 format to v6"""
54
43
eq = self.assertEquals
55
self.build_tree_contents(_upgrade1_template)
57
control = bzrdir.BzrDir.open('.')
58
b = control.open_branch()
59
# tsk, peeking under the covers.
63
bzrdir.BzrDirFormat.get_default_format().__class__))
44
build_tree_contents(_upgrade1_template)
47
eq(b._branch_format, 6)
64
48
rh = b.revision_history()
66
50
['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
67
51
'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
68
rt = b.repository.revision_tree(rh[0])
52
t = b.revision_tree(rh[0])
69
53
foo_id = 'foo-20051004035605-91e788d1875603ae'
72
eq(rt.get_file_text(foo_id), 'initial contents\n')
75
rt = b.repository.revision_tree(rh[1])
78
eq(rt.get_file_text(foo_id), 'new contents\n')
81
# check a backup was made:
82
transport = get_transport(b.base)
83
transport.stat('backup.bzr')
84
transport.stat('backup.bzr/README')
85
transport.stat('backup.bzr/branch-format')
86
transport.stat('backup.bzr/revision-history')
87
transport.stat('backup.bzr/merged-patches')
88
transport.stat('backup.bzr/pending-merged-patches')
89
transport.stat('backup.bzr/pending-merges')
90
transport.stat('backup.bzr/branch-name')
91
transport.stat('backup.bzr/branch-lock')
92
transport.stat('backup.bzr/inventory')
93
transport.stat('backup.bzr/stat-cache')
94
transport.stat('backup.bzr/text-store')
95
transport.stat('backup.bzr/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
96
transport.stat('backup.bzr/text-store/foo-20051004035756-4081373d897c3453.gz')
97
transport.stat('backup.bzr/inventory-store/')
98
transport.stat('backup.bzr/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
99
transport.stat('backup.bzr/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
100
transport.stat('backup.bzr/revision-store/')
101
transport.stat('backup.bzr/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
102
transport.stat('backup.bzr/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
54
eq(t.get_file_text(foo_id), 'initial contents\n')
55
t = b.revision_tree(rh[1])
56
eq(t.get_file_text(foo_id), 'new contents\n')
104
58
def test_upgrade_with_ghosts(self):
105
59
"""Upgrade v0.0.4 tree containing ghost references.
107
61
That is, some of the parents of revisions mentioned in the branch
108
aren't present in the branch's storage.
62
aren't present in the branches storage.
110
64
This shouldn't normally happen in branches created entirely in
111
bzr, but can happen in branches imported from baz and arch, or from
112
other systems, where the importer knows about a revision but not
65
bzr but can happen in imports from baz and arch, or from other
66
systems, where the importer knows about a revision but not
114
68
eq = self.assertEquals
115
self.build_tree_contents(_ghost_template)
117
b = Branch.open(u'.')
69
build_tree_contents(_ghost_template)
118
72
revision_id = b.revision_history()[1]
119
rev = b.repository.get_revision(revision_id)
73
rev = b.get_revision(revision_id)
120
74
eq(len(rev.parent_ids), 2)
121
75
eq(rev.parent_ids[1], 'wibble@wobble-2')
123
77
def test_upgrade_makes_dir_weaves(self):
124
self.build_tree_contents(_upgrade_dir_template)
125
old_repodir = bzrlib.bzrdir.BzrDir.open_unsupported('.')
126
old_repo_format = old_repodir.open_repository()._format
78
build_tree_contents(_upgrade_dir_template)
128
80
# this is the path to the literal file. As format changes
129
81
# occur it needs to be updated. FIXME: ask the store for the
131
repo = bzrlib.repository.Repository.open('.')
132
# it should have changed the format
133
self.assertNotEqual(old_repo_format.__class__, repo._format.__class__)
134
# and we should be able to read the names for the file id
135
# 'dir-20051005095101-da1441ea3fa6917a'
137
self.addCleanup(repo.unlock)
140
repo.weave_store.get_weave(
141
'dir-20051005095101-da1441ea3fa6917a',
142
repo.get_transaction()).versions())
144
def test_upgrade_to_meta_sets_workingtree_last_revision(self):
145
self.build_tree_contents(_upgrade_dir_template)
146
upgrade('.', bzrdir.BzrDirMetaFormat1())
147
tree = workingtree.WorkingTree.open('.')
148
self.assertEqual([tree.branch.revision_history()[-1]],
149
tree.get_parent_ids())
151
def test_upgrade_v6_to_meta_no_workingtree(self):
152
# Some format6 branches do not have checkout files. Upgrading
153
# such a branch to metadir must not setup a working tree.
154
self.build_tree_contents(_upgrade1_template)
155
upgrade('.', bzrdir.BzrDirFormat6())
156
transport = get_transport('.')
157
transport.delete_multi(['.bzr/pending-merges', '.bzr/inventory'])
158
assert not transport.has('.bzr/stat-cache')
159
# XXX: upgrade fails if a backup.bzr is already present
160
# -- David Allouche 2006-08-11
161
transport.delete_tree('backup.bzr')
162
# At this point, we have a format6 branch without checkout files.
163
upgrade('.', bzrdir.BzrDirMetaFormat1())
164
# The upgrade should not have set up a working tree.
165
control = bzrdir.BzrDir.open('.')
166
self.assertFalse(control.has_workingtree())
167
# We have covered the scope of this test, we may as well check that
168
# upgrade has not eaten our data, even if it's a bit redundant with
170
self.failUnless(isinstance(control._format, bzrdir.BzrDirMetaFormat1))
171
branch = control.open_branch()
172
self.assertEquals(branch.revision_history(),
173
['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
174
'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
176
def test_convert_branch5_branch6(self):
177
branch = self.make_branch('branch', format='knit')
178
branch.set_revision_history(['AB', 'CD'])
179
branch.set_parent('file:///EF')
180
branch.set_bound_location('file:///GH')
181
branch.set_push_location('file:///IJ')
182
target = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
183
converter = branch.bzrdir._format.get_converter(target)
184
converter.convert(branch.bzrdir, progress.DummyProgress())
185
new_branch = _mod_branch.Branch.open(self.get_url('branch'))
186
self.assertIs(new_branch.__class__, _mod_branch.BzrBranch6)
187
self.assertEqual('CD', new_branch.last_revision())
188
self.assertEqual('file:///EF', new_branch.get_parent())
189
self.assertEqual('file:///GH', new_branch.get_bound_location())
190
branch_config = new_branch.get_config()._get_branch_data_config()
191
self.assertEqual('file:///IJ',
192
branch_config.get_user_option('push_location'))
194
branch2 = self.make_branch('branch2', format='knit')
195
converter = branch2.bzrdir._format.get_converter(target)
196
converter.convert(branch2.bzrdir, progress.DummyProgress())
197
branch2 = _mod_branch.Branch.open(self.get_url('branch'))
198
self.assertIs(branch2.__class__, _mod_branch.BzrBranch6)
200
def test_convert_knit_dirstate_empty(self):
201
# test that asking for an upgrade from knit to dirstate works.
202
tree = self.make_branch_and_tree('tree', format='knit')
203
target = bzrdir.format_registry.make_bzrdir('dirstate')
204
converter = tree.bzrdir._format.get_converter(target)
205
converter.convert(tree.bzrdir, progress.DummyProgress())
206
new_tree = workingtree.WorkingTree.open('tree')
207
self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
208
self.assertEqual('null:', new_tree.last_revision())
210
def test_convert_knit_dirstate_content(self):
211
# smoke test for dirstate conversion: we call dirstate primitives,
212
# and its there that the core logic is tested.
213
tree = self.make_branch_and_tree('tree', format='knit')
214
self.build_tree(['tree/file'])
215
tree.add(['file'], ['file-id'])
216
target = bzrdir.format_registry.make_bzrdir('dirstate')
217
converter = tree.bzrdir._format.get_converter(target)
218
converter.convert(tree.bzrdir, progress.DummyProgress())
219
new_tree = workingtree.WorkingTree.open('tree')
220
self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
221
self.assertEqual('null:', new_tree.last_revision())
223
def test_convert_knit_one_parent_dirstate(self):
224
# test that asking for an upgrade from knit to dirstate works.
225
tree = self.make_branch_and_tree('tree', format='knit')
226
rev_id = tree.commit('first post')
227
target = bzrdir.format_registry.make_bzrdir('dirstate')
228
converter = tree.bzrdir._format.get_converter(target)
229
converter.convert(tree.bzrdir, progress.DummyProgress())
230
new_tree = workingtree.WorkingTree.open('tree')
231
self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
232
self.assertEqual(rev_id, new_tree.last_revision())
233
for path in ['basis-inventory-cache', 'inventory', 'last-revision',
234
'pending-merges', 'stat-cache']:
235
self.failIfExists('tree/.bzr/checkout/' + path)
237
def test_convert_knit_merges_dirstate(self):
238
tree = self.make_branch_and_tree('tree', format='knit')
239
rev_id = tree.commit('first post')
240
merge_tree = tree.bzrdir.sprout('tree2').open_workingtree()
241
rev_id2 = tree.commit('second post')
242
rev_id3 = merge_tree.commit('second merge post')
243
tree.merge_from_branch(merge_tree.branch)
244
target = bzrdir.format_registry.make_bzrdir('dirstate')
245
converter = tree.bzrdir._format.get_converter(target)
246
converter.convert(tree.bzrdir, progress.DummyProgress())
247
new_tree = workingtree.WorkingTree.open('tree')
248
self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
249
self.assertEqual(rev_id2, new_tree.last_revision())
250
self.assertEqual([rev_id2, rev_id3], new_tree.get_parent_ids())
251
for path in ['basis-inventory-cache', 'inventory', 'last-revision',
252
'pending-merges', 'stat-cache']:
253
self.failIfExists('tree/.bzr/checkout/' + path)
83
self.failUnlessExists(
84
'.bzr/weaves/de/dir-20051005095101-da1441ea3fa6917a.weave')
256
87
_upgrade1_template = \
added
removed
bzrlib/selftest/test_upgrade.py
