Mercurial > public > mercurial-scm > hg-stable
diff mercurial/mdiff.py @ 1723:fde8fb2cbede
Fix diff against an empty file (issue124) and add a test for this.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Wed, 15 Feb 2006 14:22:16 +0100 |
parents | 3b1b44b917f4 |
children | 441ea218414e |
line wrap: on
line diff
--- a/mercurial/mdiff.py Wed Feb 15 04:37:47 2006 +0100 +++ b/mercurial/mdiff.py Wed Feb 15 14:22:16 2006 +0100 @@ -18,16 +18,22 @@ if not text and (util.binary(a) or util.binary(b)): l = ['Binary file %s has changed\n' % fn] - elif a == None: + elif not a: b = b.splitlines(1) - l1 = "--- %s\t%s\n" % ("/dev/null", epoch) + if a is None: + l1 = "--- %s\t%s\n" % ("/dev/null", epoch) + else: + l1 = "--- %s\t%s\n" % ("a/" + fn, ad) l2 = "+++ %s\t%s\n" % ("b/" + fn, bd) l3 = "@@ -0,0 +1,%d @@\n" % len(b) l = [l1, l2, l3] + ["+" + e for e in b] - elif b == None: + elif not b: a = a.splitlines(1) l1 = "--- %s\t%s\n" % ("a/" + fn, ad) - l2 = "+++ %s\t%s\n" % ("/dev/null", epoch) + if b is None: + l2 = "+++ %s\t%s\n" % ("/dev/null", epoch) + else: + l2 = "+++ %s\t%s\n" % ("b/" + fn, bd) l3 = "@@ -1,%d +0,0 @@\n" % len(a) l = [l1, l2, l3] + ["-" + e for e in a] else: