@matheusbsbs / matheus-bagliano / commits / 1f2cecfd53
Fork 0

gitk: Display submodule diffs with appropriate encoding

Previously, when submodule commit headings contained non-latin-1 characters, they were displayed incorrectly in gitk, because $line was not properly decoded, for example: ----------------------------- Documentation/Dokko ----------------------------- Submodule Documentation/Dokko 2ca20c7..0ea204d: > Протоколы сопряжения ИМС "Мостик-21631" (ЛИ2 и Сандал) > hardware: документация на InnoDisk SATA 10000 > hardware: документация на IEI PCISA-6770E2 v3.0 > hardware: документация на Fastwel NIB941 > hardware: документация на IEI IPX-9S > hardware: документация на Hirschmann 5TX-EEC instead of ----------------------------- Documentation/Dokko ----------------------------- Submodule Documentation/Dokko 2ca20c7..0ea204d: > Протоколы сопряжения ИМС "Мостик-21631" (ЛИ2 и Сандал) > hardware: документация на InnoDisk SATA 10000 > hardware: документация на IEI PCISA-6770E2 v3.0 > hardware: документация на Fastwel NIB941 > hardware: документация на IEI IPX-9S > hardware: документация на Hirschmann 5TX-EEC This fixes it. Signed-off-by: Kirill Smelkov <kirr@landau.phys.spbu.ru> Signed-off-by: Paul Mackerras <paulus@samba.org>

Kirill Smelkov committed Jan 5, 2010 at 15:44 UTC 1f2cecfd53137b76d39b2dcd7bcf7e918cd745b3
1 file changed +2
gitk
+2
@@ -7689,8 +7689,10 @@ proc getblobdiffline {bdf ids} {
7689 makediffhdr $fname $ids
7690 $ctext insert end "\n$line\n" filesep
7691 } elseif {![string compare -length 3 " >" $line]} {
7692 + set line [encoding convertfrom $diffencoding $line]
7693 $ctext insert end "$line\n" dresult
7694 } elseif {![string compare -length 3 " <" $line]} {
7695 + set line [encoding convertfrom $diffencoding $line]
7696 $ctext insert end "$line\n" d0
7697 } elseif {$diffinhdr} {
7698 if {![string compare -length 12 "rename from " $line]} {