Merge branch 'dirdiff.remove_blank_lines' into 'master'

dirdiff.remove_blank_lines - make remove blank lines runs faster

See merge request GNOME/meld!16

Author: kaiw

meld/dirdiff.py

@@ -83,11 +83,11 @@ def shallow_equal(self, other, time_resolution_ns):
 
 
 def remove_blank_lines(text):
-    splits = text.splitlines()
-    lines = text.splitlines(True)
-    blanks = set([i for i, l in enumerate(splits) if not l])
-    lines = [l for i, l in enumerate(lines) if i not in blanks]
-    return b''.join(lines)
+    """
+    Remove blank lines from text.
+    And normalize line ending
+    """
+    return b'\n'.join(filter(bool, text.splitlines()))
 
 
 def _files_same(files, regexes, comparison_args):
@@ -184,13 +184,12 @@ def _files_same(files, regexes, comparison_args):
     if result == Different and need_contents:
         contents = [b"".join(c) for c in contents]
         # For probable text files, discard newline differences to match
-        # file comparisons.
-        contents = [b"\n".join(c.splitlines()) for c in contents]
-
-        contents = [misc.apply_text_filters(c, regexes) for c in contents]
-
         if ignore_blank_lines:
             contents = [remove_blank_lines(c) for c in contents]
+        else:
+            contents = [b"\n".join(c.splitlines()) for c in contents]
+
+        contents = [misc.apply_text_filters(c, regexes) for c in contents]
         result = SameFiltered if all_same(contents) else Different
 
     _cache[cache_key] = CacheResult(stats, result)

test/dirdiff/test_remove_blank_lines.py

@@ -0,0 +1,29 @@
+import pytest
+from meld.dirdiff import remove_blank_lines
+
+@pytest.mark.parametrize('txt, expected', [
+    # blank to be equal blank
+    (b'', b''),
+    # one line with spaces
+    (b' ', b' '),
+    # two lines empty
+    (b'\n', b''),
+    (b'\n ', b' '),
+    (b' \n', b' '),
+    (b' \n ', b' \n '),
+    # tree lines empty
+    (b'\n\n', b''),
+    (b'\n\n ', b' '),
+    (b'\n \n', b' '),
+    (b'\n \n ', b' \n '),
+    (b' \n \n ', b' \n \n '),
+    # one line with space and content
+    (b' content', b' content'),
+    # empty line between content
+    (b'content\n\ncontent', b'content\ncontent'),
+    # multiple leading and trailing newlines
+    (b'\n\n\ncontent\n\n\ncontent\n\n\n', b'content\ncontent'),
+])
+def test_remove_blank_lines(txt, expected):
+    result = remove_blank_lines(txt)
+    assert result == expected