equal
deleted
inserted
replaced
562 """ |
562 """ |
563 Return the inner of the html table for text1 vs text2 diff |
563 Return the inner of the html table for text1 vs text2 diff |
564 """ |
564 """ |
565 gen = unified_diff(text1.split('\n'), text2.split('\n'), n=3) |
565 gen = unified_diff(text1.split('\n'), text2.split('\n'), n=3) |
566 index = 0 |
566 index = 0 |
567 res = ['<table class="diff"><tbody>'] |
567 res = ['<table class="diff"><col class="diff-marker"/><col class="diff-content"/><col class="diff-separator"/<col class="diff-marker"/><col class="diff-content"/><tbody>'] |
568 res.append('<tr><td></td><td class="diff-title">%s</td><td></td><td></td><td class="diff-title">%s</td></tr>' %(title1, title2)) |
568 res.append('<tr><td></td><td class="diff-title">%s</td><td></td><td></td><td class="diff-title">%s</td></tr>' %(title1, title2)) |
569 res.append('<tr><td></td><td class="diff-author">%s</td><td></td><td></td><td class="diff-author">%s</td></tr>' %(author1, author2)) |
569 res.append('<tr><td></td><td class="diff-author">%s</td><td></td><td></td><td class="diff-author">%s</td></tr>' %(author1, author2)) |
570 res.append('<tr><td colspan="5"></td></tr>') |
570 res.append('<tr><td colspan="5"></td></tr>') |
571 #res.append('<tr><td width="50%" colspan="2"></td><td width="50%" colspan="2"></td></tr>') |
571 #res.append('<tr><td width="50%" colspan="2"></td><td width="50%" colspan="2"></td></tr>') |
572 |
572 |
601 res_diff1 = dif.diff_main(minus, plus) |
601 res_diff1 = dif.diff_main(minus, plus) |
602 dif.diff_cleanupSemantic(res_diff1) |
602 dif.diff_cleanupSemantic(res_diff1) |
603 p = dif.diff_prettyHtml_one_way(res_diff1, 1) |
603 p = dif.diff_prettyHtml_one_way(res_diff1, 1) |
604 minus = dif.diff_prettyHtml_one_way(res_diff1, 2) |
604 minus = dif.diff_prettyHtml_one_way(res_diff1, 2) |
605 plus = p |
605 plus = p |
606 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)) |
606 res.append('<tr><td class="diff-marker">-</td><td class="diff-deletedline"><div>%s</div></td><td class="diff-separator"></td><td class="diff-marker">+</td><td class="diff-addedline"><div>%s</div></td></tr>' % (minus, plus)) |
607 |
607 |
608 index += 1 |
608 index += 1 |
609 res.append('</tbody></table>') |
609 res.append('</tbody></table>') |
610 return ''.join(res) |
610 return ''.join(res) |
611 |
611 |