[MERGE] Branch6 mark II

[Martin Pool]

Martin Pool has voted +1.
Status is now: Approved
Comment:

> @@ -1439,6 +1445,20 @@
>
>      _lock_class = lockdir.LockDir
>
> +    def __init__(self):
> +        self._branch_format = None
> +
> +    def _get_branch_format(self):
> +        if self._branch_format is None:
> +            from bzrlib.branch import BranchFormat
> +            self._branch_format = BranchFormat.get_default_format()
> +        return self._branch_format
> +
> +    def _set_branch_format(self, format):
> +        self._branch_format = format
> +
> +    branch_format = property(_get_branch_format, _set_branch_format)
> +
>      def get_converter(self, format=None):
>          """See BzrDirFormat.get_converter()."""
>          if format is None:

Does this need to be a property rather than either get/set methods or a 
simple public field, initialized from the constructor?

> @@ -1458,6 +1478,8 @@
>
>      def _open(self, transport):
>          """See BzrDirFormat._open."""
> +        from bzrlib.repository import RepositoryFormat
> +        from bzrlib.branch import BranchFormat
>          return BzrDirMeta1(transport, self)
>

Seems unnecessary.


For details, see: 
http://bundlebuggy.aaronbentley.com/request/%3C45D3725E.8080908%40utoronto.ca%3E