← 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: 2007-04-19 02:27:44 UTC
  • mto: This revision was merged to the branch mainline in revision 2426.
  • Revision ID: robertc@robertcollins.net-20070419022744-pfdqz42kp1wizh43
``make docs`` now creates a man page at ``man1/bzr.1`` fixing bug 107388.
(Robert Collins)

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 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:
31
31
    bzrdir,
32
32
    progress,
33
33
    repository,
34
 
    transport,
35
34
    workingtree,
36
35
    workingtree_4,
37
36
    )
38
37
import bzrlib.branch
39
38
from bzrlib.branch import Branch
40
39
from bzrlib.tests import TestCaseWithTransport
 
40
from bzrlib.transport import get_transport
41
41
from bzrlib.upgrade import upgrade
42
42
 
43
43
 
44
44
class TestUpgrade(TestCaseWithTransport):
 
45
    
 
46
    def test_build_tree(self):
 
47
        """Test tree-building test helper"""
 
48
        self.build_tree_contents(_upgrade1_template)
 
49
        self.failUnlessExists('foo')
 
50
        self.failUnlessExists('.bzr/README')
45
51
 
46
52
    def test_upgrade_simple(self):
47
53
        """Upgrade simple v0.0.4 format to latest format"""
61
67
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
62
68
        rt = b.repository.revision_tree(rh[0])
63
69
        foo_id = 'foo-20051004035605-91e788d1875603ae'
64
 
        rt.lock_read()
65
 
        try:
66
 
            eq(rt.get_file_text(foo_id), 'initial contents\n')
67
 
        finally:
68
 
            rt.unlock()
 
70
        eq(rt.get_file_text(foo_id), 'initial contents\n')
69
71
        rt = b.repository.revision_tree(rh[1])
70
 
        rt.lock_read()
71
 
        try:
72
 
            eq(rt.get_file_text(foo_id), 'new contents\n')
73
 
        finally:
74
 
            rt.unlock()
 
72
        eq(rt.get_file_text(foo_id), 'new contents\n')
75
73
        # check a backup was made:
76
 
        backup_dir = 'backup.bzr.~1~'
77
 
        t = transport.get_transport(b.base)
78
 
        t.stat(backup_dir)
79
 
        t.stat(backup_dir + '/README')
80
 
        t.stat(backup_dir + '/branch-format')
81
 
        t.stat(backup_dir + '/revision-history')
82
 
        t.stat(backup_dir + '/merged-patches')
83
 
        t.stat(backup_dir + '/pending-merged-patches')
84
 
        t.stat(backup_dir + '/pending-merges')
85
 
        t.stat(backup_dir + '/branch-name')
86
 
        t.stat(backup_dir + '/branch-lock')
87
 
        t.stat(backup_dir + '/inventory')
88
 
        t.stat(backup_dir + '/stat-cache')
89
 
        t.stat(backup_dir + '/text-store')
90
 
        t.stat(backup_dir + '/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
91
 
        t.stat(backup_dir + '/text-store/foo-20051004035756-4081373d897c3453.gz')
92
 
        t.stat(backup_dir + '/inventory-store/')
93
 
        t.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
94
 
        t.stat(backup_dir + '/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
95
 
        t.stat(backup_dir + '/revision-store/')
96
 
        t.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
97
 
        t.stat(backup_dir + '/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
 
74
        transport = get_transport(b.base)
 
75
        transport.stat('.bzr.backup')
 
76
        transport.stat('.bzr.backup/README')
 
77
        transport.stat('.bzr.backup/branch-format')
 
78
        transport.stat('.bzr.backup/revision-history')
 
79
        transport.stat('.bzr.backup/merged-patches')
 
80
        transport.stat('.bzr.backup/pending-merged-patches')
 
81
        transport.stat('.bzr.backup/pending-merges')
 
82
        transport.stat('.bzr.backup/branch-name')
 
83
        transport.stat('.bzr.backup/branch-lock')
 
84
        transport.stat('.bzr.backup/inventory')
 
85
        transport.stat('.bzr.backup/stat-cache')
 
86
        transport.stat('.bzr.backup/text-store')
 
87
        transport.stat('.bzr.backup/text-store/foo-20051004035611-1591048e9dc7c2d4.gz')
 
88
        transport.stat('.bzr.backup/text-store/foo-20051004035756-4081373d897c3453.gz')
 
89
        transport.stat('.bzr.backup/inventory-store/')
 
90
        transport.stat('.bzr.backup/inventory-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
 
91
        transport.stat('.bzr.backup/inventory-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
 
92
        transport.stat('.bzr.backup/revision-store/')
 
93
        transport.stat('.bzr.backup/revision-store/mbp@sourcefrog.net-20051004035611-176b16534b086b3c.gz')
 
94
        transport.stat('.bzr.backup/revision-store/mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd.gz')
98
95
 
99
96
    def test_upgrade_with_ghosts(self):
100
97
        """Upgrade v0.0.4 tree containing ghost references.
101
98
 
102
99
        That is, some of the parents of revisions mentioned in the branch
103
 
        aren't present in the branch's storage.
 
100
        aren't present in the branch's storage. 
104
101
 
105
 
        This shouldn't normally happen in branches created entirely in
 
102
        This shouldn't normally happen in branches created entirely in 
106
103
        bzr, but can happen in branches imported from baz and arch, or from
107
 
        other systems, where the importer knows about a revision but not
 
104
        other systems, where the importer knows about a revision but not 
108
105
        its contents."""
109
106
        eq = self.assertEquals
110
107
        self.build_tree_contents(_ghost_template)
120
117
        old_repodir = bzrlib.bzrdir.BzrDir.open_unsupported('.')
121
118
        old_repo_format = old_repodir.open_repository()._format
122
119
        upgrade('.')
123
 
        # this is the path to the literal file. As format changes
 
120
        # this is the path to the literal file. As format changes 
124
121
        # occur it needs to be updated. FIXME: ask the store for the
125
122
        # path.
126
123
        repo = bzrlib.repository.Repository.open('.')
127
124
        # it should have changed the format
128
125
        self.assertNotEqual(old_repo_format.__class__, repo._format.__class__)
129
 
        # and we should be able to read the names for the file id
 
126
        # and we should be able to read the names for the file id 
130
127
        # 'dir-20051005095101-da1441ea3fa6917a'
131
 
        repo.lock_read()
132
 
        self.addCleanup(repo.unlock)
133
 
        text_keys = repo.texts.keys()
134
 
        dir_keys = [key for key in text_keys if key[0] ==
135
 
                'dir-20051005095101-da1441ea3fa6917a']
136
 
        self.assertNotEqual([], dir_keys)
 
128
        self.assertNotEqual(
 
129
            [],
 
130
            repo.text_store.get_weave(
 
131
                'dir-20051005095101-da1441ea3fa6917a',
 
132
                repo.get_transaction()))
137
133
 
138
134
    def test_upgrade_to_meta_sets_workingtree_last_revision(self):
139
135
        self.build_tree_contents(_upgrade_dir_template)
147
143
        # such a branch to metadir must not setup a working tree.
148
144
        self.build_tree_contents(_upgrade1_template)
149
145
        upgrade('.', bzrdir.BzrDirFormat6())
150
 
        t = transport.get_transport('.')
151
 
        t.delete_multi(['.bzr/pending-merges', '.bzr/inventory'])
152
 
        self.assertFalse(t.has('.bzr/stat-cache'))
153
 
        # XXX: upgrade fails if a backup.bzr is already present
 
146
        transport = get_transport('.')
 
147
        transport.delete_multi(['.bzr/pending-merges', '.bzr/inventory'])
 
148
        assert not transport.has('.bzr/stat-cache')
 
149
        # XXX: upgrade fails if a .bzr.backup is already present
154
150
        # -- David Allouche 2006-08-11
155
 
        t.delete_tree('backup.bzr.~1~')
 
151
        transport.delete_tree('.bzr.backup')
156
152
        # At this point, we have a format6 branch without checkout files.
157
153
        upgrade('.', bzrdir.BzrDirMetaFormat1())
158
154
        # The upgrade should not have set up a working tree.
167
163
           ['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
168
164
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
169
165
 
170
 
    def test_upgrade_rich_root(self):
171
 
        tree = self.make_branch_and_tree('tree', format='rich-root')
172
 
        rev_id = tree.commit('first post')
173
 
        upgrade('tree')
174
 
 
175
166
    def test_convert_branch5_branch6(self):
176
167
        branch = self.make_branch('branch', format='knit')
177
168
        branch.set_revision_history(['AB', 'CD'])
180
171
        branch.set_push_location('file:///IJ')
181
172
        target = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
182
173
        converter = branch.bzrdir._format.get_converter(target)
183
 
        converter.convert(branch.bzrdir, None)
 
174
        converter.convert(branch.bzrdir, progress.DummyProgress())
184
175
        new_branch = _mod_branch.Branch.open(self.get_url('branch'))
185
176
        self.assertIs(new_branch.__class__, _mod_branch.BzrBranch6)
186
177
        self.assertEqual('CD', new_branch.last_revision())
192
183
 
193
184
        branch2 = self.make_branch('branch2', format='knit')
194
185
        converter = branch2.bzrdir._format.get_converter(target)
195
 
        converter.convert(branch2.bzrdir, None)
 
186
        converter.convert(branch2.bzrdir, progress.DummyProgress())
196
187
        branch2 = _mod_branch.Branch.open(self.get_url('branch'))
197
188
        self.assertIs(branch2.__class__, _mod_branch.BzrBranch6)
198
189
 
199
 
    def test_convert_branch7_branch8(self):
200
 
        branch = self.make_branch('branch', format='1.9')
201
 
        target = bzrdir.format_registry.make_bzrdir('1.9')
202
 
        target.set_branch_format(_mod_branch.BzrBranchFormat8())
203
 
        converter = branch.bzrdir._format.get_converter(target)
204
 
        converter.convert(branch.bzrdir, None)
205
 
        branch = _mod_branch.Branch.open(self.get_url('branch'))
206
 
        self.assertIs(branch.__class__, _mod_branch.BzrBranch8)
207
 
        self.assertEqual({}, branch._get_all_reference_info())
208
 
 
209
190
    def test_convert_knit_dirstate_empty(self):
210
191
        # test that asking for an upgrade from knit to dirstate works.
211
192
        tree = self.make_branch_and_tree('tree', format='knit')
212
193
        target = bzrdir.format_registry.make_bzrdir('dirstate')
213
194
        converter = tree.bzrdir._format.get_converter(target)
214
 
        converter.convert(tree.bzrdir, None)
 
195
        converter.convert(tree.bzrdir, progress.DummyProgress())
215
196
        new_tree = workingtree.WorkingTree.open('tree')
216
197
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
217
 
        self.assertEqual('null:', new_tree.last_revision())
 
198
        self.assertEqual(None, new_tree.last_revision())
218
199
 
219
200
    def test_convert_knit_dirstate_content(self):
220
201
        # smoke test for dirstate conversion: we call dirstate primitives,
224
205
        tree.add(['file'], ['file-id'])
225
206
        target = bzrdir.format_registry.make_bzrdir('dirstate')
226
207
        converter = tree.bzrdir._format.get_converter(target)
227
 
        converter.convert(tree.bzrdir, None)
 
208
        converter.convert(tree.bzrdir, progress.DummyProgress())
228
209
        new_tree = workingtree.WorkingTree.open('tree')
229
210
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
230
 
        self.assertEqual('null:', new_tree.last_revision())
 
211
        self.assertEqual(None, new_tree.last_revision())
231
212
 
232
213
    def test_convert_knit_one_parent_dirstate(self):
233
214
        # test that asking for an upgrade from knit to dirstate works.
235
216
        rev_id = tree.commit('first post')
236
217
        target = bzrdir.format_registry.make_bzrdir('dirstate')
237
218
        converter = tree.bzrdir._format.get_converter(target)
238
 
        converter.convert(tree.bzrdir, None)
 
219
        converter.convert(tree.bzrdir, progress.DummyProgress())
239
220
        new_tree = workingtree.WorkingTree.open('tree')
240
221
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
241
222
        self.assertEqual(rev_id, new_tree.last_revision())
252
233
        tree.merge_from_branch(merge_tree.branch)
253
234
        target = bzrdir.format_registry.make_bzrdir('dirstate')
254
235
        converter = tree.bzrdir._format.get_converter(target)
255
 
        converter.convert(tree.bzrdir, None)
 
236
        converter.convert(tree.bzrdir, progress.DummyProgress())
256
237
        new_tree = workingtree.WorkingTree.open('tree')
257
238
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
258
239
        self.assertEqual(rev_id2, new_tree.last_revision())
267
248
     ('foo', 'new contents\n'),
268
249
     ('.bzr/',),
269
250
     ('.bzr/README',
270
 
      'This is a Bazaar control directory.\n'
271
 
      'Do not change any files in this directory.\n'
272
 
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'),
 
251
      'This is a Bazaar-NG control directory.\nDo not change any files in this directory.\n'),
273
252
     ('.bzr/branch-format', 'Bazaar-NG branch, format 0.0.4\n'),
274
253
     ('.bzr/revision-history',
275
254
      'mbp@sourcefrog.net-20051004035611-176b16534b086b3c\n'
309
288
    ),
310
289
    ( './.bzr/', ),
311
290
    ( './.bzr/README',
312
 
      'This is a Bazaar control directory.\n'
313
 
      'Do not change any files in this directory.\n'
314
 
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
 
291
        'This is a Bazaar-NG control directory.\n'
 
292
        'Do not change any files in this directory.\n'
315
293
    ),
316
294
    ( './.bzr/branch-format',
317
295
        'Bazaar-NG branch, format 0.0.4\n'
375
353
_upgrade_dir_template = [
376
354
    ( './.bzr/', ),
377
355
    ( './.bzr/README',
378
 
      'This is a Bazaar control directory.\n'
379
 
      'Do not change any files in this directory.\n'
380
 
      'See http://bazaar-vcs.org/ for more information about Bazaar.\n'
 
356
        'This is a Bazaar-NG control directory.\n'
 
357
        'Do not change any files in this directory.\n'
381
358
    ),
382
359
    ( './.bzr/branch-format',
383
360
        'Bazaar-NG branch, format 0.0.4\n'