equal
deleted
inserted
replaced
27 blocks = bdiff.blocks |
27 blocks = bdiff.blocks |
28 fixws = bdiff.fixws |
28 fixws = bdiff.fixws |
29 patches = mpatch.patches |
29 patches = mpatch.patches |
30 patchedsize = mpatch.patchedsize |
30 patchedsize = mpatch.patchedsize |
31 textdiff = bdiff.bdiff |
31 textdiff = bdiff.bdiff |
32 |
32 splitnewlines = bdiff.splitnewlines |
33 def splitnewlines(text): |
|
34 '''like str.splitlines, but only split on newlines.''' |
|
35 lines = [l + '\n' for l in text.split('\n')] |
|
36 if lines: |
|
37 if lines[-1] == '\n': |
|
38 lines.pop() |
|
39 else: |
|
40 lines[-1] = lines[-1][:-1] |
|
41 return lines |
|
42 |
33 |
43 class diffopts(object): |
34 class diffopts(object): |
44 '''context is the number of context lines |
35 '''context is the number of context lines |
45 text treats all files as text |
36 text treats all files as text |
46 showfunc enables diff -p output |
37 showfunc enables diff -p output |