#
# Authors: Olivier MATZ <zer0@droids-corp.org>
# Alan De Smet <adesmet@cs.wisc.edu>
+# Sergey Satskiy <sergey.satskiy@gmail.com>
#
# Inspired by diff2html.rb from Dave Burt <dave (at) burt.id.au>
# (mainly for html theme)
# and display those directly.
-import sys, re, htmlentitydefs, getopt
+import sys, re, htmlentitydefs, getopt, StringIO
# minimum line size, we add a zero-sized breakable space every
# LINESIZE characters
linesize = 20
tabsize = 8
-inputfile = sys.stdin
-outputfile = sys.stdout
-exclude_headers = False
show_CR = False
-show_hunk_infos = False
-html_hdr="""<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+html_hdr = """<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
<html><head>
<meta name="generator" content="diff2html.rb" />
<title>HTML Diff</title>
<body>
"""
-html_footer="""
+html_footer = """
</body></html>
"""
-table_hdr="""
+table_hdr = """
<table class="diff">
"""
-table_footer="""
+table_footer = """
</table>
"""
-DIFFON="\x01"
-DIFFOFF="\x02"
+DIFFON = "\x01"
+DIFFOFF = "\x02"
-buf=[]
-add_cpt, del_cpt = 0,0
-line1, line2 = 0,0
-hunk_off1, hunk_size1, hunk_off2, hunk_size2 = 0,0,0,0
+buf = []
+add_cpt, del_cpt = 0, 0
+line1, line2 = 0, 0
+hunk_off1, hunk_size1, hunk_off2, hunk_size2 = 0, 0, 0, 0
# Characters we're willing to word wrap on
-WORDBREAK=" \t;.,/):"
+WORDBREAK = " \t;.,/):"
def sane(x):
- r=""
+ r = ""
for i in x:
j = ord(i)
if i not in ['\t', '\n'] and ((j < 32) or (j >= 127)):
- r=r+"."
+ r = r + "."
else:
- r=r+i
+ r = r + i
return r
def linediff(s, t):
if len(s):
- s=str(reduce(lambda x,y:x+y, [ sane(c) for c in s ]))
+ s = str(reduce(lambda x, y:x+y, [ sane(c) for c in s ]))
if len(t):
- t=str(reduce(lambda x,y:x+y, [ sane(c) for c in t ]))
-
- m,n = len(s), len(t)
- d=[[(0,0) for i in range(n+1)] for i in range(m+1)]
- x=[[(0,0) for i in range(n+1)] for i in range(m+1)]
-
-
- d[0][0] = (0, (0,0))
+ t = str(reduce(lambda x, y:x+y, [ sane(c) for c in t ]))
+
+ m, n = len(s), len(t)
+ d = [[(0, 0) for i in range(n+1)] for i in range(m+1)]
+ x = [[(0, 0) for i in range(n+1)] for i in range(m+1)]
+
+
+ d[0][0] = (0, (0, 0))
for i in range(m+1)[1:]:
- d[i][0] = (i,(i-1,0))
+ d[i][0] = (i,(i-1, 0))
for j in range(n+1)[1:]:
- d[0][j] = (j,(0,j-1))
+ d[0][j] = (j,(0, j-1))
for i in range(m+1)[1:]:
for j in range(n+1)[1:]:
cost = 0
else:
cost = 1
- d[i][j] = min((d[i-1][j][0] + 1, (i-1,j)),
- (d[i][j-1][0] + 1, (i,j-1)),
- (d[i-1][j-1][0] + cost, (i-1,j-1)))
-
- l=[]
- coord = (m,n)
- while coord != (0,0):
+ d[i][j] = min((d[i-1][j][0] + 1, (i-1, j)),
+ (d[i][j-1][0] + 1, (i, j-1)),
+ (d[i-1][j-1][0] + cost, (i-1, j-1)))
+
+ l = []
+ coord = (m, n)
+ while coord != (0, 0):
l.insert(0, coord)
- x,y = coord
+ x, y = coord
coord = d[x][y][1]
l1 = []
l2 = []
for coord in l:
- cx,cy = coord
+ cx, cy = coord
child_val = d[cx][cy][0]
-
+
father_coord = d[cx][cy][1]
- fx,fy = father_coord
+ fx, fy = father_coord
father_val = d[fx][fy][0]
diff = (cx-fx, cy-fy)
- if diff == (0,1):
+ if diff == (0, 1):
l1.append("")
l2.append(DIFFON + t[fy] + DIFFOFF)
- elif diff == (1,0):
+ elif diff == (1, 0):
l1.append(DIFFON + s[fx] + DIFFOFF)
l2.append("")
elif child_val-father_val == 1:
l1.append(s[fx])
l2.append(t[fy])
- r1,r2 = (reduce(lambda x,y:x+y, l1), reduce(lambda x,y:x+y, l2))
- return r1,r2
+ r1, r2 = (reduce(lambda x, y:x+y, l1), reduce(lambda x, y:x+y, l2))
+ return r1, r2
def convert(s, linesize=0, ponct=0):
- i=0
- t=""
- l=[]
+ i = 0
+ t = ""
for c in s:
# used by diffs
- if c==DIFFON:
+ if c == DIFFON:
t += '<span class="diffchanged2">'
- elif c==DIFFOFF:
+ elif c == DIFFOFF:
t += "</span>"
# special html chars
elif htmlentitydefs.codepoint2name.has_key(ord(c)):
- t += "&%s;"%(htmlentitydefs.codepoint2name[ord(c)])
+ t += "&%s;" % (htmlentitydefs.codepoint2name[ord(c)])
i += 1
# special highlighted chars
- elif c=="\t" and ponct==1:
+ elif c == "\t" and ponct == 1:
n = tabsize-(i%tabsize)
- if n==0:
- n=tabsize
+ if n == 0:
+ n = tabsize
t += ('<span class="diffponct">»</span>'+' '*(n-1))
- elif c==" " and ponct==1:
+ elif c == " " and ponct == 1:
t += '<span class="diffponct">·</span>'
- elif c=="\n" and ponct==1:
+ elif c == "\n" and ponct == 1:
if show_CR:
t += '<span class="diffponct">\</span>'
else:
t += c
i += 1
- if linesize and (WORDBREAK.count(c)==1):
+ if linesize and (WORDBREAK.count(c) == 1):
t += '​'
- i=0
- if linesize and i>linesize:
- i=0
+ i = 0
+ if linesize and i > linesize:
+ i = 0
t += "​"
-
+
return t
-def add_comment(s):
- outputfile.write('<tr class="diffmisc"><td colspan="4">%s</td></tr>\n'%convert(s))
+def add_comment(s, output_file):
+ output_file.write('<tr class="diffmisc"><td colspan="4">%s</td></tr>\n'%convert(s))
-def add_filename(f1, f2):
- outputfile.write("<tr><th colspan='2'>%s</th>"%convert(f1, linesize=linesize))
- outputfile.write("<th colspan='2'>%s</th></tr>\n"%convert(f2, linesize=linesize))
+def add_filename(f1, f2, output_file):
+ output_file.write("<tr><th colspan='2'>%s</th>"%convert(f1, linesize=linesize))
+ output_file.write("<th colspan='2'>%s</th></tr>\n"%convert(f2, linesize=linesize))
-def add_hunk():
- global hunk_off1, hunk_size1, hunk_off2, hunk_size2
- global show_hunk_infos
+def add_hunk(output_file, show_hunk_infos):
if show_hunk_infos:
- outputfile.write('<tr class="diffhunk"><td colspan="2">Offset %d, %d lines modified</td>'%(hunk_off1, hunk_size1))
- outputfile.write('<td colspan="2">Offset %d, %d lines modified</td></tr>\n'%(hunk_off2, hunk_size2))
+ output_file.write('<tr class="diffhunk"><td colspan="2">Offset %d, %d lines modified</td>'%(hunk_off1, hunk_size1))
+ output_file.write('<td colspan="2">Offset %d, %d lines modified</td></tr>\n'%(hunk_off2, hunk_size2))
else:
# ⋮ - vertical ellipsis
- outputfile.write('<tr class="diffhunk"><td colspan="2">⋮</td><td colspan="2">⋮</td></tr>');
+ output_file.write('<tr class="diffhunk"><td colspan="2">⋮</td><td colspan="2">⋮</td></tr>')
-def add_line(s1, s2):
+def add_line(s1, s2, output_file):
global line1
global line2
- if s1==None and s2==None:
- type="unmodified"
- elif s1==None or s1=="":
- type="added"
- elif s2==None or s1=="":
- type="deleted"
- elif s1==s2:
- type="unmodified"
+ if s1 == None and s2 == None:
+ type_name = "unmodified"
+ elif s1 == None or s1 == "":
+ type_name = "added"
+ elif s2 == None or s1 == "":
+ type_name = "deleted"
+ elif s1 == s2:
+ type_name = "unmodified"
else:
- type="changed"
- s1,s2 = linediff(s1, s2)
-
- outputfile.write('<tr class="diff%s">'%type)
- if s1!=None and s1!="":
- outputfile.write('<td class="diffline">%d </td>'%line1)
- outputfile.write('<td class="diffpresent">')
- outputfile.write(convert(s1, linesize=linesize, ponct=1))
- outputfile.write('</td>')
+ type_name = "changed"
+ s1, s2 = linediff(s1, s2)
+
+ output_file.write('<tr class="diff%s">' % type_name)
+ if s1 != None and s1 != "":
+ output_file.write('<td class="diffline">%d </td>' % line1)
+ output_file.write('<td class="diffpresent">')
+ output_file.write(convert(s1, linesize=linesize, ponct=1))
+ output_file.write('</td>')
else:
- s1=""
- outputfile.write('<td colspan="2"> </td>')
-
- if s2!=None and s2!="":
- outputfile.write('<td class="diffline">%d </td>'%line2)
- outputfile.write('<td class="diffpresent">')
- outputfile.write(convert(s2, linesize=linesize, ponct=1))
- outputfile.write('</td>')
+ s1 = ""
+ output_file.write('<td colspan="2"> </td>')
+
+ if s2 != None and s2 != "":
+ output_file.write('<td class="diffline">%d </td>'%line2)
+ output_file.write('<td class="diffpresent">')
+ output_file.write(convert(s2, linesize=linesize, ponct=1))
+ output_file.write('</td>')
else:
- s2=""
- outputfile.write('<td colspan="2"></td>')
+ s2 = ""
+ output_file.write('<td colspan="2"></td>')
- outputfile.write('</tr>\n')
+ output_file.write('</tr>\n')
- if s1!="":
+ if s1 != "":
line1 += 1
- if s2!="":
+ if s2 != "":
line2 += 1
-def empty_buffer():
+def empty_buffer(output_file):
global buf
global add_cpt
global del_cpt
if del_cpt == 0 or add_cpt == 0:
for l in buf:
- add_line(l[0], l[1])
+ add_line(l[0], l[1], output_file)
elif del_cpt != 0 and add_cpt != 0:
l0, l1 = [], []
l0.append(l[0])
if l[1] != None:
l1.append(l[1])
- max = (len(l0) > len(l1)) and len(l0) or len(l1)
- for i in range(max):
+ max_len = (len(l0) > len(l1)) and len(l0) or len(l1)
+ for i in range(max_len):
s0, s1 = "", ""
- if i<len(l0):
+ if i < len(l0):
s0 = l0[i]
- if i<len(l1):
+ if i < len(l1):
s1 = l1[i]
- add_line(s0, s1)
-
- add_cpt, del_cpt = 0,0
+ add_line(s0, s1, output_file)
+
+ add_cpt, del_cpt = 0, 0
buf = []
-def parse_input():
- global buf, add_cpt, del_cpt
+def parse_input(input_file, output_file,
+ exclude_headers, show_hunk_infos):
+ global add_cpt, del_cpt
global line1, line2
global hunk_off1, hunk_size1, hunk_off2, hunk_size2
if not exclude_headers:
- outputfile.write(html_hdr)
- outputfile.write(table_hdr)
-
+ output_file.write(html_hdr)
+ output_file.write(table_hdr)
+
while True:
- l=inputfile.readline()
- if l=="":
+ l = input_file.readline()
+ if l == "":
break
- m=re.match('^--- ([^\s]*)', l)
+ m = re.match('^--- ([^\s]*)', l)
if m:
- empty_buffer()
- file1=m.groups()[0]
- l=inputfile.readline()
- m=re.match('^\+\+\+ ([^\s]*)', l)
- if m:
- file2=m.groups()[0]
- add_filename(file1, file2)
- hunk_off1, hunk_size1, hunk_off2, hunk_size2 = 0,0,0,0
+ empty_buffer(output_file)
+ file1 = m.groups()[0]
+ while True:
+ l = input_file.readline()
+ m = re.match('^\+\+\+ ([^\s]*)', l)
+ if m:
+ file2 = m.groups()[0]
+ break
+ add_filename(file1, file2, output_file)
+ hunk_off1, hunk_size1, hunk_off2, hunk_size2 = 0, 0, 0, 0
continue
- m=re.match("@@ -(\d+),?(\d*) \+(\d+),?(\d*)", l)
+ m = re.match("@@ -(\d+),?(\d*) \+(\d+),?(\d*)", l)
if m:
- empty_buffer()
+ empty_buffer(output_file)
hunk_data = map(lambda x:x=="" and 1 or int(x), m.groups())
hunk_off1, hunk_size1, hunk_off2, hunk_size2 = hunk_data
line1, line2 = hunk_off1, hunk_off2
- add_hunk()
+ add_hunk(output_file, show_hunk_infos)
continue
if hunk_size1 == 0 and hunk_size2 == 0:
- empty_buffer()
- add_comment(l)
+ empty_buffer(output_file)
+ add_comment(l, output_file)
continue
if re.match("^\+", l):
continue
if re.match("^\ ", l) and hunk_size1 and hunk_size2:
- empty_buffer()
+ empty_buffer(output_file)
hunk_size1 -= 1
hunk_size2 -= 1
buf.append((l[1:], l[1:]))
continue
- empty_buffer()
- add_comment(l)
+ empty_buffer(output_file)
+ add_comment(l, output_file)
- empty_buffer()
- outputfile.write(table_footer)
+ empty_buffer(output_file)
+ output_file.write(table_footer)
if not exclude_headers:
- outputfile.write(html_footer)
+ output_file.write(html_footer)
def usage():
def main():
global linesize, tabsize
- global inputfile, outputfile
- global exclude_headers, show_CR, show_hunk_infos
+ global show_CR
+
+ input_file = sys.stdin
+ output_file = sys.stdout
+
+ exclude_headers = False
+ show_hunk_infos = False
try:
opts, args = getopt.getopt(sys.argv[1:], "hi:o:xt:l:rk",
print str(err) # will print something like "option -a not recognized"
usage()
sys.exit(2)
- output = None
verbose = False
for o, a in opts:
if o in ("-h", "--help"):
usage()
sys.exit()
elif o in ("-i", "--input"):
- inputfile = open(a, "r")
+ input_file = open(a, "r")
elif o in ("-o", "--output"):
- outputfile = open(a, "w")
+ output_file = open(a, "w")
elif o in ("-x", "--exclude-html-headers"):
exclude_headers = True
elif o in ("-t", "--tabsize"):
show_hunk_infos = True
else:
assert False, "unhandled option"
- parse_input()
+ parse_input(input_file, output_file,
+ exclude_headers, show_hunk_infos)
+
+def parse_from_memory(txt, exclude_headers, show_hunk_infos):
+ " Parses diff from memory and returns a string with html "
+ stream = StringIO.StringIO(txt)
+ parse_input(stream, stream, exclude_headers, show_hunk_infos)
+ return stream.buf
if __name__ == "__main__":
main()
git.droids-corp.org / diff2html.git / blobdiff