Merge lp:~jelmer/bzr/use-bzr-controldir into lp:bzr

[Jelmer Vernooij]

Use bzrlib.controldir for generic access to control directories, rather than bzrlib.bzrdir.

Use ControlDir rather than BzrDir in most places.

This is in preparation of removing bzrlib.bzrdir.format_registry.

[Jelmer Vernooij (jelmer)]

Note that this is all very simple renames, no changes in the logic.

[Martin Packman (gz)]

I have failed in my hunt for a bug in this, perhaps PQM will have more luck. :)

Making bzrdir a lazy import in smart.request is interesting. Are there other modules where that could usefully happen for cases where running against foreign formats?

review: Approve

[Jelmer Vernooij (jelmer)]

sent to pqm by email

=== modified file 'bzrlib/branch.py'
--- bzrlib/branch.py	2012-02-14 17:22:37 +0000
+++ bzrlib/branch.py	2012-03-06 18:30:24 +0000
@@ -2045,7 +2045,7 @@
 
     def _initialize_helper(self, a_bzrdir, utf8_files, name=None,
                            repository=None):
-        """Initialize a branch in a bzrdir, with specified files
+        """Initialize a branch in a control dir, with specified files
 
         :param a_bzrdir: The bzrdir to initialize the branch in
         :param utf8_files: The files to create as a list of
 
=== modified file 'bzrlib/builtins.py'
--- bzrlib/builtins.py	2012-03-06 18:11:05 +0000
+++ bzrlib/builtins.py	2012-03-06 18:30:24 +0000
@@ -2053,7 +2053,7 @@
          RegistryOption('format',
                 help='Specify a format for this branch. '
                 'See "help formats".',
-                lazy_registry=('bzrlib.bzrdir', 'format_registry'),
+                lazy_registry=('bzrlib.controldir', 'format_registry'),
                 converter=lambda name: controldir.format_registry.make_bzrdir(name),
                 value_switches=True,
                 title="Branch format",
 
=== modified file 'bzrlib/bzrdir.py'
--- bzrlib/bzrdir.py	2012-01-31 15:43:17 +0000
+++ bzrlib/bzrdir.py	2012-03-06 18:30:24 +0000
@@ -1370,7 +1370,7 @@
         :param shared_repo: Control whether made repositories are shared or
             not.
         :param vfs_only: If True do not attempt to use a smart server
-        :return: repo, bzrdir, require_stacking, repository_policy. repo is
+        :return: repo, controldir, require_stacking, repository_policy. repo is
             None if none was created or found, bzrdir is always valid.
             require_stacking is the result of examining the stacked_on
             parameter and any stacking policy found for the target.
 
=== modified file 'bzrlib/config.py'
--- bzrlib/config.py	2012-02-20 17:38:11 +0000
+++ bzrlib/config.py	2012-03-06 18:30:24 +0000
@@ -2174,8 +2174,8 @@
 
         It may be set to a location, or None.
 
-        This policy affects all branches contained by this bzrdir, except for
-        those under repositories.
+        This policy affects all branches contained by this control dir, except
+        for those under repositories.
         """
         if self._config is None:
             raise errors.BzrError("Cannot set configuration in %s" % self._bzrdir)
@@ -2189,8 +2189,8 @@
 
         This will either be a location, or None.
 
-        This policy affects all branches contained by this bzrdir, except for
-        those under repositories.
+        This policy affects all branches contained by this control dir, except
+        for those under repositories.
         """
         if self._config is None:
             return None
 
=== modified file 'bzrlib/help_topics/__init__.py'
--- bzrlib/help_topics/__init__.py	2011-12-18 12:46:49 +0000
+++ bzrlib/help_topics/__init__.py	2012-03-06 18:30:24 +0000
@@ -739,13 +739,13 @@
 topic_registry.register('basic', _basic_help, "Basic commands", SECT_HIDDEN)
 topic_registry.register('topics', _help_on_topics, "Topics list", SECT_HIDDEN)
 def get_current_formats_topic(topic):
-    from bzrlib import bzrdir
+    from bzrlib import controldir
     return "Current Storage Formats\n\n" + \
-        bzrdir.format_registry.help_topic(topic)
+        controldir.format_registry.help_topic(topic)
 def get_other_formats_topic(topic):
-    from bzrlib import bzrdir
+    from bzrlib import controldir
     return "Other Storage Formats\n\n" + \
-        bzrdir.format_registry.help_topic(topic)
+        controldir.format_registry.help_topic(topic)
 topic_registry.register('current-formats', get_current_formats_topic,
     'Current storage formats')
 topic_registry.register('other-formats', get_other_formats_topic,
 
=== modified file 'bzrlib/plugins/launchpad/__init__.py'
--- bzrlib/plugins/launchpad/__init__.py	2012-02-26 15:43:02 +0000
+++ bzrlib/plugins/launchpad/__init__.py	2012-03-06 18:30:24 +0000
@@ -53,8 +53,8 @@
 
 from bzrlib import (
     branch as _mod_branch,
-    bzrdir,
     config as _mod_config,
+    controldir,
     lazy_regex,
     # Since we are a built-in plugin we share the bzrlib version
     version_info,
@@ -353,7 +353,7 @@
     def run(self, submit_branch=None, review=None, staging=False,
             message=None, approve=False, fixes=None):
         from bzrlib.plugins.launchpad import lp_propose
-        tree, branch, relpath = bzrdir.BzrDir.open_containing_tree_or_branch(
+        tree, branch, relpath = controldir.ControlDir.open_containing_tree_or_branch(
             '.')
         if review is None:
             reviews = None
 
=== modified file 'bzrlib/plugins/weave_fmt/bzrdir.py'
--- bzrlib/plugins/weave_fmt/bzrdir.py	2012-01-18 19:08:55 +0000
+++ bzrlib/plugins/weave_fmt/bzrdir.py	2012-03-06 18:30:24 +0000
@@ -24,6 +24,7 @@
     BzrDirMetaFormat1,
     )
 from bzrlib.controldir import (
+    ControlDir,
     Converter,
     format_registry,
     )
@@ -66,7 +67,7 @@
         create_prefix=False, force_new_repo=False, stacked_on=None,
         stack_on_pwd=None, repo_format_name=None, make_working_trees=None,
         shared_repo=False):
-        """See BzrDirFormat.initialize_on_transport_ex."""
+        """See ControlDir.initialize_on_transport_ex."""
         require_stacking = (stacked_on is not None)
         # Format 5 cannot stack, but we've been asked to - actually init
         # a Meta1Dir
@@ -116,11 +117,11 @@
         return BzrBranchFormat4()
 
     def get_format_description(self):
-        """See BzrDirFormat.get_format_description()."""
+        """See ControlDirFormat.get_format_description()."""
         return "All-in-one format 5"
 
     def get_converter(self, format=None):
-        """See BzrDirFormat.get_converter()."""
+        """See ControlDirFormat.get_converter()."""
         # there is one and only one upgrade path here.
         return ConvertBzrDir5To6()
 
@@ -176,7 +177,7 @@
         return "Bazaar-NG branch, format 6\n"
 
     def get_format_description(self):
-        """See BzrDirFormat.get_format_description()."""
+        """See ControlDirFormat.get_format_description()."""
         return "All-in-one format 6"
 
     def get_branch_format(self):
@@ -184,7 +185,7 @@
         return BzrBranchFormat4()
 
     def get_converter(self, format=None):
-        """See BzrDirFormat.get_converter()."""
+        """See ControlDirFormat.get_converter()."""
         # there is one and only one upgrade path here.
         return ConvertBzrDir6ToMeta()
 
@@ -240,7 +241,7 @@
             if isinstance(self.bzrdir.transport, local.LocalTransport):
                 self.bzrdir.get_workingtree_transport(None).delete('stat-cache')
             self._convert_to_weaves()
-            return BzrDir.open(self.bzrdir.user_url)
+            return ControlDir.open(self.bzrdir.user_url)
         finally:
             self.pb.finished()
 
@@ -505,7 +506,7 @@
         try:
             ui.ui_factory.note(gettext('starting upgrade from format 5 to 6'))
             self._convert_to_prefixed()
-            return BzrDir.open(self.bzrdir.user_url)
+            return ControlDir.open(self.bzrdir.user_url)
         finally:
             pb.finished()
 
@@ -633,7 +634,7 @@
             BzrDirMetaFormat1().get_format_string(),
             mode=self.file_mode)
         self.pb.finished()
-        return BzrDir.open(self.bzrdir.user_url)
+        return ControlDir.open(self.bzrdir.user_url)
 
     def make_lock(self, name):
         """Make a lock for the new control dir name."""
@@ -685,11 +686,11 @@
         return "Bazaar-NG branch, format 0.0.4\n"
 
     def get_format_description(self):
-        """See BzrDirFormat.get_format_description()."""
+        """See ControlDirFormat.get_format_description()."""
         return "All-in-one format 4"
 
     def get_converter(self, format=None):
-        """See BzrDirFormat.get_converter()."""
+        """See ControlDirFormat.get_converter()."""
         # there is one and only one upgrade path here.
         return ConvertBzrDir4To5()
 
@@ -730,7 +731,7 @@
     """A common class for the all-in-one formats."""
 
     def __init__(self, _transport, _format):
-        """See BzrDir.__init__."""
+        """See ControlDir.__init__."""
         super(BzrDirPreSplitOut, self).__init__(_transport, _format)
         self._control_files = lockable_files.LockableFiles(
                                             self.get_branch_transport(None),
@@ -749,7 +750,7 @@
 
     def clone(self, url, revision_id=None, force_new_repo=False,
               preserve_stacking=False):
-        """See BzrDir.clone().
+        """See ControlDir.clone().
 
         force_new_repo has no effect, since this family of formats always
         require a new repository.
@@ -772,7 +773,7 @@
 
     def create_branch(self, name=None, repository=None,
                       append_revisions_only=None):
-        """See BzrDir.create_branch."""
+        """See ControlDir.create_branch."""
         if repository is not None:
             raise NotImplementedError(
                 "create_branch(repository=<not None>) on %r" % (self,))
@@ -780,22 +781,22 @@
             append_revisions_only=append_revisions_only)
 
     def destroy_branch(self, name=None):
-        """See BzrDir.destroy_branch."""
+        """See ControlDir.destroy_branch."""
         raise errors.UnsupportedOperation(self.destroy_branch, self)
 
     def create_repository(self, shared=False):
-        """See BzrDir.create_repository."""
+        """See ControlDir.create_repository."""
         if shared:
             raise errors.IncompatibleFormat('shared repository', self._format)
         return self.open_repository()
 
     def destroy_repository(self):
-        """See BzrDir.destroy_repository."""
+        """See ControlDir.destroy_repository."""
         raise errors.UnsupportedOperation(self.destroy_repository, self)
 
     def create_workingtree(self, revision_id=None, from_branch=None,
                            accelerator_tree=None, hardlink=False):
-        """See BzrDir.create_workingtree."""
+        """See ControlDir.create_workingtree."""
         # The workingtree is sometimes created when the bzrdir is created,
         # but not when cloning.
 
@@ -833,11 +834,11 @@
                 self.transport, self._control_files._file_mode)
 
     def destroy_workingtree(self):
-        """See BzrDir.destroy_workingtree."""
+        """See ControlDir.destroy_workingtree."""
         raise errors.UnsupportedOperation(self.destroy_workingtree, self)
 
     def destroy_workingtree_metadata(self):
-        """See BzrDir.destroy_workingtree_metadata."""
+        """See ControlDir.destroy_workingtree_metadata."""
         raise errors.UnsupportedOperation(self.destroy_workingtree_metadata,
                                           self)
 
@@ -874,7 +875,7 @@
         raise errors.IncompatibleFormat(workingtree_format, self._format)
 
     def needs_format_conversion(self, format=None):
-        """See BzrDir.needs_format_conversion()."""
+        """See ControlDir.needs_format_conversion()."""
         # if the format is not the same as the system default,
         # an upgrade is needed.
         if format is None:
@@ -885,7 +886,7 @@
 
     def open_branch(self, name=None, unsupported=False,
                     ignore_fallbacks=False, possible_transports=None):
-        """See BzrDir.open_branch."""
+        """See ControlDir.open_branch."""
         from bzrlib.plugins.weave_fmt.branch import BzrBranchFormat4
         format = BzrBranchFormat4()
         format.check_support_status(unsupported)
@@ -896,7 +897,7 @@
                possible_transports=None, accelerator_tree=None,
                hardlink=False, stacked=False, create_tree_if_local=True,
                source_branch=None):
-        """See BzrDir.sprout()."""
+        """See ControlDir.sprout()."""
         if source_branch is not None:
             my_branch = self.open_branch()
             if source_branch.base != my_branch.base:
@@ -941,7 +942,7 @@
     """
 
     def create_repository(self, shared=False):
-        """See BzrDir.create_repository."""
+        """See ControlDir.create_repository."""
         return self._format.repository_format.initialize(self, shared)
 
     def needs_format_conversion(self, format=None):
@@ -952,7 +953,7 @@
         return True
 
     def open_repository(self):
-        """See BzrDir.open_repository."""
+        """See ControlDir.open_repository."""
         from bzrlib.plugins.weave_fmt.repository import RepositoryFormat4
         return RepositoryFormat4().open(self, _found=True)
 
@@ -964,17 +965,17 @@
     """
 
     def has_workingtree(self):
-        """See BzrDir.has_workingtree."""
+        """See ControlDir.has_workingtree."""
         return True
     
     def open_repository(self):
-        """See BzrDir.open_repository."""
+        """See ControlDir.open_repository."""
         from bzrlib.plugins.weave_fmt.repository import RepositoryFormat5
         return RepositoryFormat5().open(self, _found=True)
 
     def open_workingtree(self, unsupported=False,
             recommend_upgrade=True):
-        """See BzrDir.create_workingtree."""
+        """See ControlDir.create_workingtree."""
         from bzrlib.plugins.weave_fmt.workingtree import WorkingTreeFormat2
         wt_format = WorkingTreeFormat2()
         # we don't warn here about upgrades; that ought to be handled for the
@@ -989,16 +990,16 @@
     """
 
     def has_workingtree(self):
-        """See BzrDir.has_workingtree."""
+        """See ControlDir.has_workingtree."""
         return True
 
     def open_repository(self):
-        """See BzrDir.open_repository."""
+        """See ControlDir.open_repository."""
         from bzrlib.plugins.weave_fmt.repository import RepositoryFormat6
         return RepositoryFormat6().open(self, _found=True)
 
     def open_workingtree(self, unsupported=False, recommend_upgrade=True):
-        """See BzrDir.create_workingtree."""
+        """See ControlDir.create_workingtree."""
         # we don't warn here about upgrades; that ought to be handled for the
         # bzrdir as a whole
         from bzrlib.plugins.weave_fmt.workingtree import WorkingTreeFormat2
 
=== modified file 'bzrlib/plugins/weave_fmt/test_bzrdir.py'
--- bzrlib/plugins/weave_fmt/test_bzrdir.py	2011-12-19 13:23:58 +0000
+++ bzrlib/plugins/weave_fmt/test_bzrdir.py	2012-03-06 18:30:24 +0000
@@ -27,6 +27,7 @@
 from bzrlib import (
     branch,
     bzrdir,
+    controldir,
     errors,
     repository,
     upgrade,
@@ -66,7 +67,7 @@
             self.assertTrue(ctrl_2 is ctrl_3)
         check_dir_components_use_same_lock(dir)
         # and if we open it normally.
-        dir = bzrdir.BzrDir.open(self.get_url())
+        dir = controldir.ControlDir.open(self.get_url())
         check_dir_components_use_same_lock(dir)
 
     def test_can_convert(self):
@@ -100,7 +101,7 @@
             self.assertTrue(ctrl_2 is ctrl_3)
         check_dir_components_use_same_lock(dir)
         # and if we open it normally.
-        dir = bzrdir.BzrDir.open(self.get_url())
+        dir = controldir.ControlDir.open(self.get_url())
         check_dir_components_use_same_lock(dir)
 
     def test_can_convert(self):
@@ -302,7 +303,7 @@
         # At this point, we have a format6 branch without checkout files.
         upgrade.upgrade('.', bzrdir.BzrDirMetaFormat1())
         # The upgrade should not have set up a working tree.
-        control = bzrdir.BzrDir.open('.')
+        control = controldir.ControlDir.open('.')
         self.assertFalse(control.has_workingtree())
         # We have covered the scope of this test, we may as well check that
         # upgrade has not eaten our data, even if it's a bit redundant with
@@ -319,7 +320,7 @@
         eq = self.assertEquals
         self.build_tree_contents(_upgrade1_template)
         upgrade.upgrade(u'.')
-        control = bzrdir.BzrDir.open('.')
+        control = controldir.ControlDir.open('.')
         b = control.open_branch()
         # tsk, peeking under the covers.
         self.assertIsInstance(
@@ -389,7 +390,7 @@
 
     def test_upgrade_makes_dir_weaves(self):
         self.build_tree_contents(_upgrade_dir_template)
-        old_repodir = bzrdir.BzrDir.open_unsupported('.')
+        old_repodir = controldir.ControlDir.open_unsupported('.')
         old_repo_format = old_repodir.open_repository()._format
         upgrade.upgrade('.')
         # this is the path to the literal file. As format changes
@@ -544,7 +545,7 @@
         self.build_tree(['master/', 'child/'])
         self.make_branch_and_tree('master')
         self.make_branch_and_tree('child',
-                        format=bzrdir.format_registry.make_bzrdir('weave'))
+                        format=controldir.format_registry.make_bzrdir('weave'))
         os.chdir('child')
 
     def test_bind_format_6_bzrdir(self):
 
=== modified file 'bzrlib/remote.py'
--- bzrlib/remote.py	2012-02-14 17:22:37 +0000
+++ bzrlib/remote.py	2012-03-06 18:30:24 +0000
@@ -1051,7 +1051,7 @@
             network_name = self._network_name
         else:
             # Select the current bzrlib default and ask for that.
-            reference_bzrdir_format = _mod_bzrdir.format_registry.get('default')()
+            reference_bzrdir_format = controldir.format_registry.get('default')()
             reference_format = reference_bzrdir_format.repository_format
             network_name = reference_format.network_name()
         # 2) try direct creation via RPC
@@ -3157,7 +3157,7 @@
             network_name = self._custom_format.network_name()
         else:
             # Select the current bzrlib default and ask for that.
-            reference_bzrdir_format = _mod_bzrdir.format_registry.get('default')()
+            reference_bzrdir_format = controldir.format_registry.get('default')()
             reference_format = reference_bzrdir_format.get_branch_format()
             self._custom_format = reference_format
             network_name = reference_format.network_name()
 
=== modified file 'bzrlib/repofmt/groupcompress_repo.py'
--- bzrlib/repofmt/groupcompress_repo.py	2012-01-24 00:16:15 +0000
+++ bzrlib/repofmt/groupcompress_repo.py	2012-03-06 18:30:24 +0000
@@ -21,7 +21,7 @@
 import time
 
 from bzrlib import (
-    bzrdir,
+    controldir,
     chk_map,
     chk_serializer,
     debug,
@@ -1383,7 +1383,7 @@
     pack_compresses = True
 
     def _get_matching_bzrdir(self):
-        return bzrdir.format_registry.make_bzrdir('2a')
+        return controldir.format_registry.make_bzrdir('2a')
 
     def _ignore_setting_bzrdir(self, format):
         pass
@@ -1406,7 +1406,7 @@
     """
 
     def _get_matching_bzrdir(self):
-        return bzrdir.format_registry.make_bzrdir('development-subtree')
+        return controldir.format_registry.make_bzrdir('development-subtree')
 
     def _ignore_setting_bzrdir(self, format):
         pass
 
=== modified file 'bzrlib/repofmt/knitpack_repo.py'
--- bzrlib/repofmt/knitpack_repo.py	2011-12-19 19:15:58 +0000
+++ bzrlib/repofmt/knitpack_repo.py	2012-03-06 18:30:24 +0000
@@ -24,7 +24,7 @@
 import time
 
 from bzrlib import (
-    bzrdir,
+    controldir,
     debug,
     errors,
     knit,
@@ -155,7 +155,7 @@
     index_class = GraphIndex
 
     def _get_matching_bzrdir(self):
-        return bzrdir.format_registry.make_bzrdir('pack-0.92')
+        return controldir.format_registry.make_bzrdir('pack-0.92')
 
     def _ignore_setting_bzrdir(self, format):
         pass
@@ -195,7 +195,7 @@
     index_class = GraphIndex
 
     def _get_matching_bzrdir(self):
-        return bzrdir.format_registry.make_bzrdir(
+        return controldir.format_registry.make_bzrdir(
             'pack-0.92-subtree')
 
     def _ignore_setting_bzrdir(self, format):
@@ -234,7 +234,7 @@
     index_class = GraphIndex
 
     def _get_matching_bzrdir(self):
-        return bzrdir.format_registry.make_bzrdir(
+        return controldir.format_registry.make_bzrdir(
             'rich-root-pack')
 
     def _ignore_setting_bzrdir(self, format):
@@ -274,7 +274,7 @@
         return xml5.serializer_v5
 
     def _get_matching_bzrdir(self):
-        return bzrdir.format_registry.make_bzrdir('1.6')
+        return controldir.format_registry.make_bzrdir('1.6')
 
     def _ignore_setting_bzrdir(self, format):
         pass
@@ -314,7 +314,7 @@
         return xml6.serializer_v6
 
     def _get_matching_bzrdir(self):
-        return bzrdir.format_registry.make_bzrdir(
+        return controldir.format_registry.make_bzrdir(
             '1.6.1-rich-root')
 
     def _ignore_setting_bzrdir(self, format):
@@ -359,7 +359,7 @@
         return xml7.serializer_v7
 
     def _get_matching_bzrdir(self):
-        matching = bzrdir.format_registry.make_bzrdir(
+        matching = controldir.format_registry.make_bzrdir(
             '1.6.1-rich-root')
         matching.repository_format = self
         return matching
@@ -401,7 +401,7 @@
         return xml5.serializer_v5
 
     def _get_matching_bzrdir(self):
-        return bzrdir.format_registry.make_bzrdir('1.9')
+        return controldir.format_registry.make_bzrdir('1.9')
 
     def _ignore_setting_bzrdir(self, format):
         pass
@@ -438,7 +438,7 @@
         return xml6.serializer_v6
 
     def _get_matching_bzrdir(self):
-        return bzrdir.format_registry.make_bzrdir(
+        return controldir.format_registry.make_bzrdir(
             '1.9-rich-root')
 
     def _ignore_setting_bzrdir(self, format):
@@ -479,7 +479,7 @@
         return xml7.serializer_v7
 
     def _get_matching_bzrdir(self):
-        return bzrdir.format_registry.make_bzrdir(
+        return controldir.format_registry.make_bzrdir(
             'development5-subtree')
 
     def _ignore_setting_bzrdir(self, format):
 
=== modified file 'bzrlib/repofmt/knitrepo.py'
--- bzrlib/repofmt/knitrepo.py	2011-12-19 19:15:58 +0000
+++ bzrlib/repofmt/knitrepo.py	2012-03-06 18:30:24 +0000
@@ -21,7 +21,7 @@
 import itertools
 
 from bzrlib import (
-    bzrdir,
+    controldir,
     errors,
     knit as _mod_knit,
     lockable_files,
@@ -405,7 +405,7 @@
         return xml7.serializer_v7
 
     def _get_matching_bzrdir(self):
-        return bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
+        return controldir.format_registry.make_bzrdir('dirstate-with-subtree')
 
     def _ignore_setting_bzrdir(self, format):
         pass
@@ -447,7 +447,7 @@
         return xml6.serializer_v6
 
     def _get_matching_bzrdir(self):
-        return bzrdir.format_registry.make_bzrdir('rich-root')
+        return controldir.format_registry.make_bzrdir('rich-root')
 
     def _ignore_setting_bzrdir(self, format):
         pass
 
=== modified file 'bzrlib/smart/request.py'
--- bzrlib/smart/request.py	2012-01-06 22:06:36 +0000
+++ bzrlib/smart/request.py	2012-03-06 18:30:24 +0000
@@ -36,7 +36,6 @@
 import threading
 
 from bzrlib import (
-    bzrdir,
     debug,
     errors,
     osutils,
@@ -47,6 +46,7 @@
     )
 from bzrlib.lazy_import import lazy_import
 lazy_import(globals(), """
+from bzrlib import bzrdir
 from bzrlib.bundle import serializer
 
 import tempfile
 
=== modified file 'bzrlib/tests/__init__.py'
--- bzrlib/tests/__init__.py	2012-02-18 16:55:04 +0000
+++ bzrlib/tests/__init__.py	2012-03-06 18:30:24 +0000
@@ -60,7 +60,7 @@
 import bzrlib
 from bzrlib import (
     branchbuilder,
-    bzrdir,
+    controldir,
     chk_map,
     commands as _mod_commands,
     config,
@@ -1328,7 +1328,7 @@
         # hook into bzr dir opening. This leaves a small window of error for
         # transport tests, but they are well known, and we can improve on this
         # step.
-        bzrdir.BzrDir.hooks.install_named_hook("pre_open",
+        controldir.ControlDir.hooks.install_named_hook("pre_open",
             self._preopen_isolate_transport, "Check bzr directories are safe.")
 
     def _ndiff_strings(self, a, b):
@@ -2603,7 +2603,7 @@
         # http://pad.lv/825027).
         self.assertIs(None, os.environ.get('BZR_HOME', None))
         os.environ['BZR_HOME'] = root
-        wt = bzrdir.BzrDir.create_standalone_workingtree(root)
+        wt = controldir.ControlDir.create_standalone_workingtree(root)
         del os.environ['BZR_HOME']
         # Hack for speed: remember the raw bytes of the dirstate file so that
         # we don't need to re-open the wt to check it hasn't changed.
@@ -2680,7 +2680,7 @@
         if format is None:
             format = self.get_default_format()
         if isinstance(format, basestring):
-            format = bzrdir.format_registry.make_bzrdir(format)
+            format = controldir.format_registry.make_bzrdir(format)
         return format
 
     def make_bzrdir(self, relpath, format=None):
@@ -2854,7 +2854,7 @@
         # stacking policy to honour; create a bzr dir with an unshared
         # repository (but not a branch - our code would be trying to escape
         # then!) to stop them, and permit it to be read.
-        # control = bzrdir.BzrDir.create(self.test_base_dir)
+        # control = controldir.ControlDir.create(self.test_base_dir)
         # control.create_repository()
         self.test_home_dir = self.test_base_dir + '/home'
         os.mkdir(self.test_home_dir)
@@ -3000,7 +3000,8 @@
             if self.vfs_transport_factory is test_server.LocalURLServer:
                 # the branch is colocated on disk, we cannot create a checkout.
                 # hopefully callers will expect this.
-                local_controldir= bzrdir.BzrDir.open(self.get_vfs_only_url(relpath))
+                local_controldir = controldir.ControlDir.open(
+                    self.get_vfs_only_url(relpath))
                 wt = local_controldir.create_workingtree()
                 if wt.branch._format != b._format:
                     wt._branch = b
 
=== modified file 'bzrlib/tests/blackbox/test_bound_branches.py'
--- bzrlib/tests/blackbox/test_bound_branches.py	2012-01-18 14:09:19 +0000
+++ bzrlib/tests/blackbox/test_bound_branches.py	2012-03-06 18:30:24 +0000
@@ -19,7 +19,7 @@
 
 from bzrlib import (
     branch,
-    bzrdir,
+    controldir,
     errors,
     tests,
     )
@@ -35,19 +35,18 @@
         base_tree.add(['a', 'b'])
         base_tree.commit('init')
         base_tree.unlock()
-        branch = base_tree.branch
 
-        child_tree = branch.create_checkout('child')
+        child_tree = base_tree.branch.create_checkout('child')
 
         self.check_revno(1, 'child')
-        d = bzrdir.BzrDir.open('child')
+        d = controldir.ControlDir.open('child')
         self.assertNotEqual(None, d.open_branch().get_master_branch())
 
         return base_tree, child_tree
 
     def check_revno(self, val, loc='.'):
         self.assertEqual(
-            val, bzrdir.BzrDir.open(loc).open_branch().last_revision_info()[0])
+            val, controldir.ControlDir.open(loc).open_branch().last_revision_info()[0])
 
     def test_simple_binding(self):
         tree = self.make_branch_and_tree('base')
@@ -59,7 +58,7 @@
 
         self.run_bzr('bind ../base', working_dir='child')
 
-        d = bzrdir.BzrDir.open('child')
+        d = controldir.ControlDir.open('child')
         self.assertNotEqual(None, d.open_branch().get_master_branch())
 
         self.run_bzr('unbind', working_dir='child')
@@ -133,7 +132,7 @@
         self.run_bzr('bind ../child', working_dir='child2')
 
         # Refresh the child tree object as 'unbind' modified it
-        child2_tree = bzrdir.BzrDir.open('child2').open_workingtree()
+        child2_tree = controldir.ControlDir.open('child2').open_workingtree()
         self.assertRaises(errors.CommitToDoubleBoundBranch,
                 child2_tree.commit, message='child2', allow_pointless=True)
 
@@ -356,7 +355,7 @@
         branch = tree.branch
         tree.bzrdir.sprout('child')
         self.run_bzr('bind --directory=child base')
-        d = bzrdir.BzrDir.open('child')
+        d = controldir.ControlDir.open('child')
         self.assertNotEqual(None, d.open_branch().get_master_branch())
         self.run_bzr('unbind -d child')
         self.assertEqual(None, d.open_branch().get_master_branch())
 
=== modified file 'bzrlib/tests/blackbox/test_branch.py'
--- bzrlib/tests/blackbox/test_branch.py	2012-02-14 17:22:37 +0000
+++ bzrlib/tests/blackbox/test_branch.py	2012-03-06 18:30:24 +0000
@@ -363,12 +363,12 @@
 
     def assertRevisionInRepository(self, repo_path, revid):
         """Check that a revision is in a repo, disregarding stacking."""
-        repo = bzrdir.BzrDir.open(repo_path).open_repository()
+        repo = controldir.ControlDir.open(repo_path).open_repository()
         self.assertTrue(repo.has_revision(revid))
 
     def assertRevisionNotInRepository(self, repo_path, revid):
         """Check that a revision is not in a repo, disregarding stacking."""
-        repo = bzrdir.BzrDir.open(repo_path).open_repository()
+        repo = controldir.ControlDir.open(repo_path).open_repository()
         self.assertFalse(repo.has_revision(revid))
 
     def assertRevisionsInBranchRepository(self, revid_list, branch_path):
@@ -400,7 +400,7 @@
         # capable of supporting stacking, but not actually have a stacked_on
         # branch configured
         self.assertRaises(errors.NotStacked,
-            bzrdir.BzrDir.open('newbranch').open_branch().get_stacked_on_url)
+            controldir.ControlDir.open('newbranch').open_branch().get_stacked_on_url)
 
     def test_branch_stacked_branch_stacked(self):
         """Asking to stack on a stacked branch does work"""
 
=== modified file 'bzrlib/tests/blackbox/test_break_lock.py'
--- bzrlib/tests/blackbox/test_break_lock.py	2012-01-18 17:47:06 +0000
+++ bzrlib/tests/blackbox/test_break_lock.py	2012-03-06 18:30:24 +0000
@@ -18,8 +18,8 @@
 
 from bzrlib import (
     branch,
-    bzrdir,
     config,
+    controldir,
     errors,
     osutils,
     tests,
@@ -54,13 +54,13 @@
              'repo/',
              'repo/branch/',
              'checkout/'])
-        bzrdir.BzrDir.create('master-repo').create_repository()
-        self.master_branch = bzrdir.BzrDir.create_branch_convenience(
+        controldir.ControlDir.create('master-repo').create_repository()
+        self.master_branch = controldir.ControlDir.create_branch_convenience(
             'master-repo/master-branch')
-        bzrdir.BzrDir.create('repo').create_repository()
-        local_branch = bzrdir.BzrDir.create_branch_convenience('repo/branch')
+        controldir.ControlDir.create('repo').create_repository()
+        local_branch = controldir.ControlDir.create_branch_convenience('repo/branch')
         local_branch.bind(self.master_branch)
-        checkoutdir = bzrdir.BzrDir.create('checkout')
+        checkoutdir = controldir.ControlDir.create('checkout')
         checkoutdir.set_branch_reference(local_branch)
         self.wt = checkoutdir.create_workingtree()
 
 
=== modified file 'bzrlib/tests/blackbox/test_checkout.py'
--- bzrlib/tests/blackbox/test_checkout.py	2012-02-14 17:22:37 +0000
+++ bzrlib/tests/blackbox/test_checkout.py	2012-03-06 18:30:24 +0000
@@ -21,6 +21,7 @@
 from bzrlib import (
     branch as _mod_branch,
     bzrdir,
+    controldir,
     errors,
     workingtree,
     )
@@ -37,7 +38,7 @@
 
     def setUp(self):
         super(TestCheckout, self).setUp()
-        tree = bzrdir.BzrDir.create_standalone_workingtree('branch')
+        tree = controldir.ControlDir.create_standalone_workingtree('branch')
         tree.commit('1', rev_id='1', allow_pointless=True)
         self.build_tree(['branch/added_in_2'])
         tree.add('added_in_2')
@@ -46,16 +47,16 @@
     def test_checkout_makes_bound_branch(self):
         self.run_bzr('checkout branch checkout')
         # if we have a checkout, the branch base should be 'branch'
-        source = bzrdir.BzrDir.open('branch')
-        result = bzrdir.BzrDir.open('checkout')
+        source = controldir.ControlDir.open('branch')
+        result = controldir.ControlDir.open('checkout')
         self.assertEqual(source.open_branch().bzrdir.root_transport.base,
                          result.open_branch().get_bound_location())
 
     def test_checkout_light_makes_checkout(self):
         self.run_bzr('checkout --lightweight branch checkout')
         # if we have a checkout, the branch base should be 'branch'
-        source = bzrdir.BzrDir.open('branch')
-        result = bzrdir.BzrDir.open('checkout')
+        source = controldir.ControlDir.open('branch')
+        result = controldir.ControlDir.open('checkout')
         self.assertEqual(source.open_branch().bzrdir.root_transport.base,
                          result.open_branch().bzrdir.root_transport.base)
 
@@ -63,7 +64,7 @@
         out, err = self.run_bzr(['checkout', '-r', '-2', 'branch', 'checkout'])
         # the working tree should now be at revision '1' with the content
         # from 1.
-        result = bzrdir.BzrDir.open('checkout')
+        result = controldir.ControlDir.open('checkout')
         self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
         self.assertPathDoesNotExist('checkout/added_in_2')
 
@@ -72,14 +73,14 @@
             'branch', 'checkout'])
         # the working tree should now be at revision '1' with the content
         # from 1.
-        result = bzrdir.BzrDir.open('checkout')
+        result = controldir.ControlDir.open('checkout')
         self.assertEqual(['1'], result.open_workingtree().get_parent_ids())
         self.assertPathDoesNotExist('checkout/added_in_2')
 
     def test_checkout_into_empty_dir(self):
         self.make_bzrdir('checkout')
         out, err = self.run_bzr(['checkout', 'branch', 'checkout'])
-        result = bzrdir.BzrDir.open('checkout')
+        result = controldir.ControlDir.open('checkout')
         tree = result.open_workingtree()
         branch = result.open_branch()
 
@@ -88,7 +89,7 @@
         # or a 'bzr checkout path' with path the name of a directory with
         # a branch with no tree will reconsistute the tree.
         os.mkdir('treeless-branch')
-        branch = bzrdir.BzrDir.create_branch_convenience(
+        branch = controldir.ControlDir.create_branch_convenience(
             'treeless-branch',
             force_new_tree=False,
             format=bzrdir.BzrDirMetaFormat1())
@@ -101,7 +102,7 @@
         out, err = self.run_bzr('diff treeless-branch')
 
         # now test with no parameters
-        branch = bzrdir.BzrDir.create_branch_convenience(
+        branch = controldir.ControlDir.create_branch_convenience(
             '.',
             force_new_tree=False,
             format=bzrdir.BzrDirMetaFormat1())
 
=== modified file 'bzrlib/tests/blackbox/test_commit.py'
--- bzrlib/tests/blackbox/test_commit.py	2012-02-14 17:22:37 +0000
+++ bzrlib/tests/blackbox/test_commit.py	2012-03-06 18:30:24 +0000
@@ -30,7 +30,7 @@
     ignores,
     msgeditor,
     )
-from bzrlib.bzrdir import BzrDir
+from bzrlib.controldir import ControlDir
 from bzrlib.tests import (
     test_foreign,
     features,
@@ -117,7 +117,7 @@
     def prepare_simple_history(self):
         """Prepare and return a working tree with one commit of one file"""
         # Commit with modified file should say so
-        wt = BzrDir.create_standalone_workingtree('.')
+        wt = ControlDir.create_standalone_workingtree('.')
         self.build_tree(['hello.txt', 'extra.txt'])
         wt.add(['hello.txt'])
         wt.commit(message='added')
@@ -225,7 +225,7 @@
     def test_verbose_commit_with_unknown(self):
         """Unknown files should not be listed by default in verbose output"""
         # Is that really the best policy?
-        wt = BzrDir.create_standalone_workingtree('.')
+        wt = ControlDir.create_standalone_workingtree('.')
         self.build_tree(['hello.txt', 'extra.txt'])
         wt.add(['hello.txt'])
         out,err = self.run_bzr('commit -m added')
@@ -757,7 +757,7 @@
         # "UnlockableTransport error trying to commit in checkout of readonly
         # branch"
         self.make_branch('master')
-        master = BzrDir.open_from_transport(
+        master = ControlDir.open_from_transport(
             self.get_readonly_transport('master')).open_branch()
         master.create_checkout('checkout')
         out, err = self.run_bzr(['commit', '--unchanged', '-mfoo', 'checkout'],
 
=== modified file 'bzrlib/tests/blackbox/test_filtered_view_ops.py'
--- bzrlib/tests/blackbox/test_filtered_view_ops.py	2010-11-22 03:35:24 +0000
+++ bzrlib/tests/blackbox/test_filtered_view_ops.py	2012-03-06 18:30:24 +0000
@@ -16,10 +16,7 @@
 
 """Tests that an enabled view is reported and impacts expected commands."""
 
-import os
-
 from bzrlib import (
-    bzrdir,
     osutils,
     tests,
     )
 
=== modified file 'bzrlib/tests/blackbox/test_info.py'
--- bzrlib/tests/blackbox/test_info.py	2012-02-23 18:19:18 +0000
+++ bzrlib/tests/blackbox/test_info.py	2012-03-06 18:30:24 +0000
@@ -231,7 +231,7 @@
         # Branch and bind to standalone, needs upgrade to metadir
         # (creates backup as unknown)
         branch1.bzrdir.sprout('bound')
-        knit1_format = bzrdir.format_registry.make_bzrdir('knit')
+        knit1_format = controldir.format_registry.make_bzrdir('knit')
         upgrade.upgrade('bound', knit1_format)
         branch3 = controldir.ControlDir.open('bound').open_branch()
         branch3.bind(branch1)
@@ -328,7 +328,7 @@
         tree5 = branch1.create_checkout('lightcheckout', lightweight=True)
         branch5 = tree5.branch
         out, err = self.run_bzr('info -v lightcheckout')
-        if "metaweave" in bzrdir.format_registry:
+        if "metaweave" in controldir.format_registry:
             format_description = "knit or metaweave"
         else:
             format_description = "knit"
@@ -546,7 +546,7 @@
 
     def test_info_standalone_no_tree(self):
         # create standalone branch without a working tree
-        format = bzrdir.format_registry.make_bzrdir('default')
+        format = controldir.format_registry.make_bzrdir('default')
         branch = self.make_branch('branch')
         repo = branch.repository
         out, err = self.run_bzr('info branch -v')
@@ -575,7 +575,7 @@
         self.assertEqual('', err)
 
     def test_info_shared_repository(self):
-        format = bzrdir.format_registry.make_bzrdir('knit')
+        format = controldir.format_registry.make_bzrdir('knit')
         transport = self.get_transport()
 
         # Create shared repository
@@ -871,7 +871,7 @@
         self.assertEqual('', err)
 
     def test_info_shared_repository_with_trees(self):
-        format = bzrdir.format_registry.make_bzrdir('knit')
+        format = controldir.format_registry.make_bzrdir('knit')
         transport = self.get_transport()
 
         # Create shared repository with working trees
@@ -1098,7 +1098,7 @@
         self.assertEqual('', err)
 
     def test_info_shared_repository_with_tree_in_root(self):
-        format = bzrdir.format_registry.make_bzrdir('knit')
+        format = controldir.format_registry.make_bzrdir('knit')
         transport = self.get_transport()
 
         # Create shared repository with working trees
@@ -1166,7 +1166,7 @@
         self.assertEqual('', err)
 
     def test_info_repository_hook(self):
-        format = bzrdir.format_registry.make_bzrdir('knit')
+        format = controldir.format_registry.make_bzrdir('knit')
         def repo_info(repo, stats, outf):
             outf.write("more info\n")
         info.hooks.install_named_hook('repository', repo_info, None)
@@ -1195,7 +1195,7 @@
         self.assertEqual('', err)
 
     def test_info_unshared_repository_with_colocated_branches(self):
-        format = bzrdir.format_registry.make_bzrdir('development-colo')
+        format = controldir.format_registry.make_bzrdir('development-colo')
         transport = self.get_transport()
 
         # Create unshared repository
 
=== modified file 'bzrlib/tests/blackbox/test_join.py'
--- bzrlib/tests/blackbox/test_join.py	2012-01-27 16:27:26 +0000
+++ bzrlib/tests/blackbox/test_join.py	2012-03-06 18:30:24 +0000
@@ -18,9 +18,7 @@
 import os
 
 from bzrlib import (
-    bzrdir,
     osutils,
-    repository,
     tests,
     workingtree,
     )
 
=== modified file 'bzrlib/tests/blackbox/test_merge.py'
--- bzrlib/tests/blackbox/test_merge.py	2012-01-05 17:56:30 +0000
+++ bzrlib/tests/blackbox/test_merge.py	2012-03-06 18:30:24 +0000
@@ -26,8 +26,8 @@
 
 from bzrlib import (
     branch,
-    bzrdir,
     conflicts,
+    controldir,
     merge_directive,
     osutils,
     tests,
@@ -75,7 +75,7 @@
         return tree, other
 
     def test_merge_reprocess(self):
-        d = bzrdir.BzrDir.create_standalone_workingtree('.')
+        d = controldir.ControlDir.create_standalone_workingtree('.')
         d.commit('h')
         self.run_bzr('merge . --reprocess --merge-type weave')
 
 
=== modified file 'bzrlib/tests/blackbox/test_re_sign.py'
--- bzrlib/tests/blackbox/test_re_sign.py	2011-12-09 12:05:47 +0000
+++ bzrlib/tests/blackbox/test_re_sign.py	2012-03-06 18:30:24 +0000
@@ -23,7 +23,7 @@
     gpg,
     tests,
     )
-from bzrlib.bzrdir import BzrDir
+from bzrlib.controldir import ControlDir
 from bzrlib.testament import Testament
 
 
@@ -39,7 +39,7 @@
         self.overrideAttr(gpg, 'GPGStrategy', gpg.LoopbackGPGStrategy)
 
     def setup_tree(self):
-        wt = BzrDir.create_standalone_workingtree('.')
+        wt = ControlDir.create_standalone_workingtree('.')
         wt.commit("base A", allow_pointless=True, rev_id='A')
         wt.commit("base B", allow_pointless=True, rev_id='B')
         wt.commit("base C", allow_pointless=True, rev_id='C')
@@ -89,7 +89,7 @@
 
     def test_resign_directory(self):
         """Test --directory option"""
-        wt = BzrDir.create_standalone_workingtree('a')
+        wt = ControlDir.create_standalone_workingtree('a')
         wt.commit("base A", allow_pointless=True, rev_id='A')
         wt.commit("base B", allow_pointless=True, rev_id='B')
         wt.commit("base C", allow_pointless=True, rev_id='C')
 
=== modified file 'bzrlib/tests/blackbox/test_reconcile.py'
--- bzrlib/tests/blackbox/test_reconcile.py	2011-12-14 20:21:52 +0000
+++ bzrlib/tests/blackbox/test_reconcile.py	2012-03-06 18:30:24 +0000
@@ -18,7 +18,7 @@
 
 
 from bzrlib import (
-    bzrdir,
+    controldir,
     inventory,
     tests,
     )
@@ -28,7 +28,7 @@
 class TrivialTest(tests.TestCaseWithTransport):
 
     def test_trivial_reconcile(self):
-        t = bzrdir.BzrDir.create_standalone_workingtree('.')
+        t = controldir.ControlDir.create_standalone_workingtree('.')
         (out, err) = self.run_bzr('reconcile')
         if t.branch.repository._reconcile_backsup_inventory:
             does_backup_text = "Inventory ok.\n"
@@ -45,7 +45,7 @@
         self.assertEqualDiff(err, "")
 
     def test_does_something_reconcile(self):
-        t = bzrdir.BzrDir.create_standalone_workingtree('.')
+        t = controldir.ControlDir.create_standalone_workingtree('.')
         # an empty inventory with no revision will trigger reconciliation.
         repo = t.branch.repository
         inv = inventory.Inventory(revision_id='missing')
 
=== modified file 'bzrlib/tests/blackbox/test_reconfigure.py'
--- bzrlib/tests/blackbox/test_reconfigure.py	2012-01-09 20:55:07 +0000
+++ bzrlib/tests/blackbox/test_reconfigure.py	2012-03-06 18:30:24 +0000
@@ -15,12 +15,11 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 from bzrlib import (
-    bzrdir,
+    controldir,
     errors,
     tests,
     workingtree,
     )
-from bzrlib.branchbuilder import BranchBuilder
 from bzrlib.tests.script import TestCaseWithTransportAndScript
 
 
@@ -86,7 +85,7 @@
 
     def test_use_shared_to_standalone(self):
         repo = self.make_repository('repo', shared=True)
-        branch = bzrdir.BzrDir.create_branch_convenience('repo/tree')
+        branch = controldir.ControlDir.create_branch_convenience('repo/tree')
         self.assertNotEqual(branch.bzrdir.root_transport.base,
             branch.repository.bzrdir.root_transport.base)
         self.run_bzr('reconfigure --standalone', working_dir='repo/tree')
@@ -126,7 +125,7 @@
 
     def test_make_without_trees_leaves_tree_alone(self):
         repo = self.make_repository('repo', shared=True)
-        branch = bzrdir.BzrDir.create_branch_convenience('repo/branch')
+        branch = controldir.ControlDir.create_branch_convenience('repo/branch')
         tree = workingtree.WorkingTree.open('repo/branch')
         self.build_tree(['repo/branch/foo'])
         tree.add('foo')
@@ -137,7 +136,7 @@
 
     def test_shared_format_to_standalone(self, format=None):
         repo = self.make_repository('repo', shared=True, format=format)
-        branch = bzrdir.BzrDir.create_branch_convenience('repo/tree')
+        branch = controldir.ControlDir.create_branch_convenience('repo/tree')
         self.assertNotEqual(branch.bzrdir.root_transport.base,
             branch.repository.bzrdir.root_transport.base)
         tree = workingtree.WorkingTree.open('repo/tree')
 
=== modified file 'bzrlib/tests/blackbox/test_reference.py'
--- bzrlib/tests/blackbox/test_reference.py	2011-09-21 20:29:48 +0000
+++ bzrlib/tests/blackbox/test_reference.py	2012-03-06 18:30:24 +0000
@@ -17,7 +17,7 @@
 
 from bzrlib import (
     branch as _mod_branch,
-    bzrdir,
+    controldir,
     )
 from bzrlib.tests import TestCaseWithTransport
 
@@ -25,7 +25,7 @@
 class TestReference(TestCaseWithTransport):
 
     def get_default_format(self):
-        format = bzrdir.format_registry.make_bzrdir('1.9')
+        format = controldir.format_registry.make_bzrdir('1.9')
         format.set_branch_format(_mod_branch.BzrBranchFormat8())
         return format
 
 
=== modified file 'bzrlib/tests/blackbox/test_rmbranch.py'
--- bzrlib/tests/blackbox/test_rmbranch.py	2012-02-28 10:10:24 +0000
+++ bzrlib/tests/blackbox/test_rmbranch.py	2012-03-06 18:30:24 +0000
@@ -18,7 +18,7 @@
 """Black-box tests for bzr rmbranch."""
 
 from bzrlib import (
-    bzrdir,
+    controldir,
     )
 from bzrlib.tests import (
     TestCaseWithTransport,
@@ -44,7 +44,7 @@
         self.run_bzr_error(['Branch is active. Use --force to remove it.\n'],
             'rmbranch a')
         self.run_bzr('rmbranch --force a')
-        dir = bzrdir.BzrDir.open('a')
+        dir = controldir.ControlDir.open('a')
         self.assertFalse(dir.has_branch())
         self.assertPathExists('a/hello')
         self.assertPathExists('a/goodbye')
@@ -60,7 +60,7 @@
         tree = self.example_tree('a')
         tree.bzrdir.destroy_workingtree()
         self.run_bzr('rmbranch', working_dir='a')
-        dir = bzrdir.BzrDir.open('a')
+        dir = controldir.ControlDir.open('a')
         self.assertFalse(dir.has_branch())
 
     def test_no_arg(self):
@@ -69,7 +69,7 @@
         self.run_bzr_error(['Branch is active. Use --force to remove it.\n'],
             'rmbranch a')
         self.run_bzr('rmbranch --force', working_dir='a')
-        dir = bzrdir.BzrDir.open('a')
+        dir = controldir.ControlDir.open('a')
         self.assertFalse(dir.has_branch())
 
     def test_remove_colo(self):
@@ -78,7 +78,7 @@
         tree.bzrdir.create_branch(name="otherbranch")
         self.assertTrue(tree.bzrdir.has_branch('otherbranch'))
         self.run_bzr('rmbranch %s,branch=otherbranch' % tree.bzrdir.user_url)
-        dir = bzrdir.BzrDir.open('a')
+        dir = controldir.ControlDir.open('a')
         self.assertFalse(dir.has_branch('otherbranch'))
         self.assertTrue(dir.has_branch())
 
@@ -88,7 +88,7 @@
         tree.bzrdir.create_branch(name="otherbranch")
         self.assertTrue(tree.bzrdir.has_branch('otherbranch'))
         self.run_bzr('rmbranch otherbranch -d %s' % tree.bzrdir.user_url)
-        dir = bzrdir.BzrDir.open('a')
+        dir = controldir.ControlDir.open('a')
         self.assertFalse(dir.has_branch('otherbranch'))
         self.assertTrue(dir.has_branch())
 
 
=== modified file 'bzrlib/tests/blackbox/test_send.py'
--- bzrlib/tests/blackbox/test_send.py	2012-02-14 17:22:37 +0000
+++ bzrlib/tests/blackbox/test_send.py	2012-03-06 18:30:24 +0000
@@ -20,7 +20,6 @@
 
 from bzrlib import (
     branch,
-    bzrdir,
     merge_directive,
     tests,
     )
@@ -63,7 +62,7 @@
 
     def setUp(self):
         super(TestSend, self).setUp()
-        grandparent_tree = bzrdir.BzrDir.create_standalone_workingtree(
+        grandparent_tree = ControlDir.create_standalone_workingtree(
             'grandparent')
         self.build_tree_contents([('grandparent/file1', 'grandparent')])
         grandparent_tree.add('file1')
@@ -275,7 +274,7 @@
 
     def make_parent_and_local_branches(self):
         # Create a 'parent' branch as the base
-        self.parent_tree = bzrdir.BzrDir.create_standalone_workingtree('parent')
+        self.parent_tree = ControlDir.create_standalone_workingtree('parent')
         self.build_tree_contents([('parent/file', 'parent')])
         self.parent_tree.add('file')
         self.parent_tree.commit('first commit', rev_id='parent')
 
=== modified file 'bzrlib/tests/blackbox/test_serve.py'
--- bzrlib/tests/blackbox/test_serve.py	2012-02-24 20:22:06 +0000
+++ bzrlib/tests/blackbox/test_serve.py	2012-03-06 18:30:24 +0000
@@ -34,7 +34,7 @@
     urlutils,
     )
 from bzrlib.branch import Branch
-from bzrlib.bzrdir import BzrDir
+from bzrlib.controldir import ControlDir
 from bzrlib.smart import client, medium
 from bzrlib.smart.server import (
     BzrServerFactory,
@@ -221,7 +221,7 @@
         process, transport = self.start_server_inet(['--allow-writes'])
 
         # We get a working branch, and can create a directory
-        branch = BzrDir.open_from_transport(transport).open_branch()
+        branch = ControlDir.open_from_transport(transport).open_branch()
         self.make_read_requests(branch)
         transport.mkdir('adir')
         self.assertInetServerShutsdownCleanly(process)
@@ -263,7 +263,7 @@
         log_fname = os.getcwd() + '/server.log'
         self.overrideEnv('BZR_LOG', log_fname)
         process, transport = self.start_server_inet(['-Dhpss'])
-        branch = BzrDir.open_from_transport(transport).open_branch()
+        branch = ControlDir.open_from_transport(transport).open_branch()
         self.make_read_requests(branch)
         self.assertInetServerShutsdownCleanly(process)
         f = open(log_fname, 'rb')
 
=== modified file 'bzrlib/tests/blackbox/test_shared_repository.py'
--- bzrlib/tests/blackbox/test_shared_repository.py	2012-01-25 21:13:15 +0000
+++ bzrlib/tests/blackbox/test_shared_repository.py	2012-03-06 18:30:24 +0000
@@ -18,7 +18,8 @@
 
 import os
 
-from bzrlib.bzrdir import BzrDir, BzrDirMetaFormat1
+from bzrlib.bzrdir import BzrDirMetaFormat1
+from bzrlib.controldir import ControlDir
 import bzrlib.errors as errors
 from bzrlib.tests import TestCaseInTempDir
 from bzrlib.tests.matchers import ContainsNoVfsCalls
@@ -34,7 +35,7 @@
   shared repository: a
 """)
         self.assertEqual(err, "")
-        dir = BzrDir.open('a')
+        dir = ControlDir.open('a')
         self.assertIs(dir.open_repository().is_shared(), True)
         self.assertRaises(errors.NotBranchError, dir.open_branch)
         self.assertRaises(errors.NoWorkingTree, dir.open_workingtree)
@@ -43,7 +44,7 @@
         out, err = self.run_bzr("init-repository a -q")
         self.assertEqual(out, "")
         self.assertEqual(err, "")
-        dir = BzrDir.open('a')
+        dir = ControlDir.open('a')
         self.assertIs(dir.open_repository().is_shared(), True)
         self.assertRaises(errors.NotBranchError, dir.open_branch)
         self.assertRaises(errors.NoWorkingTree, dir.open_workingtree)
@@ -54,17 +55,17 @@
         (Malone #38331)
         """
         out, err = self.run_bzr("init-repository .")
-        dir = BzrDir.open('.')
+        dir = ControlDir.open('.')
         self.assertTrue(dir.open_repository())
 
     def test_init(self):
         self.run_bzr("init-repo a")
         self.run_bzr("init --format=default a/b")
-        dir = BzrDir.open('a')
+        dir = ControlDir.open('a')
         self.assertIs(dir.open_repository().is_shared(), True)
         self.assertRaises(errors.NotBranchError, dir.open_branch)
         self.assertRaises(errors.NoWorkingTree, dir.open_workingtree)
-        bdir = BzrDir.open('a/b')
+        bdir = ControlDir.open('a/b')
         bdir.open_branch()
         self.assertRaises(errors.NoRepositoryPresent, bdir.open_repository)
         wt = bdir.open_workingtree()
@@ -73,7 +74,7 @@
         self.run_bzr("init-repo a")
         self.run_bzr("init --format=default a/b")
         self.run_bzr('branch a/b a/c')
-        cdir = BzrDir.open('a/c')
+        cdir = ControlDir.open('a/c')
         cdir.open_branch()
         self.assertRaises(errors.NoRepositoryPresent, cdir.open_repository)
         cdir.open_workingtree()
@@ -86,7 +87,7 @@
         self.run_bzr("commit -m bar b/hello")
 
         self.run_bzr('branch b a/c')
-        cdir = BzrDir.open('a/c')
+        cdir = ControlDir.open('a/c')
         cdir.open_branch()
         self.assertRaises(errors.NoRepositoryPresent, cdir.open_repository)
         self.assertPathExists('a/c/hello')
@@ -95,20 +96,20 @@
     def test_trees_default(self):
         # 0.15 switched to trees by default
         self.run_bzr("init-repo repo")
-        repo = BzrDir.open("repo").open_repository()
+        repo = ControlDir.open("repo").open_repository()
         self.assertEqual(True, repo.make_working_trees())
 
     def test_trees_argument(self):
         # Supplying the --trees argument should be harmless,
         # as it was previously non-default we need to get it right.
         self.run_bzr("init-repo --trees trees")
-        repo = BzrDir.open("trees").open_repository()
+        repo = ControlDir.open("trees").open_repository()
         self.assertEqual(True, repo.make_working_trees())
 
     def test_no_trees_argument(self):
         # --no-trees should make it so that there is no working tree
         self.run_bzr("init-repo --no-trees notrees")
-        repo = BzrDir.open("notrees").open_repository()
+        repo = ControlDir.open("notrees").open_repository()
         self.assertEqual(False, repo.make_working_trees())
 
     def test_init_repo_smart_acceptance(self):
@@ -129,7 +130,7 @@
         out, err = self.run_bzr("init-repository -q a")
         self.assertEqual(out, "")
         self.assertEqual(err, "")
-        dir = BzrDir.open('a')
+        dir = ControlDir.open('a')
         dir.open_repository() # there is a repository there
         e = self.assertRaises(errors.NotBranchError, dir.open_branch)
         self.assertContainsRe(str(e), "location is a repository")
@@ -145,7 +146,7 @@
 
     def test_init_repo_with_post_repo_init_hook(self):
         calls = []
-        BzrDir.hooks.install_named_hook('post_repo_init', calls.append, None)
+        ControlDir.hooks.install_named_hook('post_repo_init', calls.append, None)
         self.assertLength(0, calls)
         self.run_bzr("init-repository a")
         self.assertLength(1, calls)
 
=== modified file 'bzrlib/tests/blackbox/test_switch.py'
--- bzrlib/tests/blackbox/test_switch.py	2012-02-28 10:02:24 +0000
+++ bzrlib/tests/blackbox/test_switch.py	2012-03-06 18:30:24 +0000
@@ -20,17 +20,17 @@
 
 import os
 
-from bzrlib.bzrdir import BzrDir
+from bzrlib.controldir import ControlDir
 from bzrlib import (
-        osutils,
-        urlutils,
-        branch,
-        )
+    osutils,
+    urlutils,
+    branch,
+    )
 from bzrlib.workingtree import WorkingTree
 from bzrlib.tests import (
-        TestCaseWithTransport,
-        script,
-        )
+    TestCaseWithTransport,
+    script,
+    )
 from bzrlib.tests.features import UnicodeFilenameFeature
 from bzrlib.directory_service import directories
 
@@ -237,7 +237,7 @@
         tree.add('file-1')
         revid1 = tree.commit('rev1')
         self.run_bzr(['switch', '-b', 'anotherbranch'], working_dir='branch-1')
-        bzrdir = BzrDir.open("branch-1")
+        bzrdir = ControlDir.open("branch-1")
         self.assertEquals(
             set([b.name for b in bzrdir.list_branches()]),
             set(["foo", "anotherbranch"]))
@@ -256,7 +256,7 @@
         tree.add('file-1')
         revid1 = tree.commit('rev1')
         self.run_bzr(['switch', '-b', u'branch\xe9'], working_dir='branch-1')
-        bzrdir = BzrDir.open("branch-1")
+        bzrdir = ControlDir.open("branch-1")
         self.assertEquals(
             set([b.name for b in bzrdir.list_branches()]),
             set(["foo", u"branch\xe9"]))
 
=== modified file 'bzrlib/tests/blackbox/test_upgrade.py'
--- bzrlib/tests/blackbox/test_upgrade.py	2011-12-07 14:16:12 +0000
+++ bzrlib/tests/blackbox/test_upgrade.py	2012-03-06 18:30:24 +0000
@@ -49,7 +49,7 @@
             'branch-format',
             bzrdir.BzrDirMetaFormat1().get_format_string(),
             mode=to_convert._get_file_mode())
-        return bzrdir.BzrDir.open(to_convert.user_url)
+        return controldir.ControlDir.open(to_convert.user_url)
 
 
 class OldBzrDirFormat(bzrdir.BzrDirMetaFormat1):
@@ -155,7 +155,7 @@
 """ % (display_url, display_url, display_url, display_url, backup_dir), out)
         self.assertEqualDiff("", err)
         self.assertTrue(isinstance(
-            bzrdir.BzrDir.open(self.get_url(path))._format,
+            controldir.ControlDir.open(self.get_url(path))._format,
             bzrdir.BzrDirMetaFormat1))
 
     def test_upgrade_explicit_knit(self):
@@ -179,7 +179,7 @@
 """ % (display_url, display_url, display_url, display_url, backup_dir),
                              out)
         self.assertEqualDiff("", err)
-        converted_dir = bzrdir.BzrDir.open(self.get_url('branch'))
+        converted_dir = controldir.ControlDir.open(self.get_url('branch'))
         self.assertTrue(isinstance(converted_dir._format,
                                    bzrdir.BzrDirMetaFormat1))
         self.assertTrue(isinstance(converted_dir.open_repository()._format,
@@ -196,9 +196,9 @@
         self.run_bzr('upgrade --format=2a branch-foo %s' % (option_str,))
 
     def assertBranchFormat(self, dir, format):
-        branch = bzrdir.BzrDir.open_tree_or_branch(self.get_url(dir))[1]
+        branch = controldir.ControlDir.open_tree_or_branch(self.get_url(dir))[1]
         branch_format = branch._format
-        meta_format = bzrdir.format_registry.make_bzrdir(format)
+        meta_format = controldir.format_registry.make_bzrdir(format)
         expected_format = meta_format.get_branch_format()
         self.assertEqual(expected_format, branch_format)
 
@@ -245,7 +245,7 @@
 """ % (display_url, display_url, display_url, display_url, backup_dir2), out)
         self.assertEqualDiff("", err)
         self.assertTrue(isinstance(
-            bzrdir.BzrDir.open(self.get_url("old_format_branch"))._format,
+            controldir.ControlDir.open(self.get_url("old_format_branch"))._format,
             bzrdir.BzrDirMetaFormat1))
         self.assertTrue(t.has(backup_dir2))
 
 
=== modified file 'bzrlib/tests/per_branch/test_bound_sftp.py'
--- bzrlib/tests/per_branch/test_bound_sftp.py	2012-01-25 21:13:15 +0000
+++ bzrlib/tests/per_branch/test_bound_sftp.py	2012-03-06 18:30:24 +0000
@@ -21,7 +21,7 @@
 
 from bzrlib import (
     branch,
-    bzrdir,
+    controldir,
     errors,
     tests,
     )
@@ -39,9 +39,9 @@
 
     def create_branches(self):
         self.build_tree(['base/', 'base/a', 'base/b'])
-        format = bzrdir.format_registry.make_bzrdir('knit')
+        format = controldir.format_registry.make_bzrdir('knit')
         try:
-            wt_base = bzrdir.BzrDir.create_standalone_workingtree(
+            wt_base = controldir.ControlDir.create_standalone_workingtree(
                 self.get_url('base'), format=format)
         except errors.NotLocalUrl:
             raise tests.TestSkipped('Not a local URL')
@@ -63,7 +63,7 @@
     def test_simple_binding(self):
         self.build_tree(['base/', 'base/a', 'base/b', 'child/'])
         try:
-            wt_base = bzrdir.BzrDir.create_standalone_workingtree(
+            wt_base = controldir.ControlDir.create_standalone_workingtree(
                 self.get_url('base'))
         except errors.NotLocalUrl:
             raise tests.TestSkipped('Not a local URL')
@@ -76,8 +76,8 @@
         # manually make a branch we can bind, because the default format
         # may not be bindable-from, and we want to test the side effects etc
         # of bondage.
-        format = bzrdir.format_registry.make_bzrdir('knit')
-        b_child = bzrdir.BzrDir.create_branch_convenience(
+        format = controldir.format_registry.make_bzrdir('knit')
+        b_child = controldir.ControlDir.create_branch_convenience(
             'child', format=format)
         self.assertEqual(None, b_child.get_bound_location())
         self.assertEqual(None, b_child.get_master_branch())
@@ -144,7 +144,6 @@
                 wt_child2.commit, 'child2', rev_id='r@d-2')
 
     def test_unbinding(self):
-        from bzrlib import transport
         b_base, wt_child = self.create_branches()
 
         # TestCaseWithSFTPServer only allows you to connect one time
 
=== modified file 'bzrlib/tests/per_branch/test_branch.py'
--- bzrlib/tests/per_branch/test_branch.py	2012-02-14 17:22:37 +0000
+++ bzrlib/tests/per_branch/test_branch.py	2012-03-06 18:30:24 +0000
@@ -18,7 +18,7 @@
 
 from bzrlib import (
     branch as _mod_branch,
-    bzrdir,
+    controldir,
     config,
     delta as _mod_delta,
     errors,
@@ -708,7 +708,7 @@
         self.assertIsInstance(made_branch, _mod_branch.Branch)
 
         # find it via bzrdir opening:
-        opened_control = bzrdir.BzrDir.open(readonly_t.base)
+        opened_control = controldir.ControlDir.open(readonly_t.base)
         direct_opened_branch = opened_control.open_branch()
         self.assertEqual(direct_opened_branch.__class__, made_branch.__class__)
         self.assertEqual(opened_control, direct_opened_branch.bzrdir)
@@ -849,13 +849,13 @@
     def test_fallbacks_not_opened(self):
         stacked = self.make_branch_with_fallback()
         self.get_transport('').rename('fallback', 'moved')
-        reopened_dir = bzrdir.BzrDir.open(stacked.base)
+        reopened_dir = controldir.ControlDir.open(stacked.base)
         reopened = reopened_dir.open_branch(ignore_fallbacks=True)
         self.assertEqual([], reopened.repository._fallback_repositories)
 
     def test_fallbacks_are_opened(self):
         stacked = self.make_branch_with_fallback()
-        reopened_dir = bzrdir.BzrDir.open(stacked.base)
+        reopened_dir = controldir.ControlDir.open(stacked.base)
         reopened = reopened_dir.open_branch(ignore_fallbacks=False)
         self.assertLength(1, reopened.repository._fallback_repositories)
 
 
=== modified file 'bzrlib/tests/per_branch/test_permissions.py'
--- bzrlib/tests/per_branch/test_permissions.py	2011-09-12 09:51:52 +0000
+++ bzrlib/tests/per_branch/test_permissions.py	2012-03-06 18:30:24 +0000
@@ -32,7 +32,7 @@
 
 from bzrlib import tests
 from bzrlib.branch import BzrBranch
-from bzrlib.bzrdir import BzrDir
+from bzrlib.controldir import ControlDir
 from bzrlib.remote import RemoteBranchFormat
 from bzrlib.tests.test_permissions import check_mode_r
 
@@ -126,7 +126,7 @@
             raise tests.TestNotApplicable('Remote branches have no'
                                           ' permission logic')
         self.make_branch_and_tree('.')
-        bzrdir = BzrDir.open('.')
+        bzrdir = ControlDir.open('.')
         # Monkey patch the transport
         _orig_stat = bzrdir.transport.stat
         def null_perms_stat(*args, **kwargs):
 
=== modified file 'bzrlib/tests/per_branch/test_pull.py'
--- bzrlib/tests/per_branch/test_pull.py	2011-12-27 12:18:36 +0000
+++ bzrlib/tests/per_branch/test_pull.py	2012-03-06 18:30:24 +0000
@@ -18,7 +18,7 @@
 
 from bzrlib import (
     branch,
-    bzrdir,
+    controldir,
     errors,
     memorytree,
     revision,
@@ -238,7 +238,7 @@
             # remotebranches can't be bound.  Let's instead make a new local
             # branch of the default type, which does allow binding.
             # See https://bugs.launchpad.net/bzr/+bug/112020
-            local = bzrdir.BzrDir.create_branch_convenience('local2')
+            local = controldir.ControlDir.create_branch_convenience('local2')
             local.bind(target)
         source = self.make_branch('source')
         branch.Branch.hooks.install_named_hook(
 
=== modified file 'bzrlib/tests/per_branch/test_push.py'
--- bzrlib/tests/per_branch/test_push.py	2011-09-26 15:21:01 +0000
+++ bzrlib/tests/per_branch/test_push.py	2012-03-06 18:30:24 +0000
@@ -22,7 +22,7 @@
 from bzrlib import (
     branch,
     builtins,
-    bzrdir,
+    controldir,
     check,
     errors,
     memorytree,
@@ -173,7 +173,7 @@
             if self.vfs_transport_factory is test_server.LocalURLServer:
                 # the branch is colocated on disk, we cannot create a checkout.
                 # hopefully callers will expect this.
-                local_controldir= bzrdir.BzrDir.open(
+                local_controldir = controldir.ControlDir.open(
                     self.get_vfs_only_url('repo/tree'))
                 tree = local_controldir.create_workingtree()
             else:
@@ -355,7 +355,7 @@
             # remotebranches can't be bound.  Let's instead make a new local
             # branch of the default type, which does allow binding.
             # See https://bugs.launchpad.net/bzr/+bug/112020
-            local = bzrdir.BzrDir.create_branch_convenience('local2')
+            local = controldir.ControlDir.create_branch_convenience('local2')
             local.bind(target)
         source = self.make_branch('source')
         branch.Branch.hooks.install_named_hook(
 
=== modified file 'bzrlib/tests/per_branch/test_stacking.py'
--- bzrlib/tests/per_branch/test_stacking.py	2011-11-24 17:24:21 +0000
+++ bzrlib/tests/per_branch/test_stacking.py	2012-03-06 18:30:24 +0000
@@ -18,7 +18,7 @@
 
 from bzrlib import (
     branch,
-    bzrdir,
+    controldir,
     check,
     errors,
     )
@@ -107,12 +107,12 @@
 
     def assertRevisionInRepository(self, repo_path, revid):
         """Check that a revision is in a repository, disregarding stacking."""
-        repo = bzrdir.BzrDir.open(repo_path).open_repository()
+        repo = controldir.ControlDir.open(repo_path).open_repository()
         self.assertTrue(repo.has_revision(revid))
 
     def assertRevisionNotInRepository(self, repo_path, revid):
         """Check that a revision is not in a repository, disregarding stacking."""
-        repo = bzrdir.BzrDir.open(repo_path).open_repository()
+        repo = controldir.ControlDir.open(repo_path).open_repository()
         self.assertFalse(repo.has_revision(revid))
 
     def test_get_graph_stacked(self):
@@ -165,7 +165,7 @@
             raise TestNotApplicable(e)
         # Now serve the original mainline from a smart server
         remote_transport = self.make_smart_server('mainline')
-        remote_bzrdir = bzrdir.BzrDir.open_from_transport(remote_transport)
+        remote_bzrdir = controldir.ControlDir.open_from_transport(remote_transport)
         # and make branch from the smart server which is stacked
         new_dir = remote_bzrdir.sprout('newbranch', stacked=True)
         # stacked repository
 
=== modified file 'bzrlib/tests/per_branch/test_tags.py'
--- bzrlib/tests/per_branch/test_tags.py	2011-09-12 09:51:52 +0000
+++ bzrlib/tests/per_branch/test_tags.py	2012-03-06 18:30:24 +0000
@@ -22,7 +22,7 @@
 
 from bzrlib import (
     branch,
-    bzrdir as _mod_bzrdir,
+    controldir,
     errors,
     tests,
     )
@@ -170,7 +170,7 @@
         b1 = self.make_branch_with_revisions('b',
             ['rev-1', 'rev-1-changed', 'rev-2'])
         b1.tags.set_tag('one', 'rev-1')
-        b2 = _mod_bzrdir.BzrDir.open('b').open_branch()
+        b2 = controldir.ControlDir.open('b').open_branch()
         b1.lock_read()
         self.assertEqual({'one': 'rev-1'}, b1.tags.get_tag_dict())
         # Add a tag and modify a tag in b2.  b1 is read-locked and has already
 
=== modified file 'bzrlib/tests/per_bzrdir/test_bzrdir.py'
--- bzrlib/tests/per_bzrdir/test_bzrdir.py	2012-01-28 00:41:30 +0000
+++ bzrlib/tests/per_bzrdir/test_bzrdir.py	2012-03-06 18:30:24 +0000
@@ -21,8 +21,8 @@
 
 import bzrlib.branch
 from bzrlib import (
-    branch,
     bzrdir,
+    controldir,
     errors,
     repository,
     revision as _mod_revision,
@@ -657,7 +657,7 @@
             raise TestNotApplicable('Only relevant for stackable formats.')
         # Initialize a bzrdir subject to the policy.
         t = self.get_transport('stacked')
-        repo_fmt = bzrdir.format_registry.make_bzrdir('1.9')
+        repo_fmt = controldir.format_registry.make_bzrdir('1.9')
         repo_name = repo_fmt.repository_format.network_name()
         repo, control = self.assertInitializeEx(
             t, need_meta=True, repo_format_name=repo_name, stacked_on=None)
 
=== modified file 'bzrlib/tests/per_controldir/test_controldir.py'
--- bzrlib/tests/per_controldir/test_controldir.py	2012-02-14 17:22:37 +0000
+++ bzrlib/tests/per_controldir/test_controldir.py	2012-03-06 18:30:24 +0000
@@ -20,18 +20,18 @@
 
 import bzrlib.branch
 from bzrlib import (
-    bzrdir,
+    bzrdir as _mod_bzrdir,
     check,
     controldir,
     errors,
     gpg,
     osutils,
+    revision as _mod_revision,
     transport,
     ui,
     urlutils,
     workingtree,
     )
-import bzrlib.revision
 from bzrlib.tests import (
     fixtures,
     ChrootedTestCase,
@@ -124,7 +124,7 @@
         dir.create_repository()
         dir.create_branch()
         try:
-            wt = dir.create_workingtree(revision_id=bzrlib.revision.NULL_REVISION)
+            wt = dir.create_workingtree(revision_id=_mod_revision.NULL_REVISION)
         except (errors.NotLocalUrl, errors.UnsupportedOperation):
             raise TestSkipped("cannot make working tree with transport %r"
                               % dir.transport)
@@ -186,7 +186,7 @@
         e.g. NotLocalUrl) if there is no working tree.
         """
         dir = self.make_bzrdir('source')
-        vfs_dir = bzrdir.BzrDir.open(self.get_vfs_only_url('source'))
+        vfs_dir = controldir.ControlDir.open(self.get_vfs_only_url('source'))
         if vfs_dir.has_workingtree():
             # This ControlDir format doesn't support ControlDirs without
             # working trees, so this test is irrelevant.
@@ -232,7 +232,7 @@
         tree.add('foo')
         tree.commit('revision 1', rev_id='1')
         tree.bzrdir.open_branch().generate_revision_history(
-            bzrlib.revision.NULL_REVISION)
+            _mod_revision.NULL_REVISION)
         tree.set_parent_trees([])
         tree.commit('revision 2', rev_id='2')
         # Copy the content (i.e. revisions) from the 'commit_tree' branch's
@@ -265,7 +265,7 @@
         tree.add('foo')
         tree.commit('revision 1', rev_id='1')
         tree.branch.bzrdir.open_branch().generate_revision_history(
-            bzrlib.revision.NULL_REVISION)
+            _mod_revision.NULL_REVISION)
         tree.set_parent_trees([])
         tree.commit('revision 2', rev_id='2')
         tree.branch.repository.copy_content_into(shared_repo)
@@ -293,7 +293,7 @@
         tree.add('foo')
         tree.commit('revision 1', rev_id='1')
         tree.branch.bzrdir.open_branch().generate_revision_history(
-            bzrlib.revision.NULL_REVISION)
+            _mod_revision.NULL_REVISION)
         tree.set_parent_trees([])
         tree.commit('revision 2', rev_id='2')
         source = self.make_repository('source')
@@ -365,7 +365,7 @@
         self.assertEqual('1', target.open_branch().last_revision())
 
     def test_clone_on_transport_preserves_repo_format(self):
-        if self.bzrdir_format == bzrdir.format_registry.make_bzrdir('default'):
+        if self.bzrdir_format == controldir.format_registry.make_bzrdir('default'):
             format = 'knit'
         else:
             format = None
@@ -552,7 +552,7 @@
         tree.add('foo')
         tree.commit('revision 1', rev_id='1')
         tree.bzrdir.open_branch().generate_revision_history(
-            bzrlib.revision.NULL_REVISION)
+            _mod_revision.NULL_REVISION)
         tree.set_parent_trees([])
         tree.commit('revision 2', rev_id='2')
         source = self.make_repository('source')
@@ -581,7 +581,7 @@
         tree.add('foo')
         tree.commit('revision 1', rev_id='1')
         tree.bzrdir.open_branch().generate_revision_history(
-            bzrlib.revision.NULL_REVISION)
+            _mod_revision.NULL_REVISION)
         tree.set_parent_trees([])
         tree.commit('revision 2', rev_id='2')
         tree.branch.repository.copy_content_into(shared_repo)
@@ -606,7 +606,7 @@
         tree.add('foo')
         tree.commit('revision 1', rev_id='1')
         tree.bzrdir.open_branch().generate_revision_history(
-            bzrlib.revision.NULL_REVISION)
+            _mod_revision.NULL_REVISION)
         tree.set_parent_trees([])
         tree.commit('revision 2', rev_id='2')
         tree.branch.repository.copy_content_into(shared_repo)
@@ -634,7 +634,7 @@
         tree.add('foo')
         tree.commit('revision 1', rev_id='1')
         tree.bzrdir.open_branch().generate_revision_history(
-            bzrlib.revision.NULL_REVISION)
+            _mod_revision.NULL_REVISION)
         tree.set_parent_trees([])
         tree.commit('revision 2', rev_id='2')
         source = self.make_repository('source')
@@ -661,7 +661,7 @@
         tree.add('foo')
         tree.commit('revision 1', rev_id='1')
         br = tree.bzrdir.open_branch()
-        br.set_last_revision_info(0, bzrlib.revision.NULL_REVISION)
+        br.set_last_revision_info(0, _mod_revision.NULL_REVISION)
         tree.set_parent_trees([])
         tree.commit('revision 2', rev_id='2')
         source = self.make_repository('source')
@@ -1048,7 +1048,7 @@
         self.assertEqual(self.bzrdir_format,
                          controldir.ControlDirFormat.find_format(readonly_t))
         direct_opened_dir = self.bzrdir_format.open(readonly_t)
-        opened_dir = bzrdir.BzrDir.open(t.base)
+        opened_dir = controldir.ControlDir.open(t.base)
         self.assertEqual(made_control._format,
                          opened_dir._format)
         self.assertEqual(direct_opened_dir._format,
@@ -1086,7 +1086,7 @@
 
     def test_format_initialize_on_transport_ex_force_new_repo_True(self):
         t = self.get_transport('repo')
-        repo_fmt = bzrdir.format_registry.make_bzrdir('1.9')
+        repo_fmt = controldir.format_registry.make_bzrdir('1.9')
         repo_name = repo_fmt.repository_format.network_name()
         repo = repo_fmt.initialize_on_transport_ex(t,
             repo_format_name=repo_name, shared_repo=True)[0]
@@ -1097,7 +1097,7 @@
 
     def test_format_initialize_on_transport_ex_force_new_repo_False(self):
         t = self.get_transport('repo')
-        repo_fmt = bzrdir.format_registry.make_bzrdir('1.9')
+        repo_fmt = controldir.format_registry.make_bzrdir('1.9')
         repo_name = repo_fmt.repository_format.network_name()
         repo = repo_fmt.initialize_on_transport_ex(t,
             repo_format_name=repo_name, shared_repo=True)[0]
@@ -1115,7 +1115,7 @@
     def test_format_initialize_on_transport_ex_repo_fmt_name_followed(self):
         t = self.get_transport('dir')
         # 1.6 is likely to never be default
-        fmt = bzrdir.format_registry.make_bzrdir('1.6')
+        fmt = controldir.format_registry.make_bzrdir('1.6')
         repo_name = fmt.repository_format.network_name()
         repo, control = self.assertInitializeEx(t, repo_format_name=repo_name)
         if self.bzrdir_format.fixed_components:
@@ -1144,7 +1144,7 @@
             self.assertTrue(repo.is_write_locked())
             self.addCleanup(repo.unlock)
         self.assertIsInstance(control, controldir.ControlDir)
-        opened = bzrdir.BzrDir.open(t.base)
+        opened = controldir.ControlDir.open(t.base)
         expected_format = self.bzrdir_format
         if not isinstance(expected_format, RemoteBzrDirFormat):
             self.assertEqual(control._format.network_name(),
@@ -1383,7 +1383,7 @@
         except (errors.NotLocalUrl, errors.UnsupportedOperation):
             raise TestSkipped("Can't initialize %r on transport %r"
                               % (self.bzrdir_format, t))
-        dir = bzrdir.BzrDir.open(t.base+",branch=foo")
+        dir = controldir.ControlDir.open(t.base+",branch=foo")
         self.assertEquals({"branch": "foo"},
             dir.user_transport.get_segment_parameters())
         self.assertEquals("foo", dir._get_selected_branch())
@@ -1398,7 +1398,7 @@
         except (errors.NotLocalUrl, errors.UnsupportedOperation):
             raise TestSkipped("Can't initialize %r on transport %r"
                               % (self.bzrdir_format, t))
-        dir = bzrdir.BzrDir.open(t.base)
+        dir = controldir.ControlDir.open(t.base)
         self.assertEqual(u"", dir._get_selected_branch())
 
     def test_root_transport(self):
@@ -1473,7 +1473,7 @@
             raise TestNotApplicable("format does not support "
                 "nesting repositories")
         child_repo = self.make_repository('childrepo')
-        opened_control = bzrdir.BzrDir.open(self.get_url('childrepo'))
+        opened_control = controldir.ControlDir.open(self.get_url('childrepo'))
         found_repo = opened_control.find_repository()
         self.assertEqual(child_repo.bzrdir.root_transport.base,
                          found_repo.bzrdir.root_transport.base)
@@ -1493,7 +1493,7 @@
         self.get_transport().mkdir('childrepo')
         child_control = self.bzrdir_format.initialize(url)
         child_repo = child_control.create_repository(shared=True)
-        opened_control = bzrdir.BzrDir.open(self.get_url('childrepo'))
+        opened_control = controldir.ControlDir.open(self.get_url('childrepo'))
         found_repo = opened_control.find_repository()
         self.assertEqual(child_repo.bzrdir.root_transport.base,
                          found_repo.bzrdir.root_transport.base)
@@ -1713,14 +1713,14 @@
         except errors.BzrError, e:
             if 'Cannot set config' in str(e):
                 self.assertFalse(
-                    isinstance(my_dir, (bzrdir.BzrDirMeta1, RemoteBzrDir)),
+                    isinstance(my_dir, (_mod_bzrdir.BzrDirMeta1, RemoteBzrDir)),
                     "%r should support configs" % my_dir)
                 raise TestNotApplicable(
                     'This BzrDir format does not support configs.')
             else:
                 raise
         self.assertEqual('http://example.com', config.get_default_stack_on())
-        my_dir2 = bzrdir.BzrDir.open(self.get_url('.'))
+        my_dir2 = controldir.ControlDir.open(self.get_url('.'))
         config2 = my_dir2.get_config()
         self.assertEqual('http://example.com', config2.get_default_stack_on())
 
@@ -1748,7 +1748,7 @@
             return
         except errors.NoRepositoryPresent:
             pass
-        made_control = bzrdir.BzrDir.open(self.get_readonly_url('subdir'))
+        made_control = controldir.ControlDir.open(self.get_readonly_url('subdir'))
         self.assertRaises(errors.NoRepositoryPresent,
                           made_control.find_repository)
 
 
=== modified file 'bzrlib/tests/per_interbranch/test_pull.py'
--- bzrlib/tests/per_interbranch/test_pull.py	2011-10-17 08:45:09 +0000
+++ bzrlib/tests/per_interbranch/test_pull.py	2012-03-06 18:30:24 +0000
@@ -17,7 +17,7 @@
 """Tests for InterBranch.pull behaviour."""
 
 from bzrlib.branch import Branch
-from bzrlib.bzrdir import BzrDir
+from bzrlib.controldir import ControlDir
 from bzrlib import errors
 from bzrlib.memorytree import MemoryTree
 from bzrlib.revision import NULL_REVISION
@@ -175,7 +175,7 @@
             # remotebranches can't be bound.  Let's instead make a new local
             # branch of the default type, which does allow binding.
             # See https://bugs.launchpad.net/bzr/+bug/112020
-            local = BzrDir.create_branch_convenience('local2')
+            local = ControlDir.create_branch_convenience('local2')
             local.bind(target)
         source = self.make_from_branch('source')
         Branch.hooks.install_named_hook('post_pull',
 
=== modified file 'bzrlib/tests/per_interbranch/test_push.py'
--- bzrlib/tests/per_interbranch/test_push.py	2011-12-11 15:42:02 +0000
+++ bzrlib/tests/per_interbranch/test_push.py	2012-03-06 18:30:24 +0000
@@ -25,8 +25,8 @@
 
 from bzrlib import (
     branch,
-    bzrdir,
     check,
+    controldir,
     errors,
     push,
     symbol_versioning,
@@ -34,7 +34,7 @@
     vf_repository,
     )
 from bzrlib.branch import Branch
-from bzrlib.bzrdir import BzrDir
+from bzrlib.controldir import ControlDir
 from bzrlib.memorytree import MemoryTree
 from bzrlib.revision import NULL_REVISION
 from bzrlib.smart.repository import SmartServerRepositoryGetParentMap
@@ -165,7 +165,7 @@
             if self.vfs_transport_factory is test_server.LocalURLServer:
                 # the branch is colocated on disk, we cannot create a checkout.
                 # hopefully callers will expect this.
-                local_controldir = bzrdir.BzrDir.open(self.get_vfs_only_url('repo/tree'))
+                local_controldir = controldir.ControlDir.open(self.get_vfs_only_url('repo/tree'))
                 tree = local_controldir.create_workingtree()
             else:
                 tree = a_branch.create_checkout('repo/tree', lightweight=True)
@@ -349,7 +349,7 @@
             # remotebranches can't be bound.  Let's instead make a new local
             # branch of the default type, which does allow binding.
             # See https://bugs.launchpad.net/bzr/+bug/112020
-            local = BzrDir.create_branch_convenience('local2')
+            local = ControlDir.create_branch_convenience('local2')
             local.bind(target)
         source = self.make_from_branch('source')
         Branch.hooks.install_named_hook('post_push',
 
=== modified file 'bzrlib/tests/per_intertree/__init__.py'
--- bzrlib/tests/per_intertree/__init__.py	2011-08-04 14:01:47 +0000
+++ bzrlib/tests/per_intertree/__init__.py	2012-03-06 18:30:24 +0000
@@ -135,7 +135,7 @@
             # -- vila 20090311
             chk_tree_format = WorkingTreeFormat4()
             chk_tree_format._get_matchingbzrdir = \
-                lambda:bzrlib.bzrdir.format_registry.make_bzrdir('2a')
+                lambda:bzrlib.controldir.format_registry.make_bzrdir('2a')
             test_intertree_permutations.append(
                 (InterTree.__name__ + "(CHKInventory)",
                  InterTree,
 
=== modified file 'bzrlib/tests/per_pack_repository.py'
--- bzrlib/tests/per_pack_repository.py	2011-08-19 22:34:02 +0000
+++ bzrlib/tests/per_pack_repository.py	2012-03-06 18:30:24 +0000
@@ -24,7 +24,7 @@
 from bzrlib.btree_index import BTreeGraphIndex
 from bzrlib.index import GraphIndex
 from bzrlib import (
-    bzrdir,
+    controldir,
     errors,
     inventory,
     osutils,
@@ -59,7 +59,7 @@
     """
 
     def get_format(self):
-        return bzrdir.format_registry.make_bzrdir(self.format_name)
+        return controldir.format_registry.make_bzrdir(self.format_name)
 
     def test_attribute__fetch_order(self):
         """Packs do not need ordered data retrieval."""
@@ -869,7 +869,7 @@
         super(TestPackRepositoryStacking, self).setUp()
 
     def get_format(self):
-        return bzrdir.format_registry.make_bzrdir(self.format_name)
+        return controldir.format_registry.make_bzrdir(self.format_name)
 
     def test_stack_checks_rich_root_compatibility(self):
         # early versions of the packing code relied on pack internals to
@@ -1000,7 +1000,7 @@
 class TestKeyDependencies(TestCaseWithTransport):
 
     def get_format(self):
-        return bzrdir.format_registry.make_bzrdir(self.format_name)
+        return controldir.format_registry.make_bzrdir(self.format_name)
 
     def create_source_and_target(self):
         builder = self.make_branch_builder('source', format=self.get_format())
@@ -1085,7 +1085,7 @@
         self.hpss_calls.append(params.method)
 
     def get_format(self):
-        return bzrdir.format_registry.make_bzrdir(self.format_name)
+        return controldir.format_registry.make_bzrdir(self.format_name)
 
     def test_autopack_or_streaming_rpc_is_used_when_using_hpss(self):
         # Make local and remote repos
@@ -1093,7 +1093,7 @@
         tree = self.make_branch_and_tree('local', format=format)
         self.make_branch_and_tree('remote', format=format)
         remote_branch_url = self.smart_server.get_url() + 'remote'
-        remote_branch = bzrdir.BzrDir.open(remote_branch_url).open_branch()
+        remote_branch = controldir.ControlDir.open(remote_branch_url).open_branch()
         # Make 9 local revisions, and push them one at a time to the remote
         # repo to produce 9 pack files.
         for x in range(9):
 
=== modified file 'bzrlib/tests/per_repository/__init__.py'
--- bzrlib/tests/per_repository/__init__.py	2011-10-10 14:03:32 +0000
+++ bzrlib/tests/per_repository/__init__.py	2012-03-06 18:30:24 +0000
@@ -25,7 +25,6 @@
 """
 
 from bzrlib import (
-    bzrdir,
     repository,
     )
 from bzrlib.remote import RemoteRepositoryFormat
 
=== modified file 'bzrlib/tests/per_repository/test_fetch.py'
--- bzrlib/tests/per_repository/test_fetch.py	2012-01-30 14:18:22 +0000
+++ bzrlib/tests/per_repository/test_fetch.py	2012-03-06 18:30:24 +0000
@@ -17,7 +17,7 @@
 """Tests for fetch between repositories of the same type."""
 
 from bzrlib import (
-    bzrdir,
+    controldir,
     errors,
     gpg,
     remote,
@@ -67,7 +67,7 @@
         tree_a.add('foo', 'file1')
         tree_a.commit('rev1', rev_id='rev1')
         # create a knit-3 based format to fetch into
-        f = bzrdir.format_registry.make_bzrdir('development-subtree')
+        f = controldir.format_registry.make_bzrdir('development-subtree')
         try:
             format = tree_a.branch.repository._format
             format.check_conversion_target(f.repository_format)
 
=== modified file 'bzrlib/tests/per_repository/test_has_same_location.py'
--- bzrlib/tests/per_repository/test_has_same_location.py	2011-08-19 22:34:02 +0000
+++ bzrlib/tests/per_repository/test_has_same_location.py	2012-03-06 18:30:24 +0000
@@ -17,7 +17,7 @@
 """Tests for implementations of Repository.has_same_location."""
 
 from bzrlib import (
-    bzrdir,
+    controldir,
     transport,
     )
 from bzrlib.remote import (
@@ -119,7 +119,7 @@
                 self.get_vfs_only_url()).delete_tree('other')
             other_repo = self.make_repository('other', format='knit')
         # Make sure the other_repo is not a RemoteRepository.
-        other_bzrdir = bzrdir.BzrDir.open(self.get_vfs_only_url('other'))
+        other_bzrdir = controldir.ControlDir.open(self.get_vfs_only_url('other'))
         other_repo = other_bzrdir.open_repository()
         self.assertDifferentRepo(repo, other_repo)
 
 
=== modified file 'bzrlib/tests/per_repository_reference/__init__.py'
--- bzrlib/tests/per_repository_reference/__init__.py	2011-10-01 11:54:46 +0000
+++ bzrlib/tests/per_repository_reference/__init__.py	2012-03-06 18:30:24 +0000
@@ -27,7 +27,7 @@
     remote,
     urlutils,
     )
-from bzrlib.bzrdir import BzrDir
+from bzrlib.controldir import ControlDir
 from bzrlib.tests import multiply_tests
 from bzrlib.tests.per_repository import (
     all_repository_format_scenarios,
@@ -49,7 +49,7 @@
 
     def readonly_repository(self, repo):
         relpath = urlutils.basename(repo.bzrdir.user_url.rstrip('/'))
-        return BzrDir.open_from_transport(
+        return ControlDir.open_from_transport(
             self.get_readonly_transport(relpath)).open_repository()
 
 
 
=== modified file 'bzrlib/tests/per_repository_vf/test_reconcile.py'
--- bzrlib/tests/per_repository_vf/test_reconcile.py	2011-10-01 11:36:04 +0000
+++ bzrlib/tests/per_repository_vf/test_reconcile.py	2012-03-06 18:30:24 +0000
@@ -17,7 +17,10 @@
 """Tests for reconciliation of repositories."""
 
 import bzrlib
-from bzrlib import errors
+from bzrlib import (
+    errors,
+    )
+from bzrlib.bzrdir import BzrDir
 from bzrlib.inventory import Inventory
 from bzrlib.reconcile import reconcile, Reconciler
 from bzrlib.revision import Revision
@@ -135,14 +138,14 @@
         # a inventory with a ghost that can be corrected now.
         t.copy_tree('inventory_one_ghost', 'inventory_ghost_present')
         bzrdir_url = self.get_url('inventory_ghost_present')
-        bzrdir = bzrlib.bzrdir.BzrDir.open(bzrdir_url)
+        bzrdir = BzrDir.open(bzrdir_url)
         repo = bzrdir.open_repository()
         add_commit(repo, 'the_ghost', [])
 
     def checkEmptyReconcile(self, **kwargs):
         """Check a reconcile on an empty repository."""
         self.make_repository('empty')
-        d = bzrlib.bzrdir.BzrDir.open(self.get_url('empty'))
+        d = BzrDir.open(self.get_url('empty'))
         # calling on a empty repository should do nothing
         reconciler = d.find_repository().reconcile(**kwargs)
         # no inconsistent parents should have been found
@@ -167,7 +170,7 @@
     def test_convenience_reconcile_inventory_without_revision_reconcile(self):
         # smoke test for the all in one ui tool
         bzrdir_url = self.get_url('inventory_without_revision')
-        bzrdir = bzrlib.bzrdir.BzrDir.open(bzrdir_url)
+        bzrdir = BzrDir.open(bzrdir_url)
         repo = bzrdir.open_repository()
         if not repo._reconcile_does_inventory_gc:
             raise TestSkipped('Irrelevant test')
@@ -179,7 +182,7 @@
     def test_reweave_inventory_without_revision(self):
         # an excess inventory on its own is only reconciled by using thorough
         d_url = self.get_url('inventory_without_revision')
-        d = bzrlib.bzrdir.BzrDir.open(d_url)
+        d = BzrDir.open(d_url)
         repo = d.open_repository()
         if not repo._reconcile_does_inventory_gc:
             raise TestSkipped('Irrelevant test')
@@ -232,7 +235,7 @@
         # smoke test for the all in one Reconciler class,
         # other tests use the lower level repo.reconcile()
         d_url = self.get_url('inventory_without_revision_and_ghost')
-        d = bzrlib.bzrdir.BzrDir.open(d_url)
+        d = BzrDir.open(d_url)
         if not d.open_repository()._reconcile_does_inventory_gc:
             raise TestSkipped('Irrelevant test')
         def reconcile():
@@ -244,7 +247,7 @@
     def test_reweave_inventory_without_revision_and_ghost(self):
         # actual low level test.
         d_url = self.get_url('inventory_without_revision_and_ghost')
-        d = bzrlib.bzrdir.BzrDir.open(d_url)
+        d = BzrDir.open(d_url)
         repo = d.open_repository()
         if not repo._reconcile_does_inventory_gc:
             raise TestSkipped('Irrelevant test')
@@ -254,7 +257,7 @@
             thorough=True)
 
     def test_reweave_inventory_preserves_a_revision_with_ghosts(self):
-        d = bzrlib.bzrdir.BzrDir.open(self.get_url('inventory_one_ghost'))
+        d = BzrDir.open(self.get_url('inventory_one_ghost'))
         reconciler = d.open_repository().reconcile(thorough=True)
         # no inconsistent parents should have been found:
         # the lack of a parent for ghost is normal
@@ -267,7 +270,7 @@
         self.assertThat(['ghost', 'the_ghost'], MatchesAncestry(repo, 'ghost'))
 
     def test_reweave_inventory_fixes_ancestryfor_a_present_ghost(self):
-        d = bzrlib.bzrdir.BzrDir.open(self.get_url('inventory_ghost_present'))
+        d = BzrDir.open(self.get_url('inventory_ghost_present'))
         repo = d.open_repository()
         m = MatchesAncestry(repo, 'ghost')
         if m.match(['the_ghost', 'ghost']) is None:
 
=== modified file 'bzrlib/tests/per_repository_vf/test_write_group.py'
--- bzrlib/tests/per_repository_vf/test_write_group.py	2011-05-09 20:08:47 +0000
+++ bzrlib/tests/per_repository_vf/test_write_group.py	2012-03-06 18:30:24 +0000
@@ -20,7 +20,7 @@
 
 from bzrlib import (
     branch,
-    bzrdir,
+    controldir,
     errors,
     memorytree,
     remote,
@@ -87,7 +87,8 @@
             # repository, but the default format is unstackble.  So explicitly
             # make a stackable real repository and use that.
             repo = self.make_repository(relpath, format='1.9')
-            repo = bzrdir.BzrDir.open(self.get_url(relpath)).open_repository()
+            dir = controldir.ControlDir.open(self.get_url(relpath))
+            repo = dir.open_repository()
         else:
             repo = self.make_repository(relpath)
         if not repo._format.supports_external_lookups:
 
=== modified file 'bzrlib/tests/per_workingtree/test_commit.py'
--- bzrlib/tests/per_workingtree/test_commit.py	2012-01-25 21:13:15 +0000
+++ bzrlib/tests/per_workingtree/test_commit.py	2012-03-06 18:30:24 +0000
@@ -19,8 +19,8 @@
 
 from bzrlib import (
     branch,
-    bzrdir,
     conflicts,
+    controldir,
     errors,
     mutabletree,
     osutils,
@@ -264,7 +264,7 @@
         del master
         # check its corrupted.
         self.assertRaises(errors.UnknownFormatError,
-                          bzrdir.BzrDir.open,
+                          controldir.ControlDir.open,
                           'master')
         tree.commit('foo', rev_id='foo', local=True)
 
 
=== modified file 'bzrlib/tests/per_workingtree/test_content_filters.py'
--- bzrlib/tests/per_workingtree/test_content_filters.py	2010-12-02 09:23:10 +0000
+++ bzrlib/tests/per_workingtree/test_content_filters.py	2012-03-06 18:30:24 +0000
@@ -18,7 +18,7 @@
 
 import os
 
-from bzrlib.bzrdir import BzrDir
+from bzrlib.controldir import ControlDir
 from bzrlib.filters import ContentFilter
 from bzrlib.switch import switch
 from bzrlib.workingtree import WorkingTree
@@ -330,7 +330,7 @@
         self.assertFileEqual("fOO tXT", 'checkout/file1.txt')
 
         # Switch it to branch-b and check the tree is updated
-        checkout_control_dir = BzrDir.open_containing('checkout')[0]
+        checkout_control_dir = ControlDir.open_containing('checkout')[0]
         switch(checkout_control_dir, source.branch)
         self.assertFileEqual("fOO rocks!", 'checkout/file1.txt')
         self.assertFileEqual("hELLO wORLD", 'checkout/file4.txt')
 
=== modified file 'bzrlib/tests/per_workingtree/test_workingtree.py'
--- bzrlib/tests/per_workingtree/test_workingtree.py	2012-01-28 17:24:34 +0000
+++ bzrlib/tests/per_workingtree/test_workingtree.py	2012-03-06 18:30:24 +0000
@@ -24,6 +24,7 @@
     branch,
     bzrdir,
     config,
+    controldir,
     errors,
     osutils,
     revision as _mod_revision,
@@ -719,7 +720,7 @@
         tree.add(['bloo', 'blo'])
         tree.commit("blah", allow_pointless=False)
         base = tree.branch.repository.revision_tree(tree.last_revision())
-        bzrdir.BzrDir.open("mine").sprout("other")
+        controldir.ControlDir.open("mine").sprout("other")
         with file('other/bloo', 'wb') as f: f.write('two')
         othertree = WorkingTree.open('other')
         othertree.commit('blah', allow_pointless=False)
 
=== modified file 'bzrlib/tests/test_branch.py'
--- bzrlib/tests/test_branch.py	2012-02-14 17:22:37 +0000
+++ bzrlib/tests/test_branch.py	2012-03-06 18:30:24 +0000
@@ -28,6 +28,7 @@
     branch as _mod_branch,
     bzrdir,
     config,
+    controldir,
     errors,
     symbol_versioning,
     tests,
@@ -244,7 +245,7 @@
         # but open_downlevel will work
         self.assertEqual(
             format.open(dir),
-            bzrdir.BzrDir.open(self.get_url()).open_branch(unsupported=True))
+            controldir.ControlDir.open(self.get_url()).open_branch(unsupported=True))
         # unregister the format
         self.applyDeprecated(symbol_versioning.deprecated_in((2, 4, 0)),
             _mod_branch.BranchFormat.unregister_format, format)
@@ -488,7 +489,7 @@
 
     def make_branch(self, location, format=None):
         if format is None:
-            format = bzrdir.format_registry.make_bzrdir('1.9')
+            format = controldir.format_registry.make_bzrdir('1.9')
             format.set_branch_format(_mod_branch.BzrBranchFormat8())
         return tests.TestCaseWithTransport.make_branch(
             self, location, format=format)
 
=== modified file 'bzrlib/tests/test_bzrdir.py'
--- bzrlib/tests/test_bzrdir.py	2012-02-06 11:36:02 +0000
+++ bzrlib/tests/test_bzrdir.py	2012-03-06 18:30:24 +0000
@@ -170,18 +170,18 @@
         self.assertNotContainsRe(new, 'hidden')
 
     def test_set_default_repository(self):
-        default_factory = bzrdir.format_registry.get('default')
-        old_default = [k for k, v in bzrdir.format_registry.iteritems()
+        default_factory = controldir.format_registry.get('default')
+        old_default = [k for k, v in controldir.format_registry.iteritems()
                        if v == default_factory and k != 'default'][0]
-        bzrdir.format_registry.set_default_repository('dirstate-with-subtree')
+        controldir.format_registry.set_default_repository('dirstate-with-subtree')
         try:
-            self.assertIs(bzrdir.format_registry.get('dirstate-with-subtree'),
-                          bzrdir.format_registry.get('default'))
+            self.assertIs(controldir.format_registry.get('dirstate-with-subtree'),
+                          controldir.format_registry.get('default'))
             self.assertIs(
                 repository.format_registry.get_default().__class__,
                 knitrepo.RepositoryFormatKnit3)
         finally:
-            bzrdir.format_registry.set_default_repository(old_default)
+            controldir.format_registry.set_default_repository(old_default)
 
     def test_aliases(self):
         a_registry = controldir.ControlDirFormatRegistry()
@@ -212,21 +212,21 @@
     """A sample BzrDir implementation to allow testing static methods."""
 
     def create_repository(self, shared=False):
-        """See BzrDir.create_repository."""
+        """See ControlDir.create_repository."""
         return "A repository"
 
     def open_repository(self):
-        """See BzrDir.open_repository."""
+        """See ControlDir.open_repository."""
         return SampleRepository(self)
 
     def create_branch(self, name=None):
-        """See BzrDir.create_branch."""
+        """See ControlDir.create_branch."""
         if name is not None:
             raise NoColocatedBranchSupport(self)
         return SampleBranch(self)
 
     def create_workingtree(self):
-        """See BzrDir.create_workingtree."""
+        """See ControlDir.create_workingtree."""
         return "A tree"
 
 
@@ -337,7 +337,7 @@
     def test_create_branch_and_repo_under_shared(self):
         # creating a branch and repo in a shared repo uses the
         # shared repository
-        format = bzrdir.format_registry.make_bzrdir('knit')
+        format = controldir.format_registry.make_bzrdir('knit')
         self.make_repository('.', shared=True, format=format)
         branch = bzrdir.BzrDir.create_branch_and_repo(
             self.get_url('child'), format=format)
@@ -347,7 +347,7 @@
     def test_create_branch_and_repo_under_shared_force_new(self):
         # creating a branch and repo in a shared repo can be forced to
         # make a new repo
-        format = bzrdir.format_registry.make_bzrdir('knit')
+        format = controldir.format_registry.make_bzrdir('knit')
         self.make_repository('.', shared=True, format=format)
         branch = bzrdir.BzrDir.create_branch_and_repo(self.get_url('child'),
                                                       force_new_repo=True,
@@ -367,7 +367,7 @@
 
     def test_create_standalone_working_tree_under_shared_repo(self):
         # create standalone working tree always makes a repo.
-        format = bzrdir.format_registry.make_bzrdir('knit')
+        format = controldir.format_registry.make_bzrdir('knit')
         self.make_repository('.', shared=True, format=format)
         # note this is deliberately readonly, as this failure should
         # occur before any writes.
@@ -380,14 +380,14 @@
 
     def test_create_branch_convenience(self):
         # outside a repo the default convenience output is a repo+branch_tree
-        format = bzrdir.format_registry.make_bzrdir('knit')
+        format = controldir.format_registry.make_bzrdir('knit')
         branch = bzrdir.BzrDir.create_branch_convenience('.', format=format)
         branch.bzrdir.open_workingtree()
         branch.bzrdir.open_repository()
 
     def test_create_branch_convenience_possible_transports(self):
         """Check that the optional 'possible_transports' is recognized"""
-        format = bzrdir.format_registry.make_bzrdir('knit')
+        format = controldir.format_registry.make_bzrdir('knit')
         t = self.get_transport()
         branch = bzrdir.BzrDir.create_branch_convenience(
             '.', format=format, possible_transports=[t])
@@ -398,7 +398,7 @@
         """Creating a branch at the root of a fs should work."""
         self.vfs_transport_factory = memory.MemoryServer
         # outside a repo the default convenience output is a repo+branch_tree
-        format = bzrdir.format_registry.make_bzrdir('knit')
+        format = controldir.format_registry.make_bzrdir('knit')
         branch = bzrdir.BzrDir.create_branch_convenience(self.get_url(),
                                                          format=format)
         self.assertRaises(errors.NoWorkingTree,
@@ -408,7 +408,7 @@
     def test_create_branch_convenience_under_shared_repo(self):
         # inside a repo the default convenience output is a branch+ follow the
         # repo tree policy
-        format = bzrdir.format_registry.make_bzrdir('knit')
+        format = controldir.format_registry.make_bzrdir('knit')
         self.make_repository('.', shared=True, format=format)
         branch = bzrdir.BzrDir.create_branch_convenience('child',
             format=format)
@@ -419,7 +419,7 @@
     def test_create_branch_convenience_under_shared_repo_force_no_tree(self):
         # inside a repo the default convenience output is a branch+ follow the
         # repo tree policy but we can override that
-        format = bzrdir.format_registry.make_bzrdir('knit')
+        format = controldir.format_registry.make_bzrdir('knit')
         self.make_repository('.', shared=True, format=format)
         branch = bzrdir.BzrDir.create_branch_convenience('child',
             force_new_tree=False, format=format)
@@ -431,7 +431,7 @@
     def test_create_branch_convenience_under_shared_repo_no_tree_policy(self):
         # inside a repo the default convenience output is a branch+ follow the
         # repo tree policy
-        format = bzrdir.format_registry.make_bzrdir('knit')
+        format = controldir.format_registry.make_bzrdir('knit')
         repo = self.make_repository('.', shared=True, format=format)
         repo.set_make_working_trees(False)
         branch = bzrdir.BzrDir.create_branch_convenience('child',
@@ -444,7 +444,7 @@
     def test_create_branch_convenience_under_shared_repo_no_tree_policy_force_tree(self):
         # inside a repo the default convenience output is a branch+ follow the
         # repo tree policy but we can override that
-        format = bzrdir.format_registry.make_bzrdir('knit')
+        format = controldir.format_registry.make_bzrdir('knit')
         repo = self.make_repository('.', shared=True, format=format)
         repo.set_make_working_trees(False)
         branch = bzrdir.BzrDir.create_branch_convenience('child',
@@ -456,7 +456,7 @@
     def test_create_branch_convenience_under_shared_repo_force_new_repo(self):
         # inside a repo the default convenience output is overridable to give
         # repo+branch+tree
-        format = bzrdir.format_registry.make_bzrdir('knit')
+        format = controldir.format_registry.make_bzrdir('knit')
         self.make_repository('.', shared=True, format=format)
         branch = bzrdir.BzrDir.create_branch_convenience('child',
             force_new_repo=True, format=format)
@@ -523,7 +523,7 @@
         # general case.
         trunk = self.make_branch('trunk', format='1.9')
         t = self.get_transport('stacked')
-        old_fmt = bzrdir.format_registry.make_bzrdir('pack-0.92')
+        old_fmt = controldir.format_registry.make_bzrdir('pack-0.92')
         repo_name = old_fmt.repository_format.network_name()
         # Should end up with a 1.9 format (stackable)
         repo, control, require_stacking, repo_policy = \
@@ -1015,13 +1015,13 @@
         Metadirs should compare equal iff they have the same repo, branch and
         tree formats.
         """
-        mydir = bzrdir.format_registry.make_bzrdir('knit')
+        mydir = controldir.format_registry.make_bzrdir('knit')
         self.assertEqual(mydir, mydir)
         self.assertFalse(mydir != mydir)
-        otherdir = bzrdir.format_registry.make_bzrdir('knit')
+        otherdir = controldir.format_registry.make_bzrdir('knit')
         self.assertEqual(otherdir, mydir)
         self.assertFalse(otherdir != mydir)
-        otherdir2 = bzrdir.format_registry.make_bzrdir('development-subtree')
+        otherdir2 = controldir.format_registry.make_bzrdir('development-subtree')
         self.assertNotEqual(otherdir2, mydir)
         self.assertFalse(otherdir2 == mydir)
 
@@ -1039,14 +1039,14 @@
 
     def test_needs_conversion_different_working_tree(self):
         # meta1dirs need an conversion if any element is not the default.
-        new_format = bzrdir.format_registry.make_bzrdir('dirstate')
+        new_format = controldir.format_registry.make_bzrdir('dirstate')
         tree = self.make_branch_and_tree('tree', format='knit')
         self.assertTrue(tree.bzrdir.needs_format_conversion(
             new_format))
 
     def test_initialize_on_format_uses_smart_transport(self):
         self.setup_smart_server_with_call_log()
-        new_format = bzrdir.format_registry.make_bzrdir('dirstate')
+        new_format = controldir.format_registry.make_bzrdir('dirstate')
         transport = self.get_transport('target')
         transport.ensure_base()
         self.reset_smart_call_log()
@@ -1070,7 +1070,7 @@
 
     def test_create_branch_convenience(self):
         # outside a repo the default convenience output is a repo+branch_tree
-        format = bzrdir.format_registry.make_bzrdir('knit')
+        format = controldir.format_registry.make_bzrdir('knit')
         branch = bzrdir.BzrDir.create_branch_convenience(
             self.get_url('foo'), format=format)
         self.assertRaises(errors.NoWorkingTree,
@@ -1079,7 +1079,7 @@
 
     def test_create_branch_convenience_force_tree_not_local_fails(self):
         # outside a repo the default convenience output is a repo+branch_tree
-        format = bzrdir.format_registry.make_bzrdir('knit')
+        format = controldir.format_registry.make_bzrdir('knit')
         self.assertRaises(errors.NotLocalUrl,
             bzrdir.BzrDir.create_branch_convenience,
             self.get_url('foo'),
@@ -1090,7 +1090,7 @@
 
     def test_clone(self):
         # clone into a nonlocal path works
-        format = bzrdir.format_registry.make_bzrdir('knit')
+        format = controldir.format_registry.make_bzrdir('knit')
         branch = bzrdir.BzrDir.create_branch_convenience('local',
                                                          format=format)
         branch.bzrdir.open_workingtree()
 
=== modified file 'bzrlib/tests/test_clean_tree.py'
--- bzrlib/tests/test_clean_tree.py	2011-05-26 21:02:47 +0000
+++ bzrlib/tests/test_clean_tree.py	2012-03-06 18:30:24 +0000
@@ -19,11 +19,10 @@
 import os
 import shutil
 import sys
-import types
 
 from bzrlib import tests, ui
-from bzrlib.bzrdir import (
-    BzrDir,
+from bzrlib.controldir import (
+    ControlDir,
     )
 from bzrlib.clean_tree import (
     clean_tree,
@@ -43,7 +42,7 @@
         if has_symlinks() is False:
             return
         os.mkdir('branch')
-        BzrDir.create_standalone_workingtree('branch')
+        ControlDir.create_standalone_workingtree('branch')
         os.symlink(os.path.realpath('no-die-please'), 'branch/die-please')
         os.mkdir('no-die-please')
         self.assertPathExists('branch/die-please')
@@ -56,7 +55,7 @@
     def test_iter_deletable(self):
         """Files are selected for deletion appropriately"""
         os.mkdir('branch')
-        tree = BzrDir.create_standalone_workingtree('branch')
+        tree = ControlDir.create_standalone_workingtree('branch')
         transport = tree.bzrdir.root_transport
         transport.put_bytes('.bzrignore', '*~\n*.pyc\n.bzrignore\n')
         transport.put_bytes('file.BASE', 'contents')
@@ -122,7 +121,7 @@
         stderr = tests.StringIOWrapper()
         ui.ui_factory = tests.TestUIFactory(stdout=stdout, stderr=stderr)
 
-        BzrDir.create_standalone_workingtree('.')
+        ControlDir.create_standalone_workingtree('.')
         self.build_tree(['0foo', '1bar', '2baz', 'subdir0/'])
         clean_tree('.', unknown=True, no_prompt=True)
         self.assertContainsRe(stderr.getvalue(),
 
=== modified file 'bzrlib/tests/test_commit.py'
--- bzrlib/tests/test_commit.py	2012-02-14 17:22:37 +0000
+++ bzrlib/tests/test_commit.py	2012-03-06 18:30:24 +0000
@@ -19,8 +19,8 @@
 
 import bzrlib
 from bzrlib import (
-    bzrdir,
     config,
+    controldir,
     errors,
     )
 from bzrlib.branch import Branch
@@ -835,7 +835,7 @@
     def test_commit_with_checkout_and_branch_sharing_repo(self):
         repo = self.make_repository('repo', shared=True)
         # make_branch_and_tree ignores shared repos
-        branch = bzrdir.BzrDir.create_branch_convenience('repo/branch')
+        branch = controldir.ControlDir.create_branch_convenience('repo/branch')
         tree2 = branch.create_checkout('repo/tree2')
         tree2.commit('message', rev_id='rev1')
         self.assertTrue(tree2.branch.repository.has_revision('rev1'))
 
=== modified file 'bzrlib/tests/test_config.py'
--- bzrlib/tests/test_config.py	2012-02-20 17:38:11 +0000
+++ bzrlib/tests/test_config.py	2012-03-06 18:30:24 +0000
@@ -27,8 +27,8 @@
 #import bzrlib specific imports here
 from bzrlib import (
     branch,
-    bzrdir,
     config,
+    controldir,
     diff,
     errors,
     osutils,
@@ -115,7 +115,7 @@
 
 def build_control_store(test):
     build_backing_branch(test, 'branch')
-    b = bzrdir.BzrDir.open('branch')
+    b = controldir.ControlDir.open('branch')
     return config.ControlStore(b)
 config.test_store_builder_registry.register('control', build_control_store)
 
@@ -1142,7 +1142,7 @@
 
     def test_get_config(self):
         """The Branch.get_config method works properly"""
-        b = bzrdir.BzrDir.create_standalone_workingtree('.').branch
+        b = controldir.ControlDir.create_standalone_workingtree('.').branch
         my_config = b.get_config()
         self.assertIs(my_config.get_user_option('wacky'), None)
         my_config.set_user_option('wacky', 'unlikely')
@@ -2203,7 +2203,7 @@
         self.assertGetHook(remote_branch._get_config(), 'file', 'branch')
 
     def test_get_hook_remote_bzrdir(self):
-        remote_bzrdir = bzrdir.BzrDir.open(self.get_url('tree'))
+        remote_bzrdir = controldir.ControlDir.open(self.get_url('tree'))
         conf = remote_bzrdir._get_config()
         conf.set_option('remotedir', 'file')
         self.assertGetHook(conf, 'file', 'remotedir')
@@ -2231,7 +2231,7 @@
     def test_set_hook_remote_bzrdir(self):
         remote_branch = branch.Branch.open(self.get_url('tree'))
         self.addCleanup(remote_branch.lock_write().unlock)
-        remote_bzrdir = bzrdir.BzrDir.open(self.get_url('tree'))
+        remote_bzrdir = controldir.ControlDir.open(self.get_url('tree'))
         self.assertSetHook(remote_bzrdir._get_config(), 'file', 'remotedir')
 
     def assertLoadHook(self, expected_nb_calls, name, conf_class, *conf_args):
@@ -2254,7 +2254,7 @@
         self.assertLoadHook(1, 'file', remote.RemoteBranchConfig, remote_branch)
 
     def test_load_hook_remote_bzrdir(self):
-        remote_bzrdir = bzrdir.BzrDir.open(self.get_url('tree'))
+        remote_bzrdir = controldir.ControlDir.open(self.get_url('tree'))
         # The config file doesn't exist, set an option to force its creation
         conf = remote_bzrdir._get_config()
         conf.set_option('remotedir', 'file')
@@ -2285,7 +2285,7 @@
     def test_save_hook_remote_bzrdir(self):
         remote_branch = branch.Branch.open(self.get_url('tree'))
         self.addCleanup(remote_branch.lock_write().unlock)
-        remote_bzrdir = bzrdir.BzrDir.open(self.get_url('tree'))
+        remote_bzrdir = controldir.ControlDir.open(self.get_url('tree'))
         self.assertSaveHook(remote_bzrdir._get_config())
 
 
 
=== modified file 'bzrlib/tests/test_conflicts.py'
--- bzrlib/tests/test_conflicts.py	2011-10-27 15:38:14 +0000
+++ bzrlib/tests/test_conflicts.py	2012-03-06 18:30:24 +0000
@@ -18,7 +18,6 @@
 import os
 
 from bzrlib import (
-    bzrdir,
     conflicts,
     errors,
     option,
 
=== modified file 'bzrlib/tests/test_dirstate.py'
--- bzrlib/tests/test_dirstate.py	2012-01-30 14:18:22 +0000
+++ bzrlib/tests/test_dirstate.py	2012-03-06 18:30:24 +0000
@@ -20,7 +20,7 @@
 import tempfile
 
 from bzrlib import (
-    bzrdir,
+    controldir,
     dirstate,
     errors,
     inventory,
@@ -31,7 +31,6 @@
     tests,
     workingtree_4,
     )
-from bzrlib.transport import memory
 from bzrlib.tests import (
     features,
     test_osutils,
@@ -2444,7 +2443,7 @@
     """A minimal api to get InventoryRevisionTree to work."""
 
     def __init__(self):
-        default_format = bzrdir.format_registry.make_bzrdir('default')
+        default_format = controldir.format_registry.make_bzrdir('default')
         self._format = default_format.repository_format
 
     def lock_read(self):
 
=== modified file 'bzrlib/tests/test_errors.py'
--- bzrlib/tests/test_errors.py	2011-11-28 17:15:29 +0000
+++ bzrlib/tests/test_errors.py	2012-03-06 18:30:24 +0000
@@ -22,7 +22,7 @@
 import sys
 
 from bzrlib import (
-    bzrdir,
+    controldir,
     errors,
     osutils,
     urlutils,
@@ -207,7 +207,7 @@
             'There is no public branch set for "%s".' % url, str(error))
 
     def test_no_repo(self):
-        dir = bzrdir.BzrDir.create(self.get_url())
+        dir = controldir.ControlDir.create(self.get_url())
         error = errors.NoRepositoryPresent(dir)
         self.assertNotEqual(-1, str(error).find((dir.transport.clone('..').base)))
         self.assertEqual(-1, str(error).find((dir.transport.base)))
 
=== modified file 'bzrlib/tests/test_foreign.py'
--- bzrlib/tests/test_foreign.py	2012-01-24 16:19:04 +0000
+++ bzrlib/tests/test_foreign.py	2012-03-06 18:30:24 +0000
@@ -330,7 +330,7 @@
 
     def cloning_metadir(self, stacked=False):
         """Produce a metadir suitable for cloning with."""
-        return bzrdir.format_registry.make_bzrdir("default")
+        return controldir.format_registry.make_bzrdir("default")
 
     def checkout_metadir(self):
         return self.cloning_metadir()
@@ -446,7 +446,7 @@
     def test_create(self):
         """Test we can create dummies."""
         self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
-        dir = bzrdir.BzrDir.open("d")
+        dir = controldir.ControlDir.open("d")
         self.assertEquals("A Dummy VCS Dir", dir._format.get_format_string())
         dir.open_repository()
         dir.open_branch()
@@ -455,7 +455,7 @@
     def test_sprout(self):
         """Test we can clone dummies and that the format is not preserved."""
         self.make_branch_and_tree("d", format=DummyForeignVcsDirFormat())
-        dir = bzrdir.BzrDir.open("d")
+        dir = controldir.ControlDir.open("d")
         newdir = dir.sprout("e")
         self.assertNotEquals("A Dummy VCS Dir",
                              newdir._format.get_format_string())
 
=== modified file 'bzrlib/tests/test_http.py'
--- bzrlib/tests/test_http.py	2012-01-20 12:56:05 +0000
+++ bzrlib/tests/test_http.py	2012-03-06 18:30:24 +0000
@@ -31,8 +31,8 @@
 
 import bzrlib
 from bzrlib import (
-    bzrdir,
     config,
+    controldir,
     debug,
     errors,
     osutils,
@@ -1911,10 +1911,10 @@
         server._url_protocol = self._url_protocol
         return server
 
-    def test_open_bzrdir(self):
+    def test_open_controldir(self):
         branch = self.make_branch('relpath')
         url = self.http_server.get_url() + 'relpath'
-        bd = bzrdir.BzrDir.open(url)
+        bd = controldir.ControlDir.open(url)
         self.addCleanup(bd.transport.disconnect)
         self.assertIsInstance(bd, _mod_remote.RemoteBzrDir)
 
 
=== modified file 'bzrlib/tests/test_import_tariff.py'
--- bzrlib/tests/test_import_tariff.py	2011-12-19 00:55:07 +0000
+++ bzrlib/tests/test_import_tariff.py	2012-03-06 18:30:24 +0000
@@ -25,7 +25,7 @@
     plugins as _mod_plugins,
     trace,
     )
-from bzrlib.bzrdir import BzrDir
+from bzrlib.controldir import ControlDir
 from bzrlib.smart import medium
 from bzrlib.transport import remote
 
@@ -223,7 +223,7 @@
         client_medium = medium.SmartSimplePipesClientMedium(
             process.stdout, process.stdin, url)
         transport = remote.RemoteTransport(url, medium=client_medium)
-        branch = BzrDir.open_from_transport(transport).open_branch()
+        branch = ControlDir.open_from_transport(transport).open_branch()
         process.stdin.close()
         # Hide stdin from the subprocess module, so it won't fail to close it.
         process.stdin = None
 
=== modified file 'bzrlib/tests/test_merge_core.py'
--- bzrlib/tests/test_merge_core.py	2012-01-25 21:13:15 +0000
+++ bzrlib/tests/test_merge_core.py	2012-03-06 18:30:24 +0000
@@ -19,6 +19,7 @@
 
 import bzrlib
 from bzrlib import (
+    controldir,
     errors,
     generate_ids,
     merge_directive,
@@ -48,7 +49,7 @@
         def wt(name):
            path = pathjoin(self.dir, name)
            os.mkdir(path)
-           wt = bzrlib.bzrdir.BzrDir.create_standalone_workingtree(path)
+           wt = controldir.ControlDir.create_standalone_workingtree(path)
            # the tests perform pulls, so need a branch that is writeable.
            wt.lock_write()
            wt.set_root_id(self.tree_root)
 
=== modified file 'bzrlib/tests/test_options.py'
--- bzrlib/tests/test_options.py	2011-11-24 17:01:07 +0000
+++ bzrlib/tests/test_options.py	2012-03-06 18:30:24 +0000
@@ -160,14 +160,14 @@
 
     def test_registry_converter(self):
         options = [option.RegistryOption('format', '',
-                   bzrdir.format_registry, bzrdir.format_registry.make_bzrdir)]
+                   controldir.format_registry, controldir.format_registry.make_bzrdir)]
         opts, args = self.parse(options, ['--format', 'knit'])
         self.assertIsInstance(opts.format.repository_format,
                               knitrepo.RepositoryFormatKnit1)
 
     def test_lazy_registry(self):
         options = [option.RegistryOption('format', '',
-                   lazy_registry=('bzrlib.bzrdir','format_registry'),
+                   lazy_registry=('bzrlib.controldir','format_registry'),
                    converter=str)]
         opts, args = self.parse(options, ['--format', 'knit'])
         self.assertEqual({'format': 'knit'}, opts)
 
=== modified file 'bzrlib/tests/test_permissions.py'
--- bzrlib/tests/test_permissions.py	2012-01-25 21:13:15 +0000
+++ bzrlib/tests/test_permissions.py	2012-03-06 18:30:24 +0000
@@ -35,7 +35,7 @@
 
 from bzrlib import urlutils
 from bzrlib.branch import Branch
-from bzrlib.bzrdir import BzrDir
+from bzrlib.controldir import ControlDir
 from bzrlib.tests import TestCaseWithTransport, TestSkipped
 from bzrlib.tests.test_sftp_transport import TestCaseWithSFTPServer
 from bzrlib.workingtree import WorkingTree
@@ -199,7 +199,7 @@
 
         os.mkdir('sftp')
         sftp_url = self.get_url('sftp')
-        b_sftp = BzrDir.create_branch_and_repo(sftp_url)
+        b_sftp = ControlDir.create_branch_and_repo(sftp_url)
 
         b_sftp.pull(b_local)
         del b_sftp
 
=== modified file 'bzrlib/tests/test_reconfigure.py'
--- bzrlib/tests/test_reconfigure.py	2012-01-18 14:09:19 +0000
+++ bzrlib/tests/test_reconfigure.py	2012-03-06 18:30:24 +0000
@@ -16,7 +16,7 @@
 
 from bzrlib import (
     branch as _mod_branch,
-    bzrdir,
+    controldir,
     errors,
     reconfigure,
     repository,
@@ -72,7 +72,7 @@
         checkout = branch.create_checkout('checkout')
         reconfiguration = reconfigure.Reconfigure.to_branch(checkout.bzrdir)
         reconfiguration.apply()
-        reconfigured = bzrdir.BzrDir.open('checkout').open_branch()
+        reconfigured = controldir.ControlDir.open('checkout').open_branch()
         self.assertIs(None, reconfigured.get_bound_location())
 
     def prepare_lightweight_checkout_to_branch(self):
@@ -445,7 +445,7 @@
             r"Requested reconfiguration of '.*' is not supported.")
 
     def test_lightweight_checkout_to_tree_preserves_reference_locations(self):
-        format = bzrdir.format_registry.make_bzrdir('1.9')
+        format = controldir.format_registry.make_bzrdir('1.9')
         format.set_branch_format(_mod_branch.BzrBranchFormat8())
         tree = self.make_branch_and_tree('tree', format=format)
         tree.branch.set_reference_info('file_id', 'path', '../location')
 
=== modified file 'bzrlib/tests/test_remote.py'
--- bzrlib/tests/test_remote.py	2012-02-18 16:55:04 +0000
+++ bzrlib/tests/test_remote.py	2012-03-06 18:30:24 +0000
@@ -349,11 +349,11 @@
 class TestRemote(tests.TestCaseWithMemoryTransport):
 
     def get_branch_format(self):
-        reference_bzrdir_format = bzrdir.format_registry.get('default')()
+        reference_bzrdir_format = controldir.format_registry.get('default')()
         return reference_bzrdir_format.get_branch_format()
 
     def get_repo_format(self):
-        reference_bzrdir_format = bzrdir.format_registry.get('default')()
+        reference_bzrdir_format = controldir.format_registry.get('default')()
         return reference_bzrdir_format.repository_format
 
     def assertFinished(self, fake_client):
@@ -475,7 +475,7 @@
         transport = transport.clone('quack')
         self.make_bzrdir('quack')
         client = FakeClient(transport.base)
-        reference_bzrdir_format = bzrdir.format_registry.get('default')()
+        reference_bzrdir_format = controldir.format_registry.get('default')()
         control_name = reference_bzrdir_format.network_name()
         client.add_expected_call(
             'BzrDir.cloning_metadir', ('quack/', 'False'),
@@ -509,7 +509,7 @@
     def test__get_checkout_format(self):
         transport = MemoryTransport()
         client = FakeClient(transport.base)
-        reference_bzrdir_format = bzrdir.format_registry.get('default')()
+        reference_bzrdir_format = controldir.format_registry.get('default')()
         control_name = reference_bzrdir_format.network_name()
         client.add_expected_call(
             'BzrDir.checkout_metadir', ('quack/', ),
@@ -546,7 +546,7 @@
     def test_get_branches(self):
         transport = MemoryTransport()
         client = FakeClient(transport.base)
-        reference_bzrdir_format = bzrdir.format_registry.get('default')()
+        reference_bzrdir_format = controldir.format_registry.get('default')()
         branch_name = reference_bzrdir_format.get_branch_format().network_name()
         client.add_success_response_with_body(
             bencode.bencode({
@@ -854,7 +854,7 @@
         transport = transport.clone('quack')
         self.make_repository('quack')
         client = FakeClient(transport.base)
-        reference_bzrdir_format = bzrdir.format_registry.get('default')()
+        reference_bzrdir_format = controldir.format_registry.get('default')()
         reference_format = reference_bzrdir_format.get_branch_format()
         network_name = reference_format.network_name()
         reference_repo_fmt = reference_bzrdir_format.repository_format
@@ -882,7 +882,7 @@
         # Client's medium rooted a transport root (not at the bzrdir)
         client = FakeClient(transport.base)
         transport = transport.clone('quack')
-        reference_bzrdir_format = bzrdir.format_registry.get('default')()
+        reference_bzrdir_format = controldir.format_registry.get('default')()
         reference_format = reference_bzrdir_format.get_branch_format()
         network_name = reference_format.network_name()
         reference_repo_fmt = reference_bzrdir_format.repository_format
@@ -918,7 +918,7 @@
         transport = transport.clone('quack')
         self.make_bzrdir('quack')
         client = FakeClient(transport.base)
-        reference_bzrdir_format = bzrdir.format_registry.get('default')()
+        reference_bzrdir_format = controldir.format_registry.get('default')()
         reference_format = reference_bzrdir_format.repository_format
         network_name = reference_format.network_name()
         client.add_expected_call(
@@ -3964,7 +3964,7 @@
         :result: The revision ids in the stream, in the order seen,
             the topological order of revisions in the source.
         """
-        unordered_format = bzrdir.format_registry.get(format)()
+        unordered_format = controldir.format_registry.get(format)()
         target_repository_format = unordered_format.repository_format
         # Cross check
         self.assertEqual(order, target_repository_format._fetch_order)
@@ -4273,7 +4273,7 @@
     def test_single_empty(self):
         transport_path = 'quack'
         repo, client = self.setup_fake_client_and_repository(transport_path)
-        fmt = bzrdir.format_registry.get('2a')().repository_format
+        fmt = controldir.format_registry.get('2a')().repository_format
         repo._format = fmt
         stream = [('inventory-deltas', [
             versionedfile.FulltextContentFactory('somerevid', None, None,
 
=== modified file 'bzrlib/tests/test_repository.py'
--- bzrlib/tests/test_repository.py	2012-01-24 16:19:04 +0000
+++ bzrlib/tests/test_repository.py	2012-03-06 18:30:24 +0000
@@ -45,6 +45,7 @@
     )
 from bzrlib import (
     bzrdir,
+    controldir,
     errors,
     inventory,
     osutils,
@@ -66,7 +67,7 @@
 class TestDefaultFormat(TestCase):
 
     def test_get_set_default_format(self):
-        old_default = bzrdir.format_registry.get('default')
+        old_default = controldir.format_registry.get('default')
         private_default = old_default().repository_format.__class__
         old_format = repository.format_registry.get_default()
         self.assertTrue(isinstance(old_format, private_default))
@@ -74,9 +75,9 @@
             my_bzrdir = bzrdir.BzrDirMetaFormat1()
             my_bzrdir.repository_format = SampleRepositoryFormat()
             return my_bzrdir
-        bzrdir.format_registry.remove('default')
-        bzrdir.format_registry.register('sample', make_sample_bzrdir, '')
-        bzrdir.format_registry.set_default('sample')
+        controldir.format_registry.remove('default')
+        controldir.format_registry.register('sample', make_sample_bzrdir, '')
+        controldir.format_registry.set_default('sample')
         # creating a repository should now create an instrumented dir.
         try:
             # the default branch format is used by the meta dir format
@@ -85,9 +86,9 @@
             result = dir.create_repository()
             self.assertEqual(result, 'A bzr repository dir')
         finally:
-            bzrdir.format_registry.remove('default')
-            bzrdir.format_registry.remove('sample')
-            bzrdir.format_registry.register('default', old_default, '')
+            controldir.format_registry.remove('default')
+            controldir.format_registry.remove('sample')
+            controldir.format_registry.register('default', old_default, '')
         self.assertIsInstance(repository.format_registry.get_default(),
                               old_format.__class__)
 
@@ -236,13 +237,13 @@
     def test_attribute__fetch_order(self):
         """Knits need topological data insertion."""
         repo = self.make_repository('.',
-                format=bzrdir.format_registry.get('knit')())
+                format=controldir.format_registry.get('knit')())
         self.assertEqual('topological', repo._format._fetch_order)
 
     def test_attribute__fetch_uses_deltas(self):
         """Knits reuse deltas."""
         repo = self.make_repository('.',
-                format=bzrdir.format_registry.get('knit')())
+                format=controldir.format_registry.get('knit')())
         self.assertEqual(True, repo._format._fetch_uses_deltas)
 
     def test_disk_layout(self):
@@ -334,7 +335,7 @@
         is valid when the api is not being abused.
         """
         repo = self.make_repository('.',
-                format=bzrdir.format_registry.get('knit')())
+                format=controldir.format_registry.get('knit')())
         inv_xml = '<inventory format="5">\n</inventory>\n'
         inv = repo._deserialise_inventory('test-rev-id', inv_xml)
         self.assertEqual('test-rev-id', inv.root.revision)
@@ -342,7 +343,7 @@
     def test_deserialise_uses_global_revision_id(self):
         """If it is set, then we re-use the global revision id"""
         repo = self.make_repository('.',
-                format=bzrdir.format_registry.get('knit')())
+                format=controldir.format_registry.get('knit')())
         inv_xml = ('<inventory format="5" revision_id="other-rev-id">\n'
                    '</inventory>\n')
         # Arguably, the deserialise_inventory should detect a mismatch, and
@@ -355,7 +356,7 @@
 
     def test_supports_external_lookups(self):
         repo = self.make_repository('.',
-                format=bzrdir.format_registry.get('knit')())
+                format=controldir.format_registry.get('knit')())
         self.assertFalse(repo._format.supports_external_lookups)
 
 
@@ -994,7 +995,7 @@
 class TestRepositoryPackCollection(TestCaseWithTransport):
 
     def get_format(self):
-        return bzrdir.format_registry.make_bzrdir('pack-0.92')
+        return controldir.format_registry.make_bzrdir('pack-0.92')
 
     def get_packs(self):
         format = self.get_format()
 
=== modified file 'bzrlib/tests/test_selftest.py'
--- bzrlib/tests/test_selftest.py	2011-11-08 17:07:23 +0000
+++ bzrlib/tests/test_selftest.py	2012-03-06 18:30:24 +0000
@@ -43,6 +43,7 @@
 from bzrlib import (
     branchbuilder,
     bzrdir,
+    controldir,
     errors,
     hooks,
     lockdir,
@@ -609,7 +610,7 @@
         # Guard against regression into MemoryTransport leaking
         # files to disk instead of keeping them in memory.
         self.assertFalse(osutils.lexists('dir'))
-        dir_format = bzrdir.format_registry.make_bzrdir('knit')
+        dir_format = controldir.format_registry.make_bzrdir('knit')
         self.assertEqual(dir_format.repository_format.__class__,
                          the_branch.repository._format.__class__)
         self.assertEqual('Bazaar-NG Knit Repository Format 1',
@@ -678,7 +679,7 @@
         builder = self.make_branch_builder('dir')
         rev_id = builder.build_commit()
         self.assertPathExists('dir')
-        a_dir = bzrdir.BzrDir.open('dir')
+        a_dir = controldir.ControlDir.open('dir')
         self.assertRaises(errors.NoWorkingTree, a_dir.open_workingtree)
         a_branch = a_dir.open_branch()
         builder_branch = builder.get_branch()
@@ -1477,13 +1478,13 @@
         transport_server.start_server()
         self.addCleanup(transport_server.stop_server)
         t = transport.get_transport_from_url(transport_server.get_url())
-        bzrdir.BzrDir.create(t.base)
+        controldir.ControlDir.create(t.base)
         self.assertRaises(errors.BzrError,
-            bzrdir.BzrDir.open_from_transport, t)
+            controldir.ControlDir.open_from_transport, t)
         # But if we declare this as safe, we can open the bzrdir.
         self.permit_url(t.base)
         self._bzr_selftest_roots.append(t.base)
-        bzrdir.BzrDir.open_from_transport(t)
+        controldir.ControlDir.open_from_transport(t)
 
     def test_requireFeature_available(self):
         """self.requireFeature(available) is a no-op."""
@@ -1943,7 +1944,7 @@
     def test_make_branch_and_tree_with_format(self):
         # we should be able to supply a format to make_branch_and_tree
         self.make_branch_and_tree('a', format=bzrlib.bzrdir.BzrDirMetaFormat1())
-        self.assertIsInstance(bzrlib.bzrdir.BzrDir.open('a')._format,
+        self.assertIsInstance(bzrlib.controldir.ControlDir.open('a')._format,
                               bzrlib.bzrdir.BzrDirMetaFormat1)
 
     def test_make_branch_and_memory_tree(self):
 
=== modified file 'bzrlib/tests/test_sftp_transport.py'
--- bzrlib/tests/test_sftp_transport.py	2012-01-25 21:13:15 +0000
+++ bzrlib/tests/test_sftp_transport.py	2012-03-06 18:30:24 +0000
@@ -21,8 +21,8 @@
 import time
 
 from bzrlib import (
-    bzrdir,
     config,
+    controldir,
     errors,
     tests,
     transport as _mod_transport,
@@ -191,12 +191,12 @@
 
     def test_push_support(self):
         self.build_tree(['a/', 'a/foo'])
-        t = bzrdir.BzrDir.create_standalone_workingtree('a')
+        t = controldir.ControlDir.create_standalone_workingtree('a')
         b = t.branch
         t.add('foo')
         t.commit('foo', rev_id='a1')
 
-        b2 = bzrdir.BzrDir.create_branch_and_repo(self.get_url('/b'))
+        b2 = controldir.ControlDir.create_branch_and_repo(self.get_url('/b'))
         b2.pull(b)
 
         self.assertEquals(b2.last_revision(), 'a1')
 
=== modified file 'bzrlib/tests/test_smart.py'
--- bzrlib/tests/test_smart.py	2012-02-14 17:22:37 +0000
+++ bzrlib/tests/test_smart.py	2012-03-06 18:30:24 +0000
@@ -30,7 +30,7 @@
 from bzrlib import (
     bencode,
     branch as _mod_branch,
-    bzrdir,
+    controldir,
     errors,
     gpg,
     inventory_delta,
@@ -121,7 +121,7 @@
         stream = [('text', [versionedfile.FulltextContentFactory(('k1',), None,
             None, 'foo')]),('text', [
             versionedfile.FulltextContentFactory(('k2',), None, None, 'bar')])]
-        fmt = bzrdir.format_registry.get('pack-0.92')().repository_format
+        fmt = controldir.format_registry.get('pack-0.92')().repository_format
         bytes = smart_repo._stream_to_byte_stream(stream, fmt)
         streams = []
         # Iterate the resulting iterable; checking that we get only one stream
@@ -333,7 +333,7 @@
         self.make_bzrdir('.')
         request_class = smart_dir.SmartServerRequestCreateRepository
         request = request_class(backing)
-        reference_bzrdir_format = bzrdir.format_registry.get('pack-0.92')()
+        reference_bzrdir_format = controldir.format_registry.get('pack-0.92')()
         reference_format = reference_bzrdir_format.repository_format
         network_name = reference_format.network_name()
         expected = smart_req.SuccessfulSmartServerResponse(
@@ -493,7 +493,7 @@
         request = smart_dir.SmartServerRequestInitializeBzrDir(backing)
         self.assertEqual(smart_req.SmartServerResponse(('ok', )),
             request.execute(''))
-        made_dir = bzrdir.BzrDir.open_from_transport(backing)
+        made_dir = controldir.ControlDir.open_from_transport(backing)
         # no branch, tree or repository is expected with the current
         # default formart.
         self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
@@ -533,7 +533,7 @@
                                            'False', '', '', '')),
             request.execute(name, '', 'True', 'False', 'False', '', '', '', '',
                             'False'))
-        made_dir = bzrdir.BzrDir.open_from_transport(backing)
+        made_dir = controldir.ControlDir.open_from_transport(backing)
         # no branch, tree or repository is expected with the current
         # default format.
         self.assertRaises(errors.NoWorkingTree, made_dir.open_workingtree)
@@ -2691,7 +2691,7 @@
             versionedfile.FulltextContentFactory('somerev', None, None,
                 self._get_serialized_inventory_delta(
                     t.branch.repository, 'null:', 'somerev'))])]
-        fmt = bzrdir.format_registry.get('2a')().repository_format
+        fmt = controldir.format_registry.get('2a')().repository_format
         self.assertEquals(
             "".join(response.body_stream),
             "".join(smart_repo._stream_to_byte_stream(stream, fmt)))
 
=== modified file 'bzrlib/tests/test_smart_transport.py'
--- bzrlib/tests/test_smart_transport.py	2011-11-25 17:54:52 +0000
+++ bzrlib/tests/test_smart_transport.py	2012-03-06 18:30:24 +0000
@@ -32,6 +32,7 @@
 import bzrlib
 from bzrlib import (
         bzrdir,
+        controldir,
         debug,
         errors,
         osutils,
@@ -1628,7 +1629,8 @@
         transport = self.transport
         t = self.backing_transport
         bzrdir.BzrDirFormat.get_default_format().initialize_on_transport(t)
-        result_dir = bzrdir.BzrDir.open_containing_from_transport(transport)
+        result_dir = controldir.ControlDir.open_containing_from_transport(
+            transport)
 
 
 class ReadOnlyEndToEndTests(SmartTCPTests):
 
=== modified file 'bzrlib/tests/test_tag.py'
--- bzrlib/tests/test_tag.py	2011-09-22 13:26:14 +0000
+++ bzrlib/tests/test_tag.py	2012-03-06 18:30:24 +0000
@@ -18,7 +18,7 @@
 
 
 from bzrlib import (
-    bzrdir,
+    controldir,
     errors,
     )
 from bzrlib.tag import (
@@ -69,8 +69,8 @@
 class TestTagMerging(TestCaseWithTransport):
 
     def make_knit_branch(self, relpath):
-        old_bdf = bzrdir.format_registry.make_bzrdir('knit')
-        return bzrdir.BzrDir.create_branch_convenience(relpath, format=old_bdf)
+        old_bdf = controldir.format_registry.make_bzrdir('knit')
+        return controldir.ControlDir.create_branch_convenience(relpath, format=old_bdf)
 
     def make_branch_supporting_tags(self, relpath):
         return self.make_branch(relpath, format='dirstate-tags')
 
=== modified file 'bzrlib/tests/test_transform.py'
--- bzrlib/tests/test_transform.py	2012-02-06 23:38:33 +0000
+++ bzrlib/tests/test_transform.py	2012-03-06 18:30:24 +0000
@@ -34,7 +34,6 @@
     transform,
     urlutils,
     )
-from bzrlib.bzrdir import BzrDir
 from bzrlib.conflicts import (
     DeletingParent,
     DuplicateEntry,
@@ -44,6 +43,7 @@
     ParentLoop,
     UnversionedParent,
 )
+from bzrlib.controldir import ControlDir
 from bzrlib.diff import show_diff_trees
 from bzrlib.errors import (
     DuplicateKey,
@@ -1645,7 +1645,7 @@
     def __init__(self, dirname, root_id):
         self.name = dirname
         os.mkdir(dirname)
-        self.wt = BzrDir.create_standalone_workingtree(dirname)
+        self.wt = ControlDir.create_standalone_workingtree(dirname)
         self.wt.set_root_id(root_id)
         self.b = self.wt.branch
         self.tt = TreeTransform(self.wt)
@@ -1881,13 +1881,13 @@
     def test_build_tree_with_symlinks(self):
         self.requireFeature(SymlinkFeature)
         os.mkdir('a')
-        a = BzrDir.create_standalone_workingtree('a')
+        a = ControlDir.create_standalone_workingtree('a')
         os.mkdir('a/foo')
         with file('a/foo/bar', 'wb') as f: f.write('contents')
         os.symlink('a/foo/bar', 'a/foo/baz')
         a.add(['foo', 'foo/bar', 'foo/baz'])
         a.commit('initial commit')
-        b = BzrDir.create_standalone_workingtree('b')
+        b = ControlDir.create_standalone_workingtree('b')
         basis = a.basis_tree()
         basis.lock_read()
         self.addCleanup(basis.unlock)
 
=== modified file 'bzrlib/tests/test_upgrade.py'
--- bzrlib/tests/test_upgrade.py	2012-01-04 17:12:42 +0000
+++ bzrlib/tests/test_upgrade.py	2012-03-06 18:30:24 +0000
@@ -24,7 +24,7 @@
 
 from bzrlib import (
     branch,
-    bzrdir,
+    controldir,
     tests,
     upgrade,
     workingtree,
@@ -45,7 +45,7 @@
         b.set_parent('file:///EF')
         b.set_bound_location('file:///GH')
         b.set_push_location('file:///IJ')
-        target = bzrdir.format_registry.make_bzrdir('dirstate-with-subtree')
+        target = controldir.format_registry.make_bzrdir('dirstate-with-subtree')
         converter = b.bzrdir._format.get_converter(target)
         converter.convert(b.bzrdir, None)
         new_branch = branch.Branch.open(self.get_url('branch'))
@@ -64,7 +64,7 @@
 
     def test_convert_branch7_branch8(self):
         b = self.make_branch('branch', format='1.9')
-        target = bzrdir.format_registry.make_bzrdir('1.9')
+        target = controldir.format_registry.make_bzrdir('1.9')
         target.set_branch_format(branch.BzrBranchFormat8())
         converter = b.bzrdir._format.get_converter(target)
         converter.convert(b.bzrdir, None)
@@ -75,7 +75,7 @@
     def test_convert_knit_dirstate_empty(self):
         # test that asking for an upgrade from knit to dirstate works.
         tree = self.make_branch_and_tree('tree', format='knit')
-        target = bzrdir.format_registry.make_bzrdir('dirstate')
+        target = controldir.format_registry.make_bzrdir('dirstate')
         converter = tree.bzrdir._format.get_converter(target)
         converter.convert(tree.bzrdir, None)
         new_tree = workingtree.WorkingTree.open('tree')
@@ -88,7 +88,7 @@
         tree = self.make_branch_and_tree('tree', format='knit')
         self.build_tree(['tree/file'])
         tree.add(['file'], ['file-id'])
-        target = bzrdir.format_registry.make_bzrdir('dirstate')
+        target = controldir.format_registry.make_bzrdir('dirstate')
         converter = tree.bzrdir._format.get_converter(target)
         converter.convert(tree.bzrdir, None)
         new_tree = workingtree.WorkingTree.open('tree')
@@ -99,7 +99,7 @@
         # test that asking for an upgrade from knit to dirstate works.
         tree = self.make_branch_and_tree('tree', format='knit')
         rev_id = tree.commit('first post')
-        target = bzrdir.format_registry.make_bzrdir('dirstate')
+        target = controldir.format_registry.make_bzrdir('dirstate')
         converter = tree.bzrdir._format.get_converter(target)
         converter.convert(tree.bzrdir, None)
         new_tree = workingtree.WorkingTree.open('tree')
@@ -116,7 +116,7 @@
         rev_id2 = tree.commit('second post')
         rev_id3 = merge_tree.commit('second merge post')
         tree.merge_from_branch(merge_tree.branch)
-        target = bzrdir.format_registry.make_bzrdir('dirstate')
+        target = controldir.format_registry.make_bzrdir('dirstate')
         converter = tree.bzrdir._format.get_converter(target)
         converter.convert(tree.bzrdir, None)
         new_tree = workingtree.WorkingTree.open('tree')
@@ -130,8 +130,8 @@
 
 class TestSmartUpgrade(tests.TestCaseWithTransport):
 
-    from_format = bzrdir.format_registry.make_bzrdir("pack-0.92")
-    to_format = bzrdir.format_registry.make_bzrdir("2a")
+    from_format = controldir.format_registry.make_bzrdir("pack-0.92")
+    to_format = controldir.format_registry.make_bzrdir("2a")
 
     def make_standalone_branch(self):
         wt = self.make_branch_and_tree("branch1", format=self.from_format)
@@ -170,9 +170,9 @@
             format=self.from_format)
         # Note: self.make_branch() always creates a new repo at the location
         # so we need to avoid using that here ...
-        b1 = bzrdir.BzrDir.create_branch_convenience("repo/branch1",
+        b1 = controldir.ControlDir.create_branch_convenience("repo/branch1",
             format=self.from_format)
-        b2 = bzrdir.BzrDir.create_branch_convenience("repo/branch2",
+        b2 = controldir.ControlDir.create_branch_convenience("repo/branch2",
             format=self.from_format)
         return repo.bzrdir
 
 
=== modified file 'bzrlib/tests/test_upgrade_stacked.py'
--- bzrlib/tests/test_upgrade_stacked.py	2011-01-10 22:20:12 +0000
+++ bzrlib/tests/test_upgrade_stacked.py	2012-03-06 18:30:24 +0000
@@ -18,7 +18,7 @@
 """Tests for upgrades of various stacking situations."""
 
 from bzrlib import (
-    bzrdir,
+    controldir,
     check,
     errors,
     tests,
@@ -71,7 +71,7 @@
         self.assertTrue(stacked.open_branch().get_stacked_on_url())
         # now we'll upgrade the underlying branch, then upgrade the stacked
         # branch, and this should still work.
-        new_format = bzrdir.format_registry.make_bzrdir(
+        new_format = controldir.format_registry.make_bzrdir(
             self.scenario_new_format)
         upgrade('base', new_format)
         # in some cases you'll get an error if the underlying model has
@@ -81,10 +81,10 @@
                 stacked.open_branch)
         else:
             check.check_dwim('stacked', False, True, True)
-        stacked = bzrdir.BzrDir.open('stacked')
+        stacked = controldir.ControlDir.open('stacked')
         # but we can upgrade the stacked repository
         upgrade('stacked', new_format)
         # and now it opens ok
-        stacked = bzrdir.BzrDir.open('stacked')
+        stacked = controldir.ControlDir.open('stacked')
         # And passes check.
         check.check_dwim('stacked', False, True, True)
 
=== modified file 'bzrlib/tests/test_url_policy_open.py'
--- bzrlib/tests/test_url_policy_open.py	2012-01-19 00:51:24 +0000
+++ bzrlib/tests/test_url_policy_open.py	2012-03-06 18:30:24 +0000
@@ -22,10 +22,12 @@
     BranchReferenceFormat,
     )
 from bzrlib.bzrdir import (
-    BzrDir,
     BzrProber,
     )
-from bzrlib.controldir import ControlDirFormat
+from bzrlib.controldir import (
+    ControlDir,
+    ControlDirFormat,
+    )
 from bzrlib.errors import NotBranchError
 from bzrlib.url_policy_open import (
     BadUrl,
@@ -182,9 +184,9 @@
         self.assertRaises(NotBranchError, opener.open, ".")
         self.assertEquals(1, len(TrackingProber.seen_urls))
         TrackingProber.seen_urls = []
-        # And make sure it's registered in such a way that BzrDir.open would
+        # And make sure it's registered in such a way that ControlDir.open would
         # use it.
-        self.assertRaises(NotBranchError, BzrDir.open, ".")
+        self.assertRaises(NotBranchError, ControlDir.open, ".")
         self.assertEquals(1, len(TrackingProber.seen_urls))
 
     def test_allowed_url(self):
 
=== modified file 'bzrlib/workingtree_4.py'
--- bzrlib/workingtree_4.py	2012-02-06 23:38:33 +0000
+++ bzrlib/workingtree_4.py	2012-03-06 18:30:24 +0000
@@ -38,6 +38,7 @@
     cache_utf8,
     config,
     conflicts as _mod_conflicts,
+    controldir,
     debug,
     dirstate,
     errors,
@@ -1608,7 +1609,7 @@
     def _get_matchingbzrdir(self):
         """Overrideable method to get a bzrdir for testing."""
         # please test against something that will let us do tree references
-        return bzrdir.format_registry.make_bzrdir(
+        return controldir.format_registry.make_bzrdir(
             'development-subtree')
 
     _matchingbzrdir = property(__get_matchingbzrdir)