Fixed some bug.py split effects in diff.py

Also added 'disabled' status back in so diff doesn't choke trying to
load the older versions...  Ugly hack, but I don't want to change the
past ;).

diff --git a/libbe/bug.py b/libbe/bug.py
index 46dd5215d676624f9a39f152e69593bcdd9c2677..19297bb6a9a38b13839fdeaf1d0f5cc132ab642f 100644 (file)
--- a/libbe/bug.py
+++ b/libbe/bug.py
@@ -46,7 +46,8 @@ active_status_def = (
 inactive_status_def = (
   ("closed", "The bug is no longer relevant."),
   ("fixed", "The bug should no longer occur."),
-  ("wontfix","It's not a bug, it's a feature."))
+  ("wontfix","It's not a bug, it's a feature."),
+  ("disabled", "?"))
 
 
 ### Convert the description tuples to more useful formats

diff --git a/libbe/diff.py b/libbe/diff.py
index c1dc429536d2c487ec567f93830c035ba4b444e7..97eca54c61f6fdd7fda42247e5f12e108acfb690 100644 (file)
--- a/libbe/diff.py
+++ b/libbe/diff.py
@@ -17,6 +17,7 @@
 """Compare two bug trees"""
 from libbe import cmdutil, bugdir
 from libbe.utility import time_to_str
+from libbe.bug import cmp_severity
 
 def diff(old_tree, new_tree):
     old_bug_map = old_tree.bug_map()
@@ -44,10 +45,10 @@ def diff_report(diff_data, bug_dir):
     (removed, modified, added) = diff_data
     bugs = list(bug_dir.list())
     def modified_cmp(left, right):
-        return bugdir.cmp_severity(left[1], right[1])
+        return cmp_severity(left[1], right[1])
 
-    added.sort(bugdir.cmp_severity)
-    removed.sort(bugdir.cmp_severity)
+    added.sort(cmp_severity)
+    removed.sort(cmp_severity)
     modified.sort(modified_cmp)
 
     if len(added) > 0: 
@@ -107,4 +108,4 @@ def bug_changes(old, new, bugs):
 
 def comment_summary(comment, status):
     return "%8s comment from %s on %s" % (status, comment.From, 
-                                          time_to_str(comment.date))
+                                          time_to_str(comment.time))