67
67
'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
68
68
rt = b.repository.revision_tree(rh[0])
69
69
foo_id = 'foo-20051004035605-91e788d1875603ae'
70
eq(rt.get_file_text(foo_id), 'initial contents\n')
72
eq(rt.get_file_text(foo_id), 'initial contents\n')
71
75
rt = b.repository.revision_tree(rh[1])
72
eq(rt.get_file_text(foo_id), 'new contents\n')
78
eq(rt.get_file_text(foo_id), 'new contents\n')
73
81
# check a backup was made:
74
82
transport = get_transport(b.base)
75
transport.stat('.bzr.backup')
76
transport.stat('.bzr.backup/README')
77
transport.stat('.bzr.backup/branch-format')
78
transport.stat('.bzr.backup/revision-history')
79
transport.stat('.bzr.backup/merged-patches')
80
transport.stat('.bzr.backup/pending-merged-patches')
81
transport.stat('.bzr.backup/pending-merges')
82
transport.stat('.bzr.backup/branch-name')
83
transport.stat('.bzr.backup/branch-lock')
84
transport.stat('.bzr.backup/inventory')
85
transport.stat('.bzr.backup/stat-cache')
86
transport.stat('.bzr.backup/text-store')
87
transport.stat('.bzr.backup/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
88
transport.stat('.bzr.backup/text-store/foo-20051004035756-4081373d897c3453.gz')
89
transport.stat('.bzr.backup/inventory-store/')
90
transport.stat('.bzr.backup/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
91
transport.stat('.bzr.backup/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
92
transport.stat('.bzr.backup/revision-store/')
93
transport.stat('.bzr.backup/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
94
transport.stat('.bzr.backup/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
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')
96
104
def test_upgrade_with_ghosts(self):
97
105
"""Upgrade v0.0.4 tree containing ghost references.
125
133
self.assertNotEqual(old_repo_format.__class__, repo._format.__class__)
126
134
# and we should be able to read the names for the file id
127
135
# 'dir-20051005095101-da1441ea3fa6917a'
130
repo.weave_store.get_weave(
131
'dir-20051005095101-da1441ea3fa6917a',
132
repo.get_transaction()))
137
self.addCleanup(repo.unlock)
138
text_keys = repo.texts.keys()
139
dir_keys = [key for key in text_keys if key[0] ==
140
'dir-20051005095101-da1441ea3fa6917a']
141
self.assertNotEqual([], dir_keys)
134
143
def test_upgrade_to_meta_sets_workingtree_last_revision(self):
135
144
self.build_tree_contents(_upgrade_dir_template)
145
154
upgrade('.', bzrdir.BzrDirFormat6())
146
155
transport = get_transport('.')
147
156
transport.delete_multi(['.bzr/pending-merges', '.bzr/inventory'])
148
assert not transport.has('.bzr/stat-cache')
149
# XXX: upgrade fails if a .bzr.backup is already present
157
self.assertFalse(transport.has('.bzr/stat-cache'))
158
# XXX: upgrade fails if a backup.bzr is already present
150
159
# -- David Allouche 2006-08-11
151
transport.delete_tree('.bzr.backup')
160
transport.delete_tree('backup.bzr')
152
161
# At this point, we have a format6 branch without checkout files.
153
162
upgrade('.', bzrdir.BzrDirMetaFormat1())
154
163
# The upgrade should not have set up a working tree.
248
257
('foo', 'new contents\n'),
251
'This is a Bazaar-NG control directory.\nDo not change any files in this directory.\n'),
260
'This is a Bazaar control directory.\n'
261
'Do not change any files in this directory.\n'
262
'See http://bazaar-vcs.org/ for more information about Bazaar.\n'),
252
263
('.bzr/branch-format', 'Bazaar-NG branch, format 0.0.4\n'),
253
264
('.bzr/revision-history',
254
265
'mbp@sourcefrog.net-20051004035611-176b16534b086b3c\n'
353
365
_upgrade_dir_template = [
355
367
( './.bzr/README',
356
'This is a Bazaar-NG control directory.\n'
357
'Do not change any files in this directory.\n'
368
'This is a Bazaar control directory.\n'
369
'Do not change any files in this directory.\n'
370
'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
359
372
( './.bzr/branch-format',
360
373
'Bazaar-NG branch, format 0.0.4\n'