Merged with head branch

1 files changed, 45 insertions, 25 deletions

diff --git a/becommands/set.py b/becommands/set.py
index e771018..0c0862f 100644
--- a/becommands/set.py
+++ b/becommands/set.py
@@ -3,30 +3,30 @@
 #                         Marien Zwart <marienz@gentoo.org>
 #                         Thomas Gerigk <tgerigk@gmx.de>
 #                         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
-#    the Free Software Foundation; either version 2 of the License, or
-#    (at your option) any later version.
+# 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
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
 #
-#    This program is distributed in the hope that it will be useful,
-#    but WITHOUT ANY WARRANTY; without even the implied warranty of
-#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-#    GNU General Public License for more details.
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 #
-#    You should have received a copy of the GNU General Public License
-#    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 """Change tree settings"""
-from libbe import cmdutil, bugdir, settings_object
+import textwrap
+from libbe import cmdutil, bugdir, rcs, settings_object
 __desc__ = __doc__
 
 def _value_string(bd, setting):
     val = bd.settings.get(setting, settings_object.EMPTY)
     if val == settings_object.EMPTY:
         default = getattr(bd, bd._setting_name_to_attr_name(setting))
-        if default != settings_object.EMPTY:
+        if default not in [None, settings_object.EMPTY]:
             val = "None (%s)" % default
         else:
             val = None
@@ -60,7 +60,9 @@ def execute(args, test=False):
     elif len(args) == 1:
         print _value_string(bd, args[0])
     else:
-        if args[1] != "none":
+        if args[1] == "none":
+            setattr(bd, args[0], settings_object.EMPTY)
+        else:
             if args[0] not in bd.settings_properties:
                 msg = "Invalid setting %s\n" % args[0]
                 msg += 'Allowed settings:\n  '
@@ -68,14 +70,35 @@ def execute(args, test=False):
                 raise cmdutil.UserError(msg)
             old_setting = bd.settings.get(args[0])
             setattr(bd, args[0], args[1])
-        else:
-            del bd.settings[args[0]]
-        bd.save()
 
 def get_parser():
     parser = cmdutil.CmdOptionParser("be set [NAME] [VALUE]")
     return parser
 
+def get_bugdir_settings():
+    settings = []
+    for s in bugdir.BugDir.settings_properties:
+        settings.append(s)
+    settings.sort()
+    documented_settings = []
+    for s in settings:
+        set = getattr(bugdir.BugDir, s)
+        dstr = set.__doc__.strip()
+        # per-setting comment adjustments
+        if s == "rcs_name":
+            lines = dstr.split('\n')
+            while lines[0].startswith("This property defaults to") == False:
+                lines.pop(0)
+            assert len(lines) != None, \
+                "Unexpected rcs_name docstring:\n  '%s'" % dstr
+            lines.insert(
+                0, "The name of the revision control system to use.\n")
+            dstr = '\n'.join(lines)
+        doc = textwrap.wrap(dstr, width=70, initial_indent='  ',
+                            subsequent_indent='  ')
+        documented_settings.append("%s\n%s" % (s, '\n'.join(doc)))
+    return documented_settings
+
 longhelp="""
 Show or change per-tree settings. 
 
@@ -83,14 +106,11 @@ If name and value are supplied, the name is set to a new value.
 If no value is specified, the current value is printed.
 If no arguments are provided, all names and values are listed. 
 
-Interesting settings are:
-rcs_name
-  The name of the revision control system.  "Arch" and "None" are supported.
-target
-  The current development goal 
-
 To unset a setting, set it to "none".
-"""
+
+Allowed settings are:
+
+%s""" % ('\n'.join(get_bugdir_settings()),)
 
 def help():
     return get_parser().help_str() + longhelp