← 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 lp:bzr.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
1916
1916
        branch.lock_write()
1917
1917
        self.addCleanup(branch.unlock)
1918
1918
        tt = TransformPreview(branch.basis_tree())
 
1919
        self.addCleanup(tt.finalize)
1919
1920
        tt.new_directory('', ROOT_PARENT, 'TREE_ROOT')
1920
1921
        rev = tt.commit(branch, 'my message')
1921
1922
        self.assertEqual([], branch.basis_tree().get_parent_ids())
1927
1928
        branch.lock_write()
1928
1929
        self.addCleanup(branch.unlock)
1929
1930
        tt = TransformPreview(branch.basis_tree())
 
1931
        self.addCleanup(tt.finalize)
1930
1932
        e = self.assertRaises(ValueError, tt.commit, branch,
1931
1933
                          'my message', ['rev1b-id'])
1932
1934
        self.assertEqual('Cannot supply merge parents for first commit.',
1957
1959
        tt.new_file('file', tt.root, 'contents', 'file-id')
1958
1960
        tt.commit(branch, 'message', strict=True)
1959
1961
        tt = TransformPreview(branch.basis_tree())
 
1962
        self.addCleanup(tt.finalize)
1960
1963
        trans_id = tt.trans_id_file_id('file-id')
1961
1964
        tt.delete_contents(trans_id)
1962
1965
        tt.create_file('contents', trans_id)
2274
2277
        self.assertEqual(os.stat(limbo_path).st_mtime,
2275
2278
                         preview_tree.get_file_mtime('file-id'))
2276
2279
 
 
2280
    def test_get_file_mtime_renamed(self):
 
2281
        work_tree = self.make_branch_and_tree('tree')
 
2282
        self.build_tree(['tree/file'])
 
2283
        work_tree.add('file', 'file-id')
 
2284
        preview = TransformPreview(work_tree)
 
2285
        self.addCleanup(preview.finalize)
 
2286
        file_trans_id = preview.trans_id_tree_file_id('file-id')
 
2287
        preview.adjust_path('renamed', preview.root, file_trans_id)
 
2288
        preview_tree = preview.get_preview_tree()
 
2289
        preview_mtime = preview_tree.get_file_mtime('file-id', 'renamed')
 
2290
        work_mtime = work_tree.get_file_mtime('file-id', 'file')
 
2291
 
2277
2292
    def test_get_file(self):
2278
2293
        preview = self.get_empty_preview()
2279
2294
        preview.new_file('file', preview.root, 'contents', 'file-id')
2614
2629
 
2615
2630
    def test_walkdirs(self):
2616
2631
        preview = self.get_empty_preview()
2617
 
        preview.version_file('tree-root', preview.root)
 
2632
        root = preview.new_directory('', ROOT_PARENT, 'tree-root')
 
2633
        # FIXME: new_directory should mark root.
 
2634
        preview.adjust_path('', ROOT_PARENT, root)
2618
2635
        preview_tree = preview.get_preview_tree()
2619
2636
        file_trans_id = preview.new_file('a', preview.root, 'contents',
2620
2637
                                         'a-id')
2651
2668
        self.addCleanup(work_tree.unlock)
2652
2669
        preview = TransformPreview(work_tree)
2653
2670
        self.addCleanup(preview.finalize)
2654
 
        preview_tree = preview.get_preview_tree()
2655
2671
        file_trans_id = preview.trans_id_file_id('file-id')
2656
2672
        preview.delete_contents(file_trans_id)
2657
2673
        preview.create_file('a\nb\n', file_trans_id)
2658
2674
        pb = progress.DummyProgress()
 
2675
        preview_tree = preview.get_preview_tree()
2659
2676
        merger = Merger.from_revision_ids(pb, preview_tree,
2660
2677
                                          child_tree.branch.last_revision(),
2661
2678
                                          other_branch=child_tree.branch,