·')
- t = t.replace("spanclass", "span class")
-
+
+ if linesize and (WORDBREAK.count(c) == 1):
+ t += u''
+ i = 0
+ if linesize and i > linesize:
+ i = 0
+ t += u""
+
return t
-def add_comment(s):
- sys.stdout.write('%s |
\n'%convert(s))
+def add_comment(s, output_file):
+ output_file.write(('%s |
\n'%convert(s)).encode(encoding))
-def add_filename(f1, f2):
- sys.stdout.write("%s | "%convert(f1, linesize=LINESIZE))
- sys.stdout.write("%s |
\n"%convert(f2, linesize=LINESIZE))
-def add_hunk():
- global hunk_off1
- global hunk_size1
- global hunk_off2
- global hunk_size2
- sys.stdout.write('Offset %d, %d lines modified | '%(hunk_off1, hunk_size1))
- sys.stdout.write('Offset %d, %d lines modified |
\n'%(hunk_off2, hunk_size2))
+def add_filename(f1, f2, output_file):
+ output_file.write(("%s | "%convert(f1, linesize=linesize)).encode(encoding))
+ output_file.write(("%s |
\n"%convert(f2, linesize=linesize)).encode(encoding))
-def add_line(s1, s2):
+
+def add_hunk(output_file, show_hunk_infos):
+ if show_hunk_infos:
+ output_file.write('Offset %d, %d lines modified | '%(hunk_off1, hunk_size1))
+ output_file.write('Offset %d, %d lines modified |
\n'%(hunk_off2, hunk_size2))
+ else:
+ # ⋮ - vertical ellipsis
+ output_file.write('⋮ | ⋮ |
')
+
+
+def add_line(s1, s2, output_file):
global line1
global line2
- if s1==None and s2==None:
- type="unmodified"
- elif s1==None:
- type="added"
- elif s2==None:
- 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)
-
- sys.stdout.write(''%type)
- if s1!=None and s1!="":
- sys.stdout.write('%d | '%line1)
- sys.stdout.write('')
- sys.stdout.write(convert(s1, linesize=LINESIZE, ponct=1))
- sys.stdout.write(' | ')
+ type_name = "changed"
+ s1, s2 = linediff(s1, s2)
+
+ output_file.write(('
' % type_name).encode(encoding))
+ if s1 != None and s1 != "":
+ output_file.write(('%d | ' % line1).encode(encoding))
+ output_file.write(''.encode(encoding))
+ output_file.write(convert(s1, linesize=linesize, ponct=1).encode(encoding))
+ output_file.write(' | ')
else:
- s1=""
- sys.stdout.write(' | ')
-
- if s2!=None and s2!="":
- sys.stdout.write('%d | '%line2)
- sys.stdout.write('')
- sys.stdout.write(convert(s2, linesize=LINESIZE, ponct=1))
- sys.stdout.write(' | ')
+ s1 = ""
+ output_file.write(' | ')
+
+ if s2 != None and s2 != "":
+ output_file.write(('%d | '%line2).encode(encoding))
+ output_file.write('')
+ output_file.write(convert(s2, linesize=linesize, ponct=1).encode(encoding))
+ output_file.write(' | ')
else:
- s2=""
- sys.stdout.write(' | ')
+ s2 = ""
+ output_file.write(' | ')
- sys.stdout.write('
\n')
+ output_file.write('\n')
- if s1!="":
+ if s1 != "":
line1 += 1
- if s2!="":
+ if s2 != "":
line2 += 1
-def empty_buffer():
- global 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 buffer:
- add_line(l[0], l[1])
+ for l in buf:
+ add_line(l[0], l[1], output_file)
elif del_cpt != 0 and add_cpt != 0:
l0, l1 = [], []
- for l in buffer:
+ for l in buf:
if l[0] != None:
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