/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/tests/test_merge_core.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2010-02-10 03:06:24 UTC
  • mfrom: (4961.2.22 progress)
  • Revision ID: pqm@pqm.ubuntu.com-20100210030624-wnjdp7yy7zb8vu7u
(mbp) Remove passing-around of ProgressBars

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_merge_core.py
752
752
    def test_from_revision_ids(self):
753
753
        this, other = self.set_up_trees()
754
754
        self.assertRaises(errors.NoSuchRevision, Merger.from_revision_ids,
755
 
                          progress.DummyProgress(), this, 'rev2b')
 
755
                          None, this, 'rev2b')
756
756
        this.lock_write()
757
757
        self.addCleanup(this.unlock)
758
 
        merger = Merger.from_revision_ids(progress.DummyProgress(), this,
 
758
        merger = Merger.from_revision_ids(None, this,
759
759
            'rev2b', other_branch=other.branch)
760
760
        self.assertEqual('rev2b', merger.other_rev_id)
761
761
        self.assertEqual('rev1', merger.base_rev_id)
762
 
        merger = Merger.from_revision_ids(progress.DummyProgress(), this,
 
762
        merger = Merger.from_revision_ids(None, this,
763
763
            'rev2b', 'rev2a', other_branch=other.branch)
764
764
        self.assertEqual('rev2a', merger.base_rev_id)
765
765
 
766
766
    def test_from_uncommitted(self):
767
767
        this, other = self.set_up_trees()
768
 
        merger = Merger.from_uncommitted(this, other, progress.DummyProgress())
 
768
        merger = Merger.from_uncommitted(this, other, None)
769
769
        self.assertIs(other, merger.other_tree)
770
770
        self.assertIs(None, merger.other_rev_id)
771
771
        self.assertEqual('rev2b', merger.base_rev_id)
784
784
        other.lock_read()
785
785
        self.addCleanup(other.unlock)
786
786
        merger, verified = Merger.from_mergeable(this, md,
787
 
            progress.DummyProgress())
 
787
            None)
788
788
        md.patch = None
789
789
        merger, verified = Merger.from_mergeable(this, md,
790
 
            progress.DummyProgress())
 
790
            None)
791
791
        self.assertEqual('inapplicable', verified)
792
792
        self.assertEqual('rev3', merger.other_rev_id)
793
793
        self.assertEqual('rev1', merger.base_rev_id)
794
794
        md.base_revision_id = 'rev2b'
795
795
        merger, verified = Merger.from_mergeable(this, md,
796
 
            progress.DummyProgress())
 
796
            None)
797
797
        self.assertEqual('rev2b', merger.base_rev_id)
798
798
 
799
799
    def test_from_mergeable_old_merge_directive(self):
803
803
        md = merge_directive.MergeDirective.from_objects(
804
804
            other.branch.repository, 'rev3', 0, 0, 'this')
805
805
        merger, verified = Merger.from_mergeable(this, md,
806
 
            progress.DummyProgress())
 
806
            None)
807
807
        self.assertEqual('rev3', merger.other_rev_id)
808
808
        self.assertEqual('rev1', merger.base_rev_id)