← 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: Ross Lagerwall
  • Date: 2012-08-07 06:32:51 UTC
  • mto: (6437.63.5 2.5)
  • mto: This revision was merged to the branch mainline in revision 6558.
  • Revision ID: rosslagerwall@gmail.com-20120807063251-x9p03ghg2ws8oqjc
Add bzrlib/locale to .bzrignore

bzrlib/locale is generated with ./setup.py build_mo which is in turn called
by ./setup.py build

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_interrepository/test_fetch.py
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.kind(file_id) == "file":
 
80
                if tree.inventory[file_id].kind == "file":
81
81
                    tree.get_file(file_id).read()
82
82
 
83
83
        # makes a target version repo
237
237
        (stacked_left_tree,
238
238
         stacked_right_tree) = stacked_branch.repository.revision_trees(
239
239
            ['left', 'right'])
240
 
        self.assertEqual(
241
 
            left_tree.root_inventory, stacked_left_tree.root_inventory)
242
 
        self.assertEqual(
243
 
            right_tree.root_inventory, stacked_right_tree.root_inventory)
 
240
        self.assertEqual(left_tree.inventory, stacked_left_tree.inventory)
 
241
        self.assertEqual(right_tree.inventory, stacked_right_tree.inventory)
244
242
 
245
243
        # Finally, it's not enough to see that the basis inventories are
246
244
        # present.  The texts introduced in merge (and only those) should be
301
299
        stacked_branch.lock_read()
302
300
        self.addCleanup(stacked_branch.unlock)
303
301
        stacked_second_tree = stacked_branch.repository.revision_tree('second')
304
 
        self.assertEqual(second_tree, stacked_second_tree)
 
302
        self.assertEqual(second_tree.inventory, stacked_second_tree.inventory)
305
303
        # Finally, it's not enough to see that the basis inventories are
306
304
        # present.  The texts introduced in merge (and only those) should be
307
305
        # present, and also generating a stream should succeed without blowing
385
383
        (stacked_left_tree,
386
384
         stacked_right_tree) = new_stacked_branch.repository.revision_trees(
387
385
            ['left', 'right'])
388
 
        self.assertEqual(left_tree, stacked_left_tree)
389
 
        self.assertEqual(right_tree, stacked_right_tree)
 
386
        self.assertEqual(left_tree.inventory, stacked_left_tree.inventory)
 
387
        self.assertEqual(right_tree.inventory, stacked_right_tree.inventory)
390
388
        # Finally, it's not enough to see that the basis inventories are
391
389
        # present.  The texts introduced in merge (and only those) should be
392
390
        # present, and also generating a stream should succeed without blowing