[MERGE][Bug #124853] bzr help debug should list debug options

[Daniel Watkins]

On Wed, 2007-08-22 at 18:42 -0400, Aaron Bentley wrote:
> Global options, including -Derror, are documented in the global-options
> topic.  I think we should list all global options there, including the
> debug set.
Attached.

-- 
Daniel Watkins (Odd_Bloke) <D.M.Watkins at warwick.ac.uk>
University of Warwick Christian Focus President
University of Warwick Computing Society WUGLUG Liaison Officer
-------------- next part --------------
# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: d.m.watkins at warwick.ac.uk-20070823101751-\
#   645bl30z2yxst9c2
# target_branch: file:///home/daniel/devel/bzr/bzr.dev/
# testament_sha1: 58b13fe5d29b94a375a8be305cdce30e6e650b05
# timestamp: 2007-08-23 12:18:00 +0200
# base_revision_id: pqm at pqm.ubuntu.com-20070823005013-ada9x55rc31yiwou
# 
# Begin patch
=== modified file 'NEWS'
--- NEWS	2007-08-22 23:59:17 +0000
+++ NEWS	2007-08-23 10:17:51 +0000
@@ -46,6 +46,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'
--- bzrlib/help_topics.py	2007-08-07 01:58:45 +0000
+++ bzrlib/help_topics.py	2007-08-23 10:07:12 +0000
@@ -250,8 +250,14 @@
                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.
+-Dhooks
+-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

# Begin bundle
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
fHOn2A==
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070823/49672bcc/attachment.pgp