← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: Martin Pool
  • Date: 2010-02-25 06:17:27 UTC
  • mfrom: (5055 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5057.
  • Revision ID: mbp@sourcefrog.net-20100225061727-4sd9lt0qmdc6087t
merge news

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
2371
2371
    def test_ignore_pb(self):
2372
2372
        # pb could be supported, but TT.iter_changes doesn't support it.
2373
2373
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2374
 
        preview_tree.iter_changes(revision_tree, pb=progress.DummyProgress())
 
2374
        preview_tree.iter_changes(revision_tree)
2375
2375
 
2376
2376
    def test_kind(self):
2377
2377
        revision_tree = self.create_tree()
2779
2779
        file_trans_id = preview.trans_id_file_id('file-id')
2780
2780
        preview.delete_contents(file_trans_id)
2781
2781
        preview.create_file('a\nb\n', file_trans_id)
2782
 
        pb = progress.DummyProgress()
2783
2782
        preview_tree = preview.get_preview_tree()
2784
 
        merger = Merger.from_revision_ids(pb, preview_tree,
 
2783
        merger = Merger.from_revision_ids(None, preview_tree,
2785
2784
                                          child_tree.branch.last_revision(),
2786
2785
                                          other_branch=child_tree.branch,
2787
2786
                                          tree_branch=work_tree.branch)
2799
2798
        tt.new_file('name', tt.root, 'content', 'file-id')
2800
2799
        tree2 = self.make_branch_and_tree('tree2')
2801
2800
        tree2.set_root_id('TREE_ROOT')
2802
 
        pb = progress.DummyProgress()
2803
2801
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2804
 
                                         pb, tree.basis_tree())
 
2802
                                         None, tree.basis_tree())
2805
2803
        merger.merge_type = Merge3Merger
2806
2804
        merger.do_merge()
2807
2805
 
2817
2815
        tt.create_file('baz', trans_id)
2818
2816
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
2819
2817
        self.build_tree_contents([('tree2/foo', 'qux')])
2820
 
        pb = progress.DummyProgress()
 
2818
        pb = None
2821
2819
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2822
2820
                                         pb, tree.basis_tree())
2823
2821
        merger.merge_type = Merge3Merger