Kiln » TortoiseHg » TortoiseHg
Clone URL:  
Pushed to one repository · View In Graph Contained in 0.8, 0.8.1, and 0.8.2

merge with stable

Changeset 66f2921bbb9f…

Parents bb7a3caa41c4…

Parents 3cf9c40cd9de…

by Steve Borho

Changes to 2 files · Browse files at 66f2921bbb9f Showing diff from parent bb7a3caa41c4 3cf9c40cd9de Diff from another changeset...

Show Entire File hggtk/​bugreport.py Stacked
(No changes)
Change 1 of 2 Show Entire File hggtk/​status.py Stacked
 
910
911
912
 
 
913
914
915
 
928
929
930
931
 
 
 
 
932
933
934
 
910
911
912
913
914
915
916
917
 
930
931
932
 
933
934
935
936
937
938
939
@@ -910,6 +910,8 @@
  lines[-1] = lines[-1].strip('\n\r')   for line in lines:   line = gobject.markup_escape_text(hglib.toutf(line[:128])) + if line[-1] != '\n': + line += '\n'   if line.startswith('---') or line.startswith('+++'):   hunk += '<span foreground="#000090">%s</span>' % line   elif line.startswith('-'): @@ -928,7 +930,10 @@
  lines = fp.readlines()   lines[-1] = lines[-1].strip('\n\r')   for line in lines: - hunk += gobject.markup_escape_text(hglib.toutf(line[:128])) + line = gobject.markup_escape_text(hglib.toutf(line[:128])) + if line[-1] != '\n': + line += '\n' + hunk += line   return hunk     def dohgdiff():