Merge lp:~jelmer/bzr/bzr.1-launchpad-commands into lp:bzr

[Jelmer Vernooij]

Document launchpad commands in bzr(1) manpage.

Document the various launchpad plugins in bzr(1).

This seemed like a reasonable way to do this. Better suggestions welcome. :-)

[Martin Pool (mbp)]

wfm. Another option would be to generate a bzr-launchpad manpage,
which would scale better for other plugins. But for now this is fine.

  vote approve

review: Approve

[Jelmer Vernooij (jelmer)]

sent to pqm by email

[Jelmer Vernooij (jelmer)]

sent to pqm by email

=== modified file 'bzrlib/doc_generate/autodoc_man.py'
--- bzrlib/doc_generate/autodoc_man.py	2012-03-14 16:58:27 +0000
+++ bzrlib/doc_generate/autodoc_man.py	2012-03-15 15:12:21 +0000
@@ -23,6 +23,8 @@
 
 from __future__ import absolute_import
 
+PLUGINS_TO_DOCUMENT = ["launchpad"]
+
 import textwrap
 import time
 
@@ -31,6 +33,9 @@
 import bzrlib.help_topics
 import bzrlib.commands
 
+from bzrlib.plugin import load_plugins
+load_plugins()
+
 
 def get_filename(options):
     """Provides name of manpage"""
@@ -66,6 +71,11 @@
 def command_name_list():
     """Builds a list of command names from bzrlib"""
     command_names = bzrlib.commands.builtin_command_names()
+    for cmdname in bzrlib.commands.plugin_command_names():
+        cmd_object = bzrlib.commands.get_cmd_object(cmdname)
+        if (PLUGINS_TO_DOCUMENT is None or
+            cmd_object.plugin_name() in PLUGINS_TO_DOCUMENT):
+            command_names.append(cmdname)
     command_names.sort()
     return command_names
 
@@ -105,7 +115,7 @@
     return output
 
 
-def format_command (params, cmd):
+def format_command(params, cmd):
     """Provides long help for each public command"""
     subsection_header = '.SS "%s"\n' % (cmd._usage())
     doc = "%s\n" % (cmd.__doc__)
@@ -134,7 +144,7 @@
                     subsequent_indent=30*' ',
                     break_long_words=False,
                     )
-                option_str = option_str + wrapped + '\n'       
+                option_str += wrapped + '\n'
 
     aliases_str = ""
     if cmd.aliases:

=== modified file 'doc/en/release-notes/bzr-2.6.txt'
--- doc/en/release-notes/bzr-2.6.txt	2012-03-15 11:09:54 +0000
+++ doc/en/release-notes/bzr-2.6.txt	2012-03-15 15:12:21 +0000
@@ -117,6 +117,12 @@
 Documentation
 *************
 
+.. Improved or updated documentation.
+
+* Document "bzr lp-propose", "bzr register-branch" and
+  the other Launchpad plugin commands in bzr(1).
+  (Jelmer Vernooij, #843801, #163995)
+
 * Prevent lines of command descriptions starting with a dot to
   accidentally be interpreted as a roff macro in bzr(1).
   (Jelmer Vernooij, #711079)