]>
Commit | Line | Data |
---|---|---|
96a40b27 EW |
1 | #!/bin/sh |
2 | # | |
3 | # Copyright (c) 2006 Eric Wong | |
4 | # | |
5 | ||
1364ff27 | 6 | test_description='git svn basic tests' |
952182b5 | 7 | GIT_SVN_LC_ALL=${LC_ALL:-$LANG} |
dc62e25c | 8 | |
7b7247b0 JS |
9 | . ./lib-git-svn.sh |
10 | ||
11 | say 'define NO_SVN_TESTS to skip git svn tests' | |
12 | ||
952182b5 | 13 | case "$GIT_SVN_LC_ALL" in |
dc62e25c | 14 | *.UTF-8) |
7b7247b0 | 15 | test_set_prereq UTF8 |
dc62e25c EW |
16 | ;; |
17 | *) | |
fadb5156 | 18 | say "# UTF-8 locale not set, some tests skipped ($GIT_SVN_LC_ALL)" |
dc62e25c EW |
19 | ;; |
20 | esac | |
21 | ||
96a40b27 | 22 | test_expect_success \ |
f964732c | 23 | 'initialize git svn' ' |
39ed7c18 | 24 | mkdir import && |
18a82692 JN |
25 | ( |
26 | cd import && | |
27 | echo foo >foo && | |
28 | ln -s foo foo.link | |
29 | mkdir -p dir/a/b/c/d/e && | |
30 | echo "deep dir" >dir/a/b/c/d/e/file && | |
31 | mkdir bar && | |
32 | echo "zzz" >bar/zzz && | |
33 | echo "#!/bin/sh" >exec.sh && | |
34 | chmod +x exec.sh && | |
35 | svn_cmd import -m "import for git svn" . "$svnrepo" >/dev/null | |
fd4ec4f2 | 36 | ) && |
39ed7c18 | 37 | rm -rf import && |
1364ff27 | 38 | git svn init "$svnrepo"' |
96a40b27 EW |
39 | |
40 | test_expect_success \ | |
41 | 'import an SVN revision into git' \ | |
1364ff27 | 42 | 'git svn fetch' |
96a40b27 | 43 | |
f69e836f | 44 | test_expect_success "checkout from svn" 'svn co "$svnrepo" "$SVN_TREE"' |
96a40b27 EW |
45 | |
46 | name='try a deep --rmdir with a commit' | |
f69e836f | 47 | test_expect_success "$name" ' |
16805d3e | 48 | git checkout -f -b mybranch ${remotes_git_svn} && |
39ed7c18 EW |
49 | mv dir/a/b/c/d/e/file dir/file && |
50 | cp dir/file file && | |
51 | git update-index --add --remove dir/a/b/c/d/e/file dir/file file && | |
f69e836f | 52 | git commit -m "$name" && |
1364ff27 | 53 | git svn set-tree --find-copies-harder --rmdir \ |
16805d3e | 54 | ${remotes_git_svn}..mybranch && |
da083d68 | 55 | svn_cmd up "$SVN_TREE" && |
f69e836f | 56 | test -d "$SVN_TREE"/dir && test ! -d "$SVN_TREE"/dir/a' |
96a40b27 EW |
57 | |
58 | ||
59 | name='detect node change from file to directory #1' | |
41ac414e | 60 | test_expect_success "$name" " |
39ed7c18 EW |
61 | mkdir dir/new_file && |
62 | mv dir/file dir/new_file/file && | |
63 | mv dir/new_file dir/file && | |
64 | git update-index --remove dir/file && | |
65 | git update-index --add dir/file/file && | |
41ac414e | 66 | git commit -m '$name' && |
1364ff27 | 67 | test_must_fail git svn set-tree --find-copies-harder --rmdir \ |
16805d3e | 68 | ${remotes_git_svn}..mybranch" || true |
96a40b27 EW |
69 | |
70 | ||
71 | name='detect node change from directory to file #1' | |
f69e836f BD |
72 | test_expect_success "$name" ' |
73 | rm -rf dir "$GIT_DIR"/index && | |
16805d3e | 74 | git checkout -f -b mybranch2 ${remotes_git_svn} && |
39ed7c18 EW |
75 | mv bar/zzz zzz && |
76 | rm -rf bar && | |
77 | mv zzz bar && | |
78 | git update-index --remove -- bar/zzz && | |
79 | git update-index --add -- bar && | |
f69e836f | 80 | git commit -m "$name" && |
1364ff27 | 81 | test_must_fail git svn set-tree --find-copies-harder --rmdir \ |
16805d3e | 82 | ${remotes_git_svn}..mybranch2' || true |
96a40b27 EW |
83 | |
84 | ||
85 | name='detect node change from file to directory #2' | |
f69e836f BD |
86 | test_expect_success "$name" ' |
87 | rm -f "$GIT_DIR"/index && | |
16805d3e | 88 | git checkout -f -b mybranch3 ${remotes_git_svn} && |
39ed7c18 | 89 | rm bar/zzz && |
5be60078 | 90 | git update-index --remove bar/zzz && |
39ed7c18 EW |
91 | mkdir bar/zzz && |
92 | echo yyy > bar/zzz/yyy && | |
5be60078 | 93 | git update-index --add bar/zzz/yyy && |
f69e836f | 94 | git commit -m "$name" && |
1364ff27 | 95 | test_must_fail git svn set-tree --find-copies-harder --rmdir \ |
16805d3e | 96 | ${remotes_git_svn}..mybranch3' || true |
96a40b27 EW |
97 | |
98 | ||
99 | name='detect node change from directory to file #2' | |
f69e836f BD |
100 | test_expect_success "$name" ' |
101 | rm -f "$GIT_DIR"/index && | |
16805d3e | 102 | git checkout -f -b mybranch4 ${remotes_git_svn} && |
39ed7c18 EW |
103 | rm -rf dir && |
104 | git update-index --remove -- dir/file && | |
105 | touch dir && | |
106 | echo asdf > dir && | |
107 | git update-index --add -- dir && | |
f69e836f | 108 | git commit -m "$name" && |
1364ff27 | 109 | test_must_fail git svn set-tree --find-copies-harder --rmdir \ |
16805d3e | 110 | ${remotes_git_svn}..mybranch4' || true |
96a40b27 EW |
111 | |
112 | ||
113 | name='remove executable bit from a file' | |
f69e836f BD |
114 | test_expect_success "$name" ' |
115 | rm -f "$GIT_DIR"/index && | |
16805d3e | 116 | git checkout -f -b mybranch5 ${remotes_git_svn} && |
39ed7c18 EW |
117 | chmod -x exec.sh && |
118 | git update-index exec.sh && | |
f69e836f | 119 | git commit -m "$name" && |
1364ff27 | 120 | git svn set-tree --find-copies-harder --rmdir \ |
16805d3e | 121 | ${remotes_git_svn}..mybranch5 && |
da083d68 | 122 | svn_cmd up "$SVN_TREE" && |
f69e836f | 123 | test ! -x "$SVN_TREE"/exec.sh' |
96a40b27 EW |
124 | |
125 | ||
126 | name='add executable bit back file' | |
f69e836f | 127 | test_expect_success "$name" ' |
39ed7c18 EW |
128 | chmod +x exec.sh && |
129 | git update-index exec.sh && | |
f69e836f | 130 | git commit -m "$name" && |
1364ff27 | 131 | git svn set-tree --find-copies-harder --rmdir \ |
16805d3e | 132 | ${remotes_git_svn}..mybranch5 && |
da083d68 | 133 | svn_cmd up "$SVN_TREE" && |
f69e836f | 134 | test -x "$SVN_TREE"/exec.sh' |
96a40b27 EW |
135 | |
136 | ||
5bd3870c | 137 | name='executable file becomes a symlink to bar/zzz (file)' |
f69e836f | 138 | test_expect_success "$name" ' |
5bd3870c EW |
139 | rm exec.sh && |
140 | ln -s bar/zzz exec.sh && | |
141 | git update-index exec.sh && | |
f69e836f | 142 | git commit -m "$name" && |
1364ff27 | 143 | git svn set-tree --find-copies-harder --rmdir \ |
16805d3e | 144 | ${remotes_git_svn}..mybranch5 && |
da083d68 | 145 | svn_cmd up "$SVN_TREE" && |
f69e836f | 146 | test -L "$SVN_TREE"/exec.sh' |
0e8a002c | 147 | |
5bd3870c | 148 | name='new symlink is added to a file that was also just made executable' |
0e8a002c | 149 | |
f69e836f | 150 | test_expect_success "$name" ' |
5bd3870c EW |
151 | chmod +x bar/zzz && |
152 | ln -s bar/zzz exec-2.sh && | |
153 | git update-index --add bar/zzz exec-2.sh && | |
f69e836f | 154 | git commit -m "$name" && |
1364ff27 | 155 | git svn set-tree --find-copies-harder --rmdir \ |
16805d3e | 156 | ${remotes_git_svn}..mybranch5 && |
da083d68 | 157 | svn_cmd up "$SVN_TREE" && |
f69e836f BD |
158 | test -x "$SVN_TREE"/bar/zzz && |
159 | test -L "$SVN_TREE"/exec-2.sh' | |
96a40b27 | 160 | |
5bd3870c | 161 | name='modify a symlink to become a file' |
f69e836f | 162 | test_expect_success "$name" ' |
5bd3870c EW |
163 | echo git help > help || true && |
164 | rm exec-2.sh && | |
165 | cp help exec-2.sh && | |
166 | git update-index exec-2.sh && | |
f69e836f | 167 | git commit -m "$name" && |
1364ff27 | 168 | git svn set-tree --find-copies-harder --rmdir \ |
16805d3e | 169 | ${remotes_git_svn}..mybranch5 && |
da083d68 | 170 | svn_cmd up "$SVN_TREE" && |
f69e836f BD |
171 | test -f "$SVN_TREE"/exec-2.sh && |
172 | test ! -L "$SVN_TREE"/exec-2.sh && | |
3af82863 | 173 | test_cmp help "$SVN_TREE"/exec-2.sh' |
96a40b27 | 174 | |
7b7247b0 JS |
175 | name="commit with UTF-8 message: locale: $GIT_SVN_LC_ALL" |
176 | LC_ALL="$GIT_SVN_LC_ALL" | |
177 | export LC_ALL | |
178 | test_expect_success UTF8 "$name" " | |
179 | echo '# hello' >> exec-2.sh && | |
180 | git update-index exec-2.sh && | |
181 | git commit -m 'éï∏' && | |
182 | git svn set-tree HEAD" | |
183 | unset LC_ALL | |
96a40b27 EW |
184 | |
185 | name='test fetch functionality (svn => git) with alternate GIT_SVN_ID' | |
186 | GIT_SVN_ID=alt | |
187 | export GIT_SVN_ID | |
188 | test_expect_success "$name" \ | |
1364ff27 | 189 | 'git svn init "$svnrepo" && git svn fetch && |
16805d3e | 190 | git rev-list --pretty=raw ${remotes_git_svn} | grep ^tree | uniq > a && |
5be60078 | 191 | git rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b && |
3af82863 | 192 | test_cmp a b' |
96a40b27 | 193 | |
42d32870 | 194 | name='check imported tree checksums expected tree checksums' |
86f36379 | 195 | rm -f expected |
7b7247b0 | 196 | if test_have_prereq UTF8 |
86f36379 | 197 | then |
822a7d50 | 198 | echo tree bf522353586b1b883488f2bc73dab0d9f774b9a9 > expected |
86f36379 EW |
199 | fi |
200 | cat >> expected <<\EOF | |
822a7d50 | 201 | tree 83654bb36f019ae4fe77a0171f81075972087624 |
42d32870 EW |
202 | tree 031b8d557afc6fea52894eaebb45bec52f1ba6d1 |
203 | tree 0b094cbff17168f24c302e297f55bfac65eb8bd3 | |
204 | tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e | |
205 | tree 56a30b966619b863674f5978696f4a3594f2fca9 | |
206 | tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e | |
207 | tree 8f51f74cf0163afc9ad68a4b1537288c4558b5a4 | |
208 | EOF | |
e1516119 | 209 | |
3af82863 | 210 | test_expect_success "$name" "test_cmp a expected" |
42d32870 | 211 | |
41ac414e | 212 | test_expect_success 'exit if remote refs are ambigious' " |
5be60078 | 213 | git config --add svn-remote.svn.fetch \ |
16805d3e | 214 | bar:refs/${remotes_git_svn} && |
1364ff27 | 215 | test_must_fail git svn migrate |
41ac414e | 216 | " |
e6434f87 | 217 | |
f69e836f BD |
218 | test_expect_success 'exit if init-ing a would clobber a URL' ' |
219 | svnadmin create "${PWD}/svnrepo2" && | |
220 | svn mkdir -m "mkdir bar" "${svnrepo}2/bar" && | |
5be60078 | 221 | git config --unset svn-remote.svn.fetch \ |
16805d3e | 222 | "^bar:refs/${remotes_git_svn}$" && |
1364ff27 | 223 | test_must_fail git svn init "${svnrepo}2/bar" |
f69e836f | 224 | ' |
e6434f87 EW |
225 | |
226 | test_expect_success \ | |
f69e836f | 227 | 'init allows us to connect to another directory in the same repo' ' |
1364ff27 | 228 | git svn init --minimize-url -i bar "$svnrepo/bar" && |
ccb6b6f5 | 229 | git config --get svn-remote.svn.fetch \ |
f69e836f | 230 | "^bar:refs/remotes/bar$" && |
ccb6b6f5 | 231 | git config --get svn-remote.svn.fetch \ |
16805d3e | 232 | "^:refs/${remotes_git_svn}$" |
f69e836f | 233 | ' |
b805b44a | 234 | |
5eec27e3 TR |
235 | test_expect_success 'dcommit $rev does not clobber current branch' ' |
236 | git svn fetch -i bar && | |
237 | git checkout -b my-bar refs/remotes/bar && | |
238 | echo 1 > foo && | |
239 | git add foo && | |
240 | git commit -m "change 1" && | |
241 | echo 2 > foo && | |
242 | git add foo && | |
243 | git commit -m "change 2" && | |
244 | old_head=$(git rev-parse HEAD) && | |
245 | git svn dcommit -i bar HEAD^ && | |
246 | test $old_head = $(git rev-parse HEAD) && | |
247 | test refs/heads/my-bar = $(git symbolic-ref HEAD) && | |
248 | git log refs/remotes/bar | grep "change 1" && | |
249 | ! git log refs/remotes/bar | grep "change 2" && | |
250 | git checkout master && | |
251 | git branch -D my-bar | |
252 | ' | |
253 | ||
d3a840dc | 254 | test_expect_success 'able to dcommit to a subdirectory' " |
1364ff27 | 255 | git svn fetch -i bar && |
d3a840dc EW |
256 | git checkout -b my-bar refs/remotes/bar && |
257 | echo abc > d && | |
258 | git update-index --add d && | |
259 | git commit -m '/bar/d should be in the log' && | |
1364ff27 | 260 | git svn dcommit -i bar && |
d3a840dc EW |
261 | test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" && |
262 | mkdir newdir && | |
263 | echo new > newdir/dir && | |
264 | git update-index --add newdir/dir && | |
265 | git commit -m 'add a new directory' && | |
1364ff27 | 266 | git svn dcommit -i bar && |
d3a840dc EW |
267 | test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" && |
268 | echo foo >> newdir/dir && | |
269 | git update-index newdir/dir && | |
270 | git commit -m 'modify a file in new directory' && | |
1364ff27 | 271 | git svn dcommit -i bar && |
d3a840dc EW |
272 | test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" |
273 | " | |
274 | ||
181264ad DK |
275 | test_expect_success 'dcommit should not fail with a touched file' ' |
276 | test_commit "commit-new-file-foo2" foo2 && | |
277 | test-chmtime =-60 foo && | |
278 | git svn dcommit | |
279 | ' | |
280 | ||
281 | test_expect_success 'rebase should not fail with a touched file' ' | |
282 | test-chmtime =-60 foo && | |
283 | git svn rebase | |
284 | ' | |
285 | ||
d3a840dc EW |
286 | test_expect_success 'able to set-tree to a subdirectory' " |
287 | echo cba > d && | |
288 | git update-index d && | |
289 | git commit -m 'update /bar/d' && | |
1364ff27 | 290 | git svn set-tree -i bar HEAD && |
d3a840dc EW |
291 | test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" |
292 | " | |
293 | ||
6e5121f2 DM |
294 | test_expect_success 'git-svn works in a bare repository' ' |
295 | mkdir bare-repo && | |
296 | ( cd bare-repo && | |
297 | git init --bare && | |
298 | GIT_DIR=. git svn init "$svnrepo" && | |
299 | git svn fetch ) && | |
300 | rm -rf bare-repo | |
301 | ' | |
302 | ||
96a40b27 | 303 | test_done |