Incorrect diff line numbering in case of inserting at top of the file.

[Shunichi Goto <gotoh@…>]

There's a bug of making line number (offset) of diff by hdf_diff() in case of insertion at the top of file.

See ​http://projects.edgewall.com/trac/changeset/2234#file1 for example. 'equal' part should be start as line number 1 and 8.

Here's a patch.

diff.py

@@ -115 +115 @@
     nn = n + n
     group = []
     for tag, i1, i2, j1, j2 in opcodes:
-        if tag == 'equal' and i1 == 0:
+        if tag == 'equal' and i1 == 0 and j1 == 0:
             i1, j1 = max(i1, i2 - n), max(j1, j2 - n)
-        if tag == 'equal' and i2 - i1 > nn:
+        elif tag == 'equal' and i2 - i1 > nn:
             group.append((tag, i1, min(i2, i1 + n), j1, min(j2, j1 + n)))
             yield group
             group = []

[Christopher Lenz]

Good catch, and thanks for the patch! :-)

[Christopher Lenz]

Fixed in [2264].

Note that the patch didn't completely solve the problem, but was a good starting point. I've added a unit test to make sure this doesn't resurface. Thanks again!