← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

Merge description into dont-add-conflict-helpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
1923
1923
        self.assertTrue(source.is_executable('file1-id'))
1924
1924
 
1925
1925
    def install_rot13_content_filter(self, pattern):
1926
 
        # We could use
1927
 
        # self.addCleanup(filters._reset_registry, filters._reset_registry())
1928
 
        # below, but that looks a bit... hard to read even if it's exactly
1929
 
        # the same thing.
1930
1926
        original_registry = filters._reset_registry()
1931
1927
        def restore_registry():
1932
1928
            filters._reset_registry(original_registry)
2371
2367
    def test_ignore_pb(self):
2372
2368
        # pb could be supported, but TT.iter_changes doesn't support it.
2373
2369
        revision_tree, preview_tree = self.get_tree_and_preview_tree()
2374
 
        preview_tree.iter_changes(revision_tree)
 
2370
        preview_tree.iter_changes(revision_tree, pb=progress.DummyProgress())
2375
2371
 
2376
2372
    def test_kind(self):
2377
2373
        revision_tree = self.create_tree()
2779
2775
        file_trans_id = preview.trans_id_file_id('file-id')
2780
2776
        preview.delete_contents(file_trans_id)
2781
2777
        preview.create_file('a\nb\n', file_trans_id)
 
2778
        pb = progress.DummyProgress()
2782
2779
        preview_tree = preview.get_preview_tree()
2783
 
        merger = Merger.from_revision_ids(None, preview_tree,
 
2780
        merger = Merger.from_revision_ids(pb, preview_tree,
2784
2781
                                          child_tree.branch.last_revision(),
2785
2782
                                          other_branch=child_tree.branch,
2786
2783
                                          tree_branch=work_tree.branch)
2798
2795
        tt.new_file('name', tt.root, 'content', 'file-id')
2799
2796
        tree2 = self.make_branch_and_tree('tree2')
2800
2797
        tree2.set_root_id('TREE_ROOT')
 
2798
        pb = progress.DummyProgress()
2801
2799
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2802
 
                                         None, tree.basis_tree())
 
2800
                                         pb, tree.basis_tree())
2803
2801
        merger.merge_type = Merge3Merger
2804
2802
        merger.do_merge()
2805
2803
 
2815
2813
        tt.create_file('baz', trans_id)
2816
2814
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
2817
2815
        self.build_tree_contents([('tree2/foo', 'qux')])
2818
 
        pb = None
 
2816
        pb = progress.DummyProgress()
2819
2817
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2820
2818
                                         pb, tree.basis_tree())
2821
2819
        merger.merge_type = Merge3Merger