Merge lp:~jelmer/bzr-builddeb/defer-imports into lp:bzr-builddeb

[Jelmer Vernooij]

Defer imports in cmds - this helps speed up commands like "bzr bash-completion", which iterate over all commands.

[James Westby (james-w)]

review: Approve

=== modified file 'cmds.py'
--- cmds.py	2011-12-16 14:55:04 +0000
+++ cmds.py	2012-01-02 17:08:23 +0000
@@ -21,18 +21,9 @@
 #    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 #
 
-import commands
 import os
 import shutil
-import subprocess
 import tempfile
-import urlparse
-
-try:
-    from debian.changelog import Version
-except ImportError:
-    # Prior to 0.1.15 the debian module was called debian_bundle
-    from debian_bundle.changelog import Version
 
 from bzrlib import (
     urlutils,
@@ -61,32 +52,8 @@
     BUILD_TYPE_NATIVE,
     BUILD_TYPE_SPLIT,
     )
-from bzrlib.plugins.builddeb.errors import (
-    BuildFailedError,
-    DchError,
-    MissingChangelogError,
-    NoPreviousUpload,
-    PackageVersionNotPresent,
-    StrictBuildFailed,
-    )
-from bzrlib.plugins.builddeb.hooks import run_hook
 from bzrlib.plugins.builddeb.util import (
-    FORMAT_3_0_QUILT,
-    FORMAT_3_0_NATIVE,
-    component_from_orig_tarball,
     debuild_config,
-    dget_changes,
-    find_changelog,
-    find_last_distribution,
-    find_previous_upload,
-    get_source_format,
-    guess_build_type,
-    lookup_distribution,
-    md5sum_filename,
-    open_file,
-    open_file_via_transport,
-    tarball_name,
-    tree_contains_upstream_source,
     )
 
 dont_purge_opt = Option('dont-purge',
@@ -189,6 +156,7 @@
         result_compat_opt, package_merge_opt]
 
     def _get_tree_and_branch(self, location):
+        import urlparse
         if location is None:
             location = "."
         is_local = urlparse.urlsplit(location)[0] in ('', 'file')
@@ -298,12 +266,18 @@
             quick=False, reuse=False, native=None,
             source=False, revision=None, result=None, package_merge=None,
             strict=False):
+        import commands
         from bzrlib.plugins.builddeb.source_distiller import (
                 FullSourceDistiller,
                 MergeModeDistiller,
                 NativeSourceDistiller,
                 )
         from bzrlib.plugins.builddeb.builder import DebBuild
+        from bzrlib.plugins.builddeb.errors import (
+            NoPreviousUpload,
+            StrictBuildFailed
+            )
+        from bzrlib.plugins.builddeb.hooks import run_hook
         from bzrlib.plugins.builddeb.upstream.branch import (
             LazyUpstreamBranchSource,
             )
@@ -317,6 +291,13 @@
         from bzrlib.plugins.builddeb.upstream.pristinetar import (
             PristineTarSource,
             )
+        from bzrlib.plugins.builddeb.util import (
+            dget_changes,
+            find_changelog,
+            find_previous_upload,
+            guess_build_type,
+            tree_contains_upstream_source,
+            )
 
         if result is not None:
             warning(gettext("--result is deprecated, use --result-dir instead"))
@@ -476,6 +457,9 @@
         from bzrlib.plugins.builddeb.upstream.pristinetar import (
             PristineTarSource,
             )
+        from bzrlib.plugins.builddeb.util import (
+            find_changelog,
+            )
         tree = WorkingTree.open_containing(directory)[0]
         config = debuild_config(tree, tree)
 
@@ -582,6 +566,9 @@
             changelog):
         from bzrlib.plugins.builddeb.merge_upstream import (
             changelog_add_new_version)
+        from bzrlib.plugins.builddeb.errors import (
+            DchError,
+            )
         try:
             changelog_add_new_version(tree, version, distribution_name,
                 changelog, package)
@@ -598,6 +585,9 @@
             DistributionBranch,
             DistributionBranchSet,
             )
+        from bzrlib.plugins.builddeb.util import (
+            component_from_orig_tarball,
+            )
         db = DistributionBranch(tree.branch, tree.branch, tree=tree)
         dbs = DistributionBranchSet()
         dbs.add_branch(db)
@@ -611,6 +601,7 @@
 
     def _fetch_tarball(self, package, version, orig_dir, locations, v3):
         from bzrlib.plugins.builddeb.repack_tarball import repack_tarball
+        from bzrlib.plugins.builddeb.util import tarball_name
         ret = []
         format = None
         for location in locations:
@@ -642,6 +633,14 @@
             locations, v3)
 
     def _get_changelog_info(self, tree, last_version, package, distribution):
+        from bzrlib.plugins.builddeb.util import (
+            find_changelog,
+            find_last_distribution,
+            lookup_distribution,
+            )
+        from bzrlib.plugins.builddeb.errors import (
+            MissingChangelogError,
+            )
         current_version = last_version
         try:
             (changelog, top_level) = find_changelog(tree, False, max_blocks=2)
@@ -677,13 +676,28 @@
             distribution=None, package=None,
             directory=".", revision=None, merge_type=None,
             last_version=None, force=None, snapshot=False, launchpad=False):
+        try:
+            from debian.changelog import Version
+        except ImportError:
+            # Prior to 0.1.15 the debian module was called debian_bundle
+            from debian_bundle.changelog import Version
+
+        from bzrlib.plugins.builddeb.errors import PackageVersionNotPresent
+        from bzrlib.plugins.builddeb.hooks import run_hook
         from bzrlib.plugins.builddeb.upstream import (
-                TarfileSource,
-                UScanSource,
-                )
+            TarfileSource,
+            UScanSource,
+            )
         from bzrlib.plugins.builddeb.upstream.branch import (
-                UpstreamBranchSource,
-                )
+            UpstreamBranchSource,
+            )
+        from bzrlib.plugins.builddeb.util import (
+            FORMAT_3_0_QUILT,
+            FORMAT_3_0_NATIVE,
+            get_source_format,
+            guess_build_type,
+            tree_contains_upstream_source,
+            )
 
         tree, _ = WorkingTree.open_containing(directory)
         tree.lock_write()
@@ -873,9 +887,12 @@
 
     def import_many(self, db, files_list, orig_target):
         from bzrlib.plugins.builddeb.import_dsc import (
-                DscCache,
-                DscComp,
-                )
+            DscCache,
+            DscComp,
+            )
+        from bzrlib.plugins.builddeb.util import (
+            open_file_via_transport,
+            )
         cache = DscCache()
         files_list.sort(cmp=DscComp(cache).cmp)
         if not os.path.exists(orig_target):
@@ -899,10 +916,17 @@
             db.import_package(os.path.join(orig_target, filename))
 
     def run(self, files_list, file=None):
+        from bzrlib.plugins.builddeb.errors import (
+            MissingChangelogError,
+            )
         from bzrlib.plugins.builddeb.import_dsc import (
             DistributionBranch,
             DistributionBranchSet,
             )
+        from bzrlib.plugins.builddeb.util import (
+            find_changelog,
+            open_file,
+            )
         try:
             tree = WorkingTree.open_containing('.')[0]
         except NotBranchError:
@@ -1009,10 +1033,18 @@
     takes_args = ['version', 'location', 'upstream_branch?']
 
     def run(self, version, location, upstream_branch=None, revision=None):
+        try:
+            from debian.changelog import Version
+        except ImportError:
+            # Prior to 0.1.15 the debian module was called debian_bundle
+            from debian_bundle.changelog import Version
         from bzrlib.plugins.builddeb.import_dsc import (
             DistributionBranch,
             DistributionBranchSet,
             )
+        from bzrlib.plugins.builddeb.util import (
+            md5sum_filename,
+            )
         # TODO: search for similarity etc.
         version = version.encode('utf8')
         branch, _ = Branch.open_containing('.')
@@ -1105,6 +1137,10 @@
     aliases = ['bd-do']
 
     def run(self, command_list=None):
+        import subprocess
+        from bzrlib.plugins.builddeb.errors import (
+            BuildFailedError,
+            )
         from bzrlib.plugins.builddeb.source_distiller import (
             MergeModeDistiller,
             )
@@ -1120,6 +1156,10 @@
         from bzrlib.plugins.builddeb.upstream.pristinetar import (
             PristineTarSource,
             )
+        from bzrlib.plugins.builddeb.hooks import run_hook
+        from bzrlib.plugins.builddeb.util import (
+            find_changelog,
+            )
         t = WorkingTree.open_containing('.')[0]
         config = debuild_config(t, t)
         if config.build_type != BUILD_TYPE_MERGE:
@@ -1207,6 +1247,9 @@
             DistributionBranch,
             DistributionBranchSet,
             )
+        from bzrlib.plugins.builddeb.util import (
+            find_changelog,
+            )
         t = WorkingTree.open_containing('.')[0]
         t.lock_write()
         try:

=== modified file 'debian/changelog'
--- debian/changelog	2011-12-17 16:43:38 +0000
+++ debian/changelog	2012-01-02 17:08:23 +0000
@@ -1,8 +1,10 @@
 bzr-builddeb (2.8.1) UNRELEASED; urgency=low
 
   * New revision specifier 'upstream:'. LP: #905728
+  * Imports are now deferred in command definitions, to speed up
+    commands like 'bzr bash-completion'. LP: #903650
 
- -- Jelmer Vernooij <[e-mail]>  Sat, 17 Dec 2011 17:41:19 +0100
+ -- Jelmer Vernooij <[e-mail]>  Mon, 02 Jan 2012 17:57:33 +0100
 
 bzr-builddeb (2.8.0) unstable; urgency=low