# HG changeset patch # User mpm@selenic.com # Date 1118163185 28800 # Node ID 467cea2bf2d8e06d05e5e33801e3bdf4004a4a05 # Parent 35acefbf0ae60e259f590cd317e394f86356e176 diff: use tab to separate date from filename -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 diff: use tab to separate date from filename manifest hash: 73812de990e0e787320c11f7bd83c4ca91a52c4c -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (GNU/Linux) iD8DBQFCpdDxywK+sNU5EO8RAhKwAKCFcUa/p6ALbjoOl4I8VKJknZtu7gCdFvoE HQn1iq4gnJoeurB7YLMRpqc= =ltYP -----END PGP SIGNATURE----- diff --git a/mercurial/mdiff.py b/mercurial/mdiff.py --- a/mercurial/mdiff.py +++ b/mercurial/mdiff.py @@ -26,7 +26,10 @@ def unidiff(a, ad, b, bd, fn): else: a = a.splitlines(1) b = b.splitlines(1) - l = list(difflib.unified_diff(a, b, "a/" + fn, "b/" + fn, ad, bd)) + l = list(difflib.unified_diff(a, b, "a/" + fn, "b/" + fn)) + # difflib uses a space, rather than a tab + l[0] = l[0][:-2] + "\t" + ad + "\n" + l[1] = l[1][:-2] + "\t" + bd + "\n" for ln in xrange(len(l)): if l[ln][-1] != '\n':