← 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: Martin Pool
  • Date: 2007-04-04 06:17:31 UTC
  • mto: This revision was merged to the branch mainline in revision 2397.
  • Revision ID: mbp@sourcefrog.net-20070404061731-tt2xrzllqhbodn83
Contents of TODO file moved into bug tracker

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_upgrade.py
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:
42
42
 
43
43
 
44
44
class TestUpgrade(TestCaseWithTransport):
45
 
 
 
45
    
46
46
    def test_build_tree(self):
47
47
        """Test tree-building test helper"""
48
48
        self.build_tree_contents(_upgrade1_template)
67
67
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
68
68
        rt = b.repository.revision_tree(rh[0])
69
69
        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()
 
70
        eq(rt.get_file_text(foo_id), 'initial contents\n')
75
71
        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()
 
72
        eq(rt.get_file_text(foo_id), 'new contents\n')
81
73
        # check a backup was made:
82
74
        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')
 
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')
103
95
 
104
96
    def test_upgrade_with_ghosts(self):
105
97
        """Upgrade v0.0.4 tree containing ghost references.
106
98
 
107
99
        That is, some of the parents of revisions mentioned in the branch
108
 
        aren't present in the branch's storage.
 
100
        aren't present in the branch's storage. 
109
101
 
110
 
        This shouldn't normally happen in branches created entirely in
 
102
        This shouldn't normally happen in branches created entirely in 
111
103
        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
 
104
        other systems, where the importer knows about a revision but not 
113
105
        its contents."""
114
106
        eq = self.assertEquals
115
107
        self.build_tree_contents(_ghost_template)
125
117
        old_repodir = bzrlib.bzrdir.BzrDir.open_unsupported('.')
126
118
        old_repo_format = old_repodir.open_repository()._format
127
119
        upgrade('.')
128
 
        # this is the path to the literal file. As format changes
 
120
        # this is the path to the literal file. As format changes 
129
121
        # occur it needs to be updated. FIXME: ask the store for the
130
122
        # path.
131
123
        repo = bzrlib.repository.Repository.open('.')
132
124
        # it should have changed the format
133
125
        self.assertNotEqual(old_repo_format.__class__, repo._format.__class__)
134
 
        # 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 
135
127
        # '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)
 
128
        self.assertNotEqual(
 
129
            [],
 
130
            repo.text_store.get_weave(
 
131
                'dir-20051005095101-da1441ea3fa6917a',
 
132
                repo.get_transaction()))
142
133
 
143
134
    def test_upgrade_to_meta_sets_workingtree_last_revision(self):
144
135
        self.build_tree_contents(_upgrade_dir_template)
154
145
        upgrade('.', bzrdir.BzrDirFormat6())
155
146
        transport = get_transport('.')
156
147
        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
 
148
        assert not transport.has('.bzr/stat-cache')
 
149
        # XXX: upgrade fails if a .bzr.backup is already present
159
150
        # -- David Allouche 2006-08-11
160
 
        transport.delete_tree('backup.bzr')
 
151
        transport.delete_tree('.bzr.backup')
161
152
        # At this point, we have a format6 branch without checkout files.
162
153
        upgrade('.', bzrdir.BzrDirMetaFormat1())
163
154
        # The upgrade should not have set up a working tree.
172
163
           ['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
173
164
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
174
165
 
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
166
    def test_convert_branch5_branch6(self):
181
167
        branch = self.make_branch('branch', format='knit')
182
168
        branch.set_revision_history(['AB', 'CD'])
201
187
        branch2 = _mod_branch.Branch.open(self.get_url('branch'))
202
188
        self.assertIs(branch2.__class__, _mod_branch.BzrBranch6)
203
189
 
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
190
    def test_convert_knit_dirstate_empty(self):
215
191
        # test that asking for an upgrade from knit to dirstate works.
216
192
        tree = self.make_branch_and_tree('tree', format='knit')
219
195
        converter.convert(tree.bzrdir, progress.DummyProgress())
220
196
        new_tree = workingtree.WorkingTree.open('tree')
221
197
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
222
 
        self.assertEqual('null:', new_tree.last_revision())
 
198
        self.assertEqual(None, new_tree.last_revision())
223
199
 
224
200
    def test_convert_knit_dirstate_content(self):
225
201
        # smoke test for dirstate conversion: we call dirstate primitives,
232
208
        converter.convert(tree.bzrdir, progress.DummyProgress())
233
209
        new_tree = workingtree.WorkingTree.open('tree')
234
210
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
235
 
        self.assertEqual('null:', new_tree.last_revision())
 
211
        self.assertEqual(None, new_tree.last_revision())
236
212
 
237
213
    def test_convert_knit_one_parent_dirstate(self):
238
214
        # test that asking for an upgrade from knit to dirstate works.
272
248
     ('foo', 'new contents\n'),
273
249
     ('.bzr/',),
274
250
     ('.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'),
 
251
      'This is a Bazaar-NG control directory.\nDo not change any files in this directory.\n'),
278
252
     ('.bzr/branch-format', 'Bazaar-NG branch, format 0.0.4\n'),
279
253
     ('.bzr/revision-history',
280
254
      'mbp@sourcefrog.net-20051004035611-176b16534b086b3c\n'
314
288
    ),
315
289
    ( './.bzr/', ),
316
290
    ( './.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'
 
291
        'This is a Bazaar-NG control directory.\n'
 
292
        'Do not change any files in this directory.\n'
320
293
    ),
321
294
    ( './.bzr/branch-format',
322
295
        'Bazaar-NG branch, format 0.0.4\n'
380
353
_upgrade_dir_template = [
381
354
    ( './.bzr/', ),
382
355
    ( './.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'
 
356
        'This is a Bazaar-NG control directory.\n'
 
357
        'Do not change any files in this directory.\n'
386
358
    ),
387
359
    ( './.bzr/branch-format',
388
360
        'Bazaar-NG branch, format 0.0.4\n'