← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/plugins/weave_fmt/test_bzrdir.py

  • Committer: Jelmer Vernooij
  • Date: 2011-10-06 00:14:01 UTC
  • mto: This revision was merged to the branch mainline in revision 6216.
  • Revision ID: jelmer@samba.org-20111006001401-o14rsyp6gdy5vt3o
Fix plugin use of revision_history.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/plugins/weave_fmt/test_bzrdir.py
308
308
        # other tests.
309
309
        self.assertIsInstance(control._format, bzrdir.BzrDirMetaFormat1)
310
310
        b = control.open_branch()
311
 
        self.assertEquals(b.revision_history(),
 
311
        self.assertEquals(b._revision_history(),
312
312
           ['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
313
313
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
314
314
 
323
323
        self.assertIsInstance(
324
324
            control._format,
325
325
            bzrdir.BzrDirFormat.get_default_format().__class__)
326
 
        rh = b.revision_history()
 
326
        rh = b._revision_history()
327
327
        eq(rh,
328
328
           ['mbp@sourcefrog.net-20051004035611-176b16534b086b3c',
329
329
            'mbp@sourcefrog.net-20051004035756-235f2b7dcdddd8dd'])
378
378
        self.build_tree_contents(_ghost_template)
379
379
        upgrade.upgrade(u'.')
380
380
        b = branch.Branch.open(u'.')
381
 
        revision_id = b.revision_history()[1]
 
381
        revision_id = b._revision_history()[1]
382
382
        rev = b.repository.get_revision(revision_id)
383
383
        eq(len(rev.parent_ids), 2)
384
384
        eq(rev.parent_ids[1], 'wibble@wobble-2')
407
407
        self.build_tree_contents(_upgrade_dir_template)
408
408
        upgrade.upgrade('.', bzrdir.BzrDirMetaFormat1())
409
409
        tree = workingtree.WorkingTree.open('.')
410
 
        self.assertEqual([tree.branch.revision_history()[-1]],
 
410
        self.assertEqual([tree.branch._revision_history()[-1]],
411
411
            tree.get_parent_ids())
412
412
 
413
413