rattail/appypod-rattail
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

appy.gen: first Ploneless version.

Browse source
This commit is contained in:
Gaetan Delannay 2011-11-25 18:01:20 +01:00
parent 5672c81553
commit d0cbe7e573
360 changed files with 1003 additions and 1017 deletions
Download patch file Download diff file Expand all files Collapse all files

11
shared/diff.py
View file

@ -117,13 +117,14 @@ class Merger:
if not oldDiff or not isPrevious or (oldDiffStart > newDiffEnd):
# End of the overlapping. Dump what remains in newText and dump
# this next uncorrelated diff afterwards.
res += self.differ.getModifiedChunk(text, 'delete', '',
msg=newDiff.group(2))
self.i += len(newDiff.group(3))
res += self.differ.getModifiedChunk(newText[consumed:],
'delete', '', msg=newDiff.group(2))
self.i += len(newDiff.group(0))
if oldDiff:
res += self.dumpDiff(oldDiff, oldDiffStart, isPrevious)
break
# Move forward within self.lineB w.r.t p_newDiff
return res
# We have consumed p_newDiff entirely. Move forward within self.lineB
# w.r.t p_newDiff.
self.i += len(newDiff.group(0))
return res