Rev 2465: Fix tests broken by deprecation of help.command_usage. in http://people.ubuntu.com/~robertc/baz2.0/integration

[Robert Collins]

At http://people.ubuntu.com/~robertc/baz2.0/integration

------------------------------------------------------------
revno: 2465
revision-id: robertc at robertcollins.net-20070423014105-tzsvtqg3rurfksv8
parent: robertc at robertcollins.net-20070423002858-l285r8h8a9jjco64
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2007-04-23 11:41:05 +1000
message:
  Fix tests broken by deprecation of help.command_usage.
modified:
  bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
  tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
  tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
=== modified file 'bzrlib/tests/blackbox/test_too_much.py'
--- a/bzrlib/tests/blackbox/test_too_much.py	2006-11-05 14:22:38 +0000
+++ b/bzrlib/tests/blackbox/test_too_much.py	2007-04-23 01:41:05 +0000
@@ -434,7 +434,7 @@
         runbzr("help slartibartfast", 3)
 
         out = capture("help ci")
-        out.index('aliases: ')
+        out.index('aliases:\n')
 
         f = file('hello.txt', 'wt')
         f.write('some nice new content\n')

=== modified file 'tools/doc_generate/autodoc_man.py'
--- a/tools/doc_generate/autodoc_man.py	2007-04-19 05:32:24 +0000
+++ b/tools/doc_generate/autodoc_man.py	2007-04-23 01:41:05 +0000
@@ -80,7 +80,7 @@
         cmd_help = cmd_object.help()
         if cmd_help:
             firstline = cmd_help.split('\n', 1)[0]
-            usage = bzrlib.help.command_usage(cmd_object)
+            usage = cmd_object._usage()
             tmp = '.TP\n.B "%s"\n%s\n' % (usage, firstline)
             output = output + tmp
         else:
@@ -101,7 +101,7 @@
 
 def format_command (params, cmd):
     """Provides long help for each public command"""
-    subsection_header = '.SS "%s"\n' % (bzrlib.help.command_usage(cmd))
+    subsection_header = '.SS "%s"\n' % (cmd._usage())
     doc = "%s\n" % (cmd.__doc__)
     doc = cmd.help()
 

=== modified file 'tools/doc_generate/autodoc_rstx.py'
--- a/tools/doc_generate/autodoc_rstx.py	2007-04-19 05:32:24 +0000
+++ b/tools/doc_generate/autodoc_rstx.py	2007-04-23 01:41:05 +0000
@@ -73,7 +73,7 @@
         cmd_help = cmd_object.help()
         if cmd_help:
             firstline = cmd_help.split('\n', 1)[0]
-            usage = bzrlib.help.command_usage(cmd_object)
+            usage = cmd_object._usage()
             tmp = '**%s**\n\t%s\n\n' % (usage, firstline)
             output = output + tmp
         else:
@@ -97,7 +97,7 @@
 
 def format_command (params, cmd, name):
     """Provides long help for each public command"""
-    usage = bzrlib.help.command_usage(cmd)
+    usage = cmd._usage()
     subsection_header = """
 %s
 %s