da083d688e
I have tweaked configuration in my ~/.subversion directory, namely I am running auto-properties and automatically adding '$Id$' expansion to every file. This choke the last test named 'proplist' from t9101-git-svn-props.sh, because one more property, svn:keywords is automatically added. I had just wrapped svn invocation with the svn_cmd that specifies empty directory via --config-dir argument. Since the latter is the global option, it should be recognized by all svn subcommands, so no regressions will be introduced. Now svn_cmd is used everywhere, not just in the failed test module: this should guard us from the future clashes with user-defined configuration tweaks. Signed-off-by: Eygene Ryabinkin <rea-git@codelabs.ru> Acked-by: Eric Wong <normalperson@yhbt.net>
95 lines
2.4 KiB
Bash
Executable File
95 lines
2.4 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2008 Eric Wong
|
|
#
|
|
|
|
test_description='git svn authors file tests'
|
|
|
|
. ./lib-git-svn.sh
|
|
|
|
cat > svn-authors <<EOF
|
|
aa = AAAAAAA AAAAAAA <aa@example.com>
|
|
bb = BBBBBBB BBBBBBB <bb@example.com>
|
|
EOF
|
|
|
|
test_expect_success 'setup svnrepo' '
|
|
for i in aa bb cc dd
|
|
do
|
|
svn_cmd mkdir -m $i --username $i "$svnrepo"/$i
|
|
done
|
|
'
|
|
|
|
test_expect_success 'start import with incomplete authors file' '
|
|
! git svn clone --authors-file=svn-authors "$svnrepo" x
|
|
'
|
|
|
|
test_expect_success 'imported 2 revisions successfully' '
|
|
(
|
|
cd x
|
|
test "`git rev-list refs/remotes/git-svn | wc -l`" -eq 2 &&
|
|
git rev-list -1 --pretty=raw refs/remotes/git-svn | \
|
|
grep "^author BBBBBBB BBBBBBB <bb@example\.com> " &&
|
|
git rev-list -1 --pretty=raw refs/remotes/git-svn~1 | \
|
|
grep "^author AAAAAAA AAAAAAA <aa@example\.com> "
|
|
)
|
|
'
|
|
|
|
cat >> svn-authors <<EOF
|
|
cc = CCCCCCC CCCCCCC <cc@example.com>
|
|
dd = DDDDDDD DDDDDDD <dd@example.com>
|
|
EOF
|
|
|
|
test_expect_success 'continues to import once authors have been added' '
|
|
(
|
|
cd x
|
|
git svn fetch --authors-file=../svn-authors &&
|
|
test "`git rev-list refs/remotes/git-svn | wc -l`" -eq 4 &&
|
|
git rev-list -1 --pretty=raw refs/remotes/git-svn | \
|
|
grep "^author DDDDDDD DDDDDDD <dd@example\.com> " &&
|
|
git rev-list -1 --pretty=raw refs/remotes/git-svn~1 | \
|
|
grep "^author CCCCCCC CCCCCCC <cc@example\.com> "
|
|
)
|
|
'
|
|
|
|
test_expect_success 'authors-file against globs' '
|
|
svn_cmd mkdir -m globs --username aa \
|
|
"$svnrepo"/aa/trunk "$svnrepo"/aa/branches "$svnrepo"/aa/tags &&
|
|
git svn clone --authors-file=svn-authors -s "$svnrepo"/aa aa-work &&
|
|
for i in bb ee cc
|
|
do
|
|
branch="aa/branches/$i"
|
|
svn_cmd mkdir -m "$branch" --username $i "$svnrepo/$branch"
|
|
done
|
|
'
|
|
|
|
test_expect_success 'fetch fails on ee' '
|
|
( cd aa-work && ! git svn fetch --authors-file=../svn-authors )
|
|
'
|
|
|
|
tmp_config_get () {
|
|
GIT_CONFIG=.git/svn/.metadata git config --get "$1"
|
|
}
|
|
|
|
test_expect_success 'failure happened without negative side effects' '
|
|
(
|
|
cd aa-work &&
|
|
test 6 -eq "`tmp_config_get svn-remote.svn.branches-maxRev`" &&
|
|
test 6 -eq "`tmp_config_get svn-remote.svn.tags-maxRev`"
|
|
)
|
|
'
|
|
|
|
cat >> svn-authors <<EOF
|
|
ee = EEEEEEE EEEEEEE <ee@example.com>
|
|
EOF
|
|
|
|
test_expect_success 'fetch continues after authors-file is fixed' '
|
|
(
|
|
cd aa-work &&
|
|
git svn fetch --authors-file=../svn-authors &&
|
|
test 8 -eq "`tmp_config_get svn-remote.svn.branches-maxRev`" &&
|
|
test 8 -eq "`tmp_config_get svn-remote.svn.tags-maxRev`"
|
|
)
|
|
'
|
|
|
|
test_done
|