Merge lp:~jelmer/bzr-loom/default-format into lp:bzr-loom
Proposed by
Jelmer Vernooij
Status: | Merged |
---|---|
Approved by: | Vincent Ladeuil |
Approved revision: | no longer in the source branch. |
Merged at revision: | 128 |
Proposed branch: | lp:~jelmer/bzr-loom/default-format |
Merge into: | lp:bzr-loom |
Diff against target: |
22 lines (+8/-4) 1 file modified
branch.py (+8/-4) |
To merge this branch: | bzr merge lp:~jelmer/bzr-loom/default-format |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Vincent Ladeuil | Approve | ||
Review via email: mp+50927@code.launchpad.net |
Commit message
Use bzrlib.
Description of the change
Use the new public method to get the default format, if available.
To post a comment you must log in.
Err, wait, there is an additional tweak required:
=== modified file 'formats.py'
branch. BzrBranchLoomFo rmat6() ,
branch. BzrBranchLoomFo rmat7() , branch. BranchFormat. register_ format, branch_formats) _mod_branch, 'format_registry') registry. register BranchFormat. register_ format
--- formats.py 2010-06-18 04:44:52 +0000
+++ formats.py 2011-02-23 15:54:08 +0000
@@ -54,7 +54,13 @@
]
- map(_mod_
+ try:
+ format_registry = getattr(
+ register = format_
+ except AttributeError: # bzr < 2.4
+ register = _mod_branch.
+
+ map(register, branch_formats)
I'll add it and land.
@jelmer: You intend to deploy the lazy registration for plugins later right ?