3 fccbfb98 2019-08-03 stsp # Copyright (c) 2019 Stefan Sperling <stsp@openbsd.org>
5 fccbfb98 2019-08-03 stsp # Permission to use, copy, modify, and distribute this software for any
6 fccbfb98 2019-08-03 stsp # purpose with or without fee is hereby granted, provided that the above
7 fccbfb98 2019-08-03 stsp # copyright notice and this permission notice appear in all copies.
9 fccbfb98 2019-08-03 stsp # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 fccbfb98 2019-08-03 stsp # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 fccbfb98 2019-08-03 stsp # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 fccbfb98 2019-08-03 stsp # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 fccbfb98 2019-08-03 stsp # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 fccbfb98 2019-08-03 stsp # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 fccbfb98 2019-08-03 stsp # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 fccbfb98 2019-08-03 stsp . ./common.sh
19 c861864b 2022-01-03 stsp # disable automatic packing for these tests
20 c861864b 2022-01-03 stsp export GOT_TEST_PACK=""
22 f6cae3ed 2020-09-13 naddy test_stage_basic() {
23 fccbfb98 2019-08-03 stsp local testroot=`test_init stage_basic`
25 fccbfb98 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
27 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
28 fccbfb98 2019-08-03 stsp test_done "$testroot" "$ret"
32 fccbfb98 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
33 fccbfb98 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
34 fccbfb98 2019-08-03 stsp echo "new file" > $testroot/wt/foo
35 fccbfb98 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
37 88d0e355 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
38 88d0e355 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
39 d3e7c587 2019-08-03 stsp echo ' A foo' >> $testroot/stdout.expected
40 ec9d9b2f 2019-08-08 stsp (cd $testroot/wt && got stage > $testroot/stdout)
42 d3e7c587 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
44 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
45 d3e7c587 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
47 d3e7c587 2019-08-03 stsp test_done "$testroot" "$ret"
50 f6cae3ed 2020-09-13 naddy test_stage_no_changes() {
51 31b20a6e 2019-08-06 stsp local testroot=`test_init stage_no_changes`
53 31b20a6e 2019-08-06 stsp got checkout $testroot/repo $testroot/wt > /dev/null
55 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
56 31b20a6e 2019-08-06 stsp test_done "$testroot" "$ret"
60 31b20a6e 2019-08-06 stsp (cd $testroot/wt && got stage alpha beta > $testroot/stdout \
61 31b20a6e 2019-08-06 stsp 2> $testroot/stderr)
63 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
64 31b20a6e 2019-08-06 stsp echo "got stage command succeeded unexpectedly" >&2
65 31b20a6e 2019-08-06 stsp test_done "$testroot" "1"
69 2db2652d 2019-08-07 stsp echo "got: no changes to stage" > $testroot/stderr.expected
71 31b20a6e 2019-08-06 stsp cmp -s $testroot/stderr.expected $testroot/stderr
73 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
74 31b20a6e 2019-08-06 stsp diff -u $testroot/stderr.expected $testroot/stderr
75 31b20a6e 2019-08-06 stsp test_done "$testroot" "$ret"
79 31b20a6e 2019-08-06 stsp echo -n > $testroot/stdout.expected
80 31b20a6e 2019-08-06 stsp cmp -s $testroot/stdout.expected $testroot/stdout
82 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
83 31b20a6e 2019-08-06 stsp diff -u $testroot/stdout.expected $testroot/stdout
85 31b20a6e 2019-08-06 stsp test_done "$testroot" "$ret"
88 f6cae3ed 2020-09-13 naddy test_stage_unversioned() {
89 8b13ce36 2019-08-08 stsp local testroot=`test_init stage_unversioned`
91 8b13ce36 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
93 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
94 8b13ce36 2019-08-08 stsp test_done "$testroot" "$ret"
98 8b13ce36 2019-08-08 stsp echo "modified file" > $testroot/wt/alpha
99 8b13ce36 2019-08-08 stsp touch $testroot/wt/unversioned-file
101 8b13ce36 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
102 8b13ce36 2019-08-08 stsp echo "M alpha" > $testroot/stdout.expected
103 8b13ce36 2019-08-08 stsp echo "? unversioned-file" >> $testroot/stdout.expected
104 8b13ce36 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
106 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
107 8b13ce36 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
108 8b13ce36 2019-08-08 stsp test_done "$testroot" "$ret"
112 8b13ce36 2019-08-08 stsp (cd $testroot/wt && got stage > $testroot/stdout)
114 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
115 8b13ce36 2019-08-08 stsp echo "got stage command failed unexpectedly" >&2
116 8b13ce36 2019-08-08 stsp test_done "$testroot" "$ret"
120 8b13ce36 2019-08-08 stsp echo " M alpha" > $testroot/stdout.expected
121 8b13ce36 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
123 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
124 8b13ce36 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
125 8b13ce36 2019-08-08 stsp test_done "$testroot" "$ret"
129 8b13ce36 2019-08-08 stsp echo "modified file again" > $testroot/wt/alpha
131 8b13ce36 2019-08-08 stsp (cd $testroot/wt && got stage unversioned-file > $testroot/stdout \
132 8b13ce36 2019-08-08 stsp 2> $testroot/stderr)
134 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
135 8b13ce36 2019-08-08 stsp echo "got stage command succeed unexpectedly" >&2
136 8b13ce36 2019-08-08 stsp test_done "$testroot" "1"
140 8b13ce36 2019-08-08 stsp echo "got: no changes to stage" > $testroot/stderr.expected
141 8b13ce36 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
143 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
144 8b13ce36 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
146 8b13ce36 2019-08-08 stsp test_done "$testroot" "$ret"
150 f6cae3ed 2020-09-13 naddy test_stage_nonexistent() {
151 8564cb21 2019-08-08 stsp local testroot=`test_init stage_nonexistent`
153 8564cb21 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
155 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
156 8564cb21 2019-08-08 stsp test_done "$testroot" "$ret"
160 8564cb21 2019-08-08 stsp (cd $testroot/wt && got stage nonexistent-file \
161 8564cb21 2019-08-08 stsp > $testroot/stdout 2> $testroot/stderr)
162 2a06fe5f 2019-08-24 stsp echo "got: nonexistent-file: No such file or directory" \
163 2a06fe5f 2019-08-24 stsp > $testroot/stderr.expected
164 8564cb21 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
166 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
167 8564cb21 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
169 8564cb21 2019-08-08 stsp test_done "$testroot" "$ret"
172 f6cae3ed 2020-09-13 naddy test_stage_list() {
173 a4f692bb 2019-08-04 stsp local testroot=`test_init stage_list`
175 a4f692bb 2019-08-04 stsp got checkout $testroot/repo $testroot/wt > /dev/null
177 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
178 a4f692bb 2019-08-04 stsp test_done "$testroot" "$ret"
182 a4f692bb 2019-08-04 stsp echo "modified file" > $testroot/wt/alpha
183 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got rm beta > /dev/null)
184 a4f692bb 2019-08-04 stsp echo "new file" > $testroot/wt/foo
185 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got add foo > /dev/null)
187 a4f692bb 2019-08-04 stsp echo ' M alpha' > $testroot/stdout.expected
188 a4f692bb 2019-08-04 stsp echo ' D beta' >> $testroot/stdout.expected
189 a4f692bb 2019-08-04 stsp echo ' A foo' >> $testroot/stdout.expected
190 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got stage alpha beta foo > /dev/null)
192 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got stage -l > $testroot/stdout)
193 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got diff -s alpha | grep '^blob +' | \
194 a4f692bb 2019-08-04 stsp cut -d' ' -f3 | tr -d '\n' > $testroot/stdout.expected)
195 a4f692bb 2019-08-04 stsp echo " M alpha" >> $testroot/stdout.expected
196 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got diff -s beta | grep '^blob -' | \
197 a4f692bb 2019-08-04 stsp cut -d' ' -f3 | tr -d '\n' >> $testroot/stdout.expected)
198 a4f692bb 2019-08-04 stsp echo " D beta" >> $testroot/stdout.expected
199 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got diff -s foo | grep '^blob +' | \
200 a4f692bb 2019-08-04 stsp cut -d' ' -f3 | tr -d '\n' >> $testroot/stdout.expected)
201 a4f692bb 2019-08-04 stsp echo " A foo" >> $testroot/stdout.expected
202 a4f692bb 2019-08-04 stsp cmp -s $testroot/stdout.expected $testroot/stdout
204 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
205 a4f692bb 2019-08-04 stsp diff -u $testroot/stdout.expected $testroot/stdout
206 a4f692bb 2019-08-04 stsp test_done "$testroot" "$ret"
210 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got stage -l epsilon nonexistent \
211 a4f692bb 2019-08-04 stsp > $testroot/stdout)
213 a4f692bb 2019-08-04 stsp echo -n > $testroot/stdout.expected
214 a4f692bb 2019-08-04 stsp cmp -s $testroot/stdout.expected $testroot/stdout
216 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
217 a4f692bb 2019-08-04 stsp diff -u $testroot/stdout.expected $testroot/stdout
218 a4f692bb 2019-08-04 stsp test_done "$testroot" "$ret"
222 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got stage -l alpha > $testroot/stdout)
224 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got diff -s alpha | grep '^blob +' | \
225 a4f692bb 2019-08-04 stsp cut -d' ' -f3 | tr -d '\n' > $testroot/stdout.expected)
226 a4f692bb 2019-08-04 stsp echo " M alpha" >> $testroot/stdout.expected
227 a4f692bb 2019-08-04 stsp cmp -s $testroot/stdout.expected $testroot/stdout
229 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
230 a4f692bb 2019-08-04 stsp diff -u $testroot/stdout.expected $testroot/stdout
232 a4f692bb 2019-08-04 stsp test_done "$testroot" "$ret"
236 f6cae3ed 2020-09-13 naddy test_stage_conflict() {
237 ebf48fd5 2019-08-03 stsp local testroot=`test_init stage_conflict`
238 ebf48fd5 2019-08-03 stsp local initial_commit=`git_show_head $testroot/repo`
240 ebf48fd5 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
242 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
243 ebf48fd5 2019-08-03 stsp test_done "$testroot" "$ret"
247 ebf48fd5 2019-08-03 stsp echo "modified alpha" > $testroot/wt/alpha
248 ebf48fd5 2019-08-03 stsp (cd $testroot/wt && got commit -m "modified alpha" >/dev/null)
250 ebf48fd5 2019-08-03 stsp (cd $testroot/wt && got update -c $initial_commit > /dev/null)
252 ebf48fd5 2019-08-03 stsp echo "modified alpha, too" > $testroot/wt/alpha
254 ebf48fd5 2019-08-03 stsp echo "C alpha" > $testroot/stdout.expected
255 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
256 ebf48fd5 2019-08-03 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
257 ebf48fd5 2019-08-03 stsp echo >> $testroot/stdout.expected
258 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
260 ebf48fd5 2019-08-03 stsp (cd $testroot/wt && got update > $testroot/stdout)
262 ebf48fd5 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
264 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
265 ebf48fd5 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
266 ebf48fd5 2019-08-03 stsp test_done "$testroot" "$ret"
270 ebf48fd5 2019-08-03 stsp (cd $testroot/wt && got stage alpha > $testroot/stdout \
271 ebf48fd5 2019-08-03 stsp 2> $testroot/stderr)
273 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
274 ebf48fd5 2019-08-03 stsp echo "got stage command succeeded unexpectedly" >&2
275 ebf48fd5 2019-08-03 stsp test_done "$testroot" "1"
279 ebf48fd5 2019-08-03 stsp echo -n > $testroot/stdout.expected
280 ebf48fd5 2019-08-03 stsp echo "got: alpha: cannot stage file in conflicted status" \
281 735ef5ac 2019-08-03 stsp > $testroot/stderr.expected
283 735ef5ac 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
285 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
286 735ef5ac 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
287 735ef5ac 2019-08-03 stsp test_done "$testroot" "$ret"
290 735ef5ac 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
292 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
293 735ef5ac 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
295 735ef5ac 2019-08-03 stsp test_done "$testroot" "$ret"
298 f6cae3ed 2020-09-13 naddy test_stage_out_of_date() {
299 735ef5ac 2019-08-03 stsp local testroot=`test_init stage_out_of_date`
300 735ef5ac 2019-08-03 stsp local initial_commit=`git_show_head $testroot/repo`
302 735ef5ac 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
304 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
305 735ef5ac 2019-08-03 stsp test_done "$testroot" "$ret"
309 735ef5ac 2019-08-03 stsp echo "modified alpha" > $testroot/wt/alpha
310 735ef5ac 2019-08-03 stsp (cd $testroot/wt && got commit -m "modified alpha" >/dev/null)
312 735ef5ac 2019-08-03 stsp (cd $testroot/wt && got update -c $initial_commit > /dev/null)
314 735ef5ac 2019-08-03 stsp echo "modified alpha again" > $testroot/wt/alpha
315 735ef5ac 2019-08-03 stsp (cd $testroot/wt && got stage alpha > $testroot/stdout \
316 735ef5ac 2019-08-03 stsp 2> $testroot/stderr)
318 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
319 735ef5ac 2019-08-03 stsp echo "got stage command succeeded unexpectedly" >&2
320 735ef5ac 2019-08-03 stsp test_done "$testroot" "1"
324 735ef5ac 2019-08-03 stsp echo -n > $testroot/stdout.expected
325 735ef5ac 2019-08-03 stsp echo "got: work tree must be updated before changes can be staged" \
326 ebf48fd5 2019-08-03 stsp > $testroot/stderr.expected
328 ebf48fd5 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
330 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
331 ebf48fd5 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
332 ebf48fd5 2019-08-03 stsp test_done "$testroot" "$ret"
335 ebf48fd5 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
337 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
338 ebf48fd5 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
340 ebf48fd5 2019-08-03 stsp test_done "$testroot" "$ret"
344 f6cae3ed 2020-09-13 naddy test_double_stage() {
345 d3e7c587 2019-08-03 stsp local testroot=`test_init double_stage`
347 d3e7c587 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
349 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
350 d3e7c587 2019-08-03 stsp test_done "$testroot" "$ret"
353 d3e7c587 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
354 d3e7c587 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
355 d3e7c587 2019-08-03 stsp echo "new file" > $testroot/wt/foo
356 d3e7c587 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
357 d3e7c587 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > /dev/null)
359 7b5dc508 2019-10-28 stsp echo "got: no changes to stage" > $testroot/stderr.expected
360 d3e7c587 2019-08-03 stsp (cd $testroot/wt && got stage alpha 2> $testroot/stderr)
361 d3e7c587 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
363 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
364 d3e7c587 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
365 d3e7c587 2019-08-03 stsp test_done "$testroot" "$ret"
369 7b5dc508 2019-10-28 stsp (cd $testroot/wt && got stage beta \
370 7b5dc508 2019-10-28 stsp > $testroot/stdout 2> $testroot/stderr)
372 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
373 7b5dc508 2019-10-28 stsp echo "got stage command succeeded unexpectedly" >&2
374 7b5dc508 2019-10-28 stsp test_done "$testroot" "1"
377 7b5dc508 2019-10-28 stsp echo -n > $testroot/stdout.expected
378 7b5dc508 2019-10-28 stsp cmp -s $testroot/stdout.expected $testroot/stdout
380 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
381 7b5dc508 2019-10-28 stsp diff -u $testroot/stdout.expected $testroot/stdout
382 7b5dc508 2019-10-28 stsp test_done "$testroot" "$ret"
386 7b5dc508 2019-10-28 stsp echo "got: no changes to stage" > $testroot/stderr.expected
387 7b5dc508 2019-10-28 stsp (cd $testroot/wt && got stage foo 2> $testroot/stderr)
388 7b5dc508 2019-10-28 stsp cmp -s $testroot/stderr.expected $testroot/stderr
390 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
391 7b5dc508 2019-10-28 stsp diff -u $testroot/stderr.expected $testroot/stderr
392 7b5dc508 2019-10-28 stsp test_done "$testroot" "$ret"
396 7b5dc508 2019-10-28 stsp printf "q\n" > $testroot/patchscript
397 7b5dc508 2019-10-28 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
398 7b5dc508 2019-10-28 stsp > $testroot/stdout 2> $testroot/stderr)
400 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
401 7b5dc508 2019-10-28 stsp echo "got stage command succeeded unexpectedly" >&2
402 d3e7c587 2019-08-03 stsp test_done "$testroot" "1"
405 d3e7c587 2019-08-03 stsp echo -n > $testroot/stdout.expected
406 d3e7c587 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
408 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
409 d3e7c587 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
410 d3e7c587 2019-08-03 stsp test_done "$testroot" "$ret"
414 7b5dc508 2019-10-28 stsp echo "got: no changes to stage" > $testroot/stderr.expected
415 d3e7c587 2019-08-03 stsp (cd $testroot/wt && got stage foo 2> $testroot/stderr)
416 d3e7c587 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
418 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
419 d3e7c587 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
420 d3e7c587 2019-08-03 stsp test_done "$testroot" "$ret"
424 d3e7c587 2019-08-03 stsp echo "modified file again" > $testroot/wt/alpha
425 d3e7c587 2019-08-03 stsp echo "modified new file" > $testroot/wt/foo
427 d3e7c587 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
428 88d0e355 2019-08-03 stsp echo ' A foo' >> $testroot/stdout.expected
429 fccbfb98 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > $testroot/stdout)
430 d3e7c587 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
432 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
433 d3e7c587 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
434 d3e7c587 2019-08-03 stsp test_done "$testroot" "$ret"
438 d3e7c587 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
439 d3e7c587 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
440 d3e7c587 2019-08-03 stsp echo ' A foo' >> $testroot/stdout.expected
442 d3e7c587 2019-08-03 stsp (cd $testroot/wt && got status > $testroot/stdout)
443 fccbfb98 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
445 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
446 fccbfb98 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
448 fccbfb98 2019-08-03 stsp test_done "$testroot" "$ret"
451 f6cae3ed 2020-09-13 naddy test_stage_status() {
452 c363b2c1 2019-08-03 stsp local testroot=`test_init stage_status`
454 c363b2c1 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
456 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
457 c363b2c1 2019-08-03 stsp test_done "$testroot" "$ret"
461 c363b2c1 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
462 c363b2c1 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
463 c363b2c1 2019-08-03 stsp echo "new file" > $testroot/wt/foo
464 c363b2c1 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
465 c363b2c1 2019-08-03 stsp echo "new file" > $testroot/wt/epsilon/new
466 c363b2c1 2019-08-03 stsp (cd $testroot/wt && got add epsilon/new > /dev/null)
467 c363b2c1 2019-08-03 stsp echo "modified file" > $testroot/wt/epsilon/zeta
468 c363b2c1 2019-08-03 stsp (cd $testroot/wt && got rm gamma/delta > /dev/null)
470 c363b2c1 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
471 c363b2c1 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
472 c363b2c1 2019-08-03 stsp echo 'A epsilon/new' >> $testroot/stdout.expected
473 c363b2c1 2019-08-03 stsp echo 'M epsilon/zeta' >> $testroot/stdout.expected
474 c363b2c1 2019-08-03 stsp echo ' A foo' >> $testroot/stdout.expected
475 c363b2c1 2019-08-03 stsp echo 'D gamma/delta' >> $testroot/stdout.expected
476 c363b2c1 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > /dev/null)
478 c363b2c1 2019-08-03 stsp (cd $testroot/wt && got status > $testroot/stdout)
479 c363b2c1 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
481 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
482 c363b2c1 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
483 244725f2 2019-08-03 stsp test_done "$testroot" "$ret"
487 244725f2 2019-08-03 stsp echo "modified file again" >> $testroot/wt/alpha
488 244725f2 2019-08-03 stsp echo "modified added file again" >> $testroot/wt/foo
490 244725f2 2019-08-03 stsp echo 'MM alpha' > $testroot/stdout.expected
491 244725f2 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
492 244725f2 2019-08-03 stsp echo 'A epsilon/new' >> $testroot/stdout.expected
493 244725f2 2019-08-03 stsp echo 'M epsilon/zeta' >> $testroot/stdout.expected
494 244725f2 2019-08-03 stsp echo 'MA foo' >> $testroot/stdout.expected
495 244725f2 2019-08-03 stsp echo 'D gamma/delta' >> $testroot/stdout.expected
497 244725f2 2019-08-03 stsp (cd $testroot/wt && got status > $testroot/stdout)
498 244725f2 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
500 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
501 244725f2 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
502 244725f2 2019-08-03 stsp test_done "$testroot" "$ret"
506 244725f2 2019-08-03 stsp # test no-op change of added file with new stat(2) timestamp
507 244725f2 2019-08-03 stsp echo "new file" > $testroot/wt/foo
508 244725f2 2019-08-03 stsp echo ' A foo' > $testroot/stdout.expected
509 244725f2 2019-08-03 stsp (cd $testroot/wt && got status foo > $testroot/stdout)
510 244725f2 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
512 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
513 244725f2 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
514 244725f2 2019-08-03 stsp test_done "$testroot" "$ret"
518 244725f2 2019-08-03 stsp # test staged deleted file which is restored on disk
519 244725f2 2019-08-03 stsp echo "new file" > $testroot/wt/beta
520 244725f2 2019-08-03 stsp echo ' D beta' > $testroot/stdout.expected
521 244725f2 2019-08-03 stsp (cd $testroot/wt && got status beta > $testroot/stdout)
522 244725f2 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
524 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
525 244725f2 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
527 c363b2c1 2019-08-03 stsp test_done "$testroot" "$ret"
531 f6cae3ed 2020-09-13 naddy test_stage_add_already_staged_file() {
532 1e1446d3 2019-08-03 stsp local testroot=`test_init stage_add_already_staged_file`
534 1e1446d3 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
536 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
537 1e1446d3 2019-08-03 stsp test_done "$testroot" "$ret"
541 1e1446d3 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
542 1e1446d3 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
543 1e1446d3 2019-08-03 stsp echo "new file" > $testroot/wt/foo
544 1e1446d3 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
546 1e1446d3 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > $testroot/stdout)
548 1e1446d3 2019-08-03 stsp echo -n > $testroot/stdout.expected
549 6d022e97 2019-08-04 stsp for f in alpha beta foo; do
550 1e1446d3 2019-08-03 stsp (cd $testroot/wt && got add $f \
551 1e1446d3 2019-08-03 stsp > $testroot/stdout 2> $testroot/stderr)
552 6d022e97 2019-08-04 stsp echo "got: $f: file has unexpected status" \
553 6d022e97 2019-08-04 stsp > $testroot/stderr.expected
554 6d022e97 2019-08-04 stsp cmp -s $testroot/stderr.expected $testroot/stderr
556 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
557 6d022e97 2019-08-04 stsp diff -u $testroot/stderr.expected $testroot/stderr
558 6d022e97 2019-08-04 stsp test_done "$testroot" "$ret"
561 1e1446d3 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
563 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
564 1e1446d3 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
565 1e1446d3 2019-08-03 stsp test_done "$testroot" "$ret"
570 1e1446d3 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
571 1e1446d3 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
572 1e1446d3 2019-08-03 stsp echo ' A foo' >> $testroot/stdout.expected
574 1e1446d3 2019-08-03 stsp (cd $testroot/wt && got status > $testroot/stdout)
575 1e1446d3 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
577 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
578 1e1446d3 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
580 1e1446d3 2019-08-03 stsp test_done "$testroot" "$ret"
583 f6cae3ed 2020-09-13 naddy test_stage_rm_already_staged_file() {
584 9acbc4fa 2019-08-03 stsp local testroot=`test_init stage_rm_already_staged_file`
586 9acbc4fa 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
588 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
589 9acbc4fa 2019-08-03 stsp test_done "$testroot" "$ret"
593 9acbc4fa 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
594 9acbc4fa 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
595 9acbc4fa 2019-08-03 stsp echo "new file" > $testroot/wt/foo
596 9acbc4fa 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
598 9acbc4fa 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > $testroot/stdout)
600 9acbc4fa 2019-08-03 stsp (cd $testroot/wt && got rm beta \
601 9acbc4fa 2019-08-03 stsp > $testroot/stdout 2> $testroot/stderr)
603 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
604 6d022e97 2019-08-04 stsp echo "got rm command failed unexpectedly" >&2
605 9acbc4fa 2019-08-03 stsp test_done "$testroot" "1"
608 6d022e97 2019-08-04 stsp echo -n > $testroot/stdout.expected
609 6d022e97 2019-08-04 stsp cmp -s $testroot/stdout.expected $testroot/stdout
611 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
612 6d022e97 2019-08-04 stsp diff -u $testroot/stdout.expected $testroot/stdout
613 6d022e97 2019-08-04 stsp test_done "$testroot" "$ret"
616 6d022e97 2019-08-04 stsp echo -n > $testroot/stderr.expected
617 9acbc4fa 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
619 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
620 9acbc4fa 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
621 9acbc4fa 2019-08-03 stsp test_done "$testroot" "$ret"
625 9acbc4fa 2019-08-03 stsp for f in alpha foo; do
626 24278f30 2019-08-03 stsp echo "got: $f: file is staged" > $testroot/stderr.expected
627 9acbc4fa 2019-08-03 stsp (cd $testroot/wt && got rm $f \
628 9acbc4fa 2019-08-03 stsp > $testroot/stdout 2> $testroot/stderr)
630 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
631 9acbc4fa 2019-08-03 stsp echo "got rm command succeeded unexpectedly" >&2
632 9acbc4fa 2019-08-03 stsp test_done "$testroot" "1"
635 9acbc4fa 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
637 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
638 9acbc4fa 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
639 9acbc4fa 2019-08-03 stsp test_done "$testroot" "$ret"
644 9acbc4fa 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
645 9acbc4fa 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
646 9acbc4fa 2019-08-03 stsp echo ' A foo' >> $testroot/stdout.expected
648 9acbc4fa 2019-08-03 stsp (cd $testroot/wt && got status > $testroot/stdout)
649 9acbc4fa 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
651 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
652 9acbc4fa 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
654 9acbc4fa 2019-08-03 stsp test_done "$testroot" "$ret"
657 f6cae3ed 2020-09-13 naddy test_stage_revert() {
658 24278f30 2019-08-03 stsp local testroot=`test_init stage_revert`
660 24278f30 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
662 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
663 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
667 24278f30 2019-08-03 stsp echo "modified alpha" > $testroot/wt/alpha
668 24278f30 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
669 24278f30 2019-08-03 stsp echo "new file" > $testroot/wt/foo
670 24278f30 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
671 24278f30 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > /dev/null)
673 24278f30 2019-08-03 stsp echo "modified file again" >> $testroot/wt/alpha
674 24278f30 2019-08-03 stsp echo "modified added file again" >> $testroot/wt/foo
676 24278f30 2019-08-03 stsp (cd $testroot/wt && got revert alpha > $testroot/stdout)
678 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
679 24278f30 2019-08-03 stsp echo "revert command failed unexpectedly" >&2
680 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
684 24278f30 2019-08-03 stsp echo "R alpha" > $testroot/stdout.expected
685 24278f30 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
687 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
688 24278f30 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
689 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
693 24278f30 2019-08-03 stsp echo "modified alpha" > $testroot/content.expected
694 24278f30 2019-08-03 stsp cat $testroot/wt/alpha > $testroot/content
695 24278f30 2019-08-03 stsp cmp -s $testroot/content.expected $testroot/content
697 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
698 24278f30 2019-08-03 stsp diff -u $testroot/content.expected $testroot/content
699 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
703 24278f30 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
704 24278f30 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
705 24278f30 2019-08-03 stsp echo 'MA foo' >> $testroot/stdout.expected
706 24278f30 2019-08-03 stsp (cd $testroot/wt && got status > $testroot/stdout)
707 24278f30 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
709 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
710 24278f30 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
711 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
715 24278f30 2019-08-03 stsp (cd $testroot/wt && got revert alpha > $testroot/stdout)
717 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
718 24278f30 2019-08-03 stsp echo "revert command failed unexpectedly" >&2
719 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
723 24278f30 2019-08-03 stsp echo -n > $testroot/stdout.expected
724 24278f30 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
726 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
727 24278f30 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
728 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
732 24278f30 2019-08-03 stsp echo "modified alpha" > $testroot/content.expected
733 24278f30 2019-08-03 stsp cat $testroot/wt/alpha > $testroot/content
734 24278f30 2019-08-03 stsp cmp -s $testroot/content.expected $testroot/content
736 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
737 24278f30 2019-08-03 stsp diff -u $testroot/content.expected $testroot/content
738 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
742 24278f30 2019-08-03 stsp (cd $testroot/wt && got revert beta > $testroot/stdout \
743 24278f30 2019-08-03 stsp 2> $testroot/stderr)
745 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
746 d3bcc3d1 2019-08-08 stsp echo "revert command failed unexpectedly" >&2
747 d3bcc3d1 2019-08-08 stsp test_done "$testroot" "$ret"
751 d3bcc3d1 2019-08-08 stsp echo -n > $testroot/stdout.expected
752 d3bcc3d1 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
754 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
755 d3bcc3d1 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
756 d3bcc3d1 2019-08-08 stsp test_done "$testroot" "$ret"
760 d3bcc3d1 2019-08-08 stsp echo -n > $testroot/stderr.expected
761 24278f30 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
763 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
764 24278f30 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
765 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
769 24278f30 2019-08-03 stsp (cd $testroot/wt && got revert foo > $testroot/stdout)
771 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
772 24278f30 2019-08-03 stsp echo "revert command failed unexpectedly" >&2
773 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
777 24278f30 2019-08-03 stsp echo "R foo" > $testroot/stdout.expected
778 24278f30 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
780 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
781 24278f30 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
782 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
786 24278f30 2019-08-03 stsp echo "new file" > $testroot/content.expected
787 24278f30 2019-08-03 stsp cat $testroot/wt/foo > $testroot/content
788 24278f30 2019-08-03 stsp cmp -s $testroot/content.expected $testroot/content
790 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
791 24278f30 2019-08-03 stsp diff -u $testroot/content.expected $testroot/content
792 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
796 24278f30 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
797 24278f30 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
798 24278f30 2019-08-03 stsp echo ' A foo' >> $testroot/stdout.expected
799 24278f30 2019-08-03 stsp (cd $testroot/wt && got status > $testroot/stdout)
800 24278f30 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
802 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
803 24278f30 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
804 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
808 24278f30 2019-08-03 stsp (cd $testroot/wt && got revert foo > $testroot/stdout)
810 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
811 24278f30 2019-08-03 stsp echo "revert command failed unexpectedly" >&2
812 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
816 24278f30 2019-08-03 stsp echo -n > $testroot/stdout.expected
817 24278f30 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
819 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
820 24278f30 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
821 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
825 24278f30 2019-08-03 stsp echo "new file" > $testroot/content.expected
826 24278f30 2019-08-03 stsp cat $testroot/wt/foo > $testroot/content
827 24278f30 2019-08-03 stsp cmp -s $testroot/content.expected $testroot/content
829 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
830 24278f30 2019-08-03 stsp diff -u $testroot/content.expected $testroot/content
831 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
835 24278f30 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
836 24278f30 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
837 24278f30 2019-08-03 stsp echo ' A foo' >> $testroot/stdout.expected
838 0f6d7415 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
839 0f6d7415 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
841 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
842 0f6d7415 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
843 0f6d7415 2019-08-08 stsp test_done "$testroot" "$ret"
847 0f6d7415 2019-08-08 stsp echo "modified file again" >> $testroot/wt/alpha
848 0f6d7415 2019-08-08 stsp echo "modified added file again" >> $testroot/wt/foo
850 0f6d7415 2019-08-08 stsp (cd $testroot/wt && got revert -R . > $testroot/stdout \
851 0f6d7415 2019-08-08 stsp 2> $testroot/stderr)
853 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
854 d3bcc3d1 2019-08-08 stsp echo "revert command failed unexpectedly" >&2
855 0f6d7415 2019-08-08 stsp test_done "$testroot" "$ret"
859 0f6d7415 2019-08-08 stsp echo "R alpha" > $testroot/stdout.expected
860 d3bcc3d1 2019-08-08 stsp echo "R foo" >> $testroot/stdout.expected
861 0f6d7415 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
863 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
864 0f6d7415 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
865 0f6d7415 2019-08-08 stsp test_done "$testroot" "$ret"
869 d3bcc3d1 2019-08-08 stsp echo -n > $testroot/stderr.expected
870 0f6d7415 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
872 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
873 0f6d7415 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
874 0f6d7415 2019-08-08 stsp test_done "$testroot" "$ret"
878 0f6d7415 2019-08-08 stsp echo ' M alpha' > $testroot/stdout.expected
879 0f6d7415 2019-08-08 stsp echo ' D beta' >> $testroot/stdout.expected
880 d3bcc3d1 2019-08-08 stsp echo ' A foo' >> $testroot/stdout.expected
881 24278f30 2019-08-03 stsp (cd $testroot/wt && got status > $testroot/stdout)
882 408b4ebc 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
884 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
885 408b4ebc 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
887 408b4ebc 2019-08-03 stsp test_done "$testroot" "$ret"
890 f6cae3ed 2020-09-13 naddy test_stage_diff() {
891 408b4ebc 2019-08-03 stsp local testroot=`test_init stage_diff`
892 408b4ebc 2019-08-03 stsp local head_commit=`git_show_head $testroot/repo`
894 408b4ebc 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
896 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
897 408b4ebc 2019-08-03 stsp test_done "$testroot" "$ret"
901 408b4ebc 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
902 408b4ebc 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
903 408b4ebc 2019-08-03 stsp echo "new file" > $testroot/wt/foo
904 408b4ebc 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
906 98eaaa12 2019-08-03 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
907 98eaaa12 2019-08-03 stsp echo -n > $testroot/stdout.expected
908 98eaaa12 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
910 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
911 98eaaa12 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
912 98eaaa12 2019-08-03 stsp test_done "$testroot" "$ret"
916 408b4ebc 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
917 408b4ebc 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
918 408b4ebc 2019-08-03 stsp echo ' A foo' >> $testroot/stdout.expected
919 408b4ebc 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > /dev/null)
921 408b4ebc 2019-08-03 stsp (cd $testroot/wt && got diff > $testroot/stdout)
922 408b4ebc 2019-08-03 stsp echo -n > $testroot/stdout.expected
923 408b4ebc 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
925 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
926 408b4ebc 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
927 408b4ebc 2019-08-03 stsp test_done "$testroot" "$ret"
931 408b4ebc 2019-08-03 stsp echo "modified file again" > $testroot/wt/alpha
932 408b4ebc 2019-08-03 stsp echo "new file changed" > $testroot/wt/foo
934 408b4ebc 2019-08-03 stsp (cd $testroot/wt && got diff > $testroot/stdout)
936 408b4ebc 2019-08-03 stsp echo "diff $head_commit $testroot/wt" > $testroot/stdout.expected
937 408b4ebc 2019-08-03 stsp echo -n 'blob - ' >> $testroot/stdout.expected
938 4ce46740 2019-08-08 stsp (cd $testroot/wt && got stage -l alpha) | cut -d' ' -f 1 | tr -d '\n' \
939 408b4ebc 2019-08-03 stsp >> $testroot/stdout.expected
940 4ce46740 2019-08-08 stsp echo ' (staged)' >> $testroot/stdout.expected
941 408b4ebc 2019-08-03 stsp echo 'file + alpha' >> $testroot/stdout.expected
942 408b4ebc 2019-08-03 stsp echo '--- alpha' >> $testroot/stdout.expected
943 408b4ebc 2019-08-03 stsp echo '+++ alpha' >> $testroot/stdout.expected
944 408b4ebc 2019-08-03 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
945 408b4ebc 2019-08-03 stsp echo '-modified file' >> $testroot/stdout.expected
946 408b4ebc 2019-08-03 stsp echo '+modified file again' >> $testroot/stdout.expected
947 408b4ebc 2019-08-03 stsp echo -n 'blob - ' >> $testroot/stdout.expected
948 4ce46740 2019-08-08 stsp (cd $testroot/wt && got stage -l foo) | cut -d' ' -f 1 | tr -d '\n' \
949 408b4ebc 2019-08-03 stsp >> $testroot/stdout.expected
950 4ce46740 2019-08-08 stsp echo " (staged)" >> $testroot/stdout.expected
951 408b4ebc 2019-08-03 stsp echo 'file + foo' >> $testroot/stdout.expected
952 408b4ebc 2019-08-03 stsp echo '--- foo' >> $testroot/stdout.expected
953 408b4ebc 2019-08-03 stsp echo '+++ foo' >> $testroot/stdout.expected
954 408b4ebc 2019-08-03 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
955 408b4ebc 2019-08-03 stsp echo '-new file' >> $testroot/stdout.expected
956 408b4ebc 2019-08-03 stsp echo '+new file changed' >> $testroot/stdout.expected
958 98eaaa12 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
960 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
961 98eaaa12 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
962 98eaaa12 2019-08-03 stsp test_done "$testroot" "$ret"
966 98eaaa12 2019-08-03 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
968 98eaaa12 2019-08-03 stsp echo "diff $head_commit $testroot/wt (staged changes)" \
969 98eaaa12 2019-08-03 stsp > $testroot/stdout.expected
970 98eaaa12 2019-08-03 stsp echo -n 'blob - ' >> $testroot/stdout.expected
971 98eaaa12 2019-08-03 stsp got tree -r $testroot/repo -i | grep 'alpha$' | cut -d' ' -f 1 \
972 98eaaa12 2019-08-03 stsp >> $testroot/stdout.expected
973 98eaaa12 2019-08-03 stsp echo -n 'blob + ' >> $testroot/stdout.expected
974 98eaaa12 2019-08-03 stsp (cd $testroot/wt && got stage -l alpha) | cut -d' ' -f 1 \
975 98eaaa12 2019-08-03 stsp >> $testroot/stdout.expected
976 98eaaa12 2019-08-03 stsp echo '--- alpha' >> $testroot/stdout.expected
977 98eaaa12 2019-08-03 stsp echo '+++ alpha' >> $testroot/stdout.expected
978 98eaaa12 2019-08-03 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
979 98eaaa12 2019-08-03 stsp echo '-alpha' >> $testroot/stdout.expected
980 98eaaa12 2019-08-03 stsp echo '+modified file' >> $testroot/stdout.expected
981 98eaaa12 2019-08-03 stsp echo -n 'blob - ' >> $testroot/stdout.expected
982 98eaaa12 2019-08-03 stsp got tree -r $testroot/repo -i | grep 'beta$' | cut -d' ' -f 1 \
983 98eaaa12 2019-08-03 stsp >> $testroot/stdout.expected
984 98eaaa12 2019-08-03 stsp echo 'blob + /dev/null' >> $testroot/stdout.expected
985 98eaaa12 2019-08-03 stsp echo '--- beta' >> $testroot/stdout.expected
986 98eaaa12 2019-08-03 stsp echo '+++ /dev/null' >> $testroot/stdout.expected
987 98eaaa12 2019-08-03 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
988 98eaaa12 2019-08-03 stsp echo '-beta' >> $testroot/stdout.expected
989 98eaaa12 2019-08-03 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
990 98eaaa12 2019-08-03 stsp echo -n 'blob + ' >> $testroot/stdout.expected
991 98eaaa12 2019-08-03 stsp (cd $testroot/wt && got stage -l foo) | cut -d' ' -f 1 \
992 98eaaa12 2019-08-03 stsp >> $testroot/stdout.expected
993 98eaaa12 2019-08-03 stsp echo '--- /dev/null' >> $testroot/stdout.expected
994 98eaaa12 2019-08-03 stsp echo '+++ foo' >> $testroot/stdout.expected
995 98eaaa12 2019-08-03 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
996 98eaaa12 2019-08-03 stsp echo '+new file' >> $testroot/stdout.expected
998 24278f30 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1000 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1001 24278f30 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1003 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
1007 f6cae3ed 2020-09-13 naddy test_stage_histedit() {
1008 b9622844 2019-08-03 stsp local testroot=`test_init stage_histedit`
1009 b9622844 2019-08-03 stsp local orig_commit=`git_show_head $testroot/repo`
1011 b9622844 2019-08-03 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1013 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1014 b9622844 2019-08-03 stsp test_done "$testroot" "$ret"
1018 b9622844 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
1019 b9622844 2019-08-03 stsp (cd $testroot/wt && got stage alpha > /dev/null)
1021 b9622844 2019-08-03 stsp echo "modified alpha on master" > $testroot/repo/alpha
1022 b9622844 2019-08-03 stsp (cd $testroot/repo && git rm -q beta)
1023 b9622844 2019-08-03 stsp echo "new file on master" > $testroot/repo/epsilon/new
1024 b9622844 2019-08-03 stsp (cd $testroot/repo && git add epsilon/new)
1025 b9622844 2019-08-03 stsp git_commit $testroot/repo -m "committing changes"
1026 b9622844 2019-08-03 stsp local old_commit1=`git_show_head $testroot/repo`
1028 b9622844 2019-08-03 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1029 b9622844 2019-08-03 stsp git_commit $testroot/repo -m "committing to zeta on master"
1030 b9622844 2019-08-03 stsp local old_commit2=`git_show_head $testroot/repo`
1032 b9622844 2019-08-03 stsp echo "pick $old_commit1" > $testroot/histedit-script
1033 b9622844 2019-08-03 stsp echo "pick $old_commit2" >> $testroot/histedit-script
1035 b9622844 2019-08-03 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1036 b9622844 2019-08-03 stsp > $testroot/stdout 2> $testroot/stderr)
1038 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1039 b9622844 2019-08-03 stsp echo "got histedit command succeeded unexpectedly" >&2
1040 b9622844 2019-08-03 stsp test_done "$testroot" "1"
1044 b9622844 2019-08-03 stsp echo -n > $testroot/stdout.expected
1045 b9622844 2019-08-03 stsp echo "got: alpha: file is staged" > $testroot/stderr.expected
1047 b9622844 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1049 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1050 b9622844 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
1051 b9622844 2019-08-03 stsp test_done "$testroot" "$ret"
1054 b9622844 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1056 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1057 b9622844 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1059 b9622844 2019-08-03 stsp test_done "$testroot" "$ret"
1063 f6cae3ed 2020-09-13 naddy test_stage_rebase() {
1064 243d7cf1 2019-08-03 stsp local testroot=`test_init stage_rebase`
1066 243d7cf1 2019-08-03 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1067 243d7cf1 2019-08-03 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
1068 243d7cf1 2019-08-03 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
1070 243d7cf1 2019-08-03 stsp echo "modified alpha on branch" > $testroot/repo/alpha
1071 243d7cf1 2019-08-03 stsp (cd $testroot/repo && git rm -q beta)
1072 243d7cf1 2019-08-03 stsp echo "new file on branch" > $testroot/repo/epsilon/new
1073 243d7cf1 2019-08-03 stsp (cd $testroot/repo && git add epsilon/new)
1074 243d7cf1 2019-08-03 stsp git_commit $testroot/repo -m "committing more changes on newbranch"
1076 243d7cf1 2019-08-03 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
1077 243d7cf1 2019-08-03 stsp local orig_commit2=`git_show_head $testroot/repo`
1079 243d7cf1 2019-08-03 stsp (cd $testroot/repo && git checkout -q master)
1080 243d7cf1 2019-08-03 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1081 243d7cf1 2019-08-03 stsp git_commit $testroot/repo -m "committing to zeta on master"
1082 243d7cf1 2019-08-03 stsp local master_commit=`git_show_head $testroot/repo`
1084 243d7cf1 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1086 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1087 243d7cf1 2019-08-03 stsp test_done "$testroot" "$ret"
1091 243d7cf1 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
1092 243d7cf1 2019-08-03 stsp (cd $testroot/wt && got stage alpha > /dev/null)
1094 243d7cf1 2019-08-03 stsp (cd $testroot/wt && got rebase newbranch \
1095 243d7cf1 2019-08-03 stsp > $testroot/stdout 2> $testroot/stderr)
1097 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1098 243d7cf1 2019-08-03 stsp echo "got rebase command succeeded unexpectedly" >&2
1099 243d7cf1 2019-08-03 stsp test_done "$testroot" "1"
1103 243d7cf1 2019-08-03 stsp echo -n > $testroot/stdout.expected
1104 243d7cf1 2019-08-03 stsp echo "got: alpha: file is staged" > $testroot/stderr.expected
1106 243d7cf1 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1108 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1109 243d7cf1 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
1110 243d7cf1 2019-08-03 stsp test_done "$testroot" "$ret"
1113 243d7cf1 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1115 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1116 243d7cf1 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1118 243d7cf1 2019-08-03 stsp test_done "$testroot" "$ret"
1121 f6cae3ed 2020-09-13 naddy test_stage_update() {
1122 a76c42e6 2019-08-03 stsp local testroot=`test_init stage_update`
1124 a76c42e6 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1126 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1127 a76c42e6 2019-08-03 stsp test_done "$testroot" "$ret"
1131 a76c42e6 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
1132 a76c42e6 2019-08-03 stsp (cd $testroot/wt && got stage alpha > /dev/null)
1134 a76c42e6 2019-08-03 stsp echo "modified alpha" > $testroot/repo/alpha
1135 a76c42e6 2019-08-03 stsp git_commit $testroot/repo -m "modified alpha"
1137 a76c42e6 2019-08-03 stsp (cd $testroot/wt && got update > $testroot/stdout \
1138 a76c42e6 2019-08-03 stsp 2> $testroot/stderr)
1140 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1141 a76c42e6 2019-08-03 stsp echo "got update command succeeded unexpectedly" >&2
1142 a76c42e6 2019-08-03 stsp test_done "$testroot" "1"
1146 a76c42e6 2019-08-03 stsp echo -n > $testroot/stdout.expected
1147 a76c42e6 2019-08-03 stsp echo "got: alpha: file is staged" > $testroot/stderr.expected
1149 a76c42e6 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1151 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1152 a76c42e6 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
1153 a76c42e6 2019-08-03 stsp test_done "$testroot" "$ret"
1156 a76c42e6 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1158 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1159 a76c42e6 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1161 a76c42e6 2019-08-03 stsp test_done "$testroot" "$ret"
1164 f6cae3ed 2020-09-13 naddy test_stage_commit_non_staged() {
1165 f0b75401 2019-08-03 stsp local testroot=`test_init stage_commit_non_staged`
1167 f0b75401 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1169 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1170 f0b75401 2019-08-03 stsp test_done "$testroot" "$ret"
1174 f0b75401 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
1175 f0b75401 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
1176 f0b75401 2019-08-03 stsp echo "new file" > $testroot/wt/foo
1177 f0b75401 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
1178 f0b75401 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > /dev/null)
1180 f0b75401 2019-08-03 stsp echo "modified file" > $testroot/wt/gamma/delta
1181 f0b75401 2019-08-03 stsp (cd $testroot/wt && got commit -m "change delta" gamma/delta \
1182 f0b75401 2019-08-03 stsp > $testroot/stdout 2> $testroot/stderr)
1184 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1185 f0b75401 2019-08-03 stsp echo "got commit command succeeded unexpectedly" >&2
1186 f0b75401 2019-08-03 stsp test_done "$testroot" "1"
1190 f0b75401 2019-08-03 stsp echo -n > $testroot/stdout.expected
1191 f0b75401 2019-08-03 stsp echo "got: gamma/delta: file is not staged" > $testroot/stderr.expected
1193 f0b75401 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1195 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1196 f0b75401 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
1197 5f8a88c6 2019-08-03 stsp test_done "$testroot" "$ret"
1200 5f8a88c6 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1202 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1203 5f8a88c6 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1205 5f8a88c6 2019-08-03 stsp test_done "$testroot" "$ret"
1208 f6cae3ed 2020-09-13 naddy test_stage_commit_out_of_date() {
1209 0f1cfa7f 2019-08-08 stsp local testroot=`test_init stage_commit_out_of_date`
1211 0f1cfa7f 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1213 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1214 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1218 0f1cfa7f 2019-08-08 stsp echo "modified file" > $testroot/wt/alpha
1219 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got rm beta > /dev/null)
1220 0f1cfa7f 2019-08-08 stsp echo "new file" > $testroot/wt/foo
1221 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got add foo > /dev/null)
1222 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got stage alpha beta foo > /dev/null)
1224 0f1cfa7f 2019-08-08 stsp echo "changed file" > $testroot/repo/alpha
1225 0f1cfa7f 2019-08-08 stsp git_commit $testroot/repo -m "changed alpha in repo"
1227 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got commit -m "try to commit" > $testroot/stdout \
1228 0f1cfa7f 2019-08-08 stsp 2> $testroot/stderr)
1230 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1231 0f1cfa7f 2019-08-08 stsp echo "got commit command succeeded unexpectedly" >&2
1232 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "1"
1236 0f1cfa7f 2019-08-08 stsp echo -n > $testroot/stdout.expected
1237 0f1cfa7f 2019-08-08 stsp echo -n "got: work tree must be updated before these changes " \
1238 0f1cfa7f 2019-08-08 stsp > $testroot/stderr.expected
1239 0f1cfa7f 2019-08-08 stsp echo "can be committed" >> $testroot/stderr.expected
1241 0f1cfa7f 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1243 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1244 0f1cfa7f 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
1245 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1248 0f1cfa7f 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1250 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1251 0f1cfa7f 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1252 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1256 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got update > $testroot/stdout \
1257 0f1cfa7f 2019-08-08 stsp 2> $testroot/stderr)
1258 0f1cfa7f 2019-08-08 stsp echo -n > $testroot/stdout.expected
1259 0f1cfa7f 2019-08-08 stsp echo "got: alpha: file is staged" > $testroot/stderr.expected
1261 0f1cfa7f 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1263 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1264 0f1cfa7f 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
1265 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1268 0f1cfa7f 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1270 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1271 0f1cfa7f 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1272 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1276 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got unstage > /dev/null)
1277 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got update > $testroot/stdout)
1279 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1280 0f1cfa7f 2019-08-08 stsp echo "got update command failed unexpectedly" >&2
1281 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1285 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
1286 0f1cfa7f 2019-08-08 stsp echo "C alpha" > $testroot/stdout.expected
1287 0f1cfa7f 2019-08-08 stsp echo "D beta" >> $testroot/stdout.expected
1288 0f1cfa7f 2019-08-08 stsp echo "A foo" >> $testroot/stdout.expected
1289 0f1cfa7f 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1291 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1292 0f1cfa7f 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1293 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1297 0f1cfa7f 2019-08-08 stsp # resolve conflict
1298 0f1cfa7f 2019-08-08 stsp echo "resolved file" > $testroot/wt/alpha
1300 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got stage > /dev/null)
1302 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got commit -m "try again" > $testroot/stdout)
1304 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1305 0f1cfa7f 2019-08-08 stsp echo "got commit command failed unexpectedly" >&2
1306 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1310 0f1cfa7f 2019-08-08 stsp local commit_id=`git_show_head $testroot/repo`
1311 0f1cfa7f 2019-08-08 stsp echo "A foo" > $testroot/stdout.expected
1312 0f1cfa7f 2019-08-08 stsp echo "M alpha" >> $testroot/stdout.expected
1313 0f1cfa7f 2019-08-08 stsp echo "D beta" >> $testroot/stdout.expected
1314 0f1cfa7f 2019-08-08 stsp echo "Created commit $commit_id" >> $testroot/stdout.expected
1315 0f1cfa7f 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1317 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1318 0f1cfa7f 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1320 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1324 f6cae3ed 2020-09-13 naddy test_stage_commit() {
1325 5f8a88c6 2019-08-03 stsp local testroot=`test_init stage_commit`
1326 5f8a88c6 2019-08-03 stsp local first_commit=`git_show_head $testroot/repo`
1328 5f8a88c6 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1330 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1331 5f8a88c6 2019-08-03 stsp test_done "$testroot" "$ret"
1335 5f8a88c6 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
1336 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
1337 5f8a88c6 2019-08-03 stsp echo "new file" > $testroot/wt/foo
1338 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
1339 5f8a88c6 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
1340 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > /dev/null)
1342 5f8a88c6 2019-08-03 stsp echo "modified file again" > $testroot/wt/alpha
1343 5f8a88c6 2019-08-03 stsp echo "new file changed" > $testroot/wt/foo
1344 5f8a88c6 2019-08-03 stsp echo "non-staged change" > $testroot/wt/gamma/delta
1345 5f8a88c6 2019-08-03 stsp echo "non-staged new file" > $testroot/wt/epsilon/new
1346 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got add epsilon/new > /dev/null)
1347 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got rm epsilon/zeta > /dev/null)
1349 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got stage -l alpha) | cut -d' ' -f 1 \
1350 5f8a88c6 2019-08-03 stsp > $testroot/blob_id_alpha
1351 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got stage -l foo) | cut -d' ' -f 1 \
1352 5f8a88c6 2019-08-03 stsp > $testroot/blob_id_foo
1354 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got commit -m "staged changes" \
1355 5f8a88c6 2019-08-03 stsp > $testroot/stdout)
1357 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1358 5f8a88c6 2019-08-03 stsp echo "got commit command failed unexpectedly" >&2
1359 5f8a88c6 2019-08-03 stsp test_done "$testroot" "1"
1363 5f8a88c6 2019-08-03 stsp local head_commit=`git_show_head $testroot/repo`
1364 5f8a88c6 2019-08-03 stsp echo "A foo" > $testroot/stdout.expected
1365 5f8a88c6 2019-08-03 stsp echo "M alpha" >> $testroot/stdout.expected
1366 5f8a88c6 2019-08-03 stsp echo "D beta" >> $testroot/stdout.expected
1367 5f8a88c6 2019-08-03 stsp echo "Created commit $head_commit" >> $testroot/stdout.expected
1369 5f8a88c6 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1371 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1372 5f8a88c6 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1373 f0b75401 2019-08-03 stsp test_done "$testroot" "$ret"
1377 5f8a88c6 2019-08-03 stsp got diff -r $testroot/repo $first_commit $head_commit \
1378 5f8a88c6 2019-08-03 stsp > $testroot/stdout
1380 5f8a88c6 2019-08-03 stsp echo "diff $first_commit $head_commit" \
1381 5f8a88c6 2019-08-03 stsp > $testroot/stdout.expected
1382 5f8a88c6 2019-08-03 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1383 5f8a88c6 2019-08-03 stsp got tree -r $testroot/repo -i -c $first_commit | \
1384 5f8a88c6 2019-08-03 stsp grep 'alpha$' | cut -d' ' -f 1 \
1385 5f8a88c6 2019-08-03 stsp >> $testroot/stdout.expected
1386 5f8a88c6 2019-08-03 stsp echo -n 'blob + ' >> $testroot/stdout.expected
1387 5f8a88c6 2019-08-03 stsp cat $testroot/blob_id_alpha >> $testroot/stdout.expected
1388 5f8a88c6 2019-08-03 stsp echo '--- alpha' >> $testroot/stdout.expected
1389 5f8a88c6 2019-08-03 stsp echo '+++ alpha' >> $testroot/stdout.expected
1390 5f8a88c6 2019-08-03 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
1391 5f8a88c6 2019-08-03 stsp echo '-alpha' >> $testroot/stdout.expected
1392 5f8a88c6 2019-08-03 stsp echo '+modified file' >> $testroot/stdout.expected
1393 5f8a88c6 2019-08-03 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1394 5f8a88c6 2019-08-03 stsp got tree -r $testroot/repo -i -c $first_commit \
1395 46f68b20 2019-10-19 stsp | grep 'beta$' | cut -d' ' -f 1 | tr -d '\n' \
1396 5f8a88c6 2019-08-03 stsp >> $testroot/stdout.expected
1397 46f68b20 2019-10-19 stsp echo " (mode 644)" >> $testroot/stdout.expected
1398 5f8a88c6 2019-08-03 stsp echo 'blob + /dev/null' >> $testroot/stdout.expected
1399 5f8a88c6 2019-08-03 stsp echo '--- beta' >> $testroot/stdout.expected
1400 5f8a88c6 2019-08-03 stsp echo '+++ /dev/null' >> $testroot/stdout.expected
1401 5f8a88c6 2019-08-03 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
1402 5f8a88c6 2019-08-03 stsp echo '-beta' >> $testroot/stdout.expected
1403 5f8a88c6 2019-08-03 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
1404 5f8a88c6 2019-08-03 stsp echo -n 'blob + ' >> $testroot/stdout.expected
1405 46f68b20 2019-10-19 stsp cat $testroot/blob_id_foo | tr -d '\n' >> $testroot/stdout.expected
1406 46f68b20 2019-10-19 stsp echo " (mode 644)" >> $testroot/stdout.expected
1407 5f8a88c6 2019-08-03 stsp echo '--- /dev/null' >> $testroot/stdout.expected
1408 5f8a88c6 2019-08-03 stsp echo '+++ foo' >> $testroot/stdout.expected
1409 5f8a88c6 2019-08-03 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
1410 5f8a88c6 2019-08-03 stsp echo '+new file' >> $testroot/stdout.expected
1412 f0b75401 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1414 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1415 f0b75401 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1416 5f8a88c6 2019-08-03 stsp test_done "$testroot" "$ret"
1420 72fd46fa 2019-09-06 stsp echo 'M alpha' > $testroot/stdout.expected
1421 72fd46fa 2019-09-06 stsp echo 'A epsilon/new' >> $testroot/stdout.expected
1422 5f8a88c6 2019-08-03 stsp echo 'D epsilon/zeta' >> $testroot/stdout.expected
1423 72fd46fa 2019-09-06 stsp echo 'M foo' >> $testroot/stdout.expected
1424 5f8a88c6 2019-08-03 stsp echo 'M gamma/delta' >> $testroot/stdout.expected
1426 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got status > $testroot/stdout)
1427 5f8a88c6 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1429 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1430 5f8a88c6 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1432 f0b75401 2019-08-03 stsp test_done "$testroot" "$ret"
1435 f6cae3ed 2020-09-13 naddy test_stage_patch() {
1436 dc424a06 2019-08-07 stsp local testroot=`test_init stage_patch`
1438 dc424a06 2019-08-07 stsp jot 16 > $testroot/repo/numbers
1439 dc424a06 2019-08-07 stsp (cd $testroot/repo && git add numbers)
1440 dc424a06 2019-08-07 stsp git_commit $testroot/repo -m "added numbers file"
1441 dc424a06 2019-08-07 stsp local commit_id=`git_show_head $testroot/repo`
1443 dc424a06 2019-08-07 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1445 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1446 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1450 dc424a06 2019-08-07 stsp sed -i -e 's/^2$/a/' $testroot/wt/numbers
1451 dc424a06 2019-08-07 stsp sed -i -e 's/^7$/b/' $testroot/wt/numbers
1452 dc424a06 2019-08-07 stsp sed -i -e 's/^16$/c/' $testroot/wt/numbers
1454 dc424a06 2019-08-07 stsp # don't stage any hunks
1455 dc424a06 2019-08-07 stsp printf "n\nn\nn\n" > $testroot/patchscript
1456 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1457 7b5dc508 2019-10-28 stsp numbers > $testroot/stdout 2> $testroot/stderr)
1459 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1460 7b5dc508 2019-10-28 stsp echo "got stage command succeeded unexpectedly" >&2
1461 dc424a06 2019-08-07 stsp test_done "$testroot" "1"
1464 dc424a06 2019-08-07 stsp cat > $testroot/stdout.expected <<EOF
1465 dc424a06 2019-08-07 stsp -----------------------------------------------
1466 dc424a06 2019-08-07 stsp @@ -1,5 +1,5 @@
1473 dc424a06 2019-08-07 stsp -----------------------------------------------
1474 a7c9878d 2019-08-08 stsp M numbers (change 1 of 3)
1475 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1476 dc424a06 2019-08-07 stsp -----------------------------------------------
1477 dc424a06 2019-08-07 stsp @@ -4,7 +4,7 @@
1486 dc424a06 2019-08-07 stsp -----------------------------------------------
1487 a7c9878d 2019-08-08 stsp M numbers (change 2 of 3)
1488 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1489 dc424a06 2019-08-07 stsp -----------------------------------------------
1490 dc424a06 2019-08-07 stsp @@ -13,4 +13,4 @@
1496 dc424a06 2019-08-07 stsp -----------------------------------------------
1497 a7c9878d 2019-08-08 stsp M numbers (change 3 of 3)
1498 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1500 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1502 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1503 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1504 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1508 7b5dc508 2019-10-28 stsp echo "got: no changes to stage" > $testroot/stderr.expected
1509 7b5dc508 2019-10-28 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1511 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1512 7b5dc508 2019-10-28 stsp diff -u $testroot/stderr.expected $testroot/stderr
1513 7b5dc508 2019-10-28 stsp test_done "$testroot" "$ret"
1518 dc424a06 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
1519 dc424a06 2019-08-07 stsp echo "M numbers" > $testroot/stdout.expected
1520 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1522 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1523 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1524 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1528 dc424a06 2019-08-07 stsp # stage middle hunk
1529 dc424a06 2019-08-07 stsp printf "n\ny\nn\n" > $testroot/patchscript
1530 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1531 dc424a06 2019-08-07 stsp numbers > $testroot/stdout)
1533 dc424a06 2019-08-07 stsp cat > $testroot/stdout.expected <<EOF
1534 dc424a06 2019-08-07 stsp -----------------------------------------------
1535 dc424a06 2019-08-07 stsp @@ -1,5 +1,5 @@
1542 dc424a06 2019-08-07 stsp -----------------------------------------------
1543 a7c9878d 2019-08-08 stsp M numbers (change 1 of 3)
1544 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1545 dc424a06 2019-08-07 stsp -----------------------------------------------
1546 dc424a06 2019-08-07 stsp @@ -4,7 +4,7 @@
1555 dc424a06 2019-08-07 stsp -----------------------------------------------
1556 a7c9878d 2019-08-08 stsp M numbers (change 2 of 3)
1557 b353a198 2019-08-07 stsp stage this change? [y/n/q] y
1558 dc424a06 2019-08-07 stsp -----------------------------------------------
1559 dc424a06 2019-08-07 stsp @@ -13,4 +13,4 @@
1565 dc424a06 2019-08-07 stsp -----------------------------------------------
1566 a7c9878d 2019-08-08 stsp M numbers (change 3 of 3)
1567 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1569 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1571 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1572 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1573 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1577 dc424a06 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
1578 dc424a06 2019-08-07 stsp echo "MM numbers" > $testroot/stdout.expected
1579 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1581 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1582 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1583 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1587 dc424a06 2019-08-07 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
1589 dc424a06 2019-08-07 stsp echo "diff $commit_id $testroot/wt (staged changes)" \
1590 dc424a06 2019-08-07 stsp > $testroot/stdout.expected
1591 dc424a06 2019-08-07 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1592 dc424a06 2019-08-07 stsp got tree -r $testroot/repo -i -c $commit_id \
1593 dc424a06 2019-08-07 stsp | grep 'numbers$' | cut -d' ' -f 1 \
1594 dc424a06 2019-08-07 stsp >> $testroot/stdout.expected
1595 dc424a06 2019-08-07 stsp echo -n 'blob + ' >> $testroot/stdout.expected
1596 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 \
1597 dc424a06 2019-08-07 stsp >> $testroot/stdout.expected
1598 dc424a06 2019-08-07 stsp echo "--- numbers" >> $testroot/stdout.expected
1599 dc424a06 2019-08-07 stsp echo "+++ numbers" >> $testroot/stdout.expected
1600 dc424a06 2019-08-07 stsp echo "@@ -4,7 +4,7 @@" >> $testroot/stdout.expected
1601 dc424a06 2019-08-07 stsp echo " 4" >> $testroot/stdout.expected
1602 dc424a06 2019-08-07 stsp echo " 5" >> $testroot/stdout.expected
1603 dc424a06 2019-08-07 stsp echo " 6" >> $testroot/stdout.expected
1604 dc424a06 2019-08-07 stsp echo "-7" >> $testroot/stdout.expected
1605 dc424a06 2019-08-07 stsp echo "+b" >> $testroot/stdout.expected
1606 dc424a06 2019-08-07 stsp echo " 8" >> $testroot/stdout.expected
1607 dc424a06 2019-08-07 stsp echo " 9" >> $testroot/stdout.expected
1608 dc424a06 2019-08-07 stsp echo " 10" >> $testroot/stdout.expected
1609 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1611 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1612 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1613 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1617 dc424a06 2019-08-07 stsp (cd $testroot/wt && got unstage >/dev/null)
1619 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1620 dc424a06 2019-08-07 stsp echo "got stage command failed unexpectedly" >&2
1621 dc424a06 2019-08-07 stsp test_done "$testroot" "1"
1624 dc424a06 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
1625 dc424a06 2019-08-07 stsp echo "M numbers" > $testroot/stdout.expected
1626 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1628 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1629 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1630 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1634 dc424a06 2019-08-07 stsp # stage last hunk
1635 dc424a06 2019-08-07 stsp printf "n\nn\ny\n" > $testroot/patchscript
1636 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1637 dc424a06 2019-08-07 stsp numbers > $testroot/stdout)
1639 dc424a06 2019-08-07 stsp cat > $testroot/stdout.expected <<EOF
1640 dc424a06 2019-08-07 stsp -----------------------------------------------
1641 dc424a06 2019-08-07 stsp @@ -1,5 +1,5 @@
1648 dc424a06 2019-08-07 stsp -----------------------------------------------
1649 a7c9878d 2019-08-08 stsp M numbers (change 1 of 3)
1650 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1651 dc424a06 2019-08-07 stsp -----------------------------------------------
1652 dc424a06 2019-08-07 stsp @@ -4,7 +4,7 @@
1661 dc424a06 2019-08-07 stsp -----------------------------------------------
1662 a7c9878d 2019-08-08 stsp M numbers (change 2 of 3)
1663 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1664 dc424a06 2019-08-07 stsp -----------------------------------------------
1665 dc424a06 2019-08-07 stsp @@ -13,4 +13,4 @@
1671 dc424a06 2019-08-07 stsp -----------------------------------------------
1672 a7c9878d 2019-08-08 stsp M numbers (change 3 of 3)
1673 b353a198 2019-08-07 stsp stage this change? [y/n/q] y
1675 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1677 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1678 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1679 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1683 dc424a06 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
1684 dc424a06 2019-08-07 stsp echo "MM numbers" > $testroot/stdout.expected
1685 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1687 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1688 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1689 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1693 dc424a06 2019-08-07 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
1695 dc424a06 2019-08-07 stsp echo "diff $commit_id $testroot/wt (staged changes)" \
1696 dc424a06 2019-08-07 stsp > $testroot/stdout.expected
1697 dc424a06 2019-08-07 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1698 dc424a06 2019-08-07 stsp got tree -r $testroot/repo -i -c $commit_id \
1699 dc424a06 2019-08-07 stsp | grep 'numbers$' | cut -d' ' -f 1 \
1700 dc424a06 2019-08-07 stsp >> $testroot/stdout.expected
1701 dc424a06 2019-08-07 stsp echo -n 'blob + ' >> $testroot/stdout.expected
1702 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 \
1703 dc424a06 2019-08-07 stsp >> $testroot/stdout.expected
1704 dc424a06 2019-08-07 stsp echo "--- numbers" >> $testroot/stdout.expected
1705 dc424a06 2019-08-07 stsp echo "+++ numbers" >> $testroot/stdout.expected
1706 dc424a06 2019-08-07 stsp echo "@@ -13,4 +13,4 @@" >> $testroot/stdout.expected
1707 dc424a06 2019-08-07 stsp echo " 13" >> $testroot/stdout.expected
1708 dc424a06 2019-08-07 stsp echo " 14" >> $testroot/stdout.expected
1709 dc424a06 2019-08-07 stsp echo " 15" >> $testroot/stdout.expected
1710 dc424a06 2019-08-07 stsp echo "-16" >> $testroot/stdout.expected
1711 dc424a06 2019-08-07 stsp echo "+c" >> $testroot/stdout.expected
1712 af5a81b2 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1714 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1715 af5a81b2 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1717 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1720 f6cae3ed 2020-09-13 naddy test_stage_patch_twice() {
1721 af5a81b2 2019-08-08 stsp local testroot=`test_init stage_patch_twice`
1723 af5a81b2 2019-08-08 stsp jot 16 > $testroot/repo/numbers
1724 af5a81b2 2019-08-08 stsp (cd $testroot/repo && git add numbers)
1725 af5a81b2 2019-08-08 stsp git_commit $testroot/repo -m "added numbers file"
1726 af5a81b2 2019-08-08 stsp local commit_id=`git_show_head $testroot/repo`
1728 af5a81b2 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1730 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1731 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1735 af5a81b2 2019-08-08 stsp sed -i -e 's/^2$/a/' $testroot/wt/numbers
1736 af5a81b2 2019-08-08 stsp sed -i -e 's/^7$/b/' $testroot/wt/numbers
1737 af5a81b2 2019-08-08 stsp sed -i -e 's/^16$/c/' $testroot/wt/numbers
1739 af5a81b2 2019-08-08 stsp # stage middle hunk
1740 af5a81b2 2019-08-08 stsp printf "n\ny\nn\n" > $testroot/patchscript
1741 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1742 af5a81b2 2019-08-08 stsp numbers > $testroot/stdout)
1744 af5a81b2 2019-08-08 stsp cat > $testroot/stdout.expected <<EOF
1745 af5a81b2 2019-08-08 stsp -----------------------------------------------
1746 af5a81b2 2019-08-08 stsp @@ -1,5 +1,5 @@
1753 af5a81b2 2019-08-08 stsp -----------------------------------------------
1754 af5a81b2 2019-08-08 stsp M numbers (change 1 of 3)
1755 af5a81b2 2019-08-08 stsp stage this change? [y/n/q] n
1756 af5a81b2 2019-08-08 stsp -----------------------------------------------
1757 af5a81b2 2019-08-08 stsp @@ -4,7 +4,7 @@
1766 af5a81b2 2019-08-08 stsp -----------------------------------------------
1767 af5a81b2 2019-08-08 stsp M numbers (change 2 of 3)
1768 af5a81b2 2019-08-08 stsp stage this change? [y/n/q] y
1769 af5a81b2 2019-08-08 stsp -----------------------------------------------
1770 af5a81b2 2019-08-08 stsp @@ -13,4 +13,4 @@
1776 af5a81b2 2019-08-08 stsp -----------------------------------------------
1777 af5a81b2 2019-08-08 stsp M numbers (change 3 of 3)
1778 af5a81b2 2019-08-08 stsp stage this change? [y/n/q] n
1780 af5a81b2 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1782 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1783 af5a81b2 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1784 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1788 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
1789 af5a81b2 2019-08-08 stsp echo "MM numbers" > $testroot/stdout.expected
1790 af5a81b2 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1792 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1793 af5a81b2 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1794 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1798 af5a81b2 2019-08-08 stsp # stage last hunk
1799 af5a81b2 2019-08-08 stsp printf "n\ny\n" > $testroot/patchscript
1800 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1801 af5a81b2 2019-08-08 stsp numbers > $testroot/stdout)
1803 af5a81b2 2019-08-08 stsp cat > $testroot/stdout.expected <<EOF
1804 af5a81b2 2019-08-08 stsp -----------------------------------------------
1805 fe621944 2020-11-10 stsp @@ -1,5 +1,5 @@
1812 af5a81b2 2019-08-08 stsp -----------------------------------------------
1813 af5a81b2 2019-08-08 stsp M numbers (change 1 of 2)
1814 af5a81b2 2019-08-08 stsp stage this change? [y/n/q] n
1815 af5a81b2 2019-08-08 stsp -----------------------------------------------
1816 af5a81b2 2019-08-08 stsp @@ -13,4 +13,4 @@ b
1822 af5a81b2 2019-08-08 stsp -----------------------------------------------
1823 af5a81b2 2019-08-08 stsp M numbers (change 2 of 2)
1824 af5a81b2 2019-08-08 stsp stage this change? [y/n/q] y
1826 af5a81b2 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1828 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1829 af5a81b2 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1830 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1834 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
1835 af5a81b2 2019-08-08 stsp echo "MM numbers" > $testroot/stdout.expected
1836 af5a81b2 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1838 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1839 af5a81b2 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1840 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1844 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
1846 af5a81b2 2019-08-08 stsp echo "diff $commit_id $testroot/wt (staged changes)" \
1847 af5a81b2 2019-08-08 stsp > $testroot/stdout.expected
1848 af5a81b2 2019-08-08 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1849 af5a81b2 2019-08-08 stsp got tree -r $testroot/repo -i -c $commit_id \
1850 af5a81b2 2019-08-08 stsp | grep 'numbers$' | cut -d' ' -f 1 \
1851 af5a81b2 2019-08-08 stsp >> $testroot/stdout.expected
1852 af5a81b2 2019-08-08 stsp echo -n 'blob + ' >> $testroot/stdout.expected
1853 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 \
1854 af5a81b2 2019-08-08 stsp >> $testroot/stdout.expected
1855 af5a81b2 2019-08-08 stsp echo "--- numbers" >> $testroot/stdout.expected
1856 af5a81b2 2019-08-08 stsp echo "+++ numbers" >> $testroot/stdout.expected
1857 af5a81b2 2019-08-08 stsp cat >> $testroot/stdout.expected <<EOF
1858 af5a81b2 2019-08-08 stsp @@ -4,7 +4,7 @@
1867 af5a81b2 2019-08-08 stsp @@ -13,4 +13,4 @@
1874 af5a81b2 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1876 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1877 af5a81b2 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1878 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1882 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got diff > $testroot/stdout)
1884 af5a81b2 2019-08-08 stsp echo "diff $commit_id $testroot/wt" > $testroot/stdout.expected
1885 af5a81b2 2019-08-08 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1886 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 | \
1887 af5a81b2 2019-08-08 stsp tr -d '\n' >> $testroot/stdout.expected
1888 af5a81b2 2019-08-08 stsp echo " (staged)" >> $testroot/stdout.expected
1889 af5a81b2 2019-08-08 stsp echo 'file + numbers' >> $testroot/stdout.expected
1890 af5a81b2 2019-08-08 stsp echo "--- numbers" >> $testroot/stdout.expected
1891 af5a81b2 2019-08-08 stsp echo "+++ numbers" >> $testroot/stdout.expected
1892 af5a81b2 2019-08-08 stsp cat >> $testroot/stdout.expected <<EOF
1893 af5a81b2 2019-08-08 stsp @@ -1,5 +1,5 @@
1901 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1903 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1904 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1906 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1909 f6cae3ed 2020-09-13 naddy test_stage_patch_added() {
1910 dc424a06 2019-08-07 stsp local testroot=`test_init stage_patch_added`
1911 dc424a06 2019-08-07 stsp local commit_id=`git_show_head $testroot/repo`
1913 dc424a06 2019-08-07 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1915 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1916 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1920 dc424a06 2019-08-07 stsp echo "new" > $testroot/wt/epsilon/new
1921 dc424a06 2019-08-07 stsp (cd $testroot/wt && got add epsilon/new > /dev/null)
1923 dc424a06 2019-08-07 stsp printf "y\n" > $testroot/patchscript
1924 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1925 dc424a06 2019-08-07 stsp epsilon/new > $testroot/stdout)
1927 dc424a06 2019-08-07 stsp echo "A epsilon/new" > $testroot/stdout.expected
1928 c8ede203 2019-08-08 stsp echo "stage this addition? [y/n] y" >> $testroot/stdout.expected
1929 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1931 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1932 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1933 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1937 dc424a06 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
1938 dc424a06 2019-08-07 stsp echo " A epsilon/new" > $testroot/stdout.expected
1939 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1941 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1942 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1943 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1947 dc424a06 2019-08-07 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
1949 dc424a06 2019-08-07 stsp echo "diff $commit_id $testroot/wt (staged changes)" \
1950 dc424a06 2019-08-07 stsp > $testroot/stdout.expected
1951 dc424a06 2019-08-07 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
1952 dc424a06 2019-08-07 stsp echo -n 'blob + ' >> $testroot/stdout.expected
1953 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -l epsilon/new) | cut -d' ' -f 1 \
1954 dc424a06 2019-08-07 stsp >> $testroot/stdout.expected
1955 dc424a06 2019-08-07 stsp echo "--- /dev/null" >> $testroot/stdout.expected
1956 dc424a06 2019-08-07 stsp echo "+++ epsilon/new" >> $testroot/stdout.expected
1957 dc424a06 2019-08-07 stsp echo "@@ -0,0 +1 @@" >> $testroot/stdout.expected
1958 dc424a06 2019-08-07 stsp echo "+new" >> $testroot/stdout.expected
1959 e70a841e 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1961 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1962 e70a841e 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1964 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
1967 f6cae3ed 2020-09-13 naddy test_stage_patch_added_twice() {
1968 e70a841e 2019-08-08 stsp local testroot=`test_init stage_patch_added_twice`
1969 e70a841e 2019-08-08 stsp local commit_id=`git_show_head $testroot/repo`
1971 e70a841e 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1973 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1974 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
1978 e70a841e 2019-08-08 stsp echo "new" > $testroot/wt/epsilon/new
1979 e70a841e 2019-08-08 stsp (cd $testroot/wt && got add epsilon/new > /dev/null)
1981 e70a841e 2019-08-08 stsp printf "y\n" > $testroot/patchscript
1982 e70a841e 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1983 e70a841e 2019-08-08 stsp epsilon/new > $testroot/stdout)
1985 e70a841e 2019-08-08 stsp echo "A epsilon/new" > $testroot/stdout.expected
1986 e70a841e 2019-08-08 stsp echo "stage this addition? [y/n] y" >> $testroot/stdout.expected
1987 e70a841e 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1989 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1990 e70a841e 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1991 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
1995 e70a841e 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
1996 e70a841e 2019-08-08 stsp echo " A epsilon/new" > $testroot/stdout.expected
1997 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1999 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2000 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2001 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2005 e70a841e 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
2006 e70a841e 2019-08-08 stsp epsilon/new > $testroot/stdout 2> $testroot/stderr)
2008 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
2009 e70a841e 2019-08-08 stsp echo "got stage command succeeded unexpectedly" >&2
2010 e70a841e 2019-08-08 stsp test_done "$testroot" "1"
2014 7b5dc508 2019-10-28 stsp echo "got: no changes to stage" > $testroot/stderr.expected
2015 e70a841e 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
2017 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2018 e70a841e 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
2019 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2023 e70a841e 2019-08-08 stsp echo -n > $testroot/stdout.expected
2024 e70a841e 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2026 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2027 e70a841e 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2029 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
2032 f6cae3ed 2020-09-13 naddy test_stage_patch_removed() {
2033 dc424a06 2019-08-07 stsp local testroot=`test_init stage_patch_removed`
2034 dc424a06 2019-08-07 stsp local commit_id=`git_show_head $testroot/repo`
2036 dc424a06 2019-08-07 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2038 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2039 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
2043 dc424a06 2019-08-07 stsp (cd $testroot/wt && got rm beta > /dev/null)
2045 dc424a06 2019-08-07 stsp printf "y\n" > $testroot/patchscript
2046 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
2047 dc424a06 2019-08-07 stsp beta > $testroot/stdout)
2049 dc424a06 2019-08-07 stsp echo -n > $testroot/stdout.expected
2051 dc424a06 2019-08-07 stsp echo "D beta" > $testroot/stdout.expected
2052 f5a17245 2019-08-08 stsp echo "stage this deletion? [y/n] y" >> $testroot/stdout.expected
2053 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2055 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2056 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2057 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
2061 dc424a06 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
2062 dc424a06 2019-08-07 stsp echo " D beta" > $testroot/stdout.expected
2063 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2065 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2066 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2067 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
2071 dc424a06 2019-08-07 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
2073 dc424a06 2019-08-07 stsp echo "diff $commit_id $testroot/wt (staged changes)" \
2074 dc424a06 2019-08-07 stsp > $testroot/stdout.expected
2075 dc424a06 2019-08-07 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2076 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -l beta) | cut -d' ' -f 1 \
2077 dc424a06 2019-08-07 stsp >> $testroot/stdout.expected
2078 dc424a06 2019-08-07 stsp echo 'blob + /dev/null' >> $testroot/stdout.expected
2079 dc424a06 2019-08-07 stsp echo "--- beta" >> $testroot/stdout.expected
2080 dc424a06 2019-08-07 stsp echo "+++ /dev/null" >> $testroot/stdout.expected
2081 dc424a06 2019-08-07 stsp echo "@@ -1 +0,0 @@" >> $testroot/stdout.expected
2082 dc424a06 2019-08-07 stsp echo "-beta" >> $testroot/stdout.expected
2083 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2085 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2086 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2088 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
2091 f6cae3ed 2020-09-13 naddy test_stage_patch_removed_twice() {
2092 e70a841e 2019-08-08 stsp local testroot=`test_init stage_patch_removed_twice`
2093 e70a841e 2019-08-08 stsp local commit_id=`git_show_head $testroot/repo`
2095 e70a841e 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2097 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2098 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2102 e70a841e 2019-08-08 stsp (cd $testroot/wt && got rm beta > /dev/null)
2104 e70a841e 2019-08-08 stsp printf "y\n" > $testroot/patchscript
2105 e70a841e 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
2106 e70a841e 2019-08-08 stsp beta > $testroot/stdout)
2108 e70a841e 2019-08-08 stsp echo -n > $testroot/stdout.expected
2110 e70a841e 2019-08-08 stsp echo "D beta" > $testroot/stdout.expected
2111 e70a841e 2019-08-08 stsp echo "stage this deletion? [y/n] y" >> $testroot/stdout.expected
2112 e70a841e 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2114 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2115 e70a841e 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2116 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2120 e70a841e 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
2121 e70a841e 2019-08-08 stsp echo " D beta" > $testroot/stdout.expected
2122 e70a841e 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2124 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2125 e70a841e 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2126 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2130 e70a841e 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p beta \
2131 e70a841e 2019-08-08 stsp > $testroot/stdout 2> $testroot/stderr)
2133 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
2134 7b5dc508 2019-10-28 stsp echo "got stage command succeeded unexpectedly" >&2
2135 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2139 7b5dc508 2019-10-28 stsp echo "got: no changes to stage" > $testroot/stderr.expected
2140 e70a841e 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
2142 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2143 e70a841e 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
2144 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2148 e70a841e 2019-08-08 stsp echo -n > $testroot/stdout.expected
2149 9fdde394 2022-06-04 op cmp -s $testroot/stdout.expected $testroot/stdout
2151 9fdde394 2022-06-04 op if [ $ret -ne 0 ]; then
2152 9fdde394 2022-06-04 op diff -u $testroot/stdout.expected $testroot/stdout
2154 9fdde394 2022-06-04 op test_done "$testroot" "$ret"
2157 9fdde394 2022-06-04 op test_stage_patch_reversed() {
2158 9fdde394 2022-06-04 op local testroot=`test_init stage_patch_reversed`
2160 9fdde394 2022-06-04 op got checkout $testroot/repo $testroot/wt > /dev/null
2162 9fdde394 2022-06-04 op if [ $ret -ne 0 ]; then
2163 9fdde394 2022-06-04 op test_done "$testroot" "$ret"
2167 9fdde394 2022-06-04 op echo 'ALPHA' > $testroot/wt/alpha
2168 9fdde394 2022-06-04 op (cd $testroot/wt && got stage alpha > $testroot/stdout)
2170 9fdde394 2022-06-04 op if [ $ret -ne 0 ]; then
2171 9fdde394 2022-06-04 op test_done "$testroot" "$ret"
2175 9fdde394 2022-06-04 op echo ' M alpha' > $testroot/stdout.expected
2176 9fdde394 2022-06-04 op cmp -s $testroot/stdout.expected $testroot/stdout
2178 9fdde394 2022-06-04 op if [ $ret -ne 0 ]; then
2179 9fdde394 2022-06-04 op diff -u $testroot/stdout.expected $testroot/stdout
2180 9fdde394 2022-06-04 op test_done "$testroot" "$ret"
2184 9fdde394 2022-06-04 op echo 'alpha' > $testroot/wt/alpha
2185 9fdde394 2022-06-04 op (cd $testroot/wt && got stage alpha > $testroot/stdout)
2187 9fdde394 2022-06-04 op if [ $ret -ne 0 ]; then
2188 9fdde394 2022-06-04 op test_done "$testroot" "$ret"
2192 9fdde394 2022-06-04 op echo ' M alpha' > $testroot/stdout.expected
2193 e70a841e 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2195 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2196 e70a841e 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2197 9fdde394 2022-06-04 op test_done "$testroot" "$ret"
2201 9fdde394 2022-06-04 op (cd $testroot/wt && got status > $testroot/stdout)
2202 9fdde394 2022-06-04 op cmp -s /dev/null $testroot/stdout
2204 9fdde394 2022-06-04 op if [ $ret -ne 0 ]; then
2205 9fdde394 2022-06-04 op diff -u /dev/null $testroot/stdout
2207 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2210 f6cae3ed 2020-09-13 naddy test_stage_patch_quit() {
2211 b353a198 2019-08-07 stsp local testroot=`test_init stage_patch_quit`
2213 b353a198 2019-08-07 stsp jot 16 > $testroot/repo/numbers
2214 88f33a19 2019-08-08 stsp echo zzz > $testroot/repo/zzz
2215 88f33a19 2019-08-08 stsp (cd $testroot/repo && git add numbers zzz)
2216 88f33a19 2019-08-08 stsp git_commit $testroot/repo -m "added files"
2217 b353a198 2019-08-07 stsp local commit_id=`git_show_head $testroot/repo`
2219 b353a198 2019-08-07 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2221 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2222 b353a198 2019-08-07 stsp test_done "$testroot" "$ret"
2226 b353a198 2019-08-07 stsp sed -i -e 's/^2$/a/' $testroot/wt/numbers
2227 b353a198 2019-08-07 stsp sed -i -e 's/^7$/b/' $testroot/wt/numbers
2228 b353a198 2019-08-07 stsp sed -i -e 's/^16$/c/' $testroot/wt/numbers
2229 88f33a19 2019-08-08 stsp (cd $testroot/wt && got rm zzz > /dev/null)
2231 88f33a19 2019-08-08 stsp # stage first hunk and quit; and don't pass a path argument to
2232 88f33a19 2019-08-08 stsp # ensure that we don't skip asking about the 'zzz' file after 'quit'
2233 88f33a19 2019-08-08 stsp printf "y\nq\nn\n" > $testroot/patchscript
2234 b353a198 2019-08-07 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
2235 2db2652d 2019-08-07 stsp > $testroot/stdout)
2237 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2238 b353a198 2019-08-07 stsp echo "got stage command failed unexpectedly" >&2
2239 b353a198 2019-08-07 stsp test_done "$testroot" "1"
2242 b353a198 2019-08-07 stsp cat > $testroot/stdout.expected <<EOF
2243 b353a198 2019-08-07 stsp -----------------------------------------------
2244 b353a198 2019-08-07 stsp @@ -1,5 +1,5 @@
2251 b353a198 2019-08-07 stsp -----------------------------------------------
2252 a7c9878d 2019-08-08 stsp M numbers (change 1 of 3)
2253 b353a198 2019-08-07 stsp stage this change? [y/n/q] y
2254 b353a198 2019-08-07 stsp -----------------------------------------------
2255 b353a198 2019-08-07 stsp @@ -4,7 +4,7 @@
2264 b353a198 2019-08-07 stsp -----------------------------------------------
2265 a7c9878d 2019-08-08 stsp M numbers (change 2 of 3)
2266 b353a198 2019-08-07 stsp stage this change? [y/n/q] q
2268 f5a17245 2019-08-08 stsp stage this deletion? [y/n] n
2270 b353a198 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2272 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2273 b353a198 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2274 b353a198 2019-08-07 stsp test_done "$testroot" "$ret"
2278 b353a198 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
2279 b353a198 2019-08-07 stsp echo "MM numbers" > $testroot/stdout.expected
2280 88f33a19 2019-08-08 stsp echo "D zzz" >> $testroot/stdout.expected
2281 b353a198 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2283 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2284 b353a198 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2285 b353a198 2019-08-07 stsp test_done "$testroot" "$ret"
2289 b353a198 2019-08-07 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
2291 b353a198 2019-08-07 stsp echo "diff $commit_id $testroot/wt (staged changes)" \
2292 b353a198 2019-08-07 stsp > $testroot/stdout.expected
2293 b353a198 2019-08-07 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2294 b353a198 2019-08-07 stsp got tree -r $testroot/repo -i -c $commit_id \
2295 b353a198 2019-08-07 stsp | grep 'numbers$' | cut -d' ' -f 1 \
2296 b353a198 2019-08-07 stsp >> $testroot/stdout.expected
2297 b353a198 2019-08-07 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2298 b353a198 2019-08-07 stsp (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 \
2299 b353a198 2019-08-07 stsp >> $testroot/stdout.expected
2300 b353a198 2019-08-07 stsp echo "--- numbers" >> $testroot/stdout.expected
2301 b353a198 2019-08-07 stsp echo "+++ numbers" >> $testroot/stdout.expected
2302 b353a198 2019-08-07 stsp echo "@@ -1,5 +1,5 @@" >> $testroot/stdout.expected
2303 b353a198 2019-08-07 stsp echo " 1" >> $testroot/stdout.expected
2304 b353a198 2019-08-07 stsp echo "-2" >> $testroot/stdout.expected
2305 b353a198 2019-08-07 stsp echo "+a" >> $testroot/stdout.expected
2306 b353a198 2019-08-07 stsp echo " 3" >> $testroot/stdout.expected
2307 b353a198 2019-08-07 stsp echo " 4" >> $testroot/stdout.expected
2308 b353a198 2019-08-07 stsp echo " 5" >> $testroot/stdout.expected
2309 b353a198 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2311 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2312 b353a198 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2314 b353a198 2019-08-07 stsp test_done "$testroot" "$ret"
2318 f6cae3ed 2020-09-13 naddy test_stage_patch_incomplete_script() {
2319 eba70f38 2019-08-08 stsp local testroot=`test_init stage_incomplete_script`
2321 eba70f38 2019-08-08 stsp jot 16 > $testroot/repo/numbers
2322 eba70f38 2019-08-08 stsp echo zzz > $testroot/repo/zzz
2323 eba70f38 2019-08-08 stsp (cd $testroot/repo && git add numbers zzz)
2324 eba70f38 2019-08-08 stsp git_commit $testroot/repo -m "added files"
2325 eba70f38 2019-08-08 stsp local commit_id=`git_show_head $testroot/repo`
2327 eba70f38 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2329 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2330 eba70f38 2019-08-08 stsp test_done "$testroot" "$ret"
2334 eba70f38 2019-08-08 stsp sed -i -e 's/^2$/a/' $testroot/wt/numbers
2335 eba70f38 2019-08-08 stsp sed -i -e 's/^7$/b/' $testroot/wt/numbers
2336 eba70f38 2019-08-08 stsp sed -i -e 's/^16$/c/' $testroot/wt/numbers
2338 eba70f38 2019-08-08 stsp # stage first hunk and then stop responding; got should error out
2339 eba70f38 2019-08-08 stsp printf "y\n" > $testroot/patchscript
2340 eba70f38 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
2341 eba70f38 2019-08-08 stsp > $testroot/stdout 2> $testroot/stderr)
2343 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
2344 eba70f38 2019-08-08 stsp echo "got stage command succeeded unexpectedly" >&2
2345 eba70f38 2019-08-08 stsp test_done "$testroot" "1"
2348 eba70f38 2019-08-08 stsp cat > $testroot/stdout.expected <<EOF
2349 eba70f38 2019-08-08 stsp -----------------------------------------------
2350 eba70f38 2019-08-08 stsp @@ -1,5 +1,5 @@
2357 eba70f38 2019-08-08 stsp -----------------------------------------------
2358 eba70f38 2019-08-08 stsp M numbers (change 1 of 3)
2359 eba70f38 2019-08-08 stsp stage this change? [y/n/q] y
2360 eba70f38 2019-08-08 stsp -----------------------------------------------
2361 eba70f38 2019-08-08 stsp @@ -4,7 +4,7 @@
2370 eba70f38 2019-08-08 stsp -----------------------------------------------
2371 eba70f38 2019-08-08 stsp M numbers (change 2 of 3)
2373 eba70f38 2019-08-08 stsp echo -n "stage this change? [y/n/q] " >> $testroot/stdout.expected
2374 eba70f38 2019-08-08 stsp echo "got: invalid patch choice" > $testroot/stderr.expected
2375 eba70f38 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
2377 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2378 eba70f38 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
2379 eba70f38 2019-08-08 stsp test_done "$testroot" "$ret"
2383 eba70f38 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2385 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2386 eba70f38 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2387 eba70f38 2019-08-08 stsp test_done "$testroot" "$ret"
2391 eba70f38 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
2392 eba70f38 2019-08-08 stsp echo "M numbers" > $testroot/stdout.expected
2393 eba70f38 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2395 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2396 eba70f38 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2397 eba70f38 2019-08-08 stsp test_done "$testroot" "$ret"
2401 eba70f38 2019-08-08 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
2402 eba70f38 2019-08-08 stsp echo -n > $testroot/stdout.expected
2403 eba70f38 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2405 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2406 eba70f38 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2408 eba70f38 2019-08-08 stsp test_done "$testroot" "$ret"
2412 f6cae3ed 2020-09-13 naddy test_stage_symlink() {
2413 c631b115 2020-07-23 stsp local testroot=`test_init stage_symlink`
2415 c631b115 2020-07-23 stsp (cd $testroot/repo && ln -s alpha alpha.link)
2416 c631b115 2020-07-23 stsp (cd $testroot/repo && ln -s epsilon epsilon.link)
2417 c631b115 2020-07-23 stsp (cd $testroot/repo && ln -s /etc/passwd passwd.link)
2418 c631b115 2020-07-23 stsp (cd $testroot/repo && ln -s ../beta epsilon/beta.link)
2419 c631b115 2020-07-23 stsp (cd $testroot/repo && ln -s nonexistent nonexistent.link)
2420 c631b115 2020-07-23 stsp (cd $testroot/repo && git add .)
2421 c631b115 2020-07-23 stsp git_commit $testroot/repo -m "add symlinks"
2422 c631b115 2020-07-23 stsp local head_commit=`git_show_head $testroot/repo`
2424 c631b115 2020-07-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2426 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2427 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2431 c631b115 2020-07-23 stsp (cd $testroot/wt && ln -sf beta alpha.link)
2432 c631b115 2020-07-23 stsp (cd $testroot/wt && ln -sfh gamma epsilon.link)
2433 c631b115 2020-07-23 stsp (cd $testroot/wt && ln -sf ../gamma/delta epsilon/beta.link)
2434 c631b115 2020-07-23 stsp echo 'this is regular file foo' > $testroot/wt/dotgotfoo.link
2435 c631b115 2020-07-23 stsp (cd $testroot/wt && got add dotgotfoo.link > /dev/null)
2436 c631b115 2020-07-23 stsp (cd $testroot/wt && ln -sf .got/bar dotgotbar.link)
2437 c631b115 2020-07-23 stsp (cd $testroot/wt && got add dotgotbar.link > /dev/null)
2438 c631b115 2020-07-23 stsp (cd $testroot/wt && got rm nonexistent.link > /dev/null)
2439 c631b115 2020-07-23 stsp (cd $testroot/wt && ln -sf gamma/delta zeta.link)
2440 c631b115 2020-07-23 stsp (cd $testroot/wt && got add zeta.link > /dev/null)
2442 35213c7c 2020-07-23 stsp (cd $testroot/wt && got stage > $testroot/stdout 2> $testroot/stderr)
2444 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
2445 35213c7c 2020-07-23 stsp echo "got stage succeeded unexpectedly" >&2
2446 a19f439c 2022-06-03 op test_done "$testroot" 1
2449 35213c7c 2020-07-23 stsp echo -n "got: $testroot/wt/dotgotbar.link: " > $testroot/stderr.expected
2450 35213c7c 2020-07-23 stsp echo "symbolic link points outside of paths under version control" \
2451 35213c7c 2020-07-23 stsp >> $testroot/stderr.expected
2452 35213c7c 2020-07-23 stsp cmp -s $testroot/stderr.expected $testroot/stderr
2454 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2455 35213c7c 2020-07-23 stsp diff -u $testroot/stderr.expected $testroot/stderr
2456 35213c7c 2020-07-23 stsp test_done "$testroot" "$ret"
2460 35213c7c 2020-07-23 stsp (cd $testroot/wt && got stage -S > $testroot/stdout)
2462 c631b115 2020-07-23 stsp cat > $testroot/stdout.expected <<EOF
2463 c631b115 2020-07-23 stsp M alpha.link
2464 c631b115 2020-07-23 stsp A dotgotbar.link
2465 c631b115 2020-07-23 stsp A dotgotfoo.link
2466 c631b115 2020-07-23 stsp M epsilon/beta.link
2467 c631b115 2020-07-23 stsp M epsilon.link
2468 c631b115 2020-07-23 stsp D nonexistent.link
2469 c631b115 2020-07-23 stsp A zeta.link
2471 c631b115 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2473 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2474 c631b115 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2475 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2479 0aeb8099 2020-07-23 stsp rm $testroot/wt/alpha.link
2480 0aeb8099 2020-07-23 stsp echo 'this is regular file alpha.link' > $testroot/wt/alpha.link
2482 c631b115 2020-07-23 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
2484 c631b115 2020-07-23 stsp echo "diff $head_commit $testroot/wt (staged changes)" \
2485 c631b115 2020-07-23 stsp > $testroot/stdout.expected
2486 c631b115 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2487 c631b115 2020-07-23 stsp got tree -r $testroot/repo -i | grep 'alpha.link@ -> alpha$' | \
2488 c631b115 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2489 c631b115 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2490 c631b115 2020-07-23 stsp (cd $testroot/wt && got stage -l alpha.link) | cut -d' ' -f 1 \
2491 c631b115 2020-07-23 stsp >> $testroot/stdout.expected
2492 c631b115 2020-07-23 stsp echo '--- alpha.link' >> $testroot/stdout.expected
2493 c631b115 2020-07-23 stsp echo '+++ alpha.link' >> $testroot/stdout.expected
2494 c631b115 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
2495 c631b115 2020-07-23 stsp echo '-alpha' >> $testroot/stdout.expected
2496 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2497 c631b115 2020-07-23 stsp echo '+beta' >> $testroot/stdout.expected
2498 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2499 c631b115 2020-07-23 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
2500 c631b115 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2501 c631b115 2020-07-23 stsp (cd $testroot/wt && got stage -l dotgotbar.link) | cut -d' ' -f 1 \
2502 c631b115 2020-07-23 stsp >> $testroot/stdout.expected
2503 c631b115 2020-07-23 stsp echo '--- /dev/null' >> $testroot/stdout.expected
2504 c631b115 2020-07-23 stsp echo '+++ dotgotbar.link' >> $testroot/stdout.expected
2505 c631b115 2020-07-23 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
2506 c631b115 2020-07-23 stsp echo '+.got/bar' >> $testroot/stdout.expected
2507 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2508 c631b115 2020-07-23 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
2509 c631b115 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2510 c631b115 2020-07-23 stsp (cd $testroot/wt && got stage -l dotgotfoo.link) | cut -d' ' -f 1 \
2511 c631b115 2020-07-23 stsp >> $testroot/stdout.expected
2512 c631b115 2020-07-23 stsp echo '--- /dev/null' >> $testroot/stdout.expected
2513 c631b115 2020-07-23 stsp echo '+++ dotgotfoo.link' >> $testroot/stdout.expected
2514 c631b115 2020-07-23 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
2515 c631b115 2020-07-23 stsp echo '+this is regular file foo' >> $testroot/stdout.expected
2516 c631b115 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2517 c631b115 2020-07-23 stsp got tree -r $testroot/repo -i epsilon | grep 'beta.link@ -> ../beta$' | \
2518 c631b115 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2519 c631b115 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2520 c631b115 2020-07-23 stsp (cd $testroot/wt && got stage -l epsilon/beta.link) | cut -d' ' -f 1 \
2521 c631b115 2020-07-23 stsp >> $testroot/stdout.expected
2522 c631b115 2020-07-23 stsp echo '--- epsilon/beta.link' >> $testroot/stdout.expected
2523 c631b115 2020-07-23 stsp echo '+++ epsilon/beta.link' >> $testroot/stdout.expected
2524 c631b115 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
2525 c631b115 2020-07-23 stsp echo '-../beta' >> $testroot/stdout.expected
2526 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2527 c631b115 2020-07-23 stsp echo '+../gamma/delta' >> $testroot/stdout.expected
2528 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2529 c631b115 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2530 c631b115 2020-07-23 stsp got tree -r $testroot/repo -i | grep 'epsilon.link@ -> epsilon$' | \
2531 c631b115 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2532 c631b115 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2533 c631b115 2020-07-23 stsp (cd $testroot/wt && got stage -l epsilon.link) | cut -d' ' -f 1 \
2534 c631b115 2020-07-23 stsp >> $testroot/stdout.expected
2535 c631b115 2020-07-23 stsp echo '--- epsilon.link' >> $testroot/stdout.expected
2536 c631b115 2020-07-23 stsp echo '+++ epsilon.link' >> $testroot/stdout.expected
2537 c631b115 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
2538 c631b115 2020-07-23 stsp echo '-epsilon' >> $testroot/stdout.expected
2539 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2540 c631b115 2020-07-23 stsp echo '+gamma' >> $testroot/stdout.expected
2541 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2542 c631b115 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2543 c631b115 2020-07-23 stsp got tree -r $testroot/repo -i | grep 'nonexistent.link@ -> nonexistent$' | \
2544 c631b115 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2545 c631b115 2020-07-23 stsp echo 'blob + /dev/null' >> $testroot/stdout.expected
2546 c631b115 2020-07-23 stsp echo '--- nonexistent.link' >> $testroot/stdout.expected
2547 c631b115 2020-07-23 stsp echo '+++ /dev/null' >> $testroot/stdout.expected
2548 c631b115 2020-07-23 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
2549 c631b115 2020-07-23 stsp echo '-nonexistent' >> $testroot/stdout.expected
2550 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2551 c631b115 2020-07-23 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
2552 c631b115 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2553 c631b115 2020-07-23 stsp (cd $testroot/wt && got stage -l zeta.link) | cut -d' ' -f 1 \
2554 c631b115 2020-07-23 stsp >> $testroot/stdout.expected
2555 c631b115 2020-07-23 stsp echo '--- /dev/null' >> $testroot/stdout.expected
2556 c631b115 2020-07-23 stsp echo '+++ zeta.link' >> $testroot/stdout.expected
2557 c631b115 2020-07-23 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
2558 c631b115 2020-07-23 stsp echo '+gamma/delta' >> $testroot/stdout.expected
2559 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2561 c631b115 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2563 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2564 c631b115 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2565 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2569 c631b115 2020-07-23 stsp (cd $testroot/wt && got commit -m "staged symlink" \
2570 c631b115 2020-07-23 stsp > $testroot/stdout)
2572 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2573 c631b115 2020-07-23 stsp echo "got commit command failed unexpectedly" >&2
2574 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2578 c631b115 2020-07-23 stsp local commit_id=`git_show_head $testroot/repo`
2579 c631b115 2020-07-23 stsp echo "A dotgotbar.link" > $testroot/stdout.expected
2580 c631b115 2020-07-23 stsp echo "A dotgotfoo.link" >> $testroot/stdout.expected
2581 c631b115 2020-07-23 stsp echo "A zeta.link" >> $testroot/stdout.expected
2582 c631b115 2020-07-23 stsp echo "M alpha.link" >> $testroot/stdout.expected
2583 c631b115 2020-07-23 stsp echo "M epsilon/beta.link" >> $testroot/stdout.expected
2584 c631b115 2020-07-23 stsp echo "M epsilon.link" >> $testroot/stdout.expected
2585 c631b115 2020-07-23 stsp echo "D nonexistent.link" >> $testroot/stdout.expected
2586 c631b115 2020-07-23 stsp echo "Created commit $commit_id" >> $testroot/stdout.expected
2587 c631b115 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2589 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2590 c631b115 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2591 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2595 c631b115 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id > $testroot/stdout
2597 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2598 c631b115 2020-07-23 stsp echo "got tree command failed unexpectedly" >&2
2599 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2603 c631b115 2020-07-23 stsp cat > $testroot/stdout.expected <<EOF
2605 c631b115 2020-07-23 stsp alpha.link@ -> beta
2607 c631b115 2020-07-23 stsp dotgotbar.link@ -> .got/bar
2608 c631b115 2020-07-23 stsp dotgotfoo.link
2610 c631b115 2020-07-23 stsp epsilon.link@ -> gamma
2612 c631b115 2020-07-23 stsp passwd.link@ -> /etc/passwd
2613 c631b115 2020-07-23 stsp zeta.link@ -> gamma/delta
2615 c631b115 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2617 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2618 c631b115 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2622 0aeb8099 2020-07-23 stsp if [ -h $testroot/wt/alpha.link ]; then
2623 0aeb8099 2020-07-23 stsp echo "alpha.link is a symlink"
2624 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2628 0aeb8099 2020-07-23 stsp echo 'this is regular file alpha.link' > $testroot/content.expected
2629 0aeb8099 2020-07-23 stsp cp $testroot/wt/alpha.link $testroot/content
2630 0aeb8099 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2632 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2633 0aeb8099 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2634 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2638 75f0a0fb 2020-07-23 stsp if [ ! -h $testroot/wt/dotgotbar.link ]; then
2639 75f0a0fb 2020-07-23 stsp echo "dotgotbar.link is not a symlink"
2640 75f0a0fb 2020-07-23 stsp test_done "$testroot" "1"
2643 75f0a0fb 2020-07-23 stsp (cd $testroot/wt && got update > /dev/null)
2644 c631b115 2020-07-23 stsp if [ -h $testroot/wt/dotgotbar.link ]; then
2645 c631b115 2020-07-23 stsp echo "dotgotbar.link is a symlink"
2646 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2649 0aeb8099 2020-07-23 stsp echo -n ".got/bar" > $testroot/content.expected
2650 c631b115 2020-07-23 stsp cp $testroot/wt/dotgotbar.link $testroot/content
2651 fa3cef63 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2653 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2654 fa3cef63 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2655 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2659 fa3cef63 2020-07-23 stsp if [ -h $testroot/wt/dotgotfoo.link ]; then
2660 fa3cef63 2020-07-23 stsp echo "dotgotfoo.link is a symlink"
2661 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2664 fa3cef63 2020-07-23 stsp echo "this is regular file foo" > $testroot/content.expected
2665 fa3cef63 2020-07-23 stsp cp $testroot/wt/dotgotfoo.link $testroot/content
2666 fa3cef63 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2668 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2669 fa3cef63 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2670 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2674 fa3cef63 2020-07-23 stsp if ! [ -h $testroot/wt/epsilon.link ]; then
2675 fa3cef63 2020-07-23 stsp echo "epsilon.link is not a symlink"
2676 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2680 fa3cef63 2020-07-23 stsp readlink $testroot/wt/epsilon.link > $testroot/stdout
2681 fa3cef63 2020-07-23 stsp echo "gamma" > $testroot/stdout.expected
2682 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2684 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2685 fa3cef63 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2686 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2690 fa3cef63 2020-07-23 stsp if [ -h $testroot/wt/passwd.link ]; then
2691 fa3cef63 2020-07-23 stsp echo "passwd.link is a symlink"
2692 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2695 fa3cef63 2020-07-23 stsp echo -n "/etc/passwd" > $testroot/content.expected
2696 fa3cef63 2020-07-23 stsp cp $testroot/wt/passwd.link $testroot/content
2697 fa3cef63 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2699 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2700 fa3cef63 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2701 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2705 fa3cef63 2020-07-23 stsp if ! [ -h $testroot/wt/zeta.link ]; then
2706 fa3cef63 2020-07-23 stsp echo "zeta.link is not a symlink"
2707 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2711 fa3cef63 2020-07-23 stsp readlink $testroot/wt/zeta.link > $testroot/stdout
2712 fa3cef63 2020-07-23 stsp echo "gamma/delta" > $testroot/stdout.expected
2713 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2715 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2716 fa3cef63 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2717 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2721 fa3cef63 2020-07-23 stsp test_done "$testroot" "0"
2724 f6cae3ed 2020-09-13 naddy test_stage_patch_symlink() {
2725 fa3cef63 2020-07-23 stsp local testroot=`test_init stage_patch_symlink`
2727 fa3cef63 2020-07-23 stsp (cd $testroot/repo && ln -s alpha alpha.link)
2728 fa3cef63 2020-07-23 stsp (cd $testroot/repo && ln -s epsilon epsilon.link)
2729 fa3cef63 2020-07-23 stsp (cd $testroot/repo && ln -s /etc/passwd passwd.link)
2730 fa3cef63 2020-07-23 stsp (cd $testroot/repo && ln -s ../beta epsilon/beta.link)
2731 fa3cef63 2020-07-23 stsp (cd $testroot/repo && ln -s nonexistent nonexistent.link)
2732 fa3cef63 2020-07-23 stsp (cd $testroot/repo && git add .)
2733 fa3cef63 2020-07-23 stsp git_commit $testroot/repo -m "add symlinks"
2734 fa3cef63 2020-07-23 stsp local head_commit=`git_show_head $testroot/repo`
2736 fa3cef63 2020-07-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2738 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2739 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2743 fa3cef63 2020-07-23 stsp (cd $testroot/wt && ln -sf beta alpha.link)
2744 fa3cef63 2020-07-23 stsp (cd $testroot/wt && ln -sfh gamma epsilon.link)
2745 fa3cef63 2020-07-23 stsp (cd $testroot/wt && ln -sf ../gamma/delta epsilon/beta.link)
2746 fa3cef63 2020-07-23 stsp echo 'this is regular file foo' > $testroot/wt/dotgotfoo.link
2747 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got add dotgotfoo.link > /dev/null)
2748 fa3cef63 2020-07-23 stsp (cd $testroot/wt && ln -sf .got/bar dotgotbar.link)
2749 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got add dotgotbar.link > /dev/null)
2750 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got rm nonexistent.link > /dev/null)
2751 fa3cef63 2020-07-23 stsp (cd $testroot/wt && ln -sf gamma/delta zeta.link)
2752 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got add zeta.link > /dev/null)
2754 fa3cef63 2020-07-23 stsp printf "y\nn\ny\nn\ny\ny\ny" > $testroot/patchscript
2755 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
2756 fa3cef63 2020-07-23 stsp > $testroot/stdout)
2758 fa3cef63 2020-07-23 stsp cat > $testroot/stdout.expected <<EOF
2759 fa3cef63 2020-07-23 stsp -----------------------------------------------
2760 fa3cef63 2020-07-23 stsp @@ -1 +1 @@
2762 fa3cef63 2020-07-23 stsp \ No newline at end of file
2764 fa3cef63 2020-07-23 stsp \ No newline at end of file
2765 fa3cef63 2020-07-23 stsp -----------------------------------------------
2766 fa3cef63 2020-07-23 stsp M alpha.link (change 1 of 1)
2767 fa3cef63 2020-07-23 stsp stage this change? [y/n/q] y
2768 fa3cef63 2020-07-23 stsp A dotgotbar.link
2769 fa3cef63 2020-07-23 stsp stage this addition? [y/n] n
2770 fa3cef63 2020-07-23 stsp A dotgotfoo.link
2771 fa3cef63 2020-07-23 stsp stage this addition? [y/n] y
2772 fa3cef63 2020-07-23 stsp -----------------------------------------------
2773 fa3cef63 2020-07-23 stsp @@ -1 +1 @@
2775 fa3cef63 2020-07-23 stsp \ No newline at end of file
2776 fa3cef63 2020-07-23 stsp +../gamma/delta
2777 fa3cef63 2020-07-23 stsp \ No newline at end of file
2778 fa3cef63 2020-07-23 stsp -----------------------------------------------
2779 fa3cef63 2020-07-23 stsp M epsilon/beta.link (change 1 of 1)
2780 fa3cef63 2020-07-23 stsp stage this change? [y/n/q] n
2781 fa3cef63 2020-07-23 stsp -----------------------------------------------
2782 fa3cef63 2020-07-23 stsp @@ -1 +1 @@
2784 fa3cef63 2020-07-23 stsp \ No newline at end of file
2786 fa3cef63 2020-07-23 stsp \ No newline at end of file
2787 fa3cef63 2020-07-23 stsp -----------------------------------------------
2788 fa3cef63 2020-07-23 stsp M epsilon.link (change 1 of 1)
2789 fa3cef63 2020-07-23 stsp stage this change? [y/n/q] y
2790 fa3cef63 2020-07-23 stsp D nonexistent.link
2791 fa3cef63 2020-07-23 stsp stage this deletion? [y/n] y
2792 fa3cef63 2020-07-23 stsp A zeta.link
2793 fa3cef63 2020-07-23 stsp stage this addition? [y/n] y
2795 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2797 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2798 fa3cef63 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2799 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2803 fa3cef63 2020-07-23 stsp rm $testroot/wt/alpha.link
2804 fa3cef63 2020-07-23 stsp echo 'this is regular file alpha.link' > $testroot/wt/alpha.link
2806 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
2808 fa3cef63 2020-07-23 stsp echo "diff $head_commit $testroot/wt (staged changes)" \
2809 fa3cef63 2020-07-23 stsp > $testroot/stdout.expected
2810 fa3cef63 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2811 fa3cef63 2020-07-23 stsp got tree -r $testroot/repo -i | grep 'alpha.link@ -> alpha$' | \
2812 fa3cef63 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2813 fa3cef63 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2814 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got stage -l alpha.link) | cut -d' ' -f 1 \
2815 fa3cef63 2020-07-23 stsp >> $testroot/stdout.expected
2816 fa3cef63 2020-07-23 stsp echo '--- alpha.link' >> $testroot/stdout.expected
2817 fa3cef63 2020-07-23 stsp echo '+++ alpha.link' >> $testroot/stdout.expected
2818 fa3cef63 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
2819 fa3cef63 2020-07-23 stsp echo '-alpha' >> $testroot/stdout.expected
2820 fa3cef63 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2821 fa3cef63 2020-07-23 stsp echo '+beta' >> $testroot/stdout.expected
2822 fa3cef63 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2823 fa3cef63 2020-07-23 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
2824 fa3cef63 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2825 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got stage -l dotgotfoo.link) | cut -d' ' -f 1 \
2826 fa3cef63 2020-07-23 stsp >> $testroot/stdout.expected
2827 fa3cef63 2020-07-23 stsp echo '--- /dev/null' >> $testroot/stdout.expected
2828 fa3cef63 2020-07-23 stsp echo '+++ dotgotfoo.link' >> $testroot/stdout.expected
2829 fa3cef63 2020-07-23 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
2830 fa3cef63 2020-07-23 stsp echo '+this is regular file foo' >> $testroot/stdout.expected
2831 fa3cef63 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2832 fa3cef63 2020-07-23 stsp got tree -r $testroot/repo -i | grep 'epsilon.link@ -> epsilon$' | \
2833 fa3cef63 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2834 fa3cef63 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2835 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got stage -l epsilon.link) | cut -d' ' -f 1 \
2836 fa3cef63 2020-07-23 stsp >> $testroot/stdout.expected
2837 fa3cef63 2020-07-23 stsp echo '--- epsilon.link' >> $testroot/stdout.expected
2838 fa3cef63 2020-07-23 stsp echo '+++ epsilon.link' >> $testroot/stdout.expected
2839 fa3cef63 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
2840 fa3cef63 2020-07-23 stsp echo '-epsilon' >> $testroot/stdout.expected
2841 fa3cef63 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2842 fa3cef63 2020-07-23 stsp echo '+gamma' >> $testroot/stdout.expected
2843 fa3cef63 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2844 fa3cef63 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2845 fa3cef63 2020-07-23 stsp got tree -r $testroot/repo -i | grep 'nonexistent.link@ -> nonexistent$' | \
2846 fa3cef63 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2847 fa3cef63 2020-07-23 stsp echo 'blob + /dev/null' >> $testroot/stdout.expected
2848 fa3cef63 2020-07-23 stsp echo '--- nonexistent.link' >> $testroot/stdout.expected
2849 fa3cef63 2020-07-23 stsp echo '+++ /dev/null' >> $testroot/stdout.expected
2850 fa3cef63 2020-07-23 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
2851 fa3cef63 2020-07-23 stsp echo '-nonexistent' >> $testroot/stdout.expected
2852 fa3cef63 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2853 fa3cef63 2020-07-23 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
2854 fa3cef63 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2855 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got stage -l zeta.link) | cut -d' ' -f 1 \
2856 fa3cef63 2020-07-23 stsp >> $testroot/stdout.expected
2857 fa3cef63 2020-07-23 stsp echo '--- /dev/null' >> $testroot/stdout.expected
2858 fa3cef63 2020-07-23 stsp echo '+++ zeta.link' >> $testroot/stdout.expected
2859 fa3cef63 2020-07-23 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
2860 fa3cef63 2020-07-23 stsp echo '+gamma/delta' >> $testroot/stdout.expected
2861 fa3cef63 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2863 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2865 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2866 fa3cef63 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2867 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2871 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got commit -m "staged symlink" \
2872 fa3cef63 2020-07-23 stsp > $testroot/stdout)
2874 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2875 fa3cef63 2020-07-23 stsp echo "got commit command failed unexpectedly" >&2
2876 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2880 fa3cef63 2020-07-23 stsp local commit_id=`git_show_head $testroot/repo`
2881 fa3cef63 2020-07-23 stsp echo "A dotgotfoo.link" > $testroot/stdout.expected
2882 fa3cef63 2020-07-23 stsp echo "A zeta.link" >> $testroot/stdout.expected
2883 fa3cef63 2020-07-23 stsp echo "M alpha.link" >> $testroot/stdout.expected
2884 fa3cef63 2020-07-23 stsp echo "M epsilon.link" >> $testroot/stdout.expected
2885 fa3cef63 2020-07-23 stsp echo "D nonexistent.link" >> $testroot/stdout.expected
2886 fa3cef63 2020-07-23 stsp echo "Created commit $commit_id" >> $testroot/stdout.expected
2887 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2889 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2890 fa3cef63 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2891 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2895 fa3cef63 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id > $testroot/stdout
2897 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2898 fa3cef63 2020-07-23 stsp echo "got tree command failed unexpectedly" >&2
2899 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2903 fa3cef63 2020-07-23 stsp cat > $testroot/stdout.expected <<EOF
2905 fa3cef63 2020-07-23 stsp alpha.link@ -> beta
2907 fa3cef63 2020-07-23 stsp dotgotfoo.link
2909 fa3cef63 2020-07-23 stsp epsilon.link@ -> gamma
2911 fa3cef63 2020-07-23 stsp passwd.link@ -> /etc/passwd
2912 fa3cef63 2020-07-23 stsp zeta.link@ -> gamma/delta
2914 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2916 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2917 fa3cef63 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2921 fa3cef63 2020-07-23 stsp if [ -h $testroot/wt/alpha.link ]; then
2922 fa3cef63 2020-07-23 stsp echo "alpha.link is a symlink"
2923 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2927 fa3cef63 2020-07-23 stsp echo 'this is regular file alpha.link' > $testroot/content.expected
2928 fa3cef63 2020-07-23 stsp cp $testroot/wt/alpha.link $testroot/content
2929 c631b115 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2931 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2932 c631b115 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2933 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2937 fa3cef63 2020-07-23 stsp if [ ! -h $testroot/wt/dotgotbar.link ]; then
2938 fa3cef63 2020-07-23 stsp echo "dotgotbar.link is not a symlink"
2939 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2942 fa3cef63 2020-07-23 stsp readlink $testroot/wt/dotgotbar.link > $testroot/stdout
2943 fa3cef63 2020-07-23 stsp echo ".got/bar" > $testroot/stdout.expected
2944 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2946 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2947 fa3cef63 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2948 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2952 c631b115 2020-07-23 stsp if [ -h $testroot/wt/dotgotfoo.link ]; then
2953 c631b115 2020-07-23 stsp echo "dotgotfoo.link is a symlink"
2954 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2957 c631b115 2020-07-23 stsp echo "this is regular file foo" > $testroot/content.expected
2958 c631b115 2020-07-23 stsp cp $testroot/wt/dotgotfoo.link $testroot/content
2959 c631b115 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2961 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2962 c631b115 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2963 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2967 c631b115 2020-07-23 stsp if ! [ -h $testroot/wt/epsilon.link ]; then
2968 c631b115 2020-07-23 stsp echo "epsilon.link is not a symlink"
2969 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2973 c631b115 2020-07-23 stsp readlink $testroot/wt/epsilon.link > $testroot/stdout
2974 c631b115 2020-07-23 stsp echo "gamma" > $testroot/stdout.expected
2975 c631b115 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2977 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2978 c631b115 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2979 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2983 c631b115 2020-07-23 stsp if [ -h $testroot/wt/passwd.link ]; then
2984 c631b115 2020-07-23 stsp echo "passwd.link is a symlink"
2985 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2988 c631b115 2020-07-23 stsp echo -n "/etc/passwd" > $testroot/content.expected
2989 c631b115 2020-07-23 stsp cp $testroot/wt/passwd.link $testroot/content
2990 c631b115 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2992 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2993 c631b115 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2994 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2998 c631b115 2020-07-23 stsp if ! [ -h $testroot/wt/zeta.link ]; then
2999 c631b115 2020-07-23 stsp echo "zeta.link is not a symlink"
3000 c631b115 2020-07-23 stsp test_done "$testroot" "1"
3004 c631b115 2020-07-23 stsp readlink $testroot/wt/zeta.link > $testroot/stdout
3005 c631b115 2020-07-23 stsp echo "gamma/delta" > $testroot/stdout.expected
3006 c631b115 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
3008 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
3009 c631b115 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
3010 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
3014 c631b115 2020-07-23 stsp test_done "$testroot" "0"
3017 7fb414ae 2020-08-08 stsp test_parseargs "$@"
3018 fccbfb98 2019-08-03 stsp run_test test_stage_basic
3019 31b20a6e 2019-08-06 stsp run_test test_stage_no_changes
3020 8b13ce36 2019-08-08 stsp run_test test_stage_unversioned
3021 8564cb21 2019-08-08 stsp run_test test_stage_nonexistent
3022 a4f692bb 2019-08-04 stsp run_test test_stage_list
3023 ebf48fd5 2019-08-03 stsp run_test test_stage_conflict
3024 735ef5ac 2019-08-03 stsp run_test test_stage_out_of_date
3025 d3e7c587 2019-08-03 stsp run_test test_double_stage
3026 c363b2c1 2019-08-03 stsp run_test test_stage_status
3027 1e1446d3 2019-08-03 stsp run_test test_stage_add_already_staged_file
3028 9acbc4fa 2019-08-03 stsp run_test test_stage_rm_already_staged_file
3029 24278f30 2019-08-03 stsp run_test test_stage_revert
3030 408b4ebc 2019-08-03 stsp run_test test_stage_diff
3031 b9622844 2019-08-03 stsp run_test test_stage_histedit
3032 243d7cf1 2019-08-03 stsp run_test test_stage_rebase
3033 a76c42e6 2019-08-03 stsp run_test test_stage_update
3034 f0b75401 2019-08-03 stsp run_test test_stage_commit_non_staged
3035 0f1cfa7f 2019-08-08 stsp run_test test_stage_commit_out_of_date
3036 5f8a88c6 2019-08-03 stsp run_test test_stage_commit
3037 dc424a06 2019-08-07 stsp run_test test_stage_patch
3038 af5a81b2 2019-08-08 stsp run_test test_stage_patch_twice
3039 dc424a06 2019-08-07 stsp run_test test_stage_patch_added
3040 e70a841e 2019-08-08 stsp run_test test_stage_patch_added_twice
3041 dc424a06 2019-08-07 stsp run_test test_stage_patch_removed
3042 e70a841e 2019-08-08 stsp run_test test_stage_patch_removed_twice
3043 9fdde394 2022-06-04 op run_test test_stage_patch_reversed
3044 b353a198 2019-08-07 stsp run_test test_stage_patch_quit
3045 eba70f38 2019-08-08 stsp run_test test_stage_patch_incomplete_script
3046 c631b115 2020-07-23 stsp run_test test_stage_symlink
3047 fa3cef63 2020-07-23 stsp run_test test_stage_patch_symlink
