diff options
| author | W. Trevor King <wking@drexel.edu> | 2009-07-23 10:10:36 -0400 |
|---|---|---|
| committer | W. Trevor King <wking@drexel.edu> | 2009-07-23 10:10:36 -0400 |
| commit | e4fb67ebd5dff9e33e0d2a842cbb102e7d66946d (patch) | |
| tree | 57fcb37b9ded40850703b83e83dd6deb4d707554 /becommands/diff.py | |
| parent | 9c4c86e387711f9c04d23ed58422c86c0dbaec8b (diff) | |
| parent | 678d074ba2d20c22255abdcc8c41f3c0e2ec2c2a (diff) | |
| download | bugseverywhere-e4fb67ebd5dff9e33e0d2a842cbb102e7d66946d.tar.gz | |
Merged libbe.diff upgrades and libbe.tree.Tree.has_descendant from be.wtk-rr.
Also pulls "show referenced text" fix to "be comment".
Diffstat (limited to 'becommands/diff.py')
| -rw-r--r-- | becommands/diff.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/becommands/diff.py b/becommands/diff.py index 50dea7c..4b319ca 100644 --- a/becommands/diff.py +++ b/becommands/diff.py @@ -37,7 +37,6 @@ def execute(args, manipulate_encodings=True): Modified bug reports: a:cm: Bug A status: open -> closed - <BLANKLINE> """ parser = get_parser() options, args = parser.parse_args(args) @@ -54,7 +53,7 @@ def execute(args, manipulate_encodings=True): print "This directory is not revision-controlled." else: old_bd = bd.duplicate_bugdir(revision) - r,m,a = diff.diff(old_bd, bd) + r,m,a = diff.bug_diffs(old_bd, bd) optbugs = [] if options.all == True: @@ -69,7 +68,9 @@ def execute(args, manipulate_encodings=True): for bug in optbugs: print bug.uuid else : - print diff.diff_report((r,m,a), bd).encode(bd.encoding) + rep = diff.diff_report((r,m,a), old_bd, bd).encode(bd.encoding) + if len(rep) > 0: + print rep bd.remove_duplicate_bugdir() def get_parser(): |