~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

Show diffs side-by-side

added added

removed removed

Lines of Context:
2614
2614
 
2615
2615
    def test_walkdirs(self):
2616
2616
        preview = self.get_empty_preview()
2617
 
        preview.version_file('tree-root', preview.root)
 
2617
        root = preview.new_directory('', ROOT_PARENT, 'tree-root')
 
2618
        # FIXME: new_directory should mark root.
 
2619
        preview.adjust_path('', ROOT_PARENT, root)
2618
2620
        preview_tree = preview.get_preview_tree()
2619
2621
        file_trans_id = preview.new_file('a', preview.root, 'contents',
2620
2622
                                         'a-id')
2651
2653
        self.addCleanup(work_tree.unlock)
2652
2654
        preview = TransformPreview(work_tree)
2653
2655
        self.addCleanup(preview.finalize)
2654
 
        preview_tree = preview.get_preview_tree()
2655
2656
        file_trans_id = preview.trans_id_file_id('file-id')
2656
2657
        preview.delete_contents(file_trans_id)
2657
2658
        preview.create_file('a\nb\n', file_trans_id)
2658
2659
        pb = progress.DummyProgress()
 
2660
        preview_tree = preview.get_preview_tree()
2659
2661
        merger = Merger.from_revision_ids(pb, preview_tree,
2660
2662
                                          child_tree.branch.last_revision(),
2661
2663
                                          other_branch=child_tree.branch,