← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_upgrade.py

  • Committer: Aaron Bentley
  • Date: 2007-06-06 01:28:18 UTC
  • mto: This revision was merged to the branch mainline in revision 2509.
  • Revision ID: aaron.bentley@utoronto.ca-20070606012818-ubf8cmaj1imntttb
Updates from review

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_upgrade.py
1
 
# Copyright (C) 2005-2010 Canonical Ltd
 
1
# Copyright (C) 2005 Canonical Ltd
2
2
#
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
15
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
16
16
 
17
17
"""Tests for upgrade of old trees.
18
18
 
19
 
This file contains canned versions of some old trees, which are instantiated
 
19
This file contains canned versions of some old trees, which are instantiated 
20
20
and then upgraded to the new format."""
21
21
 
22
22
# TODO queue for upgrade:
42
42
 
43
43
 
44
44
class TestUpgrade(TestCaseWithTransport):
45
 
 
 
45
    
46
46
    def test_build_tree(self):
47
47
        """Test tree-building test helper"""
48
48
        self.build_tree_contents(_upgrade1_template)
67
67
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
68
68
        rt = b.repository.revision_tree(rh[0])
69
69
        foo_id = 'foo-20051004035605-91e788d1875603ae'
70
 
        rt.lock_read()
71
 
        try:
72
 
            eq(rt.get_file_text(foo_id), 'initial contents\n')
73
 
        finally:
74
 
            rt.unlock()
 
70
        eq(rt.get_file_text(foo_id), 'initial contents\n')
75
71
        rt = b.repository.revision_tree(rh[1])
76
 
        rt.lock_read()
77
 
        try:
78
 
            eq(rt.get_file_text(foo_id), 'new contents\n')
79
 
        finally:
80
 
            rt.unlock()
 
72
        eq(rt.get_file_text(foo_id), 'new contents\n')
81
73
        # check a backup was made:
82
 
        backup_dir = 'backup.bzr.~1~'
83
74
        transport = get_transport(b.base)
84
 
        transport.stat(backup_dir)
85
 
        transport.stat(backup_dir + '/README')
86
 
        transport.stat(backup_dir + '/branch-format')
87
 
        transport.stat(backup_dir + '/revision-history')
88
 
        transport.stat(backup_dir + '/merged-patches')
89
 
        transport.stat(backup_dir + '/pending-merged-patches')
90
 
        transport.stat(backup_dir + '/pending-merges')
91
 
        transport.stat(backup_dir + '/branch-name')
92
 
        transport.stat(backup_dir + '/branch-lock')
93
 
        transport.stat(backup_dir + '/inventory')
94
 
        transport.stat(backup_dir + '/stat-cache')
95
 
        transport.stat(backup_dir + '/text-store')
96
 
        transport.stat(backup_dir + '/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
97
 
        transport.stat(backup_dir + '/text-store/foo-20051004035756-4081373d897c3453.gz')
98
 
        transport.stat(backup_dir + '/inventory-store/')
99
 
        transport.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
100
 
        transport.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
101
 
        transport.stat(backup_dir + '/revision-store/')
102
 
        transport.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
103
 
        transport.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
 
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')
104
95
 
105
96
    def test_upgrade_with_ghosts(self):
106
97
        """Upgrade v0.0.4 tree containing ghost references.
107
98
 
108
99
        That is, some of the parents of revisions mentioned in the branch
109
 
        aren't present in the branch's storage.
 
100
        aren't present in the branch's storage. 
110
101
 
111
 
        This shouldn't normally happen in branches created entirely in
 
102
        This shouldn't normally happen in branches created entirely in 
112
103
        bzr, but can happen in branches imported from baz and arch, or from
113
 
        other systems, where the importer knows about a revision but not
 
104
        other systems, where the importer knows about a revision but not 
114
105
        its contents."""
115
106
        eq = self.assertEquals
116
107
        self.build_tree_contents(_ghost_template)
126
117
        old_repodir = bzrlib.bzrdir.BzrDir.open_unsupported('.')
127
118
        old_repo_format = old_repodir.open_repository()._format
128
119
        upgrade('.')
129
 
        # this is the path to the literal file. As format changes
 
120
        # this is the path to the literal file. As format changes 
130
121
        # occur it needs to be updated. FIXME: ask the store for the
131
122
        # path.
132
123
        repo = bzrlib.repository.Repository.open('.')
133
124
        # it should have changed the format
134
125
        self.assertNotEqual(old_repo_format.__class__, repo._format.__class__)
135
 
        # and we should be able to read the names for the file id
 
126
        # and we should be able to read the names for the file id 
136
127
        # 'dir-20051005095101-da1441ea3fa6917a'
137
 
        repo.lock_read()
138
 
        self.addCleanup(repo.unlock)
139
 
        text_keys = repo.texts.keys()
140
 
        dir_keys = [key for key in text_keys if key[0] ==
141
 
                'dir-20051005095101-da1441ea3fa6917a']
142
 
        self.assertNotEqual([], dir_keys)
 
128
        self.assertNotEqual(
 
129
            [],
 
130
            repo.text_store.get_weave(
 
131
                'dir-20051005095101-da1441ea3fa6917a',
 
132
                repo.get_transaction()))
143
133
 
144
134
    def test_upgrade_to_meta_sets_workingtree_last_revision(self):
145
135
        self.build_tree_contents(_upgrade_dir_template)
155
145
        upgrade('.', bzrdir.BzrDirFormat6())
156
146
        transport = get_transport('.')
157
147
        transport.delete_multi(['.bzr/pending-merges', '.bzr/inventory'])
158
 
        self.assertFalse(transport.has('.bzr/stat-cache'))
159
 
        # XXX: upgrade fails if a backup.bzr is already present
 
148
        assert not transport.has('.bzr/stat-cache')
 
149
        # XXX: upgrade fails if a .bzr.backup is already present
160
150
        # -- David Allouche 2006-08-11
161
 
        transport.delete_tree('backup.bzr.~1~')
 
151
        transport.delete_tree('.bzr.backup')
162
152
        # At this point, we have a format6 branch without checkout files.
163
153
        upgrade('.', bzrdir.BzrDirMetaFormat1())
164
154
        # The upgrade should not have set up a working tree.
173
163
           ['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
174
164
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
175
165
 
176
 
    def test_upgrade_rich_root(self):
177
 
        tree = self.make_branch_and_tree('tree', format='rich-root')
178
 
        rev_id = tree.commit('first post')
179
 
        upgrade('tree')
180
 
 
181
166
    def test_convert_branch5_branch6(self):
182
167
        branch = self.make_branch('branch', format='knit')
183
168
        branch.set_revision_history(['AB', 'CD'])
186
171
        branch.set_push_location('file:///IJ')
187
172
        target = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
188
173
        converter = branch.bzrdir._format.get_converter(target)
189
 
        converter.convert(branch.bzrdir, None)
 
174
        converter.convert(branch.bzrdir, progress.DummyProgress())
190
175
        new_branch = _mod_branch.Branch.open(self.get_url('branch'))
191
176
        self.assertIs(new_branch.__class__, _mod_branch.BzrBranch6)
192
177
        self.assertEqual('CD', new_branch.last_revision())
198
183
 
199
184
        branch2 = self.make_branch('branch2', format='knit')
200
185
        converter = branch2.bzrdir._format.get_converter(target)
201
 
        converter.convert(branch2.bzrdir, None)
 
186
        converter.convert(branch2.bzrdir, progress.DummyProgress())
202
187
        branch2 = _mod_branch.Branch.open(self.get_url('branch'))
203
188
        self.assertIs(branch2.__class__, _mod_branch.BzrBranch6)
204
189
 
205
 
    def test_convert_branch7_branch8(self):
206
 
        branch = self.make_branch('branch', format='1.9')
207
 
        target = bzrdir.format_registry.make_bzrdir('1.9')
208
 
        target.set_branch_format(_mod_branch.BzrBranchFormat8())
209
 
        converter = branch.bzrdir._format.get_converter(target)
210
 
        converter.convert(branch.bzrdir, None)
211
 
        branch = _mod_branch.Branch.open(self.get_url('branch'))
212
 
        self.assertIs(branch.__class__, _mod_branch.BzrBranch8)
213
 
        self.assertEqual({}, branch._get_all_reference_info())
214
 
 
215
190
    def test_convert_knit_dirstate_empty(self):
216
191
        # test that asking for an upgrade from knit to dirstate works.
217
192
        tree = self.make_branch_and_tree('tree', format='knit')
218
193
        target = bzrdir.format_registry.make_bzrdir('dirstate')
219
194
        converter = tree.bzrdir._format.get_converter(target)
220
 
        converter.convert(tree.bzrdir, None)
 
195
        converter.convert(tree.bzrdir, progress.DummyProgress())
221
196
        new_tree = workingtree.WorkingTree.open('tree')
222
197
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
223
 
        self.assertEqual('null:', new_tree.last_revision())
 
198
        self.assertEqual(None, new_tree.last_revision())
224
199
 
225
200
    def test_convert_knit_dirstate_content(self):
226
201
        # smoke test for dirstate conversion: we call dirstate primitives,
230
205
        tree.add(['file'], ['file-id'])
231
206
        target = bzrdir.format_registry.make_bzrdir('dirstate')
232
207
        converter = tree.bzrdir._format.get_converter(target)
233
 
        converter.convert(tree.bzrdir, None)
 
208
        converter.convert(tree.bzrdir, progress.DummyProgress())
234
209
        new_tree = workingtree.WorkingTree.open('tree')
235
210
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
236
 
        self.assertEqual('null:', new_tree.last_revision())
 
211
        self.assertEqual(None, new_tree.last_revision())
237
212
 
238
213
    def test_convert_knit_one_parent_dirstate(self):
239
214
        # test that asking for an upgrade from knit to dirstate works.
241
216
        rev_id = tree.commit('first post')
242
217
        target = bzrdir.format_registry.make_bzrdir('dirstate')
243
218
        converter = tree.bzrdir._format.get_converter(target)
244
 
        converter.convert(tree.bzrdir, None)
 
219
        converter.convert(tree.bzrdir, progress.DummyProgress())
245
220
        new_tree = workingtree.WorkingTree.open('tree')
246
221
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
247
222
        self.assertEqual(rev_id, new_tree.last_revision())
258
233
        tree.merge_from_branch(merge_tree.branch)
259
234
        target = bzrdir.format_registry.make_bzrdir('dirstate')
260
235
        converter = tree.bzrdir._format.get_converter(target)
261
 
        converter.convert(tree.bzrdir, None)
 
236
        converter.convert(tree.bzrdir, progress.DummyProgress())
262
237
        new_tree = workingtree.WorkingTree.open('tree')
263
238
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
264
239
        self.assertEqual(rev_id2, new_tree.last_revision())
273
248
     ('foo', 'new contents\n'),
274
249
     ('.bzr/',),
275
250
     ('.bzr/README',
276
 
      'This is a Bazaar control directory.\n'
277
 
      'Do not change any files in this directory.\n'
278
 
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'),
 
251
      'This is a Bazaar-NG control directory.\nDo not change any files in this directory.\n'),
279
252
     ('.bzr/branch-format', 'Bazaar-NG branch, format 0.0.4\n'),
280
253
     ('.bzr/revision-history',
281
254
      'mbp@sourcefrog.net-20051004035611-176b16534b086b3c\n'
315
288
    ),
316
289
    ( './.bzr/', ),
317
290
    ( './.bzr/README',
318
 
      'This is a Bazaar control directory.\n'
319
 
      'Do not change any files in this directory.\n'
320
 
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
 
291
        'This is a Bazaar-NG control directory.\n'
 
292
        'Do not change any files in this directory.\n'
321
293
    ),
322
294
    ( './.bzr/branch-format',
323
295
        'Bazaar-NG branch, format 0.0.4\n'
381
353
_upgrade_dir_template = [
382
354
    ( './.bzr/', ),
383
355
    ( './.bzr/README',
384
 
      'This is a Bazaar control directory.\n'
385
 
      'Do not change any files in this directory.\n'
386
 
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
 
356
        'This is a Bazaar-NG control directory.\n'
 
357
        'Do not change any files in this directory.\n'
387
358
    ),
388
359
    ( './.bzr/branch-format',
389
360
        'Bazaar-NG branch, format 0.0.4\n'