2006-05-24 10:23:41 +08:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2006 Eric Wong
|
|
|
|
#
|
|
|
|
|
2008-09-08 18:02:08 +08:00
|
|
|
test_description='git svn property tests'
|
2006-05-24 10:23:41 +08:00
|
|
|
. ./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
|
2006-05-30 10:03:45 +08:00
|
|
|
cat >> kw.c <<\EOF
|
git-svn: SVN 1.1.x library compatibility
Tested on a plain Ubuntu Hoary installation
using subversion 1.1.1-2ubuntu3
1.1.x issues I had to deal with:
* Avoid the noisy command-line client compatibility check if we
use the libraries.
* get_log() arguments differ (now using a nice wrapper from
Junio's suggestion)
* get_file() is picky about what kind of file handles it gets,
so I ended up redirecting STDOUT. I'm probably overflushing
my file handles, but that's the safest thing to do...
* BDB kept segfaulting on me during tests, so svnadmin will use FSFS
whenever we can.
* If somebody used an expanded CVS $Id$ line inside a file, then
propsetting it to use svn:keywords will cause the original CVS
$Id$ to be retained when asked for the original file. As far as
I can see, this is a server-side issue. We won't care in the
test anymore, as long as it's not expanded by SVN, a static
CVS $Id$ line is fine.
While we're at making ourselves more compatible, avoid grep
along with the -q flag, which is GNU-specific. (grep avoidance
tip from Junio, too)
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-06-28 18:07:14 +08:00
|
|
|
/* Somebody prematurely put a keyword into this file */
|
|
|
|
/* $Id$ */
|
2006-05-30 10:03:45 +08:00
|
|
|
EOF
|
2006-05-24 10:23:41 +08:00
|
|
|
|
|
|
|
printf "Hello\r\nWorld\r\n" > crlf
|
2008-09-10 05:25:28 +08:00
|
|
|
a_crlf=`git hash-object -w crlf`
|
2006-05-24 10:23:41 +08:00
|
|
|
printf "Hello\rWorld\r" > cr
|
2008-09-10 05:25:28 +08:00
|
|
|
a_cr=`git hash-object -w cr`
|
2006-05-24 10:23:41 +08:00
|
|
|
printf "Hello\nWorld\n" > lf
|
2008-09-10 05:25:28 +08:00
|
|
|
a_lf=`git hash-object -w lf`
|
2006-05-24 10:23:41 +08:00
|
|
|
|
|
|
|
printf "Hello\r\nWorld" > ne_crlf
|
2008-09-10 05:25:28 +08:00
|
|
|
a_ne_crlf=`git hash-object -w ne_crlf`
|
2006-05-24 10:23:41 +08:00
|
|
|
printf "Hello\nWorld" > ne_lf
|
2008-09-10 05:25:28 +08:00
|
|
|
a_ne_lf=`git hash-object -w ne_lf`
|
2006-05-24 10:23:41 +08:00
|
|
|
printf "Hello\rWorld" > ne_cr
|
2008-09-10 05:25:28 +08:00
|
|
|
a_ne_cr=`git hash-object -w ne_cr`
|
2006-05-24 10:23:41 +08:00
|
|
|
|
|
|
|
touch empty
|
2008-09-10 05:25:28 +08:00
|
|
|
a_empty=`git hash-object -w empty`
|
2006-05-24 10:23:41 +08:00
|
|
|
printf "\n" > empty_lf
|
2008-09-10 05:25:28 +08:00
|
|
|
a_empty_lf=`git hash-object -w empty_lf`
|
2006-05-24 10:23:41 +08:00
|
|
|
printf "\r" > empty_cr
|
2008-09-10 05:25:28 +08:00
|
|
|
a_empty_cr=`git hash-object -w empty_cr`
|
2006-05-24 10:23:41 +08:00
|
|
|
printf "\r\n" > empty_crlf
|
2008-09-10 05:25:28 +08:00
|
|
|
a_empty_crlf=`git hash-object -w empty_crlf`
|
2006-05-24 10:23:41 +08:00
|
|
|
|
2009-05-08 16:06:16 +08:00
|
|
|
svn_cmd import --no-auto-props -m 'import for git svn' . "$svnrepo" >/dev/null
|
2006-05-24 10:23:41 +08:00
|
|
|
cd ..
|
|
|
|
|
|
|
|
rm -rf import
|
2008-05-04 13:37:59 +08:00
|
|
|
test_expect_success 'checkout working copy from svn' 'svn co "$svnrepo" test_wc'
|
2010-09-07 09:42:54 +08:00
|
|
|
test_expect_success 'setup some commits to svn' '
|
|
|
|
(
|
|
|
|
cd test_wc &&
|
2006-06-13 19:02:23 +08:00
|
|
|
echo Greetings >> kw.c &&
|
2007-02-13 08:33:37 +08:00
|
|
|
poke kw.c &&
|
2009-05-08 16:06:16 +08:00
|
|
|
svn_cmd commit -m "Not yet an Id" &&
|
2006-06-13 19:02:23 +08:00
|
|
|
echo Hello world >> kw.c &&
|
2007-02-13 08:33:37 +08:00
|
|
|
poke kw.c &&
|
2009-05-08 16:06:16 +08:00
|
|
|
svn_cmd commit -m "Modified file, but still not yet an Id" &&
|
|
|
|
svn_cmd propset svn:keywords Id kw.c &&
|
2007-02-13 08:33:37 +08:00
|
|
|
poke kw.c &&
|
2010-09-07 02:39:54 +08:00
|
|
|
svn_cmd commit -m "Propset Id"
|
2010-09-07 09:42:54 +08:00
|
|
|
)
|
|
|
|
'
|
2006-06-13 19:02:23 +08:00
|
|
|
|
2008-09-10 05:25:27 +08:00
|
|
|
test_expect_success 'initialize git svn' 'git svn init "$svnrepo"'
|
2008-09-08 18:02:08 +08:00
|
|
|
test_expect_success 'fetch revisions from svn' 'git svn fetch'
|
2006-05-24 10:23:41 +08:00
|
|
|
|
|
|
|
name='test svn:keywords ignoring'
|
2006-06-13 19:02:23 +08:00
|
|
|
test_expect_success "$name" \
|
2008-09-08 18:02:05 +08:00
|
|
|
'git checkout -b mybranch ${remotes_git_svn} &&
|
2006-06-13 19:02:23 +08:00
|
|
|
echo Hi again >> kw.c &&
|
2007-02-04 12:49:16 +08:00
|
|
|
git commit -a -m "test keywords ignoring" &&
|
2008-09-08 18:02:08 +08:00
|
|
|
git svn set-tree ${remotes_git_svn}..mybranch &&
|
2008-09-08 18:02:05 +08:00
|
|
|
git pull . ${remotes_git_svn}'
|
2006-05-24 10:23:41 +08:00
|
|
|
|
|
|
|
expect='/* $Id$ */'
|
|
|
|
got="`sed -ne 2p kw.c`"
|
|
|
|
test_expect_success 'raw $Id$ found in kw.c' "test '$expect' = '$got'"
|
|
|
|
|
2010-09-07 09:42:54 +08:00
|
|
|
test_expect_success "propset CR on crlf files" '
|
|
|
|
(
|
|
|
|
cd test_wc &&
|
2009-05-08 16:06:16 +08:00
|
|
|
svn_cmd propset svn:eol-style CR empty &&
|
|
|
|
svn_cmd propset svn:eol-style CR crlf &&
|
|
|
|
svn_cmd propset svn:eol-style CR ne_crlf &&
|
2010-09-07 02:39:54 +08:00
|
|
|
svn_cmd commit -m "propset CR on crlf files"
|
2010-09-07 09:42:54 +08:00
|
|
|
)
|
|
|
|
'
|
2006-05-24 10:23:41 +08:00
|
|
|
|
2006-06-13 19:02:23 +08:00
|
|
|
test_expect_success 'fetch and pull latest from svn and checkout a new wc' \
|
2008-09-08 18:02:08 +08:00
|
|
|
'git svn fetch &&
|
2008-09-08 18:02:05 +08:00
|
|
|
git pull . ${remotes_git_svn} &&
|
2009-05-08 16:06:16 +08:00
|
|
|
svn_cmd co "$svnrepo" new_wc'
|
2006-05-24 10:23:41 +08:00
|
|
|
|
|
|
|
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
|
2008-09-10 05:25:28 +08:00
|
|
|
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`
|
2006-06-13 19:02:23 +08:00
|
|
|
test_expect_success 'Set CRLF on cr files' \
|
2009-05-08 16:06:16 +08:00
|
|
|
'svn_cmd propset svn:eol-style CRLF cr &&
|
|
|
|
svn_cmd propset svn:eol-style CRLF ne_cr &&
|
|
|
|
svn_cmd propset svn:keywords Id cr &&
|
|
|
|
svn_cmd propset svn:keywords Id ne_cr &&
|
|
|
|
svn_cmd commit -m "propset CRLF on cr files"'
|
2006-05-24 10:23:41 +08:00
|
|
|
cd ..
|
2006-06-13 19:02:23 +08:00
|
|
|
test_expect_success 'fetch and pull latest from svn' \
|
2008-09-08 18:02:08 +08:00
|
|
|
'git svn fetch && git pull . ${remotes_git_svn}'
|
2006-05-24 10:23:41 +08:00
|
|
|
|
2008-09-10 05:25:28 +08:00
|
|
|
b_cr="`git hash-object cr`"
|
|
|
|
b_ne_cr="`git hash-object ne_cr`"
|
2006-05-24 10:23:41 +08:00
|
|
|
|
|
|
|
test_expect_success 'CRLF + $Id$' "test '$a_cr' = '$b_cr'"
|
|
|
|
test_expect_success 'CRLF + $Id$ (no newline)' "test '$a_ne_cr' = '$b_ne_cr'"
|
|
|
|
|
2007-01-12 09:55:50 +08:00
|
|
|
cat > show-ignore.expect <<\EOF
|
|
|
|
|
|
|
|
# /
|
|
|
|
/no-such-file*
|
|
|
|
|
2007-10-16 22:36:49 +08:00
|
|
|
# /deeply/
|
2007-01-12 09:55:50 +08:00
|
|
|
/deeply/no-such-file*
|
|
|
|
|
2007-10-16 22:36:49 +08:00
|
|
|
# /deeply/nested/
|
2007-01-12 09:55:50 +08:00
|
|
|
/deeply/nested/no-such-file*
|
|
|
|
|
2007-10-16 22:36:49 +08:00
|
|
|
# /deeply/nested/directory/
|
2007-01-12 09:55:50 +08:00
|
|
|
/deeply/nested/directory/no-such-file*
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'test show-ignore' "
|
2010-09-07 09:42:54 +08:00
|
|
|
(
|
|
|
|
cd test_wc &&
|
|
|
|
mkdir -p deeply/nested/directory &&
|
|
|
|
touch deeply/nested/directory/.keep &&
|
|
|
|
svn_cmd add deeply &&
|
|
|
|
svn_cmd up &&
|
|
|
|
svn_cmd propset -R svn:ignore '
|
2009-08-08 03:21:21 +08:00
|
|
|
no-such-file*
|
|
|
|
' .
|
2010-09-07 09:42:54 +08:00
|
|
|
svn_cmd commit -m 'propset svn:ignore'
|
2010-09-07 02:39:54 +08:00
|
|
|
) &&
|
2008-09-08 18:02:08 +08:00
|
|
|
git svn show-ignore > show-ignore.got &&
|
2007-01-12 09:55:50 +08:00
|
|
|
cmp show-ignore.expect show-ignore.got
|
2010-09-07 09:42:54 +08:00
|
|
|
"
|
2007-01-12 09:55:50 +08:00
|
|
|
|
2007-10-16 22:36:49 +08:00
|
|
|
cat >create-ignore.expect <<\EOF
|
|
|
|
/no-such-file*
|
|
|
|
EOF
|
|
|
|
|
|
|
|
cat >create-ignore-index.expect <<\EOF
|
|
|
|
100644 8c52e5dfcd0a8b6b6bcfe6b41b89bcbf493718a5 0 .gitignore
|
|
|
|
100644 8c52e5dfcd0a8b6b6bcfe6b41b89bcbf493718a5 0 deeply/.gitignore
|
|
|
|
100644 8c52e5dfcd0a8b6b6bcfe6b41b89bcbf493718a5 0 deeply/nested/.gitignore
|
|
|
|
100644 8c52e5dfcd0a8b6b6bcfe6b41b89bcbf493718a5 0 deeply/nested/directory/.gitignore
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'test create-ignore' "
|
2008-09-08 18:02:08 +08:00
|
|
|
git svn fetch && git pull . ${remotes_git_svn} &&
|
|
|
|
git svn create-ignore &&
|
2007-10-16 22:36:49 +08:00
|
|
|
cmp ./.gitignore create-ignore.expect &&
|
|
|
|
cmp ./deeply/.gitignore create-ignore.expect &&
|
|
|
|
cmp ./deeply/nested/.gitignore create-ignore.expect &&
|
|
|
|
cmp ./deeply/nested/directory/.gitignore create-ignore.expect &&
|
|
|
|
git ls-files -s | grep gitignore | cmp - create-ignore-index.expect
|
|
|
|
"
|
|
|
|
|
2007-10-16 22:36:50 +08:00
|
|
|
cat >prop.expect <<\EOF
|
2009-08-08 03:21:21 +08:00
|
|
|
|
2007-10-16 22:36:50 +08:00
|
|
|
no-such-file*
|
|
|
|
|
|
|
|
EOF
|
|
|
|
cat >prop2.expect <<\EOF
|
|
|
|
8
|
|
|
|
EOF
|
|
|
|
|
|
|
|
# This test can be improved: since all the svn:ignore contain the same
|
|
|
|
# pattern, it can pass even though the propget did not execute on the
|
|
|
|
# right directory.
|
|
|
|
test_expect_success 'test propget' "
|
2008-09-08 18:02:08 +08:00
|
|
|
git svn propget svn:ignore . | cmp - prop.expect &&
|
2007-10-16 22:36:50 +08:00
|
|
|
cd deeply &&
|
2008-09-08 18:02:08 +08:00
|
|
|
git svn propget svn:ignore . | cmp - ../prop.expect &&
|
|
|
|
git svn propget svn:entry:committed-rev nested/directory/.keep \
|
2007-10-16 22:36:50 +08:00
|
|
|
| cmp - ../prop2.expect &&
|
2008-09-08 18:02:08 +08:00
|
|
|
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
|
2007-10-16 22:36:50 +08:00
|
|
|
"
|
|
|
|
|
2007-10-16 22:36:51 +08:00
|
|
|
cat >prop.expect <<\EOF
|
|
|
|
Properties on '.':
|
|
|
|
svn:entry:committed-date
|
|
|
|
svn:entry:committed-rev
|
|
|
|
svn:entry:last-author
|
|
|
|
svn:entry:uuid
|
|
|
|
svn:ignore
|
|
|
|
EOF
|
|
|
|
cat >prop2.expect <<\EOF
|
|
|
|
Properties on 'nested/directory/.keep':
|
|
|
|
svn:entry:committed-date
|
|
|
|
svn:entry:committed-rev
|
|
|
|
svn:entry:last-author
|
|
|
|
svn:entry:uuid
|
|
|
|
EOF
|
|
|
|
|
|
|
|
test_expect_success 'test proplist' "
|
2008-09-08 18:02:08 +08:00
|
|
|
git svn proplist . | cmp - prop.expect &&
|
|
|
|
git svn proplist nested/directory/.keep | cmp - prop2.expect
|
2007-10-16 22:36:51 +08:00
|
|
|
"
|
|
|
|
|
2006-05-24 10:23:41 +08:00
|
|
|
test_done
|