3 c84d8c75 2019-01-02 stsp # Copyright (c) 2019 Stefan Sperling <stsp@openbsd.org>
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.
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.
17 c84d8c75 2019-01-02 stsp . ./common.sh
19 f6cae3ed 2020-09-13 naddy test_update_basic() {
20 0fbd721f 2019-01-02 stsp local testroot=`test_init update_basic`
22 3c90ba67 2019-01-02 stsp got checkout $testroot/repo $testroot/wt > /dev/null
24 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
25 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
29 c84d8c75 2019-01-02 stsp echo "modified alpha" > $testroot/repo/alpha
30 c84d8c75 2019-01-02 stsp git_commit $testroot/repo -m "modified alpha"
32 c84d8c75 2019-01-02 stsp echo "U alpha" > $testroot/stdout.expected
33 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
34 9c4b8182 2019-01-02 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
35 9c4b8182 2019-01-02 stsp echo >> $testroot/stdout.expected
37 c84d8c75 2019-01-02 stsp (cd $testroot/wt && got update > $testroot/stdout)
39 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
41 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
42 c84d8c75 2019-01-02 stsp diff -u $testroot/stdout.expected $testroot/stdout
43 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
47 c84d8c75 2019-01-02 stsp echo "modified alpha" > $testroot/content.expected
48 52a3df9b 2019-01-06 stsp cat $testroot/wt/alpha > $testroot/content
50 8d301dd9 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
52 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
53 c84d8c75 2019-01-02 stsp diff -u $testroot/content.expected $testroot/content
55 693719bc 2019-01-03 stsp test_done "$testroot" "$ret"
58 f6cae3ed 2020-09-13 naddy test_update_adds_file() {
59 3b4d3732 2019-01-02 stsp local testroot=`test_init update_adds_file`
61 3b4d3732 2019-01-02 stsp got checkout $testroot/repo $testroot/wt > /dev/null
63 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
64 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
68 3b4d3732 2019-01-02 stsp echo "new" > $testroot/repo/gamma/new
69 3b4d3732 2019-01-02 stsp (cd $testroot/repo && git add .)
70 3b4d3732 2019-01-02 stsp git_commit $testroot/repo -m "adding a new file"
72 3b4d3732 2019-01-02 stsp echo "A gamma/new" > $testroot/stdout.expected
73 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
74 3b4d3732 2019-01-02 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
75 3b4d3732 2019-01-02 stsp echo >> $testroot/stdout.expected
77 3b4d3732 2019-01-02 stsp (cd $testroot/wt && got update > $testroot/stdout)
79 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
81 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
82 3b4d3732 2019-01-02 stsp diff -u $testroot/stdout.expected $testroot/stdout
83 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
87 3b4d3732 2019-01-02 stsp echo "new" >> $testroot/content.expected
88 52a3df9b 2019-01-06 stsp cat $testroot/wt/gamma/new > $testroot/content
90 8d301dd9 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
92 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
93 3b4d3732 2019-01-02 stsp diff -u $testroot/content.expected $testroot/content
95 693719bc 2019-01-03 stsp test_done "$testroot" "$ret"
98 f6cae3ed 2020-09-13 naddy test_update_deletes_file() {
99 512f0d0e 2019-01-02 stsp local testroot=`test_init update_deletes_file`
101 1c4cdd89 2021-06-20 stsp mkdir $testroot/wtparent
102 1c4cdd89 2021-06-20 stsp got checkout $testroot/repo $testroot/wtparent/wt > /dev/null
104 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
105 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
109 97631c52 2023-02-24 thomas git_rm $testroot/repo beta
110 512f0d0e 2019-01-02 stsp git_commit $testroot/repo -m "deleting a file"
112 512f0d0e 2019-01-02 stsp echo "D beta" > $testroot/stdout.expected
113 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
114 512f0d0e 2019-01-02 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
115 512f0d0e 2019-01-02 stsp echo >> $testroot/stdout.expected
117 1c4cdd89 2021-06-20 stsp # verify that no error occurs if the work tree's parent
118 1c4cdd89 2021-06-20 stsp # directory is not writable
119 1c4cdd89 2021-06-20 stsp chmod u-w $testroot/wtparent
120 1c4cdd89 2021-06-20 stsp (cd $testroot/wtparent/wt && got update > $testroot/stdout)
121 1c4cdd89 2021-06-20 stsp chmod u+w $testroot/wtparent
123 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
125 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
126 512f0d0e 2019-01-02 stsp diff -u $testroot/stdout.expected $testroot/stdout
127 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
131 1c4cdd89 2021-06-20 stsp if [ -e $testroot/wtparent/wt/beta ]; then
132 512f0d0e 2019-01-02 stsp echo "removed file beta still exists on disk" >&2
133 52a3df9b 2019-01-06 stsp test_done "$testroot" "1"
137 52a3df9b 2019-01-06 stsp test_done "$testroot" "0"
140 f6cae3ed 2020-09-13 naddy test_update_deletes_dir() {
141 f5c49f82 2019-01-06 stsp local testroot=`test_init update_deletes_dir`
143 f5c49f82 2019-01-06 stsp got checkout $testroot/repo $testroot/wt > /dev/null
145 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
146 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
150 97631c52 2023-02-24 thomas git_rm $testroot/repo -r epsilon
151 f5c49f82 2019-01-06 stsp git_commit $testroot/repo -m "deleting a directory"
153 f5c49f82 2019-01-06 stsp echo "D epsilon/zeta" > $testroot/stdout.expected
154 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
155 f5c49f82 2019-01-06 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
156 f5c49f82 2019-01-06 stsp echo >> $testroot/stdout.expected
158 f5c49f82 2019-01-06 stsp (cd $testroot/wt && got update > $testroot/stdout)
160 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
162 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
163 f5c49f82 2019-01-06 stsp diff -u $testroot/stdout.expected $testroot/stdout
164 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
168 f5c49f82 2019-01-06 stsp if [ -e $testroot/wt/epsilon ]; then
169 f5c49f82 2019-01-06 stsp echo "removed dir epsilon still exists on disk" >&2
170 52a3df9b 2019-01-06 stsp test_done "$testroot" "1"
174 52a3df9b 2019-01-06 stsp test_done "$testroot" "0"
177 f6cae3ed 2020-09-13 naddy test_update_deletes_dir_with_path_prefix() {
178 5cc266ba 2019-01-06 stsp local testroot=`test_init update_deletes_dir_with_path_prefix`
179 5cc266ba 2019-01-06 stsp local first_rev=`git_show_head $testroot/repo`
181 5cc266ba 2019-01-06 stsp mkdir $testroot/repo/epsilon/psi
182 5cc266ba 2019-01-06 stsp echo mu > $testroot/repo/epsilon/psi/mu
183 5cc266ba 2019-01-06 stsp (cd $testroot/repo && git add .)
184 5cc266ba 2019-01-06 stsp git_commit $testroot/repo -m "adding a sub-directory beneath epsilon"
186 5cc266ba 2019-01-06 stsp # check out the epsilon/ sub-tree
187 5cc266ba 2019-01-06 stsp got checkout -p epsilon $testroot/repo $testroot/wt > /dev/null
189 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
190 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
194 5cc266ba 2019-01-06 stsp # update back to first commit and expect psi/mu to be deleted
195 5cc266ba 2019-01-06 stsp echo "D psi/mu" > $testroot/stdout.expected
196 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $first_rev" \
197 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
199 5cc266ba 2019-01-06 stsp (cd $testroot/wt && got update -c $first_rev > $testroot/stdout)
201 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
203 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
204 5cc266ba 2019-01-06 stsp diff -u $testroot/stdout.expected $testroot/stdout
205 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
209 5cc266ba 2019-01-06 stsp if [ -e $testroot/wt/psi ]; then
210 5cc266ba 2019-01-06 stsp echo "removed dir psi still exists on disk" >&2
211 5cc266ba 2019-01-06 stsp test_done "$testroot" "1"
215 52a3df9b 2019-01-06 stsp test_done "$testroot" "0"
218 f6cae3ed 2020-09-13 naddy test_update_deletes_dir_recursively() {
219 90285c3b 2019-01-08 stsp local testroot=`test_init update_deletes_dir_recursively`
220 90285c3b 2019-01-08 stsp local first_rev=`git_show_head $testroot/repo`
222 90285c3b 2019-01-08 stsp mkdir $testroot/repo/epsilon/psi
223 90285c3b 2019-01-08 stsp echo mu > $testroot/repo/epsilon/psi/mu
224 90285c3b 2019-01-08 stsp mkdir $testroot/repo/epsilon/psi/chi
225 90285c3b 2019-01-08 stsp echo tau > $testroot/repo/epsilon/psi/chi/tau
226 90285c3b 2019-01-08 stsp (cd $testroot/repo && git add .)
227 90285c3b 2019-01-08 stsp git_commit $testroot/repo -m "adding a sub-directory beneath epsilon"
229 90285c3b 2019-01-08 stsp # check out the epsilon/ sub-tree
230 90285c3b 2019-01-08 stsp got checkout -p epsilon $testroot/repo $testroot/wt > /dev/null
232 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
233 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
237 90285c3b 2019-01-08 stsp # update back to first commit and expect psi/mu to be deleted
238 90285c3b 2019-01-08 stsp echo "D psi/chi/tau" > $testroot/stdout.expected
239 90285c3b 2019-01-08 stsp echo "D psi/mu" >> $testroot/stdout.expected
240 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $first_rev" \
241 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
243 90285c3b 2019-01-08 stsp (cd $testroot/wt && got update -c $first_rev > $testroot/stdout)
245 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
247 90285c3b 2019-01-08 stsp if [ "$?" != "0" ]; then
248 90285c3b 2019-01-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
249 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
253 90285c3b 2019-01-08 stsp if [ -e $testroot/wt/psi ]; then
254 90285c3b 2019-01-08 stsp echo "removed dir psi still exists on disk" >&2
255 90285c3b 2019-01-08 stsp test_done "$testroot" "1"
259 90285c3b 2019-01-08 stsp test_done "$testroot" "0"
262 f6cae3ed 2020-09-13 naddy test_update_sibling_dirs_with_common_prefix() {
263 4482e97b 2019-01-08 stsp local testroot=`test_init update_sibling_dirs_with_common_prefix`
265 81a30460 2019-01-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
267 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
268 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
272 81a30460 2019-01-08 stsp mkdir $testroot/repo/epsilon2
273 81a30460 2019-01-08 stsp echo mu > $testroot/repo/epsilon2/mu
274 81a30460 2019-01-08 stsp (cd $testroot/repo && git add epsilon2/mu)
275 81a30460 2019-01-08 stsp git_commit $testroot/repo -m "adding sibling of epsilon"
276 81a30460 2019-01-08 stsp echo change > $testroot/repo/epsilon/zeta
277 81a30460 2019-01-08 stsp git_commit $testroot/repo -m "changing epsilon/zeta"
279 81a30460 2019-01-08 stsp echo "U epsilon/zeta" > $testroot/stdout.expected
280 81a30460 2019-01-08 stsp echo "A epsilon2/mu" >> $testroot/stdout.expected
281 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
282 81a30460 2019-01-08 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
283 81a30460 2019-01-08 stsp echo >> $testroot/stdout.expected
285 81a30460 2019-01-08 stsp (cd $testroot/wt && got update > $testroot/stdout)
287 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
289 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
290 81a30460 2019-01-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
291 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
295 81a30460 2019-01-08 stsp echo "another change" > $testroot/repo/epsilon/zeta
296 81a30460 2019-01-08 stsp git_commit $testroot/repo -m "changing epsilon/zeta again"
298 81a30460 2019-01-08 stsp echo "U epsilon/zeta" > $testroot/stdout.expected
299 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
300 81a30460 2019-01-08 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
301 81a30460 2019-01-08 stsp echo >> $testroot/stdout.expected
303 81a30460 2019-01-08 stsp # Bug: This update used to do delete/add epsilon2/mu again:
304 81a30460 2019-01-08 stsp # U epsilon/zeta
305 81a30460 2019-01-08 stsp # D epsilon2/mu <--- not intended
306 81a30460 2019-01-08 stsp # A epsilon2/mu <--- not intended
307 50952927 2019-01-12 stsp (cd $testroot/wt && got update > $testroot/stdout)
309 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
311 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
312 50952927 2019-01-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
313 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
317 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
319 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
320 50952927 2019-01-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
322 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
325 f6cae3ed 2020-09-13 naddy test_update_dir_with_dot_sibling() {
326 50952927 2019-01-12 stsp local testroot=`test_init update_dir_with_dot_sibling`
328 50952927 2019-01-12 stsp got checkout $testroot/repo $testroot/wt > /dev/null
330 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
331 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
335 50952927 2019-01-12 stsp echo text > $testroot/repo/epsilon.txt
336 50952927 2019-01-12 stsp (cd $testroot/repo && git add epsilon.txt)
337 50952927 2019-01-12 stsp git_commit $testroot/repo -m "adding sibling of epsilon"
338 50952927 2019-01-12 stsp echo change > $testroot/repo/epsilon/zeta
339 50952927 2019-01-12 stsp git_commit $testroot/repo -m "changing epsilon/zeta"
341 f5d3d7af 2019-02-05 stsp echo "U epsilon/zeta" > $testroot/stdout.expected
342 f5d3d7af 2019-02-05 stsp echo "A epsilon.txt" >> $testroot/stdout.expected
343 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
344 50952927 2019-01-12 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
345 50952927 2019-01-12 stsp echo >> $testroot/stdout.expected
347 81a30460 2019-01-08 stsp (cd $testroot/wt && got update > $testroot/stdout)
349 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
351 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
352 81a30460 2019-01-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
353 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
357 50952927 2019-01-12 stsp echo "another change" > $testroot/repo/epsilon/zeta
358 50952927 2019-01-12 stsp git_commit $testroot/repo -m "changing epsilon/zeta again"
360 50952927 2019-01-12 stsp echo "U epsilon/zeta" > $testroot/stdout.expected
361 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
362 50952927 2019-01-12 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
363 50952927 2019-01-12 stsp echo >> $testroot/stdout.expected
365 50952927 2019-01-12 stsp (cd $testroot/wt && got update > $testroot/stdout)
367 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
369 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
370 81a30460 2019-01-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
371 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
375 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
377 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
378 50952927 2019-01-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
380 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
383 f6cae3ed 2020-09-13 naddy test_update_moves_files_upwards() {
384 46cee7a3 2019-01-12 stsp local testroot=`test_init update_moves_files_upwards`
386 46cee7a3 2019-01-12 stsp mkdir $testroot/repo/epsilon/psi
387 46cee7a3 2019-01-12 stsp echo mu > $testroot/repo/epsilon/psi/mu
388 46cee7a3 2019-01-12 stsp mkdir $testroot/repo/epsilon/psi/chi
389 46cee7a3 2019-01-12 stsp echo tau > $testroot/repo/epsilon/psi/chi/tau
390 46cee7a3 2019-01-12 stsp (cd $testroot/repo && git add .)
391 46cee7a3 2019-01-12 stsp git_commit $testroot/repo -m "adding a sub-directory beneath epsilon"
393 46cee7a3 2019-01-12 stsp got checkout $testroot/repo $testroot/wt > /dev/null
395 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
396 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
400 46cee7a3 2019-01-12 stsp (cd $testroot/repo && git mv epsilon/psi/mu epsilon/mu)
401 46cee7a3 2019-01-12 stsp (cd $testroot/repo && git mv epsilon/psi/chi/tau epsilon/psi/tau)
402 46cee7a3 2019-01-12 stsp git_commit $testroot/repo -m "moving files upwards"
404 21908da4 2019-01-13 stsp echo "A epsilon/mu" > $testroot/stdout.expected
405 21908da4 2019-01-13 stsp echo "D epsilon/psi/chi/tau" >> $testroot/stdout.expected
406 46cee7a3 2019-01-12 stsp echo "D epsilon/psi/mu" >> $testroot/stdout.expected
407 bd4792ec 2019-01-13 stsp echo "A epsilon/psi/tau" >> $testroot/stdout.expected
408 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
409 46cee7a3 2019-01-12 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
410 46cee7a3 2019-01-12 stsp echo >> $testroot/stdout.expected
412 46cee7a3 2019-01-12 stsp (cd $testroot/wt && got update > $testroot/stdout)
414 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
416 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
417 46cee7a3 2019-01-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
418 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
422 46cee7a3 2019-01-12 stsp if [ -e $testroot/wt/epsilon/psi/chi ]; then
423 46cee7a3 2019-01-12 stsp echo "removed dir epsilon/psi/chi still exists on disk" >&2
424 46cee7a3 2019-01-12 stsp test_done "$testroot" "1"
428 46cee7a3 2019-01-12 stsp if [ -e $testroot/wt/epsilon/psi/mu ]; then
429 46cee7a3 2019-01-12 stsp echo "removed file epsilon/psi/mu still exists on disk" >&2
430 46cee7a3 2019-01-12 stsp test_done "$testroot" "1"
434 46cee7a3 2019-01-12 stsp test_done "$testroot" "0"
437 f6cae3ed 2020-09-13 naddy test_update_moves_files_to_new_dir() {
438 46cee7a3 2019-01-12 stsp local testroot=`test_init update_moves_files_to_new_dir`
440 46cee7a3 2019-01-12 stsp mkdir $testroot/repo/epsilon/psi
441 46cee7a3 2019-01-12 stsp echo mu > $testroot/repo/epsilon/psi/mu
442 46cee7a3 2019-01-12 stsp mkdir $testroot/repo/epsilon/psi/chi
443 46cee7a3 2019-01-12 stsp echo tau > $testroot/repo/epsilon/psi/chi/tau
444 46cee7a3 2019-01-12 stsp (cd $testroot/repo && git add .)
445 46cee7a3 2019-01-12 stsp git_commit $testroot/repo -m "adding a sub-directory beneath epsilon"
447 46cee7a3 2019-01-12 stsp got checkout $testroot/repo $testroot/wt > /dev/null
449 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
450 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
454 46cee7a3 2019-01-12 stsp mkdir -p $testroot/repo/epsilon-new/psi
455 46cee7a3 2019-01-12 stsp (cd $testroot/repo && git mv epsilon/psi/mu epsilon-new/mu)
456 46cee7a3 2019-01-12 stsp (cd $testroot/repo && git mv epsilon/psi/chi/tau epsilon-new/psi/tau)
457 46cee7a3 2019-01-12 stsp git_commit $testroot/repo -m "moving files upwards"
459 f5d3d7af 2019-02-05 stsp echo "D epsilon/psi/chi/tau" > $testroot/stdout.expected
460 46cee7a3 2019-01-12 stsp echo "D epsilon/psi/mu" >> $testroot/stdout.expected
461 f5d3d7af 2019-02-05 stsp echo "A epsilon-new/mu" >> $testroot/stdout.expected
462 f5d3d7af 2019-02-05 stsp echo "A epsilon-new/psi/tau" >> $testroot/stdout.expected
463 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
464 46cee7a3 2019-01-12 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
465 46cee7a3 2019-01-12 stsp echo >> $testroot/stdout.expected
467 46cee7a3 2019-01-12 stsp (cd $testroot/wt && got update > $testroot/stdout)
469 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
471 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
472 46cee7a3 2019-01-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
473 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
477 46cee7a3 2019-01-12 stsp if [ -e $testroot/wt/epsilon/psi/chi ]; then
478 46cee7a3 2019-01-12 stsp echo "removed dir epsilon/psi/chi still exists on disk" >&2
479 46cee7a3 2019-01-12 stsp test_done "$testroot" "1"
483 46cee7a3 2019-01-12 stsp if [ -e $testroot/wt/epsilon/psi/mu ]; then
484 46cee7a3 2019-01-12 stsp echo "removed file epsilon/psi/mu still exists on disk" >&2
485 46cee7a3 2019-01-12 stsp test_done "$testroot" "1"
489 4a1ddfc2 2019-01-12 stsp test_done "$testroot" "0"
492 f6cae3ed 2020-09-13 naddy test_update_creates_missing_parent() {
493 1aad446a 2019-01-13 stsp local testroot=`test_init update_creates_missing_parent 1`
495 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/Makefile
496 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snake.6
497 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snake.c
498 4a1ddfc2 2019-01-12 stsp (cd $testroot/repo && git add .)
499 4a1ddfc2 2019-01-12 stsp git_commit $testroot/repo -m "adding initial snake tree"
501 4a1ddfc2 2019-01-12 stsp got checkout $testroot/repo $testroot/wt > /dev/null
503 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
504 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
508 4a1ddfc2 2019-01-12 stsp mkdir -p $testroot/repo/snake
509 4a1ddfc2 2019-01-12 stsp (cd $testroot/repo && git mv Makefile snake.6 snake.c snake)
510 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snake/move.c
511 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snake/pathnames.h
512 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snake/snake.h
513 4a1ddfc2 2019-01-12 stsp mkdir -p $testroot/repo/snscore
514 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snscore/Makefile
515 4a1ddfc2 2019-01-12 stsp touch $testroot/repo/snscore/snscore.c
516 4a1ddfc2 2019-01-12 stsp (cd $testroot/repo && git add .)
517 4a1ddfc2 2019-01-12 stsp git_commit $testroot/repo -m "restructuring snake tree"
519 4a1ddfc2 2019-01-12 stsp echo "D Makefile" > $testroot/stdout.expected
520 4a1ddfc2 2019-01-12 stsp echo "A snake/Makefile" >> $testroot/stdout.expected
521 4a1ddfc2 2019-01-12 stsp echo "A snake/move.c" >> $testroot/stdout.expected
522 4a1ddfc2 2019-01-12 stsp echo "A snake/pathnames.h" >> $testroot/stdout.expected
523 4a1ddfc2 2019-01-12 stsp echo "A snake/snake.6" >> $testroot/stdout.expected
524 4a1ddfc2 2019-01-12 stsp echo "A snake/snake.c" >> $testroot/stdout.expected
525 4a1ddfc2 2019-01-12 stsp echo "A snake/snake.h" >> $testroot/stdout.expected
526 18831e78 2019-02-10 stsp echo "D snake.6" >> $testroot/stdout.expected
527 18831e78 2019-02-10 stsp echo "D snake.c" >> $testroot/stdout.expected
528 bd4792ec 2019-01-13 stsp echo "A snscore/Makefile" >> $testroot/stdout.expected
529 bd4792ec 2019-01-13 stsp echo "A snscore/snscore.c" >> $testroot/stdout.expected
530 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
531 bd4792ec 2019-01-13 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
532 bd4792ec 2019-01-13 stsp echo >> $testroot/stdout.expected
534 bd4792ec 2019-01-13 stsp (cd $testroot/wt && got update > $testroot/stdout)
536 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
538 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
539 e60e7f5b 2019-02-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
541 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
544 f6cae3ed 2020-09-13 naddy test_update_creates_missing_parent_with_subdir() {
545 1aad446a 2019-01-13 stsp local testroot=`test_init update_creates_missing_parent_with_subdir 1`
547 bd4792ec 2019-01-13 stsp touch $testroot/repo/Makefile
548 bd4792ec 2019-01-13 stsp touch $testroot/repo/snake.6
549 bd4792ec 2019-01-13 stsp touch $testroot/repo/snake.c
550 bd4792ec 2019-01-13 stsp (cd $testroot/repo && git add .)
551 bd4792ec 2019-01-13 stsp git_commit $testroot/repo -m "adding initial snake tree"
553 bd4792ec 2019-01-13 stsp got checkout $testroot/repo $testroot/wt > /dev/null
555 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
556 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
560 bd4792ec 2019-01-13 stsp mkdir -p $testroot/repo/sss/snake
561 bd4792ec 2019-01-13 stsp (cd $testroot/repo && git mv Makefile snake.6 snake.c sss/snake)
562 bd4792ec 2019-01-13 stsp touch $testroot/repo/sss/snake/move.c
563 bd4792ec 2019-01-13 stsp touch $testroot/repo/sss/snake/pathnames.h
564 bd4792ec 2019-01-13 stsp touch $testroot/repo/sss/snake/snake.h
565 bd4792ec 2019-01-13 stsp mkdir -p $testroot/repo/snscore
566 bd4792ec 2019-01-13 stsp touch $testroot/repo/snscore/Makefile
567 bd4792ec 2019-01-13 stsp touch $testroot/repo/snscore/snscore.c
568 bd4792ec 2019-01-13 stsp (cd $testroot/repo && git add .)
569 bd4792ec 2019-01-13 stsp git_commit $testroot/repo -m "restructuring snake tree"
571 bd4792ec 2019-01-13 stsp echo "D Makefile" > $testroot/stdout.expected
572 4a1ddfc2 2019-01-12 stsp echo "D snake.6" >> $testroot/stdout.expected
573 4a1ddfc2 2019-01-12 stsp echo "D snake.c" >> $testroot/stdout.expected
574 4a1ddfc2 2019-01-12 stsp echo "A snscore/Makefile" >> $testroot/stdout.expected
575 4a1ddfc2 2019-01-12 stsp echo "A snscore/snscore.c" >> $testroot/stdout.expected
576 bd4792ec 2019-01-13 stsp echo "A sss/snake/Makefile" >> $testroot/stdout.expected
577 bd4792ec 2019-01-13 stsp echo "A sss/snake/move.c" >> $testroot/stdout.expected
578 bd4792ec 2019-01-13 stsp echo "A sss/snake/pathnames.h" >> $testroot/stdout.expected
579 bd4792ec 2019-01-13 stsp echo "A sss/snake/snake.6" >> $testroot/stdout.expected
580 bd4792ec 2019-01-13 stsp echo "A sss/snake/snake.c" >> $testroot/stdout.expected
581 bd4792ec 2019-01-13 stsp echo "A sss/snake/snake.h" >> $testroot/stdout.expected
582 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
583 4a1ddfc2 2019-01-12 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
584 4a1ddfc2 2019-01-12 stsp echo >> $testroot/stdout.expected
586 4a1ddfc2 2019-01-12 stsp (cd $testroot/wt && got update > $testroot/stdout)
588 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
590 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
591 4a1ddfc2 2019-01-12 stsp diff -u $testroot/stdout.expected $testroot/stdout
592 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
596 46cee7a3 2019-01-12 stsp test_done "$testroot" "0"
599 f6cae3ed 2020-09-13 naddy test_update_file_in_subsubdir() {
600 1aad446a 2019-01-13 stsp local testroot=`test_init update_fle_in_subsubdir 1`
602 21908da4 2019-01-13 stsp touch $testroot/repo/Makefile
603 21908da4 2019-01-13 stsp mkdir -p $testroot/repo/altq
604 21908da4 2019-01-13 stsp touch $testroot/repo/altq/if_altq.h
605 21908da4 2019-01-13 stsp mkdir -p $testroot/repo/arch/alpha
606 21908da4 2019-01-13 stsp touch $testroot/repo/arch/alpha/Makefile
607 21908da4 2019-01-13 stsp (cd $testroot/repo && git add .)
608 21908da4 2019-01-13 stsp git_commit $testroot/repo -m "adding initial tree"
610 21908da4 2019-01-13 stsp got checkout $testroot/repo $testroot/wt > /dev/null
612 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
613 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
617 21908da4 2019-01-13 stsp echo change > $testroot/repo/arch/alpha/Makefile
618 21908da4 2019-01-13 stsp (cd $testroot/repo && git add .)
619 21908da4 2019-01-13 stsp git_commit $testroot/repo -m "changed a file"
621 21908da4 2019-01-13 stsp echo "U arch/alpha/Makefile" > $testroot/stdout.expected
622 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
623 21908da4 2019-01-13 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
624 21908da4 2019-01-13 stsp echo >> $testroot/stdout.expected
626 21908da4 2019-01-13 stsp (cd $testroot/wt && got update > $testroot/stdout)
628 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
630 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
631 21908da4 2019-01-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
632 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
636 21908da4 2019-01-13 stsp test_done "$testroot" "0"
639 7b074ee1 2023-03-01 thomas test_update_changes_file_to_dir() {
640 7b074ee1 2023-03-01 thomas local testroot=`test_init update_changes_file_to_dir`
642 7b074ee1 2023-03-01 thomas got checkout $testroot/repo $testroot/wt > /dev/null
644 7b074ee1 2023-03-01 thomas if [ $ret -ne 0 ]; then
645 7b074ee1 2023-03-01 thomas test_done "$testroot" "$ret"
649 7b074ee1 2023-03-01 thomas git_rm $testroot/repo alpha
650 7b074ee1 2023-03-01 thomas mkdir $testroot/repo/alpha
651 7b074ee1 2023-03-01 thomas echo eta > $testroot/repo/alpha/eta
652 7b074ee1 2023-03-01 thomas (cd $testroot/repo && git add alpha/eta)
653 7b074ee1 2023-03-01 thomas git_commit $testroot/repo -m "changed alpha into directory"
655 7b074ee1 2023-03-01 thomas (cd $testroot/wt && got update > $testroot/stdout 2> $testroot/stderr)
657 7b074ee1 2023-03-01 thomas if [ $ret -ne 0 ]; then
658 7b074ee1 2023-03-01 thomas ret="xfail change file into directory"
660 7b074ee1 2023-03-01 thomas test_done "$testroot" "$ret"
663 f6cae3ed 2020-09-13 naddy test_update_merges_file_edits() {
664 6353ad76 2019-02-08 stsp local testroot=`test_init update_merges_file_edits`
666 6353ad76 2019-02-08 stsp echo "1" > $testroot/repo/numbers
667 6353ad76 2019-02-08 stsp echo "2" >> $testroot/repo/numbers
668 6353ad76 2019-02-08 stsp echo "3" >> $testroot/repo/numbers
669 6353ad76 2019-02-08 stsp echo "4" >> $testroot/repo/numbers
670 6353ad76 2019-02-08 stsp echo "5" >> $testroot/repo/numbers
671 6353ad76 2019-02-08 stsp echo "6" >> $testroot/repo/numbers
672 6353ad76 2019-02-08 stsp echo "7" >> $testroot/repo/numbers
673 6353ad76 2019-02-08 stsp echo "8" >> $testroot/repo/numbers
674 6353ad76 2019-02-08 stsp (cd $testroot/repo && git add numbers)
675 6353ad76 2019-02-08 stsp git_commit $testroot/repo -m "added numbers file"
676 f69721c3 2019-10-21 stsp local base_commit=`git_show_head $testroot/repo`
678 6353ad76 2019-02-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
680 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
681 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
685 6353ad76 2019-02-08 stsp echo "modified alpha" > $testroot/repo/alpha
686 6353ad76 2019-02-08 stsp echo "modified beta" > $testroot/repo/beta
687 ac3cdf31 2023-03-06 thomas ed -s $testroot/repo/numbers <<-\EOF
691 6353ad76 2019-02-08 stsp git_commit $testroot/repo -m "modified 3 files"
693 6353ad76 2019-02-08 stsp echo "modified alpha, too" > $testroot/wt/alpha
694 6353ad76 2019-02-08 stsp touch $testroot/wt/beta
695 ac3cdf31 2023-03-06 thomas ed -s $testroot/wt/numbers <<-\EOF
700 6353ad76 2019-02-08 stsp echo "C alpha" > $testroot/stdout.expected
701 6353ad76 2019-02-08 stsp echo "U beta" >> $testroot/stdout.expected
702 6353ad76 2019-02-08 stsp echo "G numbers" >> $testroot/stdout.expected
703 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
704 6353ad76 2019-02-08 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
705 6353ad76 2019-02-08 stsp echo >> $testroot/stdout.expected
706 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
708 6353ad76 2019-02-08 stsp (cd $testroot/wt && got update > $testroot/stdout)
710 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
712 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
713 6353ad76 2019-02-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
714 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
718 f69721c3 2019-10-21 stsp echo -n "<<<<<<< merged change: commit " > $testroot/content.expected
719 6353ad76 2019-02-08 stsp git_show_head $testroot/repo >> $testroot/content.expected
720 6353ad76 2019-02-08 stsp echo >> $testroot/content.expected
721 6353ad76 2019-02-08 stsp echo "modified alpha" >> $testroot/content.expected
722 f69721c3 2019-10-21 stsp echo "||||||| 3-way merge base: commit $base_commit" \
723 f69721c3 2019-10-21 stsp >> $testroot/content.expected
724 d136cfcb 2019-10-12 stsp echo "alpha" >> $testroot/content.expected
725 6353ad76 2019-02-08 stsp echo "=======" >> $testroot/content.expected
726 6353ad76 2019-02-08 stsp echo "modified alpha, too" >> $testroot/content.expected
727 f69721c3 2019-10-21 stsp echo '>>>>>>>' >> $testroot/content.expected
728 6353ad76 2019-02-08 stsp echo "modified beta" >> $testroot/content.expected
729 6353ad76 2019-02-08 stsp echo "1" >> $testroot/content.expected
730 6353ad76 2019-02-08 stsp echo "22" >> $testroot/content.expected
731 6353ad76 2019-02-08 stsp echo "3" >> $testroot/content.expected
732 6353ad76 2019-02-08 stsp echo "4" >> $testroot/content.expected
733 6353ad76 2019-02-08 stsp echo "5" >> $testroot/content.expected
734 6353ad76 2019-02-08 stsp echo "6" >> $testroot/content.expected
735 6353ad76 2019-02-08 stsp echo "77" >> $testroot/content.expected
736 6353ad76 2019-02-08 stsp echo "8" >> $testroot/content.expected
738 6353ad76 2019-02-08 stsp cat $testroot/wt/alpha > $testroot/content
739 6353ad76 2019-02-08 stsp cat $testroot/wt/beta >> $testroot/content
740 6353ad76 2019-02-08 stsp cat $testroot/wt/numbers >> $testroot/content
742 8d301dd9 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
744 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
745 6353ad76 2019-02-08 stsp diff -u $testroot/content.expected $testroot/content
747 68ed9ba5 2019-02-10 stsp test_done "$testroot" "$ret"
750 f6cae3ed 2020-09-13 naddy test_update_keeps_xbit() {
751 68ed9ba5 2019-02-10 stsp local testroot=`test_init update_keeps_xbit 1`
753 68ed9ba5 2019-02-10 stsp touch $testroot/repo/xfile
754 68ed9ba5 2019-02-10 stsp chmod +x $testroot/repo/xfile
755 68ed9ba5 2019-02-10 stsp (cd $testroot/repo && git add .)
756 68ed9ba5 2019-02-10 stsp git_commit $testroot/repo -m "adding executable file"
758 68ed9ba5 2019-02-10 stsp got checkout $testroot/repo $testroot/wt > $testroot/stdout
760 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
761 68ed9ba5 2019-02-10 stsp test_done "$testroot" "$ret"
765 68ed9ba5 2019-02-10 stsp echo foo > $testroot/repo/xfile
766 68ed9ba5 2019-02-10 stsp git_commit $testroot/repo -m "changed executable file"
768 68ed9ba5 2019-02-10 stsp echo "U xfile" > $testroot/stdout.expected
769 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
770 68ed9ba5 2019-02-10 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
771 68ed9ba5 2019-02-10 stsp echo >> $testroot/stdout.expected
773 68ed9ba5 2019-02-10 stsp (cd $testroot/wt && got update > $testroot/stdout)
775 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
776 68ed9ba5 2019-02-10 stsp test_done "$testroot" "$ret"
780 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
782 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
783 68ed9ba5 2019-02-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
784 68ed9ba5 2019-02-10 stsp test_done "$testroot" "$ret"
788 68ed9ba5 2019-02-10 stsp ls -l $testroot/wt/xfile | grep -q '^-rwx'
790 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
791 68ed9ba5 2019-02-10 stsp echo "file is not executable" >&2
792 68ed9ba5 2019-02-10 stsp ls -l $testroot/wt/xfile >&2
794 6353ad76 2019-02-08 stsp test_done "$testroot" "$ret"
797 f6cae3ed 2020-09-13 naddy test_update_clears_xbit() {
798 ba8a0d4d 2019-02-10 stsp local testroot=`test_init update_clears_xbit 1`
800 ba8a0d4d 2019-02-10 stsp touch $testroot/repo/xfile
801 ba8a0d4d 2019-02-10 stsp chmod +x $testroot/repo/xfile
802 ba8a0d4d 2019-02-10 stsp (cd $testroot/repo && git add .)
803 ba8a0d4d 2019-02-10 stsp git_commit $testroot/repo -m "adding executable file"
805 ba8a0d4d 2019-02-10 stsp got checkout $testroot/repo $testroot/wt > $testroot/stdout
807 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
808 ba8a0d4d 2019-02-10 stsp test_done "$testroot" "$ret"
812 ba8a0d4d 2019-02-10 stsp ls -l $testroot/wt/xfile | grep -q '^-rwx'
814 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
815 ba8a0d4d 2019-02-10 stsp echo "file is not executable" >&2
816 ba8a0d4d 2019-02-10 stsp ls -l $testroot/wt/xfile >&2
817 ba8a0d4d 2019-02-10 stsp test_done "$testroot" "$ret"
821 ba8a0d4d 2019-02-10 stsp # XXX git seems to require a file edit when flipping the x bit?
822 ba8a0d4d 2019-02-10 stsp echo foo > $testroot/repo/xfile
823 ba8a0d4d 2019-02-10 stsp chmod -x $testroot/repo/xfile
824 ba8a0d4d 2019-02-10 stsp git_commit $testroot/repo -m "not an executable file anymore"
826 ba8a0d4d 2019-02-10 stsp echo "U xfile" > $testroot/stdout.expected
827 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
828 ba8a0d4d 2019-02-10 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
829 ba8a0d4d 2019-02-10 stsp echo >> $testroot/stdout.expected
831 ba8a0d4d 2019-02-10 stsp (cd $testroot/wt && got update > $testroot/stdout)
833 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
834 ba8a0d4d 2019-02-10 stsp test_done "$testroot" "$ret"
838 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
840 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
841 ba8a0d4d 2019-02-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
842 ba8a0d4d 2019-02-10 stsp test_done "$testroot" "$ret"
846 ba8a0d4d 2019-02-10 stsp ls -l $testroot/wt/xfile | grep -q '^-rw-'
848 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
849 ba8a0d4d 2019-02-10 stsp echo "file is unexpectedly executable" >&2
850 ba8a0d4d 2019-02-10 stsp ls -l $testroot/wt/xfile >&2
852 ba8a0d4d 2019-02-10 stsp test_done "$testroot" "$ret"
855 f6cae3ed 2020-09-13 naddy test_update_restores_missing_file() {
856 a378724f 2019-02-10 stsp local testroot=`test_init update_restores_missing_file`
858 a378724f 2019-02-10 stsp got checkout $testroot/repo $testroot/wt > /dev/null
860 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
861 a378724f 2019-02-10 stsp test_done "$testroot" "$ret"
865 a378724f 2019-02-10 stsp rm $testroot/wt/alpha
867 a378724f 2019-02-10 stsp echo "! alpha" > $testroot/stdout.expected
868 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
869 1545c615 2019-02-10 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
870 1545c615 2019-02-10 stsp echo >> $testroot/stdout.expected
871 a378724f 2019-02-10 stsp (cd $testroot/wt && got update > $testroot/stdout)
873 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
875 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
876 a378724f 2019-02-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
877 a378724f 2019-02-10 stsp test_done "$testroot" "$ret"
881 a378724f 2019-02-10 stsp echo "alpha" > $testroot/content.expected
883 a378724f 2019-02-10 stsp cat $testroot/wt/alpha > $testroot/content
885 8d301dd9 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
887 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
888 1430b4e0 2019-03-27 stsp diff -u $testroot/content.expected $testroot/content
890 1430b4e0 2019-03-27 stsp test_done "$testroot" "$ret"
893 f6cae3ed 2020-09-13 naddy test_update_conflict_wt_add_vs_repo_add() {
894 085d5bcf 2019-03-27 stsp local testroot=`test_init update_conflict_wt_add_vs_repo_add`
896 1430b4e0 2019-03-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
898 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
899 1430b4e0 2019-03-27 stsp test_done "$testroot" "$ret"
903 1430b4e0 2019-03-27 stsp echo "new" > $testroot/repo/gamma/new
904 1430b4e0 2019-03-27 stsp (cd $testroot/repo && git add .)
905 1430b4e0 2019-03-27 stsp git_commit $testroot/repo -m "adding a new file"
907 1430b4e0 2019-03-27 stsp echo "also new" > $testroot/wt/gamma/new
908 1430b4e0 2019-03-27 stsp (cd $testroot/wt && got add gamma/new >/dev/null)
910 1430b4e0 2019-03-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
912 1430b4e0 2019-03-27 stsp echo "C gamma/new" > $testroot/stdout.expected
913 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
914 1430b4e0 2019-03-27 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
915 1430b4e0 2019-03-27 stsp echo >> $testroot/stdout.expected
916 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
918 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
920 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
921 1430b4e0 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
922 1430b4e0 2019-03-27 stsp test_done "$testroot" "$ret"
926 f69721c3 2019-10-21 stsp echo -n "<<<<<<< merged change: commit " > $testroot/content.expected
927 1430b4e0 2019-03-27 stsp git_show_head $testroot/repo >> $testroot/content.expected
928 1430b4e0 2019-03-27 stsp echo >> $testroot/content.expected
929 1430b4e0 2019-03-27 stsp echo "new" >> $testroot/content.expected
930 1430b4e0 2019-03-27 stsp echo "=======" >> $testroot/content.expected
931 1430b4e0 2019-03-27 stsp echo "also new" >> $testroot/content.expected
932 f69721c3 2019-10-21 stsp echo '>>>>>>>' >> $testroot/content.expected
934 1430b4e0 2019-03-27 stsp cat $testroot/wt/gamma/new > $testroot/content
936 8d301dd9 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
938 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
939 a378724f 2019-02-10 stsp diff -u $testroot/content.expected $testroot/content
940 3165301c 2019-03-27 stsp test_done "$testroot" "$ret"
944 3165301c 2019-03-27 stsp # resolve the conflict
945 3165301c 2019-03-27 stsp echo "new and also new" > $testroot/wt/gamma/new
946 3165301c 2019-03-27 stsp echo 'M gamma/new' > $testroot/stdout.expected
947 3165301c 2019-03-27 stsp (cd $testroot/wt && got status > $testroot/stdout)
948 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
950 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
951 3165301c 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
953 a378724f 2019-02-10 stsp test_done "$testroot" "$ret"
956 f6cae3ed 2020-09-13 naddy test_update_conflict_wt_edit_vs_repo_rm() {
957 085d5bcf 2019-03-27 stsp local testroot=`test_init update_conflict_wt_edit_vs_repo_rm`
959 708d8e67 2019-03-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
961 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
962 708d8e67 2019-03-27 stsp test_done "$testroot" "$ret"
966 708d8e67 2019-03-27 stsp (cd $testroot/repo && git rm -q beta)
967 708d8e67 2019-03-27 stsp git_commit $testroot/repo -m "removing a file"
969 708d8e67 2019-03-27 stsp echo "modified beta" > $testroot/wt/beta
971 708d8e67 2019-03-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
973 fc6346c4 2019-03-27 stsp echo "G beta" > $testroot/stdout.expected
974 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
975 708d8e67 2019-03-27 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
976 708d8e67 2019-03-27 stsp echo >> $testroot/stdout.expected
977 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
979 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
980 708d8e67 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
981 708d8e67 2019-03-27 stsp test_done "$testroot" "$ret"
985 708d8e67 2019-03-27 stsp echo "modified beta" > $testroot/content.expected
987 708d8e67 2019-03-27 stsp cat $testroot/wt/beta > $testroot/content
989 8d301dd9 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
991 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
992 708d8e67 2019-03-27 stsp diff -u $testroot/content.expected $testroot/content
993 708d8e67 2019-03-27 stsp test_done "$testroot" "$ret"
997 fc6346c4 2019-03-27 stsp # beta is now an added file... we don't flag tree conflicts yet
998 fc6346c4 2019-03-27 stsp echo 'A beta' > $testroot/stdout.expected
999 13d9040b 2019-03-27 stsp (cd $testroot/wt && got status > $testroot/stdout)
1000 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1002 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1003 13d9040b 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1005 13d9040b 2019-03-27 stsp test_done "$testroot" "$ret"
1008 f6cae3ed 2020-09-13 naddy test_update_conflict_wt_rm_vs_repo_edit() {
1009 13d9040b 2019-03-27 stsp local testroot=`test_init update_conflict_wt_rm_vs_repo_edit`
1011 13d9040b 2019-03-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1013 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1014 13d9040b 2019-03-27 stsp test_done "$testroot" "$ret"
1018 13d9040b 2019-03-27 stsp echo "modified beta" > $testroot/repo/beta
1019 13d9040b 2019-03-27 stsp git_commit $testroot/repo -m "modified a file"
1021 13d9040b 2019-03-27 stsp (cd $testroot/wt && got rm beta > /dev/null)
1023 13d9040b 2019-03-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
1025 13d9040b 2019-03-27 stsp echo "G beta" > $testroot/stdout.expected
1026 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1027 13d9040b 2019-03-27 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1028 13d9040b 2019-03-27 stsp echo >> $testroot/stdout.expected
1029 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1031 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1032 13d9040b 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1033 13d9040b 2019-03-27 stsp test_done "$testroot" "$ret"
1037 13d9040b 2019-03-27 stsp # beta remains a deleted file... we don't flag tree conflicts yet
1038 13d9040b 2019-03-27 stsp echo 'D beta' > $testroot/stdout.expected
1039 708d8e67 2019-03-27 stsp (cd $testroot/wt && got status > $testroot/stdout)
1040 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1042 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1043 708d8e67 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1044 13d9040b 2019-03-27 stsp test_done "$testroot" "$ret"
1048 13d9040b 2019-03-27 stsp # 'got diff' should show post-update contents of beta being deleted
1049 13d9040b 2019-03-27 stsp local head_rev=`git_show_head $testroot/repo`
1050 9b4458b4 2022-06-26 thomas echo "diff $testroot/wt" > $testroot/stdout.expected
1051 9b4458b4 2022-06-26 thomas echo "commit - $head_rev" >> $testroot/stdout.expected
1052 9b4458b4 2022-06-26 thomas echo "path + $testroot/wt" >> $testroot/stdout.expected
1053 13d9040b 2019-03-27 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1054 13d9040b 2019-03-27 stsp got tree -r $testroot/repo -i | grep 'beta$' | cut -d' ' -f 1 \
1055 13d9040b 2019-03-27 stsp >> $testroot/stdout.expected
1056 13d9040b 2019-03-27 stsp echo 'file + /dev/null' >> $testroot/stdout.expected
1057 13d9040b 2019-03-27 stsp echo '--- beta' >> $testroot/stdout.expected
1058 1cb46f00 2020-11-21 stsp echo '+++ /dev/null' >> $testroot/stdout.expected
1059 13d9040b 2019-03-27 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
1060 13d9040b 2019-03-27 stsp echo '-modified beta' >> $testroot/stdout.expected
1062 13d9040b 2019-03-27 stsp (cd $testroot/wt && got diff > $testroot/stdout)
1063 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1065 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1066 13d9040b 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1068 708d8e67 2019-03-27 stsp test_done "$testroot" "$ret"
1071 f6cae3ed 2020-09-13 naddy test_update_conflict_wt_rm_vs_repo_rm() {
1072 66b11bf5 2019-03-27 stsp local testroot=`test_init update_conflict_wt_rm_vs_repo_rm`
1074 66b11bf5 2019-03-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1076 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1077 66b11bf5 2019-03-27 stsp test_done "$testroot" "$ret"
1081 66b11bf5 2019-03-27 stsp (cd $testroot/repo && git rm -q beta)
1082 66b11bf5 2019-03-27 stsp git_commit $testroot/repo -m "removing a file"
1084 66b11bf5 2019-03-27 stsp (cd $testroot/wt && got rm beta > /dev/null)
1086 66b11bf5 2019-03-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
1088 66b11bf5 2019-03-27 stsp echo "D beta" > $testroot/stdout.expected
1089 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1090 66b11bf5 2019-03-27 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1091 66b11bf5 2019-03-27 stsp echo >> $testroot/stdout.expected
1092 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1094 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1095 66b11bf5 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1096 66b11bf5 2019-03-27 stsp test_done "$testroot" "$ret"
1100 66b11bf5 2019-03-27 stsp # beta is now gone... we don't flag tree conflicts yet
1101 2a06fe5f 2019-08-24 stsp echo "N beta" > $testroot/stdout.expected
1102 54817d72 2019-07-27 stsp echo -n > $testroot/stderr.expected
1103 54817d72 2019-07-27 stsp (cd $testroot/wt && got status beta > $testroot/stdout \
1104 54817d72 2019-07-27 stsp 2> $testroot/stderr)
1105 54817d72 2019-07-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1107 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1108 54817d72 2019-07-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1109 54817d72 2019-07-27 stsp test_done "$testroot" "$ret"
1112 8d301dd9 2019-05-14 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1114 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1115 66b11bf5 2019-03-27 stsp diff -u $testroot/stderr.expected $testroot/stderr
1116 66b11bf5 2019-03-27 stsp test_done "$testroot" "$ret"
1120 66b11bf5 2019-03-27 stsp if [ -e $testroot/wt/beta ]; then
1121 66b11bf5 2019-03-27 stsp echo "removed file beta still exists on disk" >&2
1122 66b11bf5 2019-03-27 stsp test_done "$testroot" "1"
1126 66b11bf5 2019-03-27 stsp test_done "$testroot" "0"
1129 f6cae3ed 2020-09-13 naddy test_update_partial() {
1130 c4cdcb68 2019-04-03 stsp local testroot=`test_init update_partial`
1132 c4cdcb68 2019-04-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1134 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1135 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1139 c4cdcb68 2019-04-03 stsp echo "modified alpha" > $testroot/repo/alpha
1140 c4cdcb68 2019-04-03 stsp echo "modified beta" > $testroot/repo/beta
1141 c4cdcb68 2019-04-03 stsp echo "modified epsilon/zeta" > $testroot/repo/epsilon/zeta
1142 c4cdcb68 2019-04-03 stsp git_commit $testroot/repo -m "modified two files"
1144 f2ea84fa 2019-07-27 stsp echo "U alpha" > $testroot/stdout.expected
1145 f2ea84fa 2019-07-27 stsp echo "U beta" >> $testroot/stdout.expected
1146 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1147 f2ea84fa 2019-07-27 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1148 f2ea84fa 2019-07-27 stsp echo >> $testroot/stdout.expected
1150 f2ea84fa 2019-07-27 stsp (cd $testroot/wt && got update alpha beta > $testroot/stdout)
1152 f2ea84fa 2019-07-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1154 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1155 f2ea84fa 2019-07-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1156 f2ea84fa 2019-07-27 stsp test_done "$testroot" "$ret"
1160 f2ea84fa 2019-07-27 stsp echo "modified alpha" > $testroot/content.expected
1161 f2ea84fa 2019-07-27 stsp echo "modified beta" >> $testroot/content.expected
1163 f2ea84fa 2019-07-27 stsp cat $testroot/wt/alpha $testroot/wt/beta > $testroot/content
1164 f2ea84fa 2019-07-27 stsp cmp -s $testroot/content.expected $testroot/content
1166 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1167 f2ea84fa 2019-07-27 stsp diff -u $testroot/content.expected $testroot/content
1168 f2ea84fa 2019-07-27 stsp test_done "$testroot" "$ret"
1172 e4d984c2 2019-05-22 stsp echo "U epsilon/zeta" > $testroot/stdout.expected
1173 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1174 e4d984c2 2019-05-22 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1175 e4d984c2 2019-05-22 stsp echo >> $testroot/stdout.expected
1177 e4d984c2 2019-05-22 stsp (cd $testroot/wt && got update epsilon > $testroot/stdout)
1179 e4d984c2 2019-05-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1181 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1182 e4d984c2 2019-05-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1183 e4d984c2 2019-05-22 stsp test_done "$testroot" "$ret"
1187 e4d984c2 2019-05-22 stsp echo "modified epsilon/zeta" > $testroot/content.expected
1188 e4d984c2 2019-05-22 stsp cat $testroot/wt/epsilon/zeta > $testroot/content
1190 e4d984c2 2019-05-22 stsp cmp -s $testroot/content.expected $testroot/content
1192 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1193 e4d984c2 2019-05-22 stsp diff -u $testroot/content.expected $testroot/content
1194 e4d984c2 2019-05-22 stsp test_done "$testroot" "$ret"
1198 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1201 f6cae3ed 2020-09-13 naddy test_update_partial_add() {
1202 c4cdcb68 2019-04-03 stsp local testroot=`test_init update_partial_add`
1204 c4cdcb68 2019-04-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1206 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1207 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1211 c4cdcb68 2019-04-03 stsp echo "new" > $testroot/repo/new
1212 c4cdcb68 2019-04-03 stsp echo "epsilon/new2" > $testroot/repo/epsilon/new2
1213 c4cdcb68 2019-04-03 stsp (cd $testroot/repo && git add .)
1214 c4cdcb68 2019-04-03 stsp git_commit $testroot/repo -m "added two files"
1216 f1417e9f 2021-10-12 thomas echo "A epsilon/new2" > $testroot/stdout.expected
1217 f1417e9f 2021-10-12 thomas echo "A new" >> $testroot/stdout.expected
1218 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1219 f2ea84fa 2019-07-27 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1220 f2ea84fa 2019-07-27 stsp echo >> $testroot/stdout.expected
1222 f2ea84fa 2019-07-27 stsp (cd $testroot/wt && got update new epsilon/new2 > $testroot/stdout)
1224 f2ea84fa 2019-07-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1226 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1227 f2ea84fa 2019-07-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
1228 f2ea84fa 2019-07-27 stsp test_done "$testroot" "$ret"
1232 f2ea84fa 2019-07-27 stsp echo "new" > $testroot/content.expected
1233 f2ea84fa 2019-07-27 stsp echo "epsilon/new2" >> $testroot/content.expected
1235 f2ea84fa 2019-07-27 stsp cat $testroot/wt/new $testroot/wt/epsilon/new2 > $testroot/content
1237 f2ea84fa 2019-07-27 stsp cmp -s $testroot/content.expected $testroot/content
1239 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1240 f2ea84fa 2019-07-27 stsp diff -u $testroot/content.expected $testroot/content
1242 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1245 f6cae3ed 2020-09-13 naddy test_update_partial_rm() {
1246 c4cdcb68 2019-04-03 stsp local testroot=`test_init update_partial_rm`
1248 c4cdcb68 2019-04-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1250 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1251 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1255 f2ea84fa 2019-07-27 stsp (cd $testroot/repo && git rm -q alpha epsilon/zeta)
1256 c4cdcb68 2019-04-03 stsp git_commit $testroot/repo -m "removed two files"
1258 b66cd6f3 2020-07-31 stsp echo "got: /alpha: no such entry found in tree" \
1259 f2ea84fa 2019-07-27 stsp > $testroot/stderr.expected
1261 f2ea84fa 2019-07-27 stsp (cd $testroot/wt && got update alpha epsilon/zeta 2> $testroot/stderr)
1263 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
1264 f2ea84fa 2019-07-27 stsp echo "update succeeded unexpectedly" >&2
1265 f2ea84fa 2019-07-27 stsp test_done "$testroot" "1"
1269 f2ea84fa 2019-07-27 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1271 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1272 f2ea84fa 2019-07-27 stsp diff -u $testroot/stderr.expected $testroot/stderr
1273 f2ea84fa 2019-07-27 stsp test_done "$testroot" "$ret"
1276 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1279 f6cae3ed 2020-09-13 naddy test_update_partial_dir() {
1280 c4cdcb68 2019-04-03 stsp local testroot=`test_init update_partial_dir`
1282 c4cdcb68 2019-04-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1284 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1285 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1289 c4cdcb68 2019-04-03 stsp echo "modified alpha" > $testroot/repo/alpha
1290 c4cdcb68 2019-04-03 stsp echo "modified beta" > $testroot/repo/beta
1291 c4cdcb68 2019-04-03 stsp echo "modified epsilon/zeta" > $testroot/repo/epsilon/zeta
1292 c4cdcb68 2019-04-03 stsp git_commit $testroot/repo -m "modified two files"
1294 c4cdcb68 2019-04-03 stsp echo "U epsilon/zeta" > $testroot/stdout.expected
1295 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1296 c4cdcb68 2019-04-03 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1297 c4cdcb68 2019-04-03 stsp echo >> $testroot/stdout.expected
1299 c4cdcb68 2019-04-03 stsp (cd $testroot/wt && got update epsilon > $testroot/stdout)
1301 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1303 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1304 c4cdcb68 2019-04-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1305 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1309 c4cdcb68 2019-04-03 stsp echo "modified epsilon/zeta" > $testroot/content.expected
1310 c4cdcb68 2019-04-03 stsp cat $testroot/wt/epsilon/zeta > $testroot/content
1312 8d301dd9 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
1314 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1315 c4cdcb68 2019-04-03 stsp diff -u $testroot/content.expected $testroot/content
1316 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1319 c4cdcb68 2019-04-03 stsp test_done "$testroot" "$ret"
1323 f6cae3ed 2020-09-13 naddy test_update_moved_branch_ref() {
1324 d5bea539 2019-05-13 stsp local testroot=`test_init update_moved_branch_ref`
1326 d5bea539 2019-05-13 stsp git clone -q --mirror $testroot/repo $testroot/repo2
1328 d5bea539 2019-05-13 stsp echo "modified alpha with git" > $testroot/repo/alpha
1329 d5bea539 2019-05-13 stsp git_commit $testroot/repo -m "modified alpha with git"
1331 d5bea539 2019-05-13 stsp got checkout $testroot/repo2 $testroot/wt > /dev/null
1333 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1334 d5bea539 2019-05-13 stsp test_done "$testroot" "$ret"
1338 d5bea539 2019-05-13 stsp echo "modified alpha with got" > $testroot/wt/alpha
1339 d5bea539 2019-05-13 stsp (cd $testroot/wt && got commit -m "modified alpha with got" > /dev/null)
1341 d5bea539 2019-05-13 stsp # + xxxxxxx...yyyyyyy master -> master (forced update)
1342 d5bea539 2019-05-13 stsp (cd $testroot/repo2 && git fetch -q --all)
1344 d5bea539 2019-05-13 stsp echo -n > $testroot/stdout.expected
1345 a1fb16d8 2019-05-24 stsp echo -n "got: work tree's head reference now points to a different " \
1346 a367ff0f 2019-05-14 stsp > $testroot/stderr.expected
1347 a1fb16d8 2019-05-24 stsp echo "branch; new head reference and/or update -b required" \
1348 a1fb16d8 2019-05-24 stsp >> $testroot/stderr.expected
1350 d5bea539 2019-05-13 stsp (cd $testroot/wt && got update > $testroot/stdout 2> $testroot/stderr)
1352 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1354 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1355 d5bea539 2019-05-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
1356 d5bea539 2019-05-13 stsp test_done "$testroot" "$ret"
1360 8d301dd9 2019-05-14 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1362 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1363 d5bea539 2019-05-13 stsp diff -u $testroot/stderr.expected $testroot/stderr
1365 d5bea539 2019-05-13 stsp test_done "$testroot" "$ret"
1368 f6cae3ed 2020-09-13 naddy test_update_to_another_branch() {
1369 024e9686 2019-05-14 stsp local testroot=`test_init update_to_another_branch`
1370 f69721c3 2019-10-21 stsp local base_commit=`git_show_head $testroot/repo`
1372 024e9686 2019-05-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1374 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1375 024e9686 2019-05-14 stsp test_done "$testroot" "$ret"
1379 024e9686 2019-05-14 stsp echo 'refs/heads/master'> $testroot/head-ref.expected
1380 024e9686 2019-05-14 stsp cmp -s $testroot/head-ref.expected $testroot/wt/.got/head-ref
1382 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1383 024e9686 2019-05-14 stsp diff -u $testroot/head-ref.expected $testroot/wt/.got/head-ref
1384 024e9686 2019-05-14 stsp test_done "$testroot" "$ret"
1388 024e9686 2019-05-14 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1389 024e9686 2019-05-14 stsp echo "modified alpha on new branch" > $testroot/repo/alpha
1390 024e9686 2019-05-14 stsp git_commit $testroot/repo -m "modified alpha on new branch"
1392 024e9686 2019-05-14 stsp echo "modified alpha in work tree" > $testroot/wt/alpha
1394 d969fa15 2019-05-22 stsp echo "Switching work tree from refs/heads/master to refs/heads/newbranch" > $testroot/stdout.expected
1395 d969fa15 2019-05-22 stsp echo "C alpha" >> $testroot/stdout.expected
1396 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/newbranch: " >> $testroot/stdout.expected
1397 024e9686 2019-05-14 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1398 024e9686 2019-05-14 stsp echo >> $testroot/stdout.expected
1399 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
1401 024e9686 2019-05-14 stsp (cd $testroot/wt && got update -b newbranch > $testroot/stdout)
1403 024e9686 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1405 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1406 024e9686 2019-05-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1407 024e9686 2019-05-14 stsp test_done "$testroot" "$ret"
1411 f69721c3 2019-10-21 stsp echo -n "<<<<<<< merged change: commit " > $testroot/content.expected
1412 024e9686 2019-05-14 stsp git_show_head $testroot/repo >> $testroot/content.expected
1413 024e9686 2019-05-14 stsp echo >> $testroot/content.expected
1414 024e9686 2019-05-14 stsp echo "modified alpha on new branch" >> $testroot/content.expected
1415 f69721c3 2019-10-21 stsp echo "||||||| 3-way merge base: commit $base_commit" \
1416 f69721c3 2019-10-21 stsp >> $testroot/content.expected
1417 d136cfcb 2019-10-12 stsp echo "alpha" >> $testroot/content.expected
1418 024e9686 2019-05-14 stsp echo "=======" >> $testroot/content.expected
1419 024e9686 2019-05-14 stsp echo "modified alpha in work tree" >> $testroot/content.expected
1420 f69721c3 2019-10-21 stsp echo '>>>>>>>' >> $testroot/content.expected
1422 024e9686 2019-05-14 stsp cat $testroot/wt/alpha > $testroot/content
1424 024e9686 2019-05-14 stsp cmp -s $testroot/content.expected $testroot/content
1426 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1427 024e9686 2019-05-14 stsp diff -u $testroot/content.expected $testroot/content
1428 024e9686 2019-05-14 stsp test_done "$testroot" "$ret"
1432 024e9686 2019-05-14 stsp echo 'refs/heads/newbranch'> $testroot/head-ref.expected
1433 024e9686 2019-05-14 stsp cmp -s $testroot/head-ref.expected $testroot/wt/.got/head-ref
1435 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1436 024e9686 2019-05-14 stsp diff -u $testroot/head-ref.expected $testroot/wt/.got/head-ref
1437 a367ff0f 2019-05-14 stsp test_done "$testroot" "$ret"
1441 a367ff0f 2019-05-14 stsp test_done "$testroot" "$ret"
1444 f6cae3ed 2020-09-13 naddy test_update_to_commit_on_wrong_branch() {
1445 a367ff0f 2019-05-14 stsp local testroot=`test_init update_to_commit_on_wrong_branch`
1447 a367ff0f 2019-05-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1449 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1450 a367ff0f 2019-05-14 stsp test_done "$testroot" "$ret"
1454 a367ff0f 2019-05-14 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1455 a367ff0f 2019-05-14 stsp echo "modified alpha on new branch" > $testroot/repo/alpha
1456 a367ff0f 2019-05-14 stsp git_commit $testroot/repo -m "modified alpha on new branch"
1458 a367ff0f 2019-05-14 stsp echo -n "" > $testroot/stdout.expected
1459 a367ff0f 2019-05-14 stsp echo "got: target commit is on a different branch" \
1460 a367ff0f 2019-05-14 stsp > $testroot/stderr.expected
1462 a367ff0f 2019-05-14 stsp local head_rev=`git_show_head $testroot/repo`
1463 a367ff0f 2019-05-14 stsp (cd $testroot/wt && got update -c $head_rev > $testroot/stdout \
1464 a367ff0f 2019-05-14 stsp 2> $testroot/stderr)
1466 a367ff0f 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1468 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1469 a367ff0f 2019-05-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1470 024e9686 2019-05-14 stsp test_done "$testroot" "$ret"
1474 a367ff0f 2019-05-14 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1476 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1477 a367ff0f 2019-05-14 stsp diff -u $testroot/stderr.expected $testroot/stderr
1478 a367ff0f 2019-05-14 stsp test_done "$testroot" "$ret"
1482 024e9686 2019-05-14 stsp test_done "$testroot" "$ret"
1485 f6cae3ed 2020-09-13 naddy test_update_bumps_base_commit_id() {
1486 a5e55564 2019-06-10 stsp local testroot=`test_init update_bumps_base_commit_id`
1488 1a36436d 2019-06-10 stsp echo "psi" > $testroot/repo/epsilon/psi
1489 1a36436d 2019-06-10 stsp (cd $testroot/repo && git add .)
1490 1a36436d 2019-06-10 stsp git_commit $testroot/repo -m "adding another file"
1492 c932eeeb 2019-05-22 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1494 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1495 c932eeeb 2019-05-22 stsp test_done "$testroot" "$ret"
1499 1a36436d 2019-06-10 stsp echo "modified psi" > $testroot/wt/epsilon/psi
1500 1a36436d 2019-06-10 stsp (cd $testroot/wt && got commit -m "changed psi" > $testroot/stdout)
1502 c932eeeb 2019-05-22 stsp local head_rev=`git_show_head $testroot/repo`
1503 1a36436d 2019-06-10 stsp echo "M epsilon/psi" > $testroot/stdout.expected
1504 a7648d7a 2019-06-02 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1505 c932eeeb 2019-05-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1507 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1508 c932eeeb 2019-05-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1509 c932eeeb 2019-05-22 stsp test_done "$testroot" "$ret"
1513 305993b9 2019-07-28 stsp echo "changed zeta with git" > $testroot/repo/epsilon/zeta
1514 9bead371 2019-07-28 stsp (cd $testroot/repo && git add .)
1515 9bead371 2019-07-28 stsp git_commit $testroot/repo -m "changing zeta with git"
1517 1a36436d 2019-06-10 stsp echo "modified zeta" > $testroot/wt/epsilon/zeta
1518 1a36436d 2019-06-10 stsp (cd $testroot/wt && got commit -m "changed zeta" > $testroot/stdout \
1519 c932eeeb 2019-05-22 stsp 2> $testroot/stderr)
1521 c932eeeb 2019-05-22 stsp echo -n "" > $testroot/stdout.expected
1522 c932eeeb 2019-05-22 stsp echo "got: work tree must be updated before these changes can be committed" > $testroot/stderr.expected
1523 c932eeeb 2019-05-22 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1525 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1526 c932eeeb 2019-05-22 stsp diff -u $testroot/stderr.expected $testroot/stderr
1527 c932eeeb 2019-05-22 stsp test_done "$testroot" "$ret"
1531 c932eeeb 2019-05-22 stsp (cd $testroot/wt && got update > $testroot/stdout)
1533 9bead371 2019-07-28 stsp echo "U epsilon/psi" > $testroot/stdout.expected
1534 9bead371 2019-07-28 stsp echo "C epsilon/zeta" >> $testroot/stdout.expected
1535 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1536 a484d721 2019-06-10 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1537 a484d721 2019-06-10 stsp echo >> $testroot/stdout.expected
1538 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
1540 c932eeeb 2019-05-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1542 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1543 c932eeeb 2019-05-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1544 c932eeeb 2019-05-22 stsp test_done "$testroot" "$ret"
1548 9bead371 2019-07-28 stsp # resolve conflict
1549 9bead371 2019-07-28 stsp echo "modified zeta with got and git" > $testroot/wt/epsilon/zeta
1551 1a36436d 2019-06-10 stsp (cd $testroot/wt && got commit -m "changed zeta" > $testroot/stdout)
1553 c932eeeb 2019-05-22 stsp local head_rev=`git_show_head $testroot/repo`
1554 1a36436d 2019-06-10 stsp echo "M epsilon/zeta" > $testroot/stdout.expected
1555 a7648d7a 2019-06-02 stsp echo "Created commit $head_rev" >> $testroot/stdout.expected
1556 303e2782 2019-08-09 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1558 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1559 303e2782 2019-08-09 stsp diff -u $testroot/stdout.expected $testroot/stdout
1560 303e2782 2019-08-09 stsp test_done "$testroot" "$ret"
1564 303e2782 2019-08-09 stsp test_done "$testroot" "$ret"
1567 f6cae3ed 2020-09-13 naddy test_update_tag() {
1568 303e2782 2019-08-09 stsp local testroot=`test_init update_tag`
1569 303e2782 2019-08-09 stsp local tag="1.0.0"
1571 303e2782 2019-08-09 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1573 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1574 303e2782 2019-08-09 stsp test_done "$testroot" "$ret"
1578 303e2782 2019-08-09 stsp echo "modified alpha" > $testroot/repo/alpha
1579 303e2782 2019-08-09 stsp git_commit $testroot/repo -m "modified alpha"
1580 303e2782 2019-08-09 stsp (cd $testroot/repo && git tag -m "test" -a $tag)
1582 303e2782 2019-08-09 stsp echo "U alpha" > $testroot/stdout.expected
1583 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1584 303e2782 2019-08-09 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1585 303e2782 2019-08-09 stsp echo >> $testroot/stdout.expected
1587 303e2782 2019-08-09 stsp (cd $testroot/wt && got update -c $tag > $testroot/stdout)
1589 c932eeeb 2019-05-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1591 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1592 c932eeeb 2019-05-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
1593 c932eeeb 2019-05-22 stsp test_done "$testroot" "$ret"
1597 303e2782 2019-08-09 stsp echo "modified alpha" > $testroot/content.expected
1598 303e2782 2019-08-09 stsp cat $testroot/wt/alpha > $testroot/content
1600 303e2782 2019-08-09 stsp cmp -s $testroot/content.expected $testroot/content
1602 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1603 303e2782 2019-08-09 stsp diff -u $testroot/content.expected $testroot/content
1605 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1608 f6cae3ed 2020-09-13 naddy test_update_toggles_xbit() {
1609 523b8417 2019-10-19 stsp local testroot=`test_init update_toggles_xbit 1`
1611 523b8417 2019-10-19 stsp touch $testroot/repo/xfile
1612 523b8417 2019-10-19 stsp chmod +x $testroot/repo/xfile
1613 523b8417 2019-10-19 stsp (cd $testroot/repo && git add .)
1614 523b8417 2019-10-19 stsp git_commit $testroot/repo -m "adding executable file"
1615 523b8417 2019-10-19 stsp local commit_id1=`git_show_head $testroot/repo`
1617 523b8417 2019-10-19 stsp got checkout $testroot/repo $testroot/wt > $testroot/stdout
1619 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1620 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1624 523b8417 2019-10-19 stsp ls -l $testroot/wt/xfile | grep -q '^-rwx'
1626 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1627 523b8417 2019-10-19 stsp echo "file is not executable" >&2
1628 523b8417 2019-10-19 stsp ls -l $testroot/wt/xfile >&2
1629 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1633 523b8417 2019-10-19 stsp chmod -x $testroot/wt/xfile
1634 523b8417 2019-10-19 stsp (cd $testroot/wt && got commit -m "clear x bit" >/dev/null)
1635 523b8417 2019-10-19 stsp local commit_id2=`git_show_head $testroot/repo`
1637 523b8417 2019-10-19 stsp echo "U xfile" > $testroot/stdout.expected
1638 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1639 523b8417 2019-10-19 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1640 523b8417 2019-10-19 stsp echo >> $testroot/stdout.expected
1642 523b8417 2019-10-19 stsp (cd $testroot/wt && got update -c $commit_id1 > $testroot/stdout)
1644 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1645 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1649 523b8417 2019-10-19 stsp echo "U xfile" > $testroot/stdout.expected
1650 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id1" >> $testroot/stdout.expected
1651 523b8417 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1653 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1654 523b8417 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
1655 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1660 523b8417 2019-10-19 stsp ls -l $testroot/wt/xfile | grep -q '^-rwx'
1662 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1663 523b8417 2019-10-19 stsp echo "file is not executable" >&2
1664 523b8417 2019-10-19 stsp ls -l $testroot/wt/xfile >&2
1665 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1669 523b8417 2019-10-19 stsp (cd $testroot/wt && got update > $testroot/stdout)
1671 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1672 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1676 523b8417 2019-10-19 stsp echo "U xfile" > $testroot/stdout.expected
1677 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id2" \
1678 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
1679 523b8417 2019-10-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1681 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1682 523b8417 2019-10-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
1683 523b8417 2019-10-19 stsp test_done "$testroot" "$ret"
1687 523b8417 2019-10-19 stsp ls -l $testroot/wt/xfile | grep -q '^-rw-'
1689 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1690 523b8417 2019-10-19 stsp echo "file is unexpectedly executable" >&2
1691 523b8417 2019-10-19 stsp ls -l $testroot/wt/xfile >&2
1693 5036ab18 2020-04-18 stsp test_done "$testroot" "$ret"
1696 f6cae3ed 2020-09-13 naddy test_update_preserves_conflicted_file() {
1697 5036ab18 2020-04-18 stsp local testroot=`test_init update_preserves_conflicted_file`
1698 5036ab18 2020-04-18 stsp local commit_id0=`git_show_head $testroot/repo`
1700 5036ab18 2020-04-18 stsp echo "modified alpha" > $testroot/repo/alpha
1701 5036ab18 2020-04-18 stsp git_commit $testroot/repo -m "modified alpha"
1702 5036ab18 2020-04-18 stsp local commit_id1=`git_show_head $testroot/repo`
1704 5036ab18 2020-04-18 stsp got checkout -c $commit_id0 $testroot/repo $testroot/wt > /dev/null
1706 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1707 5036ab18 2020-04-18 stsp test_done "$testroot" "$ret"
1711 5036ab18 2020-04-18 stsp # fake a merge conflict
1712 5036ab18 2020-04-18 stsp echo '<<<<<<<' > $testroot/wt/alpha
1713 5036ab18 2020-04-18 stsp echo 'alpha' >> $testroot/wt/alpha
1714 5036ab18 2020-04-18 stsp echo '=======' >> $testroot/wt/alpha
1715 5036ab18 2020-04-18 stsp echo 'alpha, too' >> $testroot/wt/alpha
1716 5036ab18 2020-04-18 stsp echo '>>>>>>>' >> $testroot/wt/alpha
1717 5036ab18 2020-04-18 stsp cp $testroot/wt/alpha $testroot/content.expected
1719 5036ab18 2020-04-18 stsp echo "C alpha" > $testroot/stdout.expected
1720 5036ab18 2020-04-18 stsp (cd $testroot/wt && got status > $testroot/stdout)
1721 5036ab18 2020-04-18 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1723 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1724 5036ab18 2020-04-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
1725 5036ab18 2020-04-18 stsp test_done "$testroot" "$ret"
1729 5036ab18 2020-04-18 stsp echo "# alpha" > $testroot/stdout.expected
1730 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1731 5036ab18 2020-04-18 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1732 5036ab18 2020-04-18 stsp echo >> $testroot/stdout.expected
1733 9627c110 2020-04-18 stsp echo "Files not updated because of existing merge conflicts: 1" \
1734 9627c110 2020-04-18 stsp >> $testroot/stdout.expected
1735 5036ab18 2020-04-18 stsp (cd $testroot/wt && got update > $testroot/stdout)
1737 5036ab18 2020-04-18 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1739 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1740 5036ab18 2020-04-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
1741 5036ab18 2020-04-18 stsp test_done "$testroot" "$ret"
1745 5036ab18 2020-04-18 stsp cmp -s $testroot/content.expected $testroot/wt/alpha
1747 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1748 5036ab18 2020-04-18 stsp diff -u $testroot/content.expected $testroot/wt/alpha
1750 c932eeeb 2019-05-22 stsp test_done "$testroot" "$ret"
1753 f6cae3ed 2020-09-13 naddy test_update_modified_submodules() {
1754 e7303626 2020-05-14 stsp local testroot=`test_init update_modified_submodules`
1756 e7303626 2020-05-14 stsp make_single_file_repo $testroot/repo2 foo
1758 bf3ab206 2022-10-24 thomas (cd $testroot/repo && git -c protocol.file.allow=always \
1759 bf3ab206 2022-10-24 thomas submodule -q add ../repo2)
1760 e7303626 2020-05-14 stsp (cd $testroot/repo && git commit -q -m 'adding submodule')
1762 e7303626 2020-05-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1764 e7303626 2020-05-14 stsp echo "modified foo" > $testroot/repo2/foo
1765 e7303626 2020-05-14 stsp (cd $testroot/repo2 && git commit -q -a -m 'modified a submodule')
1767 e7303626 2020-05-14 stsp # Update the repo/repo2 submodule link
1768 e7303626 2020-05-14 stsp (cd $testroot/repo && git -C repo2 pull -q)
1769 e7303626 2020-05-14 stsp (cd $testroot/repo && git add repo2)
1770 e7303626 2020-05-14 stsp git_commit $testroot/repo -m "modified submodule link"
1772 e7303626 2020-05-14 stsp # This update only records the new base commit. Otherwise it is a
1773 e7303626 2020-05-14 stsp # no-op change because Got's file index does not track submodules.
1774 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " > $testroot/stdout.expected
1775 e7303626 2020-05-14 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1776 e7303626 2020-05-14 stsp echo >> $testroot/stdout.expected
1778 e7303626 2020-05-14 stsp (cd $testroot/wt && got update > $testroot/stdout)
1780 e7303626 2020-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1782 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1783 e7303626 2020-05-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1785 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
1788 f6cae3ed 2020-09-13 naddy test_update_adds_submodule() {
1789 e7303626 2020-05-14 stsp local testroot=`test_init update_adds_submodule`
1791 e7303626 2020-05-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1793 e7303626 2020-05-14 stsp make_single_file_repo $testroot/repo2 foo
1795 e7303626 2020-05-14 stsp echo "modified foo" > $testroot/repo2/foo
1796 e7303626 2020-05-14 stsp (cd $testroot/repo2 && git commit -q -a -m 'modified a submodule')
1798 bf3ab206 2022-10-24 thomas (cd $testroot/repo && git -c protocol.file.allow=always \
1799 bf3ab206 2022-10-24 thomas submodule -q add ../repo2)
1800 e7303626 2020-05-14 stsp (cd $testroot/repo && git commit -q -m 'adding submodule')
1802 e7303626 2020-05-14 stsp echo "A .gitmodules" > $testroot/stdout.expected
1803 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1804 e7303626 2020-05-14 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1805 e7303626 2020-05-14 stsp echo >> $testroot/stdout.expected
1807 e7303626 2020-05-14 stsp (cd $testroot/wt && got update > $testroot/stdout)
1809 e7303626 2020-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1811 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1812 e7303626 2020-05-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1814 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
1817 f6cae3ed 2020-09-13 naddy test_update_conflict_wt_file_vs_repo_submodule() {
1818 e7303626 2020-05-14 stsp local testroot=`test_init update_conflict_wt_file_vs_repo_submodule`
1820 e7303626 2020-05-14 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1822 e7303626 2020-05-14 stsp make_single_file_repo $testroot/repo2 foo
1824 e7303626 2020-05-14 stsp # Add a file which will clash with the submodule
1825 e7303626 2020-05-14 stsp echo "This is a file called repo2" > $testroot/wt/repo2
1826 e7303626 2020-05-14 stsp (cd $testroot/wt && got add repo2 > /dev/null)
1827 e7303626 2020-05-14 stsp (cd $testroot/wt && got commit -m 'add file repo2' > /dev/null)
1829 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1830 e7303626 2020-05-14 stsp echo "commit failed unexpectedly" >&2
1831 e7303626 2020-05-14 stsp test_done "$testroot" "1"
1835 bf3ab206 2022-10-24 thomas (cd $testroot/repo && git -c protocol.file.allow=always \
1836 bf3ab206 2022-10-24 thomas submodule -q add ../repo2)
1837 e7303626 2020-05-14 stsp (cd $testroot/repo && git commit -q -m 'adding submodule')
1839 e7303626 2020-05-14 stsp # Modify the clashing file such that any modifications brought
1840 e7303626 2020-05-14 stsp # in by 'got update' would require a merge.
1841 e7303626 2020-05-14 stsp echo "This file was changed" > $testroot/wt/repo2
1843 e7303626 2020-05-14 stsp # No conflict occurs because 'got update' ignores the submodule
1844 e7303626 2020-05-14 stsp # and leaves the clashing file as it was.
1845 e7303626 2020-05-14 stsp echo "A .gitmodules" > $testroot/stdout.expected
1846 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1847 e7303626 2020-05-14 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1848 e7303626 2020-05-14 stsp echo >> $testroot/stdout.expected
1850 e7303626 2020-05-14 stsp (cd $testroot/wt && got update > $testroot/stdout)
1852 e7303626 2020-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1854 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1855 e7303626 2020-05-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1856 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
1860 e7303626 2020-05-14 stsp (cd $testroot/wt && got status > $testroot/stdout)
1862 e7303626 2020-05-14 stsp echo "M repo2" > $testroot/stdout.expected
1863 e7303626 2020-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1865 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1866 e7303626 2020-05-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
1868 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
1871 f6cae3ed 2020-09-13 naddy test_update_adds_symlink() {
1872 f35fa46a 2020-07-23 stsp local testroot=`test_init update_adds_symlink`
1874 f35fa46a 2020-07-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1876 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1877 f35fa46a 2020-07-23 stsp echo "checkout failed unexpectedly" >&2
1878 f35fa46a 2020-07-23 stsp test_done "$testroot" "$ret"
1882 f35fa46a 2020-07-23 stsp (cd $testroot/repo && ln -s alpha alpha.link)
1883 f35fa46a 2020-07-23 stsp (cd $testroot/repo && ln -s epsilon epsilon.link)
1884 f35fa46a 2020-07-23 stsp (cd $testroot/repo && ln -s /etc/passwd passwd.link)
1885 f35fa46a 2020-07-23 stsp (cd $testroot/repo && ln -s ../beta epsilon/beta.link)
1886 f35fa46a 2020-07-23 stsp (cd $testroot/repo && ln -s nonexistent nonexistent.link)
1887 f35fa46a 2020-07-23 stsp (cd $testroot/repo && git add .)
1888 f35fa46a 2020-07-23 stsp git_commit $testroot/repo -m "add symlinks"
1890 f35fa46a 2020-07-23 stsp echo "A alpha.link" > $testroot/stdout.expected
1891 f35fa46a 2020-07-23 stsp echo "A epsilon/beta.link" >> $testroot/stdout.expected
1892 f35fa46a 2020-07-23 stsp echo "A epsilon.link" >> $testroot/stdout.expected
1893 f35fa46a 2020-07-23 stsp echo "A nonexistent.link" >> $testroot/stdout.expected
1894 f35fa46a 2020-07-23 stsp echo "A passwd.link" >> $testroot/stdout.expected
1895 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
1896 f35fa46a 2020-07-23 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
1897 f35fa46a 2020-07-23 stsp echo >> $testroot/stdout.expected
1899 f35fa46a 2020-07-23 stsp (cd $testroot/wt && got update > $testroot/stdout)
1901 f35fa46a 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1903 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1904 f35fa46a 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1905 f35fa46a 2020-07-23 stsp test_done "$testroot" "$ret"
1909 f35fa46a 2020-07-23 stsp if ! [ -h $testroot/wt/alpha.link ]; then
1910 f35fa46a 2020-07-23 stsp echo "alpha.link is not a symlink"
1911 f35fa46a 2020-07-23 stsp test_done "$testroot" "1"
1915 f35fa46a 2020-07-23 stsp readlink $testroot/wt/alpha.link > $testroot/stdout
1916 f35fa46a 2020-07-23 stsp echo "alpha" > $testroot/stdout.expected
1917 f35fa46a 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1919 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1920 f35fa46a 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1921 f35fa46a 2020-07-23 stsp test_done "$testroot" "$ret"
1925 f35fa46a 2020-07-23 stsp if ! [ -h $testroot/wt/epsilon.link ]; then
1926 f35fa46a 2020-07-23 stsp echo "epsilon.link is not a symlink"
1927 f35fa46a 2020-07-23 stsp test_done "$testroot" "1"
1931 f35fa46a 2020-07-23 stsp readlink $testroot/wt/epsilon.link > $testroot/stdout
1932 f35fa46a 2020-07-23 stsp echo "epsilon" > $testroot/stdout.expected
1933 f35fa46a 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1935 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1936 f35fa46a 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1937 f35fa46a 2020-07-23 stsp test_done "$testroot" "$ret"
1941 f35fa46a 2020-07-23 stsp if [ -h $testroot/wt/passwd.link ]; then
1942 f35fa46a 2020-07-23 stsp echo -n "passwd.link symlink points outside of work tree: " >&2
1943 f35fa46a 2020-07-23 stsp readlink $testroot/wt/passwd.link >&2
1944 f35fa46a 2020-07-23 stsp test_done "$testroot" "1"
1948 f35fa46a 2020-07-23 stsp echo -n "/etc/passwd" > $testroot/content.expected
1949 f35fa46a 2020-07-23 stsp cp $testroot/wt/passwd.link $testroot/content
1951 f35fa46a 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
1953 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1954 f35fa46a 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
1955 f35fa46a 2020-07-23 stsp test_done "$testroot" "$ret"
1959 f35fa46a 2020-07-23 stsp readlink $testroot/wt/epsilon/beta.link > $testroot/stdout
1960 f35fa46a 2020-07-23 stsp echo "../beta" > $testroot/stdout.expected
1961 f35fa46a 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1963 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1964 f35fa46a 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1965 f35fa46a 2020-07-23 stsp test_done "$testroot" "$ret"
1969 f35fa46a 2020-07-23 stsp readlink $testroot/wt/nonexistent.link > $testroot/stdout
1970 f35fa46a 2020-07-23 stsp echo "nonexistent" > $testroot/stdout.expected
1971 f35fa46a 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1973 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1974 f35fa46a 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
1975 c6e8a826 2021-04-05 stsp test_done "$testroot" "$ret"
1979 c6e8a826 2021-04-05 stsp # Updating an up-to-date symlink should be a no-op.
1980 c6e8a826 2021-04-05 stsp echo 'Already up-to-date' > $testroot/stdout.expected
1981 c6e8a826 2021-04-05 stsp (cd $testroot/wt && got update > $testroot/stdout)
1982 c6e8a826 2021-04-05 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1984 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1985 c6e8a826 2021-04-05 stsp diff -u $testroot/stdout.expected $testroot/stdout
1987 f35fa46a 2020-07-23 stsp test_done "$testroot" "$ret"
1990 f6cae3ed 2020-09-13 naddy test_update_deletes_symlink() {
1991 993e2a1b 2020-07-23 stsp local testroot=`test_init update_deletes_symlink`
1993 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -s alpha alpha.link)
1994 993e2a1b 2020-07-23 stsp (cd $testroot/repo && git add .)
1995 993e2a1b 2020-07-23 stsp git_commit $testroot/repo -m "add symlink"
1997 993e2a1b 2020-07-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1999 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2000 993e2a1b 2020-07-23 stsp echo "checkout failed unexpectedly" >&2
2001 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2005 993e2a1b 2020-07-23 stsp (cd $testroot/repo && git rm -q alpha.link)
2006 993e2a1b 2020-07-23 stsp git_commit $testroot/repo -m "delete symlink"
2008 993e2a1b 2020-07-23 stsp echo "D alpha.link" > $testroot/stdout.expected
2009 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
2010 993e2a1b 2020-07-23 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
2011 993e2a1b 2020-07-23 stsp echo >> $testroot/stdout.expected
2013 993e2a1b 2020-07-23 stsp (cd $testroot/wt && got update > $testroot/stdout)
2015 993e2a1b 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2017 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2018 993e2a1b 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2019 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2023 993e2a1b 2020-07-23 stsp if [ -e $testroot/wt/alpha.link ]; then
2024 993e2a1b 2020-07-23 stsp echo "alpha.link still exists on disk"
2025 993e2a1b 2020-07-23 stsp test_done "$testroot" "1"
2029 993e2a1b 2020-07-23 stsp test_done "$testroot" "0"
2032 f6cae3ed 2020-09-13 naddy test_update_symlink_conflicts() {
2033 993e2a1b 2020-07-23 stsp local testroot=`test_init update_symlink_conflicts`
2035 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -s alpha alpha.link)
2036 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -s epsilon epsilon.link)
2037 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -s /etc/passwd passwd.link)
2038 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -s ../beta epsilon/beta.link)
2039 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -s nonexistent nonexistent.link)
2040 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -sf epsilon/zeta zeta.link)
2041 993e2a1b 2020-07-23 stsp (cd $testroot/repo && git add .)
2042 993e2a1b 2020-07-23 stsp git_commit $testroot/repo -m "add symlinks"
2043 993e2a1b 2020-07-23 stsp local commit_id1=`git_show_head $testroot/repo`
2045 993e2a1b 2020-07-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2047 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2048 993e2a1b 2020-07-23 stsp echo "checkout failed unexpectedly" >&2
2049 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2053 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -sf beta alpha.link)
2054 e6f45b72 2023-03-03 thomas (cd $testroot/repo && rm epsilon.link && ln -s gamma epsilon.link)
2055 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -sf ../gamma/delta epsilon/beta.link)
2056 993e2a1b 2020-07-23 stsp echo 'this is regular file foo' > $testroot/repo/dotgotfoo.link
2057 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -sf .got/bar dotgotbar.link)
2058 993e2a1b 2020-07-23 stsp (cd $testroot/repo && git rm -q nonexistent.link)
2059 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -sf gamma/delta zeta.link)
2060 993e2a1b 2020-07-23 stsp (cd $testroot/repo && ln -sf alpha new.link)
2061 993e2a1b 2020-07-23 stsp (cd $testroot/repo && git add .)
2062 993e2a1b 2020-07-23 stsp git_commit $testroot/repo -m "change symlinks"
2063 993e2a1b 2020-07-23 stsp local commit_id2=`git_show_head $testroot/repo`
2065 993e2a1b 2020-07-23 stsp # modified symlink to file A vs modified symlink to file B
2066 993e2a1b 2020-07-23 stsp (cd $testroot/wt && ln -sf gamma/delta alpha.link)
2067 993e2a1b 2020-07-23 stsp # modified symlink to dir A vs modified symlink to file B
2068 e6f45b72 2023-03-03 thomas (cd $testroot/wt && rm epsilon.link && ln -s beta epsilon.link)
2069 993e2a1b 2020-07-23 stsp # modeified symlink to file A vs modified symlink to dir B
2070 e6f45b72 2023-03-03 thomas (cd $testroot/wt && rm epsilon/beta.link && ln -s ../gamma \
2071 e6f45b72 2023-03-03 thomas epsilon/beta.link)
2072 993e2a1b 2020-07-23 stsp # added regular file A vs added bad symlink to file A
2073 993e2a1b 2020-07-23 stsp (cd $testroot/wt && ln -sf .got/bar dotgotfoo.link)
2074 3b9f0f87 2020-07-23 stsp (cd $testroot/wt && got add dotgotfoo.link > /dev/null)
2075 993e2a1b 2020-07-23 stsp # added bad symlink to file A vs added regular file A
2076 993e2a1b 2020-07-23 stsp echo 'this is regular file bar' > $testroot/wt/dotgotbar.link
2077 3b9f0f87 2020-07-23 stsp (cd $testroot/wt && got add dotgotbar.link > /dev/null)
2078 993e2a1b 2020-07-23 stsp # removed symlink to non-existent file A vs modified symlink
2079 993e2a1b 2020-07-23 stsp # to nonexistent file B
2080 993e2a1b 2020-07-23 stsp (cd $testroot/wt && ln -sf nonexistent2 nonexistent.link)
2081 993e2a1b 2020-07-23 stsp # modified symlink to file A vs removed symlink to file A
2082 993e2a1b 2020-07-23 stsp (cd $testroot/wt && got rm zeta.link > /dev/null)
2083 993e2a1b 2020-07-23 stsp # added symlink to file A vs added symlink to file B
2084 993e2a1b 2020-07-23 stsp (cd $testroot/wt && ln -sf beta new.link)
2085 993e2a1b 2020-07-23 stsp (cd $testroot/wt && got add new.link > /dev/null)
2087 993e2a1b 2020-07-23 stsp (cd $testroot/wt && got update > $testroot/stdout)
2089 993e2a1b 2020-07-23 stsp echo "C alpha.link" >> $testroot/stdout.expected
2090 3b9f0f87 2020-07-23 stsp echo "C dotgotbar.link" >> $testroot/stdout.expected
2091 3b9f0f87 2020-07-23 stsp echo "C dotgotfoo.link" >> $testroot/stdout.expected
2092 993e2a1b 2020-07-23 stsp echo "C epsilon/beta.link" >> $testroot/stdout.expected
2093 993e2a1b 2020-07-23 stsp echo "C epsilon.link" >> $testroot/stdout.expected
2094 993e2a1b 2020-07-23 stsp echo "C new.link" >> $testroot/stdout.expected
2095 993e2a1b 2020-07-23 stsp echo "C nonexistent.link" >> $testroot/stdout.expected
2096 993e2a1b 2020-07-23 stsp echo "G zeta.link" >> $testroot/stdout.expected
2097 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
2098 993e2a1b 2020-07-23 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
2099 993e2a1b 2020-07-23 stsp echo >> $testroot/stdout.expected
2100 3b9f0f87 2020-07-23 stsp echo "Files with new merge conflicts: 7" >> $testroot/stdout.expected
2102 993e2a1b 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2104 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2105 993e2a1b 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2106 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2110 993e2a1b 2020-07-23 stsp if [ -h $testroot/wt/alpha.link ]; then
2111 993e2a1b 2020-07-23 stsp echo "alpha.link is a symlink"
2112 993e2a1b 2020-07-23 stsp test_done "$testroot" "1"
2116 993e2a1b 2020-07-23 stsp echo "<<<<<<< merged change: commit $commit_id2" \
2117 283102fc 2020-07-23 stsp > $testroot/content.expected
2118 993e2a1b 2020-07-23 stsp echo "beta" >> $testroot/content.expected
2119 993e2a1b 2020-07-23 stsp echo "3-way merge base: commit $commit_id1" \
2120 993e2a1b 2020-07-23 stsp >> $testroot/content.expected
2121 993e2a1b 2020-07-23 stsp echo "alpha" >> $testroot/content.expected
2122 993e2a1b 2020-07-23 stsp echo "=======" >> $testroot/content.expected
2123 993e2a1b 2020-07-23 stsp echo "gamma/delta" >> $testroot/content.expected
2124 993e2a1b 2020-07-23 stsp echo '>>>>>>>' >> $testroot/content.expected
2125 993e2a1b 2020-07-23 stsp echo -n "" >> $testroot/content.expected
2127 993e2a1b 2020-07-23 stsp cp $testroot/wt/alpha.link $testroot/content
2128 993e2a1b 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2130 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2131 993e2a1b 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2132 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2136 993e2a1b 2020-07-23 stsp if [ -h $testroot/wt/epsilon.link ]; then
2137 993e2a1b 2020-07-23 stsp echo "epsilon.link is a symlink"
2138 993e2a1b 2020-07-23 stsp test_done "$testroot" "1"
2142 993e2a1b 2020-07-23 stsp echo "<<<<<<< merged change: commit $commit_id2" \
2143 283102fc 2020-07-23 stsp > $testroot/content.expected
2144 993e2a1b 2020-07-23 stsp echo "gamma" >> $testroot/content.expected
2145 993e2a1b 2020-07-23 stsp echo "3-way merge base: commit $commit_id1" \
2146 993e2a1b 2020-07-23 stsp >> $testroot/content.expected
2147 993e2a1b 2020-07-23 stsp echo "epsilon" >> $testroot/content.expected
2148 993e2a1b 2020-07-23 stsp echo "=======" >> $testroot/content.expected
2149 993e2a1b 2020-07-23 stsp echo "beta" >> $testroot/content.expected
2150 993e2a1b 2020-07-23 stsp echo '>>>>>>>' >> $testroot/content.expected
2151 993e2a1b 2020-07-23 stsp echo -n "" >> $testroot/content.expected
2153 993e2a1b 2020-07-23 stsp cp $testroot/wt/epsilon.link $testroot/content
2154 993e2a1b 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2156 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2157 993e2a1b 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2158 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2162 993e2a1b 2020-07-23 stsp if [ -h $testroot/wt/passwd.link ]; then
2163 993e2a1b 2020-07-23 stsp echo -n "passwd.link symlink points outside of work tree: " >&2
2164 993e2a1b 2020-07-23 stsp readlink $testroot/wt/passwd.link >&2
2165 993e2a1b 2020-07-23 stsp test_done "$testroot" "1"
2169 993e2a1b 2020-07-23 stsp echo -n "/etc/passwd" > $testroot/content.expected
2170 993e2a1b 2020-07-23 stsp cp $testroot/wt/passwd.link $testroot/content
2172 993e2a1b 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2174 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2175 993e2a1b 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2176 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2180 993e2a1b 2020-07-23 stsp if [ -h $testroot/wt/epsilon/beta.link ]; then
2181 993e2a1b 2020-07-23 stsp echo "epsilon/beta.link is a symlink"
2182 993e2a1b 2020-07-23 stsp test_done "$testroot" "1"
2186 993e2a1b 2020-07-23 stsp echo "<<<<<<< merged change: commit $commit_id2" \
2187 283102fc 2020-07-23 stsp > $testroot/content.expected
2188 993e2a1b 2020-07-23 stsp echo "../gamma/delta" >> $testroot/content.expected
2189 993e2a1b 2020-07-23 stsp echo "3-way merge base: commit $commit_id1" \
2190 993e2a1b 2020-07-23 stsp >> $testroot/content.expected
2191 993e2a1b 2020-07-23 stsp echo "../beta" >> $testroot/content.expected
2192 993e2a1b 2020-07-23 stsp echo "=======" >> $testroot/content.expected
2193 993e2a1b 2020-07-23 stsp echo "../gamma" >> $testroot/content.expected
2194 993e2a1b 2020-07-23 stsp echo '>>>>>>>' >> $testroot/content.expected
2195 993e2a1b 2020-07-23 stsp echo -n "" >> $testroot/content.expected
2197 993e2a1b 2020-07-23 stsp cp $testroot/wt/epsilon/beta.link $testroot/content
2198 993e2a1b 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2200 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2201 993e2a1b 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2202 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2206 993e2a1b 2020-07-23 stsp if [ -h $testroot/wt/nonexistent.link ]; then
2207 993e2a1b 2020-07-23 stsp echo -n "nonexistent.link still exists on disk: " >&2
2208 993e2a1b 2020-07-23 stsp readlink $testroot/wt/nonexistent.link >&2
2209 993e2a1b 2020-07-23 stsp test_done "$testroot" "1"
2213 993e2a1b 2020-07-23 stsp echo "<<<<<<< merged change: commit $commit_id2" \
2214 283102fc 2020-07-23 stsp > $testroot/content.expected
2215 993e2a1b 2020-07-23 stsp echo "(symlink was deleted)" >> $testroot/content.expected
2216 993e2a1b 2020-07-23 stsp echo "=======" >> $testroot/content.expected
2217 993e2a1b 2020-07-23 stsp echo "nonexistent2" >> $testroot/content.expected
2218 993e2a1b 2020-07-23 stsp echo '>>>>>>>' >> $testroot/content.expected
2219 993e2a1b 2020-07-23 stsp echo -n "" >> $testroot/content.expected
2221 993e2a1b 2020-07-23 stsp cp $testroot/wt/nonexistent.link $testroot/content
2222 993e2a1b 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2224 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2225 993e2a1b 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2226 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2230 993e2a1b 2020-07-23 stsp if [ -h $testroot/wt/dotgotfoo.link ]; then
2231 993e2a1b 2020-07-23 stsp echo "dotgotfoo.link is a symlink"
2232 993e2a1b 2020-07-23 stsp test_done "$testroot" "1"
2236 3b9f0f87 2020-07-23 stsp echo "<<<<<<< merged change: commit $commit_id2" \
2237 3b9f0f87 2020-07-23 stsp > $testroot/content.expected
2238 3b9f0f87 2020-07-23 stsp echo "this is regular file foo" >> $testroot/content.expected
2239 3b9f0f87 2020-07-23 stsp echo "=======" >> $testroot/content.expected
2240 3b9f0f87 2020-07-23 stsp echo -n ".got/bar" >> $testroot/content.expected
2241 3b9f0f87 2020-07-23 stsp echo '>>>>>>>' >> $testroot/content.expected
2242 3b9f0f87 2020-07-23 stsp echo -n "" >> $testroot/content.expected
2244 993e2a1b 2020-07-23 stsp cp $testroot/wt/dotgotfoo.link $testroot/content
2245 993e2a1b 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2247 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2248 993e2a1b 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2249 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2253 993e2a1b 2020-07-23 stsp if [ -h $testroot/wt/dotgotbar.link ]; then
2254 993e2a1b 2020-07-23 stsp echo "dotgotbar.link is a symlink"
2255 993e2a1b 2020-07-23 stsp test_done "$testroot" "1"
2258 3b9f0f87 2020-07-23 stsp echo "<<<<<<< merged change: commit $commit_id2" \
2259 3b9f0f87 2020-07-23 stsp > $testroot/content.expected
2260 3b9f0f87 2020-07-23 stsp echo -n ".got/bar" >> $testroot/content.expected
2261 3b9f0f87 2020-07-23 stsp echo "=======" >> $testroot/content.expected
2262 3b9f0f87 2020-07-23 stsp echo "this is regular file bar" >> $testroot/content.expected
2263 3b9f0f87 2020-07-23 stsp echo '>>>>>>>' >> $testroot/content.expected
2264 3b9f0f87 2020-07-23 stsp echo -n "" >> $testroot/content.expected
2266 993e2a1b 2020-07-23 stsp cp $testroot/wt/dotgotbar.link $testroot/content
2267 993e2a1b 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2269 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2270 993e2a1b 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2271 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2275 993e2a1b 2020-07-23 stsp if [ -h $testroot/wt/new.link ]; then
2276 993e2a1b 2020-07-23 stsp echo "new.link is a symlink"
2277 993e2a1b 2020-07-23 stsp test_done "$testroot" "1"
2281 993e2a1b 2020-07-23 stsp echo "<<<<<<< merged change: commit $commit_id2" \
2282 283102fc 2020-07-23 stsp > $testroot/content.expected
2283 993e2a1b 2020-07-23 stsp echo "alpha" >> $testroot/content.expected
2284 993e2a1b 2020-07-23 stsp echo "=======" >> $testroot/content.expected
2285 993e2a1b 2020-07-23 stsp echo "beta" >> $testroot/content.expected
2286 993e2a1b 2020-07-23 stsp echo '>>>>>>>' >> $testroot/content.expected
2287 993e2a1b 2020-07-23 stsp echo -n "" >> $testroot/content.expected
2289 993e2a1b 2020-07-23 stsp cp $testroot/wt/new.link $testroot/content
2290 993e2a1b 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2292 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2293 993e2a1b 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2294 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2298 993e2a1b 2020-07-23 stsp echo "A dotgotfoo.link" > $testroot/stdout.expected
2299 993e2a1b 2020-07-23 stsp echo "M new.link" >> $testroot/stdout.expected
2300 993e2a1b 2020-07-23 stsp echo "D nonexistent.link" >> $testroot/stdout.expected
2301 993e2a1b 2020-07-23 stsp (cd $testroot/wt && got status > $testroot/stdout)
2303 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2304 993e2a1b 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2305 993e2a1b 2020-07-23 stsp test_done "$testroot" "$ret"
2309 993e2a1b 2020-07-23 stsp test_done "$testroot" "0"
2313 194cb7cb 2021-01-19 stsp test_update_single_file() {
2314 194cb7cb 2021-01-19 stsp local testroot=`test_init update_single_file 1`
2316 194cb7cb 2021-01-19 stsp echo c1 > $testroot/repo/c
2317 194cb7cb 2021-01-19 stsp (cd $testroot/repo && git add .)
2318 79775c2f 2021-01-19 stsp git_commit $testroot/repo -m "adding file c"
2319 194cb7cb 2021-01-19 stsp local commit_id1=`git_show_head $testroot/repo`
2321 194cb7cb 2021-01-19 stsp echo a > $testroot/repo/a
2322 194cb7cb 2021-01-19 stsp echo b > $testroot/repo/b
2323 194cb7cb 2021-01-19 stsp echo c2 > $testroot/repo/c
2324 194cb7cb 2021-01-19 stsp (cd $testroot/repo && git add .)
2325 79775c2f 2021-01-19 stsp git_commit $testroot/repo -m "add files a and b, change c"
2326 194cb7cb 2021-01-19 stsp local commit_id2=`git_show_head $testroot/repo`
2328 d51387a0 2021-01-19 stsp (cd $testroot/repo && git rm -qf c)
2329 d51387a0 2021-01-19 stsp git_commit $testroot/repo -m "remove file c"
2330 d51387a0 2021-01-19 stsp local commit_id3=`git_show_head $testroot/repo`
2332 d51387a0 2021-01-19 stsp got checkout -c $commit_id2 $testroot/repo $testroot/wt > /dev/null
2334 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2335 194cb7cb 2021-01-19 stsp test_done "$testroot" "$ret"
2339 194cb7cb 2021-01-19 stsp echo "U c" > $testroot/stdout.expected
2340 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id1" \
2341 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2343 194cb7cb 2021-01-19 stsp (cd $testroot/wt && got update -c $commit_id1 c \
2344 194cb7cb 2021-01-19 stsp > $testroot/stdout)
2346 194cb7cb 2021-01-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2348 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2349 194cb7cb 2021-01-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
2350 194cb7cb 2021-01-19 stsp test_done "$testroot" "$ret"
2354 194cb7cb 2021-01-19 stsp echo c1 > $testroot/content.expected
2355 194cb7cb 2021-01-19 stsp cat $testroot/wt/c > $testroot/content
2357 194cb7cb 2021-01-19 stsp cmp -s $testroot/content.expected $testroot/content
2359 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2360 194cb7cb 2021-01-19 stsp diff -u $testroot/content.expected $testroot/content
2361 194cb7cb 2021-01-19 stsp test_done "$testroot" "$ret"
2365 194cb7cb 2021-01-19 stsp echo "U c" > $testroot/stdout.expected
2366 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id2" \
2367 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2369 d51387a0 2021-01-19 stsp (cd $testroot/wt && got update -c $commit_id2 c > $testroot/stdout)
2371 194cb7cb 2021-01-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2373 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2374 194cb7cb 2021-01-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
2375 194cb7cb 2021-01-19 stsp test_done "$testroot" "$ret"
2379 194cb7cb 2021-01-19 stsp echo c2 > $testroot/content.expected
2380 194cb7cb 2021-01-19 stsp cat $testroot/wt/c > $testroot/content
2382 194cb7cb 2021-01-19 stsp cmp -s $testroot/content.expected $testroot/content
2384 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2385 194cb7cb 2021-01-19 stsp diff -u $testroot/content.expected $testroot/content
2386 d51387a0 2021-01-19 stsp test_done "$testroot" "$ret"
2390 d51387a0 2021-01-19 stsp echo "D c" > $testroot/stdout.expected
2391 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id3" \
2392 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2394 d51387a0 2021-01-19 stsp (cd $testroot/wt && got update -c $commit_id3 c \
2395 d51387a0 2021-01-19 stsp > $testroot/stdout 2> $testroot/stderr)
2397 d51387a0 2021-01-19 stsp echo "got: /c: no such entry found in tree" > $testroot/stderr.expected
2398 d51387a0 2021-01-19 stsp cmp -s $testroot/stderr.expected $testroot/stderr
2400 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2401 d51387a0 2021-01-19 stsp diff -u $testroot/stderr.expected $testroot/stderr
2402 d51387a0 2021-01-19 stsp test_done "$testroot" "$ret"
2406 d51387a0 2021-01-19 stsp echo -n > $testroot/stdout.expected
2407 d51387a0 2021-01-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2409 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2410 d51387a0 2021-01-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
2411 d51387a0 2021-01-19 stsp test_done "$testroot" "$ret"
2415 d51387a0 2021-01-19 stsp echo "D c" > $testroot/stdout.expected
2416 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id3" \
2417 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2419 d51387a0 2021-01-19 stsp (cd $testroot/wt && got update -c $commit_id3 > $testroot/stdout)
2420 d51387a0 2021-01-19 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2422 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2423 d51387a0 2021-01-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
2424 d51387a0 2021-01-19 stsp test_done "$testroot" "$ret"
2428 d51387a0 2021-01-19 stsp if [ -e $testroot/wt/c ]; then
2429 d51387a0 2021-01-19 stsp echo "removed file c still exists on disk" >&2
2430 d51387a0 2021-01-19 stsp test_done "$testroot" "1"
2434 d51387a0 2021-01-19 stsp test_done "$testroot" "0"
2438 a769b60b 2021-06-27 stsp test_update_file_skipped_due_to_conflict() {
2439 a769b60b 2021-06-27 stsp local testroot=`test_init update_file_skipped_due_to_conflict`
2440 a769b60b 2021-06-27 stsp local commit_id0=`git_show_head $testroot/repo`
2441 a769b60b 2021-06-27 stsp blob_id0=`get_blob_id $testroot/repo "" beta`
2443 a769b60b 2021-06-27 stsp echo "changed beta" > $testroot/repo/beta
2444 a769b60b 2021-06-27 stsp git_commit $testroot/repo -m "changed beta"
2445 a769b60b 2021-06-27 stsp local commit_id1=`git_show_head $testroot/repo`
2446 a769b60b 2021-06-27 stsp blob_id1=`get_blob_id $testroot/repo "" beta`
2448 a769b60b 2021-06-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2450 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2451 a769b60b 2021-06-27 stsp test_done "$testroot" "$ret"
2455 a769b60b 2021-06-27 stsp blob_id=`(cd $testroot/wt && got info beta | grep 'blob:' | \
2456 a769b60b 2021-06-27 stsp cut -d ':' -f 2 | tr -d ' ')`
2457 a769b60b 2021-06-27 stsp if [ "$blob_id" != "$blob_id1" ]; then
2458 a769b60b 2021-06-27 stsp echo "file beta has the wrong base blob ID" >&2
2459 a769b60b 2021-06-27 stsp test_done "$testroot" "1"
2463 a769b60b 2021-06-27 stsp commit_id=`(cd $testroot/wt && got info beta | \
2464 a769b60b 2021-06-27 stsp grep 'based on commit:' | cut -d ':' -f 2 | tr -d ' ')`
2465 a769b60b 2021-06-27 stsp if [ "$commit_id" != "$commit_id1" ]; then
2466 a769b60b 2021-06-27 stsp echo "file beta has the wrong base commit ID" >&2
2467 a769b60b 2021-06-27 stsp test_done "$testroot" "1"
2471 a769b60b 2021-06-27 stsp echo "modified beta" > $testroot/wt/beta
2473 a769b60b 2021-06-27 stsp (cd $testroot/wt && got update -c $commit_id0 > $testroot/stdout)
2475 a769b60b 2021-06-27 stsp echo "C beta" > $testroot/stdout.expected
2476 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id0" \
2477 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2478 a769b60b 2021-06-27 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
2479 a769b60b 2021-06-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2481 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2482 a769b60b 2021-06-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
2483 a769b60b 2021-06-27 stsp test_done "$testroot" "$ret"
2487 a769b60b 2021-06-27 stsp echo "<<<<<<< merged change: commit $commit_id0" \
2488 a769b60b 2021-06-27 stsp > $testroot/content.expected
2489 a769b60b 2021-06-27 stsp echo "beta" >> $testroot/content.expected
2490 a769b60b 2021-06-27 stsp echo "||||||| 3-way merge base: commit $commit_id1" \
2491 a769b60b 2021-06-27 stsp >> $testroot/content.expected
2492 a769b60b 2021-06-27 stsp echo "changed beta" >> $testroot/content.expected
2493 a769b60b 2021-06-27 stsp echo "=======" >> $testroot/content.expected
2494 a769b60b 2021-06-27 stsp echo "modified beta" >> $testroot/content.expected
2495 a769b60b 2021-06-27 stsp echo ">>>>>>>" >> $testroot/content.expected
2497 a769b60b 2021-06-27 stsp cat $testroot/wt/beta > $testroot/content
2499 a769b60b 2021-06-27 stsp cmp -s $testroot/content.expected $testroot/content
2501 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2502 a769b60b 2021-06-27 stsp diff -u $testroot/content.expected $testroot/content
2503 a769b60b 2021-06-27 stsp test_done "$testroot" "$ret"
2507 a769b60b 2021-06-27 stsp blob_id=`(cd $testroot/wt && got info beta | grep 'blob:' | \
2508 a769b60b 2021-06-27 stsp cut -d ':' -f 2 | tr -d ' ')`
2509 a769b60b 2021-06-27 stsp if [ "$blob_id" != "$blob_id0" ]; then
2510 a769b60b 2021-06-27 stsp echo "file beta has the wrong base blob ID" >&2
2511 a769b60b 2021-06-27 stsp test_done "$testroot" "1"
2515 a769b60b 2021-06-27 stsp commit_id=`(cd $testroot/wt && got info beta | \
2516 a769b60b 2021-06-27 stsp grep 'based on commit:' | cut -d ':' -f 2 | tr -d ' ')`
2517 a769b60b 2021-06-27 stsp if [ "$commit_id" != "$commit_id0" ]; then
2518 a769b60b 2021-06-27 stsp echo "file beta has the wrong base commit ID" >&2
2519 a769b60b 2021-06-27 stsp test_done "$testroot" "1"
2523 a769b60b 2021-06-27 stsp # update to the latest commit again; this skips beta
2524 a769b60b 2021-06-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
2525 a769b60b 2021-06-27 stsp echo "# beta" > $testroot/stdout.expected
2526 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id1" \
2527 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2528 a769b60b 2021-06-27 stsp echo "Files not updated because of existing merge conflicts: 1" \
2529 a769b60b 2021-06-27 stsp >> $testroot/stdout.expected
2530 a769b60b 2021-06-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2532 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2533 a769b60b 2021-06-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
2534 a769b60b 2021-06-27 stsp test_done "$testroot" "$ret"
2538 a769b60b 2021-06-27 stsp # blob ID of beta should not have changed
2539 a769b60b 2021-06-27 stsp blob_id=`(cd $testroot/wt && got info beta | grep 'blob:' | \
2540 a769b60b 2021-06-27 stsp cut -d ':' -f 2 | tr -d ' ')`
2541 a769b60b 2021-06-27 stsp if [ "$blob_id" != "$blob_id0" ]; then
2542 a769b60b 2021-06-27 stsp echo "file beta has the wrong base blob ID" >&2
2543 a769b60b 2021-06-27 stsp test_done "$testroot" "1"
2547 a769b60b 2021-06-27 stsp # commit ID of beta should not have changed; There was a bug
2548 a769b60b 2021-06-27 stsp # here where the commit ID had been changed even though the
2549 a769b60b 2021-06-27 stsp # file was not updated.
2550 a769b60b 2021-06-27 stsp commit_id=`(cd $testroot/wt && got info beta | \
2551 a769b60b 2021-06-27 stsp grep 'based on commit:' | cut -d ':' -f 2 | tr -d ' ')`
2552 a769b60b 2021-06-27 stsp if [ "$commit_id" != "$commit_id0" ]; then
2553 a769b60b 2021-06-27 stsp echo "file beta has the wrong base commit ID: $commit_id" >&2
2554 a769b60b 2021-06-27 stsp test_done "$testroot" "1"
2558 a769b60b 2021-06-27 stsp # beta is still conflicted and based on commit 0
2559 a769b60b 2021-06-27 stsp echo 'C beta' > $testroot/stdout.expected
2560 a769b60b 2021-06-27 stsp (cd $testroot/wt && got status > $testroot/stdout)
2561 a769b60b 2021-06-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2563 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2564 a769b60b 2021-06-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
2565 a769b60b 2021-06-27 stsp test_done "$testroot" "$ret"
2569 a769b60b 2021-06-27 stsp # resolve the conflict via revert
2570 a769b60b 2021-06-27 stsp (cd $testroot/wt && got revert beta >/dev/null)
2572 a769b60b 2021-06-27 stsp # beta now matches its base blob which is still from commit 0
2573 a769b60b 2021-06-27 stsp echo "beta" > $testroot/content.expected
2574 a769b60b 2021-06-27 stsp cat $testroot/wt/beta > $testroot/content
2575 a769b60b 2021-06-27 stsp cmp -s $testroot/content.expected $testroot/content
2577 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2578 a769b60b 2021-06-27 stsp diff -u $testroot/content.expected $testroot/content
2579 a769b60b 2021-06-27 stsp test_done "$testroot" "$ret"
2583 a769b60b 2021-06-27 stsp # updating to the latest commit should now update beta
2584 a769b60b 2021-06-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
2585 a769b60b 2021-06-27 stsp echo "U beta" > $testroot/stdout.expected
2586 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id1" \
2587 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2588 2c41dce7 2021-06-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2590 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2591 2c41dce7 2021-06-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
2592 2c41dce7 2021-06-27 stsp test_done "$testroot" "$ret"
2596 2c41dce7 2021-06-27 stsp blob_id=`(cd $testroot/wt && got info beta | grep 'blob:' | \
2597 2c41dce7 2021-06-27 stsp cut -d ':' -f 2 | tr -d ' ')`
2598 2c41dce7 2021-06-27 stsp if [ "$blob_id" != "$blob_id1" ]; then
2599 2c41dce7 2021-06-27 stsp echo "file beta has the wrong base blob ID" >&2
2600 2c41dce7 2021-06-27 stsp test_done "$testroot" "1"
2604 2c41dce7 2021-06-27 stsp commit_id=`(cd $testroot/wt && got info beta | \
2605 2c41dce7 2021-06-27 stsp grep 'based on commit:' | cut -d ':' -f 2 | tr -d ' ')`
2606 2c41dce7 2021-06-27 stsp if [ "$commit_id" != "$commit_id1" ]; then
2607 2c41dce7 2021-06-27 stsp echo "file beta has the wrong base commit ID: $commit_id" >&2
2608 2c41dce7 2021-06-27 stsp test_done "$testroot" "1"
2612 2c41dce7 2021-06-27 stsp echo "changed beta" > $testroot/content.expected
2613 2c41dce7 2021-06-27 stsp cat $testroot/wt/beta > $testroot/content
2614 2c41dce7 2021-06-27 stsp cmp -s $testroot/content.expected $testroot/content
2616 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2617 2c41dce7 2021-06-27 stsp diff -u $testroot/content.expected $testroot/content
2619 2c41dce7 2021-06-27 stsp test_done "$testroot" "$ret"
2622 2c41dce7 2021-06-27 stsp test_update_file_skipped_due_to_obstruction() {
2623 2c41dce7 2021-06-27 stsp local testroot=`test_init update_file_skipped_due_to_obstruction`
2624 2c41dce7 2021-06-27 stsp local commit_id0=`git_show_head $testroot/repo`
2625 2c41dce7 2021-06-27 stsp blob_id0=`get_blob_id $testroot/repo "" beta`
2627 2c41dce7 2021-06-27 stsp echo "changed beta" > $testroot/repo/beta
2628 e6f4ba31 2021-09-24 thomas echo "new file" > $testroot/repo/new
2629 e6f4ba31 2021-09-24 thomas (cd $testroot/repo && git add new)
2630 2c41dce7 2021-06-27 stsp git_commit $testroot/repo -m "changed beta"
2631 2c41dce7 2021-06-27 stsp local commit_id1=`git_show_head $testroot/repo`
2632 2c41dce7 2021-06-27 stsp blob_id1=`get_blob_id $testroot/repo "" beta`
2634 2c41dce7 2021-06-27 stsp got checkout -c $commit_id0 $testroot/repo $testroot/wt > /dev/null
2636 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2637 2c41dce7 2021-06-27 stsp test_done "$testroot" "$ret"
2641 2c41dce7 2021-06-27 stsp blob_id=`(cd $testroot/wt && got info beta | grep 'blob:' | \
2642 2c41dce7 2021-06-27 stsp cut -d ':' -f 2 | tr -d ' ')`
2643 2c41dce7 2021-06-27 stsp if [ "$blob_id" != "$blob_id0" ]; then
2644 2c41dce7 2021-06-27 stsp echo "file beta has the wrong base blob ID" >&2
2645 2c41dce7 2021-06-27 stsp test_done "$testroot" "1"
2649 2c41dce7 2021-06-27 stsp commit_id=`(cd $testroot/wt && got info beta | \
2650 2c41dce7 2021-06-27 stsp grep 'based on commit:' | cut -d ':' -f 2 | tr -d ' ')`
2651 2c41dce7 2021-06-27 stsp if [ "$commit_id" != "$commit_id0" ]; then
2652 2c41dce7 2021-06-27 stsp echo "file beta has the wrong base commit ID" >&2
2653 2c41dce7 2021-06-27 stsp test_done "$testroot" "1"
2657 2c41dce7 2021-06-27 stsp rm $testroot/wt/beta
2658 2c41dce7 2021-06-27 stsp mkdir -p $testroot/wt/beta/psi
2659 e6f4ba31 2021-09-24 thomas mkdir -p $testroot/wt/new
2661 e6f4ba31 2021-09-24 thomas # update to the latest commit; this skips beta and the new file
2662 2c41dce7 2021-06-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
2664 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2665 e6f4ba31 2021-09-24 thomas echo "update failed unexpectedly" >&2
2666 e6f4ba31 2021-09-24 thomas test_done "$testroot" "1"
2667 e6f4ba31 2021-09-24 thomas return 1
2670 2c41dce7 2021-06-27 stsp echo "~ beta" > $testroot/stdout.expected
2671 e6f4ba31 2021-09-24 thomas echo "~ new" >> $testroot/stdout.expected
2672 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id1" \
2673 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2674 e6f4ba31 2021-09-24 thomas echo "File paths obstructed by a non-regular file: 2" \
2675 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2676 a769b60b 2021-06-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2678 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2679 a769b60b 2021-06-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
2680 a769b60b 2021-06-27 stsp test_done "$testroot" "$ret"
2684 a769b60b 2021-06-27 stsp blob_id=`(cd $testroot/wt && got info beta | grep 'blob:' | \
2685 a769b60b 2021-06-27 stsp cut -d ':' -f 2 | tr -d ' ')`
2686 2c41dce7 2021-06-27 stsp if [ "$blob_id" != "$blob_id0" ]; then
2687 2c41dce7 2021-06-27 stsp echo "file beta has the wrong base blob ID" >&2
2688 2c41dce7 2021-06-27 stsp test_done "$testroot" "1"
2692 2c41dce7 2021-06-27 stsp commit_id=`(cd $testroot/wt && got info beta | \
2693 2c41dce7 2021-06-27 stsp grep 'based on commit:' | cut -d ':' -f 2 | tr -d ' ')`
2694 2c41dce7 2021-06-27 stsp if [ "$commit_id" != "$commit_id0" ]; then
2695 2c41dce7 2021-06-27 stsp echo "file beta has the wrong base commit ID" >&2
2696 2c41dce7 2021-06-27 stsp test_done "$testroot" "1"
2700 2c41dce7 2021-06-27 stsp # remove the directory which obstructs file beta
2701 2c41dce7 2021-06-27 stsp rm -r $testroot/wt/beta
2703 2c41dce7 2021-06-27 stsp # updating to the latest commit should now update beta
2704 2c41dce7 2021-06-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
2705 2c41dce7 2021-06-27 stsp echo "! beta" > $testroot/stdout.expected
2706 e6f4ba31 2021-09-24 thomas echo "~ new" >> $testroot/stdout.expected
2707 4f3c844b 2021-09-14 stsp echo "Updated to refs/heads/master: $commit_id1" \
2708 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
2709 e6f4ba31 2021-09-24 thomas echo "File paths obstructed by a non-regular file: 1" \
2710 e6f4ba31 2021-09-24 thomas >> $testroot/stdout.expected
2711 2c41dce7 2021-06-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2713 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2714 2c41dce7 2021-06-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
2715 2c41dce7 2021-06-27 stsp test_done "$testroot" "$ret"
2719 2c41dce7 2021-06-27 stsp blob_id=`(cd $testroot/wt && got info beta | grep 'blob:' | \
2720 2c41dce7 2021-06-27 stsp cut -d ':' -f 2 | tr -d ' ')`
2721 a769b60b 2021-06-27 stsp if [ "$blob_id" != "$blob_id1" ]; then
2722 a769b60b 2021-06-27 stsp echo "file beta has the wrong base blob ID" >&2
2723 a769b60b 2021-06-27 stsp test_done "$testroot" "1"
2727 a769b60b 2021-06-27 stsp commit_id=`(cd $testroot/wt && got info beta | \
2728 a769b60b 2021-06-27 stsp grep 'based on commit:' | cut -d ':' -f 2 | tr -d ' ')`
2729 a769b60b 2021-06-27 stsp if [ "$commit_id" != "$commit_id1" ]; then
2730 a769b60b 2021-06-27 stsp echo "file beta has the wrong base commit ID: $commit_id" >&2
2731 a769b60b 2021-06-27 stsp test_done "$testroot" "1"
2735 a769b60b 2021-06-27 stsp echo "changed beta" > $testroot/content.expected
2736 a769b60b 2021-06-27 stsp cat $testroot/wt/beta > $testroot/content
2737 a769b60b 2021-06-27 stsp cmp -s $testroot/content.expected $testroot/content
2739 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2740 a769b60b 2021-06-27 stsp diff -u $testroot/content.expected $testroot/content
2742 a769b60b 2021-06-27 stsp test_done "$testroot" "$ret"
2745 67c65ed7 2021-09-14 tracey test_update_quiet() {
2746 67c65ed7 2021-09-14 tracey local testroot=`test_init update_quiet`
2748 67c65ed7 2021-09-14 tracey got checkout $testroot/repo $testroot/wt > /dev/null
2750 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2751 67c65ed7 2021-09-14 tracey test_done "$testroot" "$ret"
2752 67c65ed7 2021-09-14 tracey return 1
2755 67c65ed7 2021-09-14 tracey echo "modified alpha" > $testroot/repo/alpha
2756 67c65ed7 2021-09-14 tracey git_commit $testroot/repo -m "modified alpha"
2758 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
2759 67c65ed7 2021-09-14 tracey git_show_head $testroot/repo >> $testroot/stdout.expected
2760 67c65ed7 2021-09-14 tracey echo >> $testroot/stdout.expected
2762 67c65ed7 2021-09-14 tracey (cd $testroot/wt && got update -q > $testroot/stdout)
2764 67c65ed7 2021-09-14 tracey cmp -s $testroot/stdout.expected $testroot/stdout
2766 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2767 67c65ed7 2021-09-14 tracey diff -u $testroot/stdout.expected $testroot/stdout
2768 67c65ed7 2021-09-14 tracey test_done "$testroot" "$ret"
2769 67c65ed7 2021-09-14 tracey return 1
2772 67c65ed7 2021-09-14 tracey echo "modified alpha" > $testroot/content.expected
2773 67c65ed7 2021-09-14 tracey cat $testroot/wt/alpha > $testroot/content
2775 67c65ed7 2021-09-14 tracey cmp -s $testroot/content.expected $testroot/content
2777 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2778 67c65ed7 2021-09-14 tracey diff -u $testroot/content.expected $testroot/content
2780 67c65ed7 2021-09-14 tracey test_done "$testroot" "$ret"
2783 24f136e0 2021-11-20 thomas test_update_binary_file() {
2784 24f136e0 2021-11-20 thomas local testroot=`test_init update_binary_file`
2785 24f136e0 2021-11-20 thomas local commit_id0=`git_show_head $testroot/repo`
2787 24f136e0 2021-11-20 thomas got checkout $testroot/repo $testroot/wt > /dev/null
2789 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2790 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2791 24f136e0 2021-11-20 thomas return 1
2794 24f136e0 2021-11-20 thomas cp /bin/ls $testroot/wt/foo
2795 24f136e0 2021-11-20 thomas chmod 755 $testroot/wt/foo
2796 24f136e0 2021-11-20 thomas (cd $testroot/wt && got add foo >/dev/null)
2797 24f136e0 2021-11-20 thomas (cd $testroot/wt && got commit -m 'add binary file' > /dev/null)
2798 24f136e0 2021-11-20 thomas local commit_id1=`git_show_head $testroot/repo`
2800 24f136e0 2021-11-20 thomas cp /bin/cat $testroot/wt/foo
2801 24f136e0 2021-11-20 thomas chmod 755 $testroot/wt/foo
2802 24f136e0 2021-11-20 thomas (cd $testroot/wt && got commit -m 'change binary file' > /dev/null)
2803 24f136e0 2021-11-20 thomas local commit_id2=`git_show_head $testroot/repo`
2805 24f136e0 2021-11-20 thomas cp /bin/cp $testroot/wt/foo
2806 24f136e0 2021-11-20 thomas chmod 755 $testroot/wt/foo
2807 24f136e0 2021-11-20 thomas (cd $testroot/wt && got commit -m 'change binary file' > /dev/null)
2808 24f136e0 2021-11-20 thomas local commit_id3=`git_show_head $testroot/repo`
2810 24f136e0 2021-11-20 thomas (cd $testroot/wt && got rm foo >/dev/null)
2811 24f136e0 2021-11-20 thomas (cd $testroot/wt && got commit -m 'remove binary file' > /dev/null)
2812 24f136e0 2021-11-20 thomas local commit_id4=`git_show_head $testroot/repo`
2814 24f136e0 2021-11-20 thomas # backdate the work tree to make it usable for updating
2815 24f136e0 2021-11-20 thomas (cd $testroot/wt && got up -c $commit_id0 > /dev/null)
2817 24f136e0 2021-11-20 thomas # update which adds a binary file
2818 24f136e0 2021-11-20 thomas (cd $testroot/wt && got up -c $commit_id1 > $testroot/stdout)
2820 24f136e0 2021-11-20 thomas echo "A foo" > $testroot/stdout.expected
2821 24f136e0 2021-11-20 thomas echo -n "Updated to refs/heads/master: $commit_id1" \
2822 24f136e0 2021-11-20 thomas >> $testroot/stdout.expected
2823 24f136e0 2021-11-20 thomas echo >> $testroot/stdout.expected
2824 24f136e0 2021-11-20 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2826 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2827 24f136e0 2021-11-20 thomas diff -u $testroot/stdout.expected $testroot/stdout
2828 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2829 24f136e0 2021-11-20 thomas return 1
2832 24f136e0 2021-11-20 thomas cp /bin/ls $testroot/content.expected
2833 24f136e0 2021-11-20 thomas chmod 755 $testroot/content.expected
2834 24f136e0 2021-11-20 thomas cat $testroot/wt/foo > $testroot/content
2836 24f136e0 2021-11-20 thomas cmp -s $testroot/content.expected $testroot/content
2838 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2839 24f136e0 2021-11-20 thomas diff -u $testroot/content.expected $testroot/content
2840 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2841 24f136e0 2021-11-20 thomas return 1
2844 24f136e0 2021-11-20 thomas # update which adds a conflicting binary file
2845 24f136e0 2021-11-20 thomas (cd $testroot/wt && got up -c $commit_id0 > /dev/null)
2846 24f136e0 2021-11-20 thomas cp /bin/cat $testroot/wt/foo
2847 24f136e0 2021-11-20 thomas chmod 755 $testroot/wt/foo
2848 24f136e0 2021-11-20 thomas (cd $testroot/wt && got add foo > /dev/null)
2849 24f136e0 2021-11-20 thomas (cd $testroot/wt && got up -c $commit_id1 > $testroot/stdout)
2851 24f136e0 2021-11-20 thomas echo "C foo" > $testroot/stdout.expected
2852 24f136e0 2021-11-20 thomas echo "Updated to refs/heads/master: $commit_id1" \
2853 24f136e0 2021-11-20 thomas >> $testroot/stdout.expected
2854 24f136e0 2021-11-20 thomas echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
2855 24f136e0 2021-11-20 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2857 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2858 24f136e0 2021-11-20 thomas diff -u $testroot/stdout.expected $testroot/stdout
2859 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2860 24f136e0 2021-11-20 thomas return 1
2863 24f136e0 2021-11-20 thomas echo "Binary files differ and cannot be merged automatically:" \
2864 24f136e0 2021-11-20 thomas > $testroot/content.expected
2865 24f136e0 2021-11-20 thomas echo "<<<<<<< merged change: commit $commit_id1" \
2866 24f136e0 2021-11-20 thomas >> $testroot/content.expected
2867 24f136e0 2021-11-20 thomas echo -n "file " >> $testroot/content.expected
2868 24f136e0 2021-11-20 thomas ls $testroot/wt/foo-1-* >> $testroot/content.expected
2869 24f136e0 2021-11-20 thomas echo '=======' >> $testroot/content.expected
2870 24f136e0 2021-11-20 thomas echo -n "file " >> $testroot/content.expected
2871 24f136e0 2021-11-20 thomas ls $testroot/wt/foo-2-* >> $testroot/content.expected
2872 24f136e0 2021-11-20 thomas echo ">>>>>>>" >> $testroot/content.expected
2873 24f136e0 2021-11-20 thomas cat $testroot/wt/foo > $testroot/content
2875 24f136e0 2021-11-20 thomas cmp -s $testroot/content.expected $testroot/content
2877 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2878 24f136e0 2021-11-20 thomas diff -u $testroot/content.expected $testroot/content
2879 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2880 24f136e0 2021-11-20 thomas return 1
2883 24f136e0 2021-11-20 thomas cp /bin/ls $testroot/content.expected
2884 24f136e0 2021-11-20 thomas chmod 755 $testroot/content.expected
2885 24f136e0 2021-11-20 thomas cat $testroot/wt/foo-1-* > $testroot/content
2887 24f136e0 2021-11-20 thomas cmp -s $testroot/content.expected $testroot/content
2889 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2890 24f136e0 2021-11-20 thomas diff -u $testroot/content.expected $testroot/content
2891 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2892 24f136e0 2021-11-20 thomas return 1
2895 24f136e0 2021-11-20 thomas cp /bin/cat $testroot/content.expected
2896 24f136e0 2021-11-20 thomas chmod 755 $testroot/content.expected
2897 24f136e0 2021-11-20 thomas cat $testroot/wt/foo-2-* > $testroot/content
2899 24f136e0 2021-11-20 thomas cmp -s $testroot/content.expected $testroot/content
2901 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2902 24f136e0 2021-11-20 thomas diff -u $testroot/content.expected $testroot/content
2903 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2904 24f136e0 2021-11-20 thomas return 1
2907 24f136e0 2021-11-20 thomas # tidy up
2908 24f136e0 2021-11-20 thomas (cd $testroot/wt && got revert -R . >/dev/null)
2909 24f136e0 2021-11-20 thomas rm $testroot/wt/foo-1-* $testroot/wt/foo-2-*
2910 24f136e0 2021-11-20 thomas (cd $testroot/wt && got up -c $commit_id1 > /dev/null)
2912 24f136e0 2021-11-20 thomas # update which changes a binary file
2913 24f136e0 2021-11-20 thomas (cd $testroot/wt && got up -c $commit_id2 > $testroot/stdout)
2915 24f136e0 2021-11-20 thomas echo "U foo" > $testroot/stdout.expected
2916 24f136e0 2021-11-20 thomas echo -n "Updated to refs/heads/master: $commit_id2" \
2917 24f136e0 2021-11-20 thomas >> $testroot/stdout.expected
2918 24f136e0 2021-11-20 thomas echo >> $testroot/stdout.expected
2919 24f136e0 2021-11-20 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2921 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2922 24f136e0 2021-11-20 thomas diff -u $testroot/stdout.expected $testroot/stdout
2923 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2924 24f136e0 2021-11-20 thomas return 1
2927 24f136e0 2021-11-20 thomas cp /bin/cat $testroot/content.expected
2928 24f136e0 2021-11-20 thomas chmod 755 $testroot/content.expected
2929 24f136e0 2021-11-20 thomas cat $testroot/wt/foo > $testroot/content
2931 24f136e0 2021-11-20 thomas cmp -s $testroot/content.expected $testroot/content
2933 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2934 24f136e0 2021-11-20 thomas diff -u $testroot/content.expected $testroot/content
2935 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2936 24f136e0 2021-11-20 thomas return 1
2939 24f136e0 2021-11-20 thomas # update which changes a locally modified binary file
2940 24f136e0 2021-11-20 thomas cp /bin/ls $testroot/wt/foo
2941 24f136e0 2021-11-20 thomas chmod 755 $testroot/wt/foo
2942 24f136e0 2021-11-20 thomas (cd $testroot/wt && got up -c $commit_id3 > $testroot/stdout)
2944 24f136e0 2021-11-20 thomas echo "C foo" > $testroot/stdout.expected
2945 24f136e0 2021-11-20 thomas echo -n "Updated to refs/heads/master: $commit_id3" \
2946 24f136e0 2021-11-20 thomas >> $testroot/stdout.expected
2947 24f136e0 2021-11-20 thomas echo >> $testroot/stdout.expected
2948 24f136e0 2021-11-20 thomas echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
2949 24f136e0 2021-11-20 thomas cmp -s $testroot/stdout.expected $testroot/stdout
2951 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2952 24f136e0 2021-11-20 thomas diff -u $testroot/stdout.expected $testroot/stdout
2953 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2954 24f136e0 2021-11-20 thomas return 1
2957 24f136e0 2021-11-20 thomas echo "Binary files differ and cannot be merged automatically:" \
2958 24f136e0 2021-11-20 thomas > $testroot/content.expected
2959 24f136e0 2021-11-20 thomas echo "<<<<<<< merged change: commit $commit_id3" \
2960 24f136e0 2021-11-20 thomas >> $testroot/content.expected
2961 24f136e0 2021-11-20 thomas echo -n "file " >> $testroot/content.expected
2962 24f136e0 2021-11-20 thomas ls $testroot/wt/foo-1-* >> $testroot/content.expected
2963 24f136e0 2021-11-20 thomas echo "||||||| 3-way merge base: commit $commit_id2" \
2964 24f136e0 2021-11-20 thomas >> $testroot/content.expected
2965 24f136e0 2021-11-20 thomas echo -n "file " >> $testroot/content.expected
2966 24f136e0 2021-11-20 thomas ls $testroot/wt/foo-orig-* >> $testroot/content.expected
2967 24f136e0 2021-11-20 thomas echo '=======' >> $testroot/content.expected
2968 24f136e0 2021-11-20 thomas echo -n "file " >> $testroot/content.expected
2969 24f136e0 2021-11-20 thomas ls $testroot/wt/foo-2-* >> $testroot/content.expected
2970 24f136e0 2021-11-20 thomas echo ">>>>>>>" >> $testroot/content.expected
2971 24f136e0 2021-11-20 thomas cat $testroot/wt/foo > $testroot/content
2973 24f136e0 2021-11-20 thomas cmp -s $testroot/content.expected $testroot/content
2975 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2976 24f136e0 2021-11-20 thomas diff -u $testroot/content.expected $testroot/content
2977 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2978 24f136e0 2021-11-20 thomas return 1
2981 24f136e0 2021-11-20 thomas cp /bin/cp $testroot/content.expected
2982 24f136e0 2021-11-20 thomas chmod 755 $testroot/content.expected
2983 24f136e0 2021-11-20 thomas cp $testroot/wt/foo-1-* $testroot/content
2984 24f136e0 2021-11-20 thomas cmp -s $testroot/content.expected $testroot/content
2986 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2987 24f136e0 2021-11-20 thomas diff -u $testroot/content.expected $testroot/content
2988 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
2989 24f136e0 2021-11-20 thomas return 1
2992 24f136e0 2021-11-20 thomas cp /bin/ls $testroot/content.expected
2993 24f136e0 2021-11-20 thomas chmod 755 $testroot/content.expected
2994 24f136e0 2021-11-20 thomas cp $testroot/wt/foo-2-* $testroot/content
2995 24f136e0 2021-11-20 thomas cmp -s $testroot/content.expected $testroot/content
2997 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
2998 24f136e0 2021-11-20 thomas diff -u $testroot/content.expected $testroot/content
2999 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
3000 24f136e0 2021-11-20 thomas return 1
3003 24f136e0 2021-11-20 thomas (cd $testroot/wt && got status > $testroot/stdout)
3004 8de9d8ad 2023-02-20 thomas echo 'C foo' > $testroot/stdout.expected
3005 24f136e0 2021-11-20 thomas echo -n '? ' >> $testroot/stdout.expected
3006 24f136e0 2021-11-20 thomas (cd $testroot/wt && ls foo-1-* >> $testroot/stdout.expected)
3007 24f136e0 2021-11-20 thomas echo -n '? ' >> $testroot/stdout.expected
3008 24f136e0 2021-11-20 thomas (cd $testroot/wt && ls foo-2-* >> $testroot/stdout.expected)
3009 24f136e0 2021-11-20 thomas echo -n '? ' >> $testroot/stdout.expected
3010 24f136e0 2021-11-20 thomas (cd $testroot/wt && ls foo-orig-* >> $testroot/stdout.expected)
3011 24f136e0 2021-11-20 thomas cmp -s $testroot/stdout.expected $testroot/stdout
3013 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
3014 24f136e0 2021-11-20 thomas diff -u $testroot/stdout.expected $testroot/stdout
3015 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
3016 24f136e0 2021-11-20 thomas return 1
3019 24f136e0 2021-11-20 thomas # tidy up
3020 24f136e0 2021-11-20 thomas (cd $testroot/wt && got revert -R . > /dev/null)
3021 24f136e0 2021-11-20 thomas rm $testroot/wt/foo-orig-* $testroot/wt/foo-1-* $testroot/wt/foo-2-*
3023 24f136e0 2021-11-20 thomas # update which deletes a binary file
3024 24f136e0 2021-11-20 thomas (cd $testroot/wt && got up -c $commit_id4 > $testroot/stdout)
3025 24f136e0 2021-11-20 thomas echo "D foo" > $testroot/stdout.expected
3026 24f136e0 2021-11-20 thomas echo -n "Updated to refs/heads/master: $commit_id4" \
3027 24f136e0 2021-11-20 thomas >> $testroot/stdout.expected
3028 24f136e0 2021-11-20 thomas echo >> $testroot/stdout.expected
3029 24f136e0 2021-11-20 thomas cmp -s $testroot/stdout.expected $testroot/stdout
3031 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
3032 24f136e0 2021-11-20 thomas diff -u $testroot/stdout.expected $testroot/stdout
3033 24f136e0 2021-11-20 thomas test_done "$testroot" "$ret"
3036 24f136e0 2021-11-20 thomas if [ -e $testroot/wt/foo ]; then
3037 24f136e0 2021-11-20 thomas echo "removed file foo still exists on disk" >&2
3038 24f136e0 2021-11-20 thomas test_done "$testroot" "1"
3039 24f136e0 2021-11-20 thomas return 1
3041 24f136e0 2021-11-20 thomas test_done "$testroot" "0"
3044 a2c162eb 2022-10-30 thomas test_update_umask() {
3045 a2c162eb 2022-10-30 thomas local testroot=`test_init update_binary_file`
3047 a2c162eb 2022-10-30 thomas got checkout "$testroot/repo" "$testroot/wt" >/dev/null
3049 a2c162eb 2022-10-30 thomas if [ $ret -ne 0 ]; then
3050 a2c162eb 2022-10-30 thomas test_done "$testroot" "$ret"
3051 a2c162eb 2022-10-30 thomas return 1
3054 a2c162eb 2022-10-30 thomas rm "$testroot/wt/alpha"
3056 a2c162eb 2022-10-30 thomas # using a subshell to avoid clobbering global umask
3057 a2c162eb 2022-10-30 thomas (umask 022 && cd "$testroot/wt" && got update alpha) \
3058 a2c162eb 2022-10-30 thomas >/dev/null 2>/dev/null
3060 a2c162eb 2022-10-30 thomas if [ $ret -ne 0 ]; then
3061 a2c162eb 2022-10-30 thomas test_done "$testroot" $ret
3062 a2c162eb 2022-10-30 thomas return 1
3065 a2c162eb 2022-10-30 thomas if ! ls -l "$testroot/wt/alpha" | grep -q ^-rw-r--r--; then
3066 a2c162eb 2022-10-30 thomas echo "alpha is not 0644" >&2
3067 a2c162eb 2022-10-30 thomas test_done "$testroot" 1
3068 a2c162eb 2022-10-30 thomas return 1
3071 a2c162eb 2022-10-30 thomas rm "$testroot/wt/alpha"
3073 a2c162eb 2022-10-30 thomas # using a subshell to avoid clobbering global umask
3074 a2c162eb 2022-10-30 thomas (umask 044 && cd "$testroot/wt" && got update alpha) \
3075 a2c162eb 2022-10-30 thomas >/dev/null 2>/dev/null
3077 a2c162eb 2022-10-30 thomas if [ $ret -ne 0 ]; then
3078 a2c162eb 2022-10-30 thomas test_done "$testroot" $ret
3079 a2c162eb 2022-10-30 thomas return 1
3082 a2c162eb 2022-10-30 thomas if ! ls -l "$testroot/wt/alpha" | grep -q ^-rw-------; then
3083 a2c162eb 2022-10-30 thomas echo "alpha is not 0600" >&2
3084 a2c162eb 2022-10-30 thomas test_done "$testroot" 1
3085 a2c162eb 2022-10-30 thomas return 1
3088 a2c162eb 2022-10-30 thomas rm "$testroot/wt/alpha"
3090 a2c162eb 2022-10-30 thomas # using a subshell to avoid clobbering global umask
3091 a2c162eb 2022-10-30 thomas (umask 222 && cd "$testroot/wt" && got update alpha) \
3092 a2c162eb 2022-10-30 thomas >/dev/null 2>/dev/null
3094 a2c162eb 2022-10-30 thomas if [ $ret -ne 0 ]; then
3095 a2c162eb 2022-10-30 thomas test_done "$testroot" $ret
3096 a2c162eb 2022-10-30 thomas return 1
3099 a2c162eb 2022-10-30 thomas if ! ls -l "$testroot/wt/alpha" | grep -q ^-r--r--r--; then
3100 a2c162eb 2022-10-30 thomas echo "alpha is not 0444" >&2
3101 a2c162eb 2022-10-30 thomas test_done "$testroot" 1
3102 a2c162eb 2022-10-30 thomas return 1;
3105 a2c162eb 2022-10-30 thomas test_done "$testroot" 0
3108 7fb414ae 2020-08-08 stsp test_parseargs "$@"
3109 c84d8c75 2019-01-02 stsp run_test test_update_basic
3110 3b4d3732 2019-01-02 stsp run_test test_update_adds_file
3111 512f0d0e 2019-01-02 stsp run_test test_update_deletes_file
3112 f5c49f82 2019-01-06 stsp run_test test_update_deletes_dir
3113 5cc266ba 2019-01-06 stsp run_test test_update_deletes_dir_with_path_prefix
3114 90285c3b 2019-01-08 stsp run_test test_update_deletes_dir_recursively
3115 4482e97b 2019-01-08 stsp run_test test_update_sibling_dirs_with_common_prefix
3116 50952927 2019-01-12 stsp run_test test_update_dir_with_dot_sibling
3117 46cee7a3 2019-01-12 stsp run_test test_update_moves_files_upwards
3118 bd4792ec 2019-01-13 stsp run_test test_update_moves_files_to_new_dir
3119 4a1ddfc2 2019-01-12 stsp run_test test_update_creates_missing_parent
3120 bd4792ec 2019-01-13 stsp run_test test_update_creates_missing_parent_with_subdir
3121 21908da4 2019-01-13 stsp run_test test_update_file_in_subsubdir
3122 7b074ee1 2023-03-01 thomas run_test test_update_changes_file_to_dir
3123 6353ad76 2019-02-08 stsp run_test test_update_merges_file_edits
3124 68ed9ba5 2019-02-10 stsp run_test test_update_keeps_xbit
3125 ba8a0d4d 2019-02-10 stsp run_test test_update_clears_xbit
3126 a378724f 2019-02-10 stsp run_test test_update_restores_missing_file
3127 085d5bcf 2019-03-27 stsp run_test test_update_conflict_wt_add_vs_repo_add
3128 085d5bcf 2019-03-27 stsp run_test test_update_conflict_wt_edit_vs_repo_rm
3129 13d9040b 2019-03-27 stsp run_test test_update_conflict_wt_rm_vs_repo_edit
3130 66b11bf5 2019-03-27 stsp run_test test_update_conflict_wt_rm_vs_repo_rm
3131 c4cdcb68 2019-04-03 stsp run_test test_update_partial
3132 c4cdcb68 2019-04-03 stsp run_test test_update_partial_add
3133 c4cdcb68 2019-04-03 stsp run_test test_update_partial_rm
3134 c4cdcb68 2019-04-03 stsp run_test test_update_partial_dir
3135 d5bea539 2019-05-13 stsp run_test test_update_moved_branch_ref
3136 024e9686 2019-05-14 stsp run_test test_update_to_another_branch
3137 a367ff0f 2019-05-14 stsp run_test test_update_to_commit_on_wrong_branch
3138 c932eeeb 2019-05-22 stsp run_test test_update_bumps_base_commit_id
3139 303e2782 2019-08-09 stsp run_test test_update_tag
3140 523b8417 2019-10-19 stsp run_test test_update_toggles_xbit
3141 5036ab18 2020-04-18 stsp run_test test_update_preserves_conflicted_file
3142 e7303626 2020-05-14 stsp run_test test_update_modified_submodules
3143 e7303626 2020-05-14 stsp run_test test_update_adds_submodule
3144 e7303626 2020-05-14 stsp run_test test_update_conflict_wt_file_vs_repo_submodule
3145 f35fa46a 2020-07-23 stsp run_test test_update_adds_symlink
3146 993e2a1b 2020-07-23 stsp run_test test_update_deletes_symlink
3147 993e2a1b 2020-07-23 stsp run_test test_update_symlink_conflicts
3148 194cb7cb 2021-01-19 stsp run_test test_update_single_file
3149 a769b60b 2021-06-27 stsp run_test test_update_file_skipped_due_to_conflict
3150 2c41dce7 2021-06-27 stsp run_test test_update_file_skipped_due_to_obstruction
3151 67c65ed7 2021-09-14 tracey run_test test_update_quiet
3152 24f136e0 2021-11-20 thomas run_test test_update_binary_file
3153 a2c162eb 2022-10-30 thomas run_test test_update_umask
