Mercurial > hg
comparison mercurial/mdiff.py @ 170:e6c621a825f2
hg diff: fix missing final newline bug
author | mpm@selenic.com |
---|---|
date | Thu, 26 May 2005 13:02:28 -0800 |
parents | 44538462d3c8 |
children | 697f05bfe976 |
comparison
equal
deleted
inserted
replaced
169:e93a16de0c66 | 170:e6c621a825f2 |
---|---|
5 def unidiff(a, ad, b, bd, fn): | 5 def unidiff(a, ad, b, bd, fn): |
6 if not a and not b: return "" | 6 if not a and not b: return "" |
7 a = a.splitlines(1) | 7 a = a.splitlines(1) |
8 b = b.splitlines(1) | 8 b = b.splitlines(1) |
9 l = list(difflib.unified_diff(a, b, "a/" + fn, "b/" + fn, ad, bd)) | 9 l = list(difflib.unified_diff(a, b, "a/" + fn, "b/" + fn, ad, bd)) |
10 | |
11 for ln in xrange(len(l)): | |
12 if l[ln][-1] != '\n': | |
13 l[ln] += "\n\ No newline at end of file\n" | |
14 | |
10 return "".join(l) | 15 return "".join(l) |
11 | 16 |
12 def textdiff(a, b): | 17 def textdiff(a, b): |
13 return diff(a.splitlines(1), b.splitlines(1)) | 18 return diff(a.splitlines(1), b.splitlines(1)) |
14 | 19 |