← 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-02-15 08:11:37 UTC
  • mto: (1534.1.24 integration)
  • mto: This revision was merged to the branch mainline in revision 1554.
  • Revision ID: robertc@robertcollins.net-20060215081137-4c27377517e96dd1
Make format 4/5/6 branches share a single LockableFiles instance across wt/branch/repository.

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 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'.')
57
53
        control = bzrdir.BzrDir.open('.')
58
54
        b = control.open_branch()
 
55
        r = control.open_repository()
 
56
        t = control.open_workingtree()
59
57
        # tsk, peeking under the covers.
60
 
        self.failUnless(
61
 
            isinstance(
62
 
                control._format,
63
 
                bzrdir.BzrDirFormat.get_default_format().__class__))
 
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))
64
62
        rh = b.revision_history()
65
63
        eq(rh,
66
64
           ['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
67
65
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
68
66
        rt = b.repository.revision_tree(rh[0])
69
67
        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()
 
68
        eq(rt.get_file_text(foo_id), 'initial contents\n')
75
69
        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()
 
70
        eq(rt.get_file_text(foo_id), 'new contents\n')
81
71
        # check a backup was made:
82
 
        backup_dir = 'backup.bzr.~1~'
83
72
        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')
 
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')
104
93
 
105
94
    def test_upgrade_with_ghosts(self):
106
95
        """Upgrade v0.0.4 tree containing ghost references.
107
96
 
108
97
        That is, some of the parents of revisions mentioned in the branch
109
 
        aren't present in the branch's storage.
 
98
        aren't present in the branch's storage. 
110
99
 
111
 
        This shouldn't normally happen in branches created entirely in
 
100
        This shouldn't normally happen in branches created entirely in 
112
101
        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
 
102
        other systems, where the importer knows about a revision but not 
114
103
        its contents."""
115
104
        eq = self.assertEquals
116
105
        self.build_tree_contents(_ghost_template)
123
112
 
124
113
    def test_upgrade_makes_dir_weaves(self):
125
114
        self.build_tree_contents(_upgrade_dir_template)
126
 
        old_repodir = bzrlib.bzrdir.BzrDir.open_unsupported('.')
127
 
        old_repo_format = old_repodir.open_repository()._format
128
115
        upgrade('.')
129
 
        # this is the path to the literal file. As format changes
 
116
        # this is the path to the literal file. As format changes 
130
117
        # occur it needs to be updated. FIXME: ask the store for the
131
118
        # path.
132
 
        repo = bzrlib.repository.Repository.open('.')
133
 
        # it should have changed the format
134
 
        self.assertNotEqual(old_repo_format.__class__, repo._format.__class__)
135
 
        # and we should be able to read the names for the file id
136
 
        # '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)
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
 
        self.assertFalse(transport.has('.bzr/stat-cache'))
159
 
        # XXX: upgrade fails if a backup.bzr is already present
160
 
        # -- David Allouche 2006-08-11
161
 
        transport.delete_tree('backup.bzr.~1~')
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_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
 
    def test_convert_branch5_branch6(self):
182
 
        branch = self.make_branch('branch', format='knit')
183
 
        branch.set_revision_history(['AB', 'CD'])
184
 
        branch.set_parent('file:///EF')
185
 
        branch.set_bound_location('file:///GH')
186
 
        branch.set_push_location('file:///IJ')
187
 
        target = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
188
 
        converter = branch.bzrdir._format.get_converter(target)
189
 
        converter.convert(branch.bzrdir, None)
190
 
        new_branch = _mod_branch.Branch.open(self.get_url('branch'))
191
 
        self.assertIs(new_branch.__class__, _mod_branch.BzrBranch6)
192
 
        self.assertEqual('CD', new_branch.last_revision())
193
 
        self.assertEqual('file:///EF', new_branch.get_parent())
194
 
        self.assertEqual('file:///GH', new_branch.get_bound_location())
195
 
        branch_config = new_branch.get_config()._get_branch_data_config()
196
 
        self.assertEqual('file:///IJ',
197
 
            branch_config.get_user_option('push_location'))
198
 
 
199
 
        branch2 = self.make_branch('branch2', format='knit')
200
 
        converter = branch2.bzrdir._format.get_converter(target)
201
 
        converter.convert(branch2.bzrdir, None)
202
 
        branch2 = _mod_branch.Branch.open(self.get_url('branch'))
203
 
        self.assertIs(branch2.__class__, _mod_branch.BzrBranch6)
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
 
 
215
 
    def test_convert_knit_dirstate_empty(self):
216
 
        # test that asking for an upgrade from knit to dirstate works.
217
 
        tree = self.make_branch_and_tree('tree', format='knit')
218
 
        target = bzrdir.format_registry.make_bzrdir('dirstate')
219
 
        converter = tree.bzrdir._format.get_converter(target)
220
 
        converter.convert(tree.bzrdir, None)
221
 
        new_tree = workingtree.WorkingTree.open('tree')
222
 
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
223
 
        self.assertEqual('null:', new_tree.last_revision())
224
 
 
225
 
    def test_convert_knit_dirstate_content(self):
226
 
        # smoke test for dirstate conversion: we call dirstate primitives,
227
 
        # and its there that the core logic is tested.
228
 
        tree = self.make_branch_and_tree('tree', format='knit')
229
 
        self.build_tree(['tree/file'])
230
 
        tree.add(['file'], ['file-id'])
231
 
        target = bzrdir.format_registry.make_bzrdir('dirstate')
232
 
        converter = tree.bzrdir._format.get_converter(target)
233
 
        converter.convert(tree.bzrdir, None)
234
 
        new_tree = workingtree.WorkingTree.open('tree')
235
 
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
236
 
        self.assertEqual('null:', new_tree.last_revision())
237
 
 
238
 
    def test_convert_knit_one_parent_dirstate(self):
239
 
        # test that asking for an upgrade from knit to dirstate works.
240
 
        tree = self.make_branch_and_tree('tree', format='knit')
241
 
        rev_id = tree.commit('first post')
242
 
        target = bzrdir.format_registry.make_bzrdir('dirstate')
243
 
        converter = tree.bzrdir._format.get_converter(target)
244
 
        converter.convert(tree.bzrdir, None)
245
 
        new_tree = workingtree.WorkingTree.open('tree')
246
 
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
247
 
        self.assertEqual(rev_id, new_tree.last_revision())
248
 
        for path in ['basis-inventory-cache', 'inventory', 'last-revision',
249
 
            'pending-merges', 'stat-cache']:
250
 
            self.failIfExists('tree/.bzr/checkout/' + path)
251
 
 
252
 
    def test_convert_knit_merges_dirstate(self):
253
 
        tree = self.make_branch_and_tree('tree', format='knit')
254
 
        rev_id = tree.commit('first post')
255
 
        merge_tree = tree.bzrdir.sprout('tree2').open_workingtree()
256
 
        rev_id2 = tree.commit('second post')
257
 
        rev_id3 = merge_tree.commit('second merge post')
258
 
        tree.merge_from_branch(merge_tree.branch)
259
 
        target = bzrdir.format_registry.make_bzrdir('dirstate')
260
 
        converter = tree.bzrdir._format.get_converter(target)
261
 
        converter.convert(tree.bzrdir, None)
262
 
        new_tree = workingtree.WorkingTree.open('tree')
263
 
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
264
 
        self.assertEqual(rev_id2, new_tree.last_revision())
265
 
        self.assertEqual([rev_id2, rev_id3], new_tree.get_parent_ids())
266
 
        for path in ['basis-inventory-cache', 'inventory', 'last-revision',
267
 
            'pending-merges', 'stat-cache']:
268
 
            self.failIfExists('tree/.bzr/checkout/' + path)
 
119
        self.failUnlessExists(
 
120
            '.bzr/weaves/de/dir-20051005095101-da1441ea3fa6917a.weave')
269
121
 
270
122
 
271
123
_upgrade1_template = \
273
125
     ('foo', 'new contents\n'),
274
126
     ('.bzr/',),
275
127
     ('.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'),
 
128
      'This is a Bazaar-NG control directory.\nDo not change any files in this directory.\n'),
279
129
     ('.bzr/branch-format', 'Bazaar-NG branch, format 0.0.4\n'),
280
130
     ('.bzr/revision-history',
281
131
      'mbp@sourcefrog.net-20051004035611-176b16534b086b3c\n'
315
165
    ),
316
166
    ( './.bzr/', ),
317
167
    ( './.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'
 
168
        'This is a Bazaar-NG control directory.\n'
 
169
        'Do not change any files in this directory.\n'
321
170
    ),
322
171
    ( './.bzr/branch-format',
323
172
        'Bazaar-NG branch, format 0.0.4\n'
381
230
_upgrade_dir_template = [
382
231
    ( './.bzr/', ),
383
232
    ( './.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'
 
233
        'This is a Bazaar-NG control directory.\n'
 
234
        'Do not change any files in this directory.\n'
387
235
    ),
388
236
    ( './.bzr/branch-format',
389
237
        'Bazaar-NG branch, format 0.0.4\n'