← 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: Robert Collins
  • Date: 2009-09-07 03:08:30 UTC
  • mto: This revision was merged to the branch mainline in revision 4690.
  • Revision ID: robertc@robertcollins.net-20090907030830-rf59kt28d550eauj
Milestones language tightning, internal consistency.

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
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., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 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:
26
26
import os
27
27
import sys
28
28
 
 
29
from bzrlib import (
 
30
    branch as _mod_branch,
 
31
    bzrdir,
 
32
    progress,
 
33
    repository,
 
34
    workingtree,
 
35
    workingtree_4,
 
36
    )
29
37
import bzrlib.branch
30
38
from bzrlib.branch import Branch
31
 
import bzrlib.bzrdir as bzrdir
32
 
import bzrlib.repository as repository
33
 
from bzrlib.revision import is_ancestor
34
 
from bzrlib.tests import TestCase, TestCaseInTempDir
 
39
from bzrlib.tests import TestCaseWithTransport
35
40
from bzrlib.transport import get_transport
36
41
from bzrlib.upgrade import upgrade
37
 
import bzrlib.workingtree as workingtree
38
 
 
39
 
 
40
 
class TestUpgrade(TestCaseInTempDir):
41
 
    
 
42
 
 
43
 
 
44
class TestUpgrade(TestCaseWithTransport):
 
45
 
42
46
    def test_build_tree(self):
43
47
        """Test tree-building test helper"""
44
48
        self.build_tree_contents(_upgrade1_template)
46
50
        self.failUnlessExists('.bzr/README')
47
51
 
48
52
    def test_upgrade_simple(self):
49
 
        """Upgrade simple v0.0.4 format to v6"""
 
53
        """Upgrade simple v0.0.4 format to latest format"""
50
54
        eq = self.assertEquals
51
55
        self.build_tree_contents(_upgrade1_template)
52
56
        upgrade(u'.')
53
57
        control = bzrdir.BzrDir.open('.')
54
58
        b = control.open_branch()
55
 
        r = control.open_repository()
56
 
        t = control.open_workingtree()
57
59
        # tsk, peeking under the covers.
58
 
        self.failUnless(isinstance(control._format, bzrdir.BzrDirFormat6))
59
 
        self.failUnless(isinstance(b._format, bzrlib.branch.BzrBranchFormat4))
60
 
        self.failUnless(isinstance(r._format, repository.RepositoryFormat6))
61
 
        self.failUnless(isinstance(t._format, workingtree.WorkingTreeFormat2))
 
60
        self.failUnless(
 
61
            isinstance(
 
62
                control._format,
 
63
                bzrdir.BzrDirFormat.get_default_format().__class__))
62
64
        rh = b.revision_history()
63
65
        eq(rh,
64
66
           ['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
65
67
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
66
68
        rt = b.repository.revision_tree(rh[0])
67
69
        foo_id = 'foo-20051004035605-91e788d1875603ae'
68
 
        eq(rt.get_file_text(foo_id), 'initial contents\n')
 
70
        rt.lock_read()
 
71
        try:
 
72
            eq(rt.get_file_text(foo_id), 'initial contents\n')
 
73
        finally:
 
74
            rt.unlock()
69
75
        rt = b.repository.revision_tree(rh[1])
70
 
        eq(rt.get_file_text(foo_id), 'new contents\n')
 
76
        rt.lock_read()
 
77
        try:
 
78
            eq(rt.get_file_text(foo_id), 'new contents\n')
 
79
        finally:
 
80
            rt.unlock()
71
81
        # check a backup was made:
72
82
        transport = get_transport(b.base)
73
 
        transport.stat('.bzr.backup')
74
 
        transport.stat('.bzr.backup/README')
75
 
        transport.stat('.bzr.backup/branch-format')
76
 
        transport.stat('.bzr.backup/revision-history')
77
 
        transport.stat('.bzr.backup/merged-patches')
78
 
        transport.stat('.bzr.backup/pending-merged-patches')
79
 
        transport.stat('.bzr.backup/pending-merges')
80
 
        transport.stat('.bzr.backup/branch-name')
81
 
        transport.stat('.bzr.backup/branch-lock')
82
 
        transport.stat('.bzr.backup/inventory')
83
 
        transport.stat('.bzr.backup/stat-cache')
84
 
        transport.stat('.bzr.backup/text-store')
85
 
        transport.stat('.bzr.backup/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
86
 
        transport.stat('.bzr.backup/text-store/foo-20051004035756-4081373d897c3453.gz')
87
 
        transport.stat('.bzr.backup/inventory-store/')
88
 
        transport.stat('.bzr.backup/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
89
 
        transport.stat('.bzr.backup/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
90
 
        transport.stat('.bzr.backup/revision-store/')
91
 
        transport.stat('.bzr.backup/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
92
 
        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')
93
103
 
94
104
    def test_upgrade_with_ghosts(self):
95
105
        """Upgrade v0.0.4 tree containing ghost references.
96
106
 
97
107
        That is, some of the parents of revisions mentioned in the branch
98
 
        aren't present in the branch's storage. 
 
108
        aren't present in the branch's storage.
99
109
 
100
 
        This shouldn't normally happen in branches created entirely in 
 
110
        This shouldn't normally happen in branches created entirely in
101
111
        bzr, but can happen in branches imported from baz and arch, or from
102
 
        other systems, where the importer knows about a revision but not 
 
112
        other systems, where the importer knows about a revision but not
103
113
        its contents."""
104
114
        eq = self.assertEquals
105
115
        self.build_tree_contents(_ghost_template)
112
122
 
113
123
    def test_upgrade_makes_dir_weaves(self):
114
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
115
127
        upgrade('.')
116
 
        # this is the path to the literal file. As format changes 
 
128
        # this is the path to the literal file. As format changes
117
129
        # occur it needs to be updated. FIXME: ask the store for the
118
130
        # path.
119
 
        self.failUnlessExists(
120
 
            '.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
        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)
121
142
 
122
143
    def test_upgrade_to_meta_sets_workingtree_last_revision(self):
123
144
        self.build_tree_contents(_upgrade_dir_template)
124
145
        upgrade('.', bzrdir.BzrDirMetaFormat1())
125
146
        tree = workingtree.WorkingTree.open('.')
126
 
        self.assertEqual(tree.last_revision(),
127
 
                         tree.branch.revision_history()[-1])
 
147
        self.assertEqual([tree.branch.revision_history()[-1]],
 
148
            tree.get_parent_ids())
 
149
 
 
150
    def test_upgrade_v6_to_meta_no_workingtree(self):
 
151
        # Some format6 branches do not have checkout files. Upgrading
 
152
        # such a branch to metadir must not setup a working tree.
 
153
        self.build_tree_contents(_upgrade1_template)
 
154
        upgrade('.', bzrdir.BzrDirFormat6())
 
155
        transport = get_transport('.')
 
156
        transport.delete_multi(['.bzr/pending-merges', '.bzr/inventory'])
 
157
        self.assertFalse(transport.has('.bzr/stat-cache'))
 
158
        # XXX: upgrade fails if a backup.bzr is already present
 
159
        # -- David Allouche 2006-08-11
 
160
        transport.delete_tree('backup.bzr')
 
161
        # At this point, we have a format6 branch without checkout files.
 
162
        upgrade('.', bzrdir.BzrDirMetaFormat1())
 
163
        # The upgrade should not have set up a working tree.
 
164
        control = bzrdir.BzrDir.open('.')
 
165
        self.assertFalse(control.has_workingtree())
 
166
        # We have covered the scope of this test, we may as well check that
 
167
        # upgrade has not eaten our data, even if it's a bit redundant with
 
168
        # other tests.
 
169
        self.failUnless(isinstance(control._format, bzrdir.BzrDirMetaFormat1))
 
170
        branch = control.open_branch()
 
171
        self.assertEquals(branch.revision_history(),
 
172
           ['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
 
173
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
 
174
 
 
175
    def test_upgrade_rich_root(self):
 
176
        tree = self.make_branch_and_tree('tree', format='rich-root')
 
177
        rev_id = tree.commit('first post')
 
178
        upgrade('tree')
 
179
 
 
180
    def test_convert_branch5_branch6(self):
 
181
        branch = self.make_branch('branch', format='knit')
 
182
        branch.set_revision_history(['AB', 'CD'])
 
183
        branch.set_parent('file:///EF')
 
184
        branch.set_bound_location('file:///GH')
 
185
        branch.set_push_location('file:///IJ')
 
186
        target = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
 
187
        converter = branch.bzrdir._format.get_converter(target)
 
188
        converter.convert(branch.bzrdir, progress.DummyProgress())
 
189
        new_branch = _mod_branch.Branch.open(self.get_url('branch'))
 
190
        self.assertIs(new_branch.__class__, _mod_branch.BzrBranch6)
 
191
        self.assertEqual('CD', new_branch.last_revision())
 
192
        self.assertEqual('file:///EF', new_branch.get_parent())
 
193
        self.assertEqual('file:///GH', new_branch.get_bound_location())
 
194
        branch_config = new_branch.get_config()._get_branch_data_config()
 
195
        self.assertEqual('file:///IJ',
 
196
            branch_config.get_user_option('push_location'))
 
197
 
 
198
        branch2 = self.make_branch('branch2', format='knit')
 
199
        converter = branch2.bzrdir._format.get_converter(target)
 
200
        converter.convert(branch2.bzrdir, progress.DummyProgress())
 
201
        branch2 = _mod_branch.Branch.open(self.get_url('branch'))
 
202
        self.assertIs(branch2.__class__, _mod_branch.BzrBranch6)
 
203
 
 
204
    def test_convert_branch7_branch8(self):
 
205
        branch = self.make_branch('branch', format='1.9')
 
206
        target = bzrdir.format_registry.make_bzrdir('1.9')
 
207
        target.set_branch_format(_mod_branch.BzrBranchFormat8())
 
208
        converter = branch.bzrdir._format.get_converter(target)
 
209
        converter.convert(branch.bzrdir, progress.DummyProgress())
 
210
        branch = _mod_branch.Branch.open(self.get_url('branch'))
 
211
        self.assertIs(branch.__class__, _mod_branch.BzrBranch8)
 
212
        self.assertEqual({}, branch._get_all_reference_info())
 
213
 
 
214
    def test_convert_knit_dirstate_empty(self):
 
215
        # test that asking for an upgrade from knit to dirstate works.
 
216
        tree = self.make_branch_and_tree('tree', format='knit')
 
217
        target = bzrdir.format_registry.make_bzrdir('dirstate')
 
218
        converter = tree.bzrdir._format.get_converter(target)
 
219
        converter.convert(tree.bzrdir, progress.DummyProgress())
 
220
        new_tree = workingtree.WorkingTree.open('tree')
 
221
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
 
222
        self.assertEqual('null:', new_tree.last_revision())
 
223
 
 
224
    def test_convert_knit_dirstate_content(self):
 
225
        # smoke test for dirstate conversion: we call dirstate primitives,
 
226
        # and its there that the core logic is tested.
 
227
        tree = self.make_branch_and_tree('tree', format='knit')
 
228
        self.build_tree(['tree/file'])
 
229
        tree.add(['file'], ['file-id'])
 
230
        target = bzrdir.format_registry.make_bzrdir('dirstate')
 
231
        converter = tree.bzrdir._format.get_converter(target)
 
232
        converter.convert(tree.bzrdir, progress.DummyProgress())
 
233
        new_tree = workingtree.WorkingTree.open('tree')
 
234
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
 
235
        self.assertEqual('null:', new_tree.last_revision())
 
236
 
 
237
    def test_convert_knit_one_parent_dirstate(self):
 
238
        # test that asking for an upgrade from knit to dirstate works.
 
239
        tree = self.make_branch_and_tree('tree', format='knit')
 
240
        rev_id = tree.commit('first post')
 
241
        target = bzrdir.format_registry.make_bzrdir('dirstate')
 
242
        converter = tree.bzrdir._format.get_converter(target)
 
243
        converter.convert(tree.bzrdir, progress.DummyProgress())
 
244
        new_tree = workingtree.WorkingTree.open('tree')
 
245
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
 
246
        self.assertEqual(rev_id, new_tree.last_revision())
 
247
        for path in ['basis-inventory-cache', 'inventory', 'last-revision',
 
248
            'pending-merges', 'stat-cache']:
 
249
            self.failIfExists('tree/.bzr/checkout/' + path)
 
250
 
 
251
    def test_convert_knit_merges_dirstate(self):
 
252
        tree = self.make_branch_and_tree('tree', format='knit')
 
253
        rev_id = tree.commit('first post')
 
254
        merge_tree = tree.bzrdir.sprout('tree2').open_workingtree()
 
255
        rev_id2 = tree.commit('second post')
 
256
        rev_id3 = merge_tree.commit('second merge post')
 
257
        tree.merge_from_branch(merge_tree.branch)
 
258
        target = bzrdir.format_registry.make_bzrdir('dirstate')
 
259
        converter = tree.bzrdir._format.get_converter(target)
 
260
        converter.convert(tree.bzrdir, progress.DummyProgress())
 
261
        new_tree = workingtree.WorkingTree.open('tree')
 
262
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
 
263
        self.assertEqual(rev_id2, new_tree.last_revision())
 
264
        self.assertEqual([rev_id2, rev_id3], new_tree.get_parent_ids())
 
265
        for path in ['basis-inventory-cache', 'inventory', 'last-revision',
 
266
            'pending-merges', 'stat-cache']:
 
267
            self.failIfExists('tree/.bzr/checkout/' + path)
128
268
 
129
269
 
130
270
_upgrade1_template = \
132
272
     ('foo', 'new contents\n'),
133
273
     ('.bzr/',),
134
274
     ('.bzr/README',
135
 
      'This is a Bazaar-NG control directory.\nDo not change any files in this directory.\n'),
 
275
      'This is a Bazaar control directory.\n'
 
276
      'Do not change any files in this directory.\n'
 
277
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'),
136
278
     ('.bzr/branch-format', 'Bazaar-NG branch, format 0.0.4\n'),
137
279
     ('.bzr/revision-history',
138
280
      'mbp@sourcefrog.net-20051004035611-176b16534b086b3c\n'
172
314
    ),
173
315
    ( './.bzr/', ),
174
316
    ( './.bzr/README',
175
 
        'This is a Bazaar-NG control directory.\n'
176
 
        'Do not change any files in this directory.\n'
 
317
      'This is a Bazaar control directory.\n'
 
318
      'Do not change any files in this directory.\n'
 
319
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
177
320
    ),
178
321
    ( './.bzr/branch-format',
179
322
        'Bazaar-NG branch, format 0.0.4\n'
237
380
_upgrade_dir_template = [
238
381
    ( './.bzr/', ),
239
382
    ( './.bzr/README',
240
 
        'This is a Bazaar-NG control directory.\n'
241
 
        'Do not change any files in this directory.\n'
 
383
      'This is a Bazaar control directory.\n'
 
384
      'Do not change any files in this directory.\n'
 
385
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
242
386
    ),
243
387
    ( './.bzr/branch-format',
244
388
        'Bazaar-NG branch, format 0.0.4\n'