Commit 1364ff27 authored by Nanako Shiraishi's avatar Nanako Shiraishi Committed by Junio C Hamano

t/t91XX git-svn tests: run "git svn" not "git-svn"

This replaces 'git-svn' with 'git svn' in the tests.
Signed-off-by: default avatarNanako Shiraishi <[email protected]>
Signed-off-by: default avatarJunio C Hamano <[email protected]>
parent 16805d3e
......@@ -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
#!/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/[email protected]`" \
= "`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 &'
......
#!/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
'
......
#!/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 &&
......
#!/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' '
......
#!/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"
......
#!/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
'
......
#!/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'