- file2=m.groups()[0]
- add_filename(file1, file2)
- hunk_off1, hunk_size1, hunk_off2, hunk_size2 = 0,0,0,0
- continue
-
- m=re.match("@@ -(\d+),?(\d*) \+(\d+),?(\d*)", l)
- if m:
- empty_buffer()
- 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()
- continue
-
- if hunk_size1 == 0 and hunk_size2 == 0:
- empty_buffer()
- add_comment(l)
- continue
-
- if re.match("^\+", l):
- add_cpt += 1
- hunk_size2 -= 1
- buffer.append((None, l[1:]))
- continue
-
- if re.match("^\-", l):
- del_cpt += 1
- hunk_size1 -= 1
- buffer.append((l[1:], None))
- continue
-
- if re.match("^\ ", l) and hunk_size1 and hunk_size2:
- empty_buffer()
- hunk_size1 -= 1
- hunk_size2 -= 1
- buffer.append((l[1:], l[1:]))
- continue
-
- empty_buffer()
- add_comment(l)
-
-
-empty_buffer()
-sys.stdout.write(html_footer)
+ 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(output_file, show_hunk_infos)
+ continue
+
+ if hunk_size1 == 0 and hunk_size2 == 0:
+ empty_buffer(output_file)
+ add_comment(l, output_file)
+ continue
+
+ if re.match("^\+", l):
+ add_cpt += 1
+ hunk_size2 -= 1
+ buf.append((None, l[1:]))
+ continue
+
+ if re.match("^\-", l):
+ del_cpt += 1
+ hunk_size1 -= 1
+ buf.append((l[1:], None))
+ continue
+
+ if re.match("^\ ", l) and hunk_size1 and hunk_size2:
+ empty_buffer(output_file)
+ hunk_size1 -= 1
+ hunk_size2 -= 1
+ buf.append((l[1:], l[1:]))
+ continue
+
+ empty_buffer(output_file)
+ add_comment(l, output_file)
+
+ empty_buffer(output_file)
+ output_file.write(table_footer)
+ if not exclude_headers:
+ output_file.write(html_footer)
+
+
+def usage():
+ print '''
+diff2html.py [-i file] [-o file] [-x]
+diff2html.py -h
+
+Transform a unified diff from stdin to a colored side-by-side HTML
+page on stdout.
+
+ -i file set input file, else use stdin
+ -o file set output file, else use stdout
+ -x exclude html header and footer
+ -t tabsize set tab size (default 8)
+ -l linesize set maximum line size is there is no word break (default 20)
+ -r show \\r characters
+ -k show hunk infos
+ -h show help and exit
+'''
+
+def main():
+ global linesize, tabsize
+ 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",
+ ["help", "input=", "output=",
+ "exclude-html-headers", "tabsize=",
+ "linesize=", "show-cr", "show-hunk-infos"])
+ except getopt.GetoptError, err:
+ 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"):
+ input_file = open(a, "r")
+ elif o in ("-o", "--output"):
+ output_file = open(a, "w")
+ elif o in ("-x", "--exclude-html-headers"):
+ exclude_headers = True
+ elif o in ("-t", "--tabsize"):
+ tabsize = int(a)
+ elif o in ("-l", "--linesize"):
+ linesize = int(a)
+ elif o in ("-r", "--show-cr"):
+ show_CR = True
+ elif o in ("-k", "--show-hunk-infos"):
+ show_hunk_infos = True
+ else:
+ assert False, "unhandled option"
+ parse_input(input_file, output_file,
+ exclude_headers, show_hunk_infos)
+
+
+if __name__ == "__main__":
+ main()