~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_repository.py

  • Committer: Vincent Ladeuil
  • Date: 2012-02-14 17:22:37 UTC
  • mfrom: (6466 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6468.
  • Revision ID: v.ladeuil+lp@free.fr-20120214172237-7dv7er3n4uy8d5m4
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
524
524
        revision_tree.lock_read()
525
525
        try:
526
526
            self.assertRaises(errors.NoSuchFile, revision_tree.get_file_lines,
527
 
                revision_tree.inventory.root.file_id)
 
527
                revision_tree.get_root_id())
528
528
        finally:
529
529
            revision_tree.unlock()
530
530
        format = bzrdir.BzrDirMetaFormat1()
534
534
        revision_tree = tree.branch.repository.revision_tree('dull')
535
535
        revision_tree.lock_read()
536
536
        try:
537
 
            revision_tree.get_file_lines(revision_tree.inventory.root.file_id)
 
537
            revision_tree.get_file_lines(revision_tree.get_root_id())
538
538
        finally:
539
539
            revision_tree.unlock()
540
540
        tree.commit("Another dull commit", rev_id='dull2')
541
541
        revision_tree = tree.branch.repository.revision_tree('dull2')
542
542
        revision_tree.lock_read()
543
543
        self.addCleanup(revision_tree.unlock)
544
 
        self.assertEqual('dull', revision_tree.inventory.root.revision)
 
544
        self.assertEqual('dull',
 
545
                revision_tree.get_file_revision(revision_tree.get_root_id()))
545
546
 
546
547
    def test_supports_external_lookups(self):
547
548
        format = bzrdir.BzrDirMetaFormat1()