summaryrefslogtreecommitdiff
path: root/t/t9100-git-svn-basic.sh
blob: bf1d6381d9f7cb3f2a0d037893986be265de4dec (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
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
#!/bin/sh
#
# Copyright (c) 2006 Eric Wong
#
 
test_description='git-svn basic tests'
GIT_SVN_LC_ALL=$LC_ALL
 
case "$LC_ALL" in
*.UTF-8)
	have_utf8=t
	;;
*)
	have_utf8=
	;;
esac
 
. ./lib-git-svn.sh
 
echo 'define NO_SVN_TESTS to skip git-svn tests'
 
mkdir import
cd import
 
echo foo > foo
if test -z "$NO_SYMLINK"
then
	ln -s foo foo.link
fi
mkdir -p dir/a/b/c/d/e
echo 'deep dir' > dir/a/b/c/d/e/file
mkdir -p bar
echo 'zzz' > bar/zzz
echo '#!/bin/sh' > exec.sh
chmod +x exec.sh
svn import -m 'import for git-svn' . "$svnrepo" >/dev/null
 
cd ..
rm -rf import
 
test_expect_success \
    'initialize git-svn' \
    "git-svn init $svnrepo"
 
test_expect_success \
    'import an SVN revision into git' \
    'git-svn fetch'
 
test_expect_success "checkout from svn" "svn co $svnrepo $SVN_TREE"
 
name='try a deep --rmdir with a commit'
git checkout -f -b mybranch remotes/git-svn
mv dir/a/b/c/d/e/file dir/file
cp dir/file file
git update-index --add --remove dir/a/b/c/d/e/file dir/file file
git commit -m "$name"
 
test_expect_success "$name" \
    "git-svn commit --find-copies-harder --rmdir remotes/git-svn..mybranch &&
     svn up $SVN_TREE &&
     test -d $SVN_TREE/dir && test ! -d $SVN_TREE/dir/a"
 
 
name='detect node change from file to directory #1'
mkdir dir/new_file
mv dir/file dir/new_file/file
mv dir/new_file dir/file
git update-index --remove dir/file
git update-index --add dir/file/file
git commit -m "$name"
 
test_expect_failure "$name" \
    'git-svn commit --find-copies-harder --rmdir remotes/git-svn..mybranch' \
    || true
 
 
name='detect node change from directory to file #1'
rm -rf dir $GIT_DIR/index
git checkout -f -b mybranch2 remotes/git-svn
mv bar/zzz zzz
rm -rf bar
mv zzz bar
git update-index --remove -- bar/zzz
git update-index --add -- bar
git commit -m "$name"
 
test_expect_failure "$name" \
    'git-svn commit --find-copies-harder --rmdir remotes/git-svn..mybranch2' \
    || true
 
 
name='detect node change from file to directory #2'
rm -f $GIT_DIR/index
git checkout -f -b mybranch3 remotes/git-svn
rm bar/zzz
git-update-index --remove bar/zzz
mkdir bar/zzz
echo yyy > bar/zzz/yyy
git-update-index --add bar/zzz/yyy
git commit -m "$name"
 
test_expect_failure "$name" \
    'git-svn commit --find-copies-harder --rmdir remotes/git-svn..mybranch3' \
    || true
 
 
name='detect node change from directory to file #2'
rm -f $GIT_DIR/index
git checkout -f -b mybranch4 remotes/git-svn
rm -rf dir
git update-index --remove -- dir/file
touch dir
echo asdf > dir
git update-index --add -- dir
git commit -m "$name"
 
test_expect_failure "$name" \
    'git-svn commit --find-copies-harder --rmdir remotes/git-svn..mybranch4' \
    || true
 
 
name='remove executable bit from a file'
rm -f $GIT_DIR/index
git checkout -f -b mybranch5 remotes/git-svn
chmod -x exec.sh
git update-index exec.sh
git commit -m "$name"
 
test_expect_success "$name" \
    "git-svn commit --find-copies-harder --rmdir remotes/git-svn..mybranch5 &&
     svn up $SVN_TREE &&
     test ! -x $SVN_TREE/exec.sh"
 
 
name='add executable bit back file'
chmod +x exec.sh
git update-index exec.sh
git commit -m "$name"
 
test_expect_success "$name" \
    "git-svn commit --find-copies-harder --rmdir remotes/git-svn..mybranch5 &&
     svn up $SVN_TREE &&
     test -x $SVN_TREE/exec.sh"
 
 
 
if test -z "$NO_SYMLINK"
then
	name='executable file becomes a symlink to bar/zzz (file)'
	rm exec.sh
	ln -s bar/zzz exec.sh
	git update-index exec.sh
	git commit -m "$name"
 
	test_expect_success "$name" \
	    "git-svn commit --find-copies-harder --rmdir remotes/git-svn..mybranch5 &&
	     svn up $SVN_TREE &&
	     test -L $SVN_TREE/exec.sh"
 
	name='new symlink is added to a file that was also just made executable'
	chmod +x bar/zzz
	ln -s bar/zzz exec-2.sh
	git update-index --add bar/zzz exec-2.sh
	git commit -m "$name"
 
	test_expect_success "$name" \
	    "git-svn commit --find-copies-harder --rmdir remotes/git-svn..mybranch5 &&
	     svn up $SVN_TREE &&
	     test -x $SVN_TREE/bar/zzz &&
	     test -L $SVN_TREE/exec-2.sh"
 
	name='modify a symlink to become a file'
	git help > help || true
	rm exec-2.sh
	cp help exec-2.sh
	git update-index exec-2.sh
	git commit -m "$name"
 
	test_expect_success "$name" \
	    "git-svn commit --find-copies-harder --rmdir remotes/git-svn..mybranch5 &&
	     svn up $SVN_TREE &&
	     test -f $SVN_TREE/exec-2.sh &&
	     test ! -L $SVN_TREE/exec-2.sh &&
	     diff -u help $SVN_TREE/exec-2.sh"
fi
 
 
if test "$have_utf8" = t
then
	name="commit with UTF-8 message: locale: $GIT_SVN_LC_ALL"
	echo '# hello' >> exec-2.sh
	git update-index exec-2.sh
	git commit -m 'éï∏'
	export LC_ALL="$GIT_SVN_LC_ALL"
	test_expect_success "$name" "git-svn commit HEAD"
	unset LC_ALL
else
	echo "UTF-8 locale not set, test skipped ($GIT_SVN_LC_ALL)"
fi
 
name='test fetch functionality (svn => git) with alternate GIT_SVN_ID'
GIT_SVN_ID=alt
export GIT_SVN_ID
test_expect_success "$name" \
    "git-svn init $svnrepo && git-svn fetch &&
     git-rev-list --pretty=raw remotes/git-svn | grep ^tree | uniq > a &&
     git-rev-list --pretty=raw remotes/alt | grep ^tree | uniq > b &&
     diff -u a b"
 
if test -n "$NO_SYMLINK"
then
	test_done
	exit 0
fi
 
name='check imported tree checksums expected tree checksums'
rm -f expected
if test "$have_utf8" = t
then
	echo tree f735671b89a7eb30cab1d8597de35bd4271ab813 > expected
fi
cat >> expected <<\EOF
tree 4b9af72bb861eaed053854ec502cf7df72618f0f
tree 031b8d557afc6fea52894eaebb45bec52f1ba6d1
tree 0b094cbff17168f24c302e297f55bfac65eb8bd3
tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e
tree 56a30b966619b863674f5978696f4a3594f2fca9
tree d667270a1f7b109f5eb3aaea21ede14b56bfdd6e
tree 8f51f74cf0163afc9ad68a4b1537288c4558b5a4
EOF
test_expect_success "$name" "diff -u a expected"
 
test_done