← 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: 2006-07-20 13:00:31 UTC
  • mto: (1852.9.1 Tree.compare().)
  • mto: This revision was merged to the branch mainline in revision 1890.
  • Revision ID: robertc@robertcollins.net-20060720130031-d26103a427ea10f3
Start tree implementation tests.

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 by 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:
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
 
    )
37
29
import bzrlib.branch
38
30
from bzrlib.branch import Branch
39
 
from bzrlib.tests import TestCaseWithTransport
 
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
40
35
from bzrlib.transport import get_transport
41
36
from bzrlib.upgrade import upgrade
42
 
 
43
 
 
44
 
class TestUpgrade(TestCaseWithTransport):
45
 
 
 
37
import bzrlib.workingtree as workingtree
 
38
 
 
39
 
 
40
class TestUpgrade(TestCaseInTempDir):
 
41
    
46
42
    def test_build_tree(self):
47
43
        """Test tree-building test helper"""
48
44
        self.build_tree_contents(_upgrade1_template)
50
46
        self.failUnlessExists('.bzr/README')
51
47
 
52
48
    def test_upgrade_simple(self):
53
 
        """Upgrade simple v0.0.4 format to latest format"""
 
49
        """Upgrade simple v0.0.4 format to v6"""
54
50
        eq = self.assertEquals
55
51
        self.build_tree_contents(_upgrade1_template)
56
52
        upgrade(u'.')
67
63
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
68
64
        rt = b.repository.revision_tree(rh[0])
69
65
        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()
 
66
        eq(rt.get_file_text(foo_id), 'initial contents\n')
75
67
        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()
 
68
        eq(rt.get_file_text(foo_id), 'new contents\n')
81
69
        # check a backup was made:
82
70
        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')
 
71
        transport.stat('.bzr.backup')
 
72
        transport.stat('.bzr.backup/README')
 
73
        transport.stat('.bzr.backup/branch-format')
 
74
        transport.stat('.bzr.backup/revision-history')
 
75
        transport.stat('.bzr.backup/merged-patches')
 
76
        transport.stat('.bzr.backup/pending-merged-patches')
 
77
        transport.stat('.bzr.backup/pending-merges')
 
78
        transport.stat('.bzr.backup/branch-name')
 
79
        transport.stat('.bzr.backup/branch-lock')
 
80
        transport.stat('.bzr.backup/inventory')
 
81
        transport.stat('.bzr.backup/stat-cache')
 
82
        transport.stat('.bzr.backup/text-store')
 
83
        transport.stat('.bzr.backup/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
 
84
        transport.stat('.bzr.backup/text-store/foo-20051004035756-4081373d897c3453.gz')
 
85
        transport.stat('.bzr.backup/inventory-store/')
 
86
        transport.stat('.bzr.backup/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
 
87
        transport.stat('.bzr.backup/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
 
88
        transport.stat('.bzr.backup/revision-store/')
 
89
        transport.stat('.bzr.backup/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
 
90
        transport.stat('.bzr.backup/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
103
91
 
104
92
    def test_upgrade_with_ghosts(self):
105
93
        """Upgrade v0.0.4 tree containing ghost references.
106
94
 
107
95
        That is, some of the parents of revisions mentioned in the branch
108
 
        aren't present in the branch's storage.
 
96
        aren't present in the branch's storage. 
109
97
 
110
 
        This shouldn't normally happen in branches created entirely in
 
98
        This shouldn't normally happen in branches created entirely in 
111
99
        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
 
100
        other systems, where the importer knows about a revision but not 
113
101
        its contents."""
114
102
        eq = self.assertEquals
115
103
        self.build_tree_contents(_ghost_template)
125
113
        old_repodir = bzrlib.bzrdir.BzrDir.open_unsupported('.')
126
114
        old_repo_format = old_repodir.open_repository()._format
127
115
        upgrade('.')
128
 
        # this is the path to the literal file. As format changes
 
116
        # this is the path to the literal file. As format changes 
129
117
        # occur it needs to be updated. FIXME: ask the store for the
130
118
        # path.
131
119
        repo = bzrlib.repository.Repository.open('.')
132
120
        # it should have changed the format
133
121
        self.assertNotEqual(old_repo_format.__class__, repo._format.__class__)
134
 
        # and we should be able to read the names for the file id
 
122
        # and we should be able to read the names for the file id 
135
123
        # '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)
 
124
        self.assertNotEqual(
 
125
            [],
 
126
            repo.text_store.get_weave(
 
127
                'dir-20051005095101-da1441ea3fa6917a',
 
128
                repo.get_transaction()))
142
129
 
143
130
    def test_upgrade_to_meta_sets_workingtree_last_revision(self):
144
131
        self.build_tree_contents(_upgrade_dir_template)
145
132
        upgrade('.', bzrdir.BzrDirMetaFormat1())
146
133
        tree = workingtree.WorkingTree.open('.')
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)
 
134
        self.assertEqual(tree.last_revision(),
 
135
                         tree.branch.revision_history()[-1])
268
136
 
269
137
 
270
138
_upgrade1_template = \
272
140
     ('foo', 'new contents\n'),
273
141
     ('.bzr/',),
274
142
     ('.bzr/README',
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'),
 
143
      'This is a Bazaar-NG control directory.\nDo not change any files in this directory.\n'),
278
144
     ('.bzr/branch-format', 'Bazaar-NG branch, format 0.0.4\n'),
279
145
     ('.bzr/revision-history',
280
146
      'mbp@sourcefrog.net-20051004035611-176b16534b086b3c\n'
314
180
    ),
315
181
    ( './.bzr/', ),
316
182
    ( './.bzr/README',
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'
 
183
        'This is a Bazaar-NG control directory.\n'
 
184
        'Do not change any files in this directory.\n'
320
185
    ),
321
186
    ( './.bzr/branch-format',
322
187
        'Bazaar-NG branch, format 0.0.4\n'
380
245
_upgrade_dir_template = [
381
246
    ( './.bzr/', ),
382
247
    ( './.bzr/README',
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'
 
248
        'This is a Bazaar-NG control directory.\n'
 
249
        'Do not change any files in this directory.\n'
386
250
    ),
387
251
    ( './.bzr/branch-format',
388
252
        'Bazaar-NG branch, format 0.0.4\n'