22
22
# TODO queue for upgrade:
23
23
# test the error message when upgrading an unknown BzrDir format.
29
25
from bzrlib import (
30
branch as _mod_branch,
39
from bzrlib.branch import Branch
40
from bzrlib.tests import TestCaseWithTransport
41
from bzrlib.upgrade import upgrade
44
class TestUpgrade(TestCaseWithTransport):
46
def test_upgrade_simple(self):
47
"""Upgrade simple v0.0.4 format to latest format"""
48
eq = self.assertEquals
49
self.build_tree_contents(_upgrade1_template)
51
control = bzrdir.BzrDir.open('.')
52
b = control.open_branch()
53
# tsk, peeking under the covers.
57
bzrdir.BzrDirFormat.get_default_format().__class__))
58
rh = b.revision_history()
60
['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
61
'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
62
rt = b.repository.revision_tree(rh[0])
63
foo_id = 'foo-20051004035605-91e788d1875603ae'
66
eq(rt.get_file_text(foo_id), 'initial contents\n')
69
rt = b.repository.revision_tree(rh[1])
72
eq(rt.get_file_text(foo_id), 'new contents\n')
75
# check a backup was made:
76
backup_dir = 'backup.bzr.~1~'
77
t = transport.get_transport(b.base)
79
t.stat(backup_dir + '/README')
80
t.stat(backup_dir + '/branch-format')
81
t.stat(backup_dir + '/revision-history')
82
t.stat(backup_dir + '/merged-patches')
83
t.stat(backup_dir + '/pending-merged-patches')
84
t.stat(backup_dir + '/pending-merges')
85
t.stat(backup_dir + '/branch-name')
86
t.stat(backup_dir + '/branch-lock')
87
t.stat(backup_dir + '/inventory')
88
t.stat(backup_dir + '/stat-cache')
89
t.stat(backup_dir + '/text-store')
90
t.stat(backup_dir + '/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
91
t.stat(backup_dir + '/text-store/foo-20051004035756-4081373d897c3453.gz')
92
t.stat(backup_dir + '/inventory-store/')
93
t.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
94
t.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
95
t.stat(backup_dir + '/revision-store/')
96
t.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
97
t.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
99
def test_upgrade_with_ghosts(self):
100
"""Upgrade v0.0.4 tree containing ghost references.
102
That is, some of the parents of revisions mentioned in the branch
103
aren't present in the branch's storage.
105
This shouldn't normally happen in branches created entirely in
106
bzr, but can happen in branches imported from baz and arch, or from
107
other systems, where the importer knows about a revision but not
109
eq = self.assertEquals
110
self.build_tree_contents(_ghost_template)
112
b = Branch.open(u'.')
113
revision_id = b.revision_history()[1]
114
rev = b.repository.get_revision(revision_id)
115
eq(len(rev.parent_ids), 2)
116
eq(rev.parent_ids[1], 'wibble@wobble-2')
118
def test_upgrade_makes_dir_weaves(self):
119
self.build_tree_contents(_upgrade_dir_template)
120
old_repodir = bzrlib.bzrdir.BzrDir.open_unsupported('.')
121
old_repo_format = old_repodir.open_repository()._format
123
# this is the path to the literal file. As format changes
124
# occur it needs to be updated. FIXME: ask the store for the
126
repo = bzrlib.repository.Repository.open('.')
127
# it should have changed the format
128
self.assertNotEqual(old_repo_format.__class__, repo._format.__class__)
129
# and we should be able to read the names for the file id
130
# 'dir-20051005095101-da1441ea3fa6917a'
132
self.addCleanup(repo.unlock)
133
text_keys = repo.texts.keys()
134
dir_keys = [key for key in text_keys if key[0] ==
135
'dir-20051005095101-da1441ea3fa6917a']
136
self.assertNotEqual([], dir_keys)
138
def test_upgrade_to_meta_sets_workingtree_last_revision(self):
139
self.build_tree_contents(_upgrade_dir_template)
140
upgrade('.', bzrdir.BzrDirMetaFormat1())
141
tree = workingtree.WorkingTree.open('.')
142
self.assertEqual([tree.branch.revision_history()[-1]],
143
tree.get_parent_ids())
145
def test_upgrade_v6_to_meta_no_workingtree(self):
146
# Some format6 branches do not have checkout files. Upgrading
147
# such a branch to metadir must not setup a working tree.
148
self.build_tree_contents(_upgrade1_template)
149
upgrade('.', bzrdir.BzrDirFormat6())
150
t = transport.get_transport('.')
151
t.delete_multi(['.bzr/pending-merges', '.bzr/inventory'])
152
self.assertFalse(t.has('.bzr/stat-cache'))
153
# XXX: upgrade fails if a backup.bzr is already present
154
# -- David Allouche 2006-08-11
155
t.delete_tree('backup.bzr.~1~')
156
# At this point, we have a format6 branch without checkout files.
157
upgrade('.', bzrdir.BzrDirMetaFormat1())
158
# The upgrade should not have set up a working tree.
159
control = bzrdir.BzrDir.open('.')
160
self.assertFalse(control.has_workingtree())
161
# We have covered the scope of this test, we may as well check that
162
# upgrade has not eaten our data, even if it's a bit redundant with
164
self.failUnless(isinstance(control._format, bzrdir.BzrDirMetaFormat1))
165
branch = control.open_branch()
166
self.assertEquals(branch.revision_history(),
167
['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
168
'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
35
class TestUpgrade(tests.TestCaseWithTransport):
170
37
def test_upgrade_rich_root(self):
171
38
tree = self.make_branch_and_tree('tree', format='rich-root')
172
39
rev_id = tree.commit('first post')
40
upgrade.upgrade('tree')
175
42
def test_convert_branch5_branch6(self):
176
branch = self.make_branch('branch', format='knit')
177
branch.set_revision_history(['AB', 'CD'])
178
branch.set_parent('file:///EF')
179
branch.set_bound_location('file:///GH')
180
branch.set_push_location('file:///IJ')
181
target = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
182
converter = branch.bzrdir._format.get_converter(target)
183
converter.convert(branch.bzrdir, None)
184
new_branch = _mod_branch.Branch.open(self.get_url('branch'))
185
self.assertIs(new_branch.__class__, _mod_branch.BzrBranch6)
43
b = self.make_branch('branch', format='knit')
44
b._set_revision_history(['CD'])
45
b.set_parent('file:///EF')
46
b.set_bound_location('file:///GH')
47
b.set_push_location('file:///IJ')
48
target = controldir.format_registry.make_bzrdir('dirstate-with-subtree')
49
converter = b.bzrdir._format.get_converter(target)
50
converter.convert(b.bzrdir, None)
51
new_branch = branch.Branch.open(self.get_url('branch'))
52
self.assertIs(new_branch.__class__, branch.BzrBranch6)
186
53
self.assertEqual('CD', new_branch.last_revision())
187
54
self.assertEqual('file:///EF', new_branch.get_parent())
188
55
self.assertEqual('file:///GH', new_branch.get_bound_location())
189
branch_config = new_branch.get_config()._get_branch_data_config()
190
self.assertEqual('file:///IJ',
191
branch_config.get_user_option('push_location'))
56
branch_config = new_branch.get_config_stack()
57
self.assertEqual('file:///IJ', branch_config.get('push_location'))
193
branch2 = self.make_branch('branch2', format='knit')
194
converter = branch2.bzrdir._format.get_converter(target)
195
converter.convert(branch2.bzrdir, None)
196
branch2 = _mod_branch.Branch.open(self.get_url('branch'))
197
self.assertIs(branch2.__class__, _mod_branch.BzrBranch6)
59
b2 = self.make_branch('branch2', format='knit')
60
converter = b2.bzrdir._format.get_converter(target)
61
converter.convert(b2.bzrdir, None)
62
b2 = branch.Branch.open(self.get_url('branch'))
63
self.assertIs(b2.__class__, branch.BzrBranch6)
199
65
def test_convert_branch7_branch8(self):
200
branch = self.make_branch('branch', format='1.9')
201
target = bzrdir.format_registry.make_bzrdir('1.9')
202
target.set_branch_format(_mod_branch.BzrBranchFormat8())
203
converter = branch.bzrdir._format.get_converter(target)
204
converter.convert(branch.bzrdir, None)
205
branch = _mod_branch.Branch.open(self.get_url('branch'))
206
self.assertIs(branch.__class__, _mod_branch.BzrBranch8)
207
self.assertEqual({}, branch._get_all_reference_info())
66
b = self.make_branch('branch', format='1.9')
67
target = controldir.format_registry.make_bzrdir('1.9')
68
target.set_branch_format(branch.BzrBranchFormat8())
69
converter = b.bzrdir._format.get_converter(target)
70
converter.convert(b.bzrdir, None)
71
b = branch.Branch.open(self.get_url('branch'))
72
self.assertIs(b.__class__, branch.BzrBranch8)
73
self.assertEqual({}, b._get_all_reference_info())
209
75
def test_convert_knit_dirstate_empty(self):
210
76
# test that asking for an upgrade from knit to dirstate works.
211
77
tree = self.make_branch_and_tree('tree', format='knit')
212
target = bzrdir.format_registry.make_bzrdir('dirstate')
78
target = controldir.format_registry.make_bzrdir('dirstate')
213
79
converter = tree.bzrdir._format.get_converter(target)
214
80
converter.convert(tree.bzrdir, None)
215
81
new_tree = workingtree.WorkingTree.open('tree')
259
125
self.assertEqual([rev_id2, rev_id3], new_tree.get_parent_ids())
260
126
for path in ['basis-inventory-cache', 'inventory', 'last-revision',
261
127
'pending-merges', 'stat-cache']:
262
self.failIfExists('tree/.bzr/checkout/' + path)
265
_upgrade1_template = \
267
('foo', 'new contents\n'),
270
'This is a Bazaar control directory.\n'
271
'Do not change any files in this directory.\n'
272
'See http://bazaar-vcs.org/ for more information about Bazaar.\n'),
273
('.bzr/branch-format', 'Bazaar-NG branch, format 0.0.4\n'),
274
('.bzr/revision-history',
275
'mbp@sourcefrog.net-20051004035611-176b16534b086b3c\n'
276
'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd\n'),
277
('.bzr/merged-patches', ''),
278
('.bzr/pending-merged-patches', ''),
279
('.bzr/branch-name', ''),
280
('.bzr/branch-lock', ''),
281
('.bzr/pending-merges', ''),
284
'<entry file_id="foo-20051004035605-91e788d1875603ae" kind="file" name="foo" />\n'
287
'### bzr hashcache v5\n'
288
'foo// be9f309239729f69a6309e970ef24941d31e042c 13 1128398176 1128398176 303464 770\n'),
289
('.bzr/text-store/',),
290
('.bzr/text-store/foo-20051004035611-1591048e9dc7c2d4.gz',
291
'\x1f\x8b\x08\x00[\xfdAC\x02\xff\xcb\xcc\xcb,\xc9L\xccQH\xce\xcf+I\xcd+)\xe6\x02\x00\xdd\xcc\xf90\x11\x00\x00\x00'),
292
('.bzr/text-store/foo-20051004035756-4081373d897c3453.gz',
293
'\x1f\x8b\x08\x00\xc4\xfdAC\x02\xff\xcbK-WH\xce\xcf+I\xcd+)\xe6\x02\x00g\xc3\xdf\xc9\r\x00\x00\x00'),
294
('.bzr/inventory-store/',),
295
('.bzr/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz',
296
'\x1f\x8b\x08\x00[\xfdAC\x02\xffm\x8f\xcd\n\xc20\x10\x84\xef>E\xc8\xbdt7?M\x02\xad\xaf"\xa1\x99`P[\xa8E\xacOo\x14\x05\x0f\xdef\xe1\xfbv\x98\xbeL7L\xeb\xbcl\xfb]_\xc3\xb2\x89\\\xce8\x944\xc8<\xcf\x8d"\xb2LdH\xdb\x8el\x13\x18\xce\xfb\xc4\xde\xd5SGHq*\xd3\x0b\xad\x8e\x14S\xbc\xe0\xadI\xb1\xe2\xbe\xfe}\xc2\xdc\xb0\rL\xc6#\xa4\xd1\x8d*\x99\x0f}=F\x1e$8G\x9d\xa0\x02\xa1rP9\x01c`FV\xda1qg\x98"\x02}\xa5\xf2\xa8\x95\xec\xa4h\xeb\x80\xf6g\xcd\x13\xb3\x01\xcc\x98\xda\x00\x00\x00'),
297
('.bzr/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz',
298
'\x1f\x8b\x08\x00\xc4\xfdAC\x02\xffm\x8f\xc1\n\xc20\x10D\xef~E\xc8\xbd\xb8\x9bM\x9a,\xb4\xfe\x8a\xc4f\x83Am\xa1\x16\xb1~\xbdQ\x14<x\x9b\x81y3LW\xc6\x9b\x8c\xcb4\xaf\xbbMW\xc5\xbc\xaa\\\xce\xb2/\xa9\xd7y\x9a\x1a\x03\xe0\x10\xc0\x02\xb9\x16\\\xc3(>\x84\x84\xc1WKQ\xb4:\x95\xf1\x15\xad\x8cVc\xbc\xc8\x1b\xd3j\x91\xfb\xf2\xaf\xa4r\x8d\x85\x80\xe4)\x05\xf6\x03YG\x9f\xf4\xf5\x18\xb1\xd7\x07\xe1L\xc0\x86\xd8\x1b\xce-\xc7\xb6:a\x0f\x92\x8de\x8b\x89P\xc0\x9a\xe1\x0b\x95G\x9d\xc4\xda\xb1\xad\x07\xb6?o\x9e\xb5\xff\xf0\xf9\xda\x00\x00\x00'),
299
('.bzr/revision-store/',),
300
('.bzr/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz',
301
'\x1f\x8b\x08\x00[\xfdAC\x02\xff\x9d\x8eKj\xc30\x14E\xe7^\x85\xd0 \xb3$\xefI\xd1\x8f\xd8\xa6\x1b(t\x07E?\xbb\x82H\n\xb2\x1ahW\xdfB1\x14:\xeb\xf4r\xee\xbdgl\xf1\x91\xb6T\x0b\xf15\xe7\xd4{l\x13}\xb6\xad\xa7B^j\xbd\x91\xc3\xad_\xb3\xbb?m\xf5\xbd\xf9\xb8\xb4\xba\x9eJ\xec\x87\xb5_)I\xe5\x11K\xaf\xed\xe35\x85\x89\xfe\xa5\x8e\x0c@ \xc0\x05\xb8\x90\x88GT\xd2\xa1\x14\xfc\xe2@K\xc7\xfd\xef\x85\xed\xcd\xe2D\x95\x8d\x1a\xa47<\x02c2\xb0 \xbc\xd0\x8ay\xa3\xbcp\x8a\x83\x12A3\xb7XJv\xef\x7f_\xf7\x94\xe3\xd6m\xbeO\x14\x91in4*<\x812\x88\xc60\xfc\x01>k\x89\x13\xe5\x12\x00\xe8<\x8c\xdf\x8d\xcd\xaeq\xb6!\x90\xa5\xd6\xf1\xbc\x07\xc3x\xde\x85\xe6\xe1\x0b\xc8\x8a\x98\x03T\x01\x00\x00'),
302
('.bzr/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz',
303
'\x1f\x8b\x08\x00\xc4\xfdAC\x02\xff\x9d\x90Kj\x031\x0c\x86\xf79\xc5\xe0Ev\xe9\xc8o\x9b\xcc\x84^\xa0\xd0\x1b\x14\xbf&5d\xec`\xbb\x81\xf6\xf45\x84\xa4\x81\xaeZ\xa1\x85\x84^\xdf\xaf\xa9\x84K\xac1\xa7\xc1\xe5u\x8d\xad\x852\xa3\x17SZL\xc3k\xce\xa7a{j\xfb\xd5\x9e\x9fk\xfe(.,%\x1f\x9fRh\xdbc\xdb\xa3!\xa6KH-\x97\xcf\xb7\xe8g\xf4\xbbkG\x008\x06`@\xb9\xe4bG(_\x88\x95\xde\xf9n\xca\xfb\xc7\r\xf5\xdd\xe0\x19\xa9\x85)\x81\xf5"\xbd\x04j\xb8\x02b\xa8W\\\x0b\xc9\x14\xf4\xbc\xbb\xd7\xd6H4\xdc\xb8\xff}\xba\xc55\xd4f\xd6\xf3\x8c0&\x8ajE\xa4x\xe2@\xa5\xa6\x9a\xf3k\xc3WNaFT\x00\x00:l\xa6>Q\xcd1\x1cjp9\xf9;\xc34\xde\n\x9b\xe9lJWT{t\',a\xf9\x0b\xae\xc0x\x87\xa5\xb0Xp\xca,(a\xa9{\xd0{}\xd4\x12\x04(\xc5\xbb$\xc5$V\xceaI\x19\x01\xa2\x1dh\xed\x82d\x8c.\xccr@\xc3\xd8Q\xc6\x1f\xaa\xf1\xb6\xe8\xb0\xf9\x06QR\r\xf9\xfc\x01\x00\x00')]
312
'This is a Bazaar control directory.\n'
313
'Do not change any files in this directory.\n'
314
'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
316
( './.bzr/branch-format',
317
'Bazaar-NG branch, format 0.0.4\n'
319
( './.bzr/branch-lock',
322
( './.bzr/branch-name',
325
( './.bzr/inventory',
327
'<entry file_id="foo-20051004104918-0379cb7c76354cde" kind="file" name="foo" />\n'
330
( './.bzr/merged-patches',
333
( './.bzr/pending-merged-patches',
336
( './.bzr/pending-merges',
339
( './.bzr/revision-history',
340
'mbp@sourcefrog.net-20051004104921-a98be2278dd30b7b\n'
341
'mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d\n'
343
( './.bzr/stat-cache',
344
'### bzr hashcache v5\n'
345
'foo// f572d396fae9206628714fb2ce00f72e94f2258f 6 1128422956 1128422956 306900 770\n'
347
( './.bzr/text-store/', ),
348
( './.bzr/text-store/foo-20051004104921-8de8118a71be45ba.gz',
349
'\x1f\x8b\x08\x081^BC\x00\x03foo-20051004104921-8de8118a71be45ba\x00\xcbH\xcd\xc9\xc9\xe7\x02\x00 0:6\x06\x00\x00\x00'
351
( './.bzr/inventory-store/', ),
352
( './.bzr/inventory-store/mbp@sourcefrog.net-20051004104921-a98be2278dd30b7b.gz',
353
'\x1f\x8b\x08\x081^BC\x00\x03mbp@sourcefrog.net-20051004104921-a98be2278dd30b7b\x00m\x8f\xcb\n'
354
'\xc20\x10E\xf7~E\xc8\xbe83\xcd\x13\xaa\xbf"yL0\xa8-\xd4"\xd6\xaf7\x8a\x82\x0bw\xb38\xe7\xde;C\x1do<.\xd3\xbc\xee7C;\xe6U\x94z\xe6C\xcd;Y\xa6\xa9#\x00\x8d\x00\n'
355
'Ayt\x1d\xf4\xd6\xa7h\x935\xbdV)\xb3\x14\xa7:\xbe\xd0\xe6H1\x86\x0b\xbf5)\x16\xbe/\x7fC\x08;\x97\xd9!\xba`1\xb2\xd21|\xe8\xeb1`\xe3\xb5\xa5\xdc{S\x02{\x02c\xc8YT%Rb\x80b\x89\xbd*D\xda\x95\xafT\x1f\xad\xd2H\xb1m\xfb\xb7?\xcf<\x01W}\xb5\x8b\xd9\x00\x00\x00'
357
( './.bzr/inventory-store/mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d.gz',
358
'\x1f\x8b\x08\x08A^BC\x00\x03mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d\x00m\x8f\xcb\n'
359
'\xc20\x10E\xf7~E\xc8\xbe83\xcd\x13\xaa\xbf"yL0\xa8-\xd4"\xd6\xaf7\x8a\x82\x0bw\xb38\xe7\xde;C\x1do<.\xd3\xbc\xee7C;\xe6U\x94z\xe6C\xcd;Y\xa6\xa9#\x00\x8d\x00\n'
360
'Ayt\x1d\xf4\xd6\xa7h\x935\xbdV)\xb3\x14\xa7:\xbe\xd0\xe6H1\x86\x0b\xbf5)\x16\xbe/\x7fC\x08;\x97\xd9!\xba`1\xb2\xd21|\xe8\xeb1`\xe3\xb5\xa5\xdc{S\x02{\x02c\xc8YT%Rb\x80b\x89\xbd*D\xda\x95\xafT\x1f\xad\xd2H\xb1m\xfb\xb7?\xcf<\x01W}\xb5\x8b\xd9\x00\x00\x00'
362
( './.bzr/revision-store/', ),
363
( './.bzr/revision-store/mbp@sourcefrog.net-20051004104921-a98be2278dd30b7b.gz',
364
'\x1f\x8b\x08\x081^BC\x00\x03mbp@sourcefrog.net-20051004104921-a98be2278dd30b7b\x00\x9d\x8eMj\xc30\x14\x84\xf7>\x85\xd0"\xbb$\xef\xc9\xb6,\x11\xdb\xf4\x02\x85\xde\xa0\xe8\xe7\xd9\x11\xc4R\x90\xd4@{\xfa\x06\x8a\xa1\xd0]\x97\x03\xdf\xcc|c\xa6G(!E\xe6\xd2\xb6\x85Z)O\xfc\xd5\xe4\x1a"{K\xe9\xc6\x0e\xb7z\xd9\xec\xfd\xa5\xa4\x8f\xech\xc9i=E\xaa\x87\xb5^8\x0b\xf1A\xb1\xa6\xfc\xf9\x1e\xfc\xc4\xffRG\x01\xd0#@\x87\xd0i\x81G\xa3\x95%!\x06\xe5}\x0bv\xb0\xbf\x17\xca\xd5\xe0\xc4-\xa0\xb1\x8b\xb6`\xc0I\xa4\xc5\xf4\x9el\xef\x95v [\x94\xcf\x8e\xd5\xcay\xe4l\xf7\xfe\xf7u\r'
365
'\x1b\x95j\xb6\xfb\xc4\x11\x85\xea\x84\xd0\x12O\x03t\x83D\xad\xc4\x0f\xf0\x95"M\xbc\x95\x00\xc0\xe7f|6\x8aYi^B.u<\xef\xb1\x19\xcf\xbb\xce\xdc|\x038=\xc7\xe6R\x01\x00\x00'
367
( './.bzr/revision-store/mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d.gz',
368
'\x1f\x8b\x08\x08A^BC\x00\x03mbp@sourcefrog.net-20051004104937-c9b7a7bfcc0bb22d\x00\x9d\x90\xc1j\xc30\x0c\x86\xef}\n'
369
"\xe3Coie'\xb1c\x9a\x94\xbe\xc0`o0,[N\x03M\\\x1c\xafe{\xfae\x94n\x85\xc1`;Y\x88O\xd2\xff\xb9Mt\x19\xe6!N\xcc\xc5q\x1cr\xa6\xd4\xf1'\x9b\xf20\xb1\xe7\x18Ol}\xca\xbb\x11\xcf\x879\xbe&G!\xc5~3Q^\xf7y\xc7\xd90]h\xca1\xbd\xbd\x0c\xbe\xe3?\xa9B\x02\xd4\x02\xa0\x12P\x99R\x17\xce\xa0\xb6\x1a\x83s\x80(\xa5\x7f\xdc0\x1f\xad\xe88\x82\xb0\x18\x0c\x82\x05\xa7\x04\x05[{\xc2\xda7\xc6\x81*\x85B\x8dh\x1a\xe7\x05g\xf7\xdc\xff>\x9d\x87\x91\xe6l\xc7s\xc7\x85\x90M%\xa5\xd1z#\x85\xa8\x9b\x1a\xaa\xfa\x06\xbc\xc7\x89:^*\x00\xe0\xfbU\xbbL\xcc\xb6\xa7\xfdH\xa9'\x16\x03\xeb\x8fq\xce\xed\xf6\xde_\xb5g\x9b\x16\xa1y\xa9\xbe\x02&\n"
370
'\x7fJ+EaM\x83$\xa5n\xbc/a\x91~\xd0\xbd\xfd\x135\n'
371
'\xd0\x9a`\x0c*W\x1aR\xc1\x94du\x08(\t\xb0\x91\xdeZ\xa3\x9cU\x9cm\x7f\x8dr\x1d\x10Ot\xb8\xc6\xcf\xa7\x907|\xfb-\xb1\xbd\xd3\xfb\xd5\x07\xeeD\xee\x08*\x02\x00\x00'
375
_upgrade_dir_template = [
378
'This is a Bazaar control directory.\n'
379
'Do not change any files in this directory.\n'
380
'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
382
( './.bzr/branch-format',
383
'Bazaar-NG branch, format 0.0.4\n'
385
( './.bzr/branch-lock',
388
( './.bzr/branch-name',
391
( './.bzr/inventory',
393
'<entry file_id="dir-20051005095101-da1441ea3fa6917a" kind="directory" name="dir" />\n'
396
( './.bzr/merged-patches',
399
( './.bzr/pending-merged-patches',
402
( './.bzr/pending-merges',
405
( './.bzr/revision-history',
406
'robertc@robertcollins.net-20051005095108-6065fbd8e7d8617e\n'
408
( './.bzr/stat-cache',
409
'### bzr hashcache v5\n'
411
( './.bzr/text-store/', ),
412
( './.bzr/inventory-store/', ),
413
( './.bzr/inventory-store/robertc@robertcollins.net-20051005095108-6065fbd8e7d8617e.gz',
414
'\x1f\x8b\x08\x00\x0c\xa2CC\x02\xff\xb3\xc9\xcc+K\xcd+\xc9/\xaa\xb4\xe3\xb2\x012\x8a*\x15\xd22sR\xe33Sl\x95R2\x8bt\x8d\x0c\x0cL\r'
415
"\x81\xd8\xc0\x12H\x19\xea\xa6$\x1a\x9a\x98\x18\xa6&\x1a\xa7%\x9aY\x1a\x9a'*)dg\xe6A\x94\xa6&\x83LQR\xc8K\xccM\x05\x0b()\xe8\x03\xcd\xd4G\xb2\x00\x00\xc2<\x94\xb1m\x00\x00\x00"
417
( './.bzr/revision-store/', ),
418
( './.bzr/revision-store/robertc@robertcollins.net-20051005095108-6065fbd8e7d8617e.gz',
419
'\x1f\x8b\x08\x00\x0c\xa2CC\x02\xff\xa5OKj\xc30\x14\xdc\xfb\x14B\x8b\xec\x92<I\xd6\xc7\xc42\x85\xde\xa0\x17(\xb6\xf4\x9c\n'
420
'l\xa9H"\x90\x9c\xbe\xa6\xa9\xa1\x9b\xae\xbax\x0c\xcc\xe71\xd3g\xbc\x85\x12R$.\xadk\xa8\x15\xb3\xa5oi\xc2\\\xc9kZ\x96\x10\x0b9,\xf5\x92\xbf)\xf7\xf2\x83O\xe5\x14\xb1\x1e\xae\xf5BI\x887\x8c5\xe5\xfb{\xf0\x96\xfei>r\x00\xc9\xb6\x83n\x03sT\xa0\xe4<y\x83\xda\x1b\xc54\xfe~T>Ff\xe9\xcc:\xdd\x8e\xa6E\xc7@\xa2\x82I\xaaNL\xbas\\313)\x00\xb9\xe6\xe0(\xd9\x87\xfc\xb7A\r'
421
"+\x96:\xae\x9f\x962\xc6\x8d\x04i\x949\x01\x97R\xb7\x1d\x17O\xc3#E\xb4T(\x00\xa0C\xd3o\x892^q\x18\xbd'>\xe4\xfe\xbc\x13M\x7f\xde{\r"
422
'\xcd\x17\x85\xea\xba\x03l\x01\x00\x00'
128
self.assertPathDoesNotExist('tree/.bzr/checkout/' + path)
131
class TestSmartUpgrade(tests.TestCaseWithTransport):
133
from_format = controldir.format_registry.make_bzrdir("pack-0.92")
134
to_format = controldir.format_registry.make_bzrdir("2a")
136
def make_standalone_branch(self):
137
wt = self.make_branch_and_tree("branch1", format=self.from_format)
140
def test_upgrade_standalone_branch(self):
141
control = self.make_standalone_branch()
142
tried, worked, issues = upgrade.smart_upgrade(
143
[control], format=self.to_format)
144
self.assertLength(1, tried)
145
self.assertEqual(tried[0], control)
146
self.assertLength(1, worked)
147
self.assertEqual(worked[0], control)
148
self.assertLength(0, issues)
149
self.assertPathExists('branch1/backup.bzr.~1~')
150
self.assertEqual(control.open_repository()._format,
151
self.to_format._repository_format)
153
def test_upgrade_standalone_branch_cleanup(self):
154
control = self.make_standalone_branch()
155
tried, worked, issues = upgrade.smart_upgrade(
156
[control], format=self.to_format, clean_up=True)
157
self.assertLength(1, tried)
158
self.assertEqual(tried[0], control)
159
self.assertLength(1, worked)
160
self.assertEqual(worked[0], control)
161
self.assertLength(0, issues)
162
self.assertPathExists('branch1')
163
self.assertPathExists('branch1/.bzr')
164
self.assertPathDoesNotExist('branch1/backup.bzr.~1~')
165
self.assertEqual(control.open_repository()._format,
166
self.to_format._repository_format)
168
def make_repo_with_branches(self):
169
repo = self.make_repository('repo', shared=True,
170
format=self.from_format)
171
# Note: self.make_branch() always creates a new repo at the location
172
# so we need to avoid using that here ...
173
b1 = controldir.ControlDir.create_branch_convenience("repo/branch1",
174
format=self.from_format)
175
b2 = controldir.ControlDir.create_branch_convenience("repo/branch2",
176
format=self.from_format)
179
def test_upgrade_repo_with_branches(self):
180
control = self.make_repo_with_branches()
181
tried, worked, issues = upgrade.smart_upgrade(
182
[control], format=self.to_format)
183
self.assertLength(3, tried)
184
self.assertEqual(tried[0], control)
185
self.assertLength(3, worked)
186
self.assertEqual(worked[0], control)
187
self.assertLength(0, issues)
188
self.assertPathExists('repo/backup.bzr.~1~')
189
self.assertPathExists('repo/branch1/backup.bzr.~1~')
190
self.assertPathExists('repo/branch2/backup.bzr.~1~')
191
self.assertEqual(control.open_repository()._format,
192
self.to_format._repository_format)
193
b1 = branch.Branch.open('repo/branch1')
194
self.assertEqual(b1._format, self.to_format._branch_format)
196
def test_upgrade_repo_with_branches_cleanup(self):
197
control = self.make_repo_with_branches()
198
tried, worked, issues = upgrade.smart_upgrade(
199
[control], format=self.to_format, clean_up=True)
200
self.assertLength(3, tried)
201
self.assertEqual(tried[0], control)
202
self.assertLength(3, worked)
203
self.assertEqual(worked[0], control)
204
self.assertLength(0, issues)
205
self.assertPathExists('repo')
206
self.assertPathExists('repo/.bzr')
207
self.assertPathDoesNotExist('repo/backup.bzr.~1~')
208
self.assertPathDoesNotExist('repo/branch1/backup.bzr.~1~')
209
self.assertPathDoesNotExist('repo/branch2/backup.bzr.~1~')
210
self.assertEqual(control.open_repository()._format,
211
self.to_format._repository_format)
212
b1 = branch.Branch.open('repo/branch1')
213
self.assertEqual(b1._format, self.to_format._branch_format)
added
removed
bzrlib/tests/test_upgrade.py
