aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorW. Trevor King <wking@drexel.edu>2008-11-14 20:21:29 -0500
committerW. Trevor King <wking@drexel.edu>2008-11-14 20:21:29 -0500
commit9e6f068085042de9f1beb44b560986f767934795 (patch)
treef363f329fabe01eb15b414d0fc509971dcaff040
parent87e356c9208e955fcf6c20c0b271db87bdd48014 (diff)
downloadbugseverywhere-9e6f068085042de9f1beb44b560986f767934795.tar.gz
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 ;).
-rw-r--r--libbe/bug.py3
-rw-r--r--libbe/diff.py9
2 files changed, 7 insertions, 5 deletions
diff --git a/libbe/bug.py b/libbe/bug.py
index 46dd521..19297bb 100644
--- 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 c1dc429..97eca54 100644
--- 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))