Merge lp:~jelmer/brz/mv-bug into lp:brz

[Jelmer Vernooij]

Fix move when file was in different location, rather than removed.

Fix move when file was in different location, rather than removed.

[Martin Packman (gz)]

Thanks!

review: Approve

[The Breezy Bot (the-breezy-bot)]

Running landing tests failed
https://ci.breezy-vcs.org/job/brz/job/brz-land/135/

=== modified file 'breezy/bzr/workingtree.py'
--- breezy/bzr/workingtree.py	2018-11-22 03:51:03 +0000
+++ breezy/bzr/workingtree.py	2018-11-23 19:58:12 +0000
@@ -1257,10 +1257,13 @@
                     raise errors.BzrRenameFailedError(
                         from_rel, to_rel,
                         errors.NotVersionedError(path=from_rel))
-                # put entry back in the inventory so we can rename it
-                from_entry = basis_tree.root_inventory.get_entry(
-                    from_id).copy()
-                from_inv.add(from_entry)
+                try:
+                    from_entry = from_inv.get_entry(from_id)
+                except errors.NoSuchId:
+                    # put entry back in the inventory so we can rename it
+                    from_entry = basis_tree.root_inventory.get_entry(
+                        from_id).copy()
+                    from_inv.add(from_entry)
             else:
                 from_inv, from_inv_id = self._unpack_file_id(from_id)
                 from_entry = from_inv.get_entry(from_inv_id)

=== modified file 'breezy/tests/blackbox/test_mv.py'
--- breezy/tests/blackbox/test_mv.py	2018-11-11 04:08:32 +0000
+++ breezy/tests/blackbox/test_mv.py	2018-11-23 19:58:12 +0000
@@ -26,6 +26,7 @@
 
 from breezy.tests import (
     TestCaseWithTransport,
+    script,
     )
 from breezy.tests.features import (
     CaseInsensitiveFilesystemFeature,
@@ -529,3 +530,41 @@
         os.remove(u"\xA7")
         out, err = self.run_bzr_error(["Could not rename", "not exist"],
                                       ["mv", u"\xA7", "b"])
+
+    def test_dupe_move(self):
+        self.script_runner = script.ScriptRunner()
+        self.script_runner.run_script(self, '''
+        $ brz init brz-bug
+        Created a standalone tree (format: 2a)
+        $ cd brz-bug
+        $ mkdir dir
+        $ brz add
+        adding dir
+        $ echo text >> dir/test.txt
+        $ brz add
+        adding dir/test.txt
+        $ brz ci -m "Add files"
+        2>Committing to: .../brz-bug/
+        2>added dir
+        2>added dir/test.txt
+        2>Committed revision 1.
+        $ mv dir dir2
+        $ mv dir2/test.txt dir2/test2.txt
+        $ brz st
+        removed:
+          dir/
+          dir/test.txt
+        unknown:
+          dir2/
+        $ brz mv dir dir2
+        dir => dir2
+        $ brz st
+        removed:
+          dir/test.txt
+        renamed:
+          dir/ => dir2/
+        unknown:
+          dir2/test2.txt
+        $ brz mv dir/test.txt dir2/test2.txt
+        dir/test.txt => dir2/test2.txt
+        ''')