Rev 2749: (Daniel Watkins) help global-options now lists all debug flags in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 2749
revision-id: pqm at pqm.ubuntu.com-20070828012914-ghechpk19ejwk5um
parent: pqm at pqm.ubuntu.com-20070825182243-a3w20rpadbfz8euc
parent: ian.clatworthy at internode.on.net-20070828004910-jjxugp6eok2bw6am
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-08-28 02:29:14 +0100
message:
  (Daniel Watkins) help global-options now lists all debug flags
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
    ------------------------------------------------------------
    revno: 2748.1.1
    merged: ian.clatworthy at internode.on.net-20070828004910-jjxugp6eok2bw6am
    parent: pqm at pqm.ubuntu.com-20070825182243-a3w20rpadbfz8euc
    parent: d.m.watkins at warwick.ac.uk-20070823101751-645bl30z2yxst9c2
    committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
    branch nick: ianc-integration
    timestamp: Tue 2007-08-28 10:49:10 +1000
    message:
      (Daniel Watkins) help global-options now lists all debug flags
    ------------------------------------------------------------
    revno: 2745.2.2
    merged: d.m.watkins at warwick.ac.uk-20070823101751-645bl30z2yxst9c2
    parent: d.m.watkins at warwick.ac.uk-20070823100712-llqov0ubh9gw1tf9
    committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
    branch nick: 124853
    timestamp: Thu 2007-08-23 12:17:51 +0200
    message:
      Help on debug flags is now included in 'help global-options', fixing bug #124853.
    ------------------------------------------------------------
    revno: 2745.2.1
    merged: d.m.watkins at warwick.ac.uk-20070823100712-llqov0ubh9gw1tf9
    parent: pqm at pqm.ubuntu.com-20070823005013-ada9x55rc31yiwou
    committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
    branch nick: 124853
    timestamp: Thu 2007-08-23 12:07:12 +0200
    message:
      Added information on debug options to 'bzr help global-options'.
=== modified file 'NEWS'
--- a/NEWS	2007-08-24 13:02:26 +0000
+++ b/NEWS	2007-08-28 00:49:10 +0000
@@ -49,6 +49,9 @@
 
     * Documentation updates (Martin Albisetti)
 
+    * Help on debug flags is now included in ``help global-options``.
+      (Daniel Watkins, #124853)
+
   API BREAKS:
 
    * ``Branch.append_revision`` is removed altogether; please use 

=== modified file 'bzrlib/help_topics.py'
--- a/bzrlib/help_topics.py	2007-08-07 01:58:45 +0000
+++ b/bzrlib/help_topics.py	2007-08-28 00:49:10 +0000
@@ -242,18 +242,24 @@
 These options may be used with any command, and may appear in front of any
 command.  (e.g. "bzr --quiet help").
 
---quiet        Suppress informational output; only print errors and warnings
---version      Print the version number
+--quiet        Suppress informational output; only print errors and warnings.
+--version      Print the version number.
 
---no-aliases   Do not process command aliases when running this command
+--no-aliases   Do not process command aliases when running this command.
 --builtin      Use the built-in version of a command, not the plugin version.
-               This does not suppress other plugin effects
---no-plugins   Do not process any plugins
+               This does not suppress other plugin effects.
+--no-plugins   Do not process any plugins.
 
+-Devil         Capture call sites that do expensive or badly-scaling
+               operations.
 -Derror        Instead of normal error handling, always print a traceback on
                error.
---profile      Profile execution using the hotshot profiler
---lsprof       Profile execution using the lsprof profiler
+-Dhooks        Trace hook execution.
+-Dhpss         Trace smart protocol requests and responses.
+-Dindex        Trace major index operations.
+-Dlock         Trace when lockdir locks are taken or released.
+--profile      Profile execution using the hotshot profiler.
+--lsprof       Profile execution using the lsprof profiler.
 --lsprof-file  Profile execution using the lsprof profiler, and write the
                results to a specified file.  If the filename ends with ".txt",
                text format will be used.  If the filename either starts with