Mercurial > hg

diff mercurial/mdiff.py @ 272:467cea2bf2d8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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-----
author mpm@selenic.com
date Tue, 07 Jun 2005 08:53:05 -0800
parents 4c1d7072d5cd
children 777e388c06d6
line wrap: on
line diff
--- a/mercurial/mdiff.py	Tue Jun 07 00:21:53 2005 -0800
+++ b/mercurial/mdiff.py	Tue Jun 07 08:53:05 2005 -0800
@@ -26,7 +26,10 @@
     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':