Merge lp:~bialix/bzr-explorer/lazy-commands into lp:~bzr-explorer-dev/bzr-explorer/trunk.old

[Alexander Belchenko]

[Alexander Belchenko (bialix)]

This patch provides new feature to bzr-explorer: it register all commands lazily using appropriate API of bzrlib. This reduce coupling between explorer and qbzr so now non-explorer commands does not need to import several (big) modules from QBzr. This is clear improvements, and I don;t see any real reasons to not do lazy registering.

[Ian Clatworthy (ian-clatworthy)]

Looks good. Thanks.

review: Approve

=== added file '__init__.py'
--- __init__.py	1970-01-01 00:00:00 +0000
+++ __init__.py	2009-11-24 09:40:26 +0000
@@ -0,0 +1,48 @@
+# Copyright (C) 2009 Canonical Ltd
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+"""Version Control for Human Beings.
+
+Bazaar Explorer is a desktop application providing an easy-to-use
+interface to the Bazaar version control system. It is designed to
+be simple enough for casual users of version control, yet powerful
+enough for experts to use as their primary interface to Bazaar.
+
+Please visit the home page, http://doc.bazaar-vcs.org/explorer/en/,
+for more information.
+"""
+
+version_info = (0, 9, 1, 'dev', 0)
+__version__ = '.'.join(map(str, version_info))
+
+
+from bzrlib.commands import plugin_cmds
+
+lazy_commands = (
+    # name, aliases, module
+    ('cmd_explorer',               ['explore'], 'bzrlib.plugins.explorer.lib.commands'),
+    ('cmd_init_ala_explorer',      ['ws-init'], 'bzrlib.plugins.explorer.lib.commands'),
+    ('cmd_qinit_ala_explorer',     [],          'bzrlib.plugins.explorer.lib.commands'),
+    ('cmd_qcheckout_ala_explorer', [],          'bzrlib.plugins.explorer.lib.commands'),
+)
+
+for name, aliases, module in lazy_commands:
+    plugin_cmds.register_lazy(name, aliases, module)
+
+
+def load_tests(basic_tests, module, loader):
+    from bzrlib.plugins.explorer.tests import load_tests
+    return load_tests(basic_tests, module, loader)

=== renamed file '__init__.py' => 'lib/commands.py'
--- __init__.py	2009-11-23 12:05:40 +0000
+++ lib/commands.py	2009-11-24 09:40:26 +0000
@@ -14,21 +14,6 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-"""Version Control for Human Beings.
-
-Bazaar Explorer is a desktop application providing an easy-to-use
-interface to the Bazaar version control system. It is designed to
-be simple enough for casual users of version control, yet powerful
-enough for experts to use as their primary interface to Bazaar.
-
-Please visit the home page, http://doc.bazaar-vcs.org/explorer/en/,
-for more information.
-"""
-
-version_info = (0, 9, 1, 'dev', 0)
-__version__ = '.'.join(map(str, version_info))
-
-
 import sys
 
 import bzrlib
@@ -56,7 +41,7 @@
         simple_revision_option,
         )
 except ImportError:
-    raise Exception("Bazaar Explorer requires QBzr. "
+    raise bzrlib.errors.BzrError("Bazaar Explorer requires QBzr. "
         "Please install QBzr (https://launchpad.net/qbzr).")
 
 if getattr(sys, "frozen", None):
@@ -64,11 +49,6 @@
     import bzrlib.plugins.qbzr.lib
 
 
-def load_tests(basic_tests, module, loader):
-    from bzrlib.plugins.explorer.tests import load_tests
-    return load_tests(basic_tests, module, loader)
-
-
 def _init_explorer_command(zzz=False, experimental=False):
     # Set up global exception handling.
     from bzrlib.plugins.qbzr.lib.trace import excepthook
@@ -251,9 +231,3 @@
             revision=revision, ui_mode=ui_mode)
         window.show()
         app.exec_()
-
-
-register_command(cmd_explorer)
-register_command(cmd_init_ala_explorer)
-register_command(cmd_qinit_ala_explorer)
-register_command(cmd_qcheckout_ala_explorer)