Merge lp:~jelmer/brz/init-repo-weave-fmt into lp:brz

[Jelmer Vernooij]

Don't explicitly specify repository format to fixed component bzrdirs (like weave).

Don't explicitly specify repository format to fixed component bzrdirs (like weave).

[Martin Packman (gz)]

Okay.

review: Approve

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2018-03-25 00:39:16 +0000
+++ breezy/builtins.py	2018-03-30 03:43:52 +0000
@@ -2279,12 +2279,17 @@
 
         to_transport = transport.get_transport(location)
 
+        if format.fixed_components:
+            repo_format_name = None
+        else:
+            repo_format_name = format.repository_format.get_format_string()
+
         (repo, newdir, require_stacking, repository_policy) = (
             format.initialize_on_transport_ex(to_transport,
             create_prefix=True, make_working_trees=not no_trees,
             shared_repo=True, force_new_repo=True,
             use_existing_dir=True,
-            repo_format_name=format.repository_format.get_format_string()))
+            repo_format_name=repo_format_name))
         if not is_quiet():
             from .info import show_bzrdir_info
             show_bzrdir_info(newdir, verbose=0, outfile=self.outf)

=== modified file 'breezy/plugins/weave_fmt/test_repository.py'
--- breezy/plugins/weave_fmt/test_repository.py	2018-02-18 15:21:06 +0000
+++ breezy/plugins/weave_fmt/test_repository.py	2018-03-30 03:43:52 +0000
@@ -252,6 +252,15 @@
 
 class TestInterWeaveRepo(TestCaseWithTransport):
 
+    def test_make_repository(self):
+        out, err = self.run_bzr("init-repository --format=weave a")
+        self.assertEqual(out,
+"""Standalone tree (format: weave)
+Location:
+  branch root: a
+""")
+        self.assertEqual(err, "")
+
     def test_is_compatible_and_registered(self):
         # InterWeaveRepo is compatible when either side
         # is a format 5/6/7 branch