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

[Martin Packman]

Make automatic resolving treat conflicts involving deleted directories as resolved if the directory has been subsequently deleted.

There are two ways a user might do this:

* bzr rm dir
 - In which case resolve can just remove the conflict. Bug 138803 wants rm to check for an clean up conflicts, that is not implemented here.

* rm -rf dir
 - In which case I think having `bzr st` report missing files after resolve would be confusing, so the tree inventory needs updating.

When the desired outcome is that the directory should be kept, using --done is still needed.

Unmerged revisions

6546. By Martin Packman on 2012-07-27

Resolve directory deletion conflicts if the dir has been removed

6545. By Martin Packman on 2012-07-27

Deprecate WorkingTree.auto_resolve

6544. By Martin Packman on 2012-07-27

Refactor auto_resolve tree method into auto action on conflicts

=== modified file 'bzrlib/conflicts.py'
--- bzrlib/conflicts.py	2012-07-27 17:36:19 +0000
+++ bzrlib/conflicts.py	2012-07-27 17:36:19 +0000
@@ -705,6 +705,19 @@
         # Nothing has been generated here
         return []
 
+    def _path_unresolved(self, tree):
+        if tree.has_id(self.file_id):
+            return True
+        try:
+            path = tree.id2path(self.file_id)
+        except errors.NoSuchId:
+            pass
+        else:
+            # GZ 2012-07-27: Is there not a less heavyweight way of updating
+            #                the inventory to accept the missing files?
+            tree.remove([path], force=True, keep_files=False)
+        return False
+
 
 class HandledPathConflict(HandledConflict):
     """A provisionally-resolved path problem involving two paths.
@@ -804,6 +817,10 @@
     format = 'Conflict because %(path)s is not versioned, but has versioned'\
              ' children.  %(action)s.'
 
+    def action_auto(self, tree):
+        if self._path_unresolved(tree):
+            raise NotImplementedError("Unversioned parent still exists")
+
     # FIXME: We silently do nothing to make tests pass, but most probably the
     # conflict shouldn't exist (the long story is that the conflict is
     # generated with another one that can be resolved properly) -- vila 091224
@@ -825,6 +842,10 @@
 
     format = 'Conflict adding files to %(path)s.  %(action)s.'
 
+    def action_auto(self, tree):
+        if self._path_unresolved(tree):
+            raise NotImplementedError("Missing parent still exists")
+
     def action_take_this(self, tree):
         tree.remove([self.path], force=True, keep_files=False)
 
@@ -847,6 +868,10 @@
     # FIXME: It's a bit strange that the default action is not coherent with
     # MissingParent from the *user* pov.
 
+    def action_auto(self, tree):
+        if self._path_unresolved(tree):
+            raise NotImplementedError("Deleted parent still exists")
+
     def action_take_this(self, tree):
         # just acccept bzr proposal
         pass

=== modified file 'bzrlib/tests/test_conflicts.py'
--- bzrlib/tests/test_conflicts.py	2012-02-23 23:41:51 +0000
+++ bzrlib/tests/test_conflicts.py	2012-07-27 17:36:19 +0000
@@ -754,10 +754,21 @@
 2>2 conflicts encountered.
 """
 
+    def test_auto_gone(self):
+        self.run_script("""
+$ rm -rf dir
+$ bzr resolve --auto dir
+2>dir/file does not exist.
+2>dir does not exist.
+2>2 conflicts resolved, 0 remaining
+$ bzr status --no-pending
+$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
+""")
+
     def test_take_this(self):
         self.run_script("""
 $ bzr rm -q dir  --force
-$ bzr resolve dir
+$ bzr resolve --auto dir
 2>2 conflicts resolved, 0 remaining
 $ bzr commit -q --strict -m 'No more conflicts nor unknown files'
 """)
@@ -807,15 +818,26 @@
         self.run_script("""
 $ bzr mv -q dir/file2 file2
 $ bzr rm -q dir --force
-$ bzr resolve dir
-2>2 conflicts resolved, 0 remaining
+$ bzr resolve --auto dir
+2>2 conflicts resolved, 0 remaining
+$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
+""")
+
+    def test_auto_gone(self):
+        self.run_script("""
+$ rm -rf dir
+$ bzr resolve --auto dir
+2>dir/file2 does not exist.
+2>dir does not exist.
+2>2 conflicts resolved, 0 remaining
+$ bzr status --no-pending
 $ bzr commit -q --strict -m 'No more conflicts nor unknown files'
 """)
 
     def test_kill_them_all(self):
         self.run_script("""
 $ bzr rm -q dir --force
-$ bzr resolve dir
+$ bzr resolve --auto dir
 2>2 conflicts resolved, 0 remaining
 $ bzr commit -q --strict -m 'No more conflicts nor unknown files'
 """)
@@ -871,15 +893,30 @@
         self.run_script("""
 $ bzr mv -q dir/file2 file2
 $ bzr rm -q dir --force
-$ bzr resolve dir
-2>2 conflicts resolved, 0 remaining
+$ bzr resolve --auto dir
+2>2 conflicts resolved, 0 remaining
+$ bzr commit -q --strict -m 'No more conflicts nor unknown files'
+""")
+
+    def test_auto_gone(self):
+        self.run_script("""
+$ rm -rf dir
+$ bzr resolve --auto dir
+2>dir/file2 does not exist.
+2>dir does not exist.
+2>2 conflicts resolved, 0 remaining
+$ bzr status --no-pending
+removed:
+  dir/
+  dir/file
+  dir/file2
 $ bzr commit -q --strict -m 'No more conflicts nor unknown files'
 """)
 
     def test_kill_them_all(self):
         self.run_script("""
 $ bzr rm -q dir --force
-$ bzr resolve dir
+$ bzr resolve --auto dir
 2>2 conflicts resolved, 0 remaining
 $ bzr commit -q --strict -m 'No more conflicts nor unknown files'
 """)