blob: 6fa7889e9a691fd0bc0c68618f41045c322b25a3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
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
|
