mergetool: Fix typo in options passed to kdiff3
[git/mergetool.git] / t / t9100-git-svn-basic.sh
blob614cf50d195bb3b055fd8166d425eeffa7106509
1 #!/bin/sh
3 # Copyright (c) 2006 Eric Wong
6 test_description='git-svn basic tests'
7 GIT_SVN_LC_ALL=$LC_ALL
9 case "$LC_ALL" in
10 *.UTF-8)
11 have_utf8=t
14 have_utf8=
16 esac
18 . ./lib-git-svn.sh
20 echo 'define NO_SVN_TESTS to skip git-svn tests'
22 test_expect_success \
23 'initialize git-svn' "
24 mkdir import &&
25 cd import &&
26 echo foo > foo &&
27 ln -s foo foo.link
28 mkdir -p dir/a/b/c/d/e &&
29 echo 'deep dir' > dir/a/b/c/d/e/file &&
30 mkdir bar &&
31 echo 'zzz' > bar/zzz &&
32 echo '#!/bin/sh' > exec.sh &&
33 chmod +x exec.sh &&
34 svn import -m 'import for git-svn' . $svnrepo >/dev/null &&
35 cd .. &&
36 rm -rf import &&
37 git-svn init $svnrepo"
39 test_expect_success \
40 'import an SVN revision into git' \
41 'git-svn fetch'
43 test_expect_success "checkout from svn" "svn co $svnrepo '$SVN_TREE'"
45 name='try a deep --rmdir with a commit'
46 test_expect_success "$name" "
47 git checkout -f -b mybranch remotes/git-svn &&
48 mv dir/a/b/c/d/e/file dir/file &&
49 cp dir/file file &&
50 git update-index --add --remove dir/a/b/c/d/e/file dir/file file &&
51 git commit -m '$name' &&
52 git-svn set-tree --find-copies-harder --rmdir \
53 remotes/git-svn..mybranch &&
54 svn up '$SVN_TREE' &&
55 test -d '$SVN_TREE'/dir && test ! -d '$SVN_TREE'/dir/a"
58 name='detect node change from file to directory #1'
59 test_expect_failure "$name" "
60 mkdir dir/new_file &&
61 mv dir/file dir/new_file/file &&
62 mv dir/new_file dir/file &&
63 git update-index --remove dir/file &&
64 git update-index --add dir/file/file &&
65 git commit -m '$name' &&
66 git-svn set-tree --find-copies-harder --rmdir \
67 remotes/git-svn..mybranch" || true
70 name='detect node change from directory to file #1'
71 test_expect_failure "$name" "
72 rm -rf dir '$GIT_DIR'/index &&
73 git checkout -f -b mybranch2 remotes/git-svn &&
74 mv bar/zzz zzz &&
75 rm -rf bar &&
76 mv zzz bar &&
77 git update-index --remove -- bar/zzz &&
78 git update-index --add -- bar &&
79 git commit -m '$name' &&
80 git-svn set-tree --find-copies-harder --rmdir \
81 remotes/git-svn..mybranch2" || true
84 name='detect node change from file to directory #2'
85 test_expect_failure "$name" "
86 rm -f '$GIT_DIR'/index &&
87 git checkout -f -b mybranch3 remotes/git-svn &&
88 rm bar/zzz &&
89 git update-index --remove bar/zzz &&
90 mkdir bar/zzz &&
91 echo yyy > bar/zzz/yyy &&
92 git update-index --add bar/zzz/yyy &&
93 git commit -m '$name' &&
94 git-svn set-tree --find-copies-harder --rmdir \
95 remotes/git-svn..mybranch3" || true
98 name='detect node change from directory to file #2'
99 test_expect_failure "$name" "
100 rm -f '$GIT_DIR'/index &&
101 git checkout -f -b mybranch4 remotes/git-svn &&
102 rm -rf dir &&
103 git update-index --remove -- dir/file &&
104 touch dir &&
105 echo asdf > dir &&
106 git update-index --add -- dir &&
107 git commit -m '$name' &&
108 git-svn set-tree --find-copies-harder --rmdir \
109 remotes/git-svn..mybranch4" || true
112 name='remove executable bit from a file'
113 test_expect_success "$name" "
114 rm -f '$GIT_DIR'/index &&
115 git checkout -f -b mybranch5 remotes/git-svn &&
116 chmod -x exec.sh &&
117 git update-index exec.sh &&
118 git commit -m '$name' &&
119 git-svn set-tree --find-copies-harder --rmdir \
120 remotes/git-svn..mybranch5 &&
121 svn up '$SVN_TREE' &&
122 test ! -x '$SVN_TREE'/exec.sh"
125 name='add executable bit back file'
126 test_expect_success "$name" "
127 chmod +x exec.sh &&
128 git update-index exec.sh &&
129 git commit -m '$name' &&
130 git-svn set-tree --find-copies-harder --rmdir \
131 remotes/git-svn..mybranch5 &&
132 svn up '$SVN_TREE' &&
133 test -x '$SVN_TREE'/exec.sh"
136 name='executable file becomes a symlink to bar/zzz (file)'
137 test_expect_success "$name" "
138 rm exec.sh &&
139 ln -s bar/zzz exec.sh &&
140 git update-index exec.sh &&
141 git commit -m '$name' &&
142 git-svn set-tree --find-copies-harder --rmdir \
143 remotes/git-svn..mybranch5 &&
144 svn up '$SVN_TREE' &&
145 test -L '$SVN_TREE'/exec.sh"
147 name='new symlink is added to a file that was also just made executable'
149 test_expect_success "$name" "
150 chmod +x bar/zzz &&
151 ln -s bar/zzz exec-2.sh &&
152 git update-index --add bar/zzz exec-2.sh &&
153 git commit -m '$name' &&
154 git-svn set-tree --find-copies-harder --rmdir \
155 remotes/git-svn..mybranch5 &&
156 svn up '$SVN_TREE' &&
157 test -x '$SVN_TREE'/bar/zzz &&
158 test -L '$SVN_TREE'/exec-2.sh"
160 name='modify a symlink to become a file'
161 test_expect_success "$name" "
162 echo git help > help || true &&
163 rm exec-2.sh &&
164 cp help exec-2.sh &&
165 git update-index exec-2.sh &&
166 git commit -m '$name' &&
167 git-svn set-tree --find-copies-harder --rmdir \
168 remotes/git-svn..mybranch5 &&
169 svn up '$SVN_TREE' &&
170 test -f '$SVN_TREE'/exec-2.sh &&
171 test ! -L '$SVN_TREE'/exec-2.sh &&
172 git diff help $SVN_TREE/exec-2.sh"
174 if test "$have_utf8" = t
175 then
176 name="commit with UTF-8 message: locale: $GIT_SVN_LC_ALL"
177 LC_ALL="$GIT_SVN_LC_ALL"
178 export LC_ALL
179 test_expect_success "$name" "
180 echo '# hello' >> exec-2.sh &&
181 git update-index exec-2.sh &&
182 git commit -m 'éï∏' &&
183 git-svn set-tree HEAD"
184 unset LC_ALL
185 else
186 echo "UTF-8 locale not set, test skipped ($GIT_SVN_LC_ALL)"
189 name='test fetch functionality (svn => git) with alternate GIT_SVN_ID'
190 GIT_SVN_ID=alt
191 export GIT_SVN_ID
192 test_expect_success "$name" \
193 "git-svn init $svnrepo && git-svn fetch &&
194 git rev-list --pretty=raw remotes/git-svn | grep ^tree | uniq > a &&
195 git rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
196 git diff a b"
198 name='check imported tree checksums expected tree checksums'
199 rm -f expected
200 if test "$have_utf8" = t
201 then
202 echo tree bf522353586b1b883488f2bc73dab0d9f774b9a9 > expected
204 cat >> expected <<\EOF
205 tree 83654bb36f019ae4fe77a0171f81075972087624
206 tree 031b8d557afc6fea52894eaebb45bec52f1ba6d1
207 tree 0b094cbff17168f24c302e297f55bfac65eb8bd3
208 tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e
209 tree 56a30b966619b863674f5978696f4a3594f2fca9
210 tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e
211 tree 8f51f74cf0163afc9ad68a4b1537288c4558b5a4
214 test_expect_success "$name" "git diff a expected"
216 test_expect_failure 'exit if remote refs are ambigious' "
217 git config --add svn-remote.svn.fetch \
218 bar:refs/remotes/git-svn &&
219 git-svn migrate
222 test_expect_failure 'exit if init-ing a would clobber a URL' "
223 svnadmin create ${PWD}/svnrepo2 &&
224 svn mkdir -m 'mkdir bar' ${svnrepo}2/bar &&
225 git config --unset svn-remote.svn.fetch \
226 '^bar:refs/remotes/git-svn$' &&
227 git-svn init ${svnrepo}2/bar
230 test_expect_success \
231 'init allows us to connect to another directory in the same repo' "
232 git-svn init --minimize-url -i bar $svnrepo/bar &&
233 git config --get svn-remote.svn.fetch \
234 '^bar:refs/remotes/bar$' &&
235 git config --get svn-remote.svn.fetch \
236 '^:refs/remotes/git-svn$'
239 test_expect_success 'able to dcommit to a subdirectory' "
240 git-svn fetch -i bar &&
241 git checkout -b my-bar refs/remotes/bar &&
242 echo abc > d &&
243 git update-index --add d &&
244 git commit -m '/bar/d should be in the log' &&
245 git-svn dcommit -i bar &&
246 test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" &&
247 mkdir newdir &&
248 echo new > newdir/dir &&
249 git update-index --add newdir/dir &&
250 git commit -m 'add a new directory' &&
251 git-svn dcommit -i bar &&
252 test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\" &&
253 echo foo >> newdir/dir &&
254 git update-index newdir/dir &&
255 git commit -m 'modify a file in new directory' &&
256 git-svn dcommit -i bar &&
257 test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\"
260 test_expect_success 'able to set-tree to a subdirectory' "
261 echo cba > d &&
262 git update-index d &&
263 git commit -m 'update /bar/d' &&
264 git-svn set-tree -i bar HEAD &&
265 test -z \"\`git diff refs/heads/my-bar refs/remotes/bar\`\"
268 test_done