mirror of
https://github.com/git/git.git
synced 2024-11-23 18:05:29 +08:00
t/t91XX git-svn tests: run "git svn" not "git-svn"
This replaces 'git-svn' with 'git svn' in the tests. Signed-off-by: Nanako Shiraishi <nanako3@lavabit.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nanako Shiraishi
Junio C Hamano
parent
16805d3e59
commit
1364ff27dc
@ -5,7 +5,7 @@ git_svn_id=git""-svn-id
|
||||
|
||||
if test -n "$NO_SVN_TESTS"
|
||||
then
|
||||
test_expect_success 'skipping git-svn tests, NO_SVN_TESTS defined' :
|
||||
test_expect_success 'skipping git svn tests, NO_SVN_TESTS defined' :
|
||||
test_done
|
||||
exit
|
||||
fi
|
||||
@ -17,7 +17,7 @@ SVN_TREE=$GIT_SVN_DIR/svn-tree
|
||||
svn >/dev/null 2>&1
|
||||
if test $? -ne 1
|
||||
then
|
||||
test_expect_success 'skipping git-svn tests, svn not found' :
|
||||
test_expect_success 'skipping git svn tests, svn not found' :
|
||||
test_done
|
||||
exit
|
||||
fi
|
||||
@ -91,7 +91,7 @@ start_httpd () {
|
||||
mkdir "$GIT_DIR"/logs
|
||||
|
||||
cat > "$GIT_DIR/httpd.conf" <<EOF
|
||||
ServerName "git-svn test"
|
||||
ServerName "git svn test"
|
||||
ServerRoot "$GIT_DIR"
|
||||
DocumentRoot "$GIT_DIR"
|
||||
PidFile "$GIT_DIR/httpd.pid"
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# Copyright (c) 2006 Eric Wong
|
||||
#
|
||||
|
||||
test_description='git-svn basic tests'
|
||||
test_description='git svn basic tests'
|
||||
GIT_SVN_LC_ALL=${LC_ALL:-$LANG}
|
||||
|
||||
case "$GIT_SVN_LC_ALL" in
|
||||
@ -17,7 +17,7 @@ esac
|
||||
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
say 'define NO_SVN_TESTS to skip git-svn tests'
|
||||
say 'define NO_SVN_TESTS to skip git svn tests'
|
||||
|
||||
test_expect_success \
|
||||
'initialize git-svn' '
|
||||
@ -34,11 +34,11 @@ test_expect_success \
|
||||
svn import -m "import for git-svn" . "$svnrepo" >/dev/null &&
|
||||
cd .. &&
|
||||
rm -rf import &&
|
||||
git-svn init "$svnrepo"'
|
||||
git svn init "$svnrepo"'
|
||||
|
||||
test_expect_success \
|
||||
'import an SVN revision into git' \
|
||||
'git-svn fetch'
|
||||
'git svn fetch'
|
||||
|
||||
test_expect_success "checkout from svn" 'svn co "$svnrepo" "$SVN_TREE"'
|
||||
|
||||
@ -49,7 +49,7 @@ test_expect_success "$name" '
|
||||
cp dir/file file &&
|
||||
git update-index --add --remove dir/a/b/c/d/e/file dir/file file &&
|
||||
git commit -m "$name" &&
|
||||
git-svn set-tree --find-copies-harder --rmdir \
|
||||
git svn set-tree --find-copies-harder --rmdir \
|
||||
${remotes_git_svn}..mybranch &&
|
||||
svn up "$SVN_TREE" &&
|
||||
test -d "$SVN_TREE"/dir && test ! -d "$SVN_TREE"/dir/a'
|
||||
@ -63,7 +63,7 @@ test_expect_success "$name" "
|
||||
git update-index --remove dir/file &&
|
||||
git update-index --add dir/file/file &&
|
||||
git commit -m '$name' &&
|
||||
test_must_fail git-svn set-tree --find-copies-harder --rmdir \
|
||||
test_must_fail git svn set-tree --find-copies-harder --rmdir \
|
||||
${remotes_git_svn}..mybranch" || true
|
||||
|
||||
|
||||
@ -77,7 +77,7 @@ test_expect_success "$name" '
|
||||
git update-index --remove -- bar/zzz &&
|
||||
git update-index --add -- bar &&
|
||||
git commit -m "$name" &&
|
||||
test_must_fail git-svn set-tree --find-copies-harder --rmdir \
|
||||
test_must_fail git svn set-tree --find-copies-harder --rmdir \
|
||||
${remotes_git_svn}..mybranch2' || true
|
||||
|
||||
|
||||
@ -91,7 +91,7 @@ test_expect_success "$name" '
|
||||
echo yyy > bar/zzz/yyy &&
|
||||
git update-index --add bar/zzz/yyy &&
|
||||
git commit -m "$name" &&
|
||||
test_must_fail git-svn set-tree --find-copies-harder --rmdir \
|
||||
test_must_fail git svn set-tree --find-copies-harder --rmdir \
|
||||
${remotes_git_svn}..mybranch3' || true
|
||||
|
||||
|
||||
@ -105,7 +105,7 @@ test_expect_success "$name" '
|
||||
echo asdf > dir &&
|
||||
git update-index --add -- dir &&
|
||||
git commit -m "$name" &&
|
||||
test_must_fail git-svn set-tree --find-copies-harder --rmdir \
|
||||
test_must_fail git svn set-tree --find-copies-harder --rmdir \
|
||||
${remotes_git_svn}..mybranch4' || true
|
||||
|
||||
|
||||
@ -116,7 +116,7 @@ test_expect_success "$name" '
|
||||
chmod -x exec.sh &&
|
||||
git update-index exec.sh &&
|
||||
git commit -m "$name" &&
|
||||
git-svn set-tree --find-copies-harder --rmdir \
|
||||
git svn set-tree --find-copies-harder --rmdir \
|
||||
${remotes_git_svn}..mybranch5 &&
|
||||
svn up "$SVN_TREE" &&
|
||||
test ! -x "$SVN_TREE"/exec.sh'
|
||||
@ -127,7 +127,7 @@ test_expect_success "$name" '
|
||||
chmod +x exec.sh &&
|
||||
git update-index exec.sh &&
|
||||
git commit -m "$name" &&
|
||||
git-svn set-tree --find-copies-harder --rmdir \
|
||||
git svn set-tree --find-copies-harder --rmdir \
|
||||
${remotes_git_svn}..mybranch5 &&
|
||||
svn up "$SVN_TREE" &&
|
||||
test -x "$SVN_TREE"/exec.sh'
|
||||
@ -139,7 +139,7 @@ test_expect_success "$name" '
|
||||
ln -s bar/zzz exec.sh &&
|
||||
git update-index exec.sh &&
|
||||
git commit -m "$name" &&
|
||||
git-svn set-tree --find-copies-harder --rmdir \
|
||||
git svn set-tree --find-copies-harder --rmdir \
|
||||
${remotes_git_svn}..mybranch5 &&
|
||||
svn up "$SVN_TREE" &&
|
||||
test -L "$SVN_TREE"/exec.sh'
|
||||
@ -151,7 +151,7 @@ test_expect_success "$name" '
|
||||
ln -s bar/zzz exec-2.sh &&
|
||||
git update-index --add bar/zzz exec-2.sh &&
|
||||
git commit -m "$name" &&
|
||||
git-svn set-tree --find-copies-harder --rmdir \
|
||||
git svn set-tree --find-copies-harder --rmdir \
|
||||
${remotes_git_svn}..mybranch5 &&
|
||||
svn up "$SVN_TREE" &&
|
||||
test -x "$SVN_TREE"/bar/zzz &&
|
||||
@ -164,7 +164,7 @@ test_expect_success "$name" '
|
||||
cp help exec-2.sh &&
|
||||
git update-index exec-2.sh &&
|
||||
git commit -m "$name" &&
|
||||
git-svn set-tree --find-copies-harder --rmdir \
|
||||
git svn set-tree --find-copies-harder --rmdir \
|
||||
${remotes_git_svn}..mybranch5 &&
|
||||
svn up "$SVN_TREE" &&
|
||||
test -f "$SVN_TREE"/exec-2.sh &&
|
||||
@ -180,7 +180,7 @@ then
|
||||
echo '# hello' >> exec-2.sh &&
|
||||
git update-index exec-2.sh &&
|
||||
git commit -m 'éï∏' &&
|
||||
git-svn set-tree HEAD"
|
||||
git svn set-tree HEAD"
|
||||
unset LC_ALL
|
||||
else
|
||||
say "UTF-8 locale not set, test skipped ($GIT_SVN_LC_ALL)"
|
||||
@ -190,7 +190,7 @@ name='test fetch functionality (svn => git) with alternate GIT_SVN_ID'
|
||||
GIT_SVN_ID=alt
|
||||
export GIT_SVN_ID
|
||||
test_expect_success "$name" \
|
||||
'git-svn init "$svnrepo" && git-svn fetch &&
|
||||
'git svn init "$svnrepo" && git svn fetch &&
|
||||
git rev-list --pretty=raw ${remotes_git_svn} | grep ^tree | uniq > a &&
|
||||
git rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
|
||||
test_cmp a b'
|
||||
@ -216,7 +216,7 @@ test_expect_success "$name" "test_cmp a expected"
|
||||
test_expect_success 'exit if remote refs are ambigious' "
|
||||
git config --add svn-remote.svn.fetch \
|
||||
bar:refs/${remotes_git_svn} &&
|
||||
test_must_fail git-svn migrate
|
||||
test_must_fail git svn migrate
|
||||
"
|
||||
|
||||
test_expect_success 'exit if init-ing a would clobber a URL' '
|
||||
@ -224,12 +224,12 @@ test_expect_success 'exit if init-ing a would clobber a URL' '
|
||||
svn mkdir -m "mkdir bar" "${svnrepo}2/bar" &&
|
||||
git config --unset svn-remote.svn.fetch \
|
||||
"^bar:refs/${remotes_git_svn}$" &&
|
||||
test_must_fail git-svn init "${svnrepo}2/bar"
|
||||
test_must_fail git svn init "${svnrepo}2/bar"
|
||||
'
|
||||
|
||||
test_expect_success \
|
||||
'init allows us to connect to another directory in the same repo' '
|
||||
git-svn init --minimize-url -i bar "$svnrepo/bar" &&
|
||||
git svn init --minimize-url -i bar "$svnrepo/bar" &&
|
||||
git config --get svn-remote.svn.fetch \
|
||||
"^bar:refs/remotes/bar$" &&
|
||||
git config --get svn-remote.svn.fetch \
|
||||
@ -237,23 +237,23 @@ test_expect_success \
|
||||
'
|
||||
|
||||
test_expect_success 'able to dcommit to a subdirectory' "
|
||||
git-svn fetch -i bar &&
|
||||
git svn fetch -i bar &&
|
||||
git checkout -b my-bar refs/remotes/bar &&
|
||||
echo abc > d &&
|
||||
git update-index --add d &&
|
||||
git commit -m '/bar/d should be in the log' &&
|
||||
git-svn dcommit -i bar &&
|
||||
git svn dcommit -i bar &&
|
||||
test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" &&
|
||||
mkdir newdir &&
|
||||
echo new > newdir/dir &&
|
||||
git update-index --add newdir/dir &&
|
||||
git commit -m 'add a new directory' &&
|
||||
git-svn dcommit -i bar &&
|
||||
git svn dcommit -i bar &&
|
||||
test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" &&
|
||||
echo foo >> newdir/dir &&
|
||||
git update-index newdir/dir &&
|
||||
git commit -m 'modify a file in new directory' &&
|
||||
git-svn dcommit -i bar &&
|
||||
git svn dcommit -i bar &&
|
||||
test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\"
|
||||
"
|
||||
|
||||
@ -261,7 +261,7 @@ test_expect_success 'able to set-tree to a subdirectory' "
|
||||
echo cba > d &&
|
||||
git update-index d &&
|
||||
git commit -m 'update /bar/d' &&
|
||||
git-svn set-tree -i bar HEAD &&
|
||||
git svn set-tree -i bar HEAD &&
|
||||
test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\"
|
||||
"
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# Copyright (c) 2006 Eric Wong
|
||||
#
|
||||
|
||||
test_description='git-svn property tests'
|
||||
test_description='git svn property tests'
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
mkdir import
|
||||
@ -66,15 +66,15 @@ test_expect_success 'setup some commits to svn' \
|
||||
svn commit -m "Propset Id" &&
|
||||
cd ..'
|
||||
|
||||
test_expect_success 'initialize git-svn' 'git-svn init "$svnrepo"'
|
||||
test_expect_success 'fetch revisions from svn' 'git-svn fetch'
|
||||
test_expect_success 'initialize git-svn' 'git svn init "$svnrepo"'
|
||||
test_expect_success 'fetch revisions from svn' 'git svn fetch'
|
||||
|
||||
name='test svn:keywords ignoring'
|
||||
test_expect_success "$name" \
|
||||
'git checkout -b mybranch ${remotes_git_svn} &&
|
||||
echo Hi again >> kw.c &&
|
||||
git commit -a -m "test keywords ignoring" &&
|
||||
git-svn set-tree ${remotes_git_svn}..mybranch &&
|
||||
git svn set-tree ${remotes_git_svn}..mybranch &&
|
||||
git pull . ${remotes_git_svn}'
|
||||
|
||||
expect='/* $Id$ */'
|
||||
@ -90,7 +90,7 @@ test_expect_success "propset CR on crlf files" \
|
||||
cd ..'
|
||||
|
||||
test_expect_success 'fetch and pull latest from svn and checkout a new wc' \
|
||||
'git-svn fetch &&
|
||||
'git svn fetch &&
|
||||
git pull . ${remotes_git_svn} &&
|
||||
svn co "$svnrepo" new_wc'
|
||||
|
||||
@ -113,7 +113,7 @@ cd test_wc
|
||||
svn commit -m "propset CRLF on cr files"'
|
||||
cd ..
|
||||
test_expect_success 'fetch and pull latest from svn' \
|
||||
'git-svn fetch && git pull . ${remotes_git_svn}'
|
||||
'git svn fetch && git pull . ${remotes_git_svn}'
|
||||
|
||||
b_cr="`git-hash-object cr`"
|
||||
b_ne_cr="`git-hash-object ne_cr`"
|
||||
@ -145,7 +145,7 @@ test_expect_success 'test show-ignore' "
|
||||
svn propset -R svn:ignore 'no-such-file*' .
|
||||
svn commit -m 'propset svn:ignore'
|
||||
cd .. &&
|
||||
git-svn show-ignore > show-ignore.got &&
|
||||
git svn show-ignore > show-ignore.got &&
|
||||
cmp show-ignore.expect show-ignore.got
|
||||
"
|
||||
|
||||
@ -161,8 +161,8 @@ cat >create-ignore-index.expect <<\EOF
|
||||
EOF
|
||||
|
||||
test_expect_success 'test create-ignore' "
|
||||
git-svn fetch && git pull . ${remotes_git_svn} &&
|
||||
git-svn create-ignore &&
|
||||
git svn fetch && git pull . ${remotes_git_svn} &&
|
||||
git svn create-ignore &&
|
||||
cmp ./.gitignore create-ignore.expect &&
|
||||
cmp ./deeply/.gitignore create-ignore.expect &&
|
||||
cmp ./deeply/nested/.gitignore create-ignore.expect &&
|
||||
@ -182,15 +182,15 @@ EOF
|
||||
# pattern, it can pass even though the propget did not execute on the
|
||||
# right directory.
|
||||
test_expect_success 'test propget' "
|
||||
git-svn propget svn:ignore . | cmp - prop.expect &&
|
||||
git svn propget svn:ignore . | cmp - prop.expect &&
|
||||
cd deeply &&
|
||||
git-svn propget svn:ignore . | cmp - ../prop.expect &&
|
||||
git-svn propget svn:entry:committed-rev nested/directory/.keep \
|
||||
git svn propget svn:ignore . | cmp - ../prop.expect &&
|
||||
git svn propget svn:entry:committed-rev nested/directory/.keep \
|
||||
| cmp - ../prop2.expect &&
|
||||
git-svn propget svn:ignore .. | cmp - ../prop.expect &&
|
||||
git-svn propget svn:ignore nested/ | cmp - ../prop.expect &&
|
||||
git-svn propget svn:ignore ./nested | cmp - ../prop.expect &&
|
||||
git-svn propget svn:ignore .././deeply/nested | cmp - ../prop.expect
|
||||
git svn propget svn:ignore .. | cmp - ../prop.expect &&
|
||||
git svn propget svn:ignore nested/ | cmp - ../prop.expect &&
|
||||
git svn propget svn:ignore ./nested | cmp - ../prop.expect &&
|
||||
git svn propget svn:ignore .././deeply/nested | cmp - ../prop.expect
|
||||
"
|
||||
|
||||
cat >prop.expect <<\EOF
|
||||
@ -210,8 +210,8 @@ Properties on 'nested/directory/.keep':
|
||||
EOF
|
||||
|
||||
test_expect_success 'test proplist' "
|
||||
git-svn proplist . | cmp - prop.expect &&
|
||||
git-svn proplist nested/directory/.keep | cmp - prop2.expect
|
||||
git svn proplist . | cmp - prop.expect &&
|
||||
git svn proplist nested/directory/.keep | cmp - prop2.expect
|
||||
"
|
||||
|
||||
test_done
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#!/bin/sh
|
||||
test_description='git-svn rmdir'
|
||||
test_description='git svn rmdir'
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
test_expect_success 'initialize repo' '
|
||||
@ -14,15 +14,15 @@ test_expect_success 'initialize repo' '
|
||||
'
|
||||
|
||||
test_expect_success 'mirror via git-svn' '
|
||||
git-svn init "$svnrepo" &&
|
||||
git-svn fetch &&
|
||||
git svn init "$svnrepo" &&
|
||||
git svn fetch &&
|
||||
git checkout -f -b test-rmdir ${remotes_git_svn}
|
||||
'
|
||||
|
||||
test_expect_success 'Try a commit on rmdir' '
|
||||
git rm -f deeply/nested/directory/number/2/another &&
|
||||
git commit -a -m "remove another" &&
|
||||
git-svn set-tree --rmdir HEAD &&
|
||||
git svn set-tree --rmdir HEAD &&
|
||||
svn ls -R "$svnrepo" | grep ^deeply/nested/directory/number/1
|
||||
'
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# Copyright (c) 2007 Eric Wong
|
||||
#
|
||||
|
||||
test_description='git-svn tracking removed top-level path'
|
||||
test_description='git svn tracking removed top-level path'
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
test_expect_success 'make history for tracking' '
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# Copyright (c) 2006 Eric Wong
|
||||
#
|
||||
|
||||
test_description='git-svn fetching'
|
||||
test_description='git svn fetching'
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
test_expect_success 'initialize repo' '
|
||||
@ -27,8 +27,8 @@ test_expect_success 'initialize repo' '
|
||||
'
|
||||
|
||||
test_expect_success 'init and fetch a moved directory' '
|
||||
git-svn init --minimize-url -i thunk "$svnrepo"/thunk &&
|
||||
git-svn fetch -i thunk &&
|
||||
git svn init --minimize-url -i thunk "$svnrepo"/thunk &&
|
||||
git svn fetch -i thunk &&
|
||||
test "`git rev-parse --verify refs/remotes/thunk@2`" \
|
||||
= "`git rev-parse --verify refs/remotes/thunk~1`" &&
|
||||
test "`git cat-file blob refs/remotes/thunk:readme |\
|
||||
@ -43,7 +43,7 @@ test_expect_success 'init and fetch from one svn-remote' '
|
||||
trunk:refs/remotes/svn/trunk &&
|
||||
git config --add svn-remote.svn.fetch \
|
||||
thunk:refs/remotes/svn/thunk &&
|
||||
git-svn fetch -i svn/thunk &&
|
||||
git svn fetch -i svn/thunk &&
|
||||
test "`git rev-parse --verify refs/remotes/svn/trunk`" \
|
||||
= "`git rev-parse --verify refs/remotes/svn/thunk~1`" &&
|
||||
test "`git cat-file blob refs/remotes/svn/thunk:readme |\
|
||||
@ -57,8 +57,8 @@ test_expect_success 'follow deleted parent' '
|
||||
-r2 "$svnrepo"/trunk "$svnrepo"/junk) &&
|
||||
git config --add svn-remote.svn.fetch \
|
||||
junk:refs/remotes/svn/junk &&
|
||||
git-svn fetch -i svn/thunk &&
|
||||
git-svn fetch -i svn/junk &&
|
||||
git svn fetch -i svn/thunk &&
|
||||
git svn fetch -i svn/junk &&
|
||||
test -z "`git diff svn/junk svn/trunk`" &&
|
||||
test "`git merge-base svn/junk svn/trunk`" \
|
||||
= "`git rev-parse svn/trunk`"
|
||||
@ -69,9 +69,9 @@ test_expect_success 'follow larger parent' '
|
||||
echo hi > import/trunk/thunk/bump/thud/file &&
|
||||
svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
|
||||
svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
|
||||
git-svn init --minimize-url -i larger \
|
||||
git svn init --minimize-url -i larger \
|
||||
"$svnrepo"/another-larger/trunk/thunk/bump/thud &&
|
||||
git-svn fetch -i larger &&
|
||||
git svn fetch -i larger &&
|
||||
git rev-parse --verify refs/remotes/larger &&
|
||||
git rev-parse --verify \
|
||||
refs/remotes/larger-parent/trunk/thunk/bump/thud &&
|
||||
@ -92,15 +92,15 @@ test_expect_success 'follow higher-level parent' '
|
||||
cd ..
|
||||
svn mkdir -m "new glob at top level" "$svnrepo"/glob &&
|
||||
svn mv -m "move blob down a level" "$svnrepo"/blob "$svnrepo"/glob/blob &&
|
||||
git-svn init --minimize-url -i blob "$svnrepo"/glob/blob &&
|
||||
git-svn fetch -i blob
|
||||
git svn init --minimize-url -i blob "$svnrepo"/glob/blob &&
|
||||
git svn fetch -i blob
|
||||
'
|
||||
|
||||
test_expect_success 'follow deleted directory' '
|
||||
svn mv -m "bye!" "$svnrepo"/glob/blob/hi "$svnrepo"/glob/blob/bye &&
|
||||
svn rm -m "remove glob" "$svnrepo"/glob &&
|
||||
git-svn init --minimize-url -i glob "$svnrepo"/glob &&
|
||||
git-svn fetch -i glob &&
|
||||
git svn init --minimize-url -i glob "$svnrepo"/glob &&
|
||||
git svn fetch -i glob &&
|
||||
test "`git cat-file blob refs/remotes/glob:blob/bye`" = hi &&
|
||||
test "`git ls-tree refs/remotes/glob | wc -l `" -eq 1
|
||||
'
|
||||
@ -129,9 +129,9 @@ test_expect_success 'follow-parent avoids deleting relevant info' '
|
||||
poke native/t/c.t &&
|
||||
svn commit -m "reorg test" &&
|
||||
cd .. &&
|
||||
git-svn init --minimize-url -i r9270-t \
|
||||
git svn init --minimize-url -i r9270-t \
|
||||
"$svnrepo"/r9270/trunk/subversion/bindings/swig/perl/native/t &&
|
||||
git-svn fetch -i r9270-t &&
|
||||
git svn fetch -i r9270-t &&
|
||||
test `git rev-list r9270-t | wc -l` -eq 2 &&
|
||||
test "`git ls-tree --name-only r9270-t~1`" = \
|
||||
"`git ls-tree --name-only r9270-t`"
|
||||
@ -139,9 +139,9 @@ test_expect_success 'follow-parent avoids deleting relevant info' '
|
||||
|
||||
test_expect_success "track initial change if it was only made to parent" '
|
||||
svn cp -m "wheee!" "$svnrepo"/r9270/trunk "$svnrepo"/r9270/drunk &&
|
||||
git-svn init --minimize-url -i r9270-d \
|
||||
git svn init --minimize-url -i r9270-d \
|
||||
"$svnrepo"/r9270/drunk/subversion/bindings/swig/perl/native/t &&
|
||||
git-svn fetch -i r9270-d &&
|
||||
git svn fetch -i r9270-d &&
|
||||
test `git rev-list r9270-d | wc -l` -eq 3 &&
|
||||
test "`git ls-tree --name-only r9270-t`" = \
|
||||
"`git ls-tree --name-only r9270-d`" &&
|
||||
@ -151,19 +151,19 @@ test_expect_success "track initial change if it was only made to parent" '
|
||||
|
||||
test_expect_success "track multi-parent paths" '
|
||||
svn cp -m "resurrect /glob" "$svnrepo"/r9270 "$svnrepo"/glob &&
|
||||
git-svn multi-fetch &&
|
||||
git svn multi-fetch &&
|
||||
test `git cat-file commit refs/remotes/glob | \
|
||||
grep "^parent " | wc -l` -eq 2
|
||||
'
|
||||
|
||||
test_expect_success "multi-fetch continues to work" "
|
||||
git-svn multi-fetch
|
||||
git svn multi-fetch
|
||||
"
|
||||
|
||||
test_expect_success "multi-fetch works off a 'clean' repository" '
|
||||
rm -r "$GIT_DIR/svn" "$GIT_DIR/refs/remotes" "$GIT_DIR/logs" &&
|
||||
mkdir "$GIT_DIR/svn" &&
|
||||
git-svn multi-fetch
|
||||
git svn multi-fetch
|
||||
'
|
||||
|
||||
test_debug 'gitk --all &'
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2006 Eric Wong
|
||||
test_description='git-svn commit-diff'
|
||||
test_description='git svn commit-diff'
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
test_expect_success 'initialize repo' '
|
||||
@ -26,16 +26,16 @@ prev=`git rev-parse --verify HEAD^1`
|
||||
|
||||
test_expect_success 'test the commit-diff command' '
|
||||
test -n "$prev" && test -n "$head" &&
|
||||
git-svn commit-diff -r1 "$prev" "$head" "$svnrepo" &&
|
||||
git svn commit-diff -r1 "$prev" "$head" "$svnrepo" &&
|
||||
svn co "$svnrepo" wc &&
|
||||
cmp readme wc/readme
|
||||
'
|
||||
|
||||
test_expect_success 'commit-diff to a sub-directory (with git-svn config)' '
|
||||
test_expect_success 'commit-diff to a sub-directory (with git svn config)' '
|
||||
svn import -m "sub-directory" import "$svnrepo"/subdir &&
|
||||
git-svn init --minimize-url "$svnrepo"/subdir &&
|
||||
git-svn fetch &&
|
||||
git-svn commit-diff -r3 "$prev" "$head" &&
|
||||
git svn init --minimize-url "$svnrepo"/subdir &&
|
||||
git svn fetch &&
|
||||
git svn commit-diff -r3 "$prev" "$head" &&
|
||||
svn cat "$svnrepo"/subdir/readme > readme.2 &&
|
||||
cmp readme readme.2
|
||||
'
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2006 Eric Wong
|
||||
test_description='git-svn commit-diff clobber'
|
||||
test_description='git svn commit-diff clobber'
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
test_expect_success 'initialize repo' '
|
||||
@ -27,7 +27,7 @@ test_expect_success 'commit change from svn side' '
|
||||
test_expect_success 'commit conflicting change from git' '
|
||||
echo second line from git >> file &&
|
||||
git commit -a -m "second line from git" &&
|
||||
test_must_fail git-svn commit-diff -r1 HEAD~1 HEAD "$svnrepo"
|
||||
test_must_fail git svn commit-diff -r1 HEAD~1 HEAD "$svnrepo"
|
||||
'
|
||||
|
||||
test_expect_success 'commit complementing change from git' '
|
||||
@ -36,12 +36,12 @@ test_expect_success 'commit complementing change from git' '
|
||||
git commit -a -m "second line from svn" &&
|
||||
echo third line from git >> file &&
|
||||
git commit -a -m "third line from git" &&
|
||||
git-svn commit-diff -r2 HEAD~1 HEAD "$svnrepo"
|
||||
git svn commit-diff -r2 HEAD~1 HEAD "$svnrepo"
|
||||
'
|
||||
|
||||
test_expect_success 'dcommit fails to commit because of conflict' '
|
||||
git-svn init "$svnrepo" &&
|
||||
git-svn fetch &&
|
||||
git svn init "$svnrepo" &&
|
||||
git svn fetch &&
|
||||
git reset --hard refs/${remotes_git_svn} &&
|
||||
svn co "$svnrepo" t.svn &&
|
||||
cd t.svn &&
|
||||
@ -52,7 +52,7 @@ test_expect_success 'dcommit fails to commit because of conflict' '
|
||||
rm -rf t.svn &&
|
||||
echo "fourth line from git" >> file &&
|
||||
git commit -a -m "fourth line from git" &&
|
||||
test_must_fail git-svn dcommit
|
||||
test_must_fail git svn dcommit
|
||||
'
|
||||
|
||||
test_expect_success 'dcommit does the svn equivalent of an index merge' "
|
||||
@ -63,7 +63,7 @@ test_expect_success 'dcommit does the svn equivalent of an index merge' "
|
||||
echo 'more changes' >> file2 &&
|
||||
git update-index file2 &&
|
||||
git commit -a -m 'more changes' &&
|
||||
git-svn dcommit
|
||||
git svn dcommit
|
||||
"
|
||||
|
||||
test_expect_success 'commit another change from svn side' '
|
||||
@ -76,7 +76,7 @@ test_expect_success 'commit another change from svn side' '
|
||||
rm -rf t.svn
|
||||
'
|
||||
|
||||
test_expect_success 'multiple dcommit from git-svn will not clobber svn' "
|
||||
test_expect_success 'multiple dcommit from git svn will not clobber svn' "
|
||||
git reset --hard refs/${remotes_git_svn} &&
|
||||
echo new file >> new-file &&
|
||||
git update-index --add new-file &&
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# Copyright (c) 2007 Eric Wong
|
||||
test_description='git-svn dcommit clobber series'
|
||||
test_description='git svn dcommit clobber series'
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
test_expect_success 'initialize repo' '
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2006 Eric Wong
|
||||
test_description='git-svn metadata migrations from previous versions'
|
||||
test_description='git svn metadata migrations from previous versions'
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
test_expect_success 'setup old-looking metadata' '
|
||||
@ -14,8 +14,8 @@ test_expect_success 'setup old-looking metadata' '
|
||||
done && \
|
||||
svn import -m test . "$svnrepo"
|
||||
cd .. &&
|
||||
git-svn init "$svnrepo" &&
|
||||
git-svn fetch &&
|
||||
git svn init "$svnrepo" &&
|
||||
git svn fetch &&
|
||||
mv "$GIT_DIR"/svn/* "$GIT_DIR"/ &&
|
||||
mv "$GIT_DIR"/svn/.metadata "$GIT_DIR"/ &&
|
||||
rmdir "$GIT_DIR"/svn &&
|
||||
@ -27,12 +27,12 @@ test_expect_success 'setup old-looking metadata' '
|
||||
head=`git rev-parse --verify refs/heads/git-svn-HEAD^0`
|
||||
test_expect_success 'git-svn-HEAD is a real HEAD' "test -n '$head'"
|
||||
|
||||
test_expect_success 'initialize old-style (v0) git-svn layout' '
|
||||
test_expect_success 'initialize old-style (v0) git svn layout' '
|
||||
mkdir -p "$GIT_DIR"/git-svn/info "$GIT_DIR"/svn/info &&
|
||||
echo "$svnrepo" > "$GIT_DIR"/git-svn/info/url &&
|
||||
echo "$svnrepo" > "$GIT_DIR"/svn/info/url &&
|
||||
git-svn migrate &&
|
||||
! test -d "$GIT_DIR"/git-svn &&
|
||||
git svn migrate &&
|
||||
! test -d "$GIT_DIR"/git svn &&
|
||||
git rev-parse --verify refs/${remotes_git_svn}^0 &&
|
||||
git rev-parse --verify refs/remotes/svn^0 &&
|
||||
test "$(git config --get svn-remote.svn.url)" = "$svnrepo" &&
|
||||
@ -41,7 +41,7 @@ test_expect_success 'initialize old-style (v0) git-svn layout' '
|
||||
'
|
||||
|
||||
test_expect_success 'initialize a multi-repository repo' '
|
||||
git-svn init "$svnrepo" -T trunk -t tags -b branches &&
|
||||
git svn init "$svnrepo" -T trunk -t tags -b branches &&
|
||||
git config --get-all svn-remote.svn.fetch > fetch.out &&
|
||||
grep "^trunk:refs/remotes/trunk$" fetch.out &&
|
||||
test -n "`git config --get svn-remote.svn.branches \
|
||||
@ -61,7 +61,7 @@ test_expect_success 'initialize a multi-repository repo' '
|
||||
|
||||
# refs should all be different, but the trees should all be the same:
|
||||
test_expect_success 'multi-fetch works on partial urls + paths' "
|
||||
git-svn multi-fetch &&
|
||||
git svn multi-fetch &&
|
||||
for i in trunk a b tags/0.1 tags/0.2 tags/0.3; do
|
||||
git rev-parse --verify refs/remotes/\$i^0 >> refs.out || exit 1;
|
||||
done &&
|
||||
@ -85,7 +85,7 @@ test_expect_success 'migrate --minimize on old inited layout' '
|
||||
( mkdir -p "$GIT_DIR"/svn/$ref/info/ &&
|
||||
echo "$svnrepo"$path > "$GIT_DIR"/svn/$ref/info/url ) || exit 1;
|
||||
done &&
|
||||
git-svn migrate --minimize &&
|
||||
git svn migrate --minimize &&
|
||||
test -z "`git config -l |grep -v "^svn-remote\.git-svn\."`" &&
|
||||
git config --get-all svn-remote.svn.fetch > fetch.out &&
|
||||
grep "^trunk:refs/remotes/trunk$" fetch.out &&
|
||||
@ -98,7 +98,7 @@ test_expect_success 'migrate --minimize on old inited layout' '
|
||||
'
|
||||
|
||||
test_expect_success ".rev_db auto-converted to .rev_map.UUID" '
|
||||
git-svn fetch -i trunk &&
|
||||
git svn fetch -i trunk &&
|
||||
test -z "$(ls "$GIT_DIR"/svn/trunk/.rev_db.* 2>/dev/null)" &&
|
||||
expect="$(ls "$GIT_DIR"/svn/trunk/.rev_map.*)" &&
|
||||
test -n "$expect" &&
|
||||
@ -106,7 +106,7 @@ test_expect_success ".rev_db auto-converted to .rev_map.UUID" '
|
||||
convert_to_rev_db "$expect" "$rev_db" &&
|
||||
rm -f "$expect" &&
|
||||
test -f "$rev_db" &&
|
||||
git-svn fetch -i trunk &&
|
||||
git svn fetch -i trunk &&
|
||||
test -z "$(ls "$GIT_DIR"/svn/trunk/.rev_db.* 2>/dev/null)" &&
|
||||
test ! -e "$GIT_DIR"/svn/trunk/.rev_db &&
|
||||
test -f "$expect"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2007 Eric Wong
|
||||
test_description='git-svn globbing refspecs'
|
||||
test_description='git svn globbing refspecs'
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
cat > expect.end <<EOF
|
||||
@ -46,7 +46,7 @@ test_expect_success 'test refspec globbing' '
|
||||
"branches/*/src/a:refs/remotes/branches/*" &&
|
||||
git config --add svn-remote.svn.tags\
|
||||
"tags/*/src/a:refs/remotes/tags/*" &&
|
||||
git-svn multi-fetch &&
|
||||
git svn multi-fetch &&
|
||||
git log --pretty=oneline refs/remotes/tags/end | \
|
||||
sed -e "s/^.\{41\}//" > output.end &&
|
||||
test_cmp expect.end output.end &&
|
||||
@ -74,7 +74,7 @@ test_expect_success 'test left-hand-side only globbing' '
|
||||
poke tags/end/src/b/readme &&
|
||||
svn commit -m "try to try"
|
||||
) &&
|
||||
git-svn fetch two &&
|
||||
git svn fetch two &&
|
||||
test `git rev-list refs/remotes/two/tags/end | wc -l` -eq 6 &&
|
||||
test `git rev-list refs/remotes/two/branches/start | wc -l` -eq 3 &&
|
||||
test `git rev-parse refs/remotes/two/branches/start~2` = \
|
||||
@ -104,7 +104,7 @@ test_expect_success 'test disallow multi-globs' '
|
||||
poke tags/end/src/b/readme &&
|
||||
svn commit -m "try to try"
|
||||
) &&
|
||||
test_must_fail git-svn fetch three 2> stderr.three &&
|
||||
test_must_fail git svn fetch three 2> stderr.three &&
|
||||
test_cmp expect.three stderr.three
|
||||
'
|
||||
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2007 Eric Wong
|
||||
test_description='git-svn globbing refspecs'
|
||||
test_description='git svn globbing refspecs'
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
cat > expect.end <<EOF
|
||||
@ -46,7 +46,7 @@ test_expect_success 'test refspec globbing' '
|
||||
"branches/*/*/src/a:refs/remotes/branches/*/*" &&
|
||||
git config --add svn-remote.svn.tags\
|
||||
"tags/*/src/a:refs/remotes/tags/*" &&
|
||||
git-svn multi-fetch &&
|
||||
git svn multi-fetch &&
|
||||
git log --pretty=oneline refs/remotes/tags/end | \
|
||||
sed -e "s/^.\{41\}//" > output.end &&
|
||||
test_cmp expect.end output.end &&
|
||||
@ -74,7 +74,7 @@ test_expect_success 'test left-hand-side only globbing' '
|
||||
poke tags/end/src/b/readme &&
|
||||
svn commit -m "try to try"
|
||||
) &&
|
||||
git-svn fetch two &&
|
||||
git svn fetch two &&
|
||||
test `git rev-list refs/remotes/two/tags/end | wc -l` -eq 6 &&
|
||||
test `git rev-list refs/remotes/two/branches/v1/start | wc -l` -eq 3 &&
|
||||
test `git rev-parse refs/remotes/two/branches/v1/start~2` = \
|
||||
@ -123,7 +123,7 @@ test_expect_success 'test another branch' '
|
||||
"branches/*/*:refs/remotes/four/branches/*/*" &&
|
||||
git config --add svn-remote.four.tags \
|
||||
"tags/*:refs/remotes/four/tags/*" &&
|
||||
git-svn fetch four &&
|
||||
git svn fetch four &&
|
||||
test `git rev-list refs/remotes/four/tags/next | wc -l` -eq 5 &&
|
||||
test `git rev-list refs/remotes/four/branches/v2/start | wc -l` -eq 3 &&
|
||||
test `git rev-parse refs/remotes/four/branches/v2/start~2` = \
|
||||
@ -153,7 +153,7 @@ test_expect_success 'test disallow multiple globs' '
|
||||
poke tags/end/src/b/readme &&
|
||||
svn commit -m "try to try"
|
||||
) &&
|
||||
test_must_fail git-svn fetch three 2> stderr.three &&
|
||||
test_must_fail git svn fetch three 2> stderr.three &&
|
||||
test_cmp expect.three stderr.three
|
||||
'
|
||||
|
||||
|
||||
@ -3,18 +3,18 @@
|
||||
# Copyright (c) 2007 Eric Wong
|
||||
#
|
||||
|
||||
test_description='git-svn useSvmProps test'
|
||||
test_description='git svn useSvmProps test'
|
||||
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
test_expect_success 'load svm repo' '
|
||||
svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9110/svm.dump &&
|
||||
git-svn init --minimize-url -R arr -i bar "$svnrepo"/mirror/arr &&
|
||||
git-svn init --minimize-url -R argh -i dir "$svnrepo"/mirror/argh &&
|
||||
git-svn init --minimize-url -R argh -i e \
|
||||
git svn init --minimize-url -R arr -i bar "$svnrepo"/mirror/arr &&
|
||||
git svn init --minimize-url -R argh -i dir "$svnrepo"/mirror/argh &&
|
||||
git svn init --minimize-url -R argh -i e \
|
||||
"$svnrepo"/mirror/argh/a/b/c/d/e &&
|
||||
git config svn.useSvmProps true &&
|
||||
git-svn fetch --all
|
||||
git svn fetch --all
|
||||
'
|
||||
|
||||
uuid=161ce429-a9dd-4828-af4a-52023f968c89
|
||||
@ -50,12 +50,12 @@ test_expect_success 'verify metadata for /dir' "
|
||||
"
|
||||
|
||||
test_expect_success 'find commit based on SVN revision number' "
|
||||
git-svn find-rev r12 |
|
||||
git svn find-rev r12 |
|
||||
grep `git rev-parse HEAD`
|
||||
"
|
||||
|
||||
test_expect_success 'empty rebase' "
|
||||
git-svn rebase
|
||||
git svn rebase
|
||||
"
|
||||
|
||||
test_done
|
||||
|
||||
@ -3,17 +3,17 @@
|
||||
# Copyright (c) 2007 Eric Wong
|
||||
#
|
||||
|
||||
test_description='git-svn useSvnsyncProps test'
|
||||
test_description='git svn useSvnsyncProps test'
|
||||
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
test_expect_success 'load svnsync repo' '
|
||||
svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9111/svnsync.dump &&
|
||||
git-svn init --minimize-url -R arr -i bar "$svnrepo"/bar &&
|
||||
git-svn init --minimize-url -R argh -i dir "$svnrepo"/dir &&
|
||||
git-svn init --minimize-url -R argh -i e "$svnrepo"/dir/a/b/c/d/e &&
|
||||
git svn init --minimize-url -R arr -i bar "$svnrepo"/bar &&
|
||||
git svn init --minimize-url -R argh -i dir "$svnrepo"/dir &&
|
||||
git svn init --minimize-url -R argh -i e "$svnrepo"/dir/a/b/c/d/e &&
|
||||
git config svn.useSvnsyncProps true &&
|
||||
git-svn fetch --all
|
||||
git svn fetch --all
|
||||
'
|
||||
|
||||
uuid=161ce429-a9dd-4828-af4a-52023f968c89
|
||||
|
||||
@ -42,6 +42,6 @@ EOF
|
||||
|
||||
test_expect_success 'load svn dumpfile' 'svnadmin load "$rawsvnrepo" < dumpfile.svn'
|
||||
|
||||
test_expect_success 'initialize git-svn' 'git-svn init "$svnrepo"'
|
||||
test_expect_success 'fetch revisions from svn' 'git-svn fetch'
|
||||
test_expect_success 'initialize git-svn' 'git svn init "$svnrepo"'
|
||||
test_expect_success 'fetch revisions from svn' 'git svn fetch'
|
||||
test_done
|
||||
|
||||
@ -8,7 +8,7 @@
|
||||
# daemon running on a users system if the test fails.
|
||||
# Not all git users will need to interact with SVN.
|
||||
|
||||
test_description='git-svn dcommit new files over svn:// test'
|
||||
test_description='git svn dcommit new files over svn:// test'
|
||||
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# Copyright (c) 2007 Eric Wong
|
||||
# Based on a script by Joakim Tjernlund <joakim.tjernlund@transmode.se>
|
||||
|
||||
test_description='git-svn dcommit handles merges'
|
||||
test_description='git svn dcommit handles merges'
|
||||
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# Copyright (c) 2007 Eric Wong
|
||||
|
||||
|
||||
test_description='git-svn dcommit can commit renames of files with ugly names'
|
||||
test_description='git svn dcommit can commit renames of files with ugly names'
|
||||
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
@ -75,7 +75,7 @@ test_expect_success 'make a commit to test rebase' '
|
||||
git svn dcommit
|
||||
'
|
||||
|
||||
test_expect_success 'git-svn rebase works inside a fresh-cloned repository' '
|
||||
test_expect_success 'git svn rebase works inside a fresh-cloned repository' '
|
||||
cd test-rebase &&
|
||||
git svn rebase &&
|
||||
test -e test-rebase-main &&
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# Copyright (c) 2007 Eric Wong
|
||||
#
|
||||
|
||||
test_description='git-svn log tests'
|
||||
test_description='git svn log tests'
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
test_expect_success 'setup repository and import' '
|
||||
@ -16,8 +16,8 @@ test_expect_success 'setup repository and import' '
|
||||
done && \
|
||||
svn import -m test . "$svnrepo"
|
||||
cd .. &&
|
||||
git-svn init "$svnrepo" -T trunk -b branches -t tags &&
|
||||
git-svn fetch &&
|
||||
git svn init "$svnrepo" -T trunk -b branches -t tags &&
|
||||
git svn fetch &&
|
||||
git reset --hard trunk &&
|
||||
echo bye >> README &&
|
||||
git commit -a -m bye &&
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# Copyright (c) 2007 Eric Wong
|
||||
#
|
||||
|
||||
test_description='git-svn init/clone tests'
|
||||
test_description='git svn init/clone tests'
|
||||
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# Copyright (c) 2007 Eric Wong
|
||||
#
|
||||
|
||||
test_description='git-svn funky branch names'
|
||||
test_description='git svn funky branch names'
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
# Abo-Uebernahme (Bug #994)
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#
|
||||
# Copyright (c) 2007 David D. Kilzer
|
||||
|
||||
test_description='git-svn info'
|
||||
test_description='git svn info'
|
||||
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
@ -56,8 +56,8 @@ test_expect_success 'setup repository and import' '
|
||||
cd .. &&
|
||||
mkdir gitwc &&
|
||||
cd gitwc &&
|
||||
git-svn init "$svnrepo" &&
|
||||
git-svn fetch &&
|
||||
git svn init "$svnrepo" &&
|
||||
git svn fetch &&
|
||||
cd .. &&
|
||||
ptouch gitwc/file svnwc/file &&
|
||||
ptouch gitwc/directory svnwc/directory &&
|
||||
@ -67,71 +67,71 @@ test_expect_success 'setup repository and import' '
|
||||
|
||||
test_expect_success 'info' "
|
||||
(cd svnwc; svn info) > expected.info &&
|
||||
(cd gitwc; git-svn info) > actual.info &&
|
||||
(cd gitwc; git svn info) > actual.info &&
|
||||
test_cmp expected.info actual.info
|
||||
"
|
||||
|
||||
test_expect_success 'info --url' '
|
||||
test "$(cd gitwc; git-svn info --url)" = "$quoted_svnrepo"
|
||||
test "$(cd gitwc; git svn info --url)" = "$quoted_svnrepo"
|
||||
'
|
||||
|
||||
test_expect_success 'info .' "
|
||||
(cd svnwc; svn info .) > expected.info-dot &&
|
||||
(cd gitwc; git-svn info .) > actual.info-dot &&
|
||||
(cd gitwc; git svn info .) > actual.info-dot &&
|
||||
test_cmp expected.info-dot actual.info-dot
|
||||
"
|
||||
|
||||
test_expect_success 'info --url .' '
|
||||
test "$(cd gitwc; git-svn info --url .)" = "$quoted_svnrepo"
|
||||
test "$(cd gitwc; git svn info --url .)" = "$quoted_svnrepo"
|
||||
'
|
||||
|
||||
test_expect_success 'info file' "
|
||||
(cd svnwc; svn info file) > expected.info-file &&
|
||||
(cd gitwc; git-svn info file) > actual.info-file &&
|
||||
(cd gitwc; git svn info file) > actual.info-file &&
|
||||
test_cmp expected.info-file actual.info-file
|
||||
"
|
||||
|
||||
test_expect_success 'info --url file' '
|
||||
test "$(cd gitwc; git-svn info --url file)" = "$quoted_svnrepo/file"
|
||||
test "$(cd gitwc; git svn info --url file)" = "$quoted_svnrepo/file"
|
||||
'
|
||||
|
||||
test_expect_success 'info directory' "
|
||||
(cd svnwc; svn info directory) > expected.info-directory &&
|
||||
(cd gitwc; git-svn info directory) > actual.info-directory &&
|
||||
(cd gitwc; git svn info directory) > actual.info-directory &&
|
||||
test_cmp expected.info-directory actual.info-directory
|
||||
"
|
||||
|
||||
test_expect_success 'info inside directory' "
|
||||
(cd svnwc/directory; svn info) > expected.info-inside-directory &&
|
||||
(cd gitwc/directory; git-svn info) > actual.info-inside-directory &&
|
||||
(cd gitwc/directory; git svn info) > actual.info-inside-directory &&
|
||||
test_cmp expected.info-inside-directory actual.info-inside-directory
|
||||
"
|
||||
|
||||
test_expect_success 'info --url directory' '
|
||||
test "$(cd gitwc; git-svn info --url directory)" = "$quoted_svnrepo/directory"
|
||||
test "$(cd gitwc; git svn info --url directory)" = "$quoted_svnrepo/directory"
|
||||
'
|
||||
|
||||
test_expect_success 'info symlink-file' "
|
||||
(cd svnwc; svn info symlink-file) > expected.info-symlink-file &&
|
||||
(cd gitwc; git-svn info symlink-file) > actual.info-symlink-file &&
|
||||
(cd gitwc; git svn info symlink-file) > actual.info-symlink-file &&
|
||||
test_cmp expected.info-symlink-file actual.info-symlink-file
|
||||
"
|
||||
|
||||
test_expect_success 'info --url symlink-file' '
|
||||
test "$(cd gitwc; git-svn info --url symlink-file)" \
|
||||
test "$(cd gitwc; git svn info --url symlink-file)" \
|
||||
= "$quoted_svnrepo/symlink-file"
|
||||
'
|
||||
|
||||
test_expect_success 'info symlink-directory' "
|
||||
(cd svnwc; svn info symlink-directory) \
|
||||
> expected.info-symlink-directory &&
|
||||
(cd gitwc; git-svn info symlink-directory) \
|
||||
(cd gitwc; git svn info symlink-directory) \
|
||||
> actual.info-symlink-directory &&
|
||||
test_cmp expected.info-symlink-directory actual.info-symlink-directory
|
||||
"
|
||||
|
||||
test_expect_success 'info --url symlink-directory' '
|
||||
test "$(cd gitwc; git-svn info --url symlink-directory)" \
|
||||
test "$(cd gitwc; git svn info --url symlink-directory)" \
|
||||
= "$quoted_svnrepo/symlink-directory"
|
||||
'
|
||||
|
||||
@ -146,12 +146,12 @@ test_expect_success 'info added-file' "
|
||||
svn add added-file > /dev/null &&
|
||||
cd .. &&
|
||||
(cd svnwc; svn info added-file) > expected.info-added-file &&
|
||||
(cd gitwc; git-svn info added-file) > actual.info-added-file &&
|
||||
(cd gitwc; git svn info added-file) > actual.info-added-file &&
|
||||
test_cmp expected.info-added-file actual.info-added-file
|
||||
"
|
||||
|
||||
test_expect_success 'info --url added-file' '
|
||||
test "$(cd gitwc; git-svn info --url added-file)" \
|
||||
test "$(cd gitwc; git svn info --url added-file)" \
|
||||
= "$quoted_svnrepo/added-file"
|
||||
'
|
||||
|
||||
@ -167,13 +167,13 @@ test_expect_success 'info added-directory' "
|
||||
cd .. &&
|
||||
(cd svnwc; svn info added-directory) \
|
||||
> expected.info-added-directory &&
|
||||
(cd gitwc; git-svn info added-directory) \
|
||||
(cd gitwc; git svn info added-directory) \
|
||||
> actual.info-added-directory &&
|
||||
test_cmp expected.info-added-directory actual.info-added-directory
|
||||
"
|
||||
|
||||
test_expect_success 'info --url added-directory' '
|
||||
test "$(cd gitwc; git-svn info --url added-directory)" \
|
||||
test "$(cd gitwc; git svn info --url added-directory)" \
|
||||
= "$quoted_svnrepo/added-directory"
|
||||
'
|
||||
|
||||
@ -189,14 +189,14 @@ test_expect_success 'info added-symlink-file' "
|
||||
ptouch gitwc/added-symlink-file svnwc/added-symlink-file &&
|
||||
(cd svnwc; svn info added-symlink-file) \
|
||||
> expected.info-added-symlink-file &&
|
||||
(cd gitwc; git-svn info added-symlink-file) \
|
||||
(cd gitwc; git svn info added-symlink-file) \
|
||||
> actual.info-added-symlink-file &&
|
||||
test_cmp expected.info-added-symlink-file \
|
||||
actual.info-added-symlink-file
|
||||
"
|
||||
|
||||
test_expect_success 'info --url added-symlink-file' '
|
||||
test "$(cd gitwc; git-svn info --url added-symlink-file)" \
|
||||
test "$(cd gitwc; git svn info --url added-symlink-file)" \
|
||||
= "$quoted_svnrepo/added-symlink-file"
|
||||
'
|
||||
|
||||
@ -212,14 +212,14 @@ test_expect_success 'info added-symlink-directory' "
|
||||
ptouch gitwc/added-symlink-directory svnwc/added-symlink-directory &&
|
||||
(cd svnwc; svn info added-symlink-directory) \
|
||||
> expected.info-added-symlink-directory &&
|
||||
(cd gitwc; git-svn info added-symlink-directory) \
|
||||
(cd gitwc; git svn info added-symlink-directory) \
|
||||
> actual.info-added-symlink-directory &&
|
||||
test_cmp expected.info-added-symlink-directory \
|
||||
actual.info-added-symlink-directory
|
||||
"
|
||||
|
||||
test_expect_success 'info --url added-symlink-directory' '
|
||||
test "$(cd gitwc; git-svn info --url added-symlink-directory)" \
|
||||
test "$(cd gitwc; git svn info --url added-symlink-directory)" \
|
||||
= "$quoted_svnrepo/added-symlink-directory"
|
||||
'
|
||||
|
||||
@ -238,14 +238,14 @@ test_expect_success 'info deleted-file' "
|
||||
(cd svnwc; svn info file) |
|
||||
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
|
||||
> expected.info-deleted-file &&
|
||||
(cd gitwc; git-svn info file) |
|
||||
(cd gitwc; git svn info file) |
|
||||
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
|
||||
> actual.info-deleted-file &&
|
||||
test_cmp expected.info-deleted-file actual.info-deleted-file
|
||||
"
|
||||
|
||||
test_expect_success 'info --url file (deleted)' '
|
||||
test "$(cd gitwc; git-svn info --url file)" \
|
||||
test "$(cd gitwc; git svn info --url file)" \
|
||||
= "$quoted_svnrepo/file"
|
||||
'
|
||||
|
||||
@ -259,14 +259,14 @@ test_expect_success 'info deleted-directory' "
|
||||
(cd svnwc; svn info directory) |
|
||||
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
|
||||
> expected.info-deleted-directory &&
|
||||
(cd gitwc; git-svn info directory) |
|
||||
(cd gitwc; git svn info directory) |
|
||||
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
|
||||
> actual.info-deleted-directory &&
|
||||
test_cmp expected.info-deleted-directory actual.info-deleted-directory
|
||||
"
|
||||
|
||||
test_expect_success 'info --url directory (deleted)' '
|
||||
test "$(cd gitwc; git-svn info --url directory)" \
|
||||
test "$(cd gitwc; git svn info --url directory)" \
|
||||
= "$quoted_svnrepo/directory"
|
||||
'
|
||||
|
||||
@ -280,7 +280,7 @@ test_expect_success 'info deleted-symlink-file' "
|
||||
(cd svnwc; svn info symlink-file) |
|
||||
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
|
||||
> expected.info-deleted-symlink-file &&
|
||||
(cd gitwc; git-svn info symlink-file) |
|
||||
(cd gitwc; git svn info symlink-file) |
|
||||
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
|
||||
> actual.info-deleted-symlink-file &&
|
||||
test_cmp expected.info-deleted-symlink-file \
|
||||
@ -288,7 +288,7 @@ test_expect_success 'info deleted-symlink-file' "
|
||||
"
|
||||
|
||||
test_expect_success 'info --url symlink-file (deleted)' '
|
||||
test "$(cd gitwc; git-svn info --url symlink-file)" \
|
||||
test "$(cd gitwc; git svn info --url symlink-file)" \
|
||||
= "$quoted_svnrepo/symlink-file"
|
||||
'
|
||||
|
||||
@ -302,7 +302,7 @@ test_expect_success 'info deleted-symlink-directory' "
|
||||
(cd svnwc; svn info symlink-directory) |
|
||||
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
|
||||
> expected.info-deleted-symlink-directory &&
|
||||
(cd gitwc; git-svn info symlink-directory) |
|
||||
(cd gitwc; git svn info symlink-directory) |
|
||||
sed -e 's/^\(Text Last Updated:\).*/\1 TEXT-LAST-UPDATED-STRING/' \
|
||||
> actual.info-deleted-symlink-directory &&
|
||||
test_cmp expected.info-deleted-symlink-directory \
|
||||
@ -310,7 +310,7 @@ test_expect_success 'info deleted-symlink-directory' "
|
||||
"
|
||||
|
||||
test_expect_success 'info --url symlink-directory (deleted)' '
|
||||
test "$(cd gitwc; git-svn info --url symlink-directory)" \
|
||||
test "$(cd gitwc; git svn info --url symlink-directory)" \
|
||||
= "$quoted_svnrepo/symlink-directory"
|
||||
'
|
||||
|
||||
@ -319,27 +319,27 @@ test_expect_success 'info --url symlink-directory (deleted)' '
|
||||
|
||||
test_expect_success 'info unknown-file' "
|
||||
echo two > gitwc/unknown-file &&
|
||||
(cd gitwc; test_must_fail git-svn info unknown-file) \
|
||||
(cd gitwc; test_must_fail git svn info unknown-file) \
|
||||
2> actual.info-unknown-file &&
|
||||
grep unknown-file actual.info-unknown-file
|
||||
"
|
||||
|
||||
test_expect_success 'info --url unknown-file' '
|
||||
echo two > gitwc/unknown-file &&
|
||||
(cd gitwc; test_must_fail git-svn info --url unknown-file) \
|
||||
(cd gitwc; test_must_fail git svn info --url unknown-file) \
|
||||
2> actual.info-url-unknown-file &&
|
||||
grep unknown-file actual.info-url-unknown-file
|
||||
'
|
||||
|
||||
test_expect_success 'info unknown-directory' "
|
||||
mkdir gitwc/unknown-directory svnwc/unknown-directory &&
|
||||
(cd gitwc; test_must_fail git-svn info unknown-directory) \
|
||||
(cd gitwc; test_must_fail git svn info unknown-directory) \
|
||||
2> actual.info-unknown-directory &&
|
||||
grep unknown-directory actual.info-unknown-directory
|
||||
"
|
||||
|
||||
test_expect_success 'info --url unknown-directory' '
|
||||
(cd gitwc; test_must_fail git-svn info --url unknown-directory) \
|
||||
(cd gitwc; test_must_fail git svn info --url unknown-directory) \
|
||||
2> actual.info-url-unknown-directory &&
|
||||
grep unknown-directory actual.info-url-unknown-directory
|
||||
'
|
||||
@ -348,13 +348,13 @@ test_expect_success 'info unknown-symlink-file' "
|
||||
cd gitwc &&
|
||||
ln -s unknown-file unknown-symlink-file &&
|
||||
cd .. &&
|
||||
(cd gitwc; test_must_fail git-svn info unknown-symlink-file) \
|
||||
(cd gitwc; test_must_fail git svn info unknown-symlink-file) \
|
||||
2> actual.info-unknown-symlink-file &&
|
||||
grep unknown-symlink-file actual.info-unknown-symlink-file
|
||||
"
|
||||
|
||||
test_expect_success 'info --url unknown-symlink-file' '
|
||||
(cd gitwc; test_must_fail git-svn info --url unknown-symlink-file) \
|
||||
(cd gitwc; test_must_fail git svn info --url unknown-symlink-file) \
|
||||
2> actual.info-url-unknown-symlink-file &&
|
||||
grep unknown-symlink-file actual.info-url-unknown-symlink-file
|
||||
'
|
||||
@ -363,13 +363,13 @@ test_expect_success 'info unknown-symlink-directory' "
|
||||
cd gitwc &&
|
||||
ln -s unknown-directory unknown-symlink-directory &&
|
||||
cd .. &&
|
||||
(cd gitwc; test_must_fail git-svn info unknown-symlink-directory) \
|
||||
(cd gitwc; test_must_fail git svn info unknown-symlink-directory) \
|
||||
2> actual.info-unknown-symlink-directory &&
|
||||
grep unknown-symlink-directory actual.info-unknown-symlink-directory
|
||||
"
|
||||
|
||||
test_expect_success 'info --url unknown-symlink-directory' '
|
||||
(cd gitwc; test_must_fail git-svn info --url unknown-symlink-directory) \
|
||||
(cd gitwc; test_must_fail git svn info --url unknown-symlink-directory) \
|
||||
2> actual.info-url-unknown-symlink-directory &&
|
||||
grep unknown-symlink-directory actual.info-url-unknown-symlink-directory
|
||||
'
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# Copyright (c) 2008 Kevin Ballard
|
||||
#
|
||||
|
||||
test_description='git-svn clone with percent escapes'
|
||||
test_description='git svn clone with percent escapes'
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
test_expect_success 'setup svnrepo' '
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# Copyright (c) 2008 Santhosh Kumar Mani
|
||||
|
||||
|
||||
test_description='git-svn can fetch renamed directories'
|
||||
test_description='git svn can fetch renamed directories'
|
||||
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
# Copyright (c) 2008 Jan Krüger
|
||||
#
|
||||
|
||||
test_description='git-svn respects rewriteRoot during rebuild'
|
||||
test_description='git svn respects rewriteRoot during rebuild'
|
||||
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
#
|
||||
# Copyright (c) 2008 Brad King
|
||||
|
||||
test_description='git-svn dcommit honors auto-props'
|
||||
test_description='git svn dcommit honors auto-props'
|
||||
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
@ -24,8 +24,8 @@ test_expect_success 'initialize git-svn' '
|
||||
svn import -m "import for git-svn" . "$svnrepo"
|
||||
) &&
|
||||
rm -rf import &&
|
||||
git-svn init "$svnrepo"
|
||||
git-svn fetch
|
||||
git svn init "$svnrepo"
|
||||
git svn fetch
|
||||
'
|
||||
|
||||
test_expect_success 'enable auto-props config' '
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#!/bin/sh
|
||||
# Copyright (c) 2008 Marcus Griep
|
||||
|
||||
test_description='git-svn multi-glob branch names'
|
||||
test_description='git svn multi-glob branch names'
|
||||
. ./lib-git-svn.sh
|
||||
|
||||
test_expect_success 'setup svnrepo' '
|
||||
|
||||
Loading…
Reference in New Issue
Block a user