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

[Daniel Watkins]

Attached is a bundle that adds a new help topic, 'debug-flags', which
contains the content which is in the docstring in bzrlib.debug.


-- 
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-20070822192946-\
#   7aoykzqcnjwt2zy4
# target_branch: file:///home/daniel/devel/bzr/bzr.dev/
# testament_sha1: 251a037b0b4391b81ac3020bc8cb020d608bed75
# timestamp: 2007-08-22 21:30:30 +0200
# base_revision_id: pqm at pqm.ubuntu.com-20070822052832-nxby1d1plok4syek
# 
# Begin patch
=== modified file 'NEWS'
--- NEWS	2007-08-22 05:28:32 +0000
+++ NEWS	2007-08-22 19:29:46 +0000
@@ -44,6 +44,9 @@
     * ``send`` now sends the directive as an attachment by default.
       (Aaron Bentley, Luk?? Lalinsk?, Alexander Belchenko)
 
+    * ``bzr help debug-flags`` now contains information on how to use debug
+      flags and an incomplete list of them.  (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-22 19:27:48 +0000
@@ -498,6 +498,23 @@
 """
 
 
+_debug_flags = \
+"""Debug Flags
+
+Set of flags that enable different debug behaviour.  These are set with eg
+``-Dlock`` on the bzr command line.
+
+Options include:
+ * evil - capture call sites that do expensive or badly-scaling operations.
+ * error - show stack traces for all top level exceptions
+ * hooks 
+ * hpss - trace smart protocol requests and responses
+ * index - trace major index operations
+ * lock - trace when lockdir locks are taken or released
+
+"""
+
+
 topic_registry.register("revisionspec", _help_on_revisionspec,
                         "Explain how to use --revision")
 topic_registry.register('basic', _basic_help, "Basic commands", SECT_HIDDEN)
@@ -527,6 +544,8 @@
                         'Environment variable names and values')
 topic_registry.register('files', _files,
                         'Information on configuration and log files')
+topic_registry.register('debug-flags', _debug_flags,
+                        'Information on debug flags')
 
 
 class HelpTopicIndex(object):

# Begin bundle
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
-------------- 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/20070822/05bd552c/attachment.pgp