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 8469d821 2022-06-25 stsp echo "diff $testroot/wt" > $testroot/stdout.expected
937 8469d821 2022-06-25 stsp echo "commit - $head_commit" >> $testroot/stdout.expected
938 8469d821 2022-06-25 stsp echo "path + $testroot/wt" >> $testroot/stdout.expected
939 408b4ebc 2019-08-03 stsp echo -n 'blob - ' >> $testroot/stdout.expected
940 4ce46740 2019-08-08 stsp (cd $testroot/wt && got stage -l alpha) | cut -d' ' -f 1 | tr -d '\n' \
941 408b4ebc 2019-08-03 stsp >> $testroot/stdout.expected
942 4ce46740 2019-08-08 stsp echo ' (staged)' >> $testroot/stdout.expected
943 408b4ebc 2019-08-03 stsp echo 'file + alpha' >> $testroot/stdout.expected
944 408b4ebc 2019-08-03 stsp echo '--- alpha' >> $testroot/stdout.expected
945 408b4ebc 2019-08-03 stsp echo '+++ alpha' >> $testroot/stdout.expected
946 408b4ebc 2019-08-03 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
947 408b4ebc 2019-08-03 stsp echo '-modified file' >> $testroot/stdout.expected
948 408b4ebc 2019-08-03 stsp echo '+modified file again' >> $testroot/stdout.expected
949 408b4ebc 2019-08-03 stsp echo -n 'blob - ' >> $testroot/stdout.expected
950 4ce46740 2019-08-08 stsp (cd $testroot/wt && got stage -l foo) | cut -d' ' -f 1 | tr -d '\n' \
951 408b4ebc 2019-08-03 stsp >> $testroot/stdout.expected
952 4ce46740 2019-08-08 stsp echo " (staged)" >> $testroot/stdout.expected
953 408b4ebc 2019-08-03 stsp echo 'file + foo' >> $testroot/stdout.expected
954 408b4ebc 2019-08-03 stsp echo '--- foo' >> $testroot/stdout.expected
955 408b4ebc 2019-08-03 stsp echo '+++ foo' >> $testroot/stdout.expected
956 408b4ebc 2019-08-03 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
957 408b4ebc 2019-08-03 stsp echo '-new file' >> $testroot/stdout.expected
958 408b4ebc 2019-08-03 stsp echo '+new file changed' >> $testroot/stdout.expected
960 98eaaa12 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
962 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
963 98eaaa12 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
964 98eaaa12 2019-08-03 stsp test_done "$testroot" "$ret"
968 98eaaa12 2019-08-03 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
970 8469d821 2022-06-25 stsp echo "diff -s $testroot/wt" > $testroot/stdout.expected
971 8469d821 2022-06-25 stsp echo "commit - $head_commit" >> $testroot/stdout.expected
972 8469d821 2022-06-25 stsp echo "path + $testroot/wt (staged changes)" >> $testroot/stdout.expected
973 98eaaa12 2019-08-03 stsp echo -n 'blob - ' >> $testroot/stdout.expected
974 98eaaa12 2019-08-03 stsp got tree -r $testroot/repo -i | grep 'alpha$' | cut -d' ' -f 1 \
975 98eaaa12 2019-08-03 stsp >> $testroot/stdout.expected
976 98eaaa12 2019-08-03 stsp echo -n 'blob + ' >> $testroot/stdout.expected
977 98eaaa12 2019-08-03 stsp (cd $testroot/wt && got stage -l alpha) | cut -d' ' -f 1 \
978 98eaaa12 2019-08-03 stsp >> $testroot/stdout.expected
979 98eaaa12 2019-08-03 stsp echo '--- alpha' >> $testroot/stdout.expected
980 98eaaa12 2019-08-03 stsp echo '+++ alpha' >> $testroot/stdout.expected
981 98eaaa12 2019-08-03 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
982 98eaaa12 2019-08-03 stsp echo '-alpha' >> $testroot/stdout.expected
983 98eaaa12 2019-08-03 stsp echo '+modified file' >> $testroot/stdout.expected
984 98eaaa12 2019-08-03 stsp echo -n 'blob - ' >> $testroot/stdout.expected
985 98eaaa12 2019-08-03 stsp got tree -r $testroot/repo -i | grep 'beta$' | cut -d' ' -f 1 \
986 98eaaa12 2019-08-03 stsp >> $testroot/stdout.expected
987 98eaaa12 2019-08-03 stsp echo 'blob + /dev/null' >> $testroot/stdout.expected
988 98eaaa12 2019-08-03 stsp echo '--- beta' >> $testroot/stdout.expected
989 98eaaa12 2019-08-03 stsp echo '+++ /dev/null' >> $testroot/stdout.expected
990 98eaaa12 2019-08-03 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
991 98eaaa12 2019-08-03 stsp echo '-beta' >> $testroot/stdout.expected
992 98eaaa12 2019-08-03 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
993 98eaaa12 2019-08-03 stsp echo -n 'blob + ' >> $testroot/stdout.expected
994 98eaaa12 2019-08-03 stsp (cd $testroot/wt && got stage -l foo) | cut -d' ' -f 1 \
995 98eaaa12 2019-08-03 stsp >> $testroot/stdout.expected
996 98eaaa12 2019-08-03 stsp echo '--- /dev/null' >> $testroot/stdout.expected
997 98eaaa12 2019-08-03 stsp echo '+++ foo' >> $testroot/stdout.expected
998 98eaaa12 2019-08-03 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
999 98eaaa12 2019-08-03 stsp echo '+new file' >> $testroot/stdout.expected
1001 24278f30 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1003 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1004 24278f30 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1006 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
1010 f6cae3ed 2020-09-13 naddy test_stage_histedit() {
1011 b9622844 2019-08-03 stsp local testroot=`test_init stage_histedit`
1012 b9622844 2019-08-03 stsp local orig_commit=`git_show_head $testroot/repo`
1014 b9622844 2019-08-03 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1016 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1017 b9622844 2019-08-03 stsp test_done "$testroot" "$ret"
1021 b9622844 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
1022 b9622844 2019-08-03 stsp (cd $testroot/wt && got stage alpha > /dev/null)
1024 b9622844 2019-08-03 stsp echo "modified alpha on master" > $testroot/repo/alpha
1025 b9622844 2019-08-03 stsp (cd $testroot/repo && git rm -q beta)
1026 b9622844 2019-08-03 stsp echo "new file on master" > $testroot/repo/epsilon/new
1027 b9622844 2019-08-03 stsp (cd $testroot/repo && git add epsilon/new)
1028 b9622844 2019-08-03 stsp git_commit $testroot/repo -m "committing changes"
1029 b9622844 2019-08-03 stsp local old_commit1=`git_show_head $testroot/repo`
1031 b9622844 2019-08-03 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1032 b9622844 2019-08-03 stsp git_commit $testroot/repo -m "committing to zeta on master"
1033 b9622844 2019-08-03 stsp local old_commit2=`git_show_head $testroot/repo`
1035 b9622844 2019-08-03 stsp echo "pick $old_commit1" > $testroot/histedit-script
1036 b9622844 2019-08-03 stsp echo "pick $old_commit2" >> $testroot/histedit-script
1038 b9622844 2019-08-03 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1039 b9622844 2019-08-03 stsp > $testroot/stdout 2> $testroot/stderr)
1041 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1042 b9622844 2019-08-03 stsp echo "got histedit command succeeded unexpectedly" >&2
1043 b9622844 2019-08-03 stsp test_done "$testroot" "1"
1047 b9622844 2019-08-03 stsp echo -n > $testroot/stdout.expected
1048 b9622844 2019-08-03 stsp echo "got: alpha: file is staged" > $testroot/stderr.expected
1050 b9622844 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1052 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1053 b9622844 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
1054 b9622844 2019-08-03 stsp test_done "$testroot" "$ret"
1057 b9622844 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1059 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1060 b9622844 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1062 b9622844 2019-08-03 stsp test_done "$testroot" "$ret"
1066 f6cae3ed 2020-09-13 naddy test_stage_rebase() {
1067 243d7cf1 2019-08-03 stsp local testroot=`test_init stage_rebase`
1069 243d7cf1 2019-08-03 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1070 243d7cf1 2019-08-03 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
1071 243d7cf1 2019-08-03 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
1073 243d7cf1 2019-08-03 stsp echo "modified alpha on branch" > $testroot/repo/alpha
1074 243d7cf1 2019-08-03 stsp (cd $testroot/repo && git rm -q beta)
1075 243d7cf1 2019-08-03 stsp echo "new file on branch" > $testroot/repo/epsilon/new
1076 243d7cf1 2019-08-03 stsp (cd $testroot/repo && git add epsilon/new)
1077 243d7cf1 2019-08-03 stsp git_commit $testroot/repo -m "committing more changes on newbranch"
1079 243d7cf1 2019-08-03 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
1080 243d7cf1 2019-08-03 stsp local orig_commit2=`git_show_head $testroot/repo`
1082 243d7cf1 2019-08-03 stsp (cd $testroot/repo && git checkout -q master)
1083 243d7cf1 2019-08-03 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1084 243d7cf1 2019-08-03 stsp git_commit $testroot/repo -m "committing to zeta on master"
1085 243d7cf1 2019-08-03 stsp local master_commit=`git_show_head $testroot/repo`
1087 243d7cf1 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1089 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1090 243d7cf1 2019-08-03 stsp test_done "$testroot" "$ret"
1094 243d7cf1 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
1095 243d7cf1 2019-08-03 stsp (cd $testroot/wt && got stage alpha > /dev/null)
1097 243d7cf1 2019-08-03 stsp (cd $testroot/wt && got rebase newbranch \
1098 243d7cf1 2019-08-03 stsp > $testroot/stdout 2> $testroot/stderr)
1100 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1101 243d7cf1 2019-08-03 stsp echo "got rebase command succeeded unexpectedly" >&2
1102 243d7cf1 2019-08-03 stsp test_done "$testroot" "1"
1106 243d7cf1 2019-08-03 stsp echo -n > $testroot/stdout.expected
1107 243d7cf1 2019-08-03 stsp echo "got: alpha: file is staged" > $testroot/stderr.expected
1109 243d7cf1 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1111 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1112 243d7cf1 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
1113 243d7cf1 2019-08-03 stsp test_done "$testroot" "$ret"
1116 243d7cf1 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1118 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1119 243d7cf1 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1121 243d7cf1 2019-08-03 stsp test_done "$testroot" "$ret"
1124 f6cae3ed 2020-09-13 naddy test_stage_update() {
1125 a76c42e6 2019-08-03 stsp local testroot=`test_init stage_update`
1127 a76c42e6 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1129 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1130 a76c42e6 2019-08-03 stsp test_done "$testroot" "$ret"
1134 a76c42e6 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
1135 a76c42e6 2019-08-03 stsp (cd $testroot/wt && got stage alpha > /dev/null)
1137 a76c42e6 2019-08-03 stsp echo "modified alpha" > $testroot/repo/alpha
1138 a76c42e6 2019-08-03 stsp git_commit $testroot/repo -m "modified alpha"
1140 a76c42e6 2019-08-03 stsp (cd $testroot/wt && got update > $testroot/stdout \
1141 a76c42e6 2019-08-03 stsp 2> $testroot/stderr)
1143 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1144 a76c42e6 2019-08-03 stsp echo "got update command succeeded unexpectedly" >&2
1145 a76c42e6 2019-08-03 stsp test_done "$testroot" "1"
1149 a76c42e6 2019-08-03 stsp echo -n > $testroot/stdout.expected
1150 a76c42e6 2019-08-03 stsp echo "got: alpha: file is staged" > $testroot/stderr.expected
1152 a76c42e6 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1154 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1155 a76c42e6 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
1156 a76c42e6 2019-08-03 stsp test_done "$testroot" "$ret"
1159 a76c42e6 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1161 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1162 a76c42e6 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1164 a76c42e6 2019-08-03 stsp test_done "$testroot" "$ret"
1167 f6cae3ed 2020-09-13 naddy test_stage_commit_non_staged() {
1168 f0b75401 2019-08-03 stsp local testroot=`test_init stage_commit_non_staged`
1170 f0b75401 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1172 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1173 f0b75401 2019-08-03 stsp test_done "$testroot" "$ret"
1177 f0b75401 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
1178 f0b75401 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
1179 f0b75401 2019-08-03 stsp echo "new file" > $testroot/wt/foo
1180 f0b75401 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
1181 f0b75401 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > /dev/null)
1183 f0b75401 2019-08-03 stsp echo "modified file" > $testroot/wt/gamma/delta
1184 f0b75401 2019-08-03 stsp (cd $testroot/wt && got commit -m "change delta" gamma/delta \
1185 f0b75401 2019-08-03 stsp > $testroot/stdout 2> $testroot/stderr)
1187 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1188 f0b75401 2019-08-03 stsp echo "got commit command succeeded unexpectedly" >&2
1189 f0b75401 2019-08-03 stsp test_done "$testroot" "1"
1193 f0b75401 2019-08-03 stsp echo -n > $testroot/stdout.expected
1194 f0b75401 2019-08-03 stsp echo "got: gamma/delta: file is not staged" > $testroot/stderr.expected
1196 f0b75401 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1198 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1199 f0b75401 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
1200 5f8a88c6 2019-08-03 stsp test_done "$testroot" "$ret"
1203 5f8a88c6 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1205 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1206 5f8a88c6 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1208 5f8a88c6 2019-08-03 stsp test_done "$testroot" "$ret"
1211 f6cae3ed 2020-09-13 naddy test_stage_commit_out_of_date() {
1212 0f1cfa7f 2019-08-08 stsp local testroot=`test_init stage_commit_out_of_date`
1214 0f1cfa7f 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1216 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1217 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1221 0f1cfa7f 2019-08-08 stsp echo "modified file" > $testroot/wt/alpha
1222 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got rm beta > /dev/null)
1223 0f1cfa7f 2019-08-08 stsp echo "new file" > $testroot/wt/foo
1224 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got add foo > /dev/null)
1225 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got stage alpha beta foo > /dev/null)
1227 0f1cfa7f 2019-08-08 stsp echo "changed file" > $testroot/repo/alpha
1228 0f1cfa7f 2019-08-08 stsp git_commit $testroot/repo -m "changed alpha in repo"
1230 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got commit -m "try to commit" > $testroot/stdout \
1231 0f1cfa7f 2019-08-08 stsp 2> $testroot/stderr)
1233 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1234 0f1cfa7f 2019-08-08 stsp echo "got commit command succeeded unexpectedly" >&2
1235 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "1"
1239 0f1cfa7f 2019-08-08 stsp echo -n > $testroot/stdout.expected
1240 0f1cfa7f 2019-08-08 stsp echo -n "got: work tree must be updated before these changes " \
1241 0f1cfa7f 2019-08-08 stsp > $testroot/stderr.expected
1242 0f1cfa7f 2019-08-08 stsp echo "can be committed" >> $testroot/stderr.expected
1244 0f1cfa7f 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1246 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1247 0f1cfa7f 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
1248 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1251 0f1cfa7f 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1253 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1254 0f1cfa7f 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1255 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1259 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got update > $testroot/stdout \
1260 0f1cfa7f 2019-08-08 stsp 2> $testroot/stderr)
1261 0f1cfa7f 2019-08-08 stsp echo -n > $testroot/stdout.expected
1262 0f1cfa7f 2019-08-08 stsp echo "got: alpha: file is staged" > $testroot/stderr.expected
1264 0f1cfa7f 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1266 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1267 0f1cfa7f 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
1268 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1271 0f1cfa7f 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1273 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1274 0f1cfa7f 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1275 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1279 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got unstage > /dev/null)
1280 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got update > $testroot/stdout)
1282 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1283 0f1cfa7f 2019-08-08 stsp echo "got update command failed unexpectedly" >&2
1284 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1288 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
1289 0f1cfa7f 2019-08-08 stsp echo "C alpha" > $testroot/stdout.expected
1290 0f1cfa7f 2019-08-08 stsp echo "D beta" >> $testroot/stdout.expected
1291 0f1cfa7f 2019-08-08 stsp echo "A foo" >> $testroot/stdout.expected
1292 0f1cfa7f 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1294 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1295 0f1cfa7f 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1296 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1300 0f1cfa7f 2019-08-08 stsp # resolve conflict
1301 0f1cfa7f 2019-08-08 stsp echo "resolved file" > $testroot/wt/alpha
1303 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got stage > /dev/null)
1305 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got commit -m "try again" > $testroot/stdout)
1307 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1308 0f1cfa7f 2019-08-08 stsp echo "got commit command failed unexpectedly" >&2
1309 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1313 0f1cfa7f 2019-08-08 stsp local commit_id=`git_show_head $testroot/repo`
1314 0f1cfa7f 2019-08-08 stsp echo "A foo" > $testroot/stdout.expected
1315 0f1cfa7f 2019-08-08 stsp echo "M alpha" >> $testroot/stdout.expected
1316 0f1cfa7f 2019-08-08 stsp echo "D beta" >> $testroot/stdout.expected
1317 0f1cfa7f 2019-08-08 stsp echo "Created commit $commit_id" >> $testroot/stdout.expected
1318 0f1cfa7f 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1320 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1321 0f1cfa7f 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1323 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1327 f6cae3ed 2020-09-13 naddy test_stage_commit() {
1328 5f8a88c6 2019-08-03 stsp local testroot=`test_init stage_commit`
1329 5f8a88c6 2019-08-03 stsp local first_commit=`git_show_head $testroot/repo`
1331 5f8a88c6 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1333 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1334 5f8a88c6 2019-08-03 stsp test_done "$testroot" "$ret"
1338 5f8a88c6 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
1339 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
1340 5f8a88c6 2019-08-03 stsp echo "new file" > $testroot/wt/foo
1341 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
1342 5f8a88c6 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
1343 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > /dev/null)
1345 5f8a88c6 2019-08-03 stsp echo "modified file again" > $testroot/wt/alpha
1346 5f8a88c6 2019-08-03 stsp echo "new file changed" > $testroot/wt/foo
1347 5f8a88c6 2019-08-03 stsp echo "non-staged change" > $testroot/wt/gamma/delta
1348 5f8a88c6 2019-08-03 stsp echo "non-staged new file" > $testroot/wt/epsilon/new
1349 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got add epsilon/new > /dev/null)
1350 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got rm epsilon/zeta > /dev/null)
1352 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got stage -l alpha) | cut -d' ' -f 1 \
1353 5f8a88c6 2019-08-03 stsp > $testroot/blob_id_alpha
1354 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got stage -l foo) | cut -d' ' -f 1 \
1355 5f8a88c6 2019-08-03 stsp > $testroot/blob_id_foo
1357 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got commit -m "staged changes" \
1358 5f8a88c6 2019-08-03 stsp > $testroot/stdout)
1360 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1361 5f8a88c6 2019-08-03 stsp echo "got commit command failed unexpectedly" >&2
1362 5f8a88c6 2019-08-03 stsp test_done "$testroot" "1"
1366 5f8a88c6 2019-08-03 stsp local head_commit=`git_show_head $testroot/repo`
1367 5f8a88c6 2019-08-03 stsp echo "A foo" > $testroot/stdout.expected
1368 5f8a88c6 2019-08-03 stsp echo "M alpha" >> $testroot/stdout.expected
1369 5f8a88c6 2019-08-03 stsp echo "D beta" >> $testroot/stdout.expected
1370 5f8a88c6 2019-08-03 stsp echo "Created commit $head_commit" >> $testroot/stdout.expected
1372 5f8a88c6 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1374 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1375 5f8a88c6 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1376 f0b75401 2019-08-03 stsp test_done "$testroot" "$ret"
1380 5f8a88c6 2019-08-03 stsp got diff -r $testroot/repo $first_commit $head_commit \
1381 5f8a88c6 2019-08-03 stsp > $testroot/stdout
1383 5f8a88c6 2019-08-03 stsp echo "diff $first_commit $head_commit" \
1384 5f8a88c6 2019-08-03 stsp > $testroot/stdout.expected
1385 8469d821 2022-06-25 stsp echo "commit - $first_commit" >> $testroot/stdout.expected
1386 8469d821 2022-06-25 stsp echo "commit + $head_commit" >> $testroot/stdout.expected
1387 5f8a88c6 2019-08-03 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1388 5f8a88c6 2019-08-03 stsp got tree -r $testroot/repo -i -c $first_commit | \
1389 5f8a88c6 2019-08-03 stsp grep 'alpha$' | cut -d' ' -f 1 \
1390 5f8a88c6 2019-08-03 stsp >> $testroot/stdout.expected
1391 5f8a88c6 2019-08-03 stsp echo -n 'blob + ' >> $testroot/stdout.expected
1392 5f8a88c6 2019-08-03 stsp cat $testroot/blob_id_alpha >> $testroot/stdout.expected
1393 5f8a88c6 2019-08-03 stsp echo '--- alpha' >> $testroot/stdout.expected
1394 5f8a88c6 2019-08-03 stsp echo '+++ alpha' >> $testroot/stdout.expected
1395 5f8a88c6 2019-08-03 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
1396 5f8a88c6 2019-08-03 stsp echo '-alpha' >> $testroot/stdout.expected
1397 5f8a88c6 2019-08-03 stsp echo '+modified file' >> $testroot/stdout.expected
1398 5f8a88c6 2019-08-03 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1399 5f8a88c6 2019-08-03 stsp got tree -r $testroot/repo -i -c $first_commit \
1400 46f68b20 2019-10-19 stsp | grep 'beta$' | cut -d' ' -f 1 | tr -d '\n' \
1401 5f8a88c6 2019-08-03 stsp >> $testroot/stdout.expected
1402 46f68b20 2019-10-19 stsp echo " (mode 644)" >> $testroot/stdout.expected
1403 5f8a88c6 2019-08-03 stsp echo 'blob + /dev/null' >> $testroot/stdout.expected
1404 5f8a88c6 2019-08-03 stsp echo '--- beta' >> $testroot/stdout.expected
1405 5f8a88c6 2019-08-03 stsp echo '+++ /dev/null' >> $testroot/stdout.expected
1406 5f8a88c6 2019-08-03 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
1407 5f8a88c6 2019-08-03 stsp echo '-beta' >> $testroot/stdout.expected
1408 5f8a88c6 2019-08-03 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
1409 5f8a88c6 2019-08-03 stsp echo -n 'blob + ' >> $testroot/stdout.expected
1410 46f68b20 2019-10-19 stsp cat $testroot/blob_id_foo | tr -d '\n' >> $testroot/stdout.expected
1411 46f68b20 2019-10-19 stsp echo " (mode 644)" >> $testroot/stdout.expected
1412 5f8a88c6 2019-08-03 stsp echo '--- /dev/null' >> $testroot/stdout.expected
1413 5f8a88c6 2019-08-03 stsp echo '+++ foo' >> $testroot/stdout.expected
1414 5f8a88c6 2019-08-03 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
1415 5f8a88c6 2019-08-03 stsp echo '+new file' >> $testroot/stdout.expected
1417 f0b75401 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1419 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1420 f0b75401 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1421 5f8a88c6 2019-08-03 stsp test_done "$testroot" "$ret"
1425 72fd46fa 2019-09-06 stsp echo 'M alpha' > $testroot/stdout.expected
1426 72fd46fa 2019-09-06 stsp echo 'A epsilon/new' >> $testroot/stdout.expected
1427 5f8a88c6 2019-08-03 stsp echo 'D epsilon/zeta' >> $testroot/stdout.expected
1428 72fd46fa 2019-09-06 stsp echo 'M foo' >> $testroot/stdout.expected
1429 5f8a88c6 2019-08-03 stsp echo 'M gamma/delta' >> $testroot/stdout.expected
1431 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got status > $testroot/stdout)
1432 5f8a88c6 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1434 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1435 5f8a88c6 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1437 f0b75401 2019-08-03 stsp test_done "$testroot" "$ret"
1440 f6cae3ed 2020-09-13 naddy test_stage_patch() {
1441 dc424a06 2019-08-07 stsp local testroot=`test_init stage_patch`
1443 dc424a06 2019-08-07 stsp jot 16 > $testroot/repo/numbers
1444 dc424a06 2019-08-07 stsp (cd $testroot/repo && git add numbers)
1445 dc424a06 2019-08-07 stsp git_commit $testroot/repo -m "added numbers file"
1446 dc424a06 2019-08-07 stsp local commit_id=`git_show_head $testroot/repo`
1448 dc424a06 2019-08-07 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1450 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1451 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1455 885e96df 2023-03-06 naddy ed -s $testroot/wt/numbers <<-\EOF
1456 885e96df 2023-03-06 naddy ,s/^2$/a/
1457 885e96df 2023-03-06 naddy ,s/^7$/b/
1458 885e96df 2023-03-06 naddy ,s/^16$/c/
1462 dc424a06 2019-08-07 stsp # don't stage any hunks
1463 dc424a06 2019-08-07 stsp printf "n\nn\nn\n" > $testroot/patchscript
1464 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1465 7b5dc508 2019-10-28 stsp numbers > $testroot/stdout 2> $testroot/stderr)
1467 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
1468 7b5dc508 2019-10-28 stsp echo "got stage command succeeded unexpectedly" >&2
1469 dc424a06 2019-08-07 stsp test_done "$testroot" "1"
1472 dc424a06 2019-08-07 stsp cat > $testroot/stdout.expected <<EOF
1473 dc424a06 2019-08-07 stsp -----------------------------------------------
1474 dc424a06 2019-08-07 stsp @@ -1,5 +1,5 @@
1481 dc424a06 2019-08-07 stsp -----------------------------------------------
1482 a7c9878d 2019-08-08 stsp M numbers (change 1 of 3)
1483 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1484 dc424a06 2019-08-07 stsp -----------------------------------------------
1485 dc424a06 2019-08-07 stsp @@ -4,7 +4,7 @@
1494 dc424a06 2019-08-07 stsp -----------------------------------------------
1495 a7c9878d 2019-08-08 stsp M numbers (change 2 of 3)
1496 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1497 dc424a06 2019-08-07 stsp -----------------------------------------------
1498 dc424a06 2019-08-07 stsp @@ -13,4 +13,4 @@
1504 dc424a06 2019-08-07 stsp -----------------------------------------------
1505 a7c9878d 2019-08-08 stsp M numbers (change 3 of 3)
1506 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1508 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1510 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1511 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1512 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1516 7b5dc508 2019-10-28 stsp echo "got: no changes to stage" > $testroot/stderr.expected
1517 7b5dc508 2019-10-28 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1519 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1520 7b5dc508 2019-10-28 stsp diff -u $testroot/stderr.expected $testroot/stderr
1521 7b5dc508 2019-10-28 stsp test_done "$testroot" "$ret"
1526 dc424a06 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
1527 dc424a06 2019-08-07 stsp echo "M numbers" > $testroot/stdout.expected
1528 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1530 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1531 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1532 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1536 dc424a06 2019-08-07 stsp # stage middle hunk
1537 dc424a06 2019-08-07 stsp printf "n\ny\nn\n" > $testroot/patchscript
1538 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1539 dc424a06 2019-08-07 stsp numbers > $testroot/stdout)
1541 dc424a06 2019-08-07 stsp cat > $testroot/stdout.expected <<EOF
1542 dc424a06 2019-08-07 stsp -----------------------------------------------
1543 dc424a06 2019-08-07 stsp @@ -1,5 +1,5 @@
1550 dc424a06 2019-08-07 stsp -----------------------------------------------
1551 a7c9878d 2019-08-08 stsp M numbers (change 1 of 3)
1552 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1553 dc424a06 2019-08-07 stsp -----------------------------------------------
1554 dc424a06 2019-08-07 stsp @@ -4,7 +4,7 @@
1563 dc424a06 2019-08-07 stsp -----------------------------------------------
1564 a7c9878d 2019-08-08 stsp M numbers (change 2 of 3)
1565 b353a198 2019-08-07 stsp stage this change? [y/n/q] y
1566 dc424a06 2019-08-07 stsp -----------------------------------------------
1567 dc424a06 2019-08-07 stsp @@ -13,4 +13,4 @@
1573 dc424a06 2019-08-07 stsp -----------------------------------------------
1574 a7c9878d 2019-08-08 stsp M numbers (change 3 of 3)
1575 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1577 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1579 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1580 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1581 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1585 dc424a06 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
1586 dc424a06 2019-08-07 stsp echo "MM numbers" > $testroot/stdout.expected
1587 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1589 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1590 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1591 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1595 dc424a06 2019-08-07 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
1597 8469d821 2022-06-25 stsp echo "diff -s $testroot/wt" > $testroot/stdout.expected
1598 8469d821 2022-06-25 stsp echo "commit - $commit_id" >> $testroot/stdout.expected
1599 8469d821 2022-06-25 stsp echo "path + $testroot/wt (staged changes)" >> $testroot/stdout.expected
1600 dc424a06 2019-08-07 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1601 dc424a06 2019-08-07 stsp got tree -r $testroot/repo -i -c $commit_id \
1602 dc424a06 2019-08-07 stsp | grep 'numbers$' | cut -d' ' -f 1 \
1603 dc424a06 2019-08-07 stsp >> $testroot/stdout.expected
1604 dc424a06 2019-08-07 stsp echo -n 'blob + ' >> $testroot/stdout.expected
1605 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 \
1606 dc424a06 2019-08-07 stsp >> $testroot/stdout.expected
1607 dc424a06 2019-08-07 stsp echo "--- numbers" >> $testroot/stdout.expected
1608 dc424a06 2019-08-07 stsp echo "+++ numbers" >> $testroot/stdout.expected
1609 dc424a06 2019-08-07 stsp echo "@@ -4,7 +4,7 @@" >> $testroot/stdout.expected
1610 dc424a06 2019-08-07 stsp echo " 4" >> $testroot/stdout.expected
1611 dc424a06 2019-08-07 stsp echo " 5" >> $testroot/stdout.expected
1612 dc424a06 2019-08-07 stsp echo " 6" >> $testroot/stdout.expected
1613 dc424a06 2019-08-07 stsp echo "-7" >> $testroot/stdout.expected
1614 dc424a06 2019-08-07 stsp echo "+b" >> $testroot/stdout.expected
1615 dc424a06 2019-08-07 stsp echo " 8" >> $testroot/stdout.expected
1616 dc424a06 2019-08-07 stsp echo " 9" >> $testroot/stdout.expected
1617 dc424a06 2019-08-07 stsp echo " 10" >> $testroot/stdout.expected
1618 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1620 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1621 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1622 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1626 dc424a06 2019-08-07 stsp (cd $testroot/wt && got unstage >/dev/null)
1628 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1629 dc424a06 2019-08-07 stsp echo "got stage command failed unexpectedly" >&2
1630 dc424a06 2019-08-07 stsp test_done "$testroot" "1"
1633 dc424a06 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
1634 dc424a06 2019-08-07 stsp echo "M numbers" > $testroot/stdout.expected
1635 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1637 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1638 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1639 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1643 dc424a06 2019-08-07 stsp # stage last hunk
1644 dc424a06 2019-08-07 stsp printf "n\nn\ny\n" > $testroot/patchscript
1645 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1646 dc424a06 2019-08-07 stsp numbers > $testroot/stdout)
1648 dc424a06 2019-08-07 stsp cat > $testroot/stdout.expected <<EOF
1649 dc424a06 2019-08-07 stsp -----------------------------------------------
1650 dc424a06 2019-08-07 stsp @@ -1,5 +1,5 @@
1657 dc424a06 2019-08-07 stsp -----------------------------------------------
1658 a7c9878d 2019-08-08 stsp M numbers (change 1 of 3)
1659 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1660 dc424a06 2019-08-07 stsp -----------------------------------------------
1661 dc424a06 2019-08-07 stsp @@ -4,7 +4,7 @@
1670 dc424a06 2019-08-07 stsp -----------------------------------------------
1671 a7c9878d 2019-08-08 stsp M numbers (change 2 of 3)
1672 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1673 dc424a06 2019-08-07 stsp -----------------------------------------------
1674 dc424a06 2019-08-07 stsp @@ -13,4 +13,4 @@
1680 dc424a06 2019-08-07 stsp -----------------------------------------------
1681 a7c9878d 2019-08-08 stsp M numbers (change 3 of 3)
1682 b353a198 2019-08-07 stsp stage this change? [y/n/q] y
1684 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1686 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1687 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1688 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1692 dc424a06 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
1693 dc424a06 2019-08-07 stsp echo "MM numbers" > $testroot/stdout.expected
1694 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1696 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1697 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1698 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1702 dc424a06 2019-08-07 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
1704 8469d821 2022-06-25 stsp echo "diff -s $testroot/wt" > $testroot/stdout.expected
1705 8469d821 2022-06-25 stsp echo "commit - $commit_id" >> $testroot/stdout.expected
1706 8469d821 2022-06-25 stsp echo "path + $testroot/wt (staged changes)" >> $testroot/stdout.expected
1707 dc424a06 2019-08-07 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1708 dc424a06 2019-08-07 stsp got tree -r $testroot/repo -i -c $commit_id \
1709 dc424a06 2019-08-07 stsp | grep 'numbers$' | cut -d' ' -f 1 \
1710 dc424a06 2019-08-07 stsp >> $testroot/stdout.expected
1711 dc424a06 2019-08-07 stsp echo -n 'blob + ' >> $testroot/stdout.expected
1712 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 \
1713 dc424a06 2019-08-07 stsp >> $testroot/stdout.expected
1714 dc424a06 2019-08-07 stsp echo "--- numbers" >> $testroot/stdout.expected
1715 dc424a06 2019-08-07 stsp echo "+++ numbers" >> $testroot/stdout.expected
1716 dc424a06 2019-08-07 stsp echo "@@ -13,4 +13,4 @@" >> $testroot/stdout.expected
1717 dc424a06 2019-08-07 stsp echo " 13" >> $testroot/stdout.expected
1718 dc424a06 2019-08-07 stsp echo " 14" >> $testroot/stdout.expected
1719 dc424a06 2019-08-07 stsp echo " 15" >> $testroot/stdout.expected
1720 dc424a06 2019-08-07 stsp echo "-16" >> $testroot/stdout.expected
1721 dc424a06 2019-08-07 stsp echo "+c" >> $testroot/stdout.expected
1722 af5a81b2 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1724 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1725 af5a81b2 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1727 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1730 f6cae3ed 2020-09-13 naddy test_stage_patch_twice() {
1731 af5a81b2 2019-08-08 stsp local testroot=`test_init stage_patch_twice`
1733 af5a81b2 2019-08-08 stsp jot 16 > $testroot/repo/numbers
1734 af5a81b2 2019-08-08 stsp (cd $testroot/repo && git add numbers)
1735 af5a81b2 2019-08-08 stsp git_commit $testroot/repo -m "added numbers file"
1736 af5a81b2 2019-08-08 stsp local commit_id=`git_show_head $testroot/repo`
1738 af5a81b2 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1740 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1741 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1745 885e96df 2023-03-06 naddy ed -s $testroot/wt/numbers <<-\EOF
1746 885e96df 2023-03-06 naddy ,s/^2$/a/
1747 885e96df 2023-03-06 naddy ,s/^7$/b/
1748 885e96df 2023-03-06 naddy ,s/^16$/c/
1752 af5a81b2 2019-08-08 stsp # stage middle hunk
1753 af5a81b2 2019-08-08 stsp printf "n\ny\nn\n" > $testroot/patchscript
1754 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1755 af5a81b2 2019-08-08 stsp numbers > $testroot/stdout)
1757 af5a81b2 2019-08-08 stsp cat > $testroot/stdout.expected <<EOF
1758 af5a81b2 2019-08-08 stsp -----------------------------------------------
1759 af5a81b2 2019-08-08 stsp @@ -1,5 +1,5 @@
1766 af5a81b2 2019-08-08 stsp -----------------------------------------------
1767 af5a81b2 2019-08-08 stsp M numbers (change 1 of 3)
1768 af5a81b2 2019-08-08 stsp stage this change? [y/n/q] n
1769 af5a81b2 2019-08-08 stsp -----------------------------------------------
1770 af5a81b2 2019-08-08 stsp @@ -4,7 +4,7 @@
1779 af5a81b2 2019-08-08 stsp -----------------------------------------------
1780 af5a81b2 2019-08-08 stsp M numbers (change 2 of 3)
1781 af5a81b2 2019-08-08 stsp stage this change? [y/n/q] y
1782 af5a81b2 2019-08-08 stsp -----------------------------------------------
1783 af5a81b2 2019-08-08 stsp @@ -13,4 +13,4 @@
1789 af5a81b2 2019-08-08 stsp -----------------------------------------------
1790 af5a81b2 2019-08-08 stsp M numbers (change 3 of 3)
1791 af5a81b2 2019-08-08 stsp stage this change? [y/n/q] n
1793 af5a81b2 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1795 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1796 af5a81b2 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1797 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1801 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
1802 af5a81b2 2019-08-08 stsp echo "MM numbers" > $testroot/stdout.expected
1803 af5a81b2 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1805 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1806 af5a81b2 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1807 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1811 af5a81b2 2019-08-08 stsp # stage last hunk
1812 af5a81b2 2019-08-08 stsp printf "n\ny\n" > $testroot/patchscript
1813 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1814 af5a81b2 2019-08-08 stsp numbers > $testroot/stdout)
1816 af5a81b2 2019-08-08 stsp cat > $testroot/stdout.expected <<EOF
1817 af5a81b2 2019-08-08 stsp -----------------------------------------------
1818 fe621944 2020-11-10 stsp @@ -1,5 +1,5 @@
1825 af5a81b2 2019-08-08 stsp -----------------------------------------------
1826 af5a81b2 2019-08-08 stsp M numbers (change 1 of 2)
1827 af5a81b2 2019-08-08 stsp stage this change? [y/n/q] n
1828 af5a81b2 2019-08-08 stsp -----------------------------------------------
1829 af5a81b2 2019-08-08 stsp @@ -13,4 +13,4 @@ b
1835 af5a81b2 2019-08-08 stsp -----------------------------------------------
1836 af5a81b2 2019-08-08 stsp M numbers (change 2 of 2)
1837 af5a81b2 2019-08-08 stsp stage this change? [y/n/q] y
1839 af5a81b2 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1841 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1842 af5a81b2 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1843 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1847 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
1848 af5a81b2 2019-08-08 stsp echo "MM numbers" > $testroot/stdout.expected
1849 af5a81b2 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1851 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1852 af5a81b2 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1853 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1857 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
1859 8469d821 2022-06-25 stsp echo "diff -s $testroot/wt" > $testroot/stdout.expected
1860 8469d821 2022-06-25 stsp echo "commit - $commit_id" >> $testroot/stdout.expected
1861 8469d821 2022-06-25 stsp echo "path + $testroot/wt (staged changes)" >> $testroot/stdout.expected
1862 af5a81b2 2019-08-08 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1863 af5a81b2 2019-08-08 stsp got tree -r $testroot/repo -i -c $commit_id \
1864 af5a81b2 2019-08-08 stsp | grep 'numbers$' | cut -d' ' -f 1 \
1865 af5a81b2 2019-08-08 stsp >> $testroot/stdout.expected
1866 af5a81b2 2019-08-08 stsp echo -n 'blob + ' >> $testroot/stdout.expected
1867 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 \
1868 af5a81b2 2019-08-08 stsp >> $testroot/stdout.expected
1869 af5a81b2 2019-08-08 stsp echo "--- numbers" >> $testroot/stdout.expected
1870 af5a81b2 2019-08-08 stsp echo "+++ numbers" >> $testroot/stdout.expected
1871 af5a81b2 2019-08-08 stsp cat >> $testroot/stdout.expected <<EOF
1872 af5a81b2 2019-08-08 stsp @@ -4,7 +4,7 @@
1881 af5a81b2 2019-08-08 stsp @@ -13,4 +13,4 @@
1888 af5a81b2 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1890 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1891 af5a81b2 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1892 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1896 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got diff > $testroot/stdout)
1898 8469d821 2022-06-25 stsp echo "diff $testroot/wt" > $testroot/stdout.expected
1899 8469d821 2022-06-25 stsp echo "commit - $commit_id" >> $testroot/stdout.expected
1900 8469d821 2022-06-25 stsp echo "path + $testroot/wt" >> $testroot/stdout.expected
1901 af5a81b2 2019-08-08 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1902 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 | \
1903 af5a81b2 2019-08-08 stsp tr -d '\n' >> $testroot/stdout.expected
1904 af5a81b2 2019-08-08 stsp echo " (staged)" >> $testroot/stdout.expected
1905 af5a81b2 2019-08-08 stsp echo 'file + numbers' >> $testroot/stdout.expected
1906 af5a81b2 2019-08-08 stsp echo "--- numbers" >> $testroot/stdout.expected
1907 af5a81b2 2019-08-08 stsp echo "+++ numbers" >> $testroot/stdout.expected
1908 af5a81b2 2019-08-08 stsp cat >> $testroot/stdout.expected <<EOF
1909 af5a81b2 2019-08-08 stsp @@ -1,5 +1,5 @@
1917 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1919 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1920 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1922 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1925 f6cae3ed 2020-09-13 naddy test_stage_patch_added() {
1926 dc424a06 2019-08-07 stsp local testroot=`test_init stage_patch_added`
1927 dc424a06 2019-08-07 stsp local commit_id=`git_show_head $testroot/repo`
1929 dc424a06 2019-08-07 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1931 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1932 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1936 dc424a06 2019-08-07 stsp echo "new" > $testroot/wt/epsilon/new
1937 dc424a06 2019-08-07 stsp (cd $testroot/wt && got add epsilon/new > /dev/null)
1939 dc424a06 2019-08-07 stsp printf "y\n" > $testroot/patchscript
1940 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1941 dc424a06 2019-08-07 stsp epsilon/new > $testroot/stdout)
1943 dc424a06 2019-08-07 stsp echo "A epsilon/new" > $testroot/stdout.expected
1944 c8ede203 2019-08-08 stsp echo "stage this addition? [y/n] y" >> $testroot/stdout.expected
1945 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1947 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1948 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1949 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1953 dc424a06 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
1954 dc424a06 2019-08-07 stsp echo " A epsilon/new" > $testroot/stdout.expected
1955 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1957 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1958 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1959 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1963 dc424a06 2019-08-07 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
1965 8469d821 2022-06-25 stsp echo "diff -s $testroot/wt" > $testroot/stdout.expected
1966 8469d821 2022-06-25 stsp echo "commit - $commit_id" >> $testroot/stdout.expected
1967 8469d821 2022-06-25 stsp echo "path + $testroot/wt (staged changes)" >> $testroot/stdout.expected
1968 dc424a06 2019-08-07 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
1969 dc424a06 2019-08-07 stsp echo -n 'blob + ' >> $testroot/stdout.expected
1970 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -l epsilon/new) | cut -d' ' -f 1 \
1971 dc424a06 2019-08-07 stsp >> $testroot/stdout.expected
1972 dc424a06 2019-08-07 stsp echo "--- /dev/null" >> $testroot/stdout.expected
1973 dc424a06 2019-08-07 stsp echo "+++ epsilon/new" >> $testroot/stdout.expected
1974 dc424a06 2019-08-07 stsp echo "@@ -0,0 +1 @@" >> $testroot/stdout.expected
1975 dc424a06 2019-08-07 stsp echo "+new" >> $testroot/stdout.expected
1976 e70a841e 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1978 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1979 e70a841e 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1981 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
1984 f6cae3ed 2020-09-13 naddy test_stage_patch_added_twice() {
1985 e70a841e 2019-08-08 stsp local testroot=`test_init stage_patch_added_twice`
1986 e70a841e 2019-08-08 stsp local commit_id=`git_show_head $testroot/repo`
1988 e70a841e 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1990 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
1991 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
1995 e70a841e 2019-08-08 stsp echo "new" > $testroot/wt/epsilon/new
1996 e70a841e 2019-08-08 stsp (cd $testroot/wt && got add epsilon/new > /dev/null)
1998 e70a841e 2019-08-08 stsp printf "y\n" > $testroot/patchscript
1999 e70a841e 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
2000 e70a841e 2019-08-08 stsp epsilon/new > $testroot/stdout)
2002 e70a841e 2019-08-08 stsp echo "A epsilon/new" > $testroot/stdout.expected
2003 e70a841e 2019-08-08 stsp echo "stage this addition? [y/n] y" >> $testroot/stdout.expected
2004 e70a841e 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2006 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2007 e70a841e 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2008 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2012 e70a841e 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
2013 e70a841e 2019-08-08 stsp echo " A epsilon/new" > $testroot/stdout.expected
2014 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2016 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2017 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2018 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2022 e70a841e 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
2023 e70a841e 2019-08-08 stsp epsilon/new > $testroot/stdout 2> $testroot/stderr)
2025 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
2026 e70a841e 2019-08-08 stsp echo "got stage command succeeded unexpectedly" >&2
2027 e70a841e 2019-08-08 stsp test_done "$testroot" "1"
2031 7b5dc508 2019-10-28 stsp echo "got: no changes to stage" > $testroot/stderr.expected
2032 e70a841e 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
2034 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2035 e70a841e 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
2036 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2040 e70a841e 2019-08-08 stsp echo -n > $testroot/stdout.expected
2041 e70a841e 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2043 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2044 e70a841e 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2046 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
2049 f6cae3ed 2020-09-13 naddy test_stage_patch_removed() {
2050 dc424a06 2019-08-07 stsp local testroot=`test_init stage_patch_removed`
2051 dc424a06 2019-08-07 stsp local commit_id=`git_show_head $testroot/repo`
2053 dc424a06 2019-08-07 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2055 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2056 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
2060 dc424a06 2019-08-07 stsp (cd $testroot/wt && got rm beta > /dev/null)
2062 dc424a06 2019-08-07 stsp printf "y\n" > $testroot/patchscript
2063 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
2064 dc424a06 2019-08-07 stsp beta > $testroot/stdout)
2066 dc424a06 2019-08-07 stsp echo -n > $testroot/stdout.expected
2068 dc424a06 2019-08-07 stsp echo "D beta" > $testroot/stdout.expected
2069 f5a17245 2019-08-08 stsp echo "stage this deletion? [y/n] y" >> $testroot/stdout.expected
2070 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2072 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2073 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2074 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
2078 dc424a06 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
2079 dc424a06 2019-08-07 stsp echo " D beta" > $testroot/stdout.expected
2080 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2082 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2083 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2084 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
2088 dc424a06 2019-08-07 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
2090 8469d821 2022-06-25 stsp echo "diff -s $testroot/wt" > $testroot/stdout.expected
2091 8469d821 2022-06-25 stsp echo "commit - $commit_id" >> $testroot/stdout.expected
2092 8469d821 2022-06-25 stsp echo "path + $testroot/wt (staged changes)" >> $testroot/stdout.expected
2093 dc424a06 2019-08-07 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2094 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -l beta) | cut -d' ' -f 1 \
2095 dc424a06 2019-08-07 stsp >> $testroot/stdout.expected
2096 dc424a06 2019-08-07 stsp echo 'blob + /dev/null' >> $testroot/stdout.expected
2097 dc424a06 2019-08-07 stsp echo "--- beta" >> $testroot/stdout.expected
2098 dc424a06 2019-08-07 stsp echo "+++ /dev/null" >> $testroot/stdout.expected
2099 dc424a06 2019-08-07 stsp echo "@@ -1 +0,0 @@" >> $testroot/stdout.expected
2100 dc424a06 2019-08-07 stsp echo "-beta" >> $testroot/stdout.expected
2101 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2103 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2104 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2106 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
2109 f6cae3ed 2020-09-13 naddy test_stage_patch_removed_twice() {
2110 e70a841e 2019-08-08 stsp local testroot=`test_init stage_patch_removed_twice`
2111 e70a841e 2019-08-08 stsp local commit_id=`git_show_head $testroot/repo`
2113 e70a841e 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2115 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2116 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2120 e70a841e 2019-08-08 stsp (cd $testroot/wt && got rm beta > /dev/null)
2122 e70a841e 2019-08-08 stsp printf "y\n" > $testroot/patchscript
2123 e70a841e 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
2124 e70a841e 2019-08-08 stsp beta > $testroot/stdout)
2126 e70a841e 2019-08-08 stsp echo -n > $testroot/stdout.expected
2128 e70a841e 2019-08-08 stsp echo "D beta" > $testroot/stdout.expected
2129 e70a841e 2019-08-08 stsp echo "stage this deletion? [y/n] y" >> $testroot/stdout.expected
2130 e70a841e 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2132 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2133 e70a841e 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2134 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2138 e70a841e 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
2139 e70a841e 2019-08-08 stsp echo " D beta" > $testroot/stdout.expected
2140 e70a841e 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2142 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2143 e70a841e 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2144 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2148 e70a841e 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p beta \
2149 e70a841e 2019-08-08 stsp > $testroot/stdout 2> $testroot/stderr)
2151 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
2152 7b5dc508 2019-10-28 stsp echo "got stage command succeeded unexpectedly" >&2
2153 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2157 7b5dc508 2019-10-28 stsp echo "got: no changes to stage" > $testroot/stderr.expected
2158 e70a841e 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
2160 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2161 e70a841e 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
2162 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2166 e70a841e 2019-08-08 stsp echo -n > $testroot/stdout.expected
2167 9fdde394 2022-06-04 op cmp -s $testroot/stdout.expected $testroot/stdout
2169 9fdde394 2022-06-04 op if [ $ret -ne 0 ]; then
2170 9fdde394 2022-06-04 op diff -u $testroot/stdout.expected $testroot/stdout
2172 9fdde394 2022-06-04 op test_done "$testroot" "$ret"
2175 9fdde394 2022-06-04 op test_stage_patch_reversed() {
2176 9fdde394 2022-06-04 op local testroot=`test_init stage_patch_reversed`
2178 9fdde394 2022-06-04 op got checkout $testroot/repo $testroot/wt > /dev/null
2180 9fdde394 2022-06-04 op if [ $ret -ne 0 ]; then
2181 9fdde394 2022-06-04 op test_done "$testroot" "$ret"
2185 9fdde394 2022-06-04 op echo 'ALPHA' > $testroot/wt/alpha
2186 9fdde394 2022-06-04 op (cd $testroot/wt && got stage alpha > $testroot/stdout)
2188 9fdde394 2022-06-04 op if [ $ret -ne 0 ]; then
2189 9fdde394 2022-06-04 op test_done "$testroot" "$ret"
2193 9fdde394 2022-06-04 op echo ' M alpha' > $testroot/stdout.expected
2194 9fdde394 2022-06-04 op cmp -s $testroot/stdout.expected $testroot/stdout
2196 9fdde394 2022-06-04 op if [ $ret -ne 0 ]; then
2197 9fdde394 2022-06-04 op diff -u $testroot/stdout.expected $testroot/stdout
2198 9fdde394 2022-06-04 op test_done "$testroot" "$ret"
2202 9fdde394 2022-06-04 op echo 'alpha' > $testroot/wt/alpha
2203 9fdde394 2022-06-04 op (cd $testroot/wt && got stage alpha > $testroot/stdout)
2205 9fdde394 2022-06-04 op if [ $ret -ne 0 ]; then
2206 9fdde394 2022-06-04 op test_done "$testroot" "$ret"
2210 9fdde394 2022-06-04 op echo ' M alpha' > $testroot/stdout.expected
2211 e70a841e 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2213 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2214 e70a841e 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2215 9fdde394 2022-06-04 op test_done "$testroot" "$ret"
2219 9fdde394 2022-06-04 op (cd $testroot/wt && got status > $testroot/stdout)
2220 9fdde394 2022-06-04 op cmp -s /dev/null $testroot/stdout
2222 9fdde394 2022-06-04 op if [ $ret -ne 0 ]; then
2223 9fdde394 2022-06-04 op diff -u /dev/null $testroot/stdout
2225 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2228 f6cae3ed 2020-09-13 naddy test_stage_patch_quit() {
2229 b353a198 2019-08-07 stsp local testroot=`test_init stage_patch_quit`
2231 b353a198 2019-08-07 stsp jot 16 > $testroot/repo/numbers
2232 88f33a19 2019-08-08 stsp echo zzz > $testroot/repo/zzz
2233 88f33a19 2019-08-08 stsp (cd $testroot/repo && git add numbers zzz)
2234 88f33a19 2019-08-08 stsp git_commit $testroot/repo -m "added files"
2235 b353a198 2019-08-07 stsp local commit_id=`git_show_head $testroot/repo`
2237 b353a198 2019-08-07 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2239 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2240 b353a198 2019-08-07 stsp test_done "$testroot" "$ret"
2244 885e96df 2023-03-06 naddy ed -s $testroot/wt/numbers <<-\EOF
2245 885e96df 2023-03-06 naddy ,s/^2$/a/
2246 885e96df 2023-03-06 naddy ,s/^7$/b/
2247 885e96df 2023-03-06 naddy ,s/^16$/c/
2250 88f33a19 2019-08-08 stsp (cd $testroot/wt && got rm zzz > /dev/null)
2252 88f33a19 2019-08-08 stsp # stage first hunk and quit; and don't pass a path argument to
2253 88f33a19 2019-08-08 stsp # ensure that we don't skip asking about the 'zzz' file after 'quit'
2254 88f33a19 2019-08-08 stsp printf "y\nq\nn\n" > $testroot/patchscript
2255 b353a198 2019-08-07 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
2256 2db2652d 2019-08-07 stsp > $testroot/stdout)
2258 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2259 b353a198 2019-08-07 stsp echo "got stage command failed unexpectedly" >&2
2260 b353a198 2019-08-07 stsp test_done "$testroot" "1"
2263 b353a198 2019-08-07 stsp cat > $testroot/stdout.expected <<EOF
2264 b353a198 2019-08-07 stsp -----------------------------------------------
2265 b353a198 2019-08-07 stsp @@ -1,5 +1,5 @@
2272 b353a198 2019-08-07 stsp -----------------------------------------------
2273 a7c9878d 2019-08-08 stsp M numbers (change 1 of 3)
2274 b353a198 2019-08-07 stsp stage this change? [y/n/q] y
2275 b353a198 2019-08-07 stsp -----------------------------------------------
2276 b353a198 2019-08-07 stsp @@ -4,7 +4,7 @@
2285 b353a198 2019-08-07 stsp -----------------------------------------------
2286 a7c9878d 2019-08-08 stsp M numbers (change 2 of 3)
2287 b353a198 2019-08-07 stsp stage this change? [y/n/q] q
2289 f5a17245 2019-08-08 stsp stage this deletion? [y/n] n
2291 b353a198 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2293 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2294 b353a198 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2295 b353a198 2019-08-07 stsp test_done "$testroot" "$ret"
2299 b353a198 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
2300 b353a198 2019-08-07 stsp echo "MM numbers" > $testroot/stdout.expected
2301 88f33a19 2019-08-08 stsp echo "D zzz" >> $testroot/stdout.expected
2302 b353a198 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2304 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2305 b353a198 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2306 b353a198 2019-08-07 stsp test_done "$testroot" "$ret"
2310 b353a198 2019-08-07 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
2312 8469d821 2022-06-25 stsp echo "diff -s $testroot/wt" > $testroot/stdout.expected
2313 8469d821 2022-06-25 stsp echo "commit - $commit_id" >> $testroot/stdout.expected
2314 8469d821 2022-06-25 stsp echo "path + $testroot/wt (staged changes)" >> $testroot/stdout.expected
2315 b353a198 2019-08-07 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2316 b353a198 2019-08-07 stsp got tree -r $testroot/repo -i -c $commit_id \
2317 b353a198 2019-08-07 stsp | grep 'numbers$' | cut -d' ' -f 1 \
2318 b353a198 2019-08-07 stsp >> $testroot/stdout.expected
2319 b353a198 2019-08-07 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2320 b353a198 2019-08-07 stsp (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 \
2321 b353a198 2019-08-07 stsp >> $testroot/stdout.expected
2322 b353a198 2019-08-07 stsp echo "--- numbers" >> $testroot/stdout.expected
2323 b353a198 2019-08-07 stsp echo "+++ numbers" >> $testroot/stdout.expected
2324 b353a198 2019-08-07 stsp echo "@@ -1,5 +1,5 @@" >> $testroot/stdout.expected
2325 b353a198 2019-08-07 stsp echo " 1" >> $testroot/stdout.expected
2326 b353a198 2019-08-07 stsp echo "-2" >> $testroot/stdout.expected
2327 b353a198 2019-08-07 stsp echo "+a" >> $testroot/stdout.expected
2328 b353a198 2019-08-07 stsp echo " 3" >> $testroot/stdout.expected
2329 b353a198 2019-08-07 stsp echo " 4" >> $testroot/stdout.expected
2330 b353a198 2019-08-07 stsp echo " 5" >> $testroot/stdout.expected
2331 b353a198 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2333 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2334 b353a198 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2336 b353a198 2019-08-07 stsp test_done "$testroot" "$ret"
2340 f6cae3ed 2020-09-13 naddy test_stage_patch_incomplete_script() {
2341 eba70f38 2019-08-08 stsp local testroot=`test_init stage_incomplete_script`
2343 eba70f38 2019-08-08 stsp jot 16 > $testroot/repo/numbers
2344 eba70f38 2019-08-08 stsp echo zzz > $testroot/repo/zzz
2345 eba70f38 2019-08-08 stsp (cd $testroot/repo && git add numbers zzz)
2346 eba70f38 2019-08-08 stsp git_commit $testroot/repo -m "added files"
2347 eba70f38 2019-08-08 stsp local commit_id=`git_show_head $testroot/repo`
2349 eba70f38 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2351 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2352 eba70f38 2019-08-08 stsp test_done "$testroot" "$ret"
2356 885e96df 2023-03-06 naddy ed -s $testroot/wt/numbers <<-\EOF
2357 885e96df 2023-03-06 naddy ,s/^2$/a/
2358 885e96df 2023-03-06 naddy ,s/^7$/b/
2359 885e96df 2023-03-06 naddy ,s/^16$/c/
2363 eba70f38 2019-08-08 stsp # stage first hunk and then stop responding; got should error out
2364 eba70f38 2019-08-08 stsp printf "y\n" > $testroot/patchscript
2365 eba70f38 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
2366 eba70f38 2019-08-08 stsp > $testroot/stdout 2> $testroot/stderr)
2368 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
2369 eba70f38 2019-08-08 stsp echo "got stage command succeeded unexpectedly" >&2
2370 eba70f38 2019-08-08 stsp test_done "$testroot" "1"
2373 eba70f38 2019-08-08 stsp cat > $testroot/stdout.expected <<EOF
2374 eba70f38 2019-08-08 stsp -----------------------------------------------
2375 eba70f38 2019-08-08 stsp @@ -1,5 +1,5 @@
2382 eba70f38 2019-08-08 stsp -----------------------------------------------
2383 eba70f38 2019-08-08 stsp M numbers (change 1 of 3)
2384 eba70f38 2019-08-08 stsp stage this change? [y/n/q] y
2385 eba70f38 2019-08-08 stsp -----------------------------------------------
2386 eba70f38 2019-08-08 stsp @@ -4,7 +4,7 @@
2395 eba70f38 2019-08-08 stsp -----------------------------------------------
2396 eba70f38 2019-08-08 stsp M numbers (change 2 of 3)
2398 eba70f38 2019-08-08 stsp echo -n "stage this change? [y/n/q] " >> $testroot/stdout.expected
2399 eba70f38 2019-08-08 stsp echo "got: invalid patch choice" > $testroot/stderr.expected
2400 eba70f38 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
2402 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2403 eba70f38 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
2404 eba70f38 2019-08-08 stsp test_done "$testroot" "$ret"
2408 eba70f38 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2410 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2411 eba70f38 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2412 eba70f38 2019-08-08 stsp test_done "$testroot" "$ret"
2416 eba70f38 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
2417 eba70f38 2019-08-08 stsp echo "M numbers" > $testroot/stdout.expected
2418 eba70f38 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2420 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2421 eba70f38 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2422 eba70f38 2019-08-08 stsp test_done "$testroot" "$ret"
2426 eba70f38 2019-08-08 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
2427 eba70f38 2019-08-08 stsp echo -n > $testroot/stdout.expected
2428 eba70f38 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2430 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2431 eba70f38 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2433 eba70f38 2019-08-08 stsp test_done "$testroot" "$ret"
2437 f6cae3ed 2020-09-13 naddy test_stage_symlink() {
2438 c631b115 2020-07-23 stsp local testroot=`test_init stage_symlink`
2440 c631b115 2020-07-23 stsp (cd $testroot/repo && ln -s alpha alpha.link)
2441 c631b115 2020-07-23 stsp (cd $testroot/repo && ln -s epsilon epsilon.link)
2442 c631b115 2020-07-23 stsp (cd $testroot/repo && ln -s /etc/passwd passwd.link)
2443 c631b115 2020-07-23 stsp (cd $testroot/repo && ln -s ../beta epsilon/beta.link)
2444 c631b115 2020-07-23 stsp (cd $testroot/repo && ln -s nonexistent nonexistent.link)
2445 c631b115 2020-07-23 stsp (cd $testroot/repo && git add .)
2446 c631b115 2020-07-23 stsp git_commit $testroot/repo -m "add symlinks"
2447 c631b115 2020-07-23 stsp local head_commit=`git_show_head $testroot/repo`
2449 c631b115 2020-07-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2451 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2452 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2456 c631b115 2020-07-23 stsp (cd $testroot/wt && ln -sf beta alpha.link)
2457 f55db25a 2023-03-03 naddy (cd $testroot/wt && rm epsilon.link && ln -s gamma epsilon.link)
2458 c631b115 2020-07-23 stsp (cd $testroot/wt && ln -sf ../gamma/delta epsilon/beta.link)
2459 c631b115 2020-07-23 stsp echo 'this is regular file foo' > $testroot/wt/dotgotfoo.link
2460 c631b115 2020-07-23 stsp (cd $testroot/wt && got add dotgotfoo.link > /dev/null)
2461 c631b115 2020-07-23 stsp (cd $testroot/wt && ln -sf .got/bar dotgotbar.link)
2462 c631b115 2020-07-23 stsp (cd $testroot/wt && got add dotgotbar.link > /dev/null)
2463 c631b115 2020-07-23 stsp (cd $testroot/wt && got rm nonexistent.link > /dev/null)
2464 c631b115 2020-07-23 stsp (cd $testroot/wt && ln -sf gamma/delta zeta.link)
2465 c631b115 2020-07-23 stsp (cd $testroot/wt && got add zeta.link > /dev/null)
2467 35213c7c 2020-07-23 stsp (cd $testroot/wt && got stage > $testroot/stdout 2> $testroot/stderr)
2469 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
2470 35213c7c 2020-07-23 stsp echo "got stage succeeded unexpectedly" >&2
2471 a19f439c 2022-06-03 op test_done "$testroot" 1
2474 35213c7c 2020-07-23 stsp echo -n "got: $testroot/wt/dotgotbar.link: " > $testroot/stderr.expected
2475 35213c7c 2020-07-23 stsp echo "symbolic link points outside of paths under version control" \
2476 35213c7c 2020-07-23 stsp >> $testroot/stderr.expected
2477 35213c7c 2020-07-23 stsp cmp -s $testroot/stderr.expected $testroot/stderr
2479 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2480 35213c7c 2020-07-23 stsp diff -u $testroot/stderr.expected $testroot/stderr
2481 35213c7c 2020-07-23 stsp test_done "$testroot" "$ret"
2485 35213c7c 2020-07-23 stsp (cd $testroot/wt && got stage -S > $testroot/stdout)
2487 c631b115 2020-07-23 stsp cat > $testroot/stdout.expected <<EOF
2488 c631b115 2020-07-23 stsp M alpha.link
2489 c631b115 2020-07-23 stsp A dotgotbar.link
2490 c631b115 2020-07-23 stsp A dotgotfoo.link
2491 c631b115 2020-07-23 stsp M epsilon/beta.link
2492 c631b115 2020-07-23 stsp M epsilon.link
2493 c631b115 2020-07-23 stsp D nonexistent.link
2494 c631b115 2020-07-23 stsp A zeta.link
2496 c631b115 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2498 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2499 c631b115 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2500 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2504 0aeb8099 2020-07-23 stsp rm $testroot/wt/alpha.link
2505 0aeb8099 2020-07-23 stsp echo 'this is regular file alpha.link' > $testroot/wt/alpha.link
2507 c631b115 2020-07-23 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
2509 8469d821 2022-06-25 stsp echo "diff -s $testroot/wt" > $testroot/stdout.expected
2510 8469d821 2022-06-25 stsp echo "commit - $head_commit" >> $testroot/stdout.expected
2511 8469d821 2022-06-25 stsp echo "path + $testroot/wt (staged changes)" >> $testroot/stdout.expected
2512 c631b115 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2513 c631b115 2020-07-23 stsp got tree -r $testroot/repo -i | grep 'alpha.link@ -> alpha$' | \
2514 c631b115 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2515 c631b115 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2516 c631b115 2020-07-23 stsp (cd $testroot/wt && got stage -l alpha.link) | cut -d' ' -f 1 \
2517 c631b115 2020-07-23 stsp >> $testroot/stdout.expected
2518 c631b115 2020-07-23 stsp echo '--- alpha.link' >> $testroot/stdout.expected
2519 c631b115 2020-07-23 stsp echo '+++ alpha.link' >> $testroot/stdout.expected
2520 c631b115 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
2521 c631b115 2020-07-23 stsp echo '-alpha' >> $testroot/stdout.expected
2522 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2523 c631b115 2020-07-23 stsp echo '+beta' >> $testroot/stdout.expected
2524 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2525 c631b115 2020-07-23 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
2526 c631b115 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2527 c631b115 2020-07-23 stsp (cd $testroot/wt && got stage -l dotgotbar.link) | cut -d' ' -f 1 \
2528 c631b115 2020-07-23 stsp >> $testroot/stdout.expected
2529 c631b115 2020-07-23 stsp echo '--- /dev/null' >> $testroot/stdout.expected
2530 c631b115 2020-07-23 stsp echo '+++ dotgotbar.link' >> $testroot/stdout.expected
2531 c631b115 2020-07-23 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
2532 c631b115 2020-07-23 stsp echo '+.got/bar' >> $testroot/stdout.expected
2533 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2534 c631b115 2020-07-23 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
2535 c631b115 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2536 c631b115 2020-07-23 stsp (cd $testroot/wt && got stage -l dotgotfoo.link) | cut -d' ' -f 1 \
2537 c631b115 2020-07-23 stsp >> $testroot/stdout.expected
2538 c631b115 2020-07-23 stsp echo '--- /dev/null' >> $testroot/stdout.expected
2539 c631b115 2020-07-23 stsp echo '+++ dotgotfoo.link' >> $testroot/stdout.expected
2540 c631b115 2020-07-23 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
2541 c631b115 2020-07-23 stsp echo '+this is regular file foo' >> $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 epsilon | grep 'beta.link@ -> ../beta$' | \
2544 c631b115 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2545 c631b115 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2546 c631b115 2020-07-23 stsp (cd $testroot/wt && got stage -l epsilon/beta.link) | cut -d' ' -f 1 \
2547 c631b115 2020-07-23 stsp >> $testroot/stdout.expected
2548 c631b115 2020-07-23 stsp echo '--- epsilon/beta.link' >> $testroot/stdout.expected
2549 c631b115 2020-07-23 stsp echo '+++ epsilon/beta.link' >> $testroot/stdout.expected
2550 c631b115 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
2551 c631b115 2020-07-23 stsp echo '-../beta' >> $testroot/stdout.expected
2552 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2553 c631b115 2020-07-23 stsp echo '+../gamma/delta' >> $testroot/stdout.expected
2554 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2555 c631b115 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2556 c631b115 2020-07-23 stsp got tree -r $testroot/repo -i | grep 'epsilon.link@ -> epsilon$' | \
2557 c631b115 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2558 c631b115 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2559 c631b115 2020-07-23 stsp (cd $testroot/wt && got stage -l epsilon.link) | cut -d' ' -f 1 \
2560 c631b115 2020-07-23 stsp >> $testroot/stdout.expected
2561 c631b115 2020-07-23 stsp echo '--- epsilon.link' >> $testroot/stdout.expected
2562 c631b115 2020-07-23 stsp echo '+++ epsilon.link' >> $testroot/stdout.expected
2563 c631b115 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
2564 c631b115 2020-07-23 stsp echo '-epsilon' >> $testroot/stdout.expected
2565 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2566 c631b115 2020-07-23 stsp echo '+gamma' >> $testroot/stdout.expected
2567 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2568 c631b115 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2569 c631b115 2020-07-23 stsp got tree -r $testroot/repo -i | grep 'nonexistent.link@ -> nonexistent$' | \
2570 c631b115 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2571 c631b115 2020-07-23 stsp echo 'blob + /dev/null' >> $testroot/stdout.expected
2572 c631b115 2020-07-23 stsp echo '--- nonexistent.link' >> $testroot/stdout.expected
2573 c631b115 2020-07-23 stsp echo '+++ /dev/null' >> $testroot/stdout.expected
2574 c631b115 2020-07-23 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
2575 c631b115 2020-07-23 stsp echo '-nonexistent' >> $testroot/stdout.expected
2576 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2577 c631b115 2020-07-23 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
2578 c631b115 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2579 c631b115 2020-07-23 stsp (cd $testroot/wt && got stage -l zeta.link) | cut -d' ' -f 1 \
2580 c631b115 2020-07-23 stsp >> $testroot/stdout.expected
2581 c631b115 2020-07-23 stsp echo '--- /dev/null' >> $testroot/stdout.expected
2582 c631b115 2020-07-23 stsp echo '+++ zeta.link' >> $testroot/stdout.expected
2583 c631b115 2020-07-23 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
2584 c631b115 2020-07-23 stsp echo '+gamma/delta' >> $testroot/stdout.expected
2585 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $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 (cd $testroot/wt && got commit -m "staged symlink" \
2596 c631b115 2020-07-23 stsp > $testroot/stdout)
2598 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2599 c631b115 2020-07-23 stsp echo "got commit command failed unexpectedly" >&2
2600 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2604 c631b115 2020-07-23 stsp local commit_id=`git_show_head $testroot/repo`
2605 c631b115 2020-07-23 stsp echo "A dotgotbar.link" > $testroot/stdout.expected
2606 c631b115 2020-07-23 stsp echo "A dotgotfoo.link" >> $testroot/stdout.expected
2607 c631b115 2020-07-23 stsp echo "A zeta.link" >> $testroot/stdout.expected
2608 c631b115 2020-07-23 stsp echo "M alpha.link" >> $testroot/stdout.expected
2609 c631b115 2020-07-23 stsp echo "M epsilon/beta.link" >> $testroot/stdout.expected
2610 c631b115 2020-07-23 stsp echo "M epsilon.link" >> $testroot/stdout.expected
2611 c631b115 2020-07-23 stsp echo "D nonexistent.link" >> $testroot/stdout.expected
2612 c631b115 2020-07-23 stsp echo "Created commit $commit_id" >> $testroot/stdout.expected
2613 c631b115 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2615 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2616 c631b115 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2617 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2621 c631b115 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id > $testroot/stdout
2623 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2624 c631b115 2020-07-23 stsp echo "got tree command failed unexpectedly" >&2
2625 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2629 c631b115 2020-07-23 stsp cat > $testroot/stdout.expected <<EOF
2631 c631b115 2020-07-23 stsp alpha.link@ -> beta
2633 c631b115 2020-07-23 stsp dotgotbar.link@ -> .got/bar
2634 c631b115 2020-07-23 stsp dotgotfoo.link
2636 c631b115 2020-07-23 stsp epsilon.link@ -> gamma
2638 c631b115 2020-07-23 stsp passwd.link@ -> /etc/passwd
2639 c631b115 2020-07-23 stsp zeta.link@ -> gamma/delta
2641 c631b115 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2643 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2644 c631b115 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2648 0aeb8099 2020-07-23 stsp if [ -h $testroot/wt/alpha.link ]; then
2649 0aeb8099 2020-07-23 stsp echo "alpha.link is a symlink"
2650 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2654 0aeb8099 2020-07-23 stsp echo 'this is regular file alpha.link' > $testroot/content.expected
2655 0aeb8099 2020-07-23 stsp cp $testroot/wt/alpha.link $testroot/content
2656 0aeb8099 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2658 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2659 0aeb8099 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2660 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2664 75f0a0fb 2020-07-23 stsp if [ ! -h $testroot/wt/dotgotbar.link ]; then
2665 75f0a0fb 2020-07-23 stsp echo "dotgotbar.link is not a symlink"
2666 75f0a0fb 2020-07-23 stsp test_done "$testroot" "1"
2669 75f0a0fb 2020-07-23 stsp (cd $testroot/wt && got update > /dev/null)
2670 c631b115 2020-07-23 stsp if [ -h $testroot/wt/dotgotbar.link ]; then
2671 c631b115 2020-07-23 stsp echo "dotgotbar.link is a symlink"
2672 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2675 0aeb8099 2020-07-23 stsp echo -n ".got/bar" > $testroot/content.expected
2676 c631b115 2020-07-23 stsp cp $testroot/wt/dotgotbar.link $testroot/content
2677 fa3cef63 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2679 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2680 fa3cef63 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2681 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2685 fa3cef63 2020-07-23 stsp if [ -h $testroot/wt/dotgotfoo.link ]; then
2686 fa3cef63 2020-07-23 stsp echo "dotgotfoo.link is a symlink"
2687 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2690 fa3cef63 2020-07-23 stsp echo "this is regular file foo" > $testroot/content.expected
2691 fa3cef63 2020-07-23 stsp cp $testroot/wt/dotgotfoo.link $testroot/content
2692 fa3cef63 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2694 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2695 fa3cef63 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2696 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2700 fa3cef63 2020-07-23 stsp if ! [ -h $testroot/wt/epsilon.link ]; then
2701 fa3cef63 2020-07-23 stsp echo "epsilon.link is not a symlink"
2702 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2706 fa3cef63 2020-07-23 stsp readlink $testroot/wt/epsilon.link > $testroot/stdout
2707 fa3cef63 2020-07-23 stsp echo "gamma" > $testroot/stdout.expected
2708 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2710 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2711 fa3cef63 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2712 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2716 fa3cef63 2020-07-23 stsp if [ -h $testroot/wt/passwd.link ]; then
2717 fa3cef63 2020-07-23 stsp echo "passwd.link is a symlink"
2718 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2721 fa3cef63 2020-07-23 stsp echo -n "/etc/passwd" > $testroot/content.expected
2722 fa3cef63 2020-07-23 stsp cp $testroot/wt/passwd.link $testroot/content
2723 fa3cef63 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2725 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2726 fa3cef63 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2727 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2731 fa3cef63 2020-07-23 stsp if ! [ -h $testroot/wt/zeta.link ]; then
2732 fa3cef63 2020-07-23 stsp echo "zeta.link is not a symlink"
2733 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2737 fa3cef63 2020-07-23 stsp readlink $testroot/wt/zeta.link > $testroot/stdout
2738 fa3cef63 2020-07-23 stsp echo "gamma/delta" > $testroot/stdout.expected
2739 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2741 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2742 fa3cef63 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2743 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2747 fa3cef63 2020-07-23 stsp test_done "$testroot" "0"
2750 f6cae3ed 2020-09-13 naddy test_stage_patch_symlink() {
2751 fa3cef63 2020-07-23 stsp local testroot=`test_init stage_patch_symlink`
2753 fa3cef63 2020-07-23 stsp (cd $testroot/repo && ln -s alpha alpha.link)
2754 fa3cef63 2020-07-23 stsp (cd $testroot/repo && ln -s epsilon epsilon.link)
2755 fa3cef63 2020-07-23 stsp (cd $testroot/repo && ln -s /etc/passwd passwd.link)
2756 fa3cef63 2020-07-23 stsp (cd $testroot/repo && ln -s ../beta epsilon/beta.link)
2757 fa3cef63 2020-07-23 stsp (cd $testroot/repo && ln -s nonexistent nonexistent.link)
2758 fa3cef63 2020-07-23 stsp (cd $testroot/repo && git add .)
2759 fa3cef63 2020-07-23 stsp git_commit $testroot/repo -m "add symlinks"
2760 fa3cef63 2020-07-23 stsp local head_commit=`git_show_head $testroot/repo`
2762 fa3cef63 2020-07-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2764 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2765 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2769 fa3cef63 2020-07-23 stsp (cd $testroot/wt && ln -sf beta alpha.link)
2770 f55db25a 2023-03-03 naddy (cd $testroot/wt && rm epsilon.link && ln -s gamma epsilon.link)
2771 fa3cef63 2020-07-23 stsp (cd $testroot/wt && ln -sf ../gamma/delta epsilon/beta.link)
2772 fa3cef63 2020-07-23 stsp echo 'this is regular file foo' > $testroot/wt/dotgotfoo.link
2773 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got add dotgotfoo.link > /dev/null)
2774 fa3cef63 2020-07-23 stsp (cd $testroot/wt && ln -sf .got/bar dotgotbar.link)
2775 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got add dotgotbar.link > /dev/null)
2776 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got rm nonexistent.link > /dev/null)
2777 fa3cef63 2020-07-23 stsp (cd $testroot/wt && ln -sf gamma/delta zeta.link)
2778 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got add zeta.link > /dev/null)
2780 fa3cef63 2020-07-23 stsp printf "y\nn\ny\nn\ny\ny\ny" > $testroot/patchscript
2781 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
2782 fa3cef63 2020-07-23 stsp > $testroot/stdout)
2784 fa3cef63 2020-07-23 stsp cat > $testroot/stdout.expected <<EOF
2785 fa3cef63 2020-07-23 stsp -----------------------------------------------
2786 fa3cef63 2020-07-23 stsp @@ -1 +1 @@
2788 fa3cef63 2020-07-23 stsp \ No newline at end of file
2790 fa3cef63 2020-07-23 stsp \ No newline at end of file
2791 fa3cef63 2020-07-23 stsp -----------------------------------------------
2792 fa3cef63 2020-07-23 stsp M alpha.link (change 1 of 1)
2793 fa3cef63 2020-07-23 stsp stage this change? [y/n/q] y
2794 fa3cef63 2020-07-23 stsp A dotgotbar.link
2795 fa3cef63 2020-07-23 stsp stage this addition? [y/n] n
2796 fa3cef63 2020-07-23 stsp A dotgotfoo.link
2797 fa3cef63 2020-07-23 stsp stage this addition? [y/n] y
2798 fa3cef63 2020-07-23 stsp -----------------------------------------------
2799 fa3cef63 2020-07-23 stsp @@ -1 +1 @@
2801 fa3cef63 2020-07-23 stsp \ No newline at end of file
2802 fa3cef63 2020-07-23 stsp +../gamma/delta
2803 fa3cef63 2020-07-23 stsp \ No newline at end of file
2804 fa3cef63 2020-07-23 stsp -----------------------------------------------
2805 fa3cef63 2020-07-23 stsp M epsilon/beta.link (change 1 of 1)
2806 fa3cef63 2020-07-23 stsp stage this change? [y/n/q] n
2807 fa3cef63 2020-07-23 stsp -----------------------------------------------
2808 fa3cef63 2020-07-23 stsp @@ -1 +1 @@
2810 fa3cef63 2020-07-23 stsp \ No newline at end of file
2812 fa3cef63 2020-07-23 stsp \ No newline at end of file
2813 fa3cef63 2020-07-23 stsp -----------------------------------------------
2814 fa3cef63 2020-07-23 stsp M epsilon.link (change 1 of 1)
2815 fa3cef63 2020-07-23 stsp stage this change? [y/n/q] y
2816 fa3cef63 2020-07-23 stsp D nonexistent.link
2817 fa3cef63 2020-07-23 stsp stage this deletion? [y/n] y
2818 fa3cef63 2020-07-23 stsp A zeta.link
2819 fa3cef63 2020-07-23 stsp stage this addition? [y/n] y
2821 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2823 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2824 fa3cef63 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2825 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2829 fa3cef63 2020-07-23 stsp rm $testroot/wt/alpha.link
2830 fa3cef63 2020-07-23 stsp echo 'this is regular file alpha.link' > $testroot/wt/alpha.link
2832 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
2834 8469d821 2022-06-25 stsp echo "diff -s $testroot/wt" > $testroot/stdout.expected
2835 8469d821 2022-06-25 stsp echo "commit - $head_commit" >> $testroot/stdout.expected
2836 8469d821 2022-06-25 stsp echo "path + $testroot/wt (staged changes)" >> $testroot/stdout.expected
2837 fa3cef63 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2838 fa3cef63 2020-07-23 stsp got tree -r $testroot/repo -i | grep 'alpha.link@ -> alpha$' | \
2839 fa3cef63 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2840 fa3cef63 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2841 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got stage -l alpha.link) | cut -d' ' -f 1 \
2842 fa3cef63 2020-07-23 stsp >> $testroot/stdout.expected
2843 fa3cef63 2020-07-23 stsp echo '--- alpha.link' >> $testroot/stdout.expected
2844 fa3cef63 2020-07-23 stsp echo '+++ alpha.link' >> $testroot/stdout.expected
2845 fa3cef63 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
2846 fa3cef63 2020-07-23 stsp echo '-alpha' >> $testroot/stdout.expected
2847 fa3cef63 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2848 fa3cef63 2020-07-23 stsp echo '+beta' >> $testroot/stdout.expected
2849 fa3cef63 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2850 fa3cef63 2020-07-23 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
2851 fa3cef63 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2852 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got stage -l dotgotfoo.link) | cut -d' ' -f 1 \
2853 fa3cef63 2020-07-23 stsp >> $testroot/stdout.expected
2854 fa3cef63 2020-07-23 stsp echo '--- /dev/null' >> $testroot/stdout.expected
2855 fa3cef63 2020-07-23 stsp echo '+++ dotgotfoo.link' >> $testroot/stdout.expected
2856 fa3cef63 2020-07-23 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
2857 fa3cef63 2020-07-23 stsp echo '+this is regular file foo' >> $testroot/stdout.expected
2858 fa3cef63 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2859 fa3cef63 2020-07-23 stsp got tree -r $testroot/repo -i | grep 'epsilon.link@ -> epsilon$' | \
2860 fa3cef63 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2861 fa3cef63 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2862 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got stage -l epsilon.link) | cut -d' ' -f 1 \
2863 fa3cef63 2020-07-23 stsp >> $testroot/stdout.expected
2864 fa3cef63 2020-07-23 stsp echo '--- epsilon.link' >> $testroot/stdout.expected
2865 fa3cef63 2020-07-23 stsp echo '+++ epsilon.link' >> $testroot/stdout.expected
2866 fa3cef63 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
2867 fa3cef63 2020-07-23 stsp echo '-epsilon' >> $testroot/stdout.expected
2868 fa3cef63 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2869 fa3cef63 2020-07-23 stsp echo '+gamma' >> $testroot/stdout.expected
2870 fa3cef63 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2871 fa3cef63 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2872 fa3cef63 2020-07-23 stsp got tree -r $testroot/repo -i | grep 'nonexistent.link@ -> nonexistent$' | \
2873 fa3cef63 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2874 fa3cef63 2020-07-23 stsp echo 'blob + /dev/null' >> $testroot/stdout.expected
2875 fa3cef63 2020-07-23 stsp echo '--- nonexistent.link' >> $testroot/stdout.expected
2876 fa3cef63 2020-07-23 stsp echo '+++ /dev/null' >> $testroot/stdout.expected
2877 fa3cef63 2020-07-23 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
2878 fa3cef63 2020-07-23 stsp echo '-nonexistent' >> $testroot/stdout.expected
2879 fa3cef63 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2880 fa3cef63 2020-07-23 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
2881 fa3cef63 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2882 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got stage -l zeta.link) | cut -d' ' -f 1 \
2883 fa3cef63 2020-07-23 stsp >> $testroot/stdout.expected
2884 fa3cef63 2020-07-23 stsp echo '--- /dev/null' >> $testroot/stdout.expected
2885 fa3cef63 2020-07-23 stsp echo '+++ zeta.link' >> $testroot/stdout.expected
2886 fa3cef63 2020-07-23 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
2887 fa3cef63 2020-07-23 stsp echo '+gamma/delta' >> $testroot/stdout.expected
2888 fa3cef63 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2890 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2892 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2893 fa3cef63 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2894 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2898 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got commit -m "staged symlink" \
2899 fa3cef63 2020-07-23 stsp > $testroot/stdout)
2901 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2902 fa3cef63 2020-07-23 stsp echo "got commit command failed unexpectedly" >&2
2903 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2907 fa3cef63 2020-07-23 stsp local commit_id=`git_show_head $testroot/repo`
2908 fa3cef63 2020-07-23 stsp echo "A dotgotfoo.link" > $testroot/stdout.expected
2909 fa3cef63 2020-07-23 stsp echo "A zeta.link" >> $testroot/stdout.expected
2910 fa3cef63 2020-07-23 stsp echo "M alpha.link" >> $testroot/stdout.expected
2911 fa3cef63 2020-07-23 stsp echo "M epsilon.link" >> $testroot/stdout.expected
2912 fa3cef63 2020-07-23 stsp echo "D nonexistent.link" >> $testroot/stdout.expected
2913 fa3cef63 2020-07-23 stsp echo "Created commit $commit_id" >> $testroot/stdout.expected
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
2918 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2922 fa3cef63 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id > $testroot/stdout
2924 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2925 fa3cef63 2020-07-23 stsp echo "got tree command failed unexpectedly" >&2
2926 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2930 fa3cef63 2020-07-23 stsp cat > $testroot/stdout.expected <<EOF
2932 fa3cef63 2020-07-23 stsp alpha.link@ -> beta
2934 fa3cef63 2020-07-23 stsp dotgotfoo.link
2936 fa3cef63 2020-07-23 stsp epsilon.link@ -> gamma
2938 fa3cef63 2020-07-23 stsp passwd.link@ -> /etc/passwd
2939 fa3cef63 2020-07-23 stsp zeta.link@ -> gamma/delta
2941 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2943 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2944 fa3cef63 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2948 fa3cef63 2020-07-23 stsp if [ -h $testroot/wt/alpha.link ]; then
2949 fa3cef63 2020-07-23 stsp echo "alpha.link is a symlink"
2950 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2954 fa3cef63 2020-07-23 stsp echo 'this is regular file alpha.link' > $testroot/content.expected
2955 fa3cef63 2020-07-23 stsp cp $testroot/wt/alpha.link $testroot/content
2956 c631b115 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2958 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2959 c631b115 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2960 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2964 fa3cef63 2020-07-23 stsp if [ ! -h $testroot/wt/dotgotbar.link ]; then
2965 fa3cef63 2020-07-23 stsp echo "dotgotbar.link is not a symlink"
2966 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2969 fa3cef63 2020-07-23 stsp readlink $testroot/wt/dotgotbar.link > $testroot/stdout
2970 fa3cef63 2020-07-23 stsp echo ".got/bar" > $testroot/stdout.expected
2971 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2973 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2974 fa3cef63 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2975 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2979 c631b115 2020-07-23 stsp if [ -h $testroot/wt/dotgotfoo.link ]; then
2980 c631b115 2020-07-23 stsp echo "dotgotfoo.link is a symlink"
2981 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2984 c631b115 2020-07-23 stsp echo "this is regular file foo" > $testroot/content.expected
2985 c631b115 2020-07-23 stsp cp $testroot/wt/dotgotfoo.link $testroot/content
2986 c631b115 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2988 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
2989 c631b115 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2990 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2994 c631b115 2020-07-23 stsp if ! [ -h $testroot/wt/epsilon.link ]; then
2995 c631b115 2020-07-23 stsp echo "epsilon.link is not a symlink"
2996 c631b115 2020-07-23 stsp test_done "$testroot" "1"
3000 c631b115 2020-07-23 stsp readlink $testroot/wt/epsilon.link > $testroot/stdout
3001 c631b115 2020-07-23 stsp echo "gamma" > $testroot/stdout.expected
3002 c631b115 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
3004 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
3005 c631b115 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
3006 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
3010 c631b115 2020-07-23 stsp if [ -h $testroot/wt/passwd.link ]; then
3011 c631b115 2020-07-23 stsp echo "passwd.link is a symlink"
3012 c631b115 2020-07-23 stsp test_done "$testroot" "1"
3015 c631b115 2020-07-23 stsp echo -n "/etc/passwd" > $testroot/content.expected
3016 c631b115 2020-07-23 stsp cp $testroot/wt/passwd.link $testroot/content
3017 c631b115 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
3019 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
3020 c631b115 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
3021 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
3025 c631b115 2020-07-23 stsp if ! [ -h $testroot/wt/zeta.link ]; then
3026 c631b115 2020-07-23 stsp echo "zeta.link is not a symlink"
3027 c631b115 2020-07-23 stsp test_done "$testroot" "1"
3031 c631b115 2020-07-23 stsp readlink $testroot/wt/zeta.link > $testroot/stdout
3032 c631b115 2020-07-23 stsp echo "gamma/delta" > $testroot/stdout.expected
3033 c631b115 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
3035 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
3036 c631b115 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
3037 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
3041 c631b115 2020-07-23 stsp test_done "$testroot" "0"
3044 7fb414ae 2020-08-08 stsp test_parseargs "$@"
3045 fccbfb98 2019-08-03 stsp run_test test_stage_basic
3046 31b20a6e 2019-08-06 stsp run_test test_stage_no_changes
3047 8b13ce36 2019-08-08 stsp run_test test_stage_unversioned
3048 8564cb21 2019-08-08 stsp run_test test_stage_nonexistent
3049 a4f692bb 2019-08-04 stsp run_test test_stage_list
3050 ebf48fd5 2019-08-03 stsp run_test test_stage_conflict
3051 735ef5ac 2019-08-03 stsp run_test test_stage_out_of_date
3052 d3e7c587 2019-08-03 stsp run_test test_double_stage
3053 c363b2c1 2019-08-03 stsp run_test test_stage_status
3054 1e1446d3 2019-08-03 stsp run_test test_stage_add_already_staged_file
3055 9acbc4fa 2019-08-03 stsp run_test test_stage_rm_already_staged_file
3056 24278f30 2019-08-03 stsp run_test test_stage_revert
3057 408b4ebc 2019-08-03 stsp run_test test_stage_diff
3058 b9622844 2019-08-03 stsp run_test test_stage_histedit
3059 243d7cf1 2019-08-03 stsp run_test test_stage_rebase
3060 a76c42e6 2019-08-03 stsp run_test test_stage_update
3061 f0b75401 2019-08-03 stsp run_test test_stage_commit_non_staged
3062 0f1cfa7f 2019-08-08 stsp run_test test_stage_commit_out_of_date
3063 5f8a88c6 2019-08-03 stsp run_test test_stage_commit
3064 dc424a06 2019-08-07 stsp run_test test_stage_patch
3065 af5a81b2 2019-08-08 stsp run_test test_stage_patch_twice
3066 dc424a06 2019-08-07 stsp run_test test_stage_patch_added
3067 e70a841e 2019-08-08 stsp run_test test_stage_patch_added_twice
3068 dc424a06 2019-08-07 stsp run_test test_stage_patch_removed
3069 e70a841e 2019-08-08 stsp run_test test_stage_patch_removed_twice
3070 9fdde394 2022-06-04 op run_test test_stage_patch_reversed
3071 b353a198 2019-08-07 stsp run_test test_stage_patch_quit
3072 eba70f38 2019-08-08 stsp run_test test_stage_patch_incomplete_script
3073 c631b115 2020-07-23 stsp run_test test_stage_symlink
3074 fa3cef63 2020-07-23 stsp run_test test_stage_patch_symlink
