Merge lp:~jelmer/brz/move-registration into lp:brz

[Jelmer Vernooij]

Move bzr format probing to breezy.bzr.

Move bzr format probing to breezy.bzr.

(This is to limit the amount of bzr-related code that needs to be imported when e.g. accessing non-bzr formats like git).

I'm planning to mirror this for the git support

[Martin Packman (gz)]

Looks good, as all imports are from a level up rather than siblings.

review: Approve

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

Running landing tests failed
http://10.242.247.184:8080/job/brz-dev/140/

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

Running landing tests failed
http://10.242.247.184:8080/job/brz-dev/142/

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

Running landing tests failed
http://10.242.247.184:8080/job/brz-dev/143/

=== modified file 'breezy/builtins.py'
--- breezy/builtins.py	2017-06-15 22:34:55 +0000
+++ breezy/builtins.py	2017-06-15 23:39:05 +0000
@@ -22,7 +22,7 @@
 import os
 import sys
 
-import breezy.bzr.bzrdir
+import breezy.bzr
 
 from . import lazy_import
 lazy_import.lazy_import(globals(), """
 
=== modified file 'breezy/bzr/__init__.py'
--- breezy/bzr/__init__.py	2017-06-10 01:39:46 +0000
+++ breezy/bzr/__init__.py	2017-06-15 23:39:05 +0000
@@ -15,3 +15,339 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 from __future__ import absolute_import
+
+from .. import (
+    config,
+    errors,
+    controldir,
+    pyutils,
+    registry,
+    )
+
+class BzrProber(controldir.Prober):
+    """Prober for formats that use a .bzr/ control directory."""
+
+    formats = registry.FormatRegistry(controldir.network_format_registry)
+    """The known .bzr formats."""
+
+    @classmethod
+    def probe_transport(klass, transport):
+        """Return the .bzrdir style format present in a directory."""
+        try:
+            format_string = transport.get_bytes(".bzr/branch-format")
+            # GZ 2017-06-09: Where should format strings get decoded...
+            format_text = format_string.decode("ascii")
+        except errors.NoSuchFile:
+            raise errors.NotBranchError(path=transport.base)
+        try:
+            first_line = format_text[:format_text.index("\n")+1]
+        except ValueError:
+            first_line = format_text
+        try:
+            cls = klass.formats.get(first_line)
+        except KeyError:
+            raise errors.UnknownFormatError(format=first_line, kind='bzrdir')
+        return cls.from_string(format_text)
+
+    @classmethod
+    def known_formats(cls):
+        result = set()
+        for name, format in cls.formats.items():
+            if callable(format):
+                format = format()
+            result.add(format)
+        return result
+
+
+controldir.ControlDirFormat.register_prober(BzrProber)
+
+
+class RemoteBzrProber(controldir.Prober):
+    """Prober for remote servers that provide a Bazaar smart server."""
+
+    @classmethod
+    def probe_transport(klass, transport):
+        """Return a RemoteBzrDirFormat object if it looks possible."""
+        try:
+            medium = transport.get_smart_medium()
+        except (NotImplementedError, AttributeError,
+                errors.TransportNotPossible, errors.NoSmartMedium,
+                errors.SmartProtocolError):
+            # no smart server, so not a branch for this format type.
+            raise errors.NotBranchError(path=transport.base)
+        else:
+            # Decline to open it if the server doesn't support our required
+            # version (3) so that the VFS-based transport will do it.
+            if medium.should_probe():
+                try:
+                    server_version = medium.protocol_version()
+                except errors.SmartProtocolError:
+                    # Apparently there's no usable smart server there, even though
+                    # the medium supports the smart protocol.
+                    raise errors.NotBranchError(path=transport.base)
+                if server_version != '2':
+                    raise errors.NotBranchError(path=transport.base)
+            from .remote import RemoteBzrDirFormat
+            return RemoteBzrDirFormat()
+
+    @classmethod
+    def known_formats(cls):
+        from .remote import RemoteBzrDirFormat
+        return {RemoteBzrDirFormat()}
+
+
+controldir.ControlDirFormat.register_server_prober(RemoteBzrProber)
+
+# Register bzr formats
+BzrProber.formats.register_lazy(
+    "Bazaar-NG meta directory, format 1\n",
+    __name__ + '.bzrdir', 'BzrDirMetaFormat1')
+BzrProber.formats.register_lazy(
+    "Bazaar meta directory, format 1 (with colocated branches)\n",
+    __name__ + '.bzrdir', 'BzrDirMetaFormat1Colo')
+
+
+def register_metadir(registry, key,
+         repository_format, help, native=True, deprecated=False,
+         branch_format=None,
+         tree_format=None,
+         hidden=False,
+         experimental=False,
+         alias=False, bzrdir_format=None):
+    """Register a metadir subformat.
+
+    These all use a meta bzrdir, but can be parameterized by the
+    Repository/Branch/WorkingTreeformats.
+
+    :param repository_format: The fully-qualified repository format class
+        name as a string.
+    :param branch_format: Fully-qualified branch format class name as
+        a string.
+    :param tree_format: Fully-qualified tree format class name as
+        a string.
+    """
+    if bzrdir_format is None:
+        bzrdir_format = 'breezy.bzr.bzrdir.BzrDirMetaFormat1'
+    # This should be expanded to support setting WorkingTree and Branch
+    # formats, once the API supports that.
+    def _load(full_name):
+        mod_name, factory_name = full_name.rsplit('.', 1)
+        try:
+            factory = pyutils.get_named_object(mod_name, factory_name)
+        except ImportError as e:
+            raise ImportError('failed to load %s: %s' % (full_name, e))
+        except AttributeError:
+            raise AttributeError('no factory %s in module %r'
+                % (full_name, sys.modules[mod_name]))
+        return factory()
+
+    def helper():
+        bd = _load(bzrdir_format)
+        if branch_format is not None:
+            bd.set_branch_format(_load(branch_format))
+        if tree_format is not None:
+            bd.workingtree_format = _load(tree_format)
+        if repository_format is not None:
+            bd.repository_format = _load(repository_format)
+        return bd
+    registry.register(key, helper, help, native, deprecated, hidden,
+        experimental, alias)
+
+register_metadir(controldir.format_registry, 'knit',
+    'breezy.bzr.knitrepo.RepositoryFormatKnit1',
+    'Format using knits.  Recommended for interoperation with bzr <= 0.14.',
+    branch_format='breezy.bzr.fullhistory.BzrBranchFormat5',
+    tree_format='breezy.bzr.workingtree_3.WorkingTreeFormat3',
+    hidden=True,
+    deprecated=True)
+register_metadir(controldir.format_registry, 'dirstate',
+    'breezy.bzr.knitrepo.RepositoryFormatKnit1',
+    help='Format using dirstate for working trees. '
+        'Compatible with bzr 0.8 and '
+        'above when accessed over the network. Introduced in bzr 0.15.',
+    branch_format='breezy.bzr.fullhistory.BzrBranchFormat5',
+    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
+    hidden=True,
+    deprecated=True)
+register_metadir(controldir.format_registry, 'dirstate-tags',
+    'breezy.bzr.knitrepo.RepositoryFormatKnit1',
+    help='Variant of dirstate with support for tags. '
+        'Introduced in bzr 0.15.',
+    branch_format='breezy.bzr.branch.BzrBranchFormat6',
+    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
+    hidden=True,
+    deprecated=True)
+register_metadir(controldir.format_registry, 'rich-root',
+    'breezy.bzr.knitrepo.RepositoryFormatKnit4',
+    help='Variant of dirstate with better handling of tree roots. '
+        'Introduced in bzr 1.0',
+    branch_format='breezy.bzr.branch.BzrBranchFormat6',
+    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
+    hidden=True,
+    deprecated=True)
+register_metadir(controldir.format_registry, 'dirstate-with-subtree',
+    'breezy.bzr.knitrepo.RepositoryFormatKnit3',
+    help='Variant of dirstate with support for nested trees. '
+         'Introduced in 0.15.',
+    branch_format='breezy.bzr.branch.BzrBranchFormat6',
+    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
+    experimental=True,
+    hidden=True,
+    )
+register_metadir(controldir.format_registry, 'pack-0.92',
+    'breezy.bzr.knitpack_repo.RepositoryFormatKnitPack1',
+    help='Pack-based format used in 1.x series. Introduced in 0.92. '
+        'Interoperates with bzr repositories before 0.92 but cannot be '
+        'read by bzr < 0.92. '
+        ,
+    branch_format='breezy.bzr.branch.BzrBranchFormat6',
+    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
+    deprecated=True,
+    )
+register_metadir(controldir.format_registry, 'pack-0.92-subtree',
+    'breezy.bzr.knitpack_repo.RepositoryFormatKnitPack3',
+    help='Pack-based format used in 1.x series, with subtree support. '
+        'Introduced in 0.92. Interoperates with '
+        'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
+        ,
+    branch_format='breezy.bzr.branch.BzrBranchFormat6',
+    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
+    hidden=True,
+    deprecated=True,
+    experimental=True,
+    )
+register_metadir(controldir.format_registry, 'rich-root-pack',
+    'breezy.bzr.knitpack_repo.RepositoryFormatKnitPack4',
+    help='A variant of pack-0.92 that supports rich-root data '
+         '(needed for bzr-svn and bzr-git). Introduced in 1.0.',
+    branch_format='breezy.bzr.branch.BzrBranchFormat6',
+    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
+    hidden=True,
+    deprecated=True,
+    )
+register_metadir(controldir.format_registry, '1.6',
+    'breezy.bzr.knitpack_repo.RepositoryFormatKnitPack5',
+    help='A format that allows a branch to indicate that there is another '
+         '(stacked) repository that should be used to access data that is '
+         'not present locally.',
+    branch_format='breezy.bzr.branch.BzrBranchFormat7',
+    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
+    hidden=True,
+    deprecated=True,
+    )
+register_metadir(controldir.format_registry, '1.6.1-rich-root',
+    'breezy.bzr.knitpack_repo.RepositoryFormatKnitPack5RichRoot',
+    help='A variant of 1.6 that supports rich-root data '
+         '(needed for bzr-svn and bzr-git).',
+    branch_format='breezy.bzr.branch.BzrBranchFormat7',
+    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
+    hidden=True,
+    deprecated=True,
+    )
+register_metadir(controldir.format_registry, '1.9',
+    'breezy.bzr.knitpack_repo.RepositoryFormatKnitPack6',
+    help='A repository format using B+tree indexes. These indexes '
+         'are smaller in size, have smarter caching and provide faster '
+         'performance for most operations.',
+    branch_format='breezy.bzr.branch.BzrBranchFormat7',
+    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
+    hidden=True,
+    deprecated=True,
+    )
+register_metadir(controldir.format_registry, '1.9-rich-root',
+    'breezy.bzr.knitpack_repo.RepositoryFormatKnitPack6RichRoot',
+    help='A variant of 1.9 that supports rich-root data '
+         '(needed for bzr-svn and bzr-git).',
+    branch_format='breezy.bzr.branch.BzrBranchFormat7',
+    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
+    hidden=True,
+    deprecated=True,
+    )
+register_metadir(controldir.format_registry, '1.14',
+    'breezy.bzr.knitpack_repo.RepositoryFormatKnitPack6',
+    help='A working-tree format that supports content filtering.',
+    branch_format='breezy.bzr.branch.BzrBranchFormat7',
+    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat5',
+    hidden=True,
+    deprecated=True,
+    )
+register_metadir(controldir.format_registry, '1.14-rich-root',
+    'breezy.bzr.knitpack_repo.RepositoryFormatKnitPack6RichRoot',
+    help='A variant of 1.14 that supports rich-root data '
+         '(needed for bzr-svn and bzr-git).',
+    branch_format='breezy.bzr.branch.BzrBranchFormat7',
+    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat5',
+    hidden=True,
+    deprecated=True,
+    )
+# The following un-numbered 'development' formats should always just be aliases.
+register_metadir(controldir.format_registry, 'development-subtree',
+    'breezy.bzr.groupcompress_repo.RepositoryFormat2aSubtree',
+    help='Current development format, subtree variant. Can convert data to and '
+        'from pack-0.92-subtree (and anything compatible with '
+        'pack-0.92-subtree) format repositories. Repositories and branches in '
+        'this format can only be read by bzr.dev. Please read '
+        'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
+        'before use.',
+    branch_format='breezy.bzr.branch.BzrBranchFormat7',
+    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat6',
+    experimental=True,
+    hidden=True,
+    alias=False, # Restore to being an alias when an actual development subtree format is added
+                 # This current non-alias status is simply because we did not introduce a
+                 # chk based subtree format.
+    )
+register_metadir(controldir.format_registry, 'development5-subtree',
+    'breezy.bzr.knitpack_repo.RepositoryFormatPackDevelopment2Subtree',
+    help='Development format, subtree variant. Can convert data to and '
+        'from pack-0.92-subtree (and anything compatible with '
+        'pack-0.92-subtree) format repositories. Repositories and branches in '
+        'this format can only be read by bzr.dev. Please read '
+        'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
+        'before use.',
+    branch_format='breezy.bzr.branch.BzrBranchFormat7',
+    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat6',
+    experimental=True,
+    hidden=True,
+    alias=False,
+    )
+
+register_metadir(controldir.format_registry, 'development-colo',
+    'breezy.bzr.groupcompress_repo.RepositoryFormat2a',
+    help='The 2a format with experimental support for colocated branches.\n',
+    branch_format='breezy.bzr.branch.BzrBranchFormat7',
+    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat6',
+    experimental=True,
+    bzrdir_format='breezy.bzr.bzrdir.BzrDirMetaFormat1Colo',
+    )
+
+
+# And the development formats above will have aliased one of the following:
+
+# Finally, the current format.
+register_metadir(controldir.format_registry, '2a',
+    'breezy.bzr.groupcompress_repo.RepositoryFormat2a',
+    help='Format for the bzr 2.0 series.\n'
+        'Uses group-compress storage.\n'
+        'Provides rich roots which are a one-way transition.\n',
+        # 'storage in packs, 255-way hashed CHK inventory, bencode revision, group compress, '
+        # 'rich roots. Supported by bzr 1.16 and later.',
+    branch_format='breezy.bzr.branch.BzrBranchFormat7',
+    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat6',
+    experimental=False,
+    )
+
+# The following format should be an alias for the rich root equivalent
+# of the default format
+register_metadir(controldir.format_registry, 'default-rich-root',
+    'breezy.bzr.groupcompress_repo.RepositoryFormat2a',
+    branch_format='breezy.bzr.branch.BzrBranchFormat7',
+    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat6',
+    alias=True,
+    hidden=True,
+    help='Same as 2a.')
+
+
+# The current format that is made on 'bzr init'.
+format_name = config.GlobalStack().get('default_format')
+controldir.format_registry.set_default(format_name)
 
=== modified file 'breezy/bzr/bzrdir.py'
--- breezy/bzr/bzrdir.py	2017-06-11 14:07:05 +0000
+++ breezy/bzr/bzrdir.py	2017-06-15 23:39:05 +0000
@@ -1223,78 +1223,6 @@
                 self.features[name] = necessity
 
 
-class BzrProber(controldir.Prober):
-    """Prober for formats that use a .bzr/ control directory."""
-
-    formats = registry.FormatRegistry(controldir.network_format_registry)
-    """The known .bzr formats."""
-
-    @classmethod
-    def probe_transport(klass, transport):
-        """Return the .bzrdir style format present in a directory."""
-        try:
-            format_string = transport.get_bytes(".bzr/branch-format")
-            # GZ 2017-06-09: Where should format strings get decoded...
-            format_text = format_string.decode("ascii")
-        except errors.NoSuchFile:
-            raise errors.NotBranchError(path=transport.base)
-        try:
-            first_line = format_text[:format_text.index("\n")+1]
-        except ValueError:
-            first_line = format_text
-        try:
-            cls = klass.formats.get(first_line)
-        except KeyError:
-            raise errors.UnknownFormatError(format=first_line, kind='bzrdir')
-        return cls.from_string(format_text)
-
-    @classmethod
-    def known_formats(cls):
-        result = set()
-        for name, format in cls.formats.items():
-            if callable(format):
-                format = format()
-            result.add(format)
-        return result
-
-
-controldir.ControlDirFormat.register_prober(BzrProber)
-
-
-class RemoteBzrProber(controldir.Prober):
-    """Prober for remote servers that provide a Bazaar smart server."""
-
-    @classmethod
-    def probe_transport(klass, transport):
-        """Return a RemoteBzrDirFormat object if it looks possible."""
-        try:
-            medium = transport.get_smart_medium()
-        except (NotImplementedError, AttributeError,
-                errors.TransportNotPossible, errors.NoSmartMedium,
-                errors.SmartProtocolError):
-            # no smart server, so not a branch for this format type.
-            raise errors.NotBranchError(path=transport.base)
-        else:
-            # Decline to open it if the server doesn't support our required
-            # version (3) so that the VFS-based transport will do it.
-            if medium.should_probe():
-                try:
-                    server_version = medium.protocol_version()
-                except errors.SmartProtocolError:
-                    # Apparently there's no usable smart server there, even though
-                    # the medium supports the smart protocol.
-                    raise errors.NotBranchError(path=transport.base)
-                if server_version != '2':
-                    raise errors.NotBranchError(path=transport.base)
-            from .remote import RemoteBzrDirFormat
-            return RemoteBzrDirFormat()
-
-    @classmethod
-    def known_formats(cls):
-        from .remote import RemoteBzrDirFormat
-        return {RemoteBzrDirFormat()}
-
-
 class BzrDirFormat(BzrFormat, controldir.ControlDirFormat):
     """ControlDirFormat base class for .bzr/ directories.
 
@@ -1745,12 +1673,6 @@
                                   __set_workingtree_format)
 
 
-# Register bzr formats
-BzrProber.formats.register(BzrDirMetaFormat1.get_format_string(),
-    BzrDirMetaFormat1)
-controldir.ControlDirFormat._default_format = BzrDirMetaFormat1()
-
-
 class BzrDirMetaFormat1Colo(BzrDirMetaFormat1):
     """BzrDirMeta1 format with support for colocated branches."""
 
@@ -1775,10 +1697,6 @@
         return BzrDirMeta1(transport, format)
 
 
-BzrProber.formats.register(BzrDirMetaFormat1Colo.get_format_string(),
-    BzrDirMetaFormat1Colo)
-
-
 class ConvertMetaToMeta(controldir.Converter):
     """Converts the components of metadirs."""
 
@@ -1892,9 +1810,6 @@
         return BzrDir.open_from_transport(to_convert.root_transport)
 
 
-controldir.ControlDirFormat.register_server_prober(RemoteBzrProber)
-
-
 class RepositoryAcquisitionPolicy(object):
     """Abstract base class for repository acquisition policies.
 
@@ -2066,246 +1981,4 @@
         return self._repository, False
 
 
-def register_metadir(registry, key,
-         repository_format, help, native=True, deprecated=False,
-         branch_format=None,
-         tree_format=None,
-         hidden=False,
-         experimental=False,
-         alias=False, bzrdir_format=None):
-    """Register a metadir subformat.
-
-    These all use a meta bzrdir, but can be parameterized by the
-    Repository/Branch/WorkingTreeformats.
-
-    :param repository_format: The fully-qualified repository format class
-        name as a string.
-    :param branch_format: Fully-qualified branch format class name as
-        a string.
-    :param tree_format: Fully-qualified tree format class name as
-        a string.
-    """
-    if bzrdir_format is None:
-        bzrdir_format = BzrDirMetaFormat1
-    # This should be expanded to support setting WorkingTree and Branch
-    # formats, once the API supports that.
-    def _load(full_name):
-        mod_name, factory_name = full_name.rsplit('.', 1)
-        try:
-            factory = pyutils.get_named_object(mod_name, factory_name)
-        except ImportError as e:
-            raise ImportError('failed to load %s: %s' % (full_name, e))
-        except AttributeError:
-            raise AttributeError('no factory %s in module %r'
-                % (full_name, sys.modules[mod_name]))
-        return factory()
-
-    def helper():
-        bd = bzrdir_format()
-        if branch_format is not None:
-            bd.set_branch_format(_load(branch_format))
-        if tree_format is not None:
-            bd.workingtree_format = _load(tree_format)
-        if repository_format is not None:
-            bd.repository_format = _load(repository_format)
-        return bd
-    registry.register(key, helper, help, native, deprecated, hidden,
-        experimental, alias)
-
-register_metadir(controldir.format_registry, 'knit',
-    'breezy.bzr.knitrepo.RepositoryFormatKnit1',
-    'Format using knits.  Recommended for interoperation with bzr <= 0.14.',
-    branch_format='breezy.bzr.fullhistory.BzrBranchFormat5',
-    tree_format='breezy.bzr.workingtree_3.WorkingTreeFormat3',
-    hidden=True,
-    deprecated=True)
-register_metadir(controldir.format_registry, 'dirstate',
-    'breezy.bzr.knitrepo.RepositoryFormatKnit1',
-    help='Format using dirstate for working trees. '
-        'Compatible with bzr 0.8 and '
-        'above when accessed over the network. Introduced in bzr 0.15.',
-    branch_format='breezy.bzr.fullhistory.BzrBranchFormat5',
-    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
-    hidden=True,
-    deprecated=True)
-register_metadir(controldir.format_registry, 'dirstate-tags',
-    'breezy.bzr.knitrepo.RepositoryFormatKnit1',
-    help='Variant of dirstate with support for tags. '
-        'Introduced in bzr 0.15.',
-    branch_format='breezy.bzr.branch.BzrBranchFormat6',
-    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
-    hidden=True,
-    deprecated=True)
-register_metadir(controldir.format_registry, 'rich-root',
-    'breezy.bzr.knitrepo.RepositoryFormatKnit4',
-    help='Variant of dirstate with better handling of tree roots. '
-        'Introduced in bzr 1.0',
-    branch_format='breezy.bzr.branch.BzrBranchFormat6',
-    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
-    hidden=True,
-    deprecated=True)
-register_metadir(controldir.format_registry, 'dirstate-with-subtree',
-    'breezy.bzr.knitrepo.RepositoryFormatKnit3',
-    help='Variant of dirstate with support for nested trees. '
-         'Introduced in 0.15.',
-    branch_format='breezy.bzr.branch.BzrBranchFormat6',
-    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
-    experimental=True,
-    hidden=True,
-    )
-register_metadir(controldir.format_registry, 'pack-0.92',
-    'breezy.bzr.knitpack_repo.RepositoryFormatKnitPack1',
-    help='Pack-based format used in 1.x series. Introduced in 0.92. '
-        'Interoperates with bzr repositories before 0.92 but cannot be '
-        'read by bzr < 0.92. '
-        ,
-    branch_format='breezy.bzr.branch.BzrBranchFormat6',
-    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
-    deprecated=True,
-    )
-register_metadir(controldir.format_registry, 'pack-0.92-subtree',
-    'breezy.bzr.knitpack_repo.RepositoryFormatKnitPack3',
-    help='Pack-based format used in 1.x series, with subtree support. '
-        'Introduced in 0.92. Interoperates with '
-        'bzr repositories before 0.92 but cannot be read by bzr < 0.92. '
-        ,
-    branch_format='breezy.bzr.branch.BzrBranchFormat6',
-    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
-    hidden=True,
-    deprecated=True,
-    experimental=True,
-    )
-register_metadir(controldir.format_registry, 'rich-root-pack',
-    'breezy.bzr.knitpack_repo.RepositoryFormatKnitPack4',
-    help='A variant of pack-0.92 that supports rich-root data '
-         '(needed for bzr-svn and bzr-git). Introduced in 1.0.',
-    branch_format='breezy.bzr.branch.BzrBranchFormat6',
-    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
-    hidden=True,
-    deprecated=True,
-    )
-register_metadir(controldir.format_registry, '1.6',
-    'breezy.bzr.knitpack_repo.RepositoryFormatKnitPack5',
-    help='A format that allows a branch to indicate that there is another '
-         '(stacked) repository that should be used to access data that is '
-         'not present locally.',
-    branch_format='breezy.bzr.branch.BzrBranchFormat7',
-    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
-    hidden=True,
-    deprecated=True,
-    )
-register_metadir(controldir.format_registry, '1.6.1-rich-root',
-    'breezy.bzr.knitpack_repo.RepositoryFormatKnitPack5RichRoot',
-    help='A variant of 1.6 that supports rich-root data '
-         '(needed for bzr-svn and bzr-git).',
-    branch_format='breezy.bzr.branch.BzrBranchFormat7',
-    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
-    hidden=True,
-    deprecated=True,
-    )
-register_metadir(controldir.format_registry, '1.9',
-    'breezy.bzr.knitpack_repo.RepositoryFormatKnitPack6',
-    help='A repository format using B+tree indexes. These indexes '
-         'are smaller in size, have smarter caching and provide faster '
-         'performance for most operations.',
-    branch_format='breezy.bzr.branch.BzrBranchFormat7',
-    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
-    hidden=True,
-    deprecated=True,
-    )
-register_metadir(controldir.format_registry, '1.9-rich-root',
-    'breezy.bzr.knitpack_repo.RepositoryFormatKnitPack6RichRoot',
-    help='A variant of 1.9 that supports rich-root data '
-         '(needed for bzr-svn and bzr-git).',
-    branch_format='breezy.bzr.branch.BzrBranchFormat7',
-    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat4',
-    hidden=True,
-    deprecated=True,
-    )
-register_metadir(controldir.format_registry, '1.14',
-    'breezy.bzr.knitpack_repo.RepositoryFormatKnitPack6',
-    help='A working-tree format that supports content filtering.',
-    branch_format='breezy.bzr.branch.BzrBranchFormat7',
-    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat5',
-    hidden=True,
-    deprecated=True,
-    )
-register_metadir(controldir.format_registry, '1.14-rich-root',
-    'breezy.bzr.knitpack_repo.RepositoryFormatKnitPack6RichRoot',
-    help='A variant of 1.14 that supports rich-root data '
-         '(needed for bzr-svn and bzr-git).',
-    branch_format='breezy.bzr.branch.BzrBranchFormat7',
-    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat5',
-    hidden=True,
-    deprecated=True,
-    )
-# The following un-numbered 'development' formats should always just be aliases.
-register_metadir(controldir.format_registry, 'development-subtree',
-    'breezy.bzr.groupcompress_repo.RepositoryFormat2aSubtree',
-    help='Current development format, subtree variant. Can convert data to and '
-        'from pack-0.92-subtree (and anything compatible with '
-        'pack-0.92-subtree) format repositories. Repositories and branches in '
-        'this format can only be read by bzr.dev. Please read '
-        'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
-        'before use.',
-    branch_format='breezy.bzr.branch.BzrBranchFormat7',
-    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat6',
-    experimental=True,
-    hidden=True,
-    alias=False, # Restore to being an alias when an actual development subtree format is added
-                 # This current non-alias status is simply because we did not introduce a
-                 # chk based subtree format.
-    )
-register_metadir(controldir.format_registry, 'development5-subtree',
-    'breezy.bzr.knitpack_repo.RepositoryFormatPackDevelopment2Subtree',
-    help='Development format, subtree variant. Can convert data to and '
-        'from pack-0.92-subtree (and anything compatible with '
-        'pack-0.92-subtree) format repositories. Repositories and branches in '
-        'this format can only be read by bzr.dev. Please read '
-        'http://doc.bazaar.canonical.com/latest/developers/development-repo.html '
-        'before use.',
-    branch_format='breezy.bzr.branch.BzrBranchFormat7',
-    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat6',
-    experimental=True,
-    hidden=True,
-    alias=False,
-    )
-
-register_metadir(controldir.format_registry, 'development-colo',
-    'breezy.bzr.groupcompress_repo.RepositoryFormat2a',
-    help='The 2a format with experimental support for colocated branches.\n',
-    branch_format='breezy.bzr.branch.BzrBranchFormat7',
-    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat6',
-    experimental=True,
-    bzrdir_format=BzrDirMetaFormat1Colo,
-    )
-
-
-# And the development formats above will have aliased one of the following:
-
-# Finally, the current format.
-register_metadir(controldir.format_registry, '2a',
-    'breezy.bzr.groupcompress_repo.RepositoryFormat2a',
-    help='Format for the bzr 2.0 series.\n'
-        'Uses group-compress storage.\n'
-        'Provides rich roots which are a one-way transition.\n',
-        # 'storage in packs, 255-way hashed CHK inventory, bencode revision, group compress, '
-        # 'rich roots. Supported by bzr 1.16 and later.',
-    branch_format='breezy.bzr.branch.BzrBranchFormat7',
-    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat6',
-    experimental=False,
-    )
-
-# The following format should be an alias for the rich root equivalent 
-# of the default format
-register_metadir(controldir.format_registry, 'default-rich-root',
-    'breezy.bzr.groupcompress_repo.RepositoryFormat2a',
-    branch_format='breezy.bzr.branch.BzrBranchFormat7',
-    tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat6',
-    alias=True,
-    hidden=True,
-    help='Same as 2a.')
-
-# The current format that is made on 'bzr init'.
-format_name = config.GlobalStack().get('default_format')
-controldir.format_registry.set_default(format_name)
+controldir.ControlDirFormat._default_format = BzrDirMetaFormat1()
 
=== modified file 'breezy/bzr/remote.py'
--- breezy/bzr/remote.py	2017-06-14 23:29:06 +0000
+++ breezy/bzr/remote.py	2017-06-15 23:39:05 +0000
@@ -22,6 +22,7 @@
 from .. import (
     bencode,
     branch,
+    bzr as _mod_bzr,
     config as _mod_config,
     controldir,
     debug,
@@ -490,7 +491,7 @@
                 warning('VFS BzrDir access triggered\n%s',
                     ''.join(traceback.format_stack()))
             self._real_bzrdir = _mod_bzrdir.BzrDir.open_from_transport(
-                self.root_transport, probers=[_mod_bzrdir.BzrProber])
+                self.root_transport, probers=[_mod_bzr.BzrProber])
             self._format._network_name = \
                 self._real_bzrdir._format.network_name()
 
 
=== modified file 'breezy/bzr/smart/bzrdir.py'
--- breezy/bzr/smart/bzrdir.py	2017-06-11 20:15:04 +0000
+++ breezy/bzr/smart/bzrdir.py	2017-06-15 23:39:05 +0000
@@ -25,10 +25,12 @@
     repository,
     urlutils,
     )
+from .. import (
+    BzrProber,
+    )
 from ..bzrdir import (
     BzrDir,
     BzrDirFormat,
-    BzrProber,
     )
 from ...controldir import (
     network_format_registry,
 
=== modified file 'breezy/plugins/weave_fmt/__init__.py'
--- breezy/plugins/weave_fmt/__init__.py	2017-06-11 20:33:20 +0000
+++ breezy/plugins/weave_fmt/__init__.py	2017-06-15 23:39:05 +0000
@@ -33,7 +33,7 @@
 from ...bzr import (
     serializer,
     )
-from ...bzr.bzrdir import (
+from ...bzr import (
     BzrProber,
     register_metadir,
     )
 
=== modified file 'breezy/tests/blackbox/test_exceptions.py'
--- breezy/tests/blackbox/test_exceptions.py	2017-06-11 01:22:16 +0000
+++ breezy/tests/blackbox/test_exceptions.py	2017-06-15 23:39:05 +0000
@@ -20,6 +20,7 @@
 import re
 
 from breezy import (
+    bzr,
     config,
     controldir,
     errors,
@@ -27,9 +28,6 @@
     repository,
     tests,
     )
-from breezy.bzr import (
-    bzrdir,
-    )
 from breezy.bzr.groupcompress_repo import RepositoryFormat2a
 
 
@@ -104,7 +102,7 @@
             TestObsoleteRepoFormat)
         repository.format_registry.register(TestObsoleteRepoFormat)
         self.addCleanup(controldir.format_registry.remove, "testobsolete")
-        bzrdir.register_metadir(controldir.format_registry, "testobsolete",
+        bzr.register_metadir(controldir.format_registry, "testobsolete",
             "breezy.tests.blackbox.test_exceptions.TestObsoleteRepoFormat",
             branch_format='breezy.bzr.branch.BzrBranchFormat7',
             tree_format='breezy.bzr.workingtree_4.WorkingTreeFormat6',
 
=== modified file 'breezy/tests/blackbox/test_upgrade.py'
--- breezy/tests/blackbox/test_upgrade.py	2017-06-10 16:40:42 +0000
+++ breezy/tests/blackbox/test_upgrade.py	2017-06-15 23:39:05 +0000
@@ -19,6 +19,7 @@
 import stat
 
 from breezy import (
+    bzr,
     controldir,
     lockable_files,
     ui,
@@ -130,9 +131,9 @@
 
     def test_upgrade_control_dir(self):
         old_format = OldBzrDirFormat()
-        self.addCleanup(bzrdir.BzrProber.formats.remove,
+        self.addCleanup(bzr.BzrProber.formats.remove,
             old_format.get_format_string())
-        bzrdir.BzrProber.formats.register(old_format.get_format_string(),
+        bzr.BzrProber.formats.register(old_format.get_format_string(),
             old_format)
         self.addCleanup(controldir.ControlDirFormat._set_default_format,
                         controldir.ControlDirFormat.get_default_format())
 
=== modified file 'breezy/tests/test_bzrdir.py'
--- breezy/tests/test_bzrdir.py	2017-06-11 14:07:05 +0000
+++ breezy/tests/test_bzrdir.py	2017-06-15 23:39:05 +0000
@@ -25,6 +25,7 @@
 
 from .. import (
     branch,
+    bzr,
     config,
     controldir,
     errors,
@@ -103,18 +104,18 @@
         my_format_registry.register_lazy('lazy', 'breezy.tests.test_bzrdir',
             'DeprecatedBzrDirFormat', 'Format registered lazily',
             deprecated=True)
-        bzrdir.register_metadir(my_format_registry, 'knit',
+        bzr.register_metadir(my_format_registry, 'knit',
             'breezy.bzr.knitrepo.RepositoryFormatKnit1',
             'Format using knits',
             )
         my_format_registry.set_default('knit')
-        bzrdir.register_metadir(my_format_registry,
+        bzr.register_metadir(my_format_registry,
             'branch6',
             'breezy.bzr.knitrepo.RepositoryFormatKnit3',
             'Experimental successor to knit.  Use at your own risk.',
             branch_format='breezy.bzr.branch.BzrBranchFormat6',
             experimental=True)
-        bzrdir.register_metadir(my_format_registry,
+        bzr.register_metadir(my_format_registry,
             'hidden format',
             'breezy.bzr.knitrepo.RepositoryFormatKnit3',
             'Experimental successor to knit.  Use at your own risk.',
@@ -281,13 +282,13 @@
     def test_find_format(self):
         # is the right format object found for a branch?
         # create a branch with a few known format objects.
-        bzrdir.BzrProber.formats.register(BzrDirFormatTest1.get_format_string(),
+        bzr.BzrProber.formats.register(BzrDirFormatTest1.get_format_string(),
             BzrDirFormatTest1())
-        self.addCleanup(bzrdir.BzrProber.formats.remove,
+        self.addCleanup(bzr.BzrProber.formats.remove,
             BzrDirFormatTest1.get_format_string())
-        bzrdir.BzrProber.formats.register(BzrDirFormatTest2.get_format_string(),
+        bzr.BzrProber.formats.register(BzrDirFormatTest2.get_format_string(),
             BzrDirFormatTest2())
-        self.addCleanup(bzrdir.BzrProber.formats.remove,
+        self.addCleanup(bzr.BzrProber.formats.remove,
             BzrDirFormatTest2.get_format_string())
         t = self.get_transport()
         self.build_tree(["foo/", "bar/"], transport=t)
@@ -318,7 +319,7 @@
         # make a bzrdir
         format.initialize(url)
         # register a format for it.
-        bzrdir.BzrProber.formats.register(format.get_format_string(), format)
+        bzr.BzrProber.formats.register(format.get_format_string(), format)
         # which bzrdir.Open will refuse (not supported)
         self.assertRaises(UnsupportedFormatError, bzrdir.BzrDir.open, url)
         # which bzrdir.open_containing will refuse (not supported)
@@ -327,7 +328,7 @@
         t = _mod_transport.get_transport_from_url(url)
         self.assertEqual(format.open(t), bzrdir.BzrDir.open_unsupported(url))
         # unregister the format
-        bzrdir.BzrProber.formats.remove(format.get_format_string())
+        bzr.BzrProber.formats.remove(format.get_format_string())
         # now open_downlevel should fail too.
         self.assertRaises(UnknownFormatError, bzrdir.BzrDir.open_unsupported, url)
 
 
=== modified file 'breezy/tests/test_options.py'
--- breezy/tests/test_options.py	2017-06-10 16:40:42 +0000
+++ breezy/tests/test_options.py	2017-06-15 23:39:05 +0000
@@ -17,15 +17,13 @@
 import re
 
 from .. import (
+    bzr,
     commands,
     controldir,
     errors,
     option,
     registry,
     )
-from ..bzr import (
-    bzrdir,
-    )
 from ..builtins import cmd_commit
 from ..commands import parse_args
 from . import TestCase
@@ -120,9 +118,9 @@
 
     def test_registry_conversion(self):
         registry = controldir.ControlDirFormatRegistry()
-        bzrdir.register_metadir(registry, 'one', 'RepositoryFormat7', 'one help')
-        bzrdir.register_metadir(registry, 'two', 'RepositoryFormatKnit1', 'two help')
-        bzrdir.register_metadir(registry, 'hidden', 'RepositoryFormatKnit1',
+        bzr.register_metadir(registry, 'one', 'RepositoryFormat7', 'one help')
+        bzr.register_metadir(registry, 'two', 'RepositoryFormatKnit1', 'two help')
+        bzr.register_metadir(registry, 'hidden', 'RepositoryFormatKnit1',
             'two help', hidden=True)
         registry.set_default('one')
         options = [option.RegistryOption('format', '', registry, str)]
@@ -190,12 +188,12 @@
 
     def test_help(self):
         registry = controldir.ControlDirFormatRegistry()
-        bzrdir.register_metadir(registry, 'one', 'RepositoryFormat7', 'one help')
-        bzrdir.register_metadir(registry, 'two',
+        bzr.register_metadir(registry, 'one', 'RepositoryFormat7', 'one help')
+        bzr.register_metadir(registry, 'two',
             'breezy.bzr.knitrepo.RepositoryFormatKnit1',
             'two help',
             )
-        bzrdir.register_metadir(registry, 'hidden', 'RepositoryFormat7', 'hidden help',
+        bzr.register_metadir(registry, 'hidden', 'RepositoryFormat7', 'hidden help',
             hidden=True)
         registry.set_default('one')
         options = [option.RegistryOption('format', 'format help', registry,
@@ -218,8 +216,8 @@
         self.assertEqual(list(opt.iter_switches()),
                          [('hello', None, 'GAR', 'fg')])
         registry = controldir.ControlDirFormatRegistry()
-        bzrdir.register_metadir(registry, 'one', 'RepositoryFormat7', 'one help')
-        bzrdir.register_metadir(registry, 'two',
+        bzr.register_metadir(registry, 'one', 'RepositoryFormat7', 'one help')
+        bzr.register_metadir(registry, 'two',
                 'breezy.bzr.knitrepo.RepositoryFormatKnit1',
                 'two help',
                 )
@@ -379,9 +377,9 @@
 
     def test_is_hidden(self):
         registry = controldir.ControlDirFormatRegistry()
-        bzrdir.register_metadir(registry, 'hidden', 'HiddenFormat',
+        bzr.register_metadir(registry, 'hidden', 'HiddenFormat',
             'hidden help text', hidden=True)
-        bzrdir.register_metadir(registry, 'visible', 'VisibleFormat',
+        bzr.register_metadir(registry, 'visible', 'VisibleFormat',
             'visible help text', hidden=False)
         format = option.RegistryOption('format', '', registry, str)
         self.assertTrue(format.is_hidden('hidden'))
 
=== modified file 'breezy/tests/test_remote.py'
--- breezy/tests/test_remote.py	2017-06-11 20:15:04 +0000
+++ breezy/tests/test_remote.py	2017-06-15 23:39:05 +0000
@@ -49,6 +49,8 @@
 from ..bzr.bzrdir import (
     BzrDir,
     BzrDirFormat,
+    )
+from ..bzr import (
     RemoteBzrProber,
     )
 from ..bzr.chk_serializer import chk_bencode_serializer
@@ -127,7 +129,7 @@
     def test_find_correct_format(self):
         """Should open a RemoteBzrDir over a RemoteTransport"""
         fmt = BzrDirFormat.find_format(self.transport)
-        self.assertTrue(bzrdir.RemoteBzrProber
+        self.assertTrue(RemoteBzrProber
                         in controldir.ControlDirFormat._server_probers)
         self.assertIsInstance(fmt, RemoteBzrDirFormat)
 
 
=== modified file 'breezy/tests/test_url_policy_open.py'
--- breezy/tests/test_url_policy_open.py	2017-06-10 16:40:42 +0000
+++ breezy/tests/test_url_policy_open.py	2017-06-15 23:39:05 +0000
@@ -23,7 +23,7 @@
 from ..bzr.branch import (
     BranchReferenceFormat,
     )
-from ..bzr.bzrdir import (
+from ..bzr import (
     BzrProber,
     )
 from ..controldir import (
 
=== modified file 'tools/generate_docs.py'
--- tools/generate_docs.py	2017-06-13 01:08:49 +0000
+++ tools/generate_docs.py	2017-06-15 23:39:05 +0000
@@ -38,12 +38,11 @@
 
 sys.path.insert(0, os.path.dirname(os.path.dirname(__file__)))
 
-import breezy
+# Don't remove the following import, it triggers a format registration that
+# avoid http://pad.lv/956860
+import breezy.bzr
 from breezy import (
     commands,
-    # Don't remove the following import, it triggers a format registration that
-    # avoid http://pad.lv/956860
-    branch,
     doc_generate,
     )