gitk: Fixing file name encoding issues

[kkato233]

fix: file name encoding issues.
fix: when resolving merge conflicts, japanese file names become garbled.

Cc: Johannes Sixt [email protected]

[kkato233]

encoding system utf-8

Handling UTF-8 encoding for file names in parameters when wish executes git commands.

https://www.tcl.tk/man/tcl/TclCmd/encoding.htm

encoding system ?encoding?
Set the system encoding to encoding. 
If encoding is omitted then the command returns the current system encoding. 
The system encoding is used whenever Tcl passes strings to system calls.

[kkato233]

in function parseblobdiffline

git command

git diff-tree -r -p --textconv --submodule -C --cc --no-commit-id -U6 --root $ids

result text ex.

diff --cc あいう.txt
index ac63e4b,33b5521..30899db
--- a/あいう.txt
+++ b/あいう.txt
@@@ -1,2 -1,2 +1,3 @@@
  あいう
 +456
+ １２３

Fixed an issue with retrieving file names.

[kkato233]

example code

git checkout -b master
echo "あいう" > あいう.txt
git add *
git commit -m "add あいう"

git checkout -b A
echo "１２３" >> あいう.txt
git add *
git commit -m "add 123"

git checkout -b B master
echo "456" >> あいう.txt
git add *
git commit -m "add 456"

git merge A
... fix conflict ...

gitk

fix in

[kkato233]

git add *
git commit -m "fix comflict"

gitk

fix it

[kkato233]

gitk あいう.txt

あいう.txt file not found

fix it

Based on the information from https://www.tcl.tk/man/tcl/TclCmd/encoding.htm

encoding system ?encoding?
Set the system encoding to encoding. 
If encoding is omitted then the command returns the current system encoding. 
The system encoding is used whenever Tcl passes strings to system calls.

This ensures that command line parameters passed when calling Git commands are treated as UTF-8 instead of SJIS (or ANSI) .

after fix it

[kkato233]

@j6t @avih

I reviewed the changes in the pull request at #7

[kkato233]

see git file name encoding UTF-8 documents.

https://git-scm.com/docs/git-commit/2.13.7#_discussion

[j6t]

Please let's continue in #7. Please participate in the conversation there.

I see you insist in encoding system utf-8, but you did not provide an explanation why it is needed.

It is unclear what you want to tell us with the reference to the git-commit manual page.