← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_upgrade.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_upgrade.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005-2010 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
31
31
    bzrdir,
32
32
    progress,
33
33
    repository,
 
34
    transport,
34
35
    workingtree,
35
36
    workingtree_4,
36
37
    )
37
38
import bzrlib.branch
38
39
from bzrlib.branch import Branch
39
40
from bzrlib.tests import TestCaseWithTransport
40
 
from bzrlib.transport import get_transport
41
41
from bzrlib.upgrade import upgrade
42
42
 
43
43
 
79
79
        finally:
80
80
            rt.unlock()
81
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')
 
82
        backup_dir = 'backup.bzr.~1~'
 
83
        t = transport.get_transport(b.base)
 
84
        t.stat(backup_dir)
 
85
        t.stat(backup_dir + '/README')
 
86
        t.stat(backup_dir + '/branch-format')
 
87
        t.stat(backup_dir + '/revision-history')
 
88
        t.stat(backup_dir + '/merged-patches')
 
89
        t.stat(backup_dir + '/pending-merged-patches')
 
90
        t.stat(backup_dir + '/pending-merges')
 
91
        t.stat(backup_dir + '/branch-name')
 
92
        t.stat(backup_dir + '/branch-lock')
 
93
        t.stat(backup_dir + '/inventory')
 
94
        t.stat(backup_dir + '/stat-cache')
 
95
        t.stat(backup_dir + '/text-store')
 
96
        t.stat(backup_dir + '/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
 
97
        t.stat(backup_dir + '/text-store/foo-20051004035756-4081373d897c3453.gz')
 
98
        t.stat(backup_dir + '/inventory-store/')
 
99
        t.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
 
100
        t.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
 
101
        t.stat(backup_dir + '/revision-store/')
 
102
        t.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
 
103
        t.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
103
104
 
104
105
    def test_upgrade_with_ghosts(self):
105
106
        """Upgrade v0.0.4 tree containing ghost references.
152
153
        # such a branch to metadir must not setup a working tree.
153
154
        self.build_tree_contents(_upgrade1_template)
154
155
        upgrade('.', bzrdir.BzrDirFormat6())
155
 
        transport = get_transport('.')
156
 
        transport.delete_multi(['.bzr/pending-merges', '.bzr/inventory'])
157
 
        self.assertFalse(transport.has('.bzr/stat-cache'))
 
156
        t = transport.get_transport('.')
 
157
        t.delete_multi(['.bzr/pending-merges', '.bzr/inventory'])
 
158
        self.assertFalse(t.has('.bzr/stat-cache'))
158
159
        # XXX: upgrade fails if a backup.bzr is already present
159
160
        # -- David Allouche 2006-08-11
160
 
        transport.delete_tree('backup.bzr')
 
161
        t.delete_tree('backup.bzr.~1~')
161
162
        # At this point, we have a format6 branch without checkout files.
162
163
        upgrade('.', bzrdir.BzrDirMetaFormat1())
163
164
        # The upgrade should not have set up a working tree.
185
186
        branch.set_push_location('file:///IJ')
186
187
        target = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
187
188
        converter = branch.bzrdir._format.get_converter(target)
188
 
        converter.convert(branch.bzrdir, progress.DummyProgress())
 
189
        converter.convert(branch.bzrdir, None)
189
190
        new_branch = _mod_branch.Branch.open(self.get_url('branch'))
190
191
        self.assertIs(new_branch.__class__, _mod_branch.BzrBranch6)
191
192
        self.assertEqual('CD', new_branch.last_revision())
197
198
 
198
199
        branch2 = self.make_branch('branch2', format='knit')
199
200
        converter = branch2.bzrdir._format.get_converter(target)
200
 
        converter.convert(branch2.bzrdir, progress.DummyProgress())
 
201
        converter.convert(branch2.bzrdir, None)
201
202
        branch2 = _mod_branch.Branch.open(self.get_url('branch'))
202
203
        self.assertIs(branch2.__class__, _mod_branch.BzrBranch6)
203
204
 
 
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
 
204
215
    def test_convert_knit_dirstate_empty(self):
205
216
        # test that asking for an upgrade from knit to dirstate works.
206
217
        tree = self.make_branch_and_tree('tree', format='knit')
207
218
        target = bzrdir.format_registry.make_bzrdir('dirstate')
208
219
        converter = tree.bzrdir._format.get_converter(target)
209
 
        converter.convert(tree.bzrdir, progress.DummyProgress())
 
220
        converter.convert(tree.bzrdir, None)
210
221
        new_tree = workingtree.WorkingTree.open('tree')
211
222
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
212
223
        self.assertEqual('null:', new_tree.last_revision())
219
230
        tree.add(['file'], ['file-id'])
220
231
        target = bzrdir.format_registry.make_bzrdir('dirstate')
221
232
        converter = tree.bzrdir._format.get_converter(target)
222
 
        converter.convert(tree.bzrdir, progress.DummyProgress())
 
233
        converter.convert(tree.bzrdir, None)
223
234
        new_tree = workingtree.WorkingTree.open('tree')
224
235
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
225
236
        self.assertEqual('null:', new_tree.last_revision())
230
241
        rev_id = tree.commit('first post')
231
242
        target = bzrdir.format_registry.make_bzrdir('dirstate')
232
243
        converter = tree.bzrdir._format.get_converter(target)
233
 
        converter.convert(tree.bzrdir, progress.DummyProgress())
 
244
        converter.convert(tree.bzrdir, None)
234
245
        new_tree = workingtree.WorkingTree.open('tree')
235
246
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
236
247
        self.assertEqual(rev_id, new_tree.last_revision())
247
258
        tree.merge_from_branch(merge_tree.branch)
248
259
        target = bzrdir.format_registry.make_bzrdir('dirstate')
249
260
        converter = tree.bzrdir._format.get_converter(target)
250
 
        converter.convert(tree.bzrdir, progress.DummyProgress())
 
261
        converter.convert(tree.bzrdir, None)
251
262
        new_tree = workingtree.WorkingTree.open('tree')
252
263
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
253
264
        self.assertEqual(rev_id2, new_tree.last_revision())