Merge lp:~nmb/brz/fix-init-formats into lp:brz

[Neil Martinsen-Burrell]

Rremove old repository format flags from init command

This fixes Bug #330494 by removing the names of various repository formats as options. The same functionality is available using ``--format=...`` now.

[Martin Packman (gz)]

Looks like a good first step. We may want to go further later, but for 3.0 I think we do want to still support all the legacy formats we can.

review: Approve

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2017-06-16 00:00:24 +0000
+++ breezy/builtins.py	2017-06-19 20:35:10 +0000
@@ -2066,7 +2066,7 @@
                 'See "help formats".',
                 lazy_registry=('breezy.controldir', 'format_registry'),
                 converter=lambda name: controldir.format_registry.make_controldir(name),
-                value_switches=True,
+                value_switches=False,
                 title="Branch format",
                 ),
          Option('append-revisions-only',
@@ -2185,7 +2185,7 @@
                                  ' "brz help formats" for details.',
                             lazy_registry=('breezy.controldir', 'format_registry'),
                             converter=lambda name: controldir.format_registry.make_controldir(name),
-                            value_switches=True, title='Repository format'),
+                            value_switches=False, title='Repository format'),
                      Option('no-trees',
                              help='Branches in the repository will default to'
                                   ' not having a working tree.'),

=== modified file 'breezy/plugins/bash_completion/tests/test_bashcomp.py'
--- breezy/plugins/bash_completion/tests/test_bashcomp.py	2017-05-22 00:56:52 +0000
+++ breezy/plugins/bash_completion/tests/test_bashcomp.py	2017-06-19 20:35:10 +0000
@@ -120,7 +120,7 @@
 
     def test_init_opts(self):
         self.complete(['brz', 'init', '-'])
-        self.assertCompletionContains('-h', '--2a', '--format=2a')
+        self.assertCompletionContains('-h', '--format=2a')
 
     def test_global_opts(self):
         self.complete(['brz', '-', 'init'], cword=1)

=== modified file 'breezy/tests/blackbox/test_init.py'
--- breezy/tests/blackbox/test_init.py	2017-06-10 16:40:42 +0000
+++ breezy/tests/blackbox/test_init.py	2017-06-19 20:35:10 +0000
@@ -187,7 +187,7 @@
 
     def test_init(self):
         # init on a remote url should succeed.
-        out, err = self.run_bzr(['init', '--pack-0.92', self.get_url()])
+        out, err = self.run_bzr(['init', '--format=pack-0.92', self.get_url()])
         self.assertEqual(out,
             """Created a standalone branch (format: pack-0.92)\n""")
         self.assertEqual('', err)
@@ -213,14 +213,14 @@
         self.run_bzr_error(['Already a branch'], ['init', self.get_url()])
 
     def test_init_append_revisions_only(self):
-        self.run_bzr('init --dirstate-tags normal_branch6')
+        self.run_bzr('init --format=dirstate-tags normal_branch6')
         branch = _mod_branch.Branch.open('normal_branch6')
         self.assertEqual(None, branch.get_append_revisions_only())
-        self.run_bzr('init --append-revisions-only --dirstate-tags branch6')
+        self.run_bzr('init --append-revisions-only --format=dirstate-tags branch6')
         branch = _mod_branch.Branch.open('branch6')
         self.assertEqual(True, branch.get_append_revisions_only())
         self.run_bzr_error(['cannot be set to append-revisions-only'],
-                           'init --append-revisions-only --knit knit')
+                           'init --append-revisions-only --format=knit knit')
 
     def test_init_without_username(self):
         """Ensure init works if username is not set.

=== modified file 'breezy/tests/blackbox/test_upgrade.py'
--- breezy/tests/blackbox/test_upgrade.py	2017-06-14 22:34:05 +0000
+++ breezy/tests/blackbox/test_upgrade.py	2017-06-19 20:35:10 +0000
@@ -279,7 +279,7 @@
 
     def test_recommend_upgrade_wt4(self):
         # using a deprecated format gives a warning
-        self.run_bzr('init --knit a')
+        self.run_bzr('init --format=knit a')
         out, err = self.run_bzr('status a')
         self.assertContainsRe(err, 'brz upgrade .*[/\\\\]a')
 
@@ -287,7 +287,7 @@
         # we should only get a recommendation to upgrade when we're accessing
         # the actual workingtree, not when we only open a bzrdir that contains
         # an old workngtree
-        self.run_bzr('init --knit a')
+        self.run_bzr('init --format=knit a')
         out, err = self.run_bzr('revno a')
         if err.find('upgrade') > -1:
             self.fail("message shouldn't suggest upgrade:\n%s" % err)

=== modified file 'doc/en/release-notes/brz-3.0.txt'
--- doc/en/release-notes/brz-3.0.txt	2017-06-19 01:04:38 +0000
+++ doc/en/release-notes/brz-3.0.txt	2017-06-19 20:35:10 +0000
@@ -51,6 +51,11 @@
    ``ignore_missing_extensions=True`` to
    ``suppress_warnings=missing_extensions``. (Jelmer Vernooij)
 
+ * Remove format names as options to ``brz init`` and ``brz
+   init-repository``.. Now you must use ``brz init --format=...``.
+   This simplifies ``brz init --help``.
+   (Neil Martinsen-Burrell, #330494)
+
 New Features
 ************