diff options
| author | W. Trevor King <wking@drexel.edu> | 2008-12-04 11:32:57 -0500 |
|---|---|---|
| committer | W. Trevor King <wking@drexel.edu> | 2008-12-04 11:32:57 -0500 |
| commit | b5b8d7214b24338ba5c97287810a4a67e61c3c06 (patch) | |
| tree | 132ba457d113eaaf03111523429dda82aabd863c /libbe/diff.py | |
| parent | 1449bf7d1a42d187c30ed72074b2c45b5131d6bc (diff) | |
| download | bugseverywhere-b5b8d7214b24338ba5c97287810a4a67e61c3c06.tar.gz | |
Per-tree status levels working.
Diffstat (limited to 'libbe/diff.py')
| -rw-r--r-- | libbe/diff.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libbe/diff.py b/libbe/diff.py index 5fc0166..17d6c50 100644 --- a/libbe/diff.py +++ b/libbe/diff.py @@ -15,9 +15,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA """Compare two bug trees""" -from libbe import cmdutil, bugdir +from libbe import cmdutil, bugdir, bug from libbe.utility import time_to_str -from libbe.bug import cmp_severity import doctest def diff(old_bugdir, new_bugdir): @@ -41,17 +40,17 @@ def diff(old_bugdir, new_bugdir): def diff_report(diff_data, bug_dir): (removed, modified, added) = diff_data def modified_cmp(left, right): - return cmp_severity(left[1], right[1]) + return bug.cmp_severity(left[1], right[1]) - added.sort(cmp_severity) - removed.sort(cmp_severity) + added.sort(bug.cmp_severity) + removed.sort(bug.cmp_severity) modified.sort(modified_cmp) lines = [] if len(added) > 0: lines.append("New bug reports:") - for bug in added: - lines.extend(bug.string(shortlist=True).splitlines()) + for bg in added: + lines.extend(bg.string(shortlist=True).splitlines()) lines.append("") if len(modified) > 0: @@ -69,8 +68,8 @@ def diff_report(diff_data, bug_dir): if len(removed) > 0: lines.append("Removed bug reports:") - for bug in removed: - lines.extend(bug.string(shortlist=True).splitlines()) + for bg in removed: + lines.extend(bg.string(shortlist=True).splitlines()) lines.append("") return '\n'.join(lines) |