Merge lp:~jelmer/bzr-service/lazy into lp:bzr-service

[Jelmer Vernooij]

Lazily load the service plugin commands.

[John A Meinel (jameinel)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 3/5/2011 3:03 AM, Jelmer Vernooij wrote:
> Jelmer Vernooij has proposed merging lp:~jelmer/bzr-service/lazy into lp:bzr-service.
>
> Requested reviews:
> Bazaar Developers (bzr)
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr-service/lazy/+merge/52278
>
> Lazily load the service plugin commands.

 merge: approve

John
=:->
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (Cygwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk101g8ACgkQJdeBCYSNAAPiZQCcCBUbrICGTVChbnlVEoSqCNLJ
jlIAoK4ul8XwekUGXG78c9U3FecTfHCU
=UaMf
-----END PGP SIGNATURE-----

review: Approve

=== modified file '__init__.py'
--- __init__.py	2007-04-09 16:12:48 +0000
+++ __init__.py	2011-03-05 02:03:09 +0000
@@ -19,51 +19,13 @@
 commands. (see also commands like 'bzr shell' from bzrtools)
 """
 
-from bzrlib import (
-    commands,
-    ui,
-    )
-
-
-class cmd_start_service(commands.Command):
-    """Run a bzr service on the local machine, which should make startup time faster.
-
-    TODO: Instead of using a TCPServer, consider using local FIFOs.
-    That would allow you to open a FIFO for stdout and one for STDERR, and
-    the client could then poll the FIFOs, and print out information as
-    it comes in.
-
-    It also guarantees no remote access to the local server.
-    """
-
-    aliases = ['service']
-
-    def run(self):
-        import service
-        from bzrlib.ui.text import TextUIFactory
-
-        # Try to load all of the code right now,
-        # so that the spawned program won't have to
-        service.load_important_syslib()
-        service.load_all_bzrlib()
-
-        ui.ui_factory = TextUIFactory()
-
-        server = service.BzrTCPServer(('localhost', 11111),
-                                      service.BzrRequestHandler)
-
-        server.serve_forever()
-
-
-class cmd_stop_service(commands.Command):
-    """Stop a running bzr service on the local machine."""
-
-    def run(self):
-        pass
-
-
-commands.register_command(cmd_start_service)
-commands.register_command(cmd_stop_service)
+from bzrlib.commands import plugin_cmds
+
+
+plugin_cmds.register_lazy("cmd_start_service", [],
+    "bzrlib.plugins.service.cmds")
+plugin_cmds.register_lazy("cmd_stop_service", [],
+    "bzrlib.plugins.service.cmds")
 
 
 def test_suite():

=== added file 'cmds.py'
--- cmds.py	1970-01-01 00:00:00 +0000
+++ cmds.py	2011-03-05 02:03:09 +0000
@@ -0,0 +1,61 @@
+# Copyright (C) 2005, 2007 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
+
+"""Service plugin commands."""
+
+from bzrlib import (
+    commands,
+    ui,
+    )
+
+class cmd_start_service(commands.Command):
+    """Run a bzr service on the local machine, which should make startup time faster.
+
+    TODO: Instead of using a TCPServer, consider using local FIFOs.
+    That would allow you to open a FIFO for stdout and one for STDERR, and
+    the client could then poll the FIFOs, and print out information as
+    it comes in.
+
+    It also guarantees no remote access to the local server.
+    """
+
+    aliases = ['service']
+
+    def run(self):
+        import service
+        from bzrlib.ui.text import TextUIFactory
+
+        # Try to load all of the code right now,
+        # so that the spawned program won't have to
+        service.load_important_syslib()
+        service.load_all_bzrlib()
+
+        ui.ui_factory = TextUIFactory()
+
+        server = service.BzrTCPServer(('localhost', 11111),
+                                      service.BzrRequestHandler)
+
+        server.serve_forever()
+
+
+class cmd_stop_service(commands.Command):
+    """Stop a running bzr service on the local machine."""
+
+    def run(self):
+        pass
+
+
+