← 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-01-12 01:44:13 UTC
  • mto: (4634.119.3 2.0)
  • mto: This revision was merged to the branch mainline in revision 4951.
  • Revision ID: mbp@sourcefrog.net-20100112014413-uw90vrssc3trlzmt
https://launchpad.net/bugs/449372
Refuse to build with pyrex 0.9.4*

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
2146
2146
    def create_tree(self):
2147
2147
        tree = self.make_branch_and_tree('.')
2148
2148
        self.build_tree_contents([('a', 'content 1')])
 
2149
        tree.set_root_id('TREE_ROOT')
2149
2150
        tree.add('a', 'a-id')
2150
2151
        tree.commit('rev1', rev_id='rev1')
2151
2152
        return tree.branch.repository.revision_tree('rev1')
2613
2614
 
2614
2615
    def test_walkdirs(self):
2615
2616
        preview = self.get_empty_preview()
2616
 
        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)
2617
2620
        preview_tree = preview.get_preview_tree()
2618
2621
        file_trans_id = preview.new_file('a', preview.root, 'contents',
2619
2622
                                         'a-id')
2650
2653
        self.addCleanup(work_tree.unlock)
2651
2654
        preview = TransformPreview(work_tree)
2652
2655
        self.addCleanup(preview.finalize)
2653
 
        preview_tree = preview.get_preview_tree()
2654
2656
        file_trans_id = preview.trans_id_file_id('file-id')
2655
2657
        preview.delete_contents(file_trans_id)
2656
2658
        preview.create_file('a\nb\n', file_trans_id)
2657
2659
        pb = progress.DummyProgress()
 
2660
        preview_tree = preview.get_preview_tree()
2658
2661
        merger = Merger.from_revision_ids(pb, preview_tree,
2659
2662
                                          child_tree.branch.last_revision(),
2660
2663
                                          other_branch=child_tree.branch,
2667
2670
 
2668
2671
    def test_merge_preview_into_workingtree(self):
2669
2672
        tree = self.make_branch_and_tree('tree')
 
2673
        tree.set_root_id('TREE_ROOT')
2670
2674
        tt = TransformPreview(tree)
2671
2675
        self.addCleanup(tt.finalize)
2672
2676
        tt.new_file('name', tt.root, 'content', 'file-id')
2673
2677
        tree2 = self.make_branch_and_tree('tree2')
 
2678
        tree2.set_root_id('TREE_ROOT')
2674
2679
        pb = progress.DummyProgress()
2675
2680
        merger = Merger.from_uncommitted(tree2, tt.get_preview_tree(),
2676
2681
                                         pb, tree.basis_tree())
2722
2727
        rev2_tree = tree.branch.repository.revision_tree(rev2_id)
2723
2728
        self.assertEqual('contents', rev2_tree.get_file_text('file_id'))
2724
2729
 
 
2730
    def test_ascii_limbo_paths(self):
 
2731
        self.requireFeature(tests.UnicodeFilenameFeature)
 
2732
        branch = self.make_branch('any')
 
2733
        tree = branch.repository.revision_tree(_mod_revision.NULL_REVISION)
 
2734
        tt = TransformPreview(tree)
 
2735
        foo_id = tt.new_directory('', ROOT_PARENT)
 
2736
        bar_id = tt.new_file(u'\u1234bar', foo_id, 'contents')
 
2737
        limbo_path = tt._limbo_name(bar_id)
 
2738
        self.assertEqual(limbo_path.encode('ascii', 'replace'), limbo_path)
 
2739
 
2725
2740
 
2726
2741
class FakeSerializer(object):
2727
2742
    """Serializer implementation that simply returns the input.