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

[Martin Packman]

Makes `bzr resolve FILE` use the same auto logic as `bzr resolve` rather than implying `bzr resolve --done FILE`.

This was discussed on the mailing list recently:

<https://lists.ubuntu.com/archives/bazaar/2012q3/075039.html>

Currently auto is pretty limited, which makes this change less appetizing, for deleted directories and such like I often end up running resolve with single argument quite often, and having to remember --done now could get frustrating. However, it's pretty obvious if you know about the change, and making auto smarter is something we've wanted for a while anyway.

I've updated some bits of documentation but am probably missing other bits elsewhere.

The current testing for conflicts I don't fully understand, some help explaining the details there would be good, but it appears that several places where I needed to add --done should get covered by making --auto smarter.

[Aaron Bentley (abentley)]

I think that the existing behaviour makes sense, and the proposed changes just cause users to do more typing.

They encourage users to use "resolve FILE" when bzr doesn't need an argument, and they force users to specify --done when they actually do need to specify an argument.

Why have you removed documentation of --all at 19?

[Martin Packman (gz)]

> I think that the existing behaviour makes sense, and the proposed changes just
> cause users to do more typing.

I agree, the extra typing is bad.

My aim with this group of branches is to actually not change what you have to type. This branch makes it harder to just discard conflicts, in others I want to make detection of resolved conflicts actually work for more cases. So, in the end you'll still be doing some action to resolve a conflict, then `bzr resolve FILE`.. or just `bzr resolve`.

> Why have you removed documentation of --all at 19?

Should have left that for another branch really but, in short, `bzr resolve --all` is functionally equivalent to `bzr resolve --done`, which is a more dangerous operation than we want to recommend in the help text.

People should be using `bzr resolve` followed by `bzr resolve --done FILE` if the auto resolution fails for something in particular. Generalising to the no-arg form for all files is easy to understand from there for when it's actually useful.

Unmerged revisions

6549. By Martin Packman on 2012-07-27

Note in cmd_resolve help that --done is needed, and remove mention of --all

6548. By Martin Packman on 2012-07-27

Make 'auto' the default in resolve_action_registry

6547. By Martin Packman on 2012-07-27

Update conflict-types help for change to resolve semantics

6546. By Martin Packman on 2012-07-27

Make resolving with a list of files default to action auto rather than done

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 12:34:38 +0000
+++ bzrlib/conflicts.py	2012-07-27 12:34:38 +0000
@@ -92,7 +92,8 @@
 resolve_action_registry.register(
     'take-other', 'take_other',
     'Resolve the conflict taking the merged version into account.')
-resolve_action_registry.default_key = 'done'
+resolve_action_registry.default_key = 'auto'
+
 
 class ResolveActionOption(option.RegistryOption):
 
@@ -112,8 +113,8 @@
     before you can commit.
 
     Once you have fixed a problem, use "bzr resolve" to automatically mark
-    text conflicts as fixed, "bzr resolve FILE" to mark a specific conflict as
-    resolved, or "bzr resolve --all" to mark all conflicts as resolved.
+    text conflicts as fixed, "bzr resolve --done FILE" to mark a specific
+    conflict as resolved.
     """
     aliases = ['resolved']
     takes_args = ['file*']
@@ -137,10 +138,7 @@
             tree, file_list = workingtree.WorkingTree.open_containing_paths(
                 file_list, directory)
             if action is None:
-                if file_list is None:
-                    action = 'auto'
-                else:
-                    action = 'done'
+                action = 'auto'
         before, after = resolve(tree, file_list, action=action)
         # GZ 2012-07-27: Should unify UI below now that auto is less magical.
         if action == 'auto' and file_list is None:
 
=== modified file 'bzrlib/help_topics/en/conflict-types.txt'
--- bzrlib/help_topics/en/conflict-types.txt	2011-04-01 06:58:37 +0000
+++ bzrlib/help_topics/en/conflict-types.txt	2012-07-27 12:34:38 +0000
@@ -50,10 +50,11 @@
 
   ``bzr resolve FILE --action=done'
 
-Note that this is the default action when a single file is involved so you can
-simply use::
+Note that for some kinds of conflict, Bazaar can automatically detect that
+they have been resolved. You will also be told about any remaining conflicts
+that still need resolving. Simply use::
 
-   ``bzr resolve FILE``
+   ``bzr resolve``
 
 See ``bzr help resolve`` for more details.
 
 
=== 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 12:34:38 +0000
@@ -755,16 +755,18 @@
 """
 
     def test_take_this(self):
+        # GZ 2012-07-27: Using auto should learn how to resolve this?
         self.run_script("""
 $ bzr rm -q dir  --force
-$ bzr resolve dir
+$ bzr resolve --done dir
 2>2 conflicts resolved, 0 remaining
 $ bzr commit -q --strict -m 'No more conflicts nor unknown files'
 """)
 
     def test_take_other(self):
+        # GZ 2012-07-27: What's this testing? Should remain conflicted?
         self.run_script("""
-$ bzr resolve dir
+$ bzr resolve --done dir
 2>2 conflicts resolved, 0 remaining
 $ bzr commit -q --strict -m 'No more conflicts nor unknown files'
 """)
@@ -797,25 +799,28 @@
 """
 
     def test_keep_them_all(self):
+        # GZ 2012-07-27: What's this testing? Should remain conflicted?
         self.run_script("""
-$ bzr resolve dir
+$ bzr resolve --done dir
 2>2 conflicts resolved, 0 remaining
 $ bzr commit -q --strict -m 'No more conflicts nor unknown files'
 """)
 
     def test_adopt_child(self):
+        # GZ 2012-07-27: Using auto should learn how to resolve this?
         self.run_script("""
 $ bzr mv -q dir/file2 file2
 $ bzr rm -q dir --force
-$ bzr resolve dir
+$ bzr resolve --done dir
 2>2 conflicts resolved, 0 remaining
 $ bzr commit -q --strict -m 'No more conflicts nor unknown files'
 """)
 
     def test_kill_them_all(self):
+        # GZ 2012-07-27: Using auto should learn how to resolve this?
         self.run_script("""
 $ bzr rm -q dir --force
-$ bzr resolve dir
+$ bzr resolve --done dir
 2>2 conflicts resolved, 0 remaining
 $ bzr commit -q --strict -m 'No more conflicts nor unknown files'
 """)
@@ -861,25 +866,28 @@
 """
 
     def test_keep_them_all(self):
+        # GZ 2012-07-27: What's this testing? Should remain conflicted?
         self.run_script("""
-$ bzr resolve dir
+$ bzr resolve --done dir
 2>2 conflicts resolved, 0 remaining
 $ bzr commit -q --strict -m 'No more conflicts nor unknown files'
 """)
 
     def test_adopt_child(self):
+        # GZ 2012-07-27: Using auto should learn how to resolve this?
         self.run_script("""
 $ bzr mv -q dir/file2 file2
 $ bzr rm -q dir --force
-$ bzr resolve dir
+$ bzr resolve --done dir
 2>2 conflicts resolved, 0 remaining
 $ bzr commit -q --strict -m 'No more conflicts nor unknown files'
 """)
 
     def test_kill_them_all(self):
+        # GZ 2012-07-27: Using auto should learn how to resolve this?
         self.run_script("""
 $ bzr rm -q dir --force
-$ bzr resolve dir
+$ bzr resolve --done dir
 2>2 conflicts resolved, 0 remaining
 $ bzr commit -q --strict -m 'No more conflicts nor unknown files'
 """)
@@ -1020,21 +1028,23 @@
 """
 
     def test_take_this(self):
+        # GZ 2012-07-27: What's this testing? Should auto understand it?
         self.run_script("""
 $ bzr rm -q foo.new --force
-# FIXME: Isn't it weird that foo is now unkown even if foo.new has been put
+# FIXME: Isn't it weird that foo is now unknown even if foo.new has been put
 # aside ? -- vila 090916
 $ bzr add -q foo
-$ bzr resolve foo.new
+$ bzr resolve --done foo.new
 2>1 conflict resolved, 0 remaining
 $ bzr commit -q --strict -m 'No more conflicts nor unknown files'
 """)
 
     def test_take_other(self):
+        # GZ 2012-07-27: Using auto should learn how to resolve this?
         self.run_script("""
 $ bzr rm -q foo --force
 $ bzr mv -q foo.new foo
-$ bzr resolve foo
+$ bzr resolve --done foo
 2>1 conflict resolved, 0 remaining
 $ bzr commit -q --strict -m 'No more conflicts nor unknown files'
 """)