/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_transform.py

  • Committer: Martin Pool
  • Date: 2010-01-15 04:17:57 UTC
  • mto: This revision was merged to the branch mainline in revision 5019.
  • Revision ID: mbp@sourcefrog.net-20100115041757-cd8pu9o5a511jc8q
Rip out most remaining uses of DummyProgressBar

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
2367
2367
    def test_ignore_pb(self):
2368
2368
        # pb could be supported, but TT.iter_changes doesn't support it.
2369
2369
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2370
 
        preview_tree.iter_changes(revision_tree, pb=progress.DummyProgress())
 
2370
        preview_tree.iter_changes(revision_tree)
2371
2371
 
2372
2372
    def test_kind(self):
2373
2373
        revision_tree = self.create_tree()
2775
2775
        file_trans_id = preview.trans_id_file_id('file-id')
2776
2776
        preview.delete_contents(file_trans_id)
2777
2777
        preview.create_file('a\nb\n', file_trans_id)
2778
 
        pb = progress.DummyProgress()
2779
2778
        preview_tree = preview.get_preview_tree()
2780
 
        merger = Merger.from_revision_ids(pb, preview_tree,
 
2779
        merger = Merger.from_revision_ids(None, preview_tree,
2781
2780
                                          child_tree.branch.last_revision(),
2782
2781
                                          other_branch=child_tree.branch,
2783
2782
                                          tree_branch=work_tree.branch)
2795
2794
        tt.new_file('name', tt.root, 'content', 'file-id')
2796
2795
        tree2 = self.make_branch_and_tree('tree2')
2797
2796
        tree2.set_root_id('TREE_ROOT')
2798
 
        pb = progress.DummyProgress()
2799
2797
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2800
 
                                         pb, tree.basis_tree())
 
2798
                                         None, tree.basis_tree())
2801
2799
        merger.merge_type = Merge3Merger
2802
2800
        merger.do_merge()
2803
2801
 
2813
2811
        tt.create_file('baz', trans_id)
2814
2812
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
2815
2813
        self.build_tree_contents([('tree2/foo', 'qux')])
2816
 
        pb = progress.DummyProgress()
 
2814
        pb = None
2817
2815
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2818
2816
                                         pb, tree.basis_tree())
2819
2817
        merger.merge_type = Merge3Merger