Breezy

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

  1. dpush-strict
  2. Merge into trunk
Proposed by Jelmer Vernooij
Status: Merged
Approved by: Jelmer Vernooij
Approved revision: no longer in the source branch.
Merge reported by: The Breezy Bot
Merged at revision: not available
Proposed branch: lp:~jelmer/brz/dpush-strict
Merge into: lp:brz
Diff against target: 64 lines (+2/-19)
4 files modified
breezy/config.py (+0/-10)
breezy/help_topics/en/configuration.txt (+0/-7)
breezy/push.py (+1/-1)
breezy/tests/blackbox/test_push.py (+1/-1)
To merge this branch: bzr merge lp:~jelmer/brz/dpush-strict
Reviewer Review Type Date Requested Status
Martin Packman Approve
Review via email: mp+358475@code.launchpad.net

Commit message

Drop dpush_strict configuration option.

Description of the change

Drop dpush_strict configuration option.

This is now unused, since dpush has been removed.

To post a comment you must log in.
Revision history for this message
Martin Packman (gz) wrote :

Thanks!

review: Approve
Revision history for this message
The Breezy Bot (the-breezy-bot) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'breezy/config.py'
2--- breezy/config.py 2018-08-14 21:37:46 +0000
3+++ breezy/config.py 2018-11-16 10:44:14 +0000
4@@ -2776,16 +2776,6 @@
5 Option('default_format', default='2a',
6 help='Format used when creating branches.'))
7 option_registry.register(
8- Option('dpush_strict', default=None,
9- from_unicode=bool_from_store,
10- help='''\
11-The default value for ``dpush --strict``.
12-
13-If present, defines the ``--strict`` option default value for checking
14-uncommitted changes before pushing into a different VCS without any
15-custom bzr metadata.
16-'''))
17-option_registry.register(
18 Option('editor',
19 help='The command called to launch an editor to enter a message.'))
20 option_registry.register(
21
22=== modified file 'breezy/help_topics/en/configuration.txt'
23--- breezy/help_topics/en/configuration.txt 2017-07-30 16:59:50 +0000
24+++ breezy/help_topics/en/configuration.txt 2018-11-16 10:44:14 +0000
25@@ -649,13 +649,6 @@
26 If present, defines the ``--strict`` option default value for checking
27 uncommitted changes before pushing.
28
29-dpush_strict
30-~~~~~~~~~~~~
31-
32-If present, defines the ``--strict`` option default value for checking
33-uncommitted changes before pushing into a different VCS without any
34-custom bzr metadata.
35-
36 bound_location
37 ~~~~~~~~~~~~~~
38
39
40=== modified file 'breezy/push.py'
41--- breezy/push.py 2018-03-31 17:16:06 +0000
42+++ breezy/push.py 2018-11-16 10:44:14 +0000
43@@ -152,7 +152,7 @@
44 ' for more information.'))
45 except errors.NoRoundtrippingSupport as e:
46 raise errors.BzrCommandError(gettext("It is not possible to losslessly "
47- "push to %s. You may want to use dpush instead.") %
48+ "push to %s. You may want to use --lossy.") %
49 e.target_branch.mapping.vcs.abbreviation)
50 except errors.NoRepositoryPresent:
51 # we have a controldir but no branch or repository
52
53=== modified file 'breezy/tests/blackbox/test_push.py'
54--- breezy/tests/blackbox/test_push.py 2018-07-22 17:06:14 +0000
55+++ breezy/tests/blackbox/test_push.py 2018-11-16 10:44:14 +0000
56@@ -899,7 +899,7 @@
57 output, error = self.run_bzr("push -d dc dp", retcode=3)
58 self.assertEqual("", output)
59 self.assertEqual(error, "brz: ERROR: It is not possible to losslessly"
60- " push to dummy. You may want to use dpush instead.\n")
61+ " push to dummy. You may want to use --lossy.\n")
62
63
64 class TestPushOutput(script.TestCaseWithTransportAndScript):

Subscribers

People subscribed via source and target branches