Large merge from W. Trevor King. Highlights:

be show --only-raw-body
be-mbox-to-xml
be-xml-to-mbox
be comment --xml
be --dir

1 files changed, 38 insertions, 11 deletions

diff --git a/becommands/show.py b/becommands/show.py
index ff434ab..f700caa 100644
--- a/becommands/show.py
+++ b/becommands/show.py
@@ -3,7 +3,6 @@
 #                         Thomas Gerigk <tgerigk@gmx.de>
 #                         Thomas Habets <thomas@habets.pp.se>
 #                         W. Trevor King <wking@drexel.edu>
-# <abentley@panoramicfeedback.com>
 #
 #    This program is free software; you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -19,6 +18,7 @@
 #    along with this program; if not, write to the Free Software
 #    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 """Show a particular bug"""
+import sys
 from libbe import cmdutil, bugdir
 __desc__ = __doc__
 
@@ -40,6 +40,7 @@ def execute(args, test=False):
     Bug A
     <BLANKLINE>
     >>> execute (["--xml", "a"], test=True) # doctest: +ELLIPSIS
+    <?xml version="1.0" encoding="..." ?>
     <bug>
       <uuid>a</uuid>
       <short-name>a</short-name>
@@ -53,27 +54,53 @@ def execute(args, test=False):
     parser = get_parser()
     options, args = parser.parse_args(args)
     cmdutil.default_complete(options, args, parser,
-                             bugid_args={0: lambda bug : bug.active==True})
+                             bugid_args={-1: lambda bug : bug.active==True})
     if len(args) == 0:
         raise cmdutil.UsageError
     bd = bugdir.BugDir(from_disk=True, manipulate_encodings=not test)
-    for bugid in args:
-        bug = bd.bug_from_shortname(bugid)
-        if options.dumpXML:
-            print bug.xml(show_comments=True)
+    for shortname in args:
+        if shortname.count(':') > 1:
+            raise cmdutil.UserError("Invalid id '%s'." % shortname)        
+        elif shortname.count(':') == 1:
+            # Split shortname generated by Comment.comment_shortnames()
+            bugname = shortname.split(':')[0]
+            is_comment = True
         else:
-            print bug.string(show_comments=True)
-            if bugid != args[-1]:
-                print "" # add a blank line between bugs
+            bugname = shortname
+            is_comment = False
+        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)
+            else:
+                print bug.string(show_comments=True)
+        else:
+            comment = bug.comment_root.comment_from_shortname(
+                shortname, bug_shortname=bugname)
+            if options.dumpXML:
+                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:
+            print "" # add a blank line between bugs/comments
 
 def get_parser():
-    parser = cmdutil.CmdOptionParser("be show [options] BUG-ID [BUG-ID ...]")
+    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("--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.")
     return parser
 
 longhelp="""
-Show all information about a bug.
+Show all information about the bugs or comments whose IDs are given.
+
+It's probably not a good idea to mix bug and comment IDs in a single
+call, but you're free to do so if you like.
 """
 
 def help():