Mercurial > hg > pyhgsh

diff mercurial/mdiff.py @ 35:9197c26a414b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
unidiff: punt on comparing empty files
author mpm@selenic.com
date Sat, 07 May 2005 16:10:50 -0800
parents 9117c6561b0b
children b3e2ddff0159
line wrap: on
line diff
--- a/mercurial/mdiff.py	Sat May 07 11:37:28 2005 -0800
+++ b/mercurial/mdiff.py	Sat May 07 16:10:50 2005 -0800
@@ -3,9 +3,10 @@
 from cStringIO import StringIO
 
 def unidiff(a, b, fn):
+    if not a and not b: return ""
     a = a.splitlines(1)
     b = b.splitlines(1)
-    l = difflib.unified_diff(a, b, fn, fn)
+    l = list(difflib.unified_diff(a, b, fn, fn))
     return "".join(l)
 
 def textdiff(a, b):