Merge lp:~jelmer/bzr-builddeb/register-lazy into lp:bzr-builddeb

[Jelmer Vernooij]

Use lazy registries if supported (introduced in bzr 2.6)

[James Westby (james-w)]

review: Approve

=== modified file '__init__.py'
--- __init__.py	2012-03-02 16:19:53 +0000
+++ __init__.py	2012-03-29 13:16:18 +0000
@@ -29,10 +29,6 @@
 
 import bzrlib
 from bzrlib.commands import plugin_cmds
-from bzrlib.directory_service import (
-    AliasDirectory,
-    directories,
-    )
 
 from bzrlib.plugins.builddeb.info import (
     bzr_plugin_version as version_info,
@@ -78,23 +74,60 @@
 default_result_dir = '..'
 
 
-directories.register_lazy("apt:", 'bzrlib.plugins.builddeb.directory',
-        'VcsDirectory',
-        "Directory that uses Debian Vcs-* control fields to look up branches")
-
-branch_aliases = getattr(AliasDirectory, "branch_aliases", None)
-if branch_aliases is not None:
-    def upstream_branch_alias(b):
-        from bzrlib.plugins.builddeb.util import debuild_config
-        b.lock_read()
-        try:
-            tree = b.basis_tree()
-            config = debuild_config(tree, False)
-            return directories.dereference(config.upstream_branch)
-        finally:
-            b.unlock()
-    branch_aliases.register("upstream", upstream_branch_alias,
-        help="upstream branch (for packaging branches)")
+try:
+    from bzrlib.registry import register_lazy
+except ImportError:
+    from bzrlib.directory_service import (
+        AliasDirectory,
+        directories,
+        )
+
+    directories.register_lazy("apt:", 'bzrlib.plugins.builddeb.directory',
+            'VcsDirectory',
+            "Directory that uses Debian Vcs-* control fields to look up branches")
+
+    branch_aliases = getattr(AliasDirectory, "branch_aliases", None)
+    if branch_aliases is not None:
+        branch_aliases.register_lazy("upstream",
+                "bzrlib.plugins.builddeb.directory", "upstream_branch_alias",
+                help="upstream branch (for packaging branches)")
+
+    try:
+        from bzrlib.tag import tag_sort_methods
+    except ImportError:
+        pass # bzr tags --sort= can not be extended
+    else:
+        tag_sort_methods.register_lazy("debversion",
+            "bzrlib.plugins.builddeb.tagging", "sort_debversion",
+            "Sort like Debian versions.")
+
+    try:
+        from bzrlib.revisionspec import revspec_registry
+        revspec_registry.register_lazy("package:",
+            "bzrlib.plugins.builddeb.revspec", "RevisionSpec_package")
+        revspec_registry.register_lazy("upstream:",
+            "bzrlib.plugins.builddeb.revspec", "RevisionSpec_upstream")
+    except ImportError:
+        from bzrlib.revisionspec import SPEC_TYPES
+        from bzrlib.plugins.builddeb.revspec import (
+            RevisionSpec_package,
+            RevisionSpec_upstream,
+            )
+        SPEC_TYPES.extend([RevisionSpec_package, RevisionSpec_upstream])
+else:
+    register_lazy("bzrlib.directory", "directories", "apt:",
+            'bzrlib.plugins.builddeb.directory', 'VcsDirectory',
+            help="Directory that uses Debian Vcs-* control fields to look up branches")
+    register_lazy("bzrlib.directory", "AliasDirectory.branch_aliases", "upstream",
+            "bzrlib.plugins.builddeb.directory", "upstream_branch_alias",
+            help="upstream branch (for packaging branches)")
+    register_lazy("bzrlib.tag", "tag_sort_methods", "debversion",
+        "bzrlib.plugins.builddeb.tagging", "sort_debversion",
+        "Sort like Debian versions.")
+    register_lazy("bzrlib.revisionspec", "revspec_registry", "package:",
+        "bzrlib.plugins.builddeb.revspec", "RevisionSpec_package")
+    register_lazy("bzrlib.revisionspec", "revspec_registry", "upstream:",
+        "bzrlib.plugins.builddeb.revspec", "RevisionSpec_upstream")
 
 
 def debian_changelog_commit_message(commit, start_message):
@@ -382,29 +415,5 @@
         "start_commit", start_commit_check_quilt,
         "Check for (un)applied quilt patches")
 
-try:
-    from bzrlib.revisionspec import revspec_registry
-    revspec_registry.register_lazy("package:",
-        "bzrlib.plugins.builddeb.revspec", "RevisionSpec_package")
-    revspec_registry.register_lazy("upstream:",
-        "bzrlib.plugins.builddeb.revspec", "RevisionSpec_upstream")
-except ImportError:
-    from bzrlib.revisionspec import SPEC_TYPES
-    from bzrlib.plugins.builddeb.revspec import (
-        RevisionSpec_package,
-        RevisionSpec_upstream,
-        )
-    SPEC_TYPES.extend([RevisionSpec_package, RevisionSpec_upstream])
-
-try:
-    from bzrlib.tag import tag_sort_methods
-except ImportError:
-    pass # bzr tags --sort= can not be extended
-else:
-    tag_sort_methods.register_lazy("debversion",
-        "bzrlib.plugins.builddeb.tagging", "sort_debversion",
-        "Sort like Debian versions.")
-
-
 def load_tests(standard_tests, module, loader):
     return loader.loadTestsFromModuleNames(['bzrlib.plugins.builddeb.tests'])

=== modified file 'directory.py'
--- directory.py	2011-10-21 08:46:23 +0000
+++ directory.py	2012-03-29 13:16:18 +0000
@@ -108,3 +108,16 @@
 
         raise errors.InvalidURL(path=url,
             extra='unsupported VCSes %r found' % urls[version].keys())
+
+
+def upstream_branch_alias(b):
+    from bzrlib.directory_service import directories
+    from bzrlib.plugins.builddeb.util import debuild_config
+    b.lock_read()
+    try:
+        tree = b.basis_tree()
+        config = debuild_config(tree, False)
+        return directories.dereference(config.upstream_branch)
+    finally:
+        b.unlock()
+