equal
deleted
inserted
replaced
25 l = [l1, l2, l3] + ["-" + e for e in a] |
25 l = [l1, l2, l3] + ["-" + e for e in a] |
26 else: |
26 else: |
27 a = a.splitlines(1) |
27 a = a.splitlines(1) |
28 b = b.splitlines(1) |
28 b = b.splitlines(1) |
29 l = list(difflib.unified_diff(a, b, "a/" + fn, "b/" + fn)) |
29 l = list(difflib.unified_diff(a, b, "a/" + fn, "b/" + fn)) |
|
30 if not l: return "" |
30 # difflib uses a space, rather than a tab |
31 # difflib uses a space, rather than a tab |
31 l[0] = l[0][:-2] + "\t" + ad + "\n" |
32 l[0] = l[0][:-2] + "\t" + ad + "\n" |
32 l[1] = l[1][:-2] + "\t" + bd + "\n" |
33 l[1] = l[1][:-2] + "\t" + bd + "\n" |
33 |
34 |
34 for ln in xrange(len(l)): |
35 for ln in xrange(len(l)): |