1 c84d8c75 2019-01-02 stsp #!/bin/sh
  2 c84d8c75 2019-01-02 stsp #
  3 c84d8c75 2019-01-02 stsp # Copyright (c) 2019 Stefan Sperling <stsp@openbsd.org>
  4 c84d8c75 2019-01-02 stsp #
  5 c84d8c75 2019-01-02 stsp # Permission to use, copy, modify, and distribute this software for any
  6 c84d8c75 2019-01-02 stsp # purpose with or without fee is hereby granted, provided that the above
  7 c84d8c75 2019-01-02 stsp # copyright notice and this permission notice appear in all copies.
  8 c84d8c75 2019-01-02 stsp #
  9 c84d8c75 2019-01-02 stsp # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
 10 c84d8c75 2019-01-02 stsp # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
 11 c84d8c75 2019-01-02 stsp # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
 12 c84d8c75 2019-01-02 stsp # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
 13 c84d8c75 2019-01-02 stsp # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 14 c84d8c75 2019-01-02 stsp # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 15 c84d8c75 2019-01-02 stsp # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 16 c84d8c75 2019-01-02 stsp 
 17 c84d8c75 2019-01-02 stsp . ./common.sh
 18 c84d8c75 2019-01-02 stsp 
 19 c84d8c75 2019-01-02 stsp function test_update_basic {
 20 0fbd721f 2019-01-02 stsp 	local testroot=`test_init update_basic`
 21 c84d8c75 2019-01-02 stsp 
 22 3c90ba67 2019-01-02 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
 23 c84d8c75 2019-01-02 stsp 	if [ "$?" != "0" ]; then
 24 c84d8c75 2019-01-02 stsp 		test_done "$testroot" "$?"
 25 c84d8c75 2019-01-02 stsp 		return 1
 26 c84d8c75 2019-01-02 stsp 	fi
 27 c84d8c75 2019-01-02 stsp 
 28 c84d8c75 2019-01-02 stsp 	echo "modified alpha" > $testroot/repo/alpha
 29 c84d8c75 2019-01-02 stsp 	git_commit $testroot/repo -m "modified alpha"
 30 c84d8c75 2019-01-02 stsp 
 31 c84d8c75 2019-01-02 stsp 	echo "U  alpha" > $testroot/stdout.expected
 32 9c4b8182 2019-01-02 stsp 	echo -n "Updated to commit " >> $testroot/stdout.expected
 33 9c4b8182 2019-01-02 stsp 	git_show_head $testroot/repo >> $testroot/stdout.expected
 34 9c4b8182 2019-01-02 stsp 	echo >> $testroot/stdout.expected
 35 c84d8c75 2019-01-02 stsp 
 36 c84d8c75 2019-01-02 stsp 	(cd $testroot/wt && got update > $testroot/stdout)
 37 c84d8c75 2019-01-02 stsp 
 38 c84d8c75 2019-01-02 stsp 	cmp $testroot/stdout.expected $testroot/stdout
 39 c84d8c75 2019-01-02 stsp 	if [ "$?" != "0" ]; then
 40 c84d8c75 2019-01-02 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 41 c84d8c75 2019-01-02 stsp 		test_done "$testroot" "$?"
 42 c84d8c75 2019-01-02 stsp 		return 1
 43 c84d8c75 2019-01-02 stsp 	fi
 44 c84d8c75 2019-01-02 stsp 
 45 c84d8c75 2019-01-02 stsp 	echo "modified alpha" > $testroot/content.expected
 46 52a3df9b 2019-01-06 stsp 	cat $testroot/wt/alpha > $testroot/content
 47 c84d8c75 2019-01-02 stsp 
 48 c84d8c75 2019-01-02 stsp 	cmp $testroot/content.expected $testroot/content
 49 693719bc 2019-01-03 stsp 	ret="$?"
 50 693719bc 2019-01-03 stsp 	if [ "$ret" != "0" ]; then
 51 c84d8c75 2019-01-02 stsp 		diff -u $testroot/content.expected $testroot/content
 52 c84d8c75 2019-01-02 stsp 	fi
 53 693719bc 2019-01-03 stsp 	test_done "$testroot" "$ret"
 54 c84d8c75 2019-01-02 stsp }
 55 c84d8c75 2019-01-02 stsp 
 56 3b4d3732 2019-01-02 stsp function test_update_adds_file {
 57 3b4d3732 2019-01-02 stsp 	local testroot=`test_init update_adds_file`
 58 3b4d3732 2019-01-02 stsp 
 59 3b4d3732 2019-01-02 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
 60 3b4d3732 2019-01-02 stsp 	if [ "$?" != "0" ]; then
 61 3b4d3732 2019-01-02 stsp 		test_done "$testroot" "$?"
 62 3b4d3732 2019-01-02 stsp 		return 1
 63 3b4d3732 2019-01-02 stsp 	fi
 64 3b4d3732 2019-01-02 stsp 
 65 3b4d3732 2019-01-02 stsp 	echo "new" > $testroot/repo/gamma/new
 66 3b4d3732 2019-01-02 stsp 	(cd $testroot/repo && git add .)
 67 3b4d3732 2019-01-02 stsp 	git_commit $testroot/repo -m "adding a new file"
 68 3b4d3732 2019-01-02 stsp 
 69 3b4d3732 2019-01-02 stsp 	echo "A  gamma/new" > $testroot/stdout.expected
 70 3b4d3732 2019-01-02 stsp 	echo -n "Updated to commit " >> $testroot/stdout.expected
 71 3b4d3732 2019-01-02 stsp 	git_show_head $testroot/repo >> $testroot/stdout.expected
 72 3b4d3732 2019-01-02 stsp 	echo >> $testroot/stdout.expected
 73 3b4d3732 2019-01-02 stsp 
 74 3b4d3732 2019-01-02 stsp 	(cd $testroot/wt && got update > $testroot/stdout)
 75 3b4d3732 2019-01-02 stsp 
 76 3b4d3732 2019-01-02 stsp 	cmp $testroot/stdout.expected $testroot/stdout
 77 3b4d3732 2019-01-02 stsp 	if [ "$?" != "0" ]; then
 78 3b4d3732 2019-01-02 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
 79 3b4d3732 2019-01-02 stsp 		test_done "$testroot" "$?"
 80 3b4d3732 2019-01-02 stsp 		return 1
 81 3b4d3732 2019-01-02 stsp 	fi
 82 3b4d3732 2019-01-02 stsp 
 83 3b4d3732 2019-01-02 stsp 	echo "new" >> $testroot/content.expected
 84 52a3df9b 2019-01-06 stsp 	cat $testroot/wt/gamma/new > $testroot/content
 85 3b4d3732 2019-01-02 stsp 
 86 3b4d3732 2019-01-02 stsp 	cmp $testroot/content.expected $testroot/content
 87 693719bc 2019-01-03 stsp 	ret="$?"
 88 693719bc 2019-01-03 stsp 	if [ "$ret" != "0" ]; then
 89 3b4d3732 2019-01-02 stsp 		diff -u $testroot/content.expected $testroot/content
 90 3b4d3732 2019-01-02 stsp 	fi
 91 693719bc 2019-01-03 stsp 	test_done "$testroot" "$ret"
 92 3b4d3732 2019-01-02 stsp }
 93 3b4d3732 2019-01-02 stsp 
 94 512f0d0e 2019-01-02 stsp function test_update_deletes_file {
 95 512f0d0e 2019-01-02 stsp 	local testroot=`test_init update_deletes_file`
 96 512f0d0e 2019-01-02 stsp 
 97 512f0d0e 2019-01-02 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
 98 512f0d0e 2019-01-02 stsp 	if [ "$?" != "0" ]; then
 99 512f0d0e 2019-01-02 stsp 		test_done "$testroot" "$?"
100 512f0d0e 2019-01-02 stsp 		return 1
101 512f0d0e 2019-01-02 stsp 	fi
102 512f0d0e 2019-01-02 stsp 
103 512f0d0e 2019-01-02 stsp 	(cd $testroot/repo && git_rm $testroot/repo beta)
104 512f0d0e 2019-01-02 stsp 	git_commit $testroot/repo -m "deleting a file"
105 512f0d0e 2019-01-02 stsp 
106 512f0d0e 2019-01-02 stsp 	echo "D  beta" > $testroot/stdout.expected
107 512f0d0e 2019-01-02 stsp 	echo -n "Updated to commit " >> $testroot/stdout.expected
108 512f0d0e 2019-01-02 stsp 	git_show_head $testroot/repo >> $testroot/stdout.expected
109 512f0d0e 2019-01-02 stsp 	echo >> $testroot/stdout.expected
110 512f0d0e 2019-01-02 stsp 
111 512f0d0e 2019-01-02 stsp 	(cd $testroot/wt && got update > $testroot/stdout)
112 512f0d0e 2019-01-02 stsp 
113 512f0d0e 2019-01-02 stsp 	cmp $testroot/stdout.expected $testroot/stdout
114 512f0d0e 2019-01-02 stsp 	if [ "$?" != "0" ]; then
115 512f0d0e 2019-01-02 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
116 512f0d0e 2019-01-02 stsp 		test_done "$testroot" "$?"
117 512f0d0e 2019-01-02 stsp 		return 1
118 512f0d0e 2019-01-02 stsp 	fi
119 512f0d0e 2019-01-02 stsp 
120 512f0d0e 2019-01-02 stsp 	if [ -e $testroot/wt/beta ]; then
121 512f0d0e 2019-01-02 stsp 		echo "removed file beta still exists on disk" >&2
122 52a3df9b 2019-01-06 stsp 		test_done "$testroot" "1"
123 512f0d0e 2019-01-02 stsp 		return 1
124 512f0d0e 2019-01-02 stsp 	fi
125 512f0d0e 2019-01-02 stsp 
126 52a3df9b 2019-01-06 stsp 	test_done "$testroot" "0"
127 512f0d0e 2019-01-02 stsp }
128 512f0d0e 2019-01-02 stsp 
129 f5c49f82 2019-01-06 stsp function test_update_deletes_dir {
130 f5c49f82 2019-01-06 stsp 	local testroot=`test_init update_deletes_dir`
131 f5c49f82 2019-01-06 stsp 
132 f5c49f82 2019-01-06 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
133 f5c49f82 2019-01-06 stsp 	if [ "$?" != "0" ]; then
134 f5c49f82 2019-01-06 stsp 		test_done "$testroot" "$?"
135 f5c49f82 2019-01-06 stsp 		return 1
136 f5c49f82 2019-01-06 stsp 	fi
137 f5c49f82 2019-01-06 stsp 
138 f5c49f82 2019-01-06 stsp 	(cd $testroot/repo && git_rm $testroot/repo -r epsilon)
139 f5c49f82 2019-01-06 stsp 	git_commit $testroot/repo -m "deleting a directory"
140 f5c49f82 2019-01-06 stsp 
141 f5c49f82 2019-01-06 stsp 	echo "D  epsilon/zeta" > $testroot/stdout.expected
142 f5c49f82 2019-01-06 stsp 	echo -n "Updated to commit " >> $testroot/stdout.expected
143 f5c49f82 2019-01-06 stsp 	git_show_head $testroot/repo >> $testroot/stdout.expected
144 f5c49f82 2019-01-06 stsp 	echo >> $testroot/stdout.expected
145 f5c49f82 2019-01-06 stsp 
146 f5c49f82 2019-01-06 stsp 	(cd $testroot/wt && got update > $testroot/stdout)
147 f5c49f82 2019-01-06 stsp 
148 f5c49f82 2019-01-06 stsp 	cmp $testroot/stdout.expected $testroot/stdout
149 f5c49f82 2019-01-06 stsp 	if [ "$?" != "0" ]; then
150 f5c49f82 2019-01-06 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
151 f5c49f82 2019-01-06 stsp 		test_done "$testroot" "$?"
152 f5c49f82 2019-01-06 stsp 		return 1
153 f5c49f82 2019-01-06 stsp 	fi
154 f5c49f82 2019-01-06 stsp 
155 f5c49f82 2019-01-06 stsp 	if [ -e $testroot/wt/epsilon ]; then
156 f5c49f82 2019-01-06 stsp 		echo "removed dir epsilon still exists on disk" >&2
157 52a3df9b 2019-01-06 stsp 		test_done "$testroot" "1"
158 f5c49f82 2019-01-06 stsp 		return 1
159 f5c49f82 2019-01-06 stsp 	fi
160 f5c49f82 2019-01-06 stsp 
161 52a3df9b 2019-01-06 stsp 	test_done "$testroot" "0"
162 f5c49f82 2019-01-06 stsp }
163 f5c49f82 2019-01-06 stsp 
164 5cc266ba 2019-01-06 stsp function test_update_deletes_dir_with_path_prefix {
165 5cc266ba 2019-01-06 stsp 	local testroot=`test_init update_deletes_dir_with_path_prefix`
166 5cc266ba 2019-01-06 stsp 	local first_rev=`git_show_head $testroot/repo`
167 5cc266ba 2019-01-06 stsp 
168 5cc266ba 2019-01-06 stsp 	mkdir $testroot/repo/epsilon/psi
169 5cc266ba 2019-01-06 stsp 	echo mu > $testroot/repo/epsilon/psi/mu
170 5cc266ba 2019-01-06 stsp 	(cd $testroot/repo && git add .)
171 5cc266ba 2019-01-06 stsp 	git_commit $testroot/repo -m "adding a sub-directory beneath epsilon"
172 5cc266ba 2019-01-06 stsp 
173 5cc266ba 2019-01-06 stsp 	# check out the epsilon/ sub-tree
174 5cc266ba 2019-01-06 stsp 	got checkout -p epsilon $testroot/repo $testroot/wt > /dev/null
175 5cc266ba 2019-01-06 stsp 	if [ "$?" != "0" ]; then
176 5cc266ba 2019-01-06 stsp 		test_done "$testroot" "$?"
177 5cc266ba 2019-01-06 stsp 		return 1
178 5cc266ba 2019-01-06 stsp 	fi
179 5cc266ba 2019-01-06 stsp 
180 5cc266ba 2019-01-06 stsp 	# update back to first commit and expect psi/mu to be deleted
181 5cc266ba 2019-01-06 stsp 	echo "D  psi/mu" > $testroot/stdout.expected
182 5cc266ba 2019-01-06 stsp 	echo "Updated to commit $first_rev" >> $testroot/stdout.expected
183 5cc266ba 2019-01-06 stsp 
184 5cc266ba 2019-01-06 stsp 	(cd $testroot/wt && got update -c $first_rev > $testroot/stdout)
185 5cc266ba 2019-01-06 stsp 
186 5cc266ba 2019-01-06 stsp 	cmp $testroot/stdout.expected $testroot/stdout
187 5cc266ba 2019-01-06 stsp 	if [ "$?" != "0" ]; then
188 5cc266ba 2019-01-06 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
189 5cc266ba 2019-01-06 stsp 		test_done "$testroot" "$?"
190 5cc266ba 2019-01-06 stsp 		return 1
191 5cc266ba 2019-01-06 stsp 	fi
192 5cc266ba 2019-01-06 stsp 
193 5cc266ba 2019-01-06 stsp 	if [ -e $testroot/wt/psi ]; then
194 5cc266ba 2019-01-06 stsp 		echo "removed dir psi still exists on disk" >&2
195 5cc266ba 2019-01-06 stsp 		test_done "$testroot" "1"
196 5cc266ba 2019-01-06 stsp 		return 1
197 5cc266ba 2019-01-06 stsp 	fi
198 5cc266ba 2019-01-06 stsp 
199 52a3df9b 2019-01-06 stsp 	test_done "$testroot" "0"
200 5cc266ba 2019-01-06 stsp }
201 5cc266ba 2019-01-06 stsp 
202 90285c3b 2019-01-08 stsp function test_update_deletes_dir_recursively {
203 90285c3b 2019-01-08 stsp 	local testroot=`test_init update_deletes_dir_recursively`
204 90285c3b 2019-01-08 stsp 	local first_rev=`git_show_head $testroot/repo`
205 90285c3b 2019-01-08 stsp 
206 90285c3b 2019-01-08 stsp 	mkdir $testroot/repo/epsilon/psi
207 90285c3b 2019-01-08 stsp 	echo mu > $testroot/repo/epsilon/psi/mu
208 90285c3b 2019-01-08 stsp 	mkdir $testroot/repo/epsilon/psi/chi
209 90285c3b 2019-01-08 stsp 	echo tau > $testroot/repo/epsilon/psi/chi/tau
210 90285c3b 2019-01-08 stsp 	(cd $testroot/repo && git add .)
211 90285c3b 2019-01-08 stsp 	git_commit $testroot/repo -m "adding a sub-directory beneath epsilon"
212 90285c3b 2019-01-08 stsp 
213 90285c3b 2019-01-08 stsp 	# check out the epsilon/ sub-tree
214 90285c3b 2019-01-08 stsp 	got checkout -p epsilon $testroot/repo $testroot/wt > /dev/null
215 90285c3b 2019-01-08 stsp 	if [ "$?" != "0" ]; then
216 90285c3b 2019-01-08 stsp 		test_done "$testroot" "$?"
217 90285c3b 2019-01-08 stsp 		return 1
218 90285c3b 2019-01-08 stsp 	fi
219 90285c3b 2019-01-08 stsp 
220 90285c3b 2019-01-08 stsp 	# update back to first commit and expect psi/mu to be deleted
221 90285c3b 2019-01-08 stsp 	echo "D  psi/chi/tau" > $testroot/stdout.expected
222 90285c3b 2019-01-08 stsp 	echo "D  psi/mu" >> $testroot/stdout.expected
223 90285c3b 2019-01-08 stsp 	echo "Updated to commit $first_rev" >> $testroot/stdout.expected
224 90285c3b 2019-01-08 stsp 
225 90285c3b 2019-01-08 stsp 	(cd $testroot/wt && got update -c $first_rev > $testroot/stdout)
226 90285c3b 2019-01-08 stsp 
227 90285c3b 2019-01-08 stsp 	cmp $testroot/stdout.expected $testroot/stdout
228 90285c3b 2019-01-08 stsp 	if [ "$?" != "0" ]; then
229 90285c3b 2019-01-08 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
230 90285c3b 2019-01-08 stsp 		test_done "$testroot" "$?"
231 90285c3b 2019-01-08 stsp 		return 1
232 90285c3b 2019-01-08 stsp 	fi
233 90285c3b 2019-01-08 stsp 
234 90285c3b 2019-01-08 stsp 	if [ -e $testroot/wt/psi ]; then
235 90285c3b 2019-01-08 stsp 		echo "removed dir psi still exists on disk" >&2
236 90285c3b 2019-01-08 stsp 		test_done "$testroot" "1"
237 90285c3b 2019-01-08 stsp 		return 1
238 90285c3b 2019-01-08 stsp 	fi
239 90285c3b 2019-01-08 stsp 
240 90285c3b 2019-01-08 stsp 	test_done "$testroot" "0"
241 90285c3b 2019-01-08 stsp }
242 90285c3b 2019-01-08 stsp 
243 4482e97b 2019-01-08 stsp function test_update_sibling_dirs_with_common_prefix {
244 4482e97b 2019-01-08 stsp 	local testroot=`test_init update_sibling_dirs_with_common_prefix`
245 81a30460 2019-01-08 stsp 
246 81a30460 2019-01-08 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
247 81a30460 2019-01-08 stsp 	if [ "$?" != "0" ]; then
248 81a30460 2019-01-08 stsp 		test_done "$testroot" "$?"
249 81a30460 2019-01-08 stsp 		return 1
250 81a30460 2019-01-08 stsp 	fi
251 81a30460 2019-01-08 stsp 
252 81a30460 2019-01-08 stsp 	mkdir $testroot/repo/epsilon2
253 81a30460 2019-01-08 stsp 	echo mu > $testroot/repo/epsilon2/mu
254 81a30460 2019-01-08 stsp 	(cd $testroot/repo && git add epsilon2/mu)
255 81a30460 2019-01-08 stsp 	git_commit $testroot/repo -m "adding sibling of epsilon"
256 81a30460 2019-01-08 stsp 	echo change > $testroot/repo/epsilon/zeta
257 81a30460 2019-01-08 stsp 	git_commit $testroot/repo -m "changing epsilon/zeta"
258 81a30460 2019-01-08 stsp 
259 81a30460 2019-01-08 stsp 	echo "U  epsilon/zeta" > $testroot/stdout.expected
260 81a30460 2019-01-08 stsp 	echo "A  epsilon2/mu" >> $testroot/stdout.expected
261 81a30460 2019-01-08 stsp 	echo -n "Updated to commit " >> $testroot/stdout.expected
262 81a30460 2019-01-08 stsp 	git_show_head $testroot/repo >> $testroot/stdout.expected
263 81a30460 2019-01-08 stsp 	echo >> $testroot/stdout.expected
264 81a30460 2019-01-08 stsp 
265 81a30460 2019-01-08 stsp 	(cd $testroot/wt && got update > $testroot/stdout)
266 81a30460 2019-01-08 stsp 
267 81a30460 2019-01-08 stsp 	cmp $testroot/stdout.expected $testroot/stdout
268 81a30460 2019-01-08 stsp 	if [ "$?" != "0" ]; then
269 81a30460 2019-01-08 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
270 81a30460 2019-01-08 stsp 		test_done "$testroot" "$?"
271 81a30460 2019-01-08 stsp 		return 1
272 81a30460 2019-01-08 stsp 	fi
273 81a30460 2019-01-08 stsp 
274 81a30460 2019-01-08 stsp 	echo "another change" > $testroot/repo/epsilon/zeta
275 81a30460 2019-01-08 stsp 	git_commit $testroot/repo -m "changing epsilon/zeta again"
276 81a30460 2019-01-08 stsp 
277 81a30460 2019-01-08 stsp 	echo "U  epsilon/zeta" > $testroot/stdout.expected
278 81a30460 2019-01-08 stsp 	echo -n "Updated to commit " >> $testroot/stdout.expected
279 81a30460 2019-01-08 stsp 	git_show_head $testroot/repo >> $testroot/stdout.expected
280 81a30460 2019-01-08 stsp 	echo >> $testroot/stdout.expected
281 81a30460 2019-01-08 stsp 
282 81a30460 2019-01-08 stsp 	# Bug: This update used to do delete/add epsilon2/mu again:
283 81a30460 2019-01-08 stsp 	# U  epsilon/zeta
284 81a30460 2019-01-08 stsp 	# D  epsilon2/mu <--- not intended
285 81a30460 2019-01-08 stsp 	# A  epsilon2/mu <--- not intended
286 50952927 2019-01-12 stsp 	(cd $testroot/wt && got update > $testroot/stdout)
287 50952927 2019-01-12 stsp 
288 50952927 2019-01-12 stsp 	cmp $testroot/stdout.expected $testroot/stdout
289 50952927 2019-01-12 stsp 	if [ "$?" != "0" ]; then
290 50952927 2019-01-12 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
291 50952927 2019-01-12 stsp 		test_done "$testroot" "$?"
292 50952927 2019-01-12 stsp 		return 1
293 50952927 2019-01-12 stsp 	fi
294 50952927 2019-01-12 stsp 
295 50952927 2019-01-12 stsp 	cmp $testroot/stdout.expected $testroot/stdout
296 50952927 2019-01-12 stsp 	if [ "$?" != "0" ]; then
297 50952927 2019-01-12 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
298 50952927 2019-01-12 stsp 		test_done "$testroot" "$?"
299 50952927 2019-01-12 stsp 		return 1
300 50952927 2019-01-12 stsp 	fi
301 50952927 2019-01-12 stsp 
302 50952927 2019-01-12 stsp 	test_done "$testroot" "0"
303 50952927 2019-01-12 stsp }
304 50952927 2019-01-12 stsp 
305 50952927 2019-01-12 stsp function test_update_dir_with_dot_sibling {
306 50952927 2019-01-12 stsp 	local testroot=`test_init update_dir_with_dot_sibling`
307 50952927 2019-01-12 stsp 
308 50952927 2019-01-12 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
309 50952927 2019-01-12 stsp 	if [ "$?" != "0" ]; then
310 50952927 2019-01-12 stsp 		test_done "$testroot" "$?"
311 50952927 2019-01-12 stsp 		return 1
312 50952927 2019-01-12 stsp 	fi
313 50952927 2019-01-12 stsp 
314 50952927 2019-01-12 stsp 	echo text > $testroot/repo/epsilon.txt
315 50952927 2019-01-12 stsp 	(cd $testroot/repo && git add epsilon.txt)
316 50952927 2019-01-12 stsp 	git_commit $testroot/repo -m "adding sibling of epsilon"
317 50952927 2019-01-12 stsp 	echo change > $testroot/repo/epsilon/zeta
318 50952927 2019-01-12 stsp 	git_commit $testroot/repo -m "changing epsilon/zeta"
319 50952927 2019-01-12 stsp 
320 50952927 2019-01-12 stsp 	echo "A  epsilon.txt" > $testroot/stdout.expected
321 50952927 2019-01-12 stsp 	echo "U  epsilon/zeta" >> $testroot/stdout.expected
322 50952927 2019-01-12 stsp 	echo -n "Updated to commit " >> $testroot/stdout.expected
323 50952927 2019-01-12 stsp 	git_show_head $testroot/repo >> $testroot/stdout.expected
324 50952927 2019-01-12 stsp 	echo >> $testroot/stdout.expected
325 50952927 2019-01-12 stsp 
326 81a30460 2019-01-08 stsp 	(cd $testroot/wt && got update > $testroot/stdout)
327 81a30460 2019-01-08 stsp 
328 81a30460 2019-01-08 stsp 	cmp $testroot/stdout.expected $testroot/stdout
329 81a30460 2019-01-08 stsp 	if [ "$?" != "0" ]; then
330 81a30460 2019-01-08 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
331 81a30460 2019-01-08 stsp 		test_done "$testroot" "$?"
332 81a30460 2019-01-08 stsp 		return 1
333 81a30460 2019-01-08 stsp 	fi
334 81a30460 2019-01-08 stsp 
335 50952927 2019-01-12 stsp 	echo "another change" > $testroot/repo/epsilon/zeta
336 50952927 2019-01-12 stsp 	git_commit $testroot/repo -m "changing epsilon/zeta again"
337 50952927 2019-01-12 stsp 
338 50952927 2019-01-12 stsp 	echo "U  epsilon/zeta" > $testroot/stdout.expected
339 50952927 2019-01-12 stsp 	echo -n "Updated to commit " >> $testroot/stdout.expected
340 50952927 2019-01-12 stsp 	git_show_head $testroot/repo >> $testroot/stdout.expected
341 50952927 2019-01-12 stsp 	echo >> $testroot/stdout.expected
342 50952927 2019-01-12 stsp 
343 50952927 2019-01-12 stsp 	(cd $testroot/wt && got update > $testroot/stdout)
344 50952927 2019-01-12 stsp 
345 81a30460 2019-01-08 stsp 	cmp $testroot/stdout.expected $testroot/stdout
346 81a30460 2019-01-08 stsp 	if [ "$?" != "0" ]; then
347 81a30460 2019-01-08 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
348 81a30460 2019-01-08 stsp 		test_done "$testroot" "$?"
349 81a30460 2019-01-08 stsp 		return 1
350 81a30460 2019-01-08 stsp 	fi
351 81a30460 2019-01-08 stsp 
352 50952927 2019-01-12 stsp 	cmp $testroot/stdout.expected $testroot/stdout
353 50952927 2019-01-12 stsp 	if [ "$?" != "0" ]; then
354 50952927 2019-01-12 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
355 50952927 2019-01-12 stsp 		test_done "$testroot" "$?"
356 50952927 2019-01-12 stsp 		return 1
357 50952927 2019-01-12 stsp 	fi
358 50952927 2019-01-12 stsp 
359 81a30460 2019-01-08 stsp 	test_done "$testroot" "0"
360 81a30460 2019-01-08 stsp }
361 46cee7a3 2019-01-12 stsp 
362 46cee7a3 2019-01-12 stsp function test_update_moves_files_upwards {
363 46cee7a3 2019-01-12 stsp 	local testroot=`test_init update_moves_files_upwards`
364 46cee7a3 2019-01-12 stsp 
365 46cee7a3 2019-01-12 stsp 	mkdir $testroot/repo/epsilon/psi
366 46cee7a3 2019-01-12 stsp 	echo mu > $testroot/repo/epsilon/psi/mu
367 46cee7a3 2019-01-12 stsp 	mkdir $testroot/repo/epsilon/psi/chi
368 46cee7a3 2019-01-12 stsp 	echo tau > $testroot/repo/epsilon/psi/chi/tau
369 46cee7a3 2019-01-12 stsp 	(cd $testroot/repo && git add .)
370 46cee7a3 2019-01-12 stsp 	git_commit $testroot/repo -m "adding a sub-directory beneath epsilon"
371 46cee7a3 2019-01-12 stsp 
372 46cee7a3 2019-01-12 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
373 46cee7a3 2019-01-12 stsp 	if [ "$?" != "0" ]; then
374 46cee7a3 2019-01-12 stsp 		test_done "$testroot" "$?"
375 46cee7a3 2019-01-12 stsp 		return 1
376 46cee7a3 2019-01-12 stsp 	fi
377 81a30460 2019-01-08 stsp 
378 46cee7a3 2019-01-12 stsp 	(cd $testroot/repo && git mv epsilon/psi/mu epsilon/mu)
379 46cee7a3 2019-01-12 stsp 	(cd $testroot/repo && git mv epsilon/psi/chi/tau epsilon/psi/tau)
380 46cee7a3 2019-01-12 stsp 	git_commit $testroot/repo -m "moving files upwards"
381 46cee7a3 2019-01-12 stsp 
382 21908da4 2019-01-13 stsp 	echo "A  epsilon/mu" > $testroot/stdout.expected
383 21908da4 2019-01-13 stsp 	echo "D  epsilon/psi/chi/tau" >> $testroot/stdout.expected
384 46cee7a3 2019-01-12 stsp 	echo "D  epsilon/psi/mu" >> $testroot/stdout.expected
385 bd4792ec 2019-01-13 stsp 	echo "A  epsilon/psi/tau" >> $testroot/stdout.expected
386 46cee7a3 2019-01-12 stsp 	echo -n "Updated to commit " >> $testroot/stdout.expected
387 46cee7a3 2019-01-12 stsp 	git_show_head $testroot/repo >> $testroot/stdout.expected
388 46cee7a3 2019-01-12 stsp 	echo >> $testroot/stdout.expected
389 46cee7a3 2019-01-12 stsp 
390 46cee7a3 2019-01-12 stsp 	(cd $testroot/wt && got update > $testroot/stdout)
391 46cee7a3 2019-01-12 stsp 
392 46cee7a3 2019-01-12 stsp 	cmp $testroot/stdout.expected $testroot/stdout
393 46cee7a3 2019-01-12 stsp 	if [ "$?" != "0" ]; then
394 46cee7a3 2019-01-12 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
395 46cee7a3 2019-01-12 stsp 		test_done "$testroot" "$?"
396 46cee7a3 2019-01-12 stsp 		return 1
397 46cee7a3 2019-01-12 stsp 	fi
398 46cee7a3 2019-01-12 stsp 
399 46cee7a3 2019-01-12 stsp 	if [ -e $testroot/wt/epsilon/psi/chi ]; then
400 46cee7a3 2019-01-12 stsp 		echo "removed dir epsilon/psi/chi still exists on disk" >&2
401 46cee7a3 2019-01-12 stsp 		test_done "$testroot" "1"
402 46cee7a3 2019-01-12 stsp 		return 1
403 46cee7a3 2019-01-12 stsp 	fi
404 46cee7a3 2019-01-12 stsp 
405 46cee7a3 2019-01-12 stsp 	if [ -e $testroot/wt/epsilon/psi/mu ]; then
406 46cee7a3 2019-01-12 stsp 		echo "removed file epsilon/psi/mu still exists on disk" >&2
407 46cee7a3 2019-01-12 stsp 		test_done "$testroot" "1"
408 46cee7a3 2019-01-12 stsp 		return 1
409 46cee7a3 2019-01-12 stsp 	fi
410 46cee7a3 2019-01-12 stsp 
411 46cee7a3 2019-01-12 stsp 	test_done "$testroot" "0"
412 46cee7a3 2019-01-12 stsp }
413 46cee7a3 2019-01-12 stsp 
414 46cee7a3 2019-01-12 stsp function test_update_moves_files_to_new_dir {
415 46cee7a3 2019-01-12 stsp 	local testroot=`test_init update_moves_files_to_new_dir`
416 46cee7a3 2019-01-12 stsp 
417 46cee7a3 2019-01-12 stsp 	mkdir $testroot/repo/epsilon/psi
418 46cee7a3 2019-01-12 stsp 	echo mu > $testroot/repo/epsilon/psi/mu
419 46cee7a3 2019-01-12 stsp 	mkdir $testroot/repo/epsilon/psi/chi
420 46cee7a3 2019-01-12 stsp 	echo tau > $testroot/repo/epsilon/psi/chi/tau
421 46cee7a3 2019-01-12 stsp 	(cd $testroot/repo && git add .)
422 46cee7a3 2019-01-12 stsp 	git_commit $testroot/repo -m "adding a sub-directory beneath epsilon"
423 46cee7a3 2019-01-12 stsp 
424 46cee7a3 2019-01-12 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
425 46cee7a3 2019-01-12 stsp 	if [ "$?" != "0" ]; then
426 46cee7a3 2019-01-12 stsp 		test_done "$testroot" "$?"
427 46cee7a3 2019-01-12 stsp 		return 1
428 46cee7a3 2019-01-12 stsp 	fi
429 46cee7a3 2019-01-12 stsp 
430 46cee7a3 2019-01-12 stsp 	mkdir -p $testroot/repo/epsilon-new/psi
431 46cee7a3 2019-01-12 stsp 	(cd $testroot/repo && git mv epsilon/psi/mu epsilon-new/mu)
432 46cee7a3 2019-01-12 stsp 	(cd $testroot/repo && git mv epsilon/psi/chi/tau epsilon-new/psi/tau)
433 46cee7a3 2019-01-12 stsp 	git_commit $testroot/repo -m "moving files upwards"
434 46cee7a3 2019-01-12 stsp 
435 46cee7a3 2019-01-12 stsp 	echo "A  epsilon-new/mu" > $testroot/stdout.expected
436 46cee7a3 2019-01-12 stsp 	echo "A  epsilon-new/psi/tau" >> $testroot/stdout.expected
437 46cee7a3 2019-01-12 stsp 	echo "D  epsilon/psi/chi/tau" >> $testroot/stdout.expected
438 46cee7a3 2019-01-12 stsp 	echo "D  epsilon/psi/mu" >> $testroot/stdout.expected
439 46cee7a3 2019-01-12 stsp 	echo -n "Updated to commit " >> $testroot/stdout.expected
440 46cee7a3 2019-01-12 stsp 	git_show_head $testroot/repo >> $testroot/stdout.expected
441 46cee7a3 2019-01-12 stsp 	echo >> $testroot/stdout.expected
442 46cee7a3 2019-01-12 stsp 
443 46cee7a3 2019-01-12 stsp 	(cd $testroot/wt && got update > $testroot/stdout)
444 46cee7a3 2019-01-12 stsp 
445 46cee7a3 2019-01-12 stsp 	cmp $testroot/stdout.expected $testroot/stdout
446 46cee7a3 2019-01-12 stsp 	if [ "$?" != "0" ]; then
447 46cee7a3 2019-01-12 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
448 46cee7a3 2019-01-12 stsp 		test_done "$testroot" "$?"
449 46cee7a3 2019-01-12 stsp 		return 1
450 46cee7a3 2019-01-12 stsp 	fi
451 46cee7a3 2019-01-12 stsp 
452 46cee7a3 2019-01-12 stsp 	if [ -e $testroot/wt/epsilon/psi/chi ]; then
453 46cee7a3 2019-01-12 stsp 		echo "removed dir epsilon/psi/chi still exists on disk" >&2
454 46cee7a3 2019-01-12 stsp 		test_done "$testroot" "1"
455 46cee7a3 2019-01-12 stsp 		return 1
456 46cee7a3 2019-01-12 stsp 	fi
457 46cee7a3 2019-01-12 stsp 
458 46cee7a3 2019-01-12 stsp 	if [ -e $testroot/wt/epsilon/psi/mu ]; then
459 46cee7a3 2019-01-12 stsp 		echo "removed file epsilon/psi/mu still exists on disk" >&2
460 46cee7a3 2019-01-12 stsp 		test_done "$testroot" "1"
461 4a1ddfc2 2019-01-12 stsp 		return 1
462 4a1ddfc2 2019-01-12 stsp 	fi
463 4a1ddfc2 2019-01-12 stsp 
464 4a1ddfc2 2019-01-12 stsp 	test_done "$testroot" "0"
465 4a1ddfc2 2019-01-12 stsp }
466 4a1ddfc2 2019-01-12 stsp 
467 4a1ddfc2 2019-01-12 stsp function test_update_creates_missing_parent {
468 1aad446a 2019-01-13 stsp 	local testroot=`test_init update_creates_missing_parent 1`
469 4a1ddfc2 2019-01-12 stsp 
470 4a1ddfc2 2019-01-12 stsp 	touch $testroot/repo/Makefile
471 4a1ddfc2 2019-01-12 stsp 	touch $testroot/repo/snake.6
472 4a1ddfc2 2019-01-12 stsp 	touch $testroot/repo/snake.c
473 4a1ddfc2 2019-01-12 stsp 	(cd $testroot/repo && git add .)
474 4a1ddfc2 2019-01-12 stsp 	git_commit $testroot/repo -m "adding initial snake tree"
475 4a1ddfc2 2019-01-12 stsp 
476 4a1ddfc2 2019-01-12 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
477 4a1ddfc2 2019-01-12 stsp 	if [ "$?" != "0" ]; then
478 4a1ddfc2 2019-01-12 stsp 		test_done "$testroot" "$?"
479 4a1ddfc2 2019-01-12 stsp 		return 1
480 4a1ddfc2 2019-01-12 stsp 	fi
481 4a1ddfc2 2019-01-12 stsp 
482 4a1ddfc2 2019-01-12 stsp 	mkdir -p $testroot/repo/snake
483 4a1ddfc2 2019-01-12 stsp 	(cd $testroot/repo && git mv Makefile snake.6 snake.c snake)
484 4a1ddfc2 2019-01-12 stsp 	touch $testroot/repo/snake/move.c
485 4a1ddfc2 2019-01-12 stsp 	touch $testroot/repo/snake/pathnames.h
486 4a1ddfc2 2019-01-12 stsp 	touch $testroot/repo/snake/snake.h
487 4a1ddfc2 2019-01-12 stsp 	mkdir -p $testroot/repo/snscore
488 4a1ddfc2 2019-01-12 stsp 	touch $testroot/repo/snscore/Makefile
489 4a1ddfc2 2019-01-12 stsp 	touch $testroot/repo/snscore/snscore.c
490 4a1ddfc2 2019-01-12 stsp 	(cd $testroot/repo && git add .)
491 4a1ddfc2 2019-01-12 stsp 	git_commit $testroot/repo -m "restructuring snake tree"
492 4a1ddfc2 2019-01-12 stsp 
493 4a1ddfc2 2019-01-12 stsp 	echo "D  Makefile" > $testroot/stdout.expected
494 bd4792ec 2019-01-13 stsp 	echo "D  snake.6" >> $testroot/stdout.expected
495 bd4792ec 2019-01-13 stsp 	echo "D  snake.c" >> $testroot/stdout.expected
496 4a1ddfc2 2019-01-12 stsp 	echo "A  snake/Makefile" >> $testroot/stdout.expected
497 4a1ddfc2 2019-01-12 stsp 	echo "A  snake/move.c" >> $testroot/stdout.expected
498 4a1ddfc2 2019-01-12 stsp 	echo "A  snake/pathnames.h" >> $testroot/stdout.expected
499 4a1ddfc2 2019-01-12 stsp 	echo "A  snake/snake.6" >> $testroot/stdout.expected
500 4a1ddfc2 2019-01-12 stsp 	echo "A  snake/snake.c" >> $testroot/stdout.expected
501 4a1ddfc2 2019-01-12 stsp 	echo "A  snake/snake.h" >> $testroot/stdout.expected
502 bd4792ec 2019-01-13 stsp 	echo "A  snscore/Makefile" >> $testroot/stdout.expected
503 bd4792ec 2019-01-13 stsp 	echo "A  snscore/snscore.c" >> $testroot/stdout.expected
504 bd4792ec 2019-01-13 stsp 	echo -n "Updated to commit " >> $testroot/stdout.expected
505 bd4792ec 2019-01-13 stsp 	git_show_head $testroot/repo >> $testroot/stdout.expected
506 bd4792ec 2019-01-13 stsp 	echo >> $testroot/stdout.expected
507 bd4792ec 2019-01-13 stsp 
508 bd4792ec 2019-01-13 stsp 	(cd $testroot/wt && got update > $testroot/stdout)
509 bd4792ec 2019-01-13 stsp 
510 bd4792ec 2019-01-13 stsp 	cmp $testroot/stdout.expected $testroot/stdout
511 bd4792ec 2019-01-13 stsp 	if [ "$?" != "0" ]; then
512 bd4792ec 2019-01-13 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
513 bd4792ec 2019-01-13 stsp 		test_done "$testroot" "$?"
514 bd4792ec 2019-01-13 stsp 		return 1
515 bd4792ec 2019-01-13 stsp 	fi
516 bd4792ec 2019-01-13 stsp 
517 bd4792ec 2019-01-13 stsp 	test_done "$testroot" "0"
518 bd4792ec 2019-01-13 stsp }
519 bd4792ec 2019-01-13 stsp 
520 bd4792ec 2019-01-13 stsp function test_update_creates_missing_parent_with_subdir {
521 1aad446a 2019-01-13 stsp 	local testroot=`test_init update_creates_missing_parent_with_subdir 1`
522 bd4792ec 2019-01-13 stsp 
523 bd4792ec 2019-01-13 stsp 	touch $testroot/repo/Makefile
524 bd4792ec 2019-01-13 stsp 	touch $testroot/repo/snake.6
525 bd4792ec 2019-01-13 stsp 	touch $testroot/repo/snake.c
526 bd4792ec 2019-01-13 stsp 	(cd $testroot/repo && git add .)
527 bd4792ec 2019-01-13 stsp 	git_commit $testroot/repo -m "adding initial snake tree"
528 bd4792ec 2019-01-13 stsp 
529 bd4792ec 2019-01-13 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
530 bd4792ec 2019-01-13 stsp 	if [ "$?" != "0" ]; then
531 bd4792ec 2019-01-13 stsp 		test_done "$testroot" "$?"
532 bd4792ec 2019-01-13 stsp 		return 1
533 bd4792ec 2019-01-13 stsp 	fi
534 bd4792ec 2019-01-13 stsp 
535 bd4792ec 2019-01-13 stsp 	mkdir -p $testroot/repo/sss/snake
536 bd4792ec 2019-01-13 stsp 	(cd $testroot/repo && git mv Makefile snake.6 snake.c sss/snake)
537 bd4792ec 2019-01-13 stsp 	touch $testroot/repo/sss/snake/move.c
538 bd4792ec 2019-01-13 stsp 	touch $testroot/repo/sss/snake/pathnames.h
539 bd4792ec 2019-01-13 stsp 	touch $testroot/repo/sss/snake/snake.h
540 bd4792ec 2019-01-13 stsp 	mkdir -p $testroot/repo/snscore
541 bd4792ec 2019-01-13 stsp 	touch $testroot/repo/snscore/Makefile
542 bd4792ec 2019-01-13 stsp 	touch $testroot/repo/snscore/snscore.c
543 bd4792ec 2019-01-13 stsp 	(cd $testroot/repo && git add .)
544 bd4792ec 2019-01-13 stsp 	git_commit $testroot/repo -m "restructuring snake tree"
545 bd4792ec 2019-01-13 stsp 
546 bd4792ec 2019-01-13 stsp 	echo "D  Makefile" > $testroot/stdout.expected
547 4a1ddfc2 2019-01-12 stsp 	echo "D  snake.6" >> $testroot/stdout.expected
548 4a1ddfc2 2019-01-12 stsp 	echo "D  snake.c" >> $testroot/stdout.expected
549 4a1ddfc2 2019-01-12 stsp 	echo "A  snscore/Makefile" >> $testroot/stdout.expected
550 4a1ddfc2 2019-01-12 stsp 	echo "A  snscore/snscore.c" >> $testroot/stdout.expected
551 bd4792ec 2019-01-13 stsp 	echo "A  sss/snake/Makefile" >> $testroot/stdout.expected
552 bd4792ec 2019-01-13 stsp 	echo "A  sss/snake/move.c" >> $testroot/stdout.expected
553 bd4792ec 2019-01-13 stsp 	echo "A  sss/snake/pathnames.h" >> $testroot/stdout.expected
554 bd4792ec 2019-01-13 stsp 	echo "A  sss/snake/snake.6" >> $testroot/stdout.expected
555 bd4792ec 2019-01-13 stsp 	echo "A  sss/snake/snake.c" >> $testroot/stdout.expected
556 bd4792ec 2019-01-13 stsp 	echo "A  sss/snake/snake.h" >> $testroot/stdout.expected
557 4a1ddfc2 2019-01-12 stsp 	echo -n "Updated to commit " >> $testroot/stdout.expected
558 4a1ddfc2 2019-01-12 stsp 	git_show_head $testroot/repo >> $testroot/stdout.expected
559 4a1ddfc2 2019-01-12 stsp 	echo >> $testroot/stdout.expected
560 4a1ddfc2 2019-01-12 stsp 
561 4a1ddfc2 2019-01-12 stsp 	(cd $testroot/wt && got update > $testroot/stdout)
562 4a1ddfc2 2019-01-12 stsp 
563 4a1ddfc2 2019-01-12 stsp 	cmp $testroot/stdout.expected $testroot/stdout
564 4a1ddfc2 2019-01-12 stsp 	if [ "$?" != "0" ]; then
565 4a1ddfc2 2019-01-12 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
566 4a1ddfc2 2019-01-12 stsp 		test_done "$testroot" "$?"
567 46cee7a3 2019-01-12 stsp 		return 1
568 46cee7a3 2019-01-12 stsp 	fi
569 46cee7a3 2019-01-12 stsp 
570 46cee7a3 2019-01-12 stsp 	test_done "$testroot" "0"
571 46cee7a3 2019-01-12 stsp }
572 21908da4 2019-01-13 stsp 
573 21908da4 2019-01-13 stsp function test_update_file_in_subsubdir {
574 1aad446a 2019-01-13 stsp 	local testroot=`test_init update_fle_in_subsubdir 1`
575 46cee7a3 2019-01-12 stsp 
576 21908da4 2019-01-13 stsp 	touch $testroot/repo/Makefile
577 21908da4 2019-01-13 stsp 	mkdir -p $testroot/repo/altq
578 21908da4 2019-01-13 stsp 	touch $testroot/repo/altq/if_altq.h
579 21908da4 2019-01-13 stsp 	mkdir -p $testroot/repo/arch/alpha
580 21908da4 2019-01-13 stsp 	touch $testroot/repo/arch/alpha/Makefile
581 21908da4 2019-01-13 stsp 	(cd $testroot/repo && git add .)
582 21908da4 2019-01-13 stsp 	git_commit $testroot/repo -m "adding initial tree"
583 21908da4 2019-01-13 stsp 
584 21908da4 2019-01-13 stsp 	got checkout $testroot/repo $testroot/wt > /dev/null
585 21908da4 2019-01-13 stsp 	if [ "$?" != "0" ]; then
586 21908da4 2019-01-13 stsp 		test_done "$testroot" "$?"
587 21908da4 2019-01-13 stsp 		return 1
588 21908da4 2019-01-13 stsp 	fi
589 21908da4 2019-01-13 stsp 
590 21908da4 2019-01-13 stsp 	echo change > $testroot/repo/arch/alpha/Makefile
591 21908da4 2019-01-13 stsp 	(cd $testroot/repo && git add .)
592 21908da4 2019-01-13 stsp 	git_commit $testroot/repo -m "changed a file"
593 21908da4 2019-01-13 stsp 
594 21908da4 2019-01-13 stsp 	echo "U  arch/alpha/Makefile" > $testroot/stdout.expected
595 21908da4 2019-01-13 stsp 	echo -n "Updated to commit " >> $testroot/stdout.expected
596 21908da4 2019-01-13 stsp 	git_show_head $testroot/repo >> $testroot/stdout.expected
597 21908da4 2019-01-13 stsp 	echo >> $testroot/stdout.expected
598 21908da4 2019-01-13 stsp 
599 21908da4 2019-01-13 stsp 	(cd $testroot/wt && got update > $testroot/stdout)
600 21908da4 2019-01-13 stsp 
601 21908da4 2019-01-13 stsp 	cmp $testroot/stdout.expected $testroot/stdout
602 21908da4 2019-01-13 stsp 	if [ "$?" != "0" ]; then
603 21908da4 2019-01-13 stsp 		diff -u $testroot/stdout.expected $testroot/stdout
604 21908da4 2019-01-13 stsp 		test_done "$testroot" "$?"
605 21908da4 2019-01-13 stsp 		return 1
606 21908da4 2019-01-13 stsp 	fi
607 21908da4 2019-01-13 stsp 
608 21908da4 2019-01-13 stsp 	test_done "$testroot" "0"
609 21908da4 2019-01-13 stsp }
610 21908da4 2019-01-13 stsp 
611 c84d8c75 2019-01-02 stsp run_test test_update_basic
612 3b4d3732 2019-01-02 stsp run_test test_update_adds_file
613 512f0d0e 2019-01-02 stsp run_test test_update_deletes_file
614 f5c49f82 2019-01-06 stsp run_test test_update_deletes_dir
615 5cc266ba 2019-01-06 stsp run_test test_update_deletes_dir_with_path_prefix
616 90285c3b 2019-01-08 stsp run_test test_update_deletes_dir_recursively
617 4482e97b 2019-01-08 stsp run_test test_update_sibling_dirs_with_common_prefix
618 50952927 2019-01-12 stsp run_test test_update_dir_with_dot_sibling
619 46cee7a3 2019-01-12 stsp run_test test_update_moves_files_upwards
620 bd4792ec 2019-01-13 stsp run_test test_update_moves_files_to_new_dir
621 4a1ddfc2 2019-01-12 stsp run_test test_update_creates_missing_parent
622 bd4792ec 2019-01-13 stsp run_test test_update_creates_missing_parent_with_subdir
623 21908da4 2019-01-13 stsp run_test test_update_file_in_subsubdir