#!/bin/sh
#
# Copyright (c) 2010, Will Palmer
+# Copyright (c) 2011, Alexey Shumkin (+ non-UTF-8 commit encoding tests)
#
test_description='Test pretty formats'
. ./test-lib.sh
+commit_msg () {
+ # String "initial. initial" partly in German (translated with Google Translate),
+ # encoded in UTF-8, used as a commit log message below.
+ msg=$(printf "initial. anf\303\244nglich")
+ if test -n "$1"
+ then
+ msg=$(echo $msg | iconv -f utf-8 -t $1)
+ fi
+ if test -n "$2" -a -n "$3"
+ then
+ # cut string, replace cut part with two dots
+ # $2 - chars count from the beginning of the string
+ # $3 - "trailing" chars
+ # LC_ALL is set to make `sed` interpret "." as a UTF-8 char not a byte
+ # as it does with C locale
+ msg=$(echo $msg | LC_ALL=en_US.UTF-8 sed -e "s/^\(.\{$2\}\)$3/\1../")
+ fi
+ echo $msg
+}
+
test_expect_success 'set up basic repos' '
>foo &&
>bar &&
git add foo &&
test_tick &&
- git commit -m initial &&
+ git config i18n.commitEncoding iso-8859-1 &&
+ git commit -m "$(commit_msg iso-8859-1)" &&
git add bar &&
test_tick &&
- git commit -m "add bar"
+ git commit -m "add bar" &&
+ git config --unset i18n.commitEncoding
'
test_expect_success 'alias builtin format' '
test_cmp expected actual
'
+test_expect_success 'alias user-defined tformat with %s (iso-8859-1 encoding)' '
+ git config i18n.logOutputEncoding iso-8859-1 &&
+ git log --oneline >expected-s &&
+ git log --pretty="tformat:%h %s" >actual-s &&
+ git config --unset i18n.logOutputEncoding &&
+ test_cmp expected-s actual-s
+'
+
+test_expect_failure 'alias user-defined tformat with %s (utf-8 encoding)' '
+ git log --oneline >expected-s &&
+ git log --pretty="tformat:%h %s" >actual-s &&
+ test_cmp expected-s actual-s
+'
+
test_expect_success 'alias user-defined tformat' '
git log --pretty="tformat:%h" >expected &&
git config pretty.test-alias "tformat:%h" &&
test_must_fail git log --pretty=test-foo
'
-test_expect_success 'NUL separation' '
- printf "add bar\0initial" >expected &&
+test_expect_failure 'NUL separation' '
+ printf "add bar\0$(commit_msg)" >expected &&
git log -z --pretty="format:%s" >actual &&
test_cmp expected actual
'
-test_expect_success 'NUL termination' '
- printf "add bar\0initial\0" >expected &&
+test_expect_failure 'NUL termination' '
+ printf "add bar\0$(commit_msg)\0" >expected &&
git log -z --pretty="tformat:%s" >actual &&
test_cmp expected actual
'
-test_expect_success 'NUL separation with --stat' '
+test_expect_failure 'NUL separation with --stat' '
stat0_part=$(git diff --stat HEAD^ HEAD) &&
stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&
- printf "add bar\n$stat0_part\n\0initial\n$stat1_part\n" >expected &&
+ printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n" >expected &&
git log -z --stat --pretty="format:%s" >actual &&
test_i18ncmp expected actual
'
test_expect_failure 'NUL termination with --stat' '
stat0_part=$(git diff --stat HEAD^ HEAD) &&
stat1_part=$(git diff-tree --no-commit-id --stat --root HEAD^) &&
- printf "add bar\n$stat0_part\n\0initial\n$stat1_part\n\0" >expected &&
+ printf "add bar\n$stat0_part\n\0$(commit_msg)\n$stat1_part\n0" >expected &&
git log -z --stat --pretty="tformat:%s" >actual &&
test_i18ncmp expected actual
'
+test_expect_success 'setup more commits' '
+ test_commit "message one" one one message-one &&
+ test_commit "message two" two two message-two &&
+ head1=$(git rev-parse --verify --short HEAD~0) &&
+ head2=$(git rev-parse --verify --short HEAD~1) &&
+ head3=$(git rev-parse --verify --short HEAD~2) &&
+ head4=$(git rev-parse --verify --short HEAD~3)
+'
+
+test_expect_failure 'left alignment formatting' "
+ git log --pretty='format:%<(40)%s' >actual &&
+ # complete the incomplete line at the end
+ echo >>actual &&
+ qz_to_tab_space <<\EOF >expected &&
+message two Z
+message one Z
+add bar Z
+$(commit_msg) Z
+EOF
+ test_cmp expected actual
+"
+
+test_expect_failure 'left alignment formatting at the nth column' "
+ git log --pretty='format:%h %<|(40)%s' >actual &&
+ # complete the incomplete line at the end
+ echo >>actual &&
+ qz_to_tab_space <<\EOF >expected &&
+$head1 message two Z
+$head2 message one Z
+$head3 add bar Z
+$head4 $(commit_msg) Z
+EOF
+ test_cmp expected actual
+"
+
+test_expect_failure 'left alignment formatting with no padding' "
+ git log --pretty='format:%<(1)%s' >actual &&
+ # complete the incomplete line at the end
+ echo >>actual &&
+ cat <<\EOF >expected &&
+message two
+message one
+add bar
+$(commit_msg)
+EOF
+ test_cmp expected actual
+"
+
+test_expect_failure 'left alignment formatting with trunc' "
+ git log --pretty='format:%<(10,trunc)%s' >actual &&
+ # complete the incomplete line at the end
+ echo >>actual &&
+ qz_to_tab_space <<\EOF >expected &&
+message ..
+message ..
+add bar Z
+$(commit_msg "" "8" ".\+$")
+EOF
+ test_cmp expected actual
+"
+
+test_expect_failure 'left alignment formatting with ltrunc' "
+ git log --pretty='format:%<(10,ltrunc)%s' >actual &&
+ # complete the incomplete line at the end
+ echo >>actual &&
+ qz_to_tab_space <<\EOF >expected &&
+..sage two
+..sage one
+add bar Z
+$(commit_msg "" "0" ".\{11\}")
+EOF
+ test_cmp expected actual
+"
+
+test_expect_failure 'left alignment formatting with mtrunc' "
+ git log --pretty='format:%<(10,mtrunc)%s' >actual &&
+ # complete the incomplete line at the end
+ echo >>actual &&
+ qz_to_tab_space <<\EOF >expected &&
+mess.. two
+mess.. one
+add bar Z
+$(commit_msg "" "4" ".\{11\}")
+EOF
+ test_cmp expected actual
+"
+
+test_expect_failure 'right alignment formatting' "
+ git log --pretty='format:%>(40)%s' >actual &&
+ # complete the incomplete line at the end
+ echo >>actual &&
+ qz_to_tab_space <<\EOF >expected &&
+Z message two
+Z message one
+Z add bar
+Z $(commit_msg)
+EOF
+ test_cmp expected actual
+"
+
+test_expect_failure 'right alignment formatting at the nth column' "
+ git log --pretty='format:%h %>|(40)%s' >actual &&
+ # complete the incomplete line at the end
+ echo >>actual &&
+ qz_to_tab_space <<\EOF >expected &&
+$head1 message two
+$head2 message one
+$head3 add bar
+$head4 $(commit_msg)
+EOF
+ test_cmp expected actual
+"
+
+test_expect_failure 'right alignment formatting with no padding' "
+ git log --pretty='format:%>(1)%s' >actual &&
+ # complete the incomplete line at the end
+ echo >>actual &&
+ cat <<\EOF >expected &&
+message two
+message one
+add bar
+$(commit_msg)
+EOF
+ test_cmp expected actual
+"
+
+test_expect_failure 'center alignment formatting' "
+ git log --pretty='format:%><(40)%s' >actual &&
+ # complete the incomplete line at the end
+ echo >>actual &&
+ qz_to_tab_space <<\EOF >expected &&
+Z message two Z
+Z message one Z
+Z add bar Z
+Z $(commit_msg) Z
+EOF
+ test_cmp expected actual
+"
+
+test_expect_failure 'center alignment formatting at the nth column' "
+ git log --pretty='format:%h %><|(40)%s' >actual &&
+ # complete the incomplete line at the end
+ echo >>actual &&
+ qz_to_tab_space <<\EOF >expected &&
+$head1 message two Z
+$head2 message one Z
+$head3 add bar Z
+$head4 $(commit_msg) Z
+EOF
+ test_cmp expected actual
+"
+
+test_expect_failure 'center alignment formatting with no padding' "
+ git log --pretty='format:%><(1)%s' >actual &&
+ # complete the incomplete line at the end
+ echo >>actual &&
+ cat <<\EOF >expected &&
+message two
+message one
+add bar
+$(commit_msg)
+EOF
+ test_cmp expected actual
+"
+
+test_expect_failure 'left/right alignment formatting with stealing' "
+ git commit --amend -m short --author 'long long long <long@me.com>' &&
+ git log --pretty='format:%<(10,trunc)%s%>>(10,ltrunc)% an' >actual &&
+ # complete the incomplete line at the end
+ echo >>actual &&
+ cat <<\EOF >expected &&
+short long long long
+message .. A U Thor
+add bar A U Thor
+$(commit_msg "" "8" ".\+$") A U Thor
+EOF
+ test_cmp expected actual
+"
+
test_done