Merge lp:~jelmer/brz/dpush-strict into lp:brz

[Jelmer Vernooij]

Drop dpush_strict configuration option.

Drop dpush_strict configuration option.

This is now unused, since dpush has been 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/12/

=== modified file 'breezy/config.py'
--- breezy/config.py	2018-08-14 21:37:46 +0000
+++ breezy/config.py	2018-11-16 10:44:14 +0000
@@ -2776,16 +2776,6 @@
     Option('default_format', default='2a',
            help='Format used when creating branches.'))
 option_registry.register(
-    Option('dpush_strict', default=None,
-           from_unicode=bool_from_store,
-           help='''\
-The default value for ``dpush --strict``.
-
-If present, defines the ``--strict`` option default value for checking
-uncommitted changes before pushing into a different VCS without any
-custom bzr metadata.
-'''))
-option_registry.register(
     Option('editor',
            help='The command called to launch an editor to enter a message.'))
 option_registry.register(
 
=== modified file 'breezy/help_topics/en/configuration.txt'
--- breezy/help_topics/en/configuration.txt	2017-07-30 16:59:50 +0000
+++ breezy/help_topics/en/configuration.txt	2018-11-16 10:44:14 +0000
@@ -649,13 +649,6 @@
 If present, defines the ``--strict`` option default value for checking
 uncommitted changes before pushing.
 
-dpush_strict
-~~~~~~~~~~~~
-
-If present, defines the ``--strict`` option default value for checking
-uncommitted changes before pushing into a different VCS without any
-custom bzr metadata.
-
 bound_location
 ~~~~~~~~~~~~~~
 
 
=== modified file 'breezy/push.py'
--- breezy/push.py	2018-03-31 17:16:06 +0000
+++ breezy/push.py	2018-11-16 10:44:14 +0000
@@ -152,7 +152,7 @@
                                     ' for more information.'))
         except errors.NoRoundtrippingSupport as e:
             raise errors.BzrCommandError(gettext("It is not possible to losslessly "
-                "push to %s. You may want to use dpush instead.") % 
+                "push to %s. You may want to use --lossy.") % 
                     e.target_branch.mapping.vcs.abbreviation)
         except errors.NoRepositoryPresent:
             # we have a controldir but no branch or repository
 
=== modified file 'breezy/tests/blackbox/test_push.py'
--- breezy/tests/blackbox/test_push.py	2018-07-22 17:06:14 +0000
+++ breezy/tests/blackbox/test_push.py	2018-11-16 10:44:14 +0000
@@ -899,7 +899,7 @@
         output, error = self.run_bzr("push -d dc dp", retcode=3)
         self.assertEqual("", output)
         self.assertEqual(error, "brz: ERROR: It is not possible to losslessly"
-            " push to dummy. You may want to use dpush instead.\n")
+            " push to dummy. You may want to use --lossy.\n")
 
 
 class TestPushOutput(script.TestCaseWithTransportAndScript):