[PATCH RFC] gitk: display submodule diffs with appropriate encoding

Kirill Smelkov· Jan 5, 2010, 12:44 UTC · lore

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(-)

Show changes to gitk +2 −0

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

Paul Mackerras· Jan 12, 2010, 11:23 UTC · re: Kirill Smelkov · lore

Re: [PATCH RFC] gitk: display submodule diffs with appropriate encoding

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.

RFC patchgitk: display submodule diffs with appropriate encoding