fix the diff again

Author: fstachura

elixir/query.py

@@ -272,11 +272,11 @@ def get_diff(self, version, version_other, path):
             if len(line) == 0:
                 continue
             elif line[0] == '+':
-                line_num, changes = line[1:].split(':')
-                result.append(('+', int(line_num), int(changes)))
+                line_num_left, line_num_right, changes = line[1:].split(':')
+                result.append(('+', int(line_num_left), int(line_num_right), int(changes)))
             elif line[0] == '-':
-                line_num, changes = line[1:].split(':')
-                result.append(('-', int(line_num), int(changes)))
+                line_num_left, line_num_right, changes = line[1:].split(':')
+                result.append(('-', int(line_num_left), int(line_num_right), int(changes)))
             elif line[0] == '=':
                 line_num, changes, other_line_num, other_changes = line[1:].split(':')
                 result.append(('=', int(line_num), int(changes), int(other_line_num), int(other_changes)))

elixir/web_utils.py

@@ -90,13 +90,18 @@ def __init__(self, diff, left: bool, *args, **kwargs):
 
     def get_next_diff_line(self, diff_num, next_diff_line):
         next_diff = self.diff[diff_num] if len(self.diff) > diff_num else None
+
         if next_diff is not None:
-            if next_diff[0] == '-' or next_diff[0] == '+':
+            if self.left and (next_diff[0] == '-' or next_diff[0] == '+'):
                 next_diff_line = next_diff[1]
+            elif next_diff[0] == '-' or next_diff[0] == '+':
+                next_diff_line = next_diff[2]
             elif self.left and next_diff[0] == '=':
                 next_diff_line = next_diff[1]
-            elif not self.left and next_diff[0] == '=':
+            elif next_diff[0] == '=':
                 next_diff_line = next_diff[3]
+            else:
+                raise Exception("invlaid next diff mode")
 
         return next_diff, diff_num+1, next_diff_line
 
@@ -128,20 +133,20 @@ def wrap_diff(self, source):
             except StopIteration:
                 break
 
-            yield line
+            yield line[0], str(linenum) + ':' + str(next_diff_line) + ':' + line[1]
 
             if linenum == next_diff_line:
                 if next_diff is not None:
                     if self.left and next_diff[0] == '+':
-                        yield from self.yield_empty(next_diff[2])
+                        yield from self.yield_empty(next_diff[3])
                     elif next_diff[0] == '+':
-                        yield from self.mark_lines(source, next_diff[2], 'line-added')
-                        linenum += next_diff[2]
-                    elif not self.left and next_diff[0] == '-':
-                        yield from self.yield_empty(next_diff[2])
+                        yield from self.mark_lines(source, next_diff[3], 'line-added')
+                        linenum += next_diff[3]
+                    elif self.left and next_diff[0] == '-':
+                        yield from self.mark_lines(source, next_diff[3], 'line-removed')
+                        linenum += next_diff[3]
                     elif next_diff[0] == '-':
-                        yield from self.mark_lines(source, next_diff[2], 'line-removed')
-                        linenum += next_diff[2]
+                        yield from self.yield_empty(next_diff[3])
                     elif next_diff[0] == '=':
                         total = max(next_diff[2], next_diff[4])
                         to_print = next_diff[2] if self.left else next_diff[4]

script.sh

@@ -100,8 +100,8 @@ get_diff()
     v_other=`echo $opt2 | version_rev`
     diff \
         --unchanged-group-format= \
-        --new-group-format="+%de:%dN%c'\012'" \
-        --old-group-format="-%dE:%dn%c'\012'" \
+        --new-group-format="+%de:%dE:%dN%c'\012'" \
+        --old-group-format="-%de:%dE:%dn%c'\012'" \
         --changed-group-format="=%de:%dn:%dE:%dN%c'\012'" \
         <(git cat-file blob "$v:`denormalize $opt3`" 2>/dev/null) \
         <(git cat-file blob "$v_other:`denormalize $opt3`" 2>/dev/null)