Merge lp:~mbp/bzr/192859-2.0-symlinks into lp:bzr/2.0

[Martin Pool]

cope with links changing into directories

This fixes another symlink problem case: adding a file under a directory that was a symlink in the basis revision.

The really right fix for this is to get away from wt inventory entries having a defined in-memory kind: their kind is whatever is on disk. But doing that would probably be much too big for 2.0. I might try a 2.3 branch for it later.

There may be more problem cases.

[John A Meinel (jameinel)]

My only comment is that the tests for "tree.smart_add(['tree/a/file'])", etc, don't actually assert the state of the final tree. Just that tree.smart_add() doesn't fail.

Which I think does prove that bug 192859 is fixed, but it would be more useful as an ongoing test to not just assert that the functions don't fail with an exception, but that they did have the expected effect (the tree now sees a dir, etc.)

review: Needs Fixing

[Martin Pool (mbp)]

followon patch https://code.edge.launchpad.net/~mbp/bzr/192859-2.0-symlinks-add

[Martin Pool (mbp)]

I've added an additional test assertion, so I might merge this on the basis of John's tweak-type review.

[Martin Pool (mbp)]

sent to pqm by email

=== modified file 'bzrlib/tests/per_workingtree/test_symlinks.py'
--- bzrlib/tests/per_workingtree/test_symlinks.py	2010-07-17 17:16:19 +0000
+++ bzrlib/tests/per_workingtree/test_symlinks.py	2010-07-20 15:37:47 +0000
@@ -21,6 +21,7 @@
 
 from bzrlib import (
     builtins,
+    osutils,
     tests,
     workingtree,
     )
@@ -79,24 +80,13 @@
 
     _test_needs_features = [tests.SymlinkFeature]
 
-    def test_symlink_to_dir(self):
+    def test_symlink_changes_to_dir(self):
         # <https://bugs.launchpad.net/bzr/+bug/192859>:
         # we had some past problems with the workingtree remembering for too
         # long what kind of object was at a particular name; we really
         # shouldn't do that.  Operating on the dirstate through passing
         # inventory deltas rather than mutating the inventory largely avoids
         # that.
-        if self.workingtree_format.upgrade_recommended: 
-            # File "bzrlib/workingtree.py", line 2341, in conflicts
-            #   for conflicted in self._iter_conflicts():
-            # File "bzrlib/workingtree.py", line 1590, in _iter_conflicts
-            #   for info in self.list_files():
-            # File "bzrlib/workingtree.py", line 1203, in list_files
-            #   f_ie = inv.get_child(from_dir_id, f)
-            # File "bzrlib/inventory.py", line 1269, in get_child
-            #   return self[parent_id].children.get(filename)
-            # AttributeError: children
-            raise tests.TestSkipped("known broken on pre-dirstate formats; wontfix")
         tree = self.make_branch_and_tree('tree')
         self.build_tree_contents([
             ('tree/a@', 'target')])
@@ -109,6 +99,29 @@
             ])
         tree.smart_add(['tree/a/f'])
         tree.commit('change to dir')
+        tree.lock_read()
+        self.addCleanup(tree.unlock)
+        self.assertEquals([], list(tree.iter_changes(tree.basis_tree())))
+
+    def test_dir_changes_to_symlink(self):
+        # <https://bugs.launchpad.net/bzr/+bug/192859>:
+        # we had some past problems with the workingtree remembering for too
+        # long what kind of object was at a particular name; we really
+        # shouldn't do that.  Operating on the dirstate through passing
+        # inventory deltas rather than mutating the inventory largely avoids
+        # that.
+        tree = self.make_branch_and_tree('tree')
+        self.build_tree_contents([
+            ('tree/a/',),
+            ('tree/a/file', 'content'),
+            ])
+        tree.smart_add(['tree/a'])
+        tree.commit('add dir')
+        osutils.rmtree('tree/a')
+        self.build_tree_contents([
+            ('tree/a@', 'target'),
+            ])
+        tree.commit('change to symlink')
 
 
 class TestOpenTree(TestCaseWithWorkingTree):