[MERGE] Branch6 mark II

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Martin Pool wrote:
>> +    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
>
> Does this need to be a property rather than either get/set methods or a
> simple public field, initialized from the constructor?

No, I was just imitating the example of
BzrDirMetaFormat1.repository_format.  They cannot be initialized at
construction time, because that would introduce circular dependencies.
But I will change it to getter/setter.

>> @@ -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.

Agreed.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFF1Ggl0F+nu1YWqI0RAtS2AKCHDc76eKdF+SBBvTvYIKkPa+ajJwCfXcm4
pUuSYD1FnxlbfgSVp3pUAhQ=
=/cZ5
-----END PGP SIGNATURE-----