Merged assorted changes from be.wtk-rr for BugDir.extra_strings.

Other highlights:
  * be show --no-comments
  * Improved *.sync_with_disk.
  * Improved be-mbox-to-xml.

1 files changed, 16 insertions, 9 deletions

diff --git a/becommands/show.py b/becommands/show.py
index ae1c7f3..b7bfe78 100644
--- a/becommands/show.py
+++ b/becommands/show.py
@@ -59,6 +59,8 @@ def execute(args, manipulate_encodings=True):
         raise cmdutil.UsageError
     bd = bugdir.BugDir(from_disk=True,
                        manipulate_encodings=manipulate_encodings)
+    if options.XML:
+        print '<?xml version="1.0" encoding="%s" ?>' % bd.encoding
     for shortname in args:
         if shortname.count(':') > 1:
             raise cmdutil.UserError("Invalid id '%s'." % shortname)        
@@ -69,32 +71,37 @@ def execute(args, manipulate_encodings=True):
         else:
             bugname = shortname
             is_comment = False
+        if is_comment == True and options.comments == False:
+            continue
         bug = bd.bug_from_shortname(bugname)
         if is_comment == False:
-            if options.dumpXML:
-                print '<?xml version="1.0" encoding="%s" ?>' % bd.encoding
-                print bug.xml(show_comments=True)
+            if options.XML:
+                print bug.xml(show_comments=options.comments)
             else:
-                print bug.string(show_comments=True)
+                print bug.string(show_comments=options.comments)
         else:
             comment = bug.comment_root.comment_from_shortname(
                 shortname, bug_shortname=bugname)
-            if options.dumpXML:
+            if options.XML:
                 print comment.xml(shortname=shortname)
             else:
                 if len(args) == 1 and options.only_raw_body == True:
                     sys.__stdout__.write(comment.body)
                 else:
                     print comment.string(shortname=shortname)
-        if shortname != args[-1] and options.dumpXML == False:
+        if shortname != args[-1] and options.XML == False:
             print "" # add a blank line between bugs/comments
 
 def get_parser():
     parser = cmdutil.CmdOptionParser("be show [options] ID [ID ...]")
-    parser.add_option("-x", "--xml", action="store_true",
-                      dest='dumpXML', help="Dump as XML")
+    parser.add_option("-x", "--xml", action="store_true", default=False,
+                      dest='XML', help="Dump as XML")
     parser.add_option("--only-raw-body", action="store_true",
-                      dest='only_raw_body', help="When printing only a single comment, just print it's body.  This allows extraction of non-text content types.")
+                      dest='only_raw_body',
+                      help="When printing only a single comment, just print it's body.  This allows extraction of non-text content types.")
+    parser.add_option("-c", "--no-comments", dest="comments",
+                      action="store_false", default=True,
+                      help="Disable comment output.  This is useful if you just want more details on a bug's current status.")
     return parser
 
 longhelp="""