← 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-12-12 15:17:13 UTC
  • mto: This revision was merged to the branch mainline in revision 3113.
  • Revision ID: abentley@panoramicfeedback.com-20071212151713-ox5n8rlx8m3nsspy
Add support for reconfiguring repositories into branches or trees

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_upgrade.py
1
 
# Copyright (C) 2005 by 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
19
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
# TODO queue for upgrade:
 
23
# test the error message when upgrading an unknown BzrDir format.
 
24
 
22
25
import base64
23
26
import os
24
27
import sys
25
28
 
26
 
from bzrlib.tests import TestCase, TestCaseInTempDir
 
29
from bzrlib import (
 
30
    branch as _mod_branch,
 
31
    bzrdir,
 
32
    progress,
 
33
    repository,
 
34
    workingtree,
 
35
    workingtree_4,
 
36
    )
 
37
import bzrlib.branch
27
38
from bzrlib.branch import Branch
28
 
from bzrlib.revision import is_ancestor
 
39
from bzrlib.tests import TestCaseWithTransport
 
40
from bzrlib.transport import get_transport
29
41
from bzrlib.upgrade import upgrade
30
42
 
31
43
 
32
 
class TestUpgrade(TestCaseInTempDir):
 
44
class TestUpgrade(TestCaseWithTransport):
33
45
    
34
46
    def test_build_tree(self):
35
47
        """Test tree-building test helper"""
38
50
        self.failUnlessExists('.bzr/README')
39
51
 
40
52
    def test_upgrade_simple(self):
41
 
        """Upgrade simple v0.0.4 format to v6"""
 
53
        """Upgrade simple v0.0.4 format to latest format"""
42
54
        eq = self.assertEquals
43
55
        self.build_tree_contents(_upgrade1_template)
44
56
        upgrade(u'.')
45
 
        b = Branch.open(u'.')
46
 
        eq(b._branch_format, 6)
 
57
        control = bzrdir.BzrDir.open('.')
 
58
        b = control.open_branch()
 
59
        # tsk, peeking under the covers.
 
60
        self.failUnless(
 
61
            isinstance(
 
62
                control._format,
 
63
                bzrdir.BzrDirFormat.get_default_format().__class__))
47
64
        rh = b.revision_history()
48
65
        eq(rh,
49
66
           ['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
50
67
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
51
 
        t = b.revision_tree(rh[0])
 
68
        rt = b.repository.revision_tree(rh[0])
52
69
        foo_id = 'foo-20051004035605-91e788d1875603ae'
53
 
        eq(t.get_file_text(foo_id), 'initial contents\n')
54
 
        t = b.revision_tree(rh[1])
55
 
        eq(t.get_file_text(foo_id), 'new contents\n')
 
70
        rt.lock_read()
 
71
        try:
 
72
            eq(rt.get_file_text(foo_id), 'initial contents\n')
 
73
        finally:
 
74
            rt.unlock()
 
75
        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()
 
81
        # check a backup was made:
 
82
        transport = get_transport(b.base)
 
83
        transport.stat('.bzr.backup')
 
84
        transport.stat('.bzr.backup/README')
 
85
        transport.stat('.bzr.backup/branch-format')
 
86
        transport.stat('.bzr.backup/revision-history')
 
87
        transport.stat('.bzr.backup/merged-patches')
 
88
        transport.stat('.bzr.backup/pending-merged-patches')
 
89
        transport.stat('.bzr.backup/pending-merges')
 
90
        transport.stat('.bzr.backup/branch-name')
 
91
        transport.stat('.bzr.backup/branch-lock')
 
92
        transport.stat('.bzr.backup/inventory')
 
93
        transport.stat('.bzr.backup/stat-cache')
 
94
        transport.stat('.bzr.backup/text-store')
 
95
        transport.stat('.bzr.backup/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
 
96
        transport.stat('.bzr.backup/text-store/foo-20051004035756-4081373d897c3453.gz')
 
97
        transport.stat('.bzr.backup/inventory-store/')
 
98
        transport.stat('.bzr.backup/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
 
99
        transport.stat('.bzr.backup/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
 
100
        transport.stat('.bzr.backup/revision-store/')
 
101
        transport.stat('.bzr.backup/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
 
102
        transport.stat('.bzr.backup/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
56
103
 
57
104
    def test_upgrade_with_ghosts(self):
58
105
        """Upgrade v0.0.4 tree containing ghost references.
59
106
 
60
107
        That is, some of the parents of revisions mentioned in the branch
61
 
        aren't present in the branches storage. 
 
108
        aren't present in the branch's storage. 
62
109
 
63
110
        This shouldn't normally happen in branches created entirely in 
64
 
        bzr but can happen in imports from baz and arch, or from other  
65
 
        systems, where the importer knows about a revision but not 
 
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 
66
113
        its contents."""
67
114
        eq = self.assertEquals
68
115
        self.build_tree_contents(_ghost_template)
69
116
        upgrade(u'.')
70
117
        b = Branch.open(u'.')
71
118
        revision_id = b.revision_history()[1]
72
 
        rev = b.get_revision(revision_id)
 
119
        rev = b.repository.get_revision(revision_id)
73
120
        eq(len(rev.parent_ids), 2)
74
121
        eq(rev.parent_ids[1], 'wibble@wobble-2')
75
122
 
76
123
    def test_upgrade_makes_dir_weaves(self):
77
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
127
        upgrade('.')
79
128
        # this is the path to the literal file. As format changes 
80
129
        # occur it needs to be updated. FIXME: ask the store for the
81
130
        # path.
82
 
        self.failUnlessExists(
83
 
            '.bzr/weaves/de/dir-20051005095101-da1441ea3fa6917a.weave')
 
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'
 
136
        repo.lock_read()
 
137
        self.addCleanup(repo.unlock)
 
138
        self.assertNotEqual(
 
139
            [],
 
140
            repo.weave_store.get_weave(
 
141
                'dir-20051005095101-da1441ea3fa6917a',
 
142
                repo.get_transaction()).versions())
 
143
 
 
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())
 
150
 
 
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 .bzr.backup is already present
 
160
        # -- David Allouche 2006-08-11
 
161
        transport.delete_tree('.bzr.backup')
 
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
 
169
        # other tests.
 
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'])
 
175
 
 
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'))
 
193
 
 
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)
 
199
 
 
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())
 
209
 
 
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())
 
222
 
 
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)
 
236
 
 
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)
84
254
 
85
255
 
86
256
_upgrade1_template = \