Merge lp:~abentley/bzr/commit-preview into lp:~bzr/bzr/trunk-old

[Aaron Bentley]

[Aaron Bentley (abentley)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi all,

This patch enables committing a TreeTransform and its PreviewTree to a
branch. This allows synthetic trees to be committed to disk. It could
be useful with looms and for committing to new branches. The current
client is Launchpad Translations.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkoUPMEACgkQ0F+nu1YWqI0c4wCfRowxvpZOFBbHBe2xF/1QZGHM
a5AAn3YvgboQD/78oaR5ZqpbwcOp5iXG
=PRxG
-----END PGP SIGNATURE-----

=== modified file 'bzrlib/tests/test_transform.py'
--- bzrlib/tests/test_transform.py	2009-05-06 05:36:28 +0000
+++ bzrlib/tests/test_transform.py	2009-05-20 17:35:10 +0000
@@ -2604,6 +2604,23 @@
                                                            'tree/foo'))
         self.assertEqual(False, preview_tree.is_executable('baz-id'))
 
+    def test_commit_preview_tree(self):
+        tree = self.make_branch_and_tree('tree')
+        rev_id = tree.commit('rev1')
+        tree.branch.lock_write()
+        self.addCleanup(tree.branch.unlock)
+        tt = TransformPreview(tree)
+        tt.new_file('file', tt.root, 'contents', 'file_id')
+        self.addCleanup(tt.finalize)
+        preview = tt.get_preview_tree()
+        preview.set_parent_ids([rev_id])
+        builder = tree.branch.get_commit_builder([rev_id])
+        list(builder.record_iter_changes(preview, rev_id, tt.iter_changes()))
+        builder.finish_inventory()
+        rev2_id = builder.commit('rev2')
+        rev2_tree = tree.branch.repository.revision_tree(rev2_id)
+        self.assertEqual('contents', rev2_tree.get_file_text('file_id'))
+
 
 class FakeSerializer(object):
     """Serializer implementation that simply returns the input.

=== modified file 'bzrlib/transform.py'
--- bzrlib/transform.py	2009-05-06 05:36:28 +0000
+++ bzrlib/transform.py	2009-05-20 17:35:10 +0000
@@ -1880,6 +1880,9 @@
         name = self._transform._limbo_name(trans_id)
         return open(name, 'rb')
 
+    def get_file_with_stat(self, file_id, path):
+        return self.get_file(file_id, path), None
+
     def annotate_iter(self, file_id,
                       default_revision=_mod_revision.CURRENT_REVISION):
         changes = self._changes(file_id)