Mercurial > hg > pyhgsh

comparison 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
comparison
equal deleted inserted replaced
34:8708c75da2ac 35:9197c26a414b
1 #!/usr/bin/python 1 #!/usr/bin/python
2 import difflib, struct 2 import difflib, struct
3 from cStringIO import StringIO 3 from cStringIO import StringIO
4 4
5 def unidiff(a, b, fn): 5 def unidiff(a, b, fn):
6 if not a and not b: return ""
6 a = a.splitlines(1) 7 a = a.splitlines(1)
7 b = b.splitlines(1) 8 b = b.splitlines(1)
8 l = difflib.unified_diff(a, b, fn, fn) 9 l = list(difflib.unified_diff(a, b, fn, fn))
9 return "".join(l) 10 return "".join(l)
10 11
11 def textdiff(a, b): 12 def textdiff(a, b):
12 return diff(a.splitlines(1), b.splitlines(1)) 13 return diff(a.splitlines(1), b.splitlines(1))
13 14