]>
Commit | Line | Data |
---|---|---|
36f5b1f0 EW |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2006 Eric Wong | |
4 | # | |
5 | ||
1364ff27 | 6 | test_description='git svn property tests' |
36f5b1f0 EW |
7 | . ./lib-git-svn.sh |
8 | ||
9 | mkdir import | |
10 | ||
11 | a_crlf= | |
12 | a_lf= | |
13 | a_cr= | |
14 | a_ne_crlf= | |
15 | a_ne_lf= | |
16 | a_ne_cr= | |
17 | a_empty= | |
18 | a_empty_lf= | |
19 | a_empty_cr= | |
20 | a_empty_crlf= | |
21 | ||
22 | cd import | |
3c4c7351 | 23 | cat >> kw.c <<\EOF |
dc62e25c EW |
24 | /* Somebody prematurely put a keyword into this file */ |
25 | /* $Id$ */ | |
3c4c7351 | 26 | EOF |
36f5b1f0 EW |
27 | |
28 | printf "Hello\r\nWorld\r\n" > crlf | |
e10de5a0 | 29 | a_crlf=$(git hash-object -w crlf) |
36f5b1f0 | 30 | printf "Hello\rWorld\r" > cr |
e10de5a0 | 31 | a_cr=$(git hash-object -w cr) |
36f5b1f0 | 32 | printf "Hello\nWorld\n" > lf |
e10de5a0 | 33 | a_lf=$(git hash-object -w lf) |
36f5b1f0 EW |
34 | |
35 | printf "Hello\r\nWorld" > ne_crlf | |
e10de5a0 | 36 | a_ne_crlf=$(git hash-object -w ne_crlf) |
36f5b1f0 | 37 | printf "Hello\nWorld" > ne_lf |
e10de5a0 | 38 | a_ne_lf=$(git hash-object -w ne_lf) |
36f5b1f0 | 39 | printf "Hello\rWorld" > ne_cr |
e10de5a0 | 40 | a_ne_cr=$(git hash-object -w ne_cr) |
36f5b1f0 EW |
41 | |
42 | touch empty | |
e10de5a0 | 43 | a_empty=$(git hash-object -w empty) |
36f5b1f0 | 44 | printf "\n" > empty_lf |
e10de5a0 | 45 | a_empty_lf=$(git hash-object -w empty_lf) |
36f5b1f0 | 46 | printf "\r" > empty_cr |
e10de5a0 | 47 | a_empty_cr=$(git hash-object -w empty_cr) |
36f5b1f0 | 48 | printf "\r\n" > empty_crlf |
e10de5a0 | 49 | a_empty_crlf=$(git hash-object -w empty_crlf) |
36f5b1f0 | 50 | |
da083d68 | 51 | svn_cmd import --no-auto-props -m 'import for git svn' . "$svnrepo" >/dev/null |
36f5b1f0 EW |
52 | cd .. |
53 | ||
54 | rm -rf import | |
f69e836f | 55 | test_expect_success 'checkout working copy from svn' 'svn co "$svnrepo" test_wc' |
18a82692 JN |
56 | test_expect_success 'setup some commits to svn' ' |
57 | ( | |
58 | cd test_wc && | |
42d32870 | 59 | echo Greetings >> kw.c && |
7b3fab87 | 60 | poke kw.c && |
da083d68 | 61 | svn_cmd commit -m "Not yet an Id" && |
42d32870 | 62 | echo Hello world >> kw.c && |
7b3fab87 | 63 | poke kw.c && |
da083d68 ER |
64 | svn_cmd commit -m "Modified file, but still not yet an Id" && |
65 | svn_cmd propset svn:keywords Id kw.c && | |
7b3fab87 | 66 | poke kw.c && |
fd4ec4f2 | 67 | svn_cmd commit -m "Propset Id" |
18a82692 JN |
68 | ) |
69 | ' | |
42d32870 | 70 | |
f964732c | 71 | test_expect_success 'initialize git svn' 'git svn init "$svnrepo"' |
1364ff27 | 72 | test_expect_success 'fetch revisions from svn' 'git svn fetch' |
36f5b1f0 | 73 | |
36f5b1f0 | 74 | name='test svn:keywords ignoring' |
42d32870 | 75 | test_expect_success "$name" \ |
e1c0c158 | 76 | 'git checkout -b mybranch remotes/git-svn && |
42d32870 | 77 | echo Hi again >> kw.c && |
3dff5379 | 78 | git commit -a -m "test keywords ignoring" && |
e1c0c158 JK |
79 | git svn set-tree remotes/git-svn..mybranch && |
80 | git pull . remotes/git-svn' | |
36f5b1f0 EW |
81 | |
82 | expect='/* $Id$ */' | |
e10de5a0 | 83 | got="$(sed -ne 2p kw.c)" |
36f5b1f0 EW |
84 | test_expect_success 'raw $Id$ found in kw.c' "test '$expect' = '$got'" |
85 | ||
18a82692 JN |
86 | test_expect_success "propset CR on crlf files" ' |
87 | ( | |
88 | cd test_wc && | |
da083d68 ER |
89 | svn_cmd propset svn:eol-style CR empty && |
90 | svn_cmd propset svn:eol-style CR crlf && | |
91 | svn_cmd propset svn:eol-style CR ne_crlf && | |
fd4ec4f2 | 92 | svn_cmd commit -m "propset CR on crlf files" |
18a82692 JN |
93 | ) |
94 | ' | |
36f5b1f0 | 95 | |
42d32870 | 96 | test_expect_success 'fetch and pull latest from svn and checkout a new wc' \ |
1364ff27 | 97 | 'git svn fetch && |
e1c0c158 | 98 | git pull . remotes/git-svn && |
da083d68 | 99 | svn_cmd co "$svnrepo" new_wc' |
36f5b1f0 | 100 | |
36f5b1f0 EW |
101 | for i in crlf ne_crlf lf ne_lf cr ne_cr empty_cr empty_lf empty empty_crlf |
102 | do | |
103 | test_expect_success "Comparing $i" "cmp $i new_wc/$i" | |
104 | done | |
105 | ||
106 | ||
107 | cd test_wc | |
108 | printf '$Id$\rHello\rWorld\r' > cr | |
109 | printf '$Id$\rHello\rWorld' > ne_cr | |
e10de5a0 EP |
110 | a_cr=$(printf '$Id$\r\nHello\r\nWorld\r\n' | git hash-object --stdin) |
111 | a_ne_cr=$(printf '$Id$\r\nHello\r\nWorld' | git hash-object --stdin) | |
42d32870 | 112 | test_expect_success 'Set CRLF on cr files' \ |
da083d68 ER |
113 | 'svn_cmd propset svn:eol-style CRLF cr && |
114 | svn_cmd propset svn:eol-style CRLF ne_cr && | |
115 | svn_cmd propset svn:keywords Id cr && | |
116 | svn_cmd propset svn:keywords Id ne_cr && | |
117 | svn_cmd commit -m "propset CRLF on cr files"' | |
36f5b1f0 | 118 | cd .. |
42d32870 | 119 | test_expect_success 'fetch and pull latest from svn' \ |
e1c0c158 | 120 | 'git svn fetch && git pull . remotes/git-svn' |
36f5b1f0 | 121 | |
e10de5a0 EP |
122 | b_cr="$(git hash-object cr)" |
123 | b_ne_cr="$(git hash-object ne_cr)" | |
36f5b1f0 EW |
124 | |
125 | test_expect_success 'CRLF + $Id$' "test '$a_cr' = '$b_cr'" | |
126 | test_expect_success 'CRLF + $Id$ (no newline)' "test '$a_ne_cr' = '$b_ne_cr'" | |
127 | ||
ad2f9085 EW |
128 | cat > show-ignore.expect <<\EOF |
129 | ||
130 | # / | |
131 | /no-such-file* | |
132 | ||
d05ddec5 | 133 | # /deeply/ |
ad2f9085 EW |
134 | /deeply/no-such-file* |
135 | ||
d05ddec5 | 136 | # /deeply/nested/ |
ad2f9085 EW |
137 | /deeply/nested/no-such-file* |
138 | ||
d05ddec5 | 139 | # /deeply/nested/directory/ |
ad2f9085 EW |
140 | /deeply/nested/directory/no-such-file* |
141 | EOF | |
142 | ||
143 | test_expect_success 'test show-ignore' " | |
18a82692 JN |
144 | ( |
145 | cd test_wc && | |
146 | mkdir -p deeply/nested/directory && | |
147 | touch deeply/nested/directory/.keep && | |
148 | svn_cmd add deeply && | |
149 | svn_cmd up && | |
150 | svn_cmd propset -R svn:ignore ' | |
a7d72544 | 151 | no-such-file* |
cff4243d | 152 | ' . && |
18a82692 | 153 | svn_cmd commit -m 'propset svn:ignore' |
fd4ec4f2 | 154 | ) && |
1364ff27 | 155 | git svn show-ignore > show-ignore.got && |
ad2f9085 | 156 | cmp show-ignore.expect show-ignore.got |
18a82692 | 157 | " |
ad2f9085 | 158 | |
d05ddec5 BS |
159 | cat >create-ignore.expect <<\EOF |
160 | /no-such-file* | |
161 | EOF | |
162 | ||
3e04b6e1 | 163 | expectoid=$(git hash-object create-ignore.expect) |
164 | ||
165 | cat >create-ignore-index.expect <<EOF | |
166 | 100644 $expectoid 0 .gitignore | |
167 | 100644 $expectoid 0 deeply/.gitignore | |
168 | 100644 $expectoid 0 deeply/nested/.gitignore | |
169 | 100644 $expectoid 0 deeply/nested/directory/.gitignore | |
d05ddec5 BS |
170 | EOF |
171 | ||
172 | test_expect_success 'test create-ignore' " | |
e1c0c158 | 173 | git svn fetch && git pull . remotes/git-svn && |
1364ff27 | 174 | git svn create-ignore && |
d05ddec5 BS |
175 | cmp ./.gitignore create-ignore.expect && |
176 | cmp ./deeply/.gitignore create-ignore.expect && | |
177 | cmp ./deeply/nested/.gitignore create-ignore.expect && | |
178 | cmp ./deeply/nested/directory/.gitignore create-ignore.expect && | |
b00b6ace MD |
179 | git ls-files -s >ls_files_result && |
180 | grep gitignore ls_files_result | cmp - create-ignore-index.expect | |
d05ddec5 BS |
181 | " |
182 | ||
15153451 | 183 | cat >prop.expect <<\EOF |
a7d72544 | 184 | |
15153451 BS |
185 | no-such-file* |
186 | ||
187 | EOF | |
188 | cat >prop2.expect <<\EOF | |
189 | 8 | |
190 | EOF | |
191 | ||
192 | # This test can be improved: since all the svn:ignore contain the same | |
193 | # pattern, it can pass even though the propget did not execute on the | |
194 | # right directory. | |
b00b6ace MD |
195 | test_expect_success 'test propget' ' |
196 | test_propget () { | |
197 | git svn propget $1 $2 >actual && | |
198 | cmp $3 actual | |
199 | } && | |
200 | test_propget svn:ignore . prop.expect && | |
15153451 | 201 | cd deeply && |
b00b6ace MD |
202 | test_propget svn:ignore . ../prop.expect && |
203 | test_propget svn:entry:committed-rev nested/directory/.keep \ | |
204 | ../prop2.expect && | |
205 | test_propget svn:ignore .. ../prop.expect && | |
206 | test_propget svn:ignore nested/ ../prop.expect && | |
207 | test_propget svn:ignore ./nested ../prop.expect && | |
208 | test_propget svn:ignore .././deeply/nested ../prop.expect | |
209 | ' | |
15153451 | 210 | |
51e057cf BS |
211 | cat >prop.expect <<\EOF |
212 | Properties on '.': | |
213 | svn:entry:committed-date | |
214 | svn:entry:committed-rev | |
215 | svn:entry:last-author | |
216 | svn:entry:uuid | |
217 | svn:ignore | |
218 | EOF | |
219 | cat >prop2.expect <<\EOF | |
220 | Properties on 'nested/directory/.keep': | |
221 | svn:entry:committed-date | |
222 | svn:entry:committed-rev | |
223 | svn:entry:last-author | |
224 | svn:entry:uuid | |
225 | EOF | |
226 | ||
227 | test_expect_success 'test proplist' " | |
b00b6ace MD |
228 | git svn proplist . >actual && |
229 | cmp prop.expect actual && | |
230 | ||
231 | git svn proplist nested/directory/.keep >actual && | |
232 | cmp prop2.expect actual | |
51e057cf BS |
233 | " |
234 | ||
36f5b1f0 | 235 | test_done |