Merge lp:~gz/bzr/smart_add_former_file_dir_251864 into lp:bzr

[Martin Packman]

Builds on the bug 205636 tests, and fixes the smart_add path that wasn't already handled by the bug 192859 change. Duplicates the logic Martin Pool added to mutabletree._add_one inside smart_add to detect a directory that used to be something else and correct the inventory.

Rewriting Inventory so we don't have to care about this I leave to someone else. :)

[Martin Pool (mbp)]

Nice, thanks. Sorry for the delay.

Could you still mention the old bug 205636 in the test, and also add news?

review: Approve

[lp:~gz/bzr/smart_add_former_file_dir_251864]

5507. By Martin Packman on 2010-10-26

Address poolie's review, mention both bugs in test and add news

[Martin Packman (gz)]

Done.

Note to landers, the prerequisite branch that added this test and a couple of others still need to be checked and approved. See the last comment especially.

<https://code.launchpad.net/~gz/bzr/tests_for_bug_205636/+merge/38673>

=== modified file 'bzrlib/mutabletree.py'
--- bzrlib/mutabletree.py	2010-08-17 06:45:33 +0000
+++ bzrlib/mutabletree.py	2010-10-26 22:24:52 +0000
@@ -545,6 +545,13 @@
                         this_ie = None
                     else:
                         this_ie = inv[this_id]
+                        # Same as in _add_one below, if the inventory doesn't
+                        # think this is a directory, update the inventory
+                        if this_ie.kind != 'directory':
+                            this_ie = inventory.make_entry('directory',
+                                this_ie.name, this_ie.parent_id, this_id)
+                            del inv[this_id]
+                            inv.add(this_ie)
 
                 for subf in sorted(os.listdir(abspath)):
                     # here we could use TreeDirectory rather than

=== modified file 'bzrlib/tests/per_workingtree/test_smart_add.py'
--- bzrlib/tests/per_workingtree/test_smart_add.py	2010-10-26 22:24:52 +0000
+++ bzrlib/tests/per_workingtree/test_smart_add.py	2010-10-26 22:24:52 +0000
@@ -203,28 +203,17 @@
         self.assertEqual(['', 'dir', 'dir/subdir', 'dir/subdir/foo'],
             [path for path, ie in tree.iter_entries_by_dir()])
 
-    @staticmethod
-    def _reraise_current_error_as_assertion():
-        _, e, tb = sys.exc_info()
-        try:
-            raise AssertionError, AssertionError(str(e)), tb
-        finally:
-            del tb
+    def test_add_dir_bug_251864(self):
+        """Added file turning into a dir should be detected on add dir
 
-    def test_add_dir_bug_205636(self):
-        """Added file turning into a dir should be detected on add dir"""
+        Similar to bug 205636 but with automatic adding of directory contents.
+        """
         tree = self.make_branch_and_tree(".")
         self.build_tree(["dir"]) # whoops, make a file called dir
         tree.smart_add(["dir"])
         os.remove("dir")
         self.build_tree(["dir/", "dir/file"])
-        # GZ 2010-10-17: Need an expectError method like expectFailure but for
-        #                execptions that are not assertions
-        try:
-            tree.smart_add(["dir"])
-        except AttributeError, e:
-            self.expectFailure("Adding dir raises AttributeError",
-                self._reraise_current_error_as_assertion)
+        tree.smart_add(["dir"])
         tree.commit("Add dir contents")
 
     def test_add_subdir_file_bug_205636(self):

=== modified file 'doc/en/release-notes/bzr-2.3.txt'
--- doc/en/release-notes/bzr-2.3.txt	2010-10-26 13:53:31 +0000
+++ doc/en/release-notes/bzr-2.3.txt	2010-10-26 22:24:52 +0000
@@ -46,12 +46,19 @@
 
 * Always set PATH in start_bzr.bat on Windows. (Matthäus G. Chajdas, #470264)
 
+<<<<<<< TREE
 * ``bzr status -r X..Y`` was failing because RevisionTree didn't implement
   ``get_shelf_manager``. (John Arbash Meinel, #662053)
 
 * Correctly set the Content-Type  header when http POSTing to comply
   with stricter web frameworks. (Vincent Ladeuil, #655100)
 
+=======
+* Correctly add directory contents when the name was previously added as a
+  normal file, rather than throwing ``AttributeError: children`` during
+  smart_add. (Martin [gz], #251864)
+
+>>>>>>> MERGE-SOURCE
 * Don't force openssh to use protocol=2, since that is now the default.
   (Neil Martinsen-Burrell, #561061)