← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_interrepository/test_fetch.py

  • Committer: Vincent Ladeuil
  • Date: 2012-03-13 17:25:29 UTC
  • mfrom: (6499 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6501.
  • Revision ID: v.ladeuil+lp@free.fr-20120313172529-i0suyjnepsor25i7
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interrepository/test_fetch.py
27
27
from bzrlib.errors import (
28
28
    NoSuchRevision,
29
29
    )
30
 
from bzrlib.graph import (
 
30
from bzrlib.vf_search import (
31
31
    SearchResult,
32
32
    )
33
33
from bzrlib.revision import (
77
77
            self.addCleanup(tree.unlock)
78
78
            tree.get_file_text('file1')
79
79
            for file_id in tree.all_file_ids():
80
 
                if tree.inventory[file_id].kind == "file":
 
80
                if tree.kind(file_id) == "file":
81
81
                    tree.get_file(file_id).read()
82
82
 
83
83
        # makes a target version repo
234
234
        (stacked_left_tree,
235
235
         stacked_right_tree) = stacked_branch.repository.revision_trees(
236
236
            ['left', 'right'])
237
 
        self.assertEqual(left_tree.inventory, stacked_left_tree.inventory)
238
 
        self.assertEqual(right_tree.inventory, stacked_right_tree.inventory)
 
237
        self.assertEqual(
 
238
            left_tree.root_inventory, stacked_left_tree.root_inventory)
 
239
        self.assertEqual(
 
240
            right_tree.root_inventory, stacked_right_tree.root_inventory)
239
241
 
240
242
        # Finally, it's not enough to see that the basis inventories are
241
243
        # present.  The texts introduced in merge (and only those) should be
296
298
        stacked_branch.lock_read()
297
299
        self.addCleanup(stacked_branch.unlock)
298
300
        stacked_second_tree = stacked_branch.repository.revision_tree('second')
299
 
        self.assertEqual(second_tree.inventory, stacked_second_tree.inventory)
 
301
        self.assertEqual(second_tree.root_inventory,
 
302
            stacked_second_tree.root_inventory)
300
303
        # Finally, it's not enough to see that the basis inventories are
301
304
        # present.  The texts introduced in merge (and only those) should be
302
305
        # present, and also generating a stream should succeed without blowing
380
383
        (stacked_left_tree,
381
384
         stacked_right_tree) = new_stacked_branch.repository.revision_trees(
382
385
            ['left', 'right'])
383
 
        self.assertEqual(left_tree.inventory, stacked_left_tree.inventory)
384
 
        self.assertEqual(right_tree.inventory, stacked_right_tree.inventory)
 
386
        self.assertEqual(left_tree, stacked_left_tree)
 
387
        self.assertEqual(right_tree, stacked_right_tree)
385
388
        # Finally, it's not enough to see that the basis inventories are
386
389
        # present.  The texts introduced in merge (and only those) should be
387
390
        # present, and also generating a stream should succeed without blowing