← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_inv.py

Merge in bzr-dir phase 2.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_inv.py
152
152
        self.tree_1 = self.branch.repository.revision_tree('1')
153
153
        self.inv_1 = self.branch.repository.get_inventory('1')
154
154
        self.file_1 = self.inv_1['fileid']
155
 
        self.tree_2 = self.branch.working_tree()
 
155
        self.tree_2 = self.wt
156
156
        self.inv_2 = self.tree_2.read_working_inventory()
157
157
        self.file_2 = self.inv_2['fileid']
158
158
        if has_symlinks():
346
346
        self.wt.add_pending_merge('B')
347
347
        self.wt.commit('merge in B', rev_id='D')
348
348
        self.inv_D = self.branch.repository.get_inventory('D')
349
 
        self.file_active = self.branch.working_tree().inventory['fileid']
 
349
        self.file_active = self.wt.inventory['fileid']
350
350
        self.weave = self.branch.repository.weave_store.get_weave('fileid',
351
351
            self.branch.get_transaction())
352
352
        
463
463
        # Now make sure that 'bzr branch' also preserves the
464
464
        # executable bit
465
465
        # TODO: Maybe this should be a blackbox test
466
 
        b.clone('b2', revision='r1')
467
 
        b2 = Branch.open('b2')
 
466
        d2 = b.bzrdir.clone('b2', revision_id='r1')
 
467
        t2 = d2.open_workingtree()
 
468
        b2 = t2.branch
468
469
        self.assertEquals('r1', b2.last_revision())
469
 
        t2 = b2.working_tree()
470
470
 
471
471
        self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
472
472
        self.failUnless(t2.is_executable(a_id), "'a' lost the execute bit")
475
475
        # Make sure pull will delete the files
476
476
        t2.pull(b)
477
477
        self.assertEquals('r2', b2.last_revision())
478
 
        # FIXME: Same thing here, t2 needs to be recreated
479
 
        del t2
480
 
        t2 = b2.working_tree()
481
478
        self.assertEqual([], [cn for cn,ie in t2.inventory.iter_entries()])
482
479
 
483
480
        # Now commit the changes on the first branch
486
483
        t.commit('resurrected', rev_id='r3')
487
484
 
488
485
        t2.pull(b)
489
 
        # FIXME: And here
490
 
        del t2
491
 
        t2 = b2.working_tree()
492
486
        self.assertEquals('r3', b2.last_revision())
493
487
        self.assertEqual(['a', 'b'], [cn for cn,ie in t2.inventory.iter_entries()])
494
488