2007-07-06 15:45:10 +08:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2007 Johannes E. Schindelin
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='Test custom diff function name patterns'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
2014-03-22 05:07:18 +08:00
|
|
|
test_expect_success 'setup' '
|
|
|
|
# a non-trivial custom pattern
|
|
|
|
git config diff.custom1.funcname "!static
|
|
|
|
!String
|
|
|
|
[^ ].*s.*" &&
|
|
|
|
|
|
|
|
# a custom pattern which matches to end of line
|
|
|
|
git config diff.custom2.funcname "......Beer\$" &&
|
|
|
|
|
|
|
|
# alternation in pattern
|
|
|
|
git config diff.custom3.funcname "Beer$" &&
|
2014-03-22 05:07:19 +08:00
|
|
|
git config diff.custom3.xfuncname "^[ ]*((public|static).*)$" &&
|
|
|
|
|
|
|
|
# for regexp compilation tests
|
|
|
|
echo A >A.java &&
|
|
|
|
echo B >B.java
|
2014-03-22 05:07:18 +08:00
|
|
|
'
|
2011-05-22 03:25:14 +08:00
|
|
|
|
2021-04-08 23:04:21 +08:00
|
|
|
test_expect_success 'setup: test-tool userdiff' '
|
|
|
|
# Make sure additions to builtin_drivers are sorted
|
|
|
|
test_when_finished "rm builtin-drivers.sorted" &&
|
|
|
|
test-tool userdiff list-builtin-drivers >builtin-drivers &&
|
|
|
|
test_file_not_empty builtin-drivers &&
|
|
|
|
sort <builtin-drivers >builtin-drivers.sorted &&
|
|
|
|
test_cmp builtin-drivers.sorted builtin-drivers &&
|
|
|
|
|
|
|
|
# Ditto, but "custom" requires the .git directory and config
|
|
|
|
# to be setup and read.
|
|
|
|
test_when_finished "rm custom-drivers.sorted" &&
|
|
|
|
test-tool userdiff list-custom-drivers >custom-drivers &&
|
|
|
|
test_file_not_empty custom-drivers &&
|
|
|
|
sort <custom-drivers >custom-drivers.sorted &&
|
|
|
|
test_cmp custom-drivers.sorted custom-drivers
|
|
|
|
'
|
|
|
|
|
2014-03-22 05:07:15 +08:00
|
|
|
diffpatterns="
|
2021-04-08 23:04:21 +08:00
|
|
|
$(cat builtin-drivers)
|
|
|
|
$(cat custom-drivers)
|
2014-03-22 05:07:15 +08:00
|
|
|
"
|
|
|
|
|
|
|
|
for p in $diffpatterns
|
2008-09-23 07:19:05 +08:00
|
|
|
do
|
|
|
|
test_expect_success "builtin $p pattern compiles" '
|
2011-05-22 03:11:33 +08:00
|
|
|
echo "*.java diff=$p" >.gitattributes &&
|
2011-05-22 03:25:14 +08:00
|
|
|
test_expect_code 1 git diff --no-index \
|
2014-03-22 05:07:19 +08:00
|
|
|
A.java B.java 2>msg &&
|
2014-08-14 03:30:11 +08:00
|
|
|
test_i18ngrep ! fatal msg &&
|
|
|
|
test_i18ngrep ! error msg
|
2008-09-23 07:19:05 +08:00
|
|
|
'
|
2010-09-10 03:02:47 +08:00
|
|
|
test_expect_success "builtin $p wordRegex pattern compiles" '
|
2011-05-22 03:11:33 +08:00
|
|
|
echo "*.java diff=$p" >.gitattributes &&
|
2011-05-22 03:25:14 +08:00
|
|
|
test_expect_code 1 git diff --no-index --word-diff \
|
2014-03-22 05:07:19 +08:00
|
|
|
A.java B.java 2>msg &&
|
2014-08-14 03:30:11 +08:00
|
|
|
test_i18ngrep ! fatal msg &&
|
|
|
|
test_i18ngrep ! error msg
|
2010-09-10 03:02:47 +08:00
|
|
|
'
|
2008-09-23 07:19:05 +08:00
|
|
|
done
|
|
|
|
|
2007-07-06 15:45:10 +08:00
|
|
|
test_expect_success 'last regexp must not be negated' '
|
2014-03-22 05:07:19 +08:00
|
|
|
echo "*.java diff=java" >.gitattributes &&
|
2011-05-22 03:22:28 +08:00
|
|
|
test_config diff.java.funcname "!static" &&
|
2014-03-22 05:07:19 +08:00
|
|
|
test_expect_code 128 git diff --no-index A.java B.java 2>msg &&
|
|
|
|
test_i18ngrep ": Last expression must not be negated:" msg
|
2007-07-06 15:45:10 +08:00
|
|
|
'
|
|
|
|
|
2014-03-22 05:07:15 +08:00
|
|
|
test_expect_success 'setup hunk header tests' '
|
|
|
|
for i in $diffpatterns
|
|
|
|
do
|
|
|
|
echo "$i-* diff=$i"
|
|
|
|
done > .gitattributes &&
|
|
|
|
|
|
|
|
# add all test files to the index
|
|
|
|
(
|
|
|
|
cd "$TEST_DIRECTORY"/t4018 &&
|
|
|
|
git --git-dir="$TRASH_DIRECTORY/.git" add .
|
|
|
|
) &&
|
|
|
|
|
|
|
|
# place modified files in the worktree
|
|
|
|
for i in $(git ls-files)
|
|
|
|
do
|
|
|
|
sed -e "s/ChangeMe/IWasChanged/" <"$TEST_DIRECTORY/t4018/$i" >"$i" || return 1
|
|
|
|
done
|
|
|
|
'
|
|
|
|
|
|
|
|
# check each individual file
|
|
|
|
for i in $(git ls-files)
|
|
|
|
do
|
|
|
|
if grep broken "$i" >/dev/null 2>&1
|
|
|
|
then
|
|
|
|
result=failure
|
|
|
|
else
|
|
|
|
result=success
|
|
|
|
fi
|
|
|
|
test_expect_$result "hunk header: $i" "
|
|
|
|
git diff -U1 $i >actual &&
|
|
|
|
grep '@@ .* @@.*RIGHT' actual
|
|
|
|
"
|
|
|
|
done
|
|
|
|
|
2007-07-06 15:45:10 +08:00
|
|
|
test_done
|