equal
deleted
inserted
replaced
595 minus, plus = diff_decorate(minus, plus) |
595 minus, plus = diff_decorate(minus, plus) |
596 |
596 |
597 |
597 |
598 minus, plus = '<br />'.join(minus), '<br />'.join(plus) |
598 minus, plus = '<br />'.join(minus), '<br />'.join(plus) |
599 dif = diff_match_patch2() |
599 dif = diff_match_patch2() |
600 p = dif.diff_prettyHtml_one_way(dif.diff_main(minus, plus), 1) |
600 res_diff1 = dif.diff_main(minus, plus) |
601 minus = dif.diff_prettyHtml_one_way(dif.diff_main(minus, plus), 2) |
601 dif.diff_cleanupSemantic(res_diff1) |
|
602 p = dif.diff_prettyHtml_one_way(res_diff1, 1) |
|
603 minus = dif.diff_prettyHtml_one_way(res_diff1, 2) |
602 plus = p |
604 plus = p |
603 res.append('<tr><td class="diff-marker">-</td><td class="diff-deletedline">%s</td><td class="diff-separator"></td><td class="diff-marker">+</td><td class="diff-addedline">%s</td></tr>' % (minus, plus)) |
605 res.append('<tr><td class="diff-marker">-</td><td class="diff-deletedline">%s</td><td class="diff-separator"></td><td class="diff-marker">+</td><td class="diff-addedline">%s</td></tr>' % (minus, plus)) |
604 |
606 |
605 index += 1 |
607 index += 1 |
606 res.append('</tbody></table>') |
608 res.append('</tbody></table>') |