First: a little "why": having /usr/bin/vim as PAGER allows to enter
UTF-8 commit messages quite easily, the problem is when git-log (or
cg-log) is run in terminal that's not UTF-8. In my case: terminal is
ISO-8859-2 and:
nelchael@nelchael ~$ cat ~/.vimrc | grep gitci
au BufRead /tmp/gitci* setlocal textwidth=75 fileencoding=utf-8
encoding=utf-8 fileencodings=utf-8,default
So... having {git,cg}-log recode the log entires when displaying is
quite useful. Two patches attached:
a. git-log-recode.patch - uses iconv to recode the log output to
GIT_LOG_RECODE encoding
b. cg-log-recode.patch - the same, but for cogito
With this patches it's possible to write UTF-8 commit messages and see
them ok in non-UTF-8 terminal in log by having GIT_LOG_RECODE=iso-8859-2.
Comments?
--
Krzysiek Pawlik (Nelchael)
RLU #322999 GPG Key ID: 0xBC555551
--- /usr/bin/cg-log 2006-01-19 17:22:22.000000000 +0100
+++ bin/cg-log 2006-02-27 00:59:07.000000000 +0100
@@ -348,13 +348,21 @@
if [ "$shortlog" ]; then
# Special care here.
- $revls $sep "${ARGS[@]}" | git-shortlog | pager
+ if [ -n "${GIT_LOG_RECODE}" ]; then
+ $revls $sep "${ARGS[@]}" | git-shortlog | iconv --from-code=UTF-8 --to-code="${GIT_LOG_RECODE}" | pager
+ else
+ $revls $sep "${ARGS[@]}" | git-shortlog | pager
+ fi
exit
fi
# LESS="S" will prevent less to wrap too long titles to multiple lines;
# you can scroll horizontally.
-$revls $sep "${ARGS[@]}" | print_commit_log | _local_CG_LESS="S" pager
+if [ -n "${GIT_LOG_RECODE}" ]; then
+ $revls $sep "${ARGS[@]}" | print_commit_log | iconv --from-code=UTF-8 --to-code="${GIT_LOG_RECODE}" | _local_CG_LESS="S" pager
+else
+ $revls $sep "${ARGS[@]}" | print_commit_log | _local_CG_LESS="S" pager
+fi
exit 0
--- /usr/bin/git-log 2006-02-23 18:31:32.000000000 +0100
+++ bin/git-log 2006-02-27 00:47:34.000000000 +0100
@@ -11,5 +11,11 @@
[ "$revs" ] || {
die "No HEAD ref"
}
-git-rev-list --pretty $(git-rev-parse --default HEAD "$@") |
-LESS=-S ${PAGER:-less}
+if [ -n "${GIT_LOG_RECODE}" ]; then
+ git-rev-list --pretty $(git-rev-parse --default HEAD "$@") | \
+ iconv --from-code=UTF-8 --to-code="${GIT_LOG_RECODE}" | \
+ LESS=-S ${PAGER:-less}
+else
+ git-rev-list --pretty $(git-rev-parse --default HEAD "$@") | \
+ LESS=-S ${PAGER:-less}
+fi
Attachment:
signature.asc
Description: OpenPGP digital signature