/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/selftest/blackbox.py

Refactored out ControlFiles and RevisionStore from _Branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/selftest/blackbox.py
393
393
        # Merging a branch pulls its revision into the tree
394
394
        a = Branch.open('.')
395
395
        b = Branch.open('../b')
396
 
        a.get_revision_xml(b.last_revision())
 
396
        a.storage.get_revision_xml(b.last_revision())
397
397
        self.log('pending merges: %s', a.pending_merges())
398
398
        self.assertEquals(a.pending_merges(), [b.last_revision()])
399
399
        self.runbzr('commit -m merged')
742
742
            from bzrlib.testament import Testament
743
743
            bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
744
744
            self.runbzr('re-sign -r revid:A')
745
 
            self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
746
 
                             branch.revision_store.get('A', 'sig').read())
 
745
            self.assertEqual(Testament.from_revision(branch.storage,
 
746
                             'A').as_short_text(),
 
747
                             branch.storage.revision_store.get('A', 
 
748
                             'sig').read())
747
749
        finally:
748
750
            bzrlib.gpg.GPGStrategy = oldstrategy
749
751
            
759
761
            from bzrlib.testament import Testament
760
762
            bzrlib.gpg.GPGStrategy = bzrlib.gpg.LoopbackGPGStrategy
761
763
            self.runbzr('re-sign -r 1..')
762
 
            self.assertEqual(Testament.from_revision(branch,'A').as_short_text(),
763
 
                             branch.revision_store.get('A', 'sig').read())
764
 
            self.assertEqual(Testament.from_revision(branch,'B').as_short_text(),
765
 
                             branch.revision_store.get('B', 'sig').read())
766
 
            self.assertEqual(Testament.from_revision(branch,'C').as_short_text(),
767
 
                             branch.revision_store.get('C', 'sig').read())
 
764
            self.assertEqual(
 
765
                Testament.from_revision(branch.storage,'A').as_short_text(),
 
766
                branch.storage.revision_store.get('A', 'sig').read())
 
767
            self.assertEqual(
 
768
                Testament.from_revision(branch.storage,'B').as_short_text(),
 
769
                branch.storage.revision_store.get('B', 'sig').read())
 
770
            self.assertEqual(Testament.from_revision(branch.storage,
 
771
                             'C').as_short_text(),
 
772
                             branch.storage.revision_store.get('C', 
 
773
                             'sig').read())
768
774
        finally:
769
775
            bzrlib.gpg.GPGStrategy = oldstrategy
770
776