← 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: Jelmer Vernooij
  • Date: 2010-01-31 12:10:40 UTC
  • mto: This revision was merged to the branch mainline in revision 4993.
  • Revision ID: jelmer@samba.org-20100131121040-64t9ykvo2oz4pknx
rename Repository.deserialise_inventory to Repository._deserialise_inventory.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
735
735
                                         ' versioned, but has versioned'
736
736
                                         ' children.  Versioned directory.')
737
737
        self.assertEqual(conflicts_s[6], 'Conflict moving oz/emeraldcity into'
738
 
                                         ' oz/emeraldcity. Cancelled move.')
 
738
                                         ' oz/emeraldcity.  Cancelled move.')
739
739
 
740
740
    def prepare_wrong_parent_kind(self):
741
741
        tt, root = self.get_transform()
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)
 
2374
        preview_tree.iter_changes(revision_tree, pb=progress.DummyProgress())
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()
2782
2783
        preview_tree = preview.get_preview_tree()
2783
 
        merger = Merger.from_revision_ids(None, preview_tree,
 
2784
        merger = Merger.from_revision_ids(pb, preview_tree,
2784
2785
                                          child_tree.branch.last_revision(),
2785
2786
                                          other_branch=child_tree.branch,
2786
2787
                                          tree_branch=work_tree.branch)
2798
2799
        tt.new_file('name', tt.root, 'content', 'file-id')
2799
2800
        tree2 = self.make_branch_and_tree('tree2')
2800
2801
        tree2.set_root_id('TREE_ROOT')
 
2802
        pb = progress.DummyProgress()
2801
2803
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2802
 
                                         None, tree.basis_tree())
 
2804
                                         pb, tree.basis_tree())
2803
2805
        merger.merge_type = Merge3Merger
2804
2806
        merger.do_merge()
2805
2807
 
2815
2817
        tt.create_file('baz', trans_id)
2816
2818
        tree2 = tree.bzrdir.sprout('tree2').open_workingtree()
2817
2819
        self.build_tree_contents([('tree2/foo', 'qux')])
2818
 
        pb = None
 
2820
        pb = progress.DummyProgress()
2819
2821
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2820
2822
                                         pb, tree.basis_tree())
2821
2823
        merger.merge_type = Merge3Merger