Merge lp:~jelmer/brz/uninitialize-remote into lp:brz

[Jelmer Vernooij]

Allow ControlDirFormat instances to be uninitializeable (like git remotes).

[Martin Packman (gz)]

Okay.

review: Approve

=== modified file 'breezy/tests/per_branch/test_push.py'
--- breezy/tests/per_branch/test_push.py	2017-12-03 21:05:52 +0000
+++ breezy/tests/per_branch/test_push.py	2018-02-28 21:38:37 +0000
@@ -223,13 +223,16 @@
         # See https://bugs.launchpad.net/bzr/+bug/465517
         t = self.get_transport('target')
         t.ensure_base()
-        bzrdir = self.bzrdir_format.initialize_on_transport(t)
+        try:
+            bzrdir = self.bzrdir_format.initialize_on_transport(t)
+        except errors.UninitializableFormat:
+            raise tests.TestNotApplicable('cannot initialize this format')
         try:
             bzrdir.open_branch()
         except errors.NotBranchError:
             pass
         else:
-            raise tests.TestNotApplicable('older formats can\'t have a repo'
+            raise tests.TestNotApplicable('some formats can\'t have a repo'
                                           ' without a branch')
         try:
             source = self.make_branch_builder('source',

=== modified file 'breezy/tests/per_interbranch/test_push.py'
--- breezy/tests/per_interbranch/test_push.py	2017-11-21 20:40:14 +0000
+++ breezy/tests/per_interbranch/test_push.py	2018-02-28 21:38:37 +0000
@@ -212,7 +212,11 @@
         #   - rev-2, no changes
         #   - rev-3, modifies the file.
         repo = self.make_repository('repo', shared=True, format='1.6')
-        builder = self.make_from_branch_builder('repo/local')
+        try:
+            builder = self.make_from_branch_builder('repo/local')
+        except errors.UninitializableFormat:
+            raise tests.TestNotApplicable(
+                'BranchBuilder can not initialize some formats')
         builder.start_series()
         revid1 = builder.build_snapshot(None, [
             ('add', ('', 'root-id', 'directory', '')),