Mercurial > hg > mercurial-crew-with-dirclash
comparison mercurial/mdiff.py @ 1540:8ca9f5b17257
minor optimization: save some string trash
author | twaldmann@thinkmo.de |
---|---|
date | Mon, 14 Nov 2005 02:30:19 +0200 |
parents | f1755621cb7d |
children | 3b1b44b917f4 |
comparison
equal
deleted
inserted
replaced
1535:7ae0ce7a3dc4 | 1540:8ca9f5b17257 |
---|---|
30 a = a.splitlines(1) | 30 a = a.splitlines(1) |
31 b = b.splitlines(1) | 31 b = b.splitlines(1) |
32 l = list(difflib.unified_diff(a, b, "a/" + fn, "b/" + fn)) | 32 l = list(difflib.unified_diff(a, b, "a/" + fn, "b/" + fn)) |
33 if not l: return "" | 33 if not l: return "" |
34 # difflib uses a space, rather than a tab | 34 # difflib uses a space, rather than a tab |
35 l[0] = l[0][:-2] + "\t" + ad + "\n" | 35 l[0] = "%s\t%s\n" % (l[0][:-2], ad) |
36 l[1] = l[1][:-2] + "\t" + bd + "\n" | 36 l[1] = "%s\t%s\n" % (l[1][:-2], bd) |
37 | 37 |
38 for ln in xrange(len(l)): | 38 for ln in xrange(len(l)): |
39 if l[ln][-1] != '\n': | 39 if l[ln][-1] != '\n': |
40 l[ln] += "\n\ No newline at end of file\n" | 40 l[ln] += "\n\ No newline at end of file\n" |
41 | 41 |