Browse Source
Unlike my earlier test patch, this also checks svn:eol-style and makes sure it's applied to working copy updates. This is definitely more correct than my original attempt at killing keyword expansions, but I still haven't tested it enough to know. Feedback would be much appreciated. Also changed assert_svn_wc_clean() to only work on the svn working copy. This requires a separate call to assert_tree() to check wc integrity against git in preparation for another change I'm planning. Signed-off-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Junio C Hamano <junkio@cox.net>maint
Eric Wong
19 years ago
committed by
Junio C Hamano
5 changed files with 254 additions and 60 deletions
@ -0,0 +1,39 @@ |
|||||||
|
PATH=$PWD/../:$PATH |
||||||
|
if test -d ../../../t |
||||||
|
then |
||||||
|
cd ../../../t |
||||||
|
else |
||||||
|
echo "Must be run in contrib/git-svn/t" >&2 |
||||||
|
exit 1 |
||||||
|
fi |
||||||
|
|
||||||
|
. ./test-lib.sh |
||||||
|
|
||||||
|
GIT_DIR=$PWD/.git |
||||||
|
GIT_SVN_DIR=$GIT_DIR/git-svn |
||||||
|
SVN_TREE=$GIT_SVN_DIR/tree |
||||||
|
|
||||||
|
svnadmin >/dev/null 2>&1 |
||||||
|
if test $? != 1 |
||||||
|
then |
||||||
|
test_expect_success 'skipping contrib/git-svn test' : |
||||||
|
test_done |
||||||
|
exit |
||||||
|
fi |
||||||
|
|
||||||
|
svn >/dev/null 2>&1 |
||||||
|
if test $? != 1 |
||||||
|
then |
||||||
|
test_expect_success 'skipping contrib/git-svn test' : |
||||||
|
test_done |
||||||
|
exit |
||||||
|
fi |
||||||
|
|
||||||
|
svnrepo=$PWD/svnrepo |
||||||
|
|
||||||
|
set -e |
||||||
|
|
||||||
|
svnadmin create $svnrepo |
||||||
|
svnrepo="file://$svnrepo/test-git-svn" |
||||||
|
|
||||||
|
|
||||||
@ -0,0 +1,125 @@ |
|||||||
|
#!/bin/sh |
||||||
|
# |
||||||
|
# Copyright (c) 2006 Eric Wong |
||||||
|
# |
||||||
|
|
||||||
|
test_description='git-svn property tests' |
||||||
|
. ./lib-git-svn.sh |
||||||
|
|
||||||
|
mkdir import |
||||||
|
|
||||||
|
a_crlf= |
||||||
|
a_lf= |
||||||
|
a_cr= |
||||||
|
a_ne_crlf= |
||||||
|
a_ne_lf= |
||||||
|
a_ne_cr= |
||||||
|
a_empty= |
||||||
|
a_empty_lf= |
||||||
|
a_empty_cr= |
||||||
|
a_empty_crlf= |
||||||
|
|
||||||
|
cd import |
||||||
|
cat >> kw.c <<'' |
||||||
|
/* Make it look like somebody copied a file from CVS into SVN: */ |
||||||
|
/* $Id: kw.c,v 1.1.1.1 1994/03/06 00:00:00 eric Exp $ */ |
||||||
|
|
||||||
|
printf "Hello\r\nWorld\r\n" > crlf |
||||||
|
a_crlf=`git-hash-object -w crlf` |
||||||
|
printf "Hello\rWorld\r" > cr |
||||||
|
a_cr=`git-hash-object -w cr` |
||||||
|
printf "Hello\nWorld\n" > lf |
||||||
|
a_lf=`git-hash-object -w lf` |
||||||
|
|
||||||
|
printf "Hello\r\nWorld" > ne_crlf |
||||||
|
a_ne_crlf=`git-hash-object -w ne_crlf` |
||||||
|
printf "Hello\nWorld" > ne_lf |
||||||
|
a_ne_lf=`git-hash-object -w ne_lf` |
||||||
|
printf "Hello\rWorld" > ne_cr |
||||||
|
a_ne_cr=`git-hash-object -w ne_cr` |
||||||
|
|
||||||
|
touch empty |
||||||
|
a_empty=`git-hash-object -w empty` |
||||||
|
printf "\n" > empty_lf |
||||||
|
a_empty_lf=`git-hash-object -w empty_lf` |
||||||
|
printf "\r" > empty_cr |
||||||
|
a_empty_cr=`git-hash-object -w empty_cr` |
||||||
|
printf "\r\n" > empty_crlf |
||||||
|
a_empty_crlf=`git-hash-object -w empty_crlf` |
||||||
|
|
||||||
|
svn import -m 'import for git-svn' . "$svnrepo" >/dev/null |
||||||
|
cd .. |
||||||
|
|
||||||
|
rm -rf import |
||||||
|
svn co "$svnrepo" test_wc |
||||||
|
|
||||||
|
cd test_wc |
||||||
|
echo 'Greetings' >> kw.c |
||||||
|
svn commit -m 'Not yet an $Id$' |
||||||
|
svn up |
||||||
|
|
||||||
|
echo 'Hello world' >> kw.c |
||||||
|
svn commit -m 'Modified file, but still not yet an $Id$' |
||||||
|
svn up |
||||||
|
|
||||||
|
svn propset svn:keywords Id kw.c |
||||||
|
svn commit -m 'Propset $Id$' |
||||||
|
svn up |
||||||
|
cd .. |
||||||
|
|
||||||
|
git-svn init "$svnrepo" |
||||||
|
git-svn fetch |
||||||
|
|
||||||
|
git checkout -b mybranch remotes/git-svn |
||||||
|
echo 'Hi again' >> kw.c |
||||||
|
name='test svn:keywords ignoring' |
||||||
|
|
||||||
|
git commit -a -m "$name" |
||||||
|
git-svn commit remotes/git-svn..mybranch |
||||||
|
git pull . remotes/git-svn |
||||||
|
|
||||||
|
expect='/* $Id$ */' |
||||||
|
got="`sed -ne 2p kw.c`" |
||||||
|
test_expect_success 'raw $Id$ found in kw.c' "test '$expect' = '$got'" |
||||||
|
|
||||||
|
cd test_wc |
||||||
|
svn propset svn:eol-style CR empty |
||||||
|
svn propset svn:eol-style CR crlf |
||||||
|
svn propset svn:eol-style CR ne_crlf |
||||||
|
svn commit -m 'propset CR on crlf files' |
||||||
|
svn up |
||||||
|
cd .. |
||||||
|
|
||||||
|
git-svn fetch |
||||||
|
git pull . remotes/git-svn |
||||||
|
|
||||||
|
svn co "$svnrepo" new_wc |
||||||
|
for i in crlf ne_crlf lf ne_lf cr ne_cr empty_cr empty_lf empty empty_crlf |
||||||
|
do |
||||||
|
test_expect_success "Comparing $i" "cmp $i new_wc/$i" |
||||||
|
done |
||||||
|
|
||||||
|
|
||||||
|
cd test_wc |
||||||
|
printf '$Id$\rHello\rWorld\r' > cr |
||||||
|
printf '$Id$\rHello\rWorld' > ne_cr |
||||||
|
a_cr=`printf '$Id$\r\nHello\r\nWorld\r\n' | git-hash-object --stdin` |
||||||
|
a_ne_cr=`printf '$Id$\r\nHello\r\nWorld' | git-hash-object --stdin` |
||||||
|
svn propset svn:eol-style CRLF cr |
||||||
|
svn propset svn:eol-style CRLF ne_cr |
||||||
|
svn propset svn:keywords Id cr |
||||||
|
svn propset svn:keywords Id ne_cr |
||||||
|
svn commit -m 'propset CRLF on cr files' |
||||||
|
svn up |
||||||
|
cd .. |
||||||
|
|
||||||
|
git-svn fetch |
||||||
|
git pull . remotes/git-svn |
||||||
|
|
||||||
|
b_cr="`git-hash-object cr`" |
||||||
|
b_ne_cr="`git-hash-object ne_cr`" |
||||||
|
|
||||||
|
test_expect_success 'CRLF + $Id$' "test '$a_cr' = '$b_cr'" |
||||||
|
test_expect_success 'CRLF + $Id$ (no newline)' "test '$a_ne_cr' = '$b_ne_cr'" |
||||||
|
|
||||||
|
test_done |
||||||
Loading…
Reference in new issue