Merge lp:~mnn282/bzr/auto-rename-fix into lp:bzr

[mnn]

Fixed bug with RenameMap (bzr move --auto), also RenameMap has ability to detect files moved into new unversioned directories.

[lp:~mnn282/bzr/auto-rename-fix]

6549. By mnn on 2012-07-29

Simplified test_guess_rename_handles_new_directories

[Martin Packman (gz)]

Thanks for working on this!

I'm still a little uncertain on the core logic here, will look again later.

+ if self.tree.has_filename(self.tree.id2path(parent[0])) == False:

Normal style is not to compare against booleans, just use `if not condition` instead.

+ self.assertEqual('added:\n folder/\nrenamed:\n file => folder/file2\n',
+ self.run_bzr("status")[0])

At this level, in bzrlib.tests rather than bzrlib.tests.blackbox, you really want to be writing assertions based on api calls rather than the commandline ui. Mostly this just confirms the check above, but adding an assertion for the current tree shape does seem reasonable.

I see you've already fixed the other style stuff I mentioned on IRC, thanks!

review: Approve

Unmerged revisions

6549. By mnn on 2012-07-29

Simplified test_guess_rename_handles_new_directories

6548. By mnn on 2012-07-29

Fixed issue with RenameMap - also it supports renaming into new unversioned directory

=== modified file 'bzrlib/rename_map.py'
--- bzrlib/rename_map.py	2011-12-18 15:28:38 +0000
+++ bzrlib/rename_map.py	2012-07-29 23:12:20 +0000
@@ -183,7 +183,8 @@
             for (file_id, paths, changed_content, versioned, parent, name,
                  kind, executable) in iterator:
                 if kind[1] is None and versioned[1]:
-                    missing_parents.setdefault(parent[0], set()).add(file_id)
+                    if self.tree.has_filename(self.tree.id2path(parent[0])) == False:
+                        missing_parents.setdefault(parent[0], set()).add(file_id)
                     if kind[0] == 'file':
                         missing_files.add(file_id)
                     else:
@@ -255,6 +256,12 @@
             parent_id = matches.get(parent_path)
             if parent_id is None:
                 parent_id = self.tree.path2id(parent_path)
+                if parent_id is None:
+                    added, ignored = self.tree.smart_add([parent_path], recurse=False)
+                    if len(ignored) > 0 and ignored[0] == parent_path:
+                        continue
+                    else:
+                        parent_id = self.tree.path2id(parent_path)
             if entry.name == new_name and entry.parent_id == parent_id:
                 continue
             new_entry = entry.copy()
 
=== modified file 'bzrlib/tests/test_rename_map.py'
--- bzrlib/tests/test_rename_map.py	2009-05-08 16:34:09 +0000
+++ bzrlib/tests/test_rename_map.py	2012-07-29 23:12:20 +0000
@@ -200,3 +200,20 @@
         notes = self.captureNotes(RenameMap.guess_renames, tree,
                                   dry_run=False)[0]
         self.assertEqual('file => file2', ''.join(notes))
+
+    def test_guess_rename_handles_new_directories(self):
+        """When a file was moved into a new directory."""
+        tree = self.make_branch_and_tree('.')
+        tree.lock_write()
+        #self.addCleanup(tree.unlock)
+        self.build_tree(['file'])
+        tree.add('file', 'file-id')
+        tree.commit('Added file')
+        os.mkdir('folder')
+        os.rename('file', 'folder/file2')
+        notes = self.captureNotes(RenameMap.guess_renames, tree)[0]
+        self.assertEqual('file => folder/file2', ''.join(notes))
+
+        tree.unlock()
+        self.assertEqual('added:\n  folder/\nrenamed:\n  file => folder/file2\n',
+            self.run_bzr("status")[0])