webdiff 1.1.0__tar.gz → 1.1.1__tar.gz

{webdiff-1.1.0 → webdiff-1.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: webdiff
-Version: 1.1.0
+Version: 1.1.1
 Summary: Two-column web-based git difftool
 Home-page: https://github.com/danvk/webdiff/
 License: Apache-2.0

{webdiff-1.1.0 → webdiff-1.1.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "poetry.core.masonry.api"
 
 [tool.poetry]
 name = "webdiff"
-version = "1.1.0"
+version = "1.1.1"
 description = "Two-column web-based git difftool"
 license = "Apache-2.0"
 readme = "README.md"

{webdiff-1.1.0 → webdiff-1.1.1}/webdiff/dirdiff.py

@@ -44,7 +44,7 @@ def make_resolved_dir(dir: str) -> str:
 
 def gitdiff(a_dir, b_dir, webdiff_config):
     extra_args = webdiff_config['extraDirDiffArgs']
-    cmd = 'git diff --raw --no-index'
+    cmd = 'git diff --raw -z --no-index'
     if extra_args:
         cmd += ' ' + extra_args
     a_dir_nosym = a_dir

{webdiff-1.1.0 → webdiff-1.1.1}/webdiff/unified_diff.py

@@ -162,8 +162,7 @@ class RawDiffLine:
     """Only set when status=C or R."""
 
 
-def parse_raw_diff_line(line: str) -> RawDiffLine:
-    parts = line.split('\t')
+def parse_raw_diff_line(parts: list[str]) -> RawDiffLine:
     meta = parts[0]
     path = parts[1]
     dst_path = parts[2] if len(parts) > 2 else None
@@ -188,4 +187,13 @@ def parse_raw_diff_line(line: str) -> RawDiffLine:
 
 
 def parse_raw_diff(diff: str) -> List[RawDiffLine]:
-    return [parse_raw_diff_line(line) for line in diff.split('\n') if line]
+    # each diff line can be two or three parts. The parts and lines are both null-delimited.
+    # The "lines" start with ":".
+    parts = diff.strip('\0').split('\0')
+    lines = []
+    for part in parts:
+        if part.startswith(':'):
+            lines.append([part])
+        else:
+            lines[-1].append(part)
+    return [parse_raw_diff_line(line) for line in lines]