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

[Martin Packman]

Deprecate `bzr resolve --all`, it's the same as `bzr resolve --done` but can't be used for a subset of files and may give users the false impression it does something more than just wipe the conflict list.

This is going to clash a fair bit with lp:~gz/bzr/resolve_file_not_done and the documentation probably wants more sensible updating for both.

Unmerged revisions

6547. By Martin Packman on 2012-07-27

Update some documentation to not mention resolve --all

6546. By Martin Packman on 2012-07-27

Deprecate the use of resolve --all instead just use --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 14:48:18 +0000
+++ bzrlib/conflicts.py	2012-07-27 14:48:18 +0000
@@ -34,6 +34,7 @@
     trace,
     transform,
     workingtree,
+    ui,
     )
 from bzrlib.i18n import gettext, ngettext
 """)
@@ -113,7 +114,7 @@
 
     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.
+    resolved, or "bzr resolve --done" to mark all conflicts as resolved.
     """
     aliases = ['resolved']
     takes_args = ['file*']
@@ -125,22 +126,25 @@
     _see_also = ['conflicts']
     def run(self, file_list=None, all=False, action=None, directory=None):
         if all:
+            ui.ui_factory.show_user_warning(
+                'deprecated_command_option',
+                deprecated_name='--all',
+                recommended_name='bzr resolve --done',
+                deprecated_in_version='2.6',
+                command=self.invoked_as)
             if file_list:
                 raise errors.BzrCommandError(gettext("If --all is specified,"
                                              " no FILE may be provided"))
-            if directory is None:
-                directory = u'.'
-            tree = workingtree.WorkingTree.open_containing(directory)[0]
             if action is None:
                 action = 'done'
         else:
-            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'
+        tree, file_list = workingtree.WorkingTree.open_containing_paths(
+            file_list, directory)
         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/tests/blackbox/test_remerge.py'
--- bzrlib/tests/blackbox/test_remerge.py	2012-01-05 13:02:31 +0000
+++ bzrlib/tests/blackbox/test_remerge.py	2012-07-27 14:48:18 +0000
@@ -105,7 +105,7 @@
                            'remerge hello --reprocess',
                            retcode=1, working_dir='this')
 
-        self.run_bzr('resolve --all', working_dir='this')
+        self.run_bzr('resolve --done', working_dir='this')
         self.run_bzr('commit -m done', working_dir='this')
 
         self.run_bzr_error(['remerge only works after normal merges',

=== modified file 'bzrlib/tests/blackbox/test_resolve.py'
--- bzrlib/tests/blackbox/test_resolve.py	2011-09-16 15:37:58 +0000
+++ bzrlib/tests/blackbox/test_resolve.py	2012-07-27 14:48:18 +0000
@@ -47,6 +47,16 @@
         self.run_script("""\
 $ cd branch
 $ bzr resolve --all
+2>The option '--all' to 'bzr resolve' has been deprecated in bzr 2.6. \
+Please use 'bzr resolve --done' instead.
+2>3 conflicts resolved, 0 remaining
+$ bzr conflicts
+""")
+
+    def test_resolve_done(self):
+        self.run_script("""\
+$ cd branch
+$ bzr resolve --done
 2>3 conflicts resolved, 0 remaining
 $ bzr conflicts
 """)
@@ -68,6 +78,15 @@
     def test_resolve_all_via_directory_option(self):
         self.run_script("""\
 $ bzr resolve -d branch --all
+2>The option '--all' to 'bzr resolve' has been deprecated in bzr 2.6. \
+Please use 'bzr resolve --done' instead.
+2>3 conflicts resolved, 0 remaining
+$ bzr conflicts -d branch
+""")
+
+    def test_resolve_done_via_directory_option(self):
+        self.run_script("""\
+$ bzr resolve -d branch --done
 2>3 conflicts resolved, 0 remaining
 $ bzr conflicts -d branch
 """)

=== modified file 'bzrlib/tests/blackbox/test_too_much.py'
--- bzrlib/tests/blackbox/test_too_much.py	2011-09-26 15:21:01 +0000
+++ bzrlib/tests/blackbox/test_too_much.py	2012-07-27 14:48:18 +0000
@@ -240,7 +240,7 @@
         self.assert_('|||||||' in conflict_text)
         self.assert_('hi world' in conflict_text)
         self.run_bzr('revert')
-        self.run_bzr('resolve --all')
+        self.run_bzr('resolve --done')
         self.run_bzr('merge ../other', retcode=1)
         conflict_text = file('hello').read()
         self.assert_('|||||||' not in conflict_text)
@@ -255,7 +255,7 @@
         result = self.run_bzr('conflicts')[0]
         self.assertEquals(result, "Text conflict in question\n")
         self.run_bzr('commit -m conflicts', retcode=3)
-        self.run_bzr('resolve --all')
+        self.run_bzr('resolve --done')
         result = self.run_bzr('conflicts')[0]
         self.run_bzr('commit -m conflicts')
         self.assertEquals(result, "")

=== modified file 'doc/en/tutorials/centralized_workflow.txt'
--- doc/en/tutorials/centralized_workflow.txt	2011-04-06 04:58:43 +0000
+++ doc/en/tutorials/centralized_workflow.txt	2012-07-27 14:48:18 +0000
@@ -256,7 +256,7 @@
 conflicts. That way you don't accidentally commit the conflict markers.
 The command ``bzr status`` will show the conflicts along with the other
 changes, or you can use ``bzr conflicts`` to just list conflicts. Use
-``bzr resolve file/name`` or ``bzr resolve --all`` once conflicts have
+``bzr resolve file/name`` or ``bzr resolve --done`` once conflicts have
 been handled. [#resolve]_ If you have a conflict that is particularly
 difficult to solve you may want to use the ``bzr remerge`` command. It
 will let you try different merge algorithms, as well as let you see the

=== modified file 'doc/ja/tutorials/centralized_workflow.txt'
--- doc/ja/tutorials/centralized_workflow.txt	2011-05-18 13:12:59 +0000
+++ doc/ja/tutorials/centralized_workflow.txt	2012-07-27 14:48:18 +0000
@@ -228,7 +228,7 @@
 そのため、間違って競合マーカーをコミットしてしまうことはありません。
 ``bzr status`` コマンドを使えば、他の変更内容と一緒に競合の情報も表示されます。
 ``bzr conflicts`` なら、競合の情報だけが表示されます。
-競合を解決し終わったら、``bzr resolve file/name`` か ``bzr resolve --all`` を実行してください。
+競合を解決し終わったら、``bzr resolve file/name`` か ``bzr resolve --done`` を実行してください。
 [#resolve]_ もし、解決が特に難しい競合がある場合は、 ``bzr remerge`` コマンドを使いたいと思うかもしれません。
 このコマンドで、別のマージアルゴリズムを試してみることができ、さらに元のソース行を表示する\
 こともできます。(``--show-base``)

=== modified file 'doc/ja/user-reference/index.txt'
--- doc/ja/user-reference/index.txt	2011-05-18 06:01:08 +0000
+++ doc/ja/user-reference/index.txt	2012-07-27 14:48:18 +0000
@@ -3198,7 +3198,7 @@
   
   一旦問題を修正すれば、自動的にテキストの衝突を修正したものとしてマークするために"bzr resolve"を使用し、
   特定の衝突を解消したものとしてマークするためにFILEをresolveします。
-  すべての衝突が解消されたものとしてマークするにはor "bzr resolve --all"を行います。
+  すべての衝突が解消されたものとしてマークするにはor "bzr resolve --done"を行います。
   
 :関連コマンド: `bzr conflicts`
 

=== modified file 'doc/ru/tutorials/centralized_workflow.txt'
--- doc/ru/tutorials/centralized_workflow.txt	2010-08-13 19:08:57 +0000
+++ doc/ru/tutorials/centralized_workflow.txt	2012-07-27 14:48:18 +0000
@@ -258,7 +258,7 @@
 разрешены все конфликты. В этом случае вы случайно не зафиксируете маркеры
 конфликта. Команда ``bzr status`` покажет конфликты и изменения, или можно
 использовать ``bzr conflicts`` что бы увидеть только конфликты.
-Используйте ``bzr resolve file/name``, или ``bzr resolve --all`` как
+Используйте ``bzr resolve file/name``, или ``bzr resolve --done`` как
 только конфликты были разрешены. [#resolve]_ Если существуют конфликты
 которые особенно сложно разрешить можно использовать команду ``bzr
 remerge``. Эта команда позволит использовать другие алгоритмы объединения