[diffoscope] 04/06: Ignore text difference if we have a visual one.

Maria Glukhova siamezzze-guest at moszumanska.debian.org
Sat Apr 29 19:16:59 CEST 2017

This is an automated email from the git hooks/post-receive script.

siamezzze-guest pushed a commit to branch siamezzze/image-visual-comparison
in repository diffoscope.

commit 608264c66b57cbe0b7391205375d63654aa39189
Author: Maria Glukhova <siamezzze at gmail.com>
Date:   Sun Apr 23 19:27:19 2017 +0300

    Ignore text difference if we have a visual one.
 diffoscope/presenters/html/html.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/diffoscope/presenters/html/html.py b/diffoscope/presenters/html/html.py
index 3378cff..f066081 100644
--- a/diffoscope/presenters/html/html.py
+++ b/diffoscope/presenters/html/html.py
@@ -482,7 +482,7 @@ def output_difference(difference, print_func, css_url, directory, parents):
         if len(difference.visuals) > 0:
             for visual in difference.visuals:
                 output_visual(print_func, visual, sources)
-        if difference.unified_diff:
+        elif difference.unified_diff:
             output_unified_diff(print_func, css_url, directory, difference.unified_diff, difference.has_internal_linenos)
         for detail in difference.details:
             output_difference(detail, print_func, css_url, directory, sources)

Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git

More information about the diffoscope mailing list