← 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: John Arbash Meinel
  • Date: 2010-02-10 17:52:08 UTC
  • mfrom: (5021 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5023.
  • Revision ID: john@arbash-meinel.com-20100210175208-bubuwav4uqigu291
Merge bzr.dev 5021 to resolve NEWS

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-2010 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
185
185
        branch.set_push_location('file:///IJ')
186
186
        target = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
187
187
        converter = branch.bzrdir._format.get_converter(target)
188
 
        converter.convert(branch.bzrdir, progress.DummyProgress())
 
188
        converter.convert(branch.bzrdir, None)
189
189
        new_branch = _mod_branch.Branch.open(self.get_url('branch'))
190
190
        self.assertIs(new_branch.__class__, _mod_branch.BzrBranch6)
191
191
        self.assertEqual('CD', new_branch.last_revision())
197
197
 
198
198
        branch2 = self.make_branch('branch2', format='knit')
199
199
        converter = branch2.bzrdir._format.get_converter(target)
200
 
        converter.convert(branch2.bzrdir, progress.DummyProgress())
 
200
        converter.convert(branch2.bzrdir, None)
201
201
        branch2 = _mod_branch.Branch.open(self.get_url('branch'))
202
202
        self.assertIs(branch2.__class__, _mod_branch.BzrBranch6)
203
203
 
206
206
        target = bzrdir.format_registry.make_bzrdir('1.9')
207
207
        target.set_branch_format(_mod_branch.BzrBranchFormat8())
208
208
        converter = branch.bzrdir._format.get_converter(target)
209
 
        converter.convert(branch.bzrdir, progress.DummyProgress())
 
209
        converter.convert(branch.bzrdir, None)
210
210
        branch = _mod_branch.Branch.open(self.get_url('branch'))
211
211
        self.assertIs(branch.__class__, _mod_branch.BzrBranch8)
212
212
        self.assertEqual({}, branch._get_all_reference_info())
216
216
        tree = self.make_branch_and_tree('tree', format='knit')
217
217
        target = bzrdir.format_registry.make_bzrdir('dirstate')
218
218
        converter = tree.bzrdir._format.get_converter(target)
219
 
        converter.convert(tree.bzrdir, progress.DummyProgress())
 
219
        converter.convert(tree.bzrdir, None)
220
220
        new_tree = workingtree.WorkingTree.open('tree')
221
221
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
222
222
        self.assertEqual('null:', new_tree.last_revision())
229
229
        tree.add(['file'], ['file-id'])
230
230
        target = bzrdir.format_registry.make_bzrdir('dirstate')
231
231
        converter = tree.bzrdir._format.get_converter(target)
232
 
        converter.convert(tree.bzrdir, progress.DummyProgress())
 
232
        converter.convert(tree.bzrdir, None)
233
233
        new_tree = workingtree.WorkingTree.open('tree')
234
234
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
235
235
        self.assertEqual('null:', new_tree.last_revision())
240
240
        rev_id = tree.commit('first post')
241
241
        target = bzrdir.format_registry.make_bzrdir('dirstate')
242
242
        converter = tree.bzrdir._format.get_converter(target)
243
 
        converter.convert(tree.bzrdir, progress.DummyProgress())
 
243
        converter.convert(tree.bzrdir, None)
244
244
        new_tree = workingtree.WorkingTree.open('tree')
245
245
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
246
246
        self.assertEqual(rev_id, new_tree.last_revision())
257
257
        tree.merge_from_branch(merge_tree.branch)
258
258
        target = bzrdir.format_registry.make_bzrdir('dirstate')
259
259
        converter = tree.bzrdir._format.get_converter(target)
260
 
        converter.convert(tree.bzrdir, progress.DummyProgress())
 
260
        converter.convert(tree.bzrdir, None)
261
261
        new_tree = workingtree.WorkingTree.open('tree')
262
262
        self.assertIs(new_tree.__class__, workingtree_4.WorkingTree4)
263
263
        self.assertEqual(rev_id2, new_tree.last_revision())