From 298c3b34765821a81fede2ff6edc8769e87c0c27 Mon Sep 17 00:00:00 2001 From: "W. Trevor King" Date: Sun, 23 Nov 2008 10:08:18 -0500 Subject: [PATCH] libbe/diff.diff() was missing newly created bugs. Fixed. Also added blank lines to separate the new/modified/removed groups. --- becommands/diff.py | 3 ++- libbe/diff.py | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/becommands/diff.py b/becommands/diff.py index 0a3bab1..3a8b42a 100644 --- a/becommands/diff.py +++ b/becommands/diff.py @@ -33,10 +33,11 @@ def execute(args): >>> if bd.rcs.versioned == True: ... execute([original]) ... else: - ... print "a:cm: Bug A\\nstatus: open -> closed" + ... print "a:cm: Bug A\\nstatus: open -> closed\\n" Modified bug reports: a:cm: Bug A status: open -> closed + """ options, args = get_parser().parse_args(args) if len(args) == 0: diff --git a/libbe/diff.py b/libbe/diff.py index f147bce..84b3bfe 100644 --- a/libbe/diff.py +++ b/libbe/diff.py @@ -33,7 +33,7 @@ def diff(old_bugdir, new_bugdir): except KeyError: removed.append(old_bug) for uuid in new_bugdir.list_uuids(): - if not old_bugdir.bug_map.has_key(new_bug.uuid): + if not old_bugdir.bug_map.has_key(uuid): new_bug = new_bugdir.bug_from_uuid(uuid) added.append(new_bug) return (removed, modified, added) @@ -51,6 +51,7 @@ def diff_report(diff_data, bug_dir): print "New bug reports:" for bug in added: print bug.string(shortlist=True) + print "" if len(modified) > 0: printed = False @@ -62,12 +63,14 @@ def diff_report(diff_data, bug_dir): printed = True print "Modified bug reports:" print change_str + print "" if len(removed) > 0: print "Removed bug reports:" for bug in removed: print bug.string(shortlist=True) - + print "" + def change_lines(old, new, attributes): change_list = [] for attr in attributes: -- 2.26.2