git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH RFC] gitk: display submodule diffs with appropriate encoding
@ 2010-01-05 12:44 Kirill Smelkov
  2010-01-12 11:23 ` Paul Mackerras
  0 siblings, 1 reply; 2+ messages in thread
From: Kirill Smelkov @ 2010-01-05 12:44 UTC (permalink / raw)
  To: Paul Mackerras; +Cc: Kirill Smelkov, git

Previsously, when submodule commits headings contained non-latin-1
characters, they were displayed incorrectly in gitk, because $line was
not properly decoded, i.e.

----------------------------- 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>
---
 gitk |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/gitk b/gitk
index 86dff0f..0edef8f 100755
--- a/gitk
+++ b/gitk
@@ -7689,8 +7689,10 @@ proc getblobdiffline {bdf ids} {
 	    makediffhdr $fname $ids
 	    $ctext insert end "\n$line\n" filesep
 	} elseif {![string compare -length 3 "  >" $line]} {
+	    set line [encoding convertfrom $diffencoding $line]
 	    $ctext insert end "$line\n" dresult
 	} elseif {![string compare -length 3 "  <" $line]} {
+	    set line [encoding convertfrom $diffencoding $line]
 	    $ctext insert end "$line\n" d0
 	} elseif {$diffinhdr} {
 	    if {![string compare -length 12 "rename from " $line]} {
-- 
1.6.6.78.gbd757c.dirty

^ permalink raw reply related	[flat|nested] 2+ messages in thread
* Re: [PATCH RFC] gitk: display submodule diffs with appropriate encoding
  2010-01-05 12:44 [PATCH RFC] gitk: display submodule diffs with appropriate encoding Kirill Smelkov
@ 2010-01-12 11:23 ` Paul Mackerras
  0 siblings, 0 replies; 2+ messages in thread
From: Paul Mackerras @ 2010-01-12 11:23 UTC (permalink / raw)
  To: Kirill Smelkov; +Cc: git

On Tue, Jan 05, 2010 at 03:44:54PM +0300, Kirill Smelkov wrote:

> Previsously, when submodule commits headings contained non-latin-1
> characters, they were displayed incorrectly in gitk, because $line was
> not properly decoded, i.e.

Thanks, applied.

Paul.

^ permalink raw reply	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-01-12 11:23 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2010-01-05 12:44 [PATCH RFC] gitk: display submodule diffs with appropriate encoding Kirill Smelkov
2010-01-12 11:23 ` Paul Mackerras

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).