← 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: Robert J. Tanner
  • Date: 2009-06-10 03:56:49 UTC
  • mfrom: (4423 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4425.
  • Revision ID: tanner@real-time.com-20090610035649-7rfx4cls4550zc3c
Merge 1.15.1 back to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_transform.py
20
20
import sys
21
21
 
22
22
from bzrlib import (
 
23
    bencode,
23
24
    errors,
24
25
    generate_ids,
25
26
    osutils,
53
54
                              build_tree, get_backup_name,
54
55
                              _FileMover, resolve_checkout,
55
56
                              TransformPreview, create_from_tree)
56
 
from bzrlib.util import bencode
57
57
 
58
58
 
59
59
class TestTreeTransform(tests.TestCaseWithTransport):
2604
2604
                                                           'tree/foo'))
2605
2605
        self.assertEqual(False, preview_tree.is_executable('baz-id'))
2606
2606
 
 
2607
    def test_commit_preview_tree(self):
 
2608
        tree = self.make_branch_and_tree('tree')
 
2609
        rev_id = tree.commit('rev1')
 
2610
        tree.branch.lock_write()
 
2611
        self.addCleanup(tree.branch.unlock)
 
2612
        tt = TransformPreview(tree)
 
2613
        tt.new_file('file', tt.root, 'contents', 'file_id')
 
2614
        self.addCleanup(tt.finalize)
 
2615
        preview = tt.get_preview_tree()
 
2616
        preview.set_parent_ids([rev_id])
 
2617
        builder = tree.branch.get_commit_builder([rev_id])
 
2618
        list(builder.record_iter_changes(preview, rev_id, tt.iter_changes()))
 
2619
        builder.finish_inventory()
 
2620
        rev2_id = builder.commit('rev2')
 
2621
        rev2_tree = tree.branch.repository.revision_tree(rev2_id)
 
2622
        self.assertEqual('contents', rev2_tree.get_file_text('file_id'))
 
2623
 
2607
2624
 
2608
2625
class FakeSerializer(object):
2609
2626
    """Serializer implementation that simply returns the input.