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 is a followup on my changes to allow PreviewTree to be
committed. It turns out that get_file_with_stat should be declared on
the Tree interface. This patch moves the code from MutableTree to Tree,
and updates the tests accordingly.

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

iEYEARECAAYFAkoVRrkACgkQ0F+nu1YWqI3NswCePVKEnKq6danx6Nf8JSizvuZL
MJgAn2FBFMkyS2MHICAMaIvq8Hfn+wtu
=nQw3
-----END PGP SIGNATURE-----

[Ian Clatworthy (ian-clatworthy)]

review: Approve

=== modified file 'bzrlib/mutabletree.py'
--- bzrlib/mutabletree.py	2009-04-09 20:23:07 +0000
+++ bzrlib/mutabletree.py	2009-05-28 12:36:32 +0000
@@ -232,20 +232,6 @@
         """Helper function for add - sets the entries of kinds."""
         raise NotImplementedError(self._gather_kinds)
 
-    def get_file_with_stat(self, file_id, path=None):
-        """Get a file handle and stat object for file_id.
-
-        The default implementation returns (self.get_file, None) for backwards
-        compatibility.
-
-        :param file_id: The file id to read.
-        :param path: The path of the file, if it is known.
-        :return: A tuple (file_handle, stat_value_or_None). If the tree has
-            no stat facility, or need for a stat cache feedback during commit,
-            it may return None for the second element of the tuple.
-        """
-        return (self.get_file(file_id, path), None)
-
     @needs_read_lock
     def last_revision(self):
         """Return the revision id of the last commit performed in this tree.

=== modified file 'bzrlib/tests/tree_implementations/__init__.py'
--- bzrlib/tests/tree_implementations/__init__.py	2009-04-11 16:06:53 +0000
+++ bzrlib/tests/tree_implementations/__init__.py	2009-05-28 12:36:33 +0000
@@ -365,6 +365,7 @@
     submod_tests = loader.loadTestsFromModuleNames([
         'bzrlib.tests.tree_implementations.test_annotate_iter',
         'bzrlib.tests.tree_implementations.test_get_file_mtime',
+        'bzrlib.tests.tree_implementations.test_get_file_with_stat',
         'bzrlib.tests.tree_implementations.test_get_root_id',
         'bzrlib.tests.tree_implementations.test_get_symlink_target',
         'bzrlib.tests.tree_implementations.test_inv',

=== renamed file 'bzrlib/tests/workingtree_implementations/test_get_file_with_stat.py' => 'bzrlib/tests/tree_implementations/test_get_file_with_stat.py'
--- bzrlib/tests/workingtree_implementations/test_get_file_with_stat.py	2009-03-23 14:59:43 +0000
+++ bzrlib/tests/tree_implementations/test_get_file_with_stat.py	2009-05-28 12:36:33 +0000
@@ -18,15 +18,16 @@
 
 import os
 
-from bzrlib.tests.workingtree_implementations import TestCaseWithWorkingTree
-
-
-class TestGetFileWithStat(TestCaseWithWorkingTree):
+from bzrlib.tests.tree_implementations import TestCaseWithTree
+
+
+class TestGetFileWithStat(TestCaseWithTree):
 
     def test_get_file_with_stat_id_only(self):
-        tree = self.make_branch_and_tree('.')
+        work_tree = self.make_branch_and_tree('.')
         self.build_tree(['foo'])
-        tree.add(['foo'], ['foo-id'])
+        work_tree.add(['foo'], ['foo-id'])
+        tree = self._convert_tree(work_tree)
         tree.lock_read()
         self.addCleanup(tree.unlock)
         file_obj, statvalue = tree.get_file_with_stat('foo-id')
@@ -36,9 +37,10 @@
         self.assertEqual(["contents of foo\n"], file_obj.readlines())
 
     def test_get_file_with_stat_id_and_path(self):
-        tree = self.make_branch_and_tree('.')
+        work_tree = self.make_branch_and_tree('.')
         self.build_tree(['foo'])
-        tree.add(['foo'], ['foo-id'])
+        work_tree.add(['foo'], ['foo-id'])
+        tree = self._convert_tree(work_tree)
         tree.lock_read()
         self.addCleanup(tree.unlock)
         file_obj, statvalue = tree.get_file_with_stat('foo-id', 'foo')

=== modified file 'bzrlib/tests/workingtree_implementations/__init__.py'
--- bzrlib/tests/workingtree_implementations/__init__.py	2009-04-11 16:06:53 +0000
+++ bzrlib/tests/workingtree_implementations/__init__.py	2009-05-28 12:36:33 +0000
@@ -72,7 +72,6 @@
         'bzrlib.tests.workingtree_implementations.test_eol_conversion',
         'bzrlib.tests.workingtree_implementations.test_executable',
         'bzrlib.tests.workingtree_implementations.test_flush',
-        'bzrlib.tests.workingtree_implementations.test_get_file_with_stat',
         'bzrlib.tests.workingtree_implementations.test_get_file_mtime',
         'bzrlib.tests.workingtree_implementations.test_get_parent_ids',
         'bzrlib.tests.workingtree_implementations.test_inv',

=== modified file 'bzrlib/transform.py'
--- bzrlib/transform.py	2009-05-28 07:46:53 +0000
+++ bzrlib/transform.py	2009-05-28 12:36:32 +0000
@@ -1915,7 +1915,7 @@
         name = self._transform._limbo_name(trans_id)
         return open(name, 'rb')
 
-    def get_file_with_stat(self, file_id, path):
+    def get_file_with_stat(self, file_id, path=None):
         return self.get_file(file_id, path), None
 
     def annotate_iter(self, file_id,

=== modified file 'bzrlib/tree.py'
--- bzrlib/tree.py	2009-05-23 04:55:52 +0000
+++ bzrlib/tree.py	2009-05-28 12:36:32 +0000
@@ -263,6 +263,20 @@
         """
         raise NotImplementedError(self.get_file)
 
+    def get_file_with_stat(self, file_id, path=None):
+        """Get a file handle and stat object for file_id.
+
+        The default implementation returns (self.get_file, None) for backwards
+        compatibility.
+
+        :param file_id: The file id to read.
+        :param path: The path of the file, if it is known.
+        :return: A tuple (file_handle, stat_value_or_None). If the tree has
+            no stat facility, or need for a stat cache feedback during commit,
+            it may return None for the second element of the tuple.
+        """
+        return (self.get_file(file_id, path), None)
+
     def get_file_text(self, file_id, path=None):
         """Return the byte content of a file.
 

=== modified file 'bzrlib/workingtree.py'
--- bzrlib/workingtree.py	2009-05-13 17:16:28 +0000
+++ bzrlib/workingtree.py	2009-05-28 12:36:33 +0000
@@ -446,7 +446,7 @@
 
     def get_file_with_stat(self, file_id, path=None, filtered=True,
         _fstat=os.fstat):
-        """See MutableTree.get_file_with_stat."""
+        """See Tree.get_file_with_stat."""
         if path is None:
             path = self.id2path(file_id)
         file_obj = self.get_file_byname(path, filtered=False)