mirror of
https://github.com/git/git.git
synced 2024-11-18 23:14:51 +01:00
1ef626b4b6
The get_log() function in the Perl SVN API introduced the limit parameter in 1.2.0. However, this got discarded in our SVN::Ra compatibility layer when used with SVN 1.1.x. We now emulate the limit functionality in older SVN versions by preventing the original callback from being called if the given limit has been reached. This emulation is less bandwidth efficient, but SVN 1.1.x is becoming rarer now. Additionally, the --limit parameter in svn(1) uses the aforementioned get_log() functionality change in SVN 1.2.x. t9129 no longer depends on --limit to work and instead uses Perl to parse out the commit message. Thanks to Tom G. Christensen for the bug report. Signed-off-by: Eric Wong <normalperson@yhbt.net>
93 lines
2 KiB
Bash
Executable file
93 lines
2 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2008 Eric Wong
|
|
|
|
test_description='git svn honors i18n.commitEncoding in config'
|
|
|
|
. ./lib-git-svn.sh
|
|
|
|
compare_git_head_with () {
|
|
nr=`wc -l < "$1"`
|
|
a=7
|
|
b=$(($a + $nr - 1))
|
|
git cat-file commit HEAD | sed -ne "$a,${b}p" >current &&
|
|
test_cmp current "$1"
|
|
}
|
|
|
|
compare_svn_head_with () {
|
|
# extract just the log message and strip out committer info.
|
|
# don't use --limit here since svn 1.1.x doesn't have it,
|
|
LC_ALL=en_US.UTF-8 svn log `git svn info --url` | perl -w -e '
|
|
use bytes;
|
|
$/ = ("-"x72) . "\n";
|
|
my @x = <STDIN>;
|
|
@x = split(/\n/, $x[1]);
|
|
splice(@x, 0, 2);
|
|
$x[-1] = "";
|
|
print join("\n", @x);
|
|
' > current &&
|
|
test_cmp current "$1"
|
|
}
|
|
|
|
for H in ISO-8859-1 EUCJP ISO-2022-JP
|
|
do
|
|
test_expect_success "$H setup" '
|
|
mkdir $H &&
|
|
svn import -m "$H test" $H "$svnrepo"/$H &&
|
|
git svn clone "$svnrepo"/$H $H
|
|
'
|
|
done
|
|
|
|
for H in ISO-8859-1 EUCJP ISO-2022-JP
|
|
do
|
|
test_expect_success "$H commit on git side" '
|
|
(
|
|
cd $H &&
|
|
git config i18n.commitencoding $H &&
|
|
git checkout -b t refs/remotes/git-svn &&
|
|
echo $H >F &&
|
|
git add F &&
|
|
git commit -a -F "$TEST_DIRECTORY"/t3900/$H.txt &&
|
|
E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
|
|
test "z$E" = "z$H"
|
|
compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
|
|
)
|
|
'
|
|
done
|
|
|
|
for H in ISO-8859-1 EUCJP ISO-2022-JP
|
|
do
|
|
test_expect_success "$H dcommit to svn" '
|
|
(
|
|
cd $H &&
|
|
git svn dcommit &&
|
|
git cat-file commit HEAD | grep git-svn-id: &&
|
|
E=$(git cat-file commit HEAD | sed -ne "s/^encoding //p") &&
|
|
test "z$E" = "z$H" &&
|
|
compare_git_head_with "$TEST_DIRECTORY"/t3900/$H.txt
|
|
)
|
|
'
|
|
done
|
|
|
|
if locale -a |grep -q en_US.utf8; then
|
|
test_expect_success 'ISO-8859-1 should match UTF-8 in svn' '
|
|
(
|
|
cd ISO-8859-1 &&
|
|
compare_svn_head_with "$TEST_DIRECTORY"/t3900/1-UTF-8.txt
|
|
)
|
|
'
|
|
|
|
for H in EUCJP ISO-2022-JP
|
|
do
|
|
test_expect_success '$H should match UTF-8 in svn' '
|
|
(
|
|
cd $H &&
|
|
compare_svn_head_with "$TEST_DIRECTORY"/t3900/2-UTF-8.txt
|
|
)
|
|
'
|
|
done
|
|
else
|
|
say "UTF-8 locale not available, test skipped"
|
|
fi
|
|
|
|
test_done
|