Merge lp:~bialix/bzr-colo/lazy-commands into lp:bzr-colo

[Alexander Belchenko]

[Alexander Belchenko (bialix)]

This patch fixes lazy commands registration and makes it truly lazy.

[Alexander Belchenko (bialix)]

Neil, the status of this merge proposal is Merged, but I don't see the changes in lp:bzr-colo branch. Do you merged locally and don't push to lp yet? Or there is something wrong with lp?

[Neil Martinsen-Burrell (nmb)]

On 2010-01-12 02:38 , Alexander Belchenko wrote:
> Neil, the status of this merge proposal is Merged, but I don't see
> the changes in lp:bzr-colo branch. Do you merged locally and don't
> push to lp yet? Or there is something wrong with lp?

Just haven't pushed the changes back to Launchpad. Am doing it now. Peace,

-Neil

[Alexander Belchenko (bialix)]

Neil Martinsen-Burrell пишет:
> On 2010-01-12 02:38 , Alexander Belchenko wrote:
>> Neil, the status of this merge proposal is Merged, but I don't see
>> the changes in lp:bzr-colo branch. Do you merged locally and don't
>> push to lp yet? Or there is something wrong with lp?
>
> Just haven't pushed the changes back to Launchpad. Am doing it now. Peace,

In this case I suggest to not change status to Merged manually.
LP is smart enough to detect the moment when the merge proposal will land to lp branch and mark it
as Merged automatically.

=== modified file '__init__.py'
--- __init__.py	2010-01-10 19:57:10 +0000
+++ __init__.py	2010-01-11 10:39:16 +0000
@@ -68,15 +68,6 @@
 from bzrlib.help_topics import topic_registry
 
 from info import bzr_plugin_version as version_info
-from commands import (cmd_colo_init,
-                      cmd_colo_branch,
-                      cmd_colo_branches,
-                      cmd_colo_fetch,
-                      cmd_colo_clone,
-                      cmd_colo_prune,
-                      cmd_colo_clean,
-                      cmd_colo_ify
-                     )
 from colocated import ColocatedDirectory
 from tutorial import _colo_tutorial
 
@@ -102,5 +93,4 @@
                  ('cmd_colo_ify', []),
                 ]
 for cmd, aliases in lazy_commands:
-    plugin_cmds.register_lazy(cmd, aliases, 'bzrlib.plugins.colo')
-
+    plugin_cmds.register_lazy(cmd, aliases, 'bzrlib.plugins.colo.commands')