# Transform a unified diff from stdin to a colored
# side-by-side HTML page on stdout.
#
-# Authors: Olivier MATZ <zer0@droids-corp.org>
+# Authors: Olivier Matz <zer0@droids-corp.org>
# Alan De Smet <adesmet@cs.wisc.edu>
# Sergey Satskiy <sergey.satskiy@gmail.com>
# scito <info at scito.ch>
#
# TODO:
# - The sane function currently mashes non-ASCII characters to "."
-# Instead be clever and convert to something like "xF0"
+# Instead be clever and convert to something like "xF0"
# (the hex value), and mark with a <span>. Even more clever:
# Detect if the character is "printable" for whatever definition,
# and display those directly.
-
-import sys, re, htmlentitydefs, getopt, StringIO, codecs
+import sys, re, htmlentitydefs, getopt, StringIO, codecs, datetime
+try:
+ from simplediff import diff, string_diff
+except ImportError:
+ sys.stderr.write("info: simplediff module not found, only linediff is available\n")
+ sys.stderr.write("info: it can be downloaded at https://github.com/paulgb/simplediff\n")
# minimum line size, we add a zero-sized breakable space every
# LINESIZE characters
tabsize = 8
show_CR = False
encoding = "utf-8"
+lang = "en"
+algorithm = 0
+desc = "File comparison"
+dtnow = datetime.datetime.now()
+modified_date = "%s+01:00"%dtnow.isoformat()
html_hdr = """<!DOCTYPE html>
-<html><head>
- <meta charset="{0}" />
- <meta name="generator" content="diff2html.rb" />
- <title>HTML Diff</title>
- <style>
- table {{ border:0px; border-collapse:collapse; width: 100%; font-size:0.75em; font-family: Lucida Console, monospace }}
- td.line {{ color:#8080a0 }}
- th {{ background: black; color: white }}
- tr.diffunmodified td {{ background: #D0D0E0 }}
- tr.diffhunk td {{ background: #A0A0A0 }}
- tr.diffadded td {{ background: #CCFFCC }}
- tr.diffdeleted td {{ background: #FFCCCC }}
- tr.diffchanged td {{ background: #FFFFA0 }}
- span.diffchanged2 {{ background: #E0C880 }}
- span.diffponct {{ color: #B08080 }}
- tr.diffmisc td {{}}
- tr.diffseparator td {{}}
- </style>
- </head>
- <body>
+<html lang="{5}" dir="ltr"
+ xmlns:dc="http://purl.org/dc/terms/">
+<head>
+ <meta charset="{1}" />
+ <meta name="generator" content="diff2html.py (http://git.droids-corp.org/gitweb/?p=diff2html)" />
+ <!--meta name="author" content="Fill in" /-->
+ <title>HTML Diff{0}</title>
+ <link rel="shortcut icon" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQAgMAAABinRfyAAAACVBMVEXAAAAAgAD///+K/HwIAAAAJUlEQVQI12NYBQQM2IgGBQ4mCIEQW7oyK4phampkGIQAc1G1AQCRxCNbyW92oQAAAABJRU5ErkJggg==" type="image/png" />
+ <meta property="dc:language" content="{5}" />
+ <!--meta property="dc:date" content="{3}" /-->
+ <meta property="dc:modified" content="{4}" />
+ <meta name="description" content="{2}" />
+ <meta property="dc:abstract" content="{2}" />
+ <style>
+ table {{ border:0px; border-collapse:collapse; width: 100%; font-size:0.75em; font-family: Lucida Console, monospace }}
+ td.line {{ color:#8080a0 }}
+ th {{ background: black; color: white }}
+ tr.diffunmodified td {{ background: #D0D0E0 }}
+ tr.diffhunk td {{ background: #A0A0A0 }}
+ tr.diffadded td {{ background: #CCFFCC }}
+ tr.diffdeleted td {{ background: #FFCCCC }}
+ tr.diffchanged td {{ background: #FFFFA0 }}
+ span.diffchanged2 {{ background: #E0C880 }}
+ span.diffponct {{ color: #B08080 }}
+ tr.diffmisc td {{}}
+ tr.diffseparator td {{}}
+ </style>
+</head>
+<body>
"""
html_footer = """
+<footer>
+ <p>Modified at {1}. HTML formatting created by <a href="http://git.droids-corp.org/gitweb/?p=diff2html;a=summary">diff2html</a>. </p>
+</footer>
</body></html>
"""
# Characters we're willing to word wrap on
-WORDBREAK = " \t;.,/):"
+WORDBREAK = " \t;.,/):-"
def sane(x):
r = ""
return r
def linediff(s, t):
+ '''
+ Original line diff algorithm of diff2html. It's character based.
+ '''
if len(s):
s = unicode(reduce(lambda x, y:x+y, [ sane(c) for c in s ]))
if len(t):
return r1, r2
+def diff_changed(old, new):
+ '''
+ Returns the differences basend on characters between two strings
+ wrapped with DIFFON and DIFFOFF using `diff`.
+ '''
+ con = {'=': (lambda x: x),
+ '+': (lambda x: DIFFON + x + DIFFOFF),
+ '-': (lambda x: '')}
+ return "".join([(con[a])("".join(b)) for a, b in diff(old, new)])
+
+
+def diff_changed_ts(old, new):
+ '''
+ Returns a tuple for a two sided comparison based on characters, see `diff_changed`.
+ '''
+ return (diff_changed(new, old), diff_changed(old, new))
+
+
+def word_diff(old, new):
+ '''
+ Returns the difference between the old and new strings based on words. Punctuation is not part of the word.
+
+ Params:
+ old the old string
+ new the new string
+
+ Returns:
+ the output of `diff` on the two strings after splitting them
+ on whitespace (a list of change instructions; see the docstring
+ of `diff`)
+ '''
+ separator_pattern = '(\W+)';
+ return diff(re.split(separator_pattern, old, flags=re.UNICODE), re.split(separator_pattern, new, flags=re.UNICODE))
+
+
+def diff_changed_words(old, new):
+ '''
+ Returns the difference between two strings based on words (see `word_diff`)
+ wrapped with DIFFON and DIFFOFF.
+
+ Returns:
+ the output of the diff expressed delimited with DIFFON and DIFFOFF.
+ '''
+ con = {'=': (lambda x: x),
+ '+': (lambda x: DIFFON + x + DIFFOFF),
+ '-': (lambda x: '')}
+ return "".join([(con[a])("".join(b)) for a, b in word_diff(old, new)])
+
+
+def diff_changed_words_ts(old, new):
+ '''
+ Returns a tuple for a two sided comparison based on words, see `diff_changed_words`.
+ '''
+ return (diff_changed_words(new, old), diff_changed_words(old, new))
+
+
def convert(s, linesize=0, ponct=0):
i = 0
t = u""
global line1
global line2
+ orig1 = s1
+ orig2 = s2
+
if s1 == None and s2 == None:
type_name = "unmodified"
elif s1 == None or s1 == "":
type_name = "unmodified"
else:
type_name = "changed"
- s1, s2 = linediff(s1, s2)
+ if algorithm == 1:
+ s1, s2 = diff_changed_words_ts(orig1, orig2)
+ elif algorithm == 2:
+ s1, s2 = diff_changed_ts(orig1, orig2)
+ else: # default
+ s1, s2 = linediff(orig1, orig2)
output_file.write(('<tr class="diff%s">' % type_name).encode(encoding))
if s1 != None and s1 != "":
buf = []
-def parse_input(input_file, output_file,
+def parse_input(input_file, output_file, input_file_name, output_file_name,
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:
- output_file.write(html_hdr.format(encoding).encode(encoding))
+ title_suffix = ' ' + input_file_name
+ output_file.write(html_hdr.format(title_suffix, encoding, desc, "", modified_date, lang).encode(encoding))
output_file.write(table_hdr.encode(encoding))
while True:
empty_buffer(output_file)
output_file.write(table_footer.encode(encoding))
if not exclude_headers:
- output_file.write(html_footer.encode(encoding))
+ output_file.write(html_footer.format("", dtnow.strftime("%d.%m.%Y")).encode(encoding))
def usage():
-l linesize set maximum line size is there is no word break (default 20)
-r show \\r characters
-k show hunk infos
+ -a algo line diff algorithm (0: linediff characters, 1: word, 2: simplediff characters) (default 0)
-h show help and exit
'''
global linesize, tabsize
global show_CR
global encoding
+ global algorithm
- input_file = sys.stdin
- output_file = sys.stdout
+ input_file_name = ''
+ output_file_name = ''
exclude_headers = False
show_hunk_infos = False
try:
- opts, args = getopt.getopt(sys.argv[1:], "he:i:o:xt:l:rk",
+ opts, args = getopt.getopt(sys.argv[1:], "he:i:o:xt:l:rka:",
["help", "encoding=", "input=", "output=",
"exclude-html-headers", "tabsize=",
- "linesize=", "show-cr", "show-hunk-infos"])
+ "linesize=", "show-cr", "show-hunk-infos", "algorithm="])
except getopt.GetoptError, err:
print unicode(err) # will print something like "option -a not recognized"
usage()
encoding = a
elif o in ("-i", "--input"):
input_file = codecs.open(a, "r", encoding)
+ input_file_name = a
elif o in ("-o", "--output"):
output_file = codecs.open(a, "w")
+ output_file_name = a
elif o in ("-x", "--exclude-html-headers"):
exclude_headers = True
elif o in ("-t", "--tabsize"):
show_CR = True
elif o in ("-k", "--show-hunk-infos"):
show_hunk_infos = True
+ elif o in ("-a", "--algorithm"):
+ algorithm = int(a)
else:
assert False, "unhandled option"
- parse_input(input_file, output_file,
+
+ # Use stdin if not input file is set
+ if not ('input_file' in locals()):
+ input_file = codecs.getreader(encoding)(sys.stdin)
+
+ # Use stdout if not output file is set
+ if not ('output_file' in locals()):
+ output_file = codecs.getwriter(encoding)(sys.stdout)
+
+ parse_input(input_file, output_file, input_file_name, output_file_name,
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 "
input_stream = StringIO.StringIO(txt)
output_stream = StringIO.StringIO()
- parse_input(input_stream, output_stream, exclude_headers, show_hunk_infos)
+ parse_input(input_stream, output_stream, '', '', exclude_headers, show_hunk_infos)
return output_stream.getvalue()
git.droids-corp.org / diff2html.git / blobdiff