/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/tests/test_transform.py

  • Committer: John Arbash Meinel
  • Date: 2009-10-15 20:04:37 UTC
  • mfrom: (4748 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4752.
  • Revision ID: john@arbash-meinel.com-20091015200437-4wweb0t6uzspvv84
Bring in bzr.dev 4748, resolve conflict, update NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
2277
2277
        self.assertEqual(os.stat(limbo_path).st_mtime,
2278
2278
                         preview_tree.get_file_mtime('file-id'))
2279
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
 
2280
2292
    def test_get_file(self):
2281
2293
        preview = self.get_empty_preview()
2282
2294
        preview.new_file('file', preview.root, 'contents', 'file-id')
2617
2629
 
2618
2630
    def test_walkdirs(self):
2619
2631
        preview = self.get_empty_preview()
2620
 
        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)
2621
2635
        preview_tree = preview.get_preview_tree()
2622
2636
        file_trans_id = preview.new_file('a', preview.root, 'contents',
2623
2637
                                         'a-id')
2654
2668
        self.addCleanup(work_tree.unlock)
2655
2669
        preview = TransformPreview(work_tree)
2656
2670
        self.addCleanup(preview.finalize)
2657
 
        preview_tree = preview.get_preview_tree()
2658
2671
        file_trans_id = preview.trans_id_file_id('file-id')
2659
2672
        preview.delete_contents(file_trans_id)
2660
2673
        preview.create_file('a\nb\n', file_trans_id)
2661
2674
        pb = progress.DummyProgress()
 
2675
        preview_tree = preview.get_preview_tree()
2662
2676
        merger = Merger.from_revision_ids(pb, preview_tree,
2663
2677
                                          child_tree.branch.last_revision(),
2664
2678
                                          other_branch=child_tree.branch,