Merge lp:~jelmer/brz/default-format-git into lp:brz

[Jelmer Vernooij]

Some more improvements to handle git as default format.

Some more improvements to handle git as default format.

[Jelmer Vernooij (jelmer)]

review: Approve

[The Breezy Bot (the-breezy-bot)]

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

=== modified file 'breezy/bzr/bzrdir.py'
--- breezy/bzr/bzrdir.py	2021-11-17 20:30:19 +0000
+++ breezy/bzr/bzrdir.py	2021-12-27 23:17:52 +0000
@@ -780,6 +780,8 @@
         if cls is not BzrDir:
             raise AssertionError("BzrDir.create always creates the "
                                  "default format, not one of %r" % cls)
+        if format is None:
+            format = BzrDirFormat.get_default_format()
         return controldir.ControlDir.create(
             base, format=format, possible_transports=possible_transports)
 
 
=== modified file 'breezy/bzr/tests/test_bzrdir.py'
--- breezy/bzr/tests/test_bzrdir.py	2020-12-26 18:24:48 +0000
+++ breezy/bzr/tests/test_bzrdir.py	2021-12-27 23:17:52 +0000
@@ -80,13 +80,16 @@
         old_format = bzrdir.BzrDirFormat.get_default_format()
         # default is BzrDirMetaFormat1
         self.assertIsInstance(old_format, bzrdir.BzrDirMetaFormat1)
-        controldir.ControlDirFormat._set_default_format(SampleBzrDirFormat())
+        current_default = controldir.format_registry.aliases()['bzr']
+        controldir.format_registry.register('sample', SampleBzrDirFormat, help='Sample')
+        self.addCleanup(controldir.format_registry.remove, 'sample')
+        controldir.format_registry.register_alias('bzr', 'sample')
         # creating a bzr dir should now create an instrumented dir.
         try:
             result = bzrdir.BzrDir.create('memory:///')
             self.assertIsInstance(result, SampleBzrDir)
         finally:
-            controldir.ControlDirFormat._set_default_format(old_format)
+            controldir.format_registry.register_alias('bzr', current_default)
         self.assertEqual(old_format, bzrdir.BzrDirFormat.get_default_format())
 
 
 
=== modified file 'breezy/tests/blackbox/test_send.py'
--- breezy/tests/blackbox/test_send.py	2020-06-19 21:26:53 +0000
+++ breezy/tests/blackbox/test_send.py	2021-12-27 23:17:52 +0000
@@ -282,16 +282,17 @@
         self.parent_tree = ControlDir.create_standalone_workingtree('parent')
         self.build_tree_contents([('parent/file', b'parent')])
         self.parent_tree.add('file')
-        self.parent_tree.commit('first commit', rev_id=b'parent')
+        parent = self.parent_tree.commit('first commit')
         # Branch 'local' from parent and do a change
         local_bzrdir = self.parent_tree.controldir.sprout('local')
         self.local_tree = local_bzrdir.open_workingtree()
         self.build_tree_contents([('local/file', b'local')])
-        self.local_tree.commit('second commit', rev_id=b'local')
+        local = self.local_tree.commit('second commit')
+        return parent, local
 
     _default_command = ['send', '-o-', '../parent']
     _default_wd = 'local'
-    _default_sent_revs = [b'local']
+    _default_sent_revs = None
     _default_errors = ['Working tree ".*/local/" has uncommitted '
                        'changes \\(See brz status\\)\\.', ]
     _default_additional_error = 'Use --no-strict to force the send.\n'
@@ -311,7 +312,7 @@
         else:
             err_re = []
         if revs is None:
-            revs = self._default_sent_revs
+            revs = self._default_sent_revs or [self.local]
         out, err = self.run_send(args, err_re=err_re)
         if len(revs) == 1:
             bundling_revs = 'Bundling %d revision.\n' % len(revs)
@@ -324,7 +325,7 @@
             self.assertEqual(bundling_revs, err)
         md = merge_directive.MergeDirective.from_lines(
             BytesIO(out.encode('utf-8')))
-        self.assertEqual(b'parent', md.base_revision_id)
+        self.assertEqual(self.parent, md.base_revision_id)
         br = serializer.read_bundle(BytesIO(md.get_raw_bundle()))
         self.assertEqual(set(revs), set(r.revision_id for r in br.revisions))
 
@@ -334,7 +335,7 @@
 
     def setUp(self):
         super(TestSendStrictWithoutChanges, self).setUp()
-        self.make_parent_and_local_branches()
+        self.parent, self.local = self.make_parent_and_local_branches()
 
     def test_send_without_workingtree(self):
         ControlDir.open("local").destroy_workingtree()
@@ -383,12 +384,12 @@
         do_changes_func()
 
     def _uncommitted_changes(self):
-        self.make_parent_and_local_branches()
+        self.parent, self.local = self.make_parent_and_local_branches()
         # Make a change without committing it
         self.build_tree_contents([('local/file', b'modified')])
 
     def _pending_merges(self):
-        self.make_parent_and_local_branches()
+        self.parent, self.local = self.make_parent_and_local_branches()
         # Create 'other' branch containing a new file
         other_bzrdir = self.parent_tree.controldir.sprout('other')
         other_tree = other_bzrdir.open_workingtree()
@@ -400,7 +401,7 @@
         self.local_tree.revert(filenames=['other-file'], backups=False)
 
     def _out_of_sync_trees(self):
-        self.make_parent_and_local_branches()
+        self.parent, self.local = self.make_parent_and_local_branches()
         self.run_bzr(['checkout', '--lightweight', 'local', 'checkout'])
         # Make a change and commit it
         self.build_tree_contents([('local/file', b'modified in local')])
@@ -409,13 +410,13 @@
         self._default_wd = 'checkout'
         self._default_errors = ["Working tree is out of date, please run"
                                 " 'brz update'\\.", ]
-        self._default_sent_revs = [b'modified-in-local', b'local']
+        self._default_sent_revs = [b'modified-in-local', self.local]
 
     def test_send_default(self):
         self.assertSendSucceeds([], with_warning=True)
 
     def test_send_with_revision(self):
-        self.assertSendSucceeds(['-r', 'revid:local'], revs=[b'local'])
+        self.assertSendSucceeds(['-r', 'revid:' + self.local.decode('utf-8')], revs=[self.local])
 
     def test_send_no_strict(self):
         self.assertSendSucceeds(['--no-strict'])
 
=== modified file 'breezy/tests/per_branch/test_pull.py'
--- breezy/tests/per_branch/test_pull.py	2021-12-25 14:55:24 +0000
+++ breezy/tests/per_branch/test_pull.py	2021-12-27 23:17:52 +0000
@@ -300,7 +300,11 @@
             # branch of the default type, which does allow binding.
             # See https://bugs.launchpad.net/bzr/+bug/112020
             local = controldir.ControlDir.create_branch_convenience('local2')
-            local.bind(target)
+            try:
+                local.bind(target)
+            except branch.BindingUnsupported:
+                raise TestNotApplicable(
+                    'default format does not support binding')
         source = self.make_branch('source')
         branch.Branch.hooks.install_named_hook(
             'post_pull', self.capture_post_pull_hook, None)
 
=== modified file 'breezy/tests/per_branch/test_push.py'
--- breezy/tests/per_branch/test_push.py	2021-12-25 14:55:24 +0000
+++ breezy/tests/per_branch/test_push.py	2021-12-27 23:17:52 +0000
@@ -351,7 +351,11 @@
             # branch of the default type, which does allow binding.
             # See https://bugs.launchpad.net/bzr/+bug/112020
             local = controldir.ControlDir.create_branch_convenience('local2')
-            local.bind(target)
+            try:
+                local.bind(target)
+            except branch.BindingUnsupported:
+                raise tests.TestNotApplicable(
+                    'default format does not support binding')
         source = self.make_branch('source')
         branch.Branch.hooks.install_named_hook(
             'post_push', self.capture_post_push_hook, None)
 
=== modified file 'breezy/tests/per_merger.py'
--- breezy/tests/per_merger.py	2021-12-27 13:56:34 +0000
+++ breezy/tests/per_merger.py	2021-12-27 23:17:52 +0000
@@ -351,7 +351,11 @@
         builder = self.make_merge_builder()
         self.create_file_needing_contents_merge(builder, "name1")
         conflicts = builder.merge(self.merge_type)
-        self.assertEqual(conflicts, [TextConflict('name1', file_id=b'name1-id')])
+        self.assertEqual(1, len(conflicts))
+        [conflict] = conflicts
+        self.assertEqual('text conflict', conflict.typestring)
+        if builder.this.supports_file_ids:
+            self.assertEqual(conflict.file_id, builder.this.path2id('name1'))
         # The hook still gets to set the file contents in this case, so that it
         # can insert custom conflict markers.
         with builder.this.get_file('name1') as f:
 
=== modified file 'setup.py'
--- setup.py	2021-12-25 12:35:22 +0000
+++ setup.py	2021-12-27 23:17:52 +0000
@@ -588,8 +588,9 @@
         version=version_str,
         description=META_INFO['description'],
         maintainer=META_INFO['maintainer'],
-        copyright="Copyright 2005-2012 Canonical Ltd.\n"
-            "Copyright 2017-2021 Breezy developers",
+        copyright=(
+            "Copyright 2005-2012 Canonical Ltd.\n"
+            "Copyright 2017-2021 Breezy developers"),
         company_name="Canonical Ltd.",
         comments=META_INFO['description'],
     )