Merge lp:~jelmer/bzr-loom/default-format into lp:bzr-loom

[Jelmer Vernooij]

Use bzrlib.branch.format_registry.get_default(), if available.

Use the new public method to get the default format, if available.

[Vincent Ladeuil (vila)]

review: Approve

[lp:~jelmer/bzr-loom/default-format]

128. By Jelmer Vernooij on 2011-02-23

Merge use of default branch format method, if available.

[Vincent Ladeuil (vila)]

Err, wait, there is an additional tweak required:

=== modified file 'formats.py'
--- formats.py 2010-06-18 04:44:52 +0000
+++ formats.py 2011-02-23 15:54:08 +0000
@@ -54,7 +54,13 @@
             branch.BzrBranchLoomFormat6(),
             branch.BzrBranchLoomFormat7(),
             ]
- map(_mod_branch.BranchFormat.register_format, branch_formats)
+ try:
+ format_registry = getattr(_mod_branch, 'format_registry')
+ register = format_registry.register
+ except AttributeError: # bzr < 2.4
+ register = _mod_branch.BranchFormat.register_format
+
+ map(register, branch_formats)

I'll add it and land.

@jelmer: You intend to deploy the lazy registration for plugins later right ?

=== modified file 'branch.py'
--- branch.py	2010-12-16 01:32:05 +0000
+++ branch.py	2011-02-23 14:13:00 +0000
@@ -911,11 +911,15 @@
 
     @classmethod
     def _get_branch_formats_to_test(klass):
+        try:
+            format_registry = getattr(bzrlib.branch, "format_registry")
+        except AttributeError: # bzr < 2.4
+            default_format = bzrlib.branch.BranchFormat._default_format
+        else:
+            default_format = format_registry.get_default()
         return [
-            (bzrlib.branch.BranchFormat._default_format,
-             BzrBranchLoomFormat7()),
-            (BzrBranchLoomFormat7(),
-             bzrlib.branch.BranchFormat._default_format),
+            (default_format, BzrBranchLoomFormat7()),
+            (BzrBranchLoomFormat7(), default_format),
             (BzrBranchLoomFormat7(), BzrBranchLoomFormat7()),
             ]