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 f6cae3ed 2020-09-13 naddy test_stage_basic() {
20 fccbfb98 2019-08-03 stsp local testroot=`test_init stage_basic`
22 fccbfb98 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
24 fccbfb98 2019-08-03 stsp if [ "$ret" != "0" ]; then
25 fccbfb98 2019-08-03 stsp test_done "$testroot" "$ret"
29 fccbfb98 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
30 fccbfb98 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
31 fccbfb98 2019-08-03 stsp echo "new file" > $testroot/wt/foo
32 fccbfb98 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
34 88d0e355 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
35 88d0e355 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
36 d3e7c587 2019-08-03 stsp echo ' A foo' >> $testroot/stdout.expected
37 ec9d9b2f 2019-08-08 stsp (cd $testroot/wt && got stage > $testroot/stdout)
39 d3e7c587 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
41 d3e7c587 2019-08-03 stsp if [ "$ret" != "0" ]; then
42 d3e7c587 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
44 d3e7c587 2019-08-03 stsp test_done "$testroot" "$ret"
47 f6cae3ed 2020-09-13 naddy test_stage_no_changes() {
48 31b20a6e 2019-08-06 stsp local testroot=`test_init stage_no_changes`
50 31b20a6e 2019-08-06 stsp got checkout $testroot/repo $testroot/wt > /dev/null
52 31b20a6e 2019-08-06 stsp if [ "$ret" != "0" ]; then
53 31b20a6e 2019-08-06 stsp test_done "$testroot" "$ret"
57 31b20a6e 2019-08-06 stsp (cd $testroot/wt && got stage alpha beta > $testroot/stdout \
58 31b20a6e 2019-08-06 stsp 2> $testroot/stderr)
60 54c39596 2020-12-28 stsp if [ "$ret" = "0" ]; then
61 31b20a6e 2019-08-06 stsp echo "got stage command succeeded unexpectedly" >&2
62 31b20a6e 2019-08-06 stsp test_done "$testroot" "1"
66 2db2652d 2019-08-07 stsp echo "got: no changes to stage" > $testroot/stderr.expected
68 31b20a6e 2019-08-06 stsp cmp -s $testroot/stderr.expected $testroot/stderr
70 31b20a6e 2019-08-06 stsp if [ "$ret" != "0" ]; then
71 31b20a6e 2019-08-06 stsp diff -u $testroot/stderr.expected $testroot/stderr
72 31b20a6e 2019-08-06 stsp test_done "$testroot" "$ret"
76 31b20a6e 2019-08-06 stsp echo -n > $testroot/stdout.expected
77 31b20a6e 2019-08-06 stsp cmp -s $testroot/stdout.expected $testroot/stdout
79 31b20a6e 2019-08-06 stsp if [ "$ret" != "0" ]; then
80 31b20a6e 2019-08-06 stsp diff -u $testroot/stdout.expected $testroot/stdout
82 31b20a6e 2019-08-06 stsp test_done "$testroot" "$ret"
85 f6cae3ed 2020-09-13 naddy test_stage_unversioned() {
86 8b13ce36 2019-08-08 stsp local testroot=`test_init stage_unversioned`
88 8b13ce36 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
90 8b13ce36 2019-08-08 stsp if [ "$ret" != "0" ]; then
91 8b13ce36 2019-08-08 stsp test_done "$testroot" "$ret"
95 8b13ce36 2019-08-08 stsp echo "modified file" > $testroot/wt/alpha
96 8b13ce36 2019-08-08 stsp touch $testroot/wt/unversioned-file
98 8b13ce36 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
99 8b13ce36 2019-08-08 stsp echo "M alpha" > $testroot/stdout.expected
100 8b13ce36 2019-08-08 stsp echo "? unversioned-file" >> $testroot/stdout.expected
101 8b13ce36 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
103 8b13ce36 2019-08-08 stsp if [ "$ret" != "0" ]; then
104 8b13ce36 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
105 8b13ce36 2019-08-08 stsp test_done "$testroot" "$ret"
109 8b13ce36 2019-08-08 stsp (cd $testroot/wt && got stage > $testroot/stdout)
111 8b13ce36 2019-08-08 stsp if [ "$ret" != "0" ]; then
112 8b13ce36 2019-08-08 stsp echo "got stage command failed unexpectedly" >&2
113 8b13ce36 2019-08-08 stsp test_done "$testroot" "$ret"
117 8b13ce36 2019-08-08 stsp echo " M alpha" > $testroot/stdout.expected
118 8b13ce36 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
120 8b13ce36 2019-08-08 stsp if [ "$ret" != "0" ]; then
121 8b13ce36 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
122 8b13ce36 2019-08-08 stsp test_done "$testroot" "$ret"
126 8b13ce36 2019-08-08 stsp echo "modified file again" > $testroot/wt/alpha
128 8b13ce36 2019-08-08 stsp (cd $testroot/wt && got stage unversioned-file > $testroot/stdout \
129 8b13ce36 2019-08-08 stsp 2> $testroot/stderr)
131 54c39596 2020-12-28 stsp if [ "$ret" = "0" ]; then
132 8b13ce36 2019-08-08 stsp echo "got stage command succeed unexpectedly" >&2
133 8b13ce36 2019-08-08 stsp test_done "$testroot" "1"
137 8b13ce36 2019-08-08 stsp echo "got: no changes to stage" > $testroot/stderr.expected
138 8b13ce36 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
140 8b13ce36 2019-08-08 stsp if [ "$ret" != "0" ]; then
141 8b13ce36 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
143 8b13ce36 2019-08-08 stsp test_done "$testroot" "$ret"
147 f6cae3ed 2020-09-13 naddy test_stage_nonexistent() {
148 8564cb21 2019-08-08 stsp local testroot=`test_init stage_nonexistent`
150 8564cb21 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
152 8564cb21 2019-08-08 stsp if [ "$ret" != "0" ]; then
153 8564cb21 2019-08-08 stsp test_done "$testroot" "$ret"
157 8564cb21 2019-08-08 stsp (cd $testroot/wt && got stage nonexistent-file \
158 8564cb21 2019-08-08 stsp > $testroot/stdout 2> $testroot/stderr)
159 2a06fe5f 2019-08-24 stsp echo "got: nonexistent-file: No such file or directory" \
160 2a06fe5f 2019-08-24 stsp > $testroot/stderr.expected
161 8564cb21 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
163 8564cb21 2019-08-08 stsp if [ "$ret" != "0" ]; then
164 8564cb21 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
166 8564cb21 2019-08-08 stsp test_done "$testroot" "$ret"
169 f6cae3ed 2020-09-13 naddy test_stage_list() {
170 a4f692bb 2019-08-04 stsp local testroot=`test_init stage_list`
172 a4f692bb 2019-08-04 stsp got checkout $testroot/repo $testroot/wt > /dev/null
174 a4f692bb 2019-08-04 stsp if [ "$ret" != "0" ]; then
175 a4f692bb 2019-08-04 stsp test_done "$testroot" "$ret"
179 a4f692bb 2019-08-04 stsp echo "modified file" > $testroot/wt/alpha
180 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got rm beta > /dev/null)
181 a4f692bb 2019-08-04 stsp echo "new file" > $testroot/wt/foo
182 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got add foo > /dev/null)
184 a4f692bb 2019-08-04 stsp echo ' M alpha' > $testroot/stdout.expected
185 a4f692bb 2019-08-04 stsp echo ' D beta' >> $testroot/stdout.expected
186 a4f692bb 2019-08-04 stsp echo ' A foo' >> $testroot/stdout.expected
187 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got stage alpha beta foo > /dev/null)
189 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got stage -l > $testroot/stdout)
190 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got diff -s alpha | grep '^blob +' | \
191 a4f692bb 2019-08-04 stsp cut -d' ' -f3 | tr -d '\n' > $testroot/stdout.expected)
192 a4f692bb 2019-08-04 stsp echo " M alpha" >> $testroot/stdout.expected
193 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got diff -s beta | grep '^blob -' | \
194 a4f692bb 2019-08-04 stsp cut -d' ' -f3 | tr -d '\n' >> $testroot/stdout.expected)
195 a4f692bb 2019-08-04 stsp echo " D beta" >> $testroot/stdout.expected
196 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got diff -s foo | grep '^blob +' | \
197 a4f692bb 2019-08-04 stsp cut -d' ' -f3 | tr -d '\n' >> $testroot/stdout.expected)
198 a4f692bb 2019-08-04 stsp echo " A foo" >> $testroot/stdout.expected
199 a4f692bb 2019-08-04 stsp cmp -s $testroot/stdout.expected $testroot/stdout
201 a4f692bb 2019-08-04 stsp if [ "$ret" != "0" ]; then
202 a4f692bb 2019-08-04 stsp diff -u $testroot/stdout.expected $testroot/stdout
203 a4f692bb 2019-08-04 stsp test_done "$testroot" "$ret"
207 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got stage -l epsilon nonexistent \
208 a4f692bb 2019-08-04 stsp > $testroot/stdout)
210 a4f692bb 2019-08-04 stsp echo -n > $testroot/stdout.expected
211 a4f692bb 2019-08-04 stsp cmp -s $testroot/stdout.expected $testroot/stdout
213 a4f692bb 2019-08-04 stsp if [ "$ret" != "0" ]; then
214 a4f692bb 2019-08-04 stsp diff -u $testroot/stdout.expected $testroot/stdout
215 a4f692bb 2019-08-04 stsp test_done "$testroot" "$ret"
219 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got stage -l alpha > $testroot/stdout)
221 a4f692bb 2019-08-04 stsp (cd $testroot/wt && got diff -s alpha | grep '^blob +' | \
222 a4f692bb 2019-08-04 stsp cut -d' ' -f3 | tr -d '\n' > $testroot/stdout.expected)
223 a4f692bb 2019-08-04 stsp echo " M alpha" >> $testroot/stdout.expected
224 a4f692bb 2019-08-04 stsp cmp -s $testroot/stdout.expected $testroot/stdout
226 a4f692bb 2019-08-04 stsp if [ "$ret" != "0" ]; then
227 a4f692bb 2019-08-04 stsp diff -u $testroot/stdout.expected $testroot/stdout
229 a4f692bb 2019-08-04 stsp test_done "$testroot" "$ret"
233 f6cae3ed 2020-09-13 naddy test_stage_conflict() {
234 ebf48fd5 2019-08-03 stsp local testroot=`test_init stage_conflict`
235 ebf48fd5 2019-08-03 stsp local initial_commit=`git_show_head $testroot/repo`
237 ebf48fd5 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
239 ebf48fd5 2019-08-03 stsp if [ "$ret" != "0" ]; then
240 ebf48fd5 2019-08-03 stsp test_done "$testroot" "$ret"
244 ebf48fd5 2019-08-03 stsp echo "modified alpha" > $testroot/wt/alpha
245 ebf48fd5 2019-08-03 stsp (cd $testroot/wt && got commit -m "modified alpha" >/dev/null)
247 ebf48fd5 2019-08-03 stsp (cd $testroot/wt && got update -c $initial_commit > /dev/null)
249 ebf48fd5 2019-08-03 stsp echo "modified alpha, too" > $testroot/wt/alpha
251 ebf48fd5 2019-08-03 stsp echo "C alpha" > $testroot/stdout.expected
252 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: " >> $testroot/stdout.expected
253 ebf48fd5 2019-08-03 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
254 ebf48fd5 2019-08-03 stsp echo >> $testroot/stdout.expected
255 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
257 ebf48fd5 2019-08-03 stsp (cd $testroot/wt && got update > $testroot/stdout)
259 ebf48fd5 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
261 ebf48fd5 2019-08-03 stsp if [ "$ret" != "0" ]; then
262 ebf48fd5 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
263 ebf48fd5 2019-08-03 stsp test_done "$testroot" "$ret"
267 ebf48fd5 2019-08-03 stsp (cd $testroot/wt && got stage alpha > $testroot/stdout \
268 ebf48fd5 2019-08-03 stsp 2> $testroot/stderr)
270 54c39596 2020-12-28 stsp if [ "$ret" = "0" ]; then
271 ebf48fd5 2019-08-03 stsp echo "got stage command succeeded unexpectedly" >&2
272 ebf48fd5 2019-08-03 stsp test_done "$testroot" "1"
276 ebf48fd5 2019-08-03 stsp echo -n > $testroot/stdout.expected
277 ebf48fd5 2019-08-03 stsp echo "got: alpha: cannot stage file in conflicted status" \
278 735ef5ac 2019-08-03 stsp > $testroot/stderr.expected
280 735ef5ac 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
282 735ef5ac 2019-08-03 stsp if [ "$ret" != "0" ]; then
283 735ef5ac 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
284 735ef5ac 2019-08-03 stsp test_done "$testroot" "$ret"
287 735ef5ac 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
289 735ef5ac 2019-08-03 stsp if [ "$ret" != "0" ]; then
290 735ef5ac 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
292 735ef5ac 2019-08-03 stsp test_done "$testroot" "$ret"
295 f6cae3ed 2020-09-13 naddy test_stage_out_of_date() {
296 735ef5ac 2019-08-03 stsp local testroot=`test_init stage_out_of_date`
297 735ef5ac 2019-08-03 stsp local initial_commit=`git_show_head $testroot/repo`
299 735ef5ac 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
301 735ef5ac 2019-08-03 stsp if [ "$ret" != "0" ]; then
302 735ef5ac 2019-08-03 stsp test_done "$testroot" "$ret"
306 735ef5ac 2019-08-03 stsp echo "modified alpha" > $testroot/wt/alpha
307 735ef5ac 2019-08-03 stsp (cd $testroot/wt && got commit -m "modified alpha" >/dev/null)
309 735ef5ac 2019-08-03 stsp (cd $testroot/wt && got update -c $initial_commit > /dev/null)
311 735ef5ac 2019-08-03 stsp echo "modified alpha again" > $testroot/wt/alpha
312 735ef5ac 2019-08-03 stsp (cd $testroot/wt && got stage alpha > $testroot/stdout \
313 735ef5ac 2019-08-03 stsp 2> $testroot/stderr)
315 54c39596 2020-12-28 stsp if [ "$ret" = "0" ]; then
316 735ef5ac 2019-08-03 stsp echo "got stage command succeeded unexpectedly" >&2
317 735ef5ac 2019-08-03 stsp test_done "$testroot" "1"
321 735ef5ac 2019-08-03 stsp echo -n > $testroot/stdout.expected
322 735ef5ac 2019-08-03 stsp echo "got: work tree must be updated before changes can be staged" \
323 ebf48fd5 2019-08-03 stsp > $testroot/stderr.expected
325 ebf48fd5 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
327 ebf48fd5 2019-08-03 stsp if [ "$ret" != "0" ]; then
328 ebf48fd5 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
329 ebf48fd5 2019-08-03 stsp test_done "$testroot" "$ret"
332 ebf48fd5 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
334 ebf48fd5 2019-08-03 stsp if [ "$ret" != "0" ]; then
335 ebf48fd5 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
337 ebf48fd5 2019-08-03 stsp test_done "$testroot" "$ret"
341 f6cae3ed 2020-09-13 naddy test_double_stage() {
342 d3e7c587 2019-08-03 stsp local testroot=`test_init double_stage`
344 d3e7c587 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
346 d3e7c587 2019-08-03 stsp if [ "$ret" != "0" ]; then
347 d3e7c587 2019-08-03 stsp test_done "$testroot" "$ret"
350 d3e7c587 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
351 d3e7c587 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
352 d3e7c587 2019-08-03 stsp echo "new file" > $testroot/wt/foo
353 d3e7c587 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
354 d3e7c587 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > /dev/null)
356 7b5dc508 2019-10-28 stsp echo "got: no changes to stage" > $testroot/stderr.expected
357 d3e7c587 2019-08-03 stsp (cd $testroot/wt && got stage alpha 2> $testroot/stderr)
358 d3e7c587 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
360 d3e7c587 2019-08-03 stsp if [ "$ret" != "0" ]; then
361 d3e7c587 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
362 d3e7c587 2019-08-03 stsp test_done "$testroot" "$ret"
366 7b5dc508 2019-10-28 stsp (cd $testroot/wt && got stage beta \
367 7b5dc508 2019-10-28 stsp > $testroot/stdout 2> $testroot/stderr)
369 54c39596 2020-12-28 stsp if [ "$ret" = "0" ]; then
370 7b5dc508 2019-10-28 stsp echo "got stage command succeeded unexpectedly" >&2
371 7b5dc508 2019-10-28 stsp test_done "$testroot" "1"
374 7b5dc508 2019-10-28 stsp echo -n > $testroot/stdout.expected
375 7b5dc508 2019-10-28 stsp cmp -s $testroot/stdout.expected $testroot/stdout
377 d3e7c587 2019-08-03 stsp if [ "$ret" != "0" ]; then
378 7b5dc508 2019-10-28 stsp diff -u $testroot/stdout.expected $testroot/stdout
379 7b5dc508 2019-10-28 stsp test_done "$testroot" "$ret"
383 7b5dc508 2019-10-28 stsp echo "got: no changes to stage" > $testroot/stderr.expected
384 7b5dc508 2019-10-28 stsp (cd $testroot/wt && got stage foo 2> $testroot/stderr)
385 7b5dc508 2019-10-28 stsp cmp -s $testroot/stderr.expected $testroot/stderr
387 7b5dc508 2019-10-28 stsp if [ "$ret" != "0" ]; then
388 7b5dc508 2019-10-28 stsp diff -u $testroot/stderr.expected $testroot/stderr
389 7b5dc508 2019-10-28 stsp test_done "$testroot" "$ret"
393 7b5dc508 2019-10-28 stsp printf "q\n" > $testroot/patchscript
394 7b5dc508 2019-10-28 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
395 7b5dc508 2019-10-28 stsp > $testroot/stdout 2> $testroot/stderr)
397 54c39596 2020-12-28 stsp if [ "$ret" = "0" ]; then
398 7b5dc508 2019-10-28 stsp echo "got stage command succeeded unexpectedly" >&2
399 d3e7c587 2019-08-03 stsp test_done "$testroot" "1"
402 d3e7c587 2019-08-03 stsp echo -n > $testroot/stdout.expected
403 d3e7c587 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
405 d3e7c587 2019-08-03 stsp if [ "$ret" != "0" ]; then
406 d3e7c587 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
407 d3e7c587 2019-08-03 stsp test_done "$testroot" "$ret"
411 7b5dc508 2019-10-28 stsp echo "got: no changes to stage" > $testroot/stderr.expected
412 d3e7c587 2019-08-03 stsp (cd $testroot/wt && got stage foo 2> $testroot/stderr)
413 d3e7c587 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
415 d3e7c587 2019-08-03 stsp if [ "$ret" != "0" ]; then
416 d3e7c587 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
417 d3e7c587 2019-08-03 stsp test_done "$testroot" "$ret"
421 d3e7c587 2019-08-03 stsp echo "modified file again" > $testroot/wt/alpha
422 d3e7c587 2019-08-03 stsp echo "modified new file" > $testroot/wt/foo
424 d3e7c587 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
425 88d0e355 2019-08-03 stsp echo ' A foo' >> $testroot/stdout.expected
426 fccbfb98 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > $testroot/stdout)
427 d3e7c587 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
429 d3e7c587 2019-08-03 stsp if [ "$ret" != "0" ]; then
430 d3e7c587 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
431 d3e7c587 2019-08-03 stsp test_done "$testroot" "$ret"
435 d3e7c587 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
436 d3e7c587 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
437 d3e7c587 2019-08-03 stsp echo ' A foo' >> $testroot/stdout.expected
439 d3e7c587 2019-08-03 stsp (cd $testroot/wt && got status > $testroot/stdout)
440 fccbfb98 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
442 fccbfb98 2019-08-03 stsp if [ "$ret" != "0" ]; then
443 fccbfb98 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
445 fccbfb98 2019-08-03 stsp test_done "$testroot" "$ret"
448 f6cae3ed 2020-09-13 naddy test_stage_status() {
449 c363b2c1 2019-08-03 stsp local testroot=`test_init stage_status`
451 c363b2c1 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
453 c363b2c1 2019-08-03 stsp if [ "$ret" != "0" ]; then
454 c363b2c1 2019-08-03 stsp test_done "$testroot" "$ret"
458 c363b2c1 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
459 c363b2c1 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
460 c363b2c1 2019-08-03 stsp echo "new file" > $testroot/wt/foo
461 c363b2c1 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
462 c363b2c1 2019-08-03 stsp echo "new file" > $testroot/wt/epsilon/new
463 c363b2c1 2019-08-03 stsp (cd $testroot/wt && got add epsilon/new > /dev/null)
464 c363b2c1 2019-08-03 stsp echo "modified file" > $testroot/wt/epsilon/zeta
465 c363b2c1 2019-08-03 stsp (cd $testroot/wt && got rm gamma/delta > /dev/null)
467 c363b2c1 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
468 c363b2c1 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
469 c363b2c1 2019-08-03 stsp echo 'A epsilon/new' >> $testroot/stdout.expected
470 c363b2c1 2019-08-03 stsp echo 'M epsilon/zeta' >> $testroot/stdout.expected
471 c363b2c1 2019-08-03 stsp echo ' A foo' >> $testroot/stdout.expected
472 c363b2c1 2019-08-03 stsp echo 'D gamma/delta' >> $testroot/stdout.expected
473 c363b2c1 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > /dev/null)
475 c363b2c1 2019-08-03 stsp (cd $testroot/wt && got status > $testroot/stdout)
476 c363b2c1 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
478 c363b2c1 2019-08-03 stsp if [ "$ret" != "0" ]; then
479 c363b2c1 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
480 244725f2 2019-08-03 stsp test_done "$testroot" "$ret"
484 244725f2 2019-08-03 stsp echo "modified file again" >> $testroot/wt/alpha
485 244725f2 2019-08-03 stsp echo "modified added file again" >> $testroot/wt/foo
487 244725f2 2019-08-03 stsp echo 'MM alpha' > $testroot/stdout.expected
488 244725f2 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
489 244725f2 2019-08-03 stsp echo 'A epsilon/new' >> $testroot/stdout.expected
490 244725f2 2019-08-03 stsp echo 'M epsilon/zeta' >> $testroot/stdout.expected
491 244725f2 2019-08-03 stsp echo 'MA foo' >> $testroot/stdout.expected
492 244725f2 2019-08-03 stsp echo 'D gamma/delta' >> $testroot/stdout.expected
494 244725f2 2019-08-03 stsp (cd $testroot/wt && got status > $testroot/stdout)
495 244725f2 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
497 244725f2 2019-08-03 stsp if [ "$ret" != "0" ]; then
498 244725f2 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
499 244725f2 2019-08-03 stsp test_done "$testroot" "$ret"
503 244725f2 2019-08-03 stsp # test no-op change of added file with new stat(2) timestamp
504 244725f2 2019-08-03 stsp echo "new file" > $testroot/wt/foo
505 244725f2 2019-08-03 stsp echo ' A foo' > $testroot/stdout.expected
506 244725f2 2019-08-03 stsp (cd $testroot/wt && got status foo > $testroot/stdout)
507 244725f2 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
509 244725f2 2019-08-03 stsp if [ "$ret" != "0" ]; then
510 244725f2 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
511 244725f2 2019-08-03 stsp test_done "$testroot" "$ret"
515 244725f2 2019-08-03 stsp # test staged deleted file which is restored on disk
516 244725f2 2019-08-03 stsp echo "new file" > $testroot/wt/beta
517 244725f2 2019-08-03 stsp echo ' D beta' > $testroot/stdout.expected
518 244725f2 2019-08-03 stsp (cd $testroot/wt && got status beta > $testroot/stdout)
519 244725f2 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
521 244725f2 2019-08-03 stsp if [ "$ret" != "0" ]; then
522 244725f2 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
524 c363b2c1 2019-08-03 stsp test_done "$testroot" "$ret"
528 f6cae3ed 2020-09-13 naddy test_stage_add_already_staged_file() {
529 1e1446d3 2019-08-03 stsp local testroot=`test_init stage_add_already_staged_file`
531 1e1446d3 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
533 1e1446d3 2019-08-03 stsp if [ "$ret" != "0" ]; then
534 1e1446d3 2019-08-03 stsp test_done "$testroot" "$ret"
538 1e1446d3 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
539 1e1446d3 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
540 1e1446d3 2019-08-03 stsp echo "new file" > $testroot/wt/foo
541 1e1446d3 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
543 1e1446d3 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > $testroot/stdout)
545 1e1446d3 2019-08-03 stsp echo -n > $testroot/stdout.expected
546 6d022e97 2019-08-04 stsp for f in alpha beta foo; do
547 1e1446d3 2019-08-03 stsp (cd $testroot/wt && got add $f \
548 1e1446d3 2019-08-03 stsp > $testroot/stdout 2> $testroot/stderr)
549 6d022e97 2019-08-04 stsp echo "got: $f: file has unexpected status" \
550 6d022e97 2019-08-04 stsp > $testroot/stderr.expected
551 6d022e97 2019-08-04 stsp cmp -s $testroot/stderr.expected $testroot/stderr
553 1e1446d3 2019-08-03 stsp if [ "$ret" != "0" ]; then
554 6d022e97 2019-08-04 stsp diff -u $testroot/stderr.expected $testroot/stderr
555 6d022e97 2019-08-04 stsp test_done "$testroot" "$ret"
558 1e1446d3 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
560 1e1446d3 2019-08-03 stsp if [ "$ret" != "0" ]; then
561 1e1446d3 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
562 1e1446d3 2019-08-03 stsp test_done "$testroot" "$ret"
567 1e1446d3 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
568 1e1446d3 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
569 1e1446d3 2019-08-03 stsp echo ' A foo' >> $testroot/stdout.expected
571 1e1446d3 2019-08-03 stsp (cd $testroot/wt && got status > $testroot/stdout)
572 1e1446d3 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
574 1e1446d3 2019-08-03 stsp if [ "$ret" != "0" ]; then
575 1e1446d3 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
577 1e1446d3 2019-08-03 stsp test_done "$testroot" "$ret"
580 f6cae3ed 2020-09-13 naddy test_stage_rm_already_staged_file() {
581 9acbc4fa 2019-08-03 stsp local testroot=`test_init stage_rm_already_staged_file`
583 9acbc4fa 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
585 9acbc4fa 2019-08-03 stsp if [ "$ret" != "0" ]; then
586 9acbc4fa 2019-08-03 stsp test_done "$testroot" "$ret"
590 9acbc4fa 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
591 9acbc4fa 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
592 9acbc4fa 2019-08-03 stsp echo "new file" > $testroot/wt/foo
593 9acbc4fa 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
595 9acbc4fa 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > $testroot/stdout)
597 9acbc4fa 2019-08-03 stsp (cd $testroot/wt && got rm beta \
598 9acbc4fa 2019-08-03 stsp > $testroot/stdout 2> $testroot/stderr)
600 6d022e97 2019-08-04 stsp if [ "$ret" != "0" ]; then
601 6d022e97 2019-08-04 stsp echo "got rm command failed unexpectedly" >&2
602 9acbc4fa 2019-08-03 stsp test_done "$testroot" "1"
605 6d022e97 2019-08-04 stsp echo -n > $testroot/stdout.expected
606 6d022e97 2019-08-04 stsp cmp -s $testroot/stdout.expected $testroot/stdout
608 6d022e97 2019-08-04 stsp if [ "$ret" != "0" ]; then
609 6d022e97 2019-08-04 stsp diff -u $testroot/stdout.expected $testroot/stdout
610 6d022e97 2019-08-04 stsp test_done "$testroot" "$ret"
613 6d022e97 2019-08-04 stsp echo -n > $testroot/stderr.expected
614 9acbc4fa 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
616 9acbc4fa 2019-08-03 stsp if [ "$ret" != "0" ]; then
617 9acbc4fa 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
618 9acbc4fa 2019-08-03 stsp test_done "$testroot" "$ret"
622 9acbc4fa 2019-08-03 stsp for f in alpha foo; do
623 24278f30 2019-08-03 stsp echo "got: $f: file is staged" > $testroot/stderr.expected
624 9acbc4fa 2019-08-03 stsp (cd $testroot/wt && got rm $f \
625 9acbc4fa 2019-08-03 stsp > $testroot/stdout 2> $testroot/stderr)
627 54c39596 2020-12-28 stsp if [ "$ret" = "0" ]; then
628 9acbc4fa 2019-08-03 stsp echo "got rm command succeeded unexpectedly" >&2
629 9acbc4fa 2019-08-03 stsp test_done "$testroot" "1"
632 9acbc4fa 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
634 9acbc4fa 2019-08-03 stsp if [ "$ret" != "0" ]; then
635 9acbc4fa 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
636 9acbc4fa 2019-08-03 stsp test_done "$testroot" "$ret"
641 9acbc4fa 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
642 9acbc4fa 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
643 9acbc4fa 2019-08-03 stsp echo ' A foo' >> $testroot/stdout.expected
645 9acbc4fa 2019-08-03 stsp (cd $testroot/wt && got status > $testroot/stdout)
646 9acbc4fa 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
648 9acbc4fa 2019-08-03 stsp if [ "$ret" != "0" ]; then
649 9acbc4fa 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
651 9acbc4fa 2019-08-03 stsp test_done "$testroot" "$ret"
654 f6cae3ed 2020-09-13 naddy test_stage_revert() {
655 24278f30 2019-08-03 stsp local testroot=`test_init stage_revert`
657 24278f30 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
659 24278f30 2019-08-03 stsp if [ "$ret" != "0" ]; then
660 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
664 24278f30 2019-08-03 stsp echo "modified alpha" > $testroot/wt/alpha
665 24278f30 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
666 24278f30 2019-08-03 stsp echo "new file" > $testroot/wt/foo
667 24278f30 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
668 24278f30 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > /dev/null)
670 24278f30 2019-08-03 stsp echo "modified file again" >> $testroot/wt/alpha
671 24278f30 2019-08-03 stsp echo "modified added file again" >> $testroot/wt/foo
673 24278f30 2019-08-03 stsp (cd $testroot/wt && got revert alpha > $testroot/stdout)
675 24278f30 2019-08-03 stsp if [ "$ret" != "0" ]; then
676 24278f30 2019-08-03 stsp echo "revert command failed unexpectedly" >&2
677 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
681 24278f30 2019-08-03 stsp echo "R alpha" > $testroot/stdout.expected
682 24278f30 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
684 24278f30 2019-08-03 stsp if [ "$ret" != "0" ]; then
685 24278f30 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
686 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
690 24278f30 2019-08-03 stsp echo "modified alpha" > $testroot/content.expected
691 24278f30 2019-08-03 stsp cat $testroot/wt/alpha > $testroot/content
692 24278f30 2019-08-03 stsp cmp -s $testroot/content.expected $testroot/content
694 24278f30 2019-08-03 stsp if [ "$ret" != "0" ]; then
695 24278f30 2019-08-03 stsp diff -u $testroot/content.expected $testroot/content
696 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
700 24278f30 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
701 24278f30 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
702 24278f30 2019-08-03 stsp echo 'MA foo' >> $testroot/stdout.expected
703 24278f30 2019-08-03 stsp (cd $testroot/wt && got status > $testroot/stdout)
704 24278f30 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
706 24278f30 2019-08-03 stsp if [ "$ret" != "0" ]; then
707 24278f30 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
708 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
712 24278f30 2019-08-03 stsp (cd $testroot/wt && got revert alpha > $testroot/stdout)
714 24278f30 2019-08-03 stsp if [ "$ret" != "0" ]; then
715 24278f30 2019-08-03 stsp echo "revert command failed unexpectedly" >&2
716 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
720 24278f30 2019-08-03 stsp echo -n > $testroot/stdout.expected
721 24278f30 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
723 24278f30 2019-08-03 stsp if [ "$ret" != "0" ]; then
724 24278f30 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
725 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
729 24278f30 2019-08-03 stsp echo "modified alpha" > $testroot/content.expected
730 24278f30 2019-08-03 stsp cat $testroot/wt/alpha > $testroot/content
731 24278f30 2019-08-03 stsp cmp -s $testroot/content.expected $testroot/content
733 24278f30 2019-08-03 stsp if [ "$ret" != "0" ]; then
734 24278f30 2019-08-03 stsp diff -u $testroot/content.expected $testroot/content
735 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
739 24278f30 2019-08-03 stsp (cd $testroot/wt && got revert beta > $testroot/stdout \
740 24278f30 2019-08-03 stsp 2> $testroot/stderr)
742 d3bcc3d1 2019-08-08 stsp if [ "$ret" != "0" ]; then
743 d3bcc3d1 2019-08-08 stsp echo "revert command failed unexpectedly" >&2
744 d3bcc3d1 2019-08-08 stsp test_done "$testroot" "$ret"
748 d3bcc3d1 2019-08-08 stsp echo -n > $testroot/stdout.expected
749 d3bcc3d1 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
751 d3bcc3d1 2019-08-08 stsp if [ "$ret" != "0" ]; then
752 d3bcc3d1 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
753 d3bcc3d1 2019-08-08 stsp test_done "$testroot" "$ret"
757 d3bcc3d1 2019-08-08 stsp echo -n > $testroot/stderr.expected
758 24278f30 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
760 24278f30 2019-08-03 stsp if [ "$ret" != "0" ]; then
761 24278f30 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
762 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
766 24278f30 2019-08-03 stsp (cd $testroot/wt && got revert foo > $testroot/stdout)
768 24278f30 2019-08-03 stsp if [ "$ret" != "0" ]; then
769 24278f30 2019-08-03 stsp echo "revert command failed unexpectedly" >&2
770 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
774 24278f30 2019-08-03 stsp echo "R foo" > $testroot/stdout.expected
775 24278f30 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
777 24278f30 2019-08-03 stsp if [ "$ret" != "0" ]; then
778 24278f30 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
779 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
783 24278f30 2019-08-03 stsp echo "new file" > $testroot/content.expected
784 24278f30 2019-08-03 stsp cat $testroot/wt/foo > $testroot/content
785 24278f30 2019-08-03 stsp cmp -s $testroot/content.expected $testroot/content
787 24278f30 2019-08-03 stsp if [ "$ret" != "0" ]; then
788 24278f30 2019-08-03 stsp diff -u $testroot/content.expected $testroot/content
789 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
793 24278f30 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
794 24278f30 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
795 24278f30 2019-08-03 stsp echo ' A foo' >> $testroot/stdout.expected
796 24278f30 2019-08-03 stsp (cd $testroot/wt && got status > $testroot/stdout)
797 24278f30 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
799 24278f30 2019-08-03 stsp if [ "$ret" != "0" ]; then
800 24278f30 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
801 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
805 24278f30 2019-08-03 stsp (cd $testroot/wt && got revert foo > $testroot/stdout)
807 24278f30 2019-08-03 stsp if [ "$ret" != "0" ]; then
808 24278f30 2019-08-03 stsp echo "revert command failed unexpectedly" >&2
809 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
813 24278f30 2019-08-03 stsp echo -n > $testroot/stdout.expected
814 24278f30 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
816 24278f30 2019-08-03 stsp if [ "$ret" != "0" ]; then
817 24278f30 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
818 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
822 24278f30 2019-08-03 stsp echo "new file" > $testroot/content.expected
823 24278f30 2019-08-03 stsp cat $testroot/wt/foo > $testroot/content
824 24278f30 2019-08-03 stsp cmp -s $testroot/content.expected $testroot/content
826 24278f30 2019-08-03 stsp if [ "$ret" != "0" ]; then
827 24278f30 2019-08-03 stsp diff -u $testroot/content.expected $testroot/content
828 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
832 24278f30 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
833 24278f30 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
834 24278f30 2019-08-03 stsp echo ' A foo' >> $testroot/stdout.expected
835 0f6d7415 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
836 0f6d7415 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
838 0f6d7415 2019-08-08 stsp if [ "$ret" != "0" ]; then
839 0f6d7415 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
840 0f6d7415 2019-08-08 stsp test_done "$testroot" "$ret"
844 0f6d7415 2019-08-08 stsp echo "modified file again" >> $testroot/wt/alpha
845 0f6d7415 2019-08-08 stsp echo "modified added file again" >> $testroot/wt/foo
847 0f6d7415 2019-08-08 stsp (cd $testroot/wt && got revert -R . > $testroot/stdout \
848 0f6d7415 2019-08-08 stsp 2> $testroot/stderr)
850 d3bcc3d1 2019-08-08 stsp if [ "$ret" != "0" ]; then
851 d3bcc3d1 2019-08-08 stsp echo "revert command failed unexpectedly" >&2
852 0f6d7415 2019-08-08 stsp test_done "$testroot" "$ret"
856 0f6d7415 2019-08-08 stsp echo "R alpha" > $testroot/stdout.expected
857 d3bcc3d1 2019-08-08 stsp echo "R foo" >> $testroot/stdout.expected
858 0f6d7415 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
860 0f6d7415 2019-08-08 stsp if [ "$ret" != "0" ]; then
861 0f6d7415 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
862 0f6d7415 2019-08-08 stsp test_done "$testroot" "$ret"
866 d3bcc3d1 2019-08-08 stsp echo -n > $testroot/stderr.expected
867 0f6d7415 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
869 0f6d7415 2019-08-08 stsp if [ "$ret" != "0" ]; then
870 0f6d7415 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
871 0f6d7415 2019-08-08 stsp test_done "$testroot" "$ret"
875 0f6d7415 2019-08-08 stsp echo ' M alpha' > $testroot/stdout.expected
876 0f6d7415 2019-08-08 stsp echo ' D beta' >> $testroot/stdout.expected
877 d3bcc3d1 2019-08-08 stsp echo ' A foo' >> $testroot/stdout.expected
878 24278f30 2019-08-03 stsp (cd $testroot/wt && got status > $testroot/stdout)
879 408b4ebc 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
881 408b4ebc 2019-08-03 stsp if [ "$ret" != "0" ]; then
882 408b4ebc 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
884 408b4ebc 2019-08-03 stsp test_done "$testroot" "$ret"
887 f6cae3ed 2020-09-13 naddy test_stage_diff() {
888 408b4ebc 2019-08-03 stsp local testroot=`test_init stage_diff`
889 408b4ebc 2019-08-03 stsp local head_commit=`git_show_head $testroot/repo`
891 408b4ebc 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
893 408b4ebc 2019-08-03 stsp if [ "$ret" != "0" ]; then
894 408b4ebc 2019-08-03 stsp test_done "$testroot" "$ret"
898 408b4ebc 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
899 408b4ebc 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
900 408b4ebc 2019-08-03 stsp echo "new file" > $testroot/wt/foo
901 408b4ebc 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
903 98eaaa12 2019-08-03 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
904 98eaaa12 2019-08-03 stsp echo -n > $testroot/stdout.expected
905 98eaaa12 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
907 98eaaa12 2019-08-03 stsp if [ "$ret" != "0" ]; then
908 98eaaa12 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
909 98eaaa12 2019-08-03 stsp test_done "$testroot" "$ret"
913 408b4ebc 2019-08-03 stsp echo ' M alpha' > $testroot/stdout.expected
914 408b4ebc 2019-08-03 stsp echo ' D beta' >> $testroot/stdout.expected
915 408b4ebc 2019-08-03 stsp echo ' A foo' >> $testroot/stdout.expected
916 408b4ebc 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > /dev/null)
918 408b4ebc 2019-08-03 stsp (cd $testroot/wt && got diff > $testroot/stdout)
919 408b4ebc 2019-08-03 stsp echo -n > $testroot/stdout.expected
920 408b4ebc 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
922 408b4ebc 2019-08-03 stsp if [ "$ret" != "0" ]; then
923 408b4ebc 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
924 408b4ebc 2019-08-03 stsp test_done "$testroot" "$ret"
928 408b4ebc 2019-08-03 stsp echo "modified file again" > $testroot/wt/alpha
929 408b4ebc 2019-08-03 stsp echo "new file changed" > $testroot/wt/foo
931 408b4ebc 2019-08-03 stsp (cd $testroot/wt && got diff > $testroot/stdout)
933 408b4ebc 2019-08-03 stsp echo "diff $head_commit $testroot/wt" > $testroot/stdout.expected
934 408b4ebc 2019-08-03 stsp echo -n 'blob - ' >> $testroot/stdout.expected
935 4ce46740 2019-08-08 stsp (cd $testroot/wt && got stage -l alpha) | cut -d' ' -f 1 | tr -d '\n' \
936 408b4ebc 2019-08-03 stsp >> $testroot/stdout.expected
937 4ce46740 2019-08-08 stsp echo ' (staged)' >> $testroot/stdout.expected
938 408b4ebc 2019-08-03 stsp echo 'file + alpha' >> $testroot/stdout.expected
939 408b4ebc 2019-08-03 stsp echo '--- alpha' >> $testroot/stdout.expected
940 408b4ebc 2019-08-03 stsp echo '+++ alpha' >> $testroot/stdout.expected
941 408b4ebc 2019-08-03 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
942 408b4ebc 2019-08-03 stsp echo '-modified file' >> $testroot/stdout.expected
943 408b4ebc 2019-08-03 stsp echo '+modified file again' >> $testroot/stdout.expected
944 408b4ebc 2019-08-03 stsp echo -n 'blob - ' >> $testroot/stdout.expected
945 4ce46740 2019-08-08 stsp (cd $testroot/wt && got stage -l foo) | cut -d' ' -f 1 | tr -d '\n' \
946 408b4ebc 2019-08-03 stsp >> $testroot/stdout.expected
947 4ce46740 2019-08-08 stsp echo " (staged)" >> $testroot/stdout.expected
948 408b4ebc 2019-08-03 stsp echo 'file + foo' >> $testroot/stdout.expected
949 408b4ebc 2019-08-03 stsp echo '--- foo' >> $testroot/stdout.expected
950 408b4ebc 2019-08-03 stsp echo '+++ foo' >> $testroot/stdout.expected
951 408b4ebc 2019-08-03 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
952 408b4ebc 2019-08-03 stsp echo '-new file' >> $testroot/stdout.expected
953 408b4ebc 2019-08-03 stsp echo '+new file changed' >> $testroot/stdout.expected
955 98eaaa12 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
957 98eaaa12 2019-08-03 stsp if [ "$ret" != "0" ]; then
958 98eaaa12 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
959 98eaaa12 2019-08-03 stsp test_done "$testroot" "$ret"
963 98eaaa12 2019-08-03 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
965 98eaaa12 2019-08-03 stsp echo "diff $head_commit $testroot/wt (staged changes)" \
966 98eaaa12 2019-08-03 stsp > $testroot/stdout.expected
967 98eaaa12 2019-08-03 stsp echo -n 'blob - ' >> $testroot/stdout.expected
968 98eaaa12 2019-08-03 stsp got tree -r $testroot/repo -i | grep 'alpha$' | cut -d' ' -f 1 \
969 98eaaa12 2019-08-03 stsp >> $testroot/stdout.expected
970 98eaaa12 2019-08-03 stsp echo -n 'blob + ' >> $testroot/stdout.expected
971 98eaaa12 2019-08-03 stsp (cd $testroot/wt && got stage -l alpha) | cut -d' ' -f 1 \
972 98eaaa12 2019-08-03 stsp >> $testroot/stdout.expected
973 98eaaa12 2019-08-03 stsp echo '--- alpha' >> $testroot/stdout.expected
974 98eaaa12 2019-08-03 stsp echo '+++ alpha' >> $testroot/stdout.expected
975 98eaaa12 2019-08-03 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
976 98eaaa12 2019-08-03 stsp echo '-alpha' >> $testroot/stdout.expected
977 98eaaa12 2019-08-03 stsp echo '+modified file' >> $testroot/stdout.expected
978 98eaaa12 2019-08-03 stsp echo -n 'blob - ' >> $testroot/stdout.expected
979 98eaaa12 2019-08-03 stsp got tree -r $testroot/repo -i | grep 'beta$' | cut -d' ' -f 1 \
980 98eaaa12 2019-08-03 stsp >> $testroot/stdout.expected
981 98eaaa12 2019-08-03 stsp echo 'blob + /dev/null' >> $testroot/stdout.expected
982 98eaaa12 2019-08-03 stsp echo '--- beta' >> $testroot/stdout.expected
983 98eaaa12 2019-08-03 stsp echo '+++ /dev/null' >> $testroot/stdout.expected
984 98eaaa12 2019-08-03 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
985 98eaaa12 2019-08-03 stsp echo '-beta' >> $testroot/stdout.expected
986 98eaaa12 2019-08-03 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
987 98eaaa12 2019-08-03 stsp echo -n 'blob + ' >> $testroot/stdout.expected
988 98eaaa12 2019-08-03 stsp (cd $testroot/wt && got stage -l foo) | cut -d' ' -f 1 \
989 98eaaa12 2019-08-03 stsp >> $testroot/stdout.expected
990 98eaaa12 2019-08-03 stsp echo '--- /dev/null' >> $testroot/stdout.expected
991 98eaaa12 2019-08-03 stsp echo '+++ foo' >> $testroot/stdout.expected
992 98eaaa12 2019-08-03 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
993 98eaaa12 2019-08-03 stsp echo '+new file' >> $testroot/stdout.expected
995 24278f30 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
997 24278f30 2019-08-03 stsp if [ "$ret" != "0" ]; then
998 24278f30 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1000 24278f30 2019-08-03 stsp test_done "$testroot" "$ret"
1004 f6cae3ed 2020-09-13 naddy test_stage_histedit() {
1005 b9622844 2019-08-03 stsp local testroot=`test_init stage_histedit`
1006 b9622844 2019-08-03 stsp local orig_commit=`git_show_head $testroot/repo`
1008 b9622844 2019-08-03 stsp got checkout -c $orig_commit $testroot/repo $testroot/wt > /dev/null
1010 b9622844 2019-08-03 stsp if [ "$ret" != "0" ]; then
1011 b9622844 2019-08-03 stsp test_done "$testroot" "$ret"
1015 b9622844 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
1016 b9622844 2019-08-03 stsp (cd $testroot/wt && got stage alpha > /dev/null)
1018 b9622844 2019-08-03 stsp echo "modified alpha on master" > $testroot/repo/alpha
1019 b9622844 2019-08-03 stsp (cd $testroot/repo && git rm -q beta)
1020 b9622844 2019-08-03 stsp echo "new file on master" > $testroot/repo/epsilon/new
1021 b9622844 2019-08-03 stsp (cd $testroot/repo && git add epsilon/new)
1022 b9622844 2019-08-03 stsp git_commit $testroot/repo -m "committing changes"
1023 b9622844 2019-08-03 stsp local old_commit1=`git_show_head $testroot/repo`
1025 b9622844 2019-08-03 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1026 b9622844 2019-08-03 stsp git_commit $testroot/repo -m "committing to zeta on master"
1027 b9622844 2019-08-03 stsp local old_commit2=`git_show_head $testroot/repo`
1029 b9622844 2019-08-03 stsp echo "pick $old_commit1" > $testroot/histedit-script
1030 b9622844 2019-08-03 stsp echo "pick $old_commit2" >> $testroot/histedit-script
1032 b9622844 2019-08-03 stsp (cd $testroot/wt && got histedit -F $testroot/histedit-script \
1033 b9622844 2019-08-03 stsp > $testroot/stdout 2> $testroot/stderr)
1035 54c39596 2020-12-28 stsp if [ "$ret" = "0" ]; then
1036 b9622844 2019-08-03 stsp echo "got histedit command succeeded unexpectedly" >&2
1037 b9622844 2019-08-03 stsp test_done "$testroot" "1"
1041 b9622844 2019-08-03 stsp echo -n > $testroot/stdout.expected
1042 b9622844 2019-08-03 stsp echo "got: alpha: file is staged" > $testroot/stderr.expected
1044 b9622844 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1046 b9622844 2019-08-03 stsp if [ "$ret" != "0" ]; then
1047 b9622844 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
1048 b9622844 2019-08-03 stsp test_done "$testroot" "$ret"
1051 b9622844 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1053 b9622844 2019-08-03 stsp if [ "$ret" != "0" ]; then
1054 b9622844 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1056 b9622844 2019-08-03 stsp test_done "$testroot" "$ret"
1060 f6cae3ed 2020-09-13 naddy test_stage_rebase() {
1061 243d7cf1 2019-08-03 stsp local testroot=`test_init stage_rebase`
1063 243d7cf1 2019-08-03 stsp (cd $testroot/repo && git checkout -q -b newbranch)
1064 243d7cf1 2019-08-03 stsp echo "modified delta on branch" > $testroot/repo/gamma/delta
1065 243d7cf1 2019-08-03 stsp git_commit $testroot/repo -m "committing to delta on newbranch"
1067 243d7cf1 2019-08-03 stsp echo "modified alpha on branch" > $testroot/repo/alpha
1068 243d7cf1 2019-08-03 stsp (cd $testroot/repo && git rm -q beta)
1069 243d7cf1 2019-08-03 stsp echo "new file on branch" > $testroot/repo/epsilon/new
1070 243d7cf1 2019-08-03 stsp (cd $testroot/repo && git add epsilon/new)
1071 243d7cf1 2019-08-03 stsp git_commit $testroot/repo -m "committing more changes on newbranch"
1073 243d7cf1 2019-08-03 stsp local orig_commit1=`git_show_parent_commit $testroot/repo`
1074 243d7cf1 2019-08-03 stsp local orig_commit2=`git_show_head $testroot/repo`
1076 243d7cf1 2019-08-03 stsp (cd $testroot/repo && git checkout -q master)
1077 243d7cf1 2019-08-03 stsp echo "modified zeta on master" > $testroot/repo/epsilon/zeta
1078 243d7cf1 2019-08-03 stsp git_commit $testroot/repo -m "committing to zeta on master"
1079 243d7cf1 2019-08-03 stsp local master_commit=`git_show_head $testroot/repo`
1081 243d7cf1 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1083 243d7cf1 2019-08-03 stsp if [ "$ret" != "0" ]; then
1084 243d7cf1 2019-08-03 stsp test_done "$testroot" "$ret"
1088 243d7cf1 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
1089 243d7cf1 2019-08-03 stsp (cd $testroot/wt && got stage alpha > /dev/null)
1091 243d7cf1 2019-08-03 stsp (cd $testroot/wt && got rebase newbranch \
1092 243d7cf1 2019-08-03 stsp > $testroot/stdout 2> $testroot/stderr)
1094 54c39596 2020-12-28 stsp if [ "$ret" = "0" ]; then
1095 243d7cf1 2019-08-03 stsp echo "got rebase command succeeded unexpectedly" >&2
1096 243d7cf1 2019-08-03 stsp test_done "$testroot" "1"
1100 243d7cf1 2019-08-03 stsp echo -n > $testroot/stdout.expected
1101 243d7cf1 2019-08-03 stsp echo "got: alpha: file is staged" > $testroot/stderr.expected
1103 243d7cf1 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1105 243d7cf1 2019-08-03 stsp if [ "$ret" != "0" ]; then
1106 243d7cf1 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
1107 243d7cf1 2019-08-03 stsp test_done "$testroot" "$ret"
1110 243d7cf1 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1112 243d7cf1 2019-08-03 stsp if [ "$ret" != "0" ]; then
1113 243d7cf1 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1115 243d7cf1 2019-08-03 stsp test_done "$testroot" "$ret"
1118 f6cae3ed 2020-09-13 naddy test_stage_update() {
1119 a76c42e6 2019-08-03 stsp local testroot=`test_init stage_update`
1121 a76c42e6 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1123 a76c42e6 2019-08-03 stsp if [ "$ret" != "0" ]; then
1124 a76c42e6 2019-08-03 stsp test_done "$testroot" "$ret"
1128 a76c42e6 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
1129 a76c42e6 2019-08-03 stsp (cd $testroot/wt && got stage alpha > /dev/null)
1131 a76c42e6 2019-08-03 stsp echo "modified alpha" > $testroot/repo/alpha
1132 a76c42e6 2019-08-03 stsp git_commit $testroot/repo -m "modified alpha"
1134 a76c42e6 2019-08-03 stsp (cd $testroot/wt && got update > $testroot/stdout \
1135 a76c42e6 2019-08-03 stsp 2> $testroot/stderr)
1137 54c39596 2020-12-28 stsp if [ "$ret" = "0" ]; then
1138 a76c42e6 2019-08-03 stsp echo "got update command succeeded unexpectedly" >&2
1139 a76c42e6 2019-08-03 stsp test_done "$testroot" "1"
1143 a76c42e6 2019-08-03 stsp echo -n > $testroot/stdout.expected
1144 a76c42e6 2019-08-03 stsp echo "got: alpha: file is staged" > $testroot/stderr.expected
1146 a76c42e6 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1148 a76c42e6 2019-08-03 stsp if [ "$ret" != "0" ]; then
1149 a76c42e6 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
1150 a76c42e6 2019-08-03 stsp test_done "$testroot" "$ret"
1153 a76c42e6 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1155 a76c42e6 2019-08-03 stsp if [ "$ret" != "0" ]; then
1156 a76c42e6 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1158 a76c42e6 2019-08-03 stsp test_done "$testroot" "$ret"
1161 f6cae3ed 2020-09-13 naddy test_stage_commit_non_staged() {
1162 f0b75401 2019-08-03 stsp local testroot=`test_init stage_commit_non_staged`
1164 f0b75401 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1166 f0b75401 2019-08-03 stsp if [ "$ret" != "0" ]; then
1167 f0b75401 2019-08-03 stsp test_done "$testroot" "$ret"
1171 f0b75401 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
1172 f0b75401 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
1173 f0b75401 2019-08-03 stsp echo "new file" > $testroot/wt/foo
1174 f0b75401 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
1175 f0b75401 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > /dev/null)
1177 f0b75401 2019-08-03 stsp echo "modified file" > $testroot/wt/gamma/delta
1178 f0b75401 2019-08-03 stsp (cd $testroot/wt && got commit -m "change delta" gamma/delta \
1179 f0b75401 2019-08-03 stsp > $testroot/stdout 2> $testroot/stderr)
1181 54c39596 2020-12-28 stsp if [ "$ret" = "0" ]; then
1182 f0b75401 2019-08-03 stsp echo "got commit command succeeded unexpectedly" >&2
1183 f0b75401 2019-08-03 stsp test_done "$testroot" "1"
1187 f0b75401 2019-08-03 stsp echo -n > $testroot/stdout.expected
1188 f0b75401 2019-08-03 stsp echo "got: gamma/delta: file is not staged" > $testroot/stderr.expected
1190 f0b75401 2019-08-03 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1192 f0b75401 2019-08-03 stsp if [ "$ret" != "0" ]; then
1193 f0b75401 2019-08-03 stsp diff -u $testroot/stderr.expected $testroot/stderr
1194 5f8a88c6 2019-08-03 stsp test_done "$testroot" "$ret"
1197 5f8a88c6 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1199 5f8a88c6 2019-08-03 stsp if [ "$ret" != "0" ]; then
1200 5f8a88c6 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1202 5f8a88c6 2019-08-03 stsp test_done "$testroot" "$ret"
1205 f6cae3ed 2020-09-13 naddy test_stage_commit_out_of_date() {
1206 0f1cfa7f 2019-08-08 stsp local testroot=`test_init stage_commit_out_of_date`
1208 0f1cfa7f 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1210 0f1cfa7f 2019-08-08 stsp if [ "$ret" != "0" ]; then
1211 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1215 0f1cfa7f 2019-08-08 stsp echo "modified file" > $testroot/wt/alpha
1216 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got rm beta > /dev/null)
1217 0f1cfa7f 2019-08-08 stsp echo "new file" > $testroot/wt/foo
1218 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got add foo > /dev/null)
1219 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got stage alpha beta foo > /dev/null)
1221 0f1cfa7f 2019-08-08 stsp echo "changed file" > $testroot/repo/alpha
1222 0f1cfa7f 2019-08-08 stsp git_commit $testroot/repo -m "changed alpha in repo"
1224 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got commit -m "try to commit" > $testroot/stdout \
1225 0f1cfa7f 2019-08-08 stsp 2> $testroot/stderr)
1227 54c39596 2020-12-28 stsp if [ "$ret" = "0" ]; then
1228 0f1cfa7f 2019-08-08 stsp echo "got commit command succeeded unexpectedly" >&2
1229 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "1"
1233 0f1cfa7f 2019-08-08 stsp echo -n > $testroot/stdout.expected
1234 0f1cfa7f 2019-08-08 stsp echo -n "got: work tree must be updated before these changes " \
1235 0f1cfa7f 2019-08-08 stsp > $testroot/stderr.expected
1236 0f1cfa7f 2019-08-08 stsp echo "can be committed" >> $testroot/stderr.expected
1238 0f1cfa7f 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1240 0f1cfa7f 2019-08-08 stsp if [ "$ret" != "0" ]; then
1241 0f1cfa7f 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
1242 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1245 0f1cfa7f 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1247 0f1cfa7f 2019-08-08 stsp if [ "$ret" != "0" ]; then
1248 0f1cfa7f 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1249 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1253 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got update > $testroot/stdout \
1254 0f1cfa7f 2019-08-08 stsp 2> $testroot/stderr)
1255 0f1cfa7f 2019-08-08 stsp echo -n > $testroot/stdout.expected
1256 0f1cfa7f 2019-08-08 stsp echo "got: alpha: file is staged" > $testroot/stderr.expected
1258 0f1cfa7f 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1260 0f1cfa7f 2019-08-08 stsp if [ "$ret" != "0" ]; then
1261 0f1cfa7f 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
1262 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1265 0f1cfa7f 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1267 0f1cfa7f 2019-08-08 stsp if [ "$ret" != "0" ]; then
1268 0f1cfa7f 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1269 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1273 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got unstage > /dev/null)
1274 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got update > $testroot/stdout)
1276 0f1cfa7f 2019-08-08 stsp if [ "$ret" != "0" ]; then
1277 0f1cfa7f 2019-08-08 stsp echo "got update command failed unexpectedly" >&2
1278 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1282 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
1283 0f1cfa7f 2019-08-08 stsp echo "C alpha" > $testroot/stdout.expected
1284 0f1cfa7f 2019-08-08 stsp echo "D beta" >> $testroot/stdout.expected
1285 0f1cfa7f 2019-08-08 stsp echo "A foo" >> $testroot/stdout.expected
1286 0f1cfa7f 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1288 0f1cfa7f 2019-08-08 stsp if [ "$ret" != "0" ]; then
1289 0f1cfa7f 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1290 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1294 0f1cfa7f 2019-08-08 stsp # resolve conflict
1295 0f1cfa7f 2019-08-08 stsp echo "resolved file" > $testroot/wt/alpha
1297 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got stage > /dev/null)
1299 0f1cfa7f 2019-08-08 stsp (cd $testroot/wt && got commit -m "try again" > $testroot/stdout)
1301 0f1cfa7f 2019-08-08 stsp if [ "$ret" != "0" ]; then
1302 0f1cfa7f 2019-08-08 stsp echo "got commit command failed unexpectedly" >&2
1303 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1307 0f1cfa7f 2019-08-08 stsp local commit_id=`git_show_head $testroot/repo`
1308 0f1cfa7f 2019-08-08 stsp echo "A foo" > $testroot/stdout.expected
1309 0f1cfa7f 2019-08-08 stsp echo "M alpha" >> $testroot/stdout.expected
1310 0f1cfa7f 2019-08-08 stsp echo "D beta" >> $testroot/stdout.expected
1311 0f1cfa7f 2019-08-08 stsp echo "Created commit $commit_id" >> $testroot/stdout.expected
1312 0f1cfa7f 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1314 0f1cfa7f 2019-08-08 stsp if [ "$ret" != "0" ]; then
1315 0f1cfa7f 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1317 0f1cfa7f 2019-08-08 stsp test_done "$testroot" "$ret"
1321 f6cae3ed 2020-09-13 naddy test_stage_commit() {
1322 5f8a88c6 2019-08-03 stsp local testroot=`test_init stage_commit`
1323 5f8a88c6 2019-08-03 stsp local first_commit=`git_show_head $testroot/repo`
1325 5f8a88c6 2019-08-03 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1327 5f8a88c6 2019-08-03 stsp if [ "$ret" != "0" ]; then
1328 5f8a88c6 2019-08-03 stsp test_done "$testroot" "$ret"
1332 5f8a88c6 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
1333 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got rm beta > /dev/null)
1334 5f8a88c6 2019-08-03 stsp echo "new file" > $testroot/wt/foo
1335 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got add foo > /dev/null)
1336 5f8a88c6 2019-08-03 stsp echo "modified file" > $testroot/wt/alpha
1337 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got stage alpha beta foo > /dev/null)
1339 5f8a88c6 2019-08-03 stsp echo "modified file again" > $testroot/wt/alpha
1340 5f8a88c6 2019-08-03 stsp echo "new file changed" > $testroot/wt/foo
1341 5f8a88c6 2019-08-03 stsp echo "non-staged change" > $testroot/wt/gamma/delta
1342 5f8a88c6 2019-08-03 stsp echo "non-staged new file" > $testroot/wt/epsilon/new
1343 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got add epsilon/new > /dev/null)
1344 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got rm epsilon/zeta > /dev/null)
1346 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got stage -l alpha) | cut -d' ' -f 1 \
1347 5f8a88c6 2019-08-03 stsp > $testroot/blob_id_alpha
1348 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got stage -l foo) | cut -d' ' -f 1 \
1349 5f8a88c6 2019-08-03 stsp > $testroot/blob_id_foo
1351 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got commit -m "staged changes" \
1352 5f8a88c6 2019-08-03 stsp > $testroot/stdout)
1354 5f8a88c6 2019-08-03 stsp if [ "$ret" != "0" ]; then
1355 5f8a88c6 2019-08-03 stsp echo "got commit command failed unexpectedly" >&2
1356 5f8a88c6 2019-08-03 stsp test_done "$testroot" "1"
1360 5f8a88c6 2019-08-03 stsp local head_commit=`git_show_head $testroot/repo`
1361 5f8a88c6 2019-08-03 stsp echo "A foo" > $testroot/stdout.expected
1362 5f8a88c6 2019-08-03 stsp echo "M alpha" >> $testroot/stdout.expected
1363 5f8a88c6 2019-08-03 stsp echo "D beta" >> $testroot/stdout.expected
1364 5f8a88c6 2019-08-03 stsp echo "Created commit $head_commit" >> $testroot/stdout.expected
1366 5f8a88c6 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1368 5f8a88c6 2019-08-03 stsp if [ "$ret" != "0" ]; then
1369 5f8a88c6 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1370 f0b75401 2019-08-03 stsp test_done "$testroot" "$ret"
1374 5f8a88c6 2019-08-03 stsp got diff -r $testroot/repo $first_commit $head_commit \
1375 5f8a88c6 2019-08-03 stsp > $testroot/stdout
1377 5f8a88c6 2019-08-03 stsp echo "diff $first_commit $head_commit" \
1378 5f8a88c6 2019-08-03 stsp > $testroot/stdout.expected
1379 5f8a88c6 2019-08-03 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1380 5f8a88c6 2019-08-03 stsp got tree -r $testroot/repo -i -c $first_commit | \
1381 5f8a88c6 2019-08-03 stsp grep 'alpha$' | cut -d' ' -f 1 \
1382 5f8a88c6 2019-08-03 stsp >> $testroot/stdout.expected
1383 5f8a88c6 2019-08-03 stsp echo -n 'blob + ' >> $testroot/stdout.expected
1384 5f8a88c6 2019-08-03 stsp cat $testroot/blob_id_alpha >> $testroot/stdout.expected
1385 5f8a88c6 2019-08-03 stsp echo '--- alpha' >> $testroot/stdout.expected
1386 5f8a88c6 2019-08-03 stsp echo '+++ alpha' >> $testroot/stdout.expected
1387 5f8a88c6 2019-08-03 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
1388 5f8a88c6 2019-08-03 stsp echo '-alpha' >> $testroot/stdout.expected
1389 5f8a88c6 2019-08-03 stsp echo '+modified file' >> $testroot/stdout.expected
1390 5f8a88c6 2019-08-03 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1391 5f8a88c6 2019-08-03 stsp got tree -r $testroot/repo -i -c $first_commit \
1392 46f68b20 2019-10-19 stsp | grep 'beta$' | cut -d' ' -f 1 | tr -d '\n' \
1393 5f8a88c6 2019-08-03 stsp >> $testroot/stdout.expected
1394 46f68b20 2019-10-19 stsp echo " (mode 644)" >> $testroot/stdout.expected
1395 5f8a88c6 2019-08-03 stsp echo 'blob + /dev/null' >> $testroot/stdout.expected
1396 5f8a88c6 2019-08-03 stsp echo '--- beta' >> $testroot/stdout.expected
1397 5f8a88c6 2019-08-03 stsp echo '+++ /dev/null' >> $testroot/stdout.expected
1398 5f8a88c6 2019-08-03 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
1399 5f8a88c6 2019-08-03 stsp echo '-beta' >> $testroot/stdout.expected
1400 5f8a88c6 2019-08-03 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
1401 5f8a88c6 2019-08-03 stsp echo -n 'blob + ' >> $testroot/stdout.expected
1402 46f68b20 2019-10-19 stsp cat $testroot/blob_id_foo | tr -d '\n' >> $testroot/stdout.expected
1403 46f68b20 2019-10-19 stsp echo " (mode 644)" >> $testroot/stdout.expected
1404 5f8a88c6 2019-08-03 stsp echo '--- /dev/null' >> $testroot/stdout.expected
1405 5f8a88c6 2019-08-03 stsp echo '+++ foo' >> $testroot/stdout.expected
1406 5f8a88c6 2019-08-03 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
1407 5f8a88c6 2019-08-03 stsp echo '+new file' >> $testroot/stdout.expected
1409 f0b75401 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1411 f0b75401 2019-08-03 stsp if [ "$ret" != "0" ]; then
1412 f0b75401 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1413 5f8a88c6 2019-08-03 stsp test_done "$testroot" "$ret"
1417 72fd46fa 2019-09-06 stsp echo 'M alpha' > $testroot/stdout.expected
1418 72fd46fa 2019-09-06 stsp echo 'A epsilon/new' >> $testroot/stdout.expected
1419 5f8a88c6 2019-08-03 stsp echo 'D epsilon/zeta' >> $testroot/stdout.expected
1420 72fd46fa 2019-09-06 stsp echo 'M foo' >> $testroot/stdout.expected
1421 5f8a88c6 2019-08-03 stsp echo 'M gamma/delta' >> $testroot/stdout.expected
1423 5f8a88c6 2019-08-03 stsp (cd $testroot/wt && got status > $testroot/stdout)
1424 5f8a88c6 2019-08-03 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1426 5f8a88c6 2019-08-03 stsp if [ "$ret" != "0" ]; then
1427 5f8a88c6 2019-08-03 stsp diff -u $testroot/stdout.expected $testroot/stdout
1429 f0b75401 2019-08-03 stsp test_done "$testroot" "$ret"
1432 f6cae3ed 2020-09-13 naddy test_stage_patch() {
1433 dc424a06 2019-08-07 stsp local testroot=`test_init stage_patch`
1435 dc424a06 2019-08-07 stsp jot 16 > $testroot/repo/numbers
1436 dc424a06 2019-08-07 stsp (cd $testroot/repo && git add numbers)
1437 dc424a06 2019-08-07 stsp git_commit $testroot/repo -m "added numbers file"
1438 dc424a06 2019-08-07 stsp local commit_id=`git_show_head $testroot/repo`
1440 dc424a06 2019-08-07 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1442 dc424a06 2019-08-07 stsp if [ "$ret" != "0" ]; then
1443 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1447 c206b220 2021-10-09 thomas sed -i '' -e 's/^2$/a/' $testroot/wt/numbers
1448 c206b220 2021-10-09 thomas sed -i '' -e 's/^7$/b/' $testroot/wt/numbers
1449 c206b220 2021-10-09 thomas sed -i '' -e 's/^16$/c/' $testroot/wt/numbers
1451 dc424a06 2019-08-07 stsp # don't stage any hunks
1452 dc424a06 2019-08-07 stsp printf "n\nn\nn\n" > $testroot/patchscript
1453 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1454 7b5dc508 2019-10-28 stsp numbers > $testroot/stdout 2> $testroot/stderr)
1456 54c39596 2020-12-28 stsp if [ "$ret" = "0" ]; then
1457 7b5dc508 2019-10-28 stsp echo "got stage command succeeded unexpectedly" >&2
1458 dc424a06 2019-08-07 stsp test_done "$testroot" "1"
1461 dc424a06 2019-08-07 stsp cat > $testroot/stdout.expected <<EOF
1462 dc424a06 2019-08-07 stsp -----------------------------------------------
1463 dc424a06 2019-08-07 stsp @@ -1,5 +1,5 @@
1470 dc424a06 2019-08-07 stsp -----------------------------------------------
1471 a7c9878d 2019-08-08 stsp M numbers (change 1 of 3)
1472 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1473 dc424a06 2019-08-07 stsp -----------------------------------------------
1474 dc424a06 2019-08-07 stsp @@ -4,7 +4,7 @@
1483 dc424a06 2019-08-07 stsp -----------------------------------------------
1484 a7c9878d 2019-08-08 stsp M numbers (change 2 of 3)
1485 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1486 dc424a06 2019-08-07 stsp -----------------------------------------------
1487 dc424a06 2019-08-07 stsp @@ -13,4 +13,4 @@
1493 dc424a06 2019-08-07 stsp -----------------------------------------------
1494 a7c9878d 2019-08-08 stsp M numbers (change 3 of 3)
1495 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1497 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1499 dc424a06 2019-08-07 stsp if [ "$ret" != "0" ]; then
1500 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1501 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1505 7b5dc508 2019-10-28 stsp echo "got: no changes to stage" > $testroot/stderr.expected
1506 7b5dc508 2019-10-28 stsp cmp -s $testroot/stderr.expected $testroot/stderr
1508 7b5dc508 2019-10-28 stsp if [ "$ret" != "0" ]; then
1509 7b5dc508 2019-10-28 stsp diff -u $testroot/stderr.expected $testroot/stderr
1510 7b5dc508 2019-10-28 stsp test_done "$testroot" "$ret"
1515 dc424a06 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
1516 dc424a06 2019-08-07 stsp echo "M numbers" > $testroot/stdout.expected
1517 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1519 dc424a06 2019-08-07 stsp if [ "$ret" != "0" ]; then
1520 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1521 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1525 dc424a06 2019-08-07 stsp # stage middle hunk
1526 dc424a06 2019-08-07 stsp printf "n\ny\nn\n" > $testroot/patchscript
1527 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1528 dc424a06 2019-08-07 stsp numbers > $testroot/stdout)
1530 dc424a06 2019-08-07 stsp cat > $testroot/stdout.expected <<EOF
1531 dc424a06 2019-08-07 stsp -----------------------------------------------
1532 dc424a06 2019-08-07 stsp @@ -1,5 +1,5 @@
1539 dc424a06 2019-08-07 stsp -----------------------------------------------
1540 a7c9878d 2019-08-08 stsp M numbers (change 1 of 3)
1541 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1542 dc424a06 2019-08-07 stsp -----------------------------------------------
1543 dc424a06 2019-08-07 stsp @@ -4,7 +4,7 @@
1552 dc424a06 2019-08-07 stsp -----------------------------------------------
1553 a7c9878d 2019-08-08 stsp M numbers (change 2 of 3)
1554 b353a198 2019-08-07 stsp stage this change? [y/n/q] y
1555 dc424a06 2019-08-07 stsp -----------------------------------------------
1556 dc424a06 2019-08-07 stsp @@ -13,4 +13,4 @@
1562 dc424a06 2019-08-07 stsp -----------------------------------------------
1563 a7c9878d 2019-08-08 stsp M numbers (change 3 of 3)
1564 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1566 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1568 dc424a06 2019-08-07 stsp if [ "$ret" != "0" ]; then
1569 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1570 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1574 dc424a06 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
1575 dc424a06 2019-08-07 stsp echo "MM numbers" > $testroot/stdout.expected
1576 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1578 dc424a06 2019-08-07 stsp if [ "$ret" != "0" ]; then
1579 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1580 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1584 dc424a06 2019-08-07 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
1586 dc424a06 2019-08-07 stsp echo "diff $commit_id $testroot/wt (staged changes)" \
1587 dc424a06 2019-08-07 stsp > $testroot/stdout.expected
1588 dc424a06 2019-08-07 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1589 dc424a06 2019-08-07 stsp got tree -r $testroot/repo -i -c $commit_id \
1590 dc424a06 2019-08-07 stsp | grep 'numbers$' | cut -d' ' -f 1 \
1591 dc424a06 2019-08-07 stsp >> $testroot/stdout.expected
1592 dc424a06 2019-08-07 stsp echo -n 'blob + ' >> $testroot/stdout.expected
1593 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 \
1594 dc424a06 2019-08-07 stsp >> $testroot/stdout.expected
1595 dc424a06 2019-08-07 stsp echo "--- numbers" >> $testroot/stdout.expected
1596 dc424a06 2019-08-07 stsp echo "+++ numbers" >> $testroot/stdout.expected
1597 dc424a06 2019-08-07 stsp echo "@@ -4,7 +4,7 @@" >> $testroot/stdout.expected
1598 dc424a06 2019-08-07 stsp echo " 4" >> $testroot/stdout.expected
1599 dc424a06 2019-08-07 stsp echo " 5" >> $testroot/stdout.expected
1600 dc424a06 2019-08-07 stsp echo " 6" >> $testroot/stdout.expected
1601 dc424a06 2019-08-07 stsp echo "-7" >> $testroot/stdout.expected
1602 dc424a06 2019-08-07 stsp echo "+b" >> $testroot/stdout.expected
1603 dc424a06 2019-08-07 stsp echo " 8" >> $testroot/stdout.expected
1604 dc424a06 2019-08-07 stsp echo " 9" >> $testroot/stdout.expected
1605 dc424a06 2019-08-07 stsp echo " 10" >> $testroot/stdout.expected
1606 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1608 dc424a06 2019-08-07 stsp if [ "$ret" != "0" ]; then
1609 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1610 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1614 dc424a06 2019-08-07 stsp (cd $testroot/wt && got unstage >/dev/null)
1616 dc424a06 2019-08-07 stsp if [ "$ret" != "0" ]; then
1617 dc424a06 2019-08-07 stsp echo "got stage command failed unexpectedly" >&2
1618 dc424a06 2019-08-07 stsp test_done "$testroot" "1"
1621 dc424a06 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
1622 dc424a06 2019-08-07 stsp echo "M numbers" > $testroot/stdout.expected
1623 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1625 dc424a06 2019-08-07 stsp if [ "$ret" != "0" ]; then
1626 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1627 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1631 dc424a06 2019-08-07 stsp # stage last hunk
1632 dc424a06 2019-08-07 stsp printf "n\nn\ny\n" > $testroot/patchscript
1633 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1634 dc424a06 2019-08-07 stsp numbers > $testroot/stdout)
1636 dc424a06 2019-08-07 stsp cat > $testroot/stdout.expected <<EOF
1637 dc424a06 2019-08-07 stsp -----------------------------------------------
1638 dc424a06 2019-08-07 stsp @@ -1,5 +1,5 @@
1645 dc424a06 2019-08-07 stsp -----------------------------------------------
1646 a7c9878d 2019-08-08 stsp M numbers (change 1 of 3)
1647 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1648 dc424a06 2019-08-07 stsp -----------------------------------------------
1649 dc424a06 2019-08-07 stsp @@ -4,7 +4,7 @@
1658 dc424a06 2019-08-07 stsp -----------------------------------------------
1659 a7c9878d 2019-08-08 stsp M numbers (change 2 of 3)
1660 b353a198 2019-08-07 stsp stage this change? [y/n/q] n
1661 dc424a06 2019-08-07 stsp -----------------------------------------------
1662 dc424a06 2019-08-07 stsp @@ -13,4 +13,4 @@
1668 dc424a06 2019-08-07 stsp -----------------------------------------------
1669 a7c9878d 2019-08-08 stsp M numbers (change 3 of 3)
1670 b353a198 2019-08-07 stsp stage this change? [y/n/q] y
1672 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1674 dc424a06 2019-08-07 stsp if [ "$ret" != "0" ]; then
1675 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1676 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1680 dc424a06 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
1681 dc424a06 2019-08-07 stsp echo "MM numbers" > $testroot/stdout.expected
1682 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1684 dc424a06 2019-08-07 stsp if [ "$ret" != "0" ]; then
1685 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1686 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1690 dc424a06 2019-08-07 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
1692 dc424a06 2019-08-07 stsp echo "diff $commit_id $testroot/wt (staged changes)" \
1693 dc424a06 2019-08-07 stsp > $testroot/stdout.expected
1694 dc424a06 2019-08-07 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1695 dc424a06 2019-08-07 stsp got tree -r $testroot/repo -i -c $commit_id \
1696 dc424a06 2019-08-07 stsp | grep 'numbers$' | cut -d' ' -f 1 \
1697 dc424a06 2019-08-07 stsp >> $testroot/stdout.expected
1698 dc424a06 2019-08-07 stsp echo -n 'blob + ' >> $testroot/stdout.expected
1699 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 \
1700 dc424a06 2019-08-07 stsp >> $testroot/stdout.expected
1701 dc424a06 2019-08-07 stsp echo "--- numbers" >> $testroot/stdout.expected
1702 dc424a06 2019-08-07 stsp echo "+++ numbers" >> $testroot/stdout.expected
1703 dc424a06 2019-08-07 stsp echo "@@ -13,4 +13,4 @@" >> $testroot/stdout.expected
1704 dc424a06 2019-08-07 stsp echo " 13" >> $testroot/stdout.expected
1705 dc424a06 2019-08-07 stsp echo " 14" >> $testroot/stdout.expected
1706 dc424a06 2019-08-07 stsp echo " 15" >> $testroot/stdout.expected
1707 dc424a06 2019-08-07 stsp echo "-16" >> $testroot/stdout.expected
1708 dc424a06 2019-08-07 stsp echo "+c" >> $testroot/stdout.expected
1709 af5a81b2 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1711 af5a81b2 2019-08-08 stsp if [ "$ret" != "0" ]; then
1712 af5a81b2 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1714 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1717 f6cae3ed 2020-09-13 naddy test_stage_patch_twice() {
1718 af5a81b2 2019-08-08 stsp local testroot=`test_init stage_patch_twice`
1720 af5a81b2 2019-08-08 stsp jot 16 > $testroot/repo/numbers
1721 af5a81b2 2019-08-08 stsp (cd $testroot/repo && git add numbers)
1722 af5a81b2 2019-08-08 stsp git_commit $testroot/repo -m "added numbers file"
1723 af5a81b2 2019-08-08 stsp local commit_id=`git_show_head $testroot/repo`
1725 af5a81b2 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1727 af5a81b2 2019-08-08 stsp if [ "$ret" != "0" ]; then
1728 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1732 c206b220 2021-10-09 thomas sed -i '' -e 's/^2$/a/' $testroot/wt/numbers
1733 c206b220 2021-10-09 thomas sed -i '' -e 's/^7$/b/' $testroot/wt/numbers
1734 c206b220 2021-10-09 thomas sed -i '' -e 's/^16$/c/' $testroot/wt/numbers
1736 af5a81b2 2019-08-08 stsp # stage middle hunk
1737 af5a81b2 2019-08-08 stsp printf "n\ny\nn\n" > $testroot/patchscript
1738 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1739 af5a81b2 2019-08-08 stsp numbers > $testroot/stdout)
1741 af5a81b2 2019-08-08 stsp cat > $testroot/stdout.expected <<EOF
1742 af5a81b2 2019-08-08 stsp -----------------------------------------------
1743 af5a81b2 2019-08-08 stsp @@ -1,5 +1,5 @@
1750 af5a81b2 2019-08-08 stsp -----------------------------------------------
1751 af5a81b2 2019-08-08 stsp M numbers (change 1 of 3)
1752 af5a81b2 2019-08-08 stsp stage this change? [y/n/q] n
1753 af5a81b2 2019-08-08 stsp -----------------------------------------------
1754 af5a81b2 2019-08-08 stsp @@ -4,7 +4,7 @@
1763 af5a81b2 2019-08-08 stsp -----------------------------------------------
1764 af5a81b2 2019-08-08 stsp M numbers (change 2 of 3)
1765 af5a81b2 2019-08-08 stsp stage this change? [y/n/q] y
1766 af5a81b2 2019-08-08 stsp -----------------------------------------------
1767 af5a81b2 2019-08-08 stsp @@ -13,4 +13,4 @@
1773 af5a81b2 2019-08-08 stsp -----------------------------------------------
1774 af5a81b2 2019-08-08 stsp M numbers (change 3 of 3)
1775 af5a81b2 2019-08-08 stsp stage this change? [y/n/q] n
1777 af5a81b2 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1779 af5a81b2 2019-08-08 stsp if [ "$ret" != "0" ]; then
1780 af5a81b2 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1781 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1785 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
1786 af5a81b2 2019-08-08 stsp echo "MM numbers" > $testroot/stdout.expected
1787 af5a81b2 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1789 af5a81b2 2019-08-08 stsp if [ "$ret" != "0" ]; then
1790 af5a81b2 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1791 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1795 af5a81b2 2019-08-08 stsp # stage last hunk
1796 af5a81b2 2019-08-08 stsp printf "n\ny\n" > $testroot/patchscript
1797 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1798 af5a81b2 2019-08-08 stsp numbers > $testroot/stdout)
1800 af5a81b2 2019-08-08 stsp cat > $testroot/stdout.expected <<EOF
1801 af5a81b2 2019-08-08 stsp -----------------------------------------------
1802 fe621944 2020-11-10 stsp @@ -1,5 +1,5 @@
1809 af5a81b2 2019-08-08 stsp -----------------------------------------------
1810 af5a81b2 2019-08-08 stsp M numbers (change 1 of 2)
1811 af5a81b2 2019-08-08 stsp stage this change? [y/n/q] n
1812 af5a81b2 2019-08-08 stsp -----------------------------------------------
1813 af5a81b2 2019-08-08 stsp @@ -13,4 +13,4 @@ b
1819 af5a81b2 2019-08-08 stsp -----------------------------------------------
1820 af5a81b2 2019-08-08 stsp M numbers (change 2 of 2)
1821 af5a81b2 2019-08-08 stsp stage this change? [y/n/q] y
1823 af5a81b2 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1825 af5a81b2 2019-08-08 stsp if [ "$ret" != "0" ]; then
1826 af5a81b2 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1827 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1831 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
1832 af5a81b2 2019-08-08 stsp echo "MM numbers" > $testroot/stdout.expected
1833 af5a81b2 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1835 af5a81b2 2019-08-08 stsp if [ "$ret" != "0" ]; then
1836 af5a81b2 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1837 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1841 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
1843 af5a81b2 2019-08-08 stsp echo "diff $commit_id $testroot/wt (staged changes)" \
1844 af5a81b2 2019-08-08 stsp > $testroot/stdout.expected
1845 af5a81b2 2019-08-08 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1846 af5a81b2 2019-08-08 stsp got tree -r $testroot/repo -i -c $commit_id \
1847 af5a81b2 2019-08-08 stsp | grep 'numbers$' | cut -d' ' -f 1 \
1848 af5a81b2 2019-08-08 stsp >> $testroot/stdout.expected
1849 af5a81b2 2019-08-08 stsp echo -n 'blob + ' >> $testroot/stdout.expected
1850 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 \
1851 af5a81b2 2019-08-08 stsp >> $testroot/stdout.expected
1852 af5a81b2 2019-08-08 stsp echo "--- numbers" >> $testroot/stdout.expected
1853 af5a81b2 2019-08-08 stsp echo "+++ numbers" >> $testroot/stdout.expected
1854 af5a81b2 2019-08-08 stsp cat >> $testroot/stdout.expected <<EOF
1855 af5a81b2 2019-08-08 stsp @@ -4,7 +4,7 @@
1864 af5a81b2 2019-08-08 stsp @@ -13,4 +13,4 @@
1871 af5a81b2 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1873 af5a81b2 2019-08-08 stsp if [ "$ret" != "0" ]; then
1874 af5a81b2 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1875 af5a81b2 2019-08-08 stsp test_done "$testroot" "$ret"
1879 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got diff > $testroot/stdout)
1881 af5a81b2 2019-08-08 stsp echo "diff $commit_id $testroot/wt" > $testroot/stdout.expected
1882 af5a81b2 2019-08-08 stsp echo -n 'blob - ' >> $testroot/stdout.expected
1883 af5a81b2 2019-08-08 stsp (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 | \
1884 af5a81b2 2019-08-08 stsp tr -d '\n' >> $testroot/stdout.expected
1885 af5a81b2 2019-08-08 stsp echo " (staged)" >> $testroot/stdout.expected
1886 af5a81b2 2019-08-08 stsp echo 'file + numbers' >> $testroot/stdout.expected
1887 af5a81b2 2019-08-08 stsp echo "--- numbers" >> $testroot/stdout.expected
1888 af5a81b2 2019-08-08 stsp echo "+++ numbers" >> $testroot/stdout.expected
1889 af5a81b2 2019-08-08 stsp cat >> $testroot/stdout.expected <<EOF
1890 af5a81b2 2019-08-08 stsp @@ -1,5 +1,5 @@
1898 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1900 dc424a06 2019-08-07 stsp if [ "$ret" != "0" ]; then
1901 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1903 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1906 f6cae3ed 2020-09-13 naddy test_stage_patch_added() {
1907 dc424a06 2019-08-07 stsp local testroot=`test_init stage_patch_added`
1908 dc424a06 2019-08-07 stsp local commit_id=`git_show_head $testroot/repo`
1910 dc424a06 2019-08-07 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1912 dc424a06 2019-08-07 stsp if [ "$ret" != "0" ]; then
1913 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1917 dc424a06 2019-08-07 stsp echo "new" > $testroot/wt/epsilon/new
1918 dc424a06 2019-08-07 stsp (cd $testroot/wt && got add epsilon/new > /dev/null)
1920 dc424a06 2019-08-07 stsp printf "y\n" > $testroot/patchscript
1921 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1922 dc424a06 2019-08-07 stsp epsilon/new > $testroot/stdout)
1924 dc424a06 2019-08-07 stsp echo "A epsilon/new" > $testroot/stdout.expected
1925 c8ede203 2019-08-08 stsp echo "stage this addition? [y/n] y" >> $testroot/stdout.expected
1926 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1928 dc424a06 2019-08-07 stsp if [ "$ret" != "0" ]; then
1929 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1930 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1934 dc424a06 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
1935 dc424a06 2019-08-07 stsp echo " A epsilon/new" > $testroot/stdout.expected
1936 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1938 dc424a06 2019-08-07 stsp if [ "$ret" != "0" ]; then
1939 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1940 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
1944 dc424a06 2019-08-07 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
1946 dc424a06 2019-08-07 stsp echo "diff $commit_id $testroot/wt (staged changes)" \
1947 dc424a06 2019-08-07 stsp > $testroot/stdout.expected
1948 dc424a06 2019-08-07 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
1949 dc424a06 2019-08-07 stsp echo -n 'blob + ' >> $testroot/stdout.expected
1950 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -l epsilon/new) | cut -d' ' -f 1 \
1951 dc424a06 2019-08-07 stsp >> $testroot/stdout.expected
1952 dc424a06 2019-08-07 stsp echo "--- /dev/null" >> $testroot/stdout.expected
1953 dc424a06 2019-08-07 stsp echo "+++ epsilon/new" >> $testroot/stdout.expected
1954 dc424a06 2019-08-07 stsp echo "@@ -0,0 +1 @@" >> $testroot/stdout.expected
1955 dc424a06 2019-08-07 stsp echo "+new" >> $testroot/stdout.expected
1956 e70a841e 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1958 e70a841e 2019-08-08 stsp if [ "$ret" != "0" ]; then
1959 e70a841e 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1961 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
1964 f6cae3ed 2020-09-13 naddy test_stage_patch_added_twice() {
1965 e70a841e 2019-08-08 stsp local testroot=`test_init stage_patch_added_twice`
1966 e70a841e 2019-08-08 stsp local commit_id=`git_show_head $testroot/repo`
1968 e70a841e 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
1970 e70a841e 2019-08-08 stsp if [ "$ret" != "0" ]; then
1971 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
1975 e70a841e 2019-08-08 stsp echo "new" > $testroot/wt/epsilon/new
1976 e70a841e 2019-08-08 stsp (cd $testroot/wt && got add epsilon/new > /dev/null)
1978 e70a841e 2019-08-08 stsp printf "y\n" > $testroot/patchscript
1979 e70a841e 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
1980 e70a841e 2019-08-08 stsp epsilon/new > $testroot/stdout)
1982 e70a841e 2019-08-08 stsp echo "A epsilon/new" > $testroot/stdout.expected
1983 e70a841e 2019-08-08 stsp echo "stage this addition? [y/n] y" >> $testroot/stdout.expected
1984 e70a841e 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1986 e70a841e 2019-08-08 stsp if [ "$ret" != "0" ]; then
1987 e70a841e 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
1988 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
1992 e70a841e 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
1993 e70a841e 2019-08-08 stsp echo " A epsilon/new" > $testroot/stdout.expected
1994 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1996 dc424a06 2019-08-07 stsp if [ "$ret" != "0" ]; then
1997 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
1998 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2002 e70a841e 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
2003 e70a841e 2019-08-08 stsp epsilon/new > $testroot/stdout 2> $testroot/stderr)
2005 54c39596 2020-12-28 stsp if [ "$ret" = "0" ]; then
2006 e70a841e 2019-08-08 stsp echo "got stage command succeeded unexpectedly" >&2
2007 e70a841e 2019-08-08 stsp test_done "$testroot" "1"
2011 7b5dc508 2019-10-28 stsp echo "got: no changes to stage" > $testroot/stderr.expected
2012 e70a841e 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
2014 e70a841e 2019-08-08 stsp if [ "$ret" != "0" ]; then
2015 e70a841e 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
2016 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2020 e70a841e 2019-08-08 stsp echo -n > $testroot/stdout.expected
2021 e70a841e 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2023 e70a841e 2019-08-08 stsp if [ "$ret" != "0" ]; then
2024 e70a841e 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2026 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
2029 f6cae3ed 2020-09-13 naddy test_stage_patch_removed() {
2030 dc424a06 2019-08-07 stsp local testroot=`test_init stage_patch_removed`
2031 dc424a06 2019-08-07 stsp local commit_id=`git_show_head $testroot/repo`
2033 dc424a06 2019-08-07 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2035 dc424a06 2019-08-07 stsp if [ "$ret" != "0" ]; then
2036 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
2040 dc424a06 2019-08-07 stsp (cd $testroot/wt && got rm beta > /dev/null)
2042 dc424a06 2019-08-07 stsp printf "y\n" > $testroot/patchscript
2043 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
2044 dc424a06 2019-08-07 stsp beta > $testroot/stdout)
2046 dc424a06 2019-08-07 stsp echo -n > $testroot/stdout.expected
2048 dc424a06 2019-08-07 stsp echo "D beta" > $testroot/stdout.expected
2049 f5a17245 2019-08-08 stsp echo "stage this deletion? [y/n] y" >> $testroot/stdout.expected
2050 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2052 dc424a06 2019-08-07 stsp if [ "$ret" != "0" ]; then
2053 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2054 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
2058 dc424a06 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
2059 dc424a06 2019-08-07 stsp echo " D beta" > $testroot/stdout.expected
2060 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2062 dc424a06 2019-08-07 stsp if [ "$ret" != "0" ]; then
2063 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2064 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
2068 dc424a06 2019-08-07 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
2070 dc424a06 2019-08-07 stsp echo "diff $commit_id $testroot/wt (staged changes)" \
2071 dc424a06 2019-08-07 stsp > $testroot/stdout.expected
2072 dc424a06 2019-08-07 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2073 dc424a06 2019-08-07 stsp (cd $testroot/wt && got stage -l beta) | cut -d' ' -f 1 \
2074 dc424a06 2019-08-07 stsp >> $testroot/stdout.expected
2075 dc424a06 2019-08-07 stsp echo 'blob + /dev/null' >> $testroot/stdout.expected
2076 dc424a06 2019-08-07 stsp echo "--- beta" >> $testroot/stdout.expected
2077 dc424a06 2019-08-07 stsp echo "+++ /dev/null" >> $testroot/stdout.expected
2078 dc424a06 2019-08-07 stsp echo "@@ -1 +0,0 @@" >> $testroot/stdout.expected
2079 dc424a06 2019-08-07 stsp echo "-beta" >> $testroot/stdout.expected
2080 dc424a06 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2082 dc424a06 2019-08-07 stsp if [ "$ret" != "0" ]; then
2083 dc424a06 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2085 dc424a06 2019-08-07 stsp test_done "$testroot" "$ret"
2088 f6cae3ed 2020-09-13 naddy test_stage_patch_removed_twice() {
2089 e70a841e 2019-08-08 stsp local testroot=`test_init stage_patch_removed_twice`
2090 e70a841e 2019-08-08 stsp local commit_id=`git_show_head $testroot/repo`
2092 e70a841e 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2094 e70a841e 2019-08-08 stsp if [ "$ret" != "0" ]; then
2095 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2099 e70a841e 2019-08-08 stsp (cd $testroot/wt && got rm beta > /dev/null)
2101 e70a841e 2019-08-08 stsp printf "y\n" > $testroot/patchscript
2102 e70a841e 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
2103 e70a841e 2019-08-08 stsp beta > $testroot/stdout)
2105 e70a841e 2019-08-08 stsp echo -n > $testroot/stdout.expected
2107 e70a841e 2019-08-08 stsp echo "D beta" > $testroot/stdout.expected
2108 e70a841e 2019-08-08 stsp echo "stage this deletion? [y/n] y" >> $testroot/stdout.expected
2109 e70a841e 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2111 e70a841e 2019-08-08 stsp if [ "$ret" != "0" ]; then
2112 e70a841e 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2113 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2117 e70a841e 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
2118 e70a841e 2019-08-08 stsp echo " D beta" > $testroot/stdout.expected
2119 e70a841e 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2121 e70a841e 2019-08-08 stsp if [ "$ret" != "0" ]; then
2122 e70a841e 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2123 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2127 e70a841e 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p beta \
2128 e70a841e 2019-08-08 stsp > $testroot/stdout 2> $testroot/stderr)
2130 54c39596 2020-12-28 stsp if [ "$ret" = "0" ]; then
2131 7b5dc508 2019-10-28 stsp echo "got stage command succeeded unexpectedly" >&2
2132 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2136 7b5dc508 2019-10-28 stsp echo "got: no changes to stage" > $testroot/stderr.expected
2137 e70a841e 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
2139 e70a841e 2019-08-08 stsp if [ "$ret" != "0" ]; then
2140 e70a841e 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
2141 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2145 e70a841e 2019-08-08 stsp echo -n > $testroot/stdout.expected
2146 e70a841e 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2148 e70a841e 2019-08-08 stsp if [ "$ret" != "0" ]; then
2149 e70a841e 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2151 e70a841e 2019-08-08 stsp test_done "$testroot" "$ret"
2154 f6cae3ed 2020-09-13 naddy test_stage_patch_quit() {
2155 b353a198 2019-08-07 stsp local testroot=`test_init stage_patch_quit`
2157 b353a198 2019-08-07 stsp jot 16 > $testroot/repo/numbers
2158 88f33a19 2019-08-08 stsp echo zzz > $testroot/repo/zzz
2159 88f33a19 2019-08-08 stsp (cd $testroot/repo && git add numbers zzz)
2160 88f33a19 2019-08-08 stsp git_commit $testroot/repo -m "added files"
2161 b353a198 2019-08-07 stsp local commit_id=`git_show_head $testroot/repo`
2163 b353a198 2019-08-07 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2165 b353a198 2019-08-07 stsp if [ "$ret" != "0" ]; then
2166 b353a198 2019-08-07 stsp test_done "$testroot" "$ret"
2170 c206b220 2021-10-09 thomas sed -i '' -e 's/^2$/a/' $testroot/wt/numbers
2171 c206b220 2021-10-09 thomas sed -i '' -e 's/^7$/b/' $testroot/wt/numbers
2172 c206b220 2021-10-09 thomas sed -i '' -e 's/^16$/c/' $testroot/wt/numbers
2173 88f33a19 2019-08-08 stsp (cd $testroot/wt && got rm zzz > /dev/null)
2175 88f33a19 2019-08-08 stsp # stage first hunk and quit; and don't pass a path argument to
2176 88f33a19 2019-08-08 stsp # ensure that we don't skip asking about the 'zzz' file after 'quit'
2177 88f33a19 2019-08-08 stsp printf "y\nq\nn\n" > $testroot/patchscript
2178 b353a198 2019-08-07 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
2179 2db2652d 2019-08-07 stsp > $testroot/stdout)
2181 b353a198 2019-08-07 stsp if [ "$ret" != "0" ]; then
2182 b353a198 2019-08-07 stsp echo "got stage command failed unexpectedly" >&2
2183 b353a198 2019-08-07 stsp test_done "$testroot" "1"
2186 b353a198 2019-08-07 stsp cat > $testroot/stdout.expected <<EOF
2187 b353a198 2019-08-07 stsp -----------------------------------------------
2188 b353a198 2019-08-07 stsp @@ -1,5 +1,5 @@
2195 b353a198 2019-08-07 stsp -----------------------------------------------
2196 a7c9878d 2019-08-08 stsp M numbers (change 1 of 3)
2197 b353a198 2019-08-07 stsp stage this change? [y/n/q] y
2198 b353a198 2019-08-07 stsp -----------------------------------------------
2199 b353a198 2019-08-07 stsp @@ -4,7 +4,7 @@
2208 b353a198 2019-08-07 stsp -----------------------------------------------
2209 a7c9878d 2019-08-08 stsp M numbers (change 2 of 3)
2210 b353a198 2019-08-07 stsp stage this change? [y/n/q] q
2212 f5a17245 2019-08-08 stsp stage this deletion? [y/n] n
2214 b353a198 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2216 b353a198 2019-08-07 stsp if [ "$ret" != "0" ]; then
2217 b353a198 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2218 b353a198 2019-08-07 stsp test_done "$testroot" "$ret"
2222 b353a198 2019-08-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
2223 b353a198 2019-08-07 stsp echo "MM numbers" > $testroot/stdout.expected
2224 88f33a19 2019-08-08 stsp echo "D zzz" >> $testroot/stdout.expected
2225 b353a198 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2227 b353a198 2019-08-07 stsp if [ "$ret" != "0" ]; then
2228 b353a198 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2229 b353a198 2019-08-07 stsp test_done "$testroot" "$ret"
2233 b353a198 2019-08-07 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
2235 b353a198 2019-08-07 stsp echo "diff $commit_id $testroot/wt (staged changes)" \
2236 b353a198 2019-08-07 stsp > $testroot/stdout.expected
2237 b353a198 2019-08-07 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2238 b353a198 2019-08-07 stsp got tree -r $testroot/repo -i -c $commit_id \
2239 b353a198 2019-08-07 stsp | grep 'numbers$' | cut -d' ' -f 1 \
2240 b353a198 2019-08-07 stsp >> $testroot/stdout.expected
2241 b353a198 2019-08-07 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2242 b353a198 2019-08-07 stsp (cd $testroot/wt && got stage -l numbers) | cut -d' ' -f 1 \
2243 b353a198 2019-08-07 stsp >> $testroot/stdout.expected
2244 b353a198 2019-08-07 stsp echo "--- numbers" >> $testroot/stdout.expected
2245 b353a198 2019-08-07 stsp echo "+++ numbers" >> $testroot/stdout.expected
2246 b353a198 2019-08-07 stsp echo "@@ -1,5 +1,5 @@" >> $testroot/stdout.expected
2247 b353a198 2019-08-07 stsp echo " 1" >> $testroot/stdout.expected
2248 b353a198 2019-08-07 stsp echo "-2" >> $testroot/stdout.expected
2249 b353a198 2019-08-07 stsp echo "+a" >> $testroot/stdout.expected
2250 b353a198 2019-08-07 stsp echo " 3" >> $testroot/stdout.expected
2251 b353a198 2019-08-07 stsp echo " 4" >> $testroot/stdout.expected
2252 b353a198 2019-08-07 stsp echo " 5" >> $testroot/stdout.expected
2253 b353a198 2019-08-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2255 b353a198 2019-08-07 stsp if [ "$ret" != "0" ]; then
2256 b353a198 2019-08-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
2258 b353a198 2019-08-07 stsp test_done "$testroot" "$ret"
2262 f6cae3ed 2020-09-13 naddy test_stage_patch_incomplete_script() {
2263 eba70f38 2019-08-08 stsp local testroot=`test_init stage_incomplete_script`
2265 eba70f38 2019-08-08 stsp jot 16 > $testroot/repo/numbers
2266 eba70f38 2019-08-08 stsp echo zzz > $testroot/repo/zzz
2267 eba70f38 2019-08-08 stsp (cd $testroot/repo && git add numbers zzz)
2268 eba70f38 2019-08-08 stsp git_commit $testroot/repo -m "added files"
2269 eba70f38 2019-08-08 stsp local commit_id=`git_show_head $testroot/repo`
2271 eba70f38 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2273 eba70f38 2019-08-08 stsp if [ "$ret" != "0" ]; then
2274 eba70f38 2019-08-08 stsp test_done "$testroot" "$ret"
2278 c206b220 2021-10-09 thomas sed -i '' -e 's/^2$/a/' $testroot/wt/numbers
2279 c206b220 2021-10-09 thomas sed -i '' -e 's/^7$/b/' $testroot/wt/numbers
2280 c206b220 2021-10-09 thomas sed -i '' -e 's/^16$/c/' $testroot/wt/numbers
2282 eba70f38 2019-08-08 stsp # stage first hunk and then stop responding; got should error out
2283 eba70f38 2019-08-08 stsp printf "y\n" > $testroot/patchscript
2284 eba70f38 2019-08-08 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
2285 eba70f38 2019-08-08 stsp > $testroot/stdout 2> $testroot/stderr)
2287 54c39596 2020-12-28 stsp if [ "$ret" = "0" ]; then
2288 eba70f38 2019-08-08 stsp echo "got stage command succeeded unexpectedly" >&2
2289 eba70f38 2019-08-08 stsp test_done "$testroot" "1"
2292 eba70f38 2019-08-08 stsp cat > $testroot/stdout.expected <<EOF
2293 eba70f38 2019-08-08 stsp -----------------------------------------------
2294 eba70f38 2019-08-08 stsp @@ -1,5 +1,5 @@
2301 eba70f38 2019-08-08 stsp -----------------------------------------------
2302 eba70f38 2019-08-08 stsp M numbers (change 1 of 3)
2303 eba70f38 2019-08-08 stsp stage this change? [y/n/q] y
2304 eba70f38 2019-08-08 stsp -----------------------------------------------
2305 eba70f38 2019-08-08 stsp @@ -4,7 +4,7 @@
2314 eba70f38 2019-08-08 stsp -----------------------------------------------
2315 eba70f38 2019-08-08 stsp M numbers (change 2 of 3)
2317 eba70f38 2019-08-08 stsp echo -n "stage this change? [y/n/q] " >> $testroot/stdout.expected
2318 eba70f38 2019-08-08 stsp echo "got: invalid patch choice" > $testroot/stderr.expected
2319 eba70f38 2019-08-08 stsp cmp -s $testroot/stderr.expected $testroot/stderr
2321 eba70f38 2019-08-08 stsp if [ "$ret" != "0" ]; then
2322 eba70f38 2019-08-08 stsp diff -u $testroot/stderr.expected $testroot/stderr
2323 eba70f38 2019-08-08 stsp test_done "$testroot" "$ret"
2327 eba70f38 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2329 eba70f38 2019-08-08 stsp if [ "$ret" != "0" ]; then
2330 eba70f38 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2331 eba70f38 2019-08-08 stsp test_done "$testroot" "$ret"
2335 eba70f38 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
2336 eba70f38 2019-08-08 stsp echo "M numbers" > $testroot/stdout.expected
2337 eba70f38 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2339 eba70f38 2019-08-08 stsp if [ "$ret" != "0" ]; then
2340 eba70f38 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2341 eba70f38 2019-08-08 stsp test_done "$testroot" "$ret"
2345 eba70f38 2019-08-08 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
2346 eba70f38 2019-08-08 stsp echo -n > $testroot/stdout.expected
2347 eba70f38 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2349 eba70f38 2019-08-08 stsp if [ "$ret" != "0" ]; then
2350 eba70f38 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
2352 eba70f38 2019-08-08 stsp test_done "$testroot" "$ret"
2356 f6cae3ed 2020-09-13 naddy test_stage_symlink() {
2357 c631b115 2020-07-23 stsp local testroot=`test_init stage_symlink`
2359 c631b115 2020-07-23 stsp (cd $testroot/repo && ln -s alpha alpha.link)
2360 c631b115 2020-07-23 stsp (cd $testroot/repo && ln -s epsilon epsilon.link)
2361 c631b115 2020-07-23 stsp (cd $testroot/repo && ln -s /etc/passwd passwd.link)
2362 c631b115 2020-07-23 stsp (cd $testroot/repo && ln -s ../beta epsilon/beta.link)
2363 c631b115 2020-07-23 stsp (cd $testroot/repo && ln -s nonexistent nonexistent.link)
2364 c631b115 2020-07-23 stsp (cd $testroot/repo && git add .)
2365 c631b115 2020-07-23 stsp git_commit $testroot/repo -m "add symlinks"
2366 c631b115 2020-07-23 stsp local head_commit=`git_show_head $testroot/repo`
2368 c631b115 2020-07-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2370 c631b115 2020-07-23 stsp if [ "$ret" != "0" ]; then
2371 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2375 c631b115 2020-07-23 stsp (cd $testroot/wt && ln -sf beta alpha.link)
2376 dd6165e4 2021-09-21 thomas.ad (cd $testroot/wt && ln -sfT gamma epsilon.link)
2377 c631b115 2020-07-23 stsp (cd $testroot/wt && ln -sf ../gamma/delta epsilon/beta.link)
2378 c631b115 2020-07-23 stsp echo 'this is regular file foo' > $testroot/wt/dotgotfoo.link
2379 c631b115 2020-07-23 stsp (cd $testroot/wt && got add dotgotfoo.link > /dev/null)
2380 c631b115 2020-07-23 stsp (cd $testroot/wt && ln -sf .got/bar dotgotbar.link)
2381 c631b115 2020-07-23 stsp (cd $testroot/wt && got add dotgotbar.link > /dev/null)
2382 c631b115 2020-07-23 stsp (cd $testroot/wt && got rm nonexistent.link > /dev/null)
2383 c631b115 2020-07-23 stsp (cd $testroot/wt && ln -sf gamma/delta zeta.link)
2384 c631b115 2020-07-23 stsp (cd $testroot/wt && got add zeta.link > /dev/null)
2386 35213c7c 2020-07-23 stsp (cd $testroot/wt && got stage > $testroot/stdout 2> $testroot/stderr)
2388 54c39596 2020-12-28 stsp if [ "$ret" = "0" ]; then
2389 35213c7c 2020-07-23 stsp echo "got stage succeeded unexpectedly" >&2
2390 35213c7c 2020-07-23 stsp test_done "$testroot" "$ret"
2393 35213c7c 2020-07-23 stsp echo -n "got: $testroot/wt/dotgotbar.link: " > $testroot/stderr.expected
2394 35213c7c 2020-07-23 stsp echo "symbolic link points outside of paths under version control" \
2395 35213c7c 2020-07-23 stsp >> $testroot/stderr.expected
2396 35213c7c 2020-07-23 stsp cmp -s $testroot/stderr.expected $testroot/stderr
2398 35213c7c 2020-07-23 stsp if [ "$ret" != "0" ]; then
2399 35213c7c 2020-07-23 stsp diff -u $testroot/stderr.expected $testroot/stderr
2400 35213c7c 2020-07-23 stsp test_done "$testroot" "$ret"
2404 35213c7c 2020-07-23 stsp (cd $testroot/wt && got stage -S > $testroot/stdout)
2406 c631b115 2020-07-23 stsp cat > $testroot/stdout.expected <<EOF
2407 c631b115 2020-07-23 stsp M alpha.link
2408 c631b115 2020-07-23 stsp A dotgotbar.link
2409 c631b115 2020-07-23 stsp A dotgotfoo.link
2410 c631b115 2020-07-23 stsp M epsilon/beta.link
2411 c631b115 2020-07-23 stsp M epsilon.link
2412 c631b115 2020-07-23 stsp D nonexistent.link
2413 c631b115 2020-07-23 stsp A zeta.link
2415 c631b115 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2417 c631b115 2020-07-23 stsp if [ "$ret" != "0" ]; then
2418 c631b115 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2419 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2423 0aeb8099 2020-07-23 stsp rm $testroot/wt/alpha.link
2424 0aeb8099 2020-07-23 stsp echo 'this is regular file alpha.link' > $testroot/wt/alpha.link
2426 c631b115 2020-07-23 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
2428 c631b115 2020-07-23 stsp echo "diff $head_commit $testroot/wt (staged changes)" \
2429 c631b115 2020-07-23 stsp > $testroot/stdout.expected
2430 c631b115 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2431 c631b115 2020-07-23 stsp got tree -r $testroot/repo -i | grep 'alpha.link@ -> alpha$' | \
2432 c631b115 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2433 c631b115 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2434 c631b115 2020-07-23 stsp (cd $testroot/wt && got stage -l alpha.link) | cut -d' ' -f 1 \
2435 c631b115 2020-07-23 stsp >> $testroot/stdout.expected
2436 c631b115 2020-07-23 stsp echo '--- alpha.link' >> $testroot/stdout.expected
2437 c631b115 2020-07-23 stsp echo '+++ alpha.link' >> $testroot/stdout.expected
2438 c631b115 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
2439 c631b115 2020-07-23 stsp echo '-alpha' >> $testroot/stdout.expected
2440 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2441 c631b115 2020-07-23 stsp echo '+beta' >> $testroot/stdout.expected
2442 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2443 c631b115 2020-07-23 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
2444 c631b115 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2445 c631b115 2020-07-23 stsp (cd $testroot/wt && got stage -l dotgotbar.link) | cut -d' ' -f 1 \
2446 c631b115 2020-07-23 stsp >> $testroot/stdout.expected
2447 c631b115 2020-07-23 stsp echo '--- /dev/null' >> $testroot/stdout.expected
2448 c631b115 2020-07-23 stsp echo '+++ dotgotbar.link' >> $testroot/stdout.expected
2449 c631b115 2020-07-23 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
2450 c631b115 2020-07-23 stsp echo '+.got/bar' >> $testroot/stdout.expected
2451 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2452 c631b115 2020-07-23 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
2453 c631b115 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2454 c631b115 2020-07-23 stsp (cd $testroot/wt && got stage -l dotgotfoo.link) | cut -d' ' -f 1 \
2455 c631b115 2020-07-23 stsp >> $testroot/stdout.expected
2456 c631b115 2020-07-23 stsp echo '--- /dev/null' >> $testroot/stdout.expected
2457 c631b115 2020-07-23 stsp echo '+++ dotgotfoo.link' >> $testroot/stdout.expected
2458 c631b115 2020-07-23 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
2459 c631b115 2020-07-23 stsp echo '+this is regular file foo' >> $testroot/stdout.expected
2460 c631b115 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2461 c631b115 2020-07-23 stsp got tree -r $testroot/repo -i epsilon | grep 'beta.link@ -> ../beta$' | \
2462 c631b115 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2463 c631b115 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2464 c631b115 2020-07-23 stsp (cd $testroot/wt && got stage -l epsilon/beta.link) | cut -d' ' -f 1 \
2465 c631b115 2020-07-23 stsp >> $testroot/stdout.expected
2466 c631b115 2020-07-23 stsp echo '--- epsilon/beta.link' >> $testroot/stdout.expected
2467 c631b115 2020-07-23 stsp echo '+++ epsilon/beta.link' >> $testroot/stdout.expected
2468 c631b115 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
2469 c631b115 2020-07-23 stsp echo '-../beta' >> $testroot/stdout.expected
2470 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2471 c631b115 2020-07-23 stsp echo '+../gamma/delta' >> $testroot/stdout.expected
2472 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2473 c631b115 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2474 c631b115 2020-07-23 stsp got tree -r $testroot/repo -i | grep 'epsilon.link@ -> epsilon$' | \
2475 c631b115 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2476 c631b115 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2477 c631b115 2020-07-23 stsp (cd $testroot/wt && got stage -l epsilon.link) | cut -d' ' -f 1 \
2478 c631b115 2020-07-23 stsp >> $testroot/stdout.expected
2479 c631b115 2020-07-23 stsp echo '--- epsilon.link' >> $testroot/stdout.expected
2480 c631b115 2020-07-23 stsp echo '+++ epsilon.link' >> $testroot/stdout.expected
2481 c631b115 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
2482 c631b115 2020-07-23 stsp echo '-epsilon' >> $testroot/stdout.expected
2483 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2484 c631b115 2020-07-23 stsp echo '+gamma' >> $testroot/stdout.expected
2485 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2486 c631b115 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2487 c631b115 2020-07-23 stsp got tree -r $testroot/repo -i | grep 'nonexistent.link@ -> nonexistent$' | \
2488 c631b115 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2489 c631b115 2020-07-23 stsp echo 'blob + /dev/null' >> $testroot/stdout.expected
2490 c631b115 2020-07-23 stsp echo '--- nonexistent.link' >> $testroot/stdout.expected
2491 c631b115 2020-07-23 stsp echo '+++ /dev/null' >> $testroot/stdout.expected
2492 c631b115 2020-07-23 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
2493 c631b115 2020-07-23 stsp echo '-nonexistent' >> $testroot/stdout.expected
2494 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2495 c631b115 2020-07-23 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
2496 c631b115 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2497 c631b115 2020-07-23 stsp (cd $testroot/wt && got stage -l zeta.link) | cut -d' ' -f 1 \
2498 c631b115 2020-07-23 stsp >> $testroot/stdout.expected
2499 c631b115 2020-07-23 stsp echo '--- /dev/null' >> $testroot/stdout.expected
2500 c631b115 2020-07-23 stsp echo '+++ zeta.link' >> $testroot/stdout.expected
2501 c631b115 2020-07-23 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
2502 c631b115 2020-07-23 stsp echo '+gamma/delta' >> $testroot/stdout.expected
2503 c631b115 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2505 c631b115 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2507 c631b115 2020-07-23 stsp if [ "$ret" != "0" ]; then
2508 c631b115 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2509 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2513 c631b115 2020-07-23 stsp (cd $testroot/wt && got commit -m "staged symlink" \
2514 c631b115 2020-07-23 stsp > $testroot/stdout)
2516 c631b115 2020-07-23 stsp if [ "$ret" != "0" ]; then
2517 c631b115 2020-07-23 stsp echo "got commit command failed unexpectedly" >&2
2518 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2522 c631b115 2020-07-23 stsp local commit_id=`git_show_head $testroot/repo`
2523 c631b115 2020-07-23 stsp echo "A dotgotbar.link" > $testroot/stdout.expected
2524 c631b115 2020-07-23 stsp echo "A dotgotfoo.link" >> $testroot/stdout.expected
2525 c631b115 2020-07-23 stsp echo "A zeta.link" >> $testroot/stdout.expected
2526 c631b115 2020-07-23 stsp echo "M alpha.link" >> $testroot/stdout.expected
2527 c631b115 2020-07-23 stsp echo "M epsilon/beta.link" >> $testroot/stdout.expected
2528 c631b115 2020-07-23 stsp echo "M epsilon.link" >> $testroot/stdout.expected
2529 c631b115 2020-07-23 stsp echo "D nonexistent.link" >> $testroot/stdout.expected
2530 c631b115 2020-07-23 stsp echo "Created commit $commit_id" >> $testroot/stdout.expected
2531 c631b115 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2533 c631b115 2020-07-23 stsp if [ "$ret" != "0" ]; then
2534 c631b115 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2535 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2539 c631b115 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id > $testroot/stdout
2541 c631b115 2020-07-23 stsp if [ "$ret" != "0" ]; then
2542 c631b115 2020-07-23 stsp echo "got tree command failed unexpectedly" >&2
2543 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2547 c631b115 2020-07-23 stsp cat > $testroot/stdout.expected <<EOF
2549 c631b115 2020-07-23 stsp alpha.link@ -> beta
2551 c631b115 2020-07-23 stsp dotgotbar.link@ -> .got/bar
2552 c631b115 2020-07-23 stsp dotgotfoo.link
2554 c631b115 2020-07-23 stsp epsilon.link@ -> gamma
2556 c631b115 2020-07-23 stsp passwd.link@ -> /etc/passwd
2557 c631b115 2020-07-23 stsp zeta.link@ -> gamma/delta
2559 c631b115 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2561 c631b115 2020-07-23 stsp if [ "$ret" != "0" ]; then
2562 c631b115 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2566 0aeb8099 2020-07-23 stsp if [ -h $testroot/wt/alpha.link ]; then
2567 0aeb8099 2020-07-23 stsp echo "alpha.link is a symlink"
2568 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2572 0aeb8099 2020-07-23 stsp echo 'this is regular file alpha.link' > $testroot/content.expected
2573 0aeb8099 2020-07-23 stsp cp $testroot/wt/alpha.link $testroot/content
2574 0aeb8099 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2576 c631b115 2020-07-23 stsp if [ "$ret" != "0" ]; then
2577 0aeb8099 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2578 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2582 75f0a0fb 2020-07-23 stsp if [ ! -h $testroot/wt/dotgotbar.link ]; then
2583 75f0a0fb 2020-07-23 stsp echo "dotgotbar.link is not a symlink"
2584 75f0a0fb 2020-07-23 stsp test_done "$testroot" "1"
2587 75f0a0fb 2020-07-23 stsp (cd $testroot/wt && got update > /dev/null)
2588 c631b115 2020-07-23 stsp if [ -h $testroot/wt/dotgotbar.link ]; then
2589 c631b115 2020-07-23 stsp echo "dotgotbar.link is a symlink"
2590 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2593 0aeb8099 2020-07-23 stsp echo -n ".got/bar" > $testroot/content.expected
2594 c631b115 2020-07-23 stsp cp $testroot/wt/dotgotbar.link $testroot/content
2595 fa3cef63 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2597 fa3cef63 2020-07-23 stsp if [ "$ret" != "0" ]; then
2598 fa3cef63 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2599 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2603 fa3cef63 2020-07-23 stsp if [ -h $testroot/wt/dotgotfoo.link ]; then
2604 fa3cef63 2020-07-23 stsp echo "dotgotfoo.link is a symlink"
2605 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2608 fa3cef63 2020-07-23 stsp echo "this is regular file foo" > $testroot/content.expected
2609 fa3cef63 2020-07-23 stsp cp $testroot/wt/dotgotfoo.link $testroot/content
2610 fa3cef63 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2612 fa3cef63 2020-07-23 stsp if [ "$ret" != "0" ]; then
2613 fa3cef63 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2614 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2618 fa3cef63 2020-07-23 stsp if ! [ -h $testroot/wt/epsilon.link ]; then
2619 fa3cef63 2020-07-23 stsp echo "epsilon.link is not a symlink"
2620 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2624 fa3cef63 2020-07-23 stsp readlink $testroot/wt/epsilon.link > $testroot/stdout
2625 fa3cef63 2020-07-23 stsp echo "gamma" > $testroot/stdout.expected
2626 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2628 fa3cef63 2020-07-23 stsp if [ "$ret" != "0" ]; then
2629 fa3cef63 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2630 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2634 fa3cef63 2020-07-23 stsp if [ -h $testroot/wt/passwd.link ]; then
2635 fa3cef63 2020-07-23 stsp echo "passwd.link is a symlink"
2636 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2639 fa3cef63 2020-07-23 stsp echo -n "/etc/passwd" > $testroot/content.expected
2640 fa3cef63 2020-07-23 stsp cp $testroot/wt/passwd.link $testroot/content
2641 fa3cef63 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2643 fa3cef63 2020-07-23 stsp if [ "$ret" != "0" ]; then
2644 fa3cef63 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2645 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2649 fa3cef63 2020-07-23 stsp if ! [ -h $testroot/wt/zeta.link ]; then
2650 fa3cef63 2020-07-23 stsp echo "zeta.link is not a symlink"
2651 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2655 fa3cef63 2020-07-23 stsp readlink $testroot/wt/zeta.link > $testroot/stdout
2656 fa3cef63 2020-07-23 stsp echo "gamma/delta" > $testroot/stdout.expected
2657 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2659 fa3cef63 2020-07-23 stsp if [ "$ret" != "0" ]; then
2660 fa3cef63 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2661 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2665 fa3cef63 2020-07-23 stsp test_done "$testroot" "0"
2668 f6cae3ed 2020-09-13 naddy test_stage_patch_symlink() {
2669 fa3cef63 2020-07-23 stsp local testroot=`test_init stage_patch_symlink`
2671 fa3cef63 2020-07-23 stsp (cd $testroot/repo && ln -s alpha alpha.link)
2672 fa3cef63 2020-07-23 stsp (cd $testroot/repo && ln -s epsilon epsilon.link)
2673 fa3cef63 2020-07-23 stsp (cd $testroot/repo && ln -s /etc/passwd passwd.link)
2674 fa3cef63 2020-07-23 stsp (cd $testroot/repo && ln -s ../beta epsilon/beta.link)
2675 fa3cef63 2020-07-23 stsp (cd $testroot/repo && ln -s nonexistent nonexistent.link)
2676 fa3cef63 2020-07-23 stsp (cd $testroot/repo && git add .)
2677 fa3cef63 2020-07-23 stsp git_commit $testroot/repo -m "add symlinks"
2678 fa3cef63 2020-07-23 stsp local head_commit=`git_show_head $testroot/repo`
2680 fa3cef63 2020-07-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
2682 fa3cef63 2020-07-23 stsp if [ "$ret" != "0" ]; then
2683 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2687 fa3cef63 2020-07-23 stsp (cd $testroot/wt && ln -sf beta alpha.link)
2688 dd6165e4 2021-09-21 thomas.ad (cd $testroot/wt && ln -sfT gamma epsilon.link)
2689 fa3cef63 2020-07-23 stsp (cd $testroot/wt && ln -sf ../gamma/delta epsilon/beta.link)
2690 fa3cef63 2020-07-23 stsp echo 'this is regular file foo' > $testroot/wt/dotgotfoo.link
2691 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got add dotgotfoo.link > /dev/null)
2692 fa3cef63 2020-07-23 stsp (cd $testroot/wt && ln -sf .got/bar dotgotbar.link)
2693 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got add dotgotbar.link > /dev/null)
2694 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got rm nonexistent.link > /dev/null)
2695 fa3cef63 2020-07-23 stsp (cd $testroot/wt && ln -sf gamma/delta zeta.link)
2696 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got add zeta.link > /dev/null)
2698 fa3cef63 2020-07-23 stsp printf "y\nn\ny\nn\ny\ny\ny" > $testroot/patchscript
2699 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got stage -F $testroot/patchscript -p \
2700 fa3cef63 2020-07-23 stsp > $testroot/stdout)
2702 fa3cef63 2020-07-23 stsp cat > $testroot/stdout.expected <<EOF
2703 fa3cef63 2020-07-23 stsp -----------------------------------------------
2704 fa3cef63 2020-07-23 stsp @@ -1 +1 @@
2706 fa3cef63 2020-07-23 stsp \ No newline at end of file
2708 fa3cef63 2020-07-23 stsp \ No newline at end of file
2709 fa3cef63 2020-07-23 stsp -----------------------------------------------
2710 fa3cef63 2020-07-23 stsp M alpha.link (change 1 of 1)
2711 fa3cef63 2020-07-23 stsp stage this change? [y/n/q] y
2712 fa3cef63 2020-07-23 stsp A dotgotbar.link
2713 fa3cef63 2020-07-23 stsp stage this addition? [y/n] n
2714 fa3cef63 2020-07-23 stsp A dotgotfoo.link
2715 fa3cef63 2020-07-23 stsp stage this addition? [y/n] y
2716 fa3cef63 2020-07-23 stsp -----------------------------------------------
2717 fa3cef63 2020-07-23 stsp @@ -1 +1 @@
2719 fa3cef63 2020-07-23 stsp \ No newline at end of file
2720 fa3cef63 2020-07-23 stsp +../gamma/delta
2721 fa3cef63 2020-07-23 stsp \ No newline at end of file
2722 fa3cef63 2020-07-23 stsp -----------------------------------------------
2723 fa3cef63 2020-07-23 stsp M epsilon/beta.link (change 1 of 1)
2724 fa3cef63 2020-07-23 stsp stage this change? [y/n/q] n
2725 fa3cef63 2020-07-23 stsp -----------------------------------------------
2726 fa3cef63 2020-07-23 stsp @@ -1 +1 @@
2728 fa3cef63 2020-07-23 stsp \ No newline at end of file
2730 fa3cef63 2020-07-23 stsp \ No newline at end of file
2731 fa3cef63 2020-07-23 stsp -----------------------------------------------
2732 fa3cef63 2020-07-23 stsp M epsilon.link (change 1 of 1)
2733 fa3cef63 2020-07-23 stsp stage this change? [y/n/q] y
2734 fa3cef63 2020-07-23 stsp D nonexistent.link
2735 fa3cef63 2020-07-23 stsp stage this deletion? [y/n] y
2736 fa3cef63 2020-07-23 stsp A zeta.link
2737 fa3cef63 2020-07-23 stsp stage this addition? [y/n] y
2739 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2741 fa3cef63 2020-07-23 stsp if [ "$ret" != "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 rm $testroot/wt/alpha.link
2748 fa3cef63 2020-07-23 stsp echo 'this is regular file alpha.link' > $testroot/wt/alpha.link
2750 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got diff -s > $testroot/stdout)
2752 fa3cef63 2020-07-23 stsp echo "diff $head_commit $testroot/wt (staged changes)" \
2753 fa3cef63 2020-07-23 stsp > $testroot/stdout.expected
2754 fa3cef63 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2755 fa3cef63 2020-07-23 stsp got tree -r $testroot/repo -i | grep 'alpha.link@ -> alpha$' | \
2756 fa3cef63 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2757 fa3cef63 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2758 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got stage -l alpha.link) | cut -d' ' -f 1 \
2759 fa3cef63 2020-07-23 stsp >> $testroot/stdout.expected
2760 fa3cef63 2020-07-23 stsp echo '--- alpha.link' >> $testroot/stdout.expected
2761 fa3cef63 2020-07-23 stsp echo '+++ alpha.link' >> $testroot/stdout.expected
2762 fa3cef63 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
2763 fa3cef63 2020-07-23 stsp echo '-alpha' >> $testroot/stdout.expected
2764 fa3cef63 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2765 fa3cef63 2020-07-23 stsp echo '+beta' >> $testroot/stdout.expected
2766 fa3cef63 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2767 fa3cef63 2020-07-23 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
2768 fa3cef63 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2769 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got stage -l dotgotfoo.link) | cut -d' ' -f 1 \
2770 fa3cef63 2020-07-23 stsp >> $testroot/stdout.expected
2771 fa3cef63 2020-07-23 stsp echo '--- /dev/null' >> $testroot/stdout.expected
2772 fa3cef63 2020-07-23 stsp echo '+++ dotgotfoo.link' >> $testroot/stdout.expected
2773 fa3cef63 2020-07-23 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
2774 fa3cef63 2020-07-23 stsp echo '+this is regular file foo' >> $testroot/stdout.expected
2775 fa3cef63 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2776 fa3cef63 2020-07-23 stsp got tree -r $testroot/repo -i | grep 'epsilon.link@ -> epsilon$' | \
2777 fa3cef63 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2778 fa3cef63 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2779 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got stage -l epsilon.link) | cut -d' ' -f 1 \
2780 fa3cef63 2020-07-23 stsp >> $testroot/stdout.expected
2781 fa3cef63 2020-07-23 stsp echo '--- epsilon.link' >> $testroot/stdout.expected
2782 fa3cef63 2020-07-23 stsp echo '+++ epsilon.link' >> $testroot/stdout.expected
2783 fa3cef63 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
2784 fa3cef63 2020-07-23 stsp echo '-epsilon' >> $testroot/stdout.expected
2785 fa3cef63 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2786 fa3cef63 2020-07-23 stsp echo '+gamma' >> $testroot/stdout.expected
2787 fa3cef63 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2788 fa3cef63 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
2789 fa3cef63 2020-07-23 stsp got tree -r $testroot/repo -i | grep 'nonexistent.link@ -> nonexistent$' | \
2790 fa3cef63 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
2791 fa3cef63 2020-07-23 stsp echo 'blob + /dev/null' >> $testroot/stdout.expected
2792 fa3cef63 2020-07-23 stsp echo '--- nonexistent.link' >> $testroot/stdout.expected
2793 fa3cef63 2020-07-23 stsp echo '+++ /dev/null' >> $testroot/stdout.expected
2794 fa3cef63 2020-07-23 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
2795 fa3cef63 2020-07-23 stsp echo '-nonexistent' >> $testroot/stdout.expected
2796 fa3cef63 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2797 fa3cef63 2020-07-23 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
2798 fa3cef63 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
2799 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got stage -l zeta.link) | cut -d' ' -f 1 \
2800 fa3cef63 2020-07-23 stsp >> $testroot/stdout.expected
2801 fa3cef63 2020-07-23 stsp echo '--- /dev/null' >> $testroot/stdout.expected
2802 fa3cef63 2020-07-23 stsp echo '+++ zeta.link' >> $testroot/stdout.expected
2803 fa3cef63 2020-07-23 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
2804 fa3cef63 2020-07-23 stsp echo '+gamma/delta' >> $testroot/stdout.expected
2805 fa3cef63 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
2807 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2809 fa3cef63 2020-07-23 stsp if [ "$ret" != "0" ]; then
2810 fa3cef63 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2811 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2815 fa3cef63 2020-07-23 stsp (cd $testroot/wt && got commit -m "staged symlink" \
2816 fa3cef63 2020-07-23 stsp > $testroot/stdout)
2818 fa3cef63 2020-07-23 stsp if [ "$ret" != "0" ]; then
2819 fa3cef63 2020-07-23 stsp echo "got commit command failed unexpectedly" >&2
2820 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2824 fa3cef63 2020-07-23 stsp local commit_id=`git_show_head $testroot/repo`
2825 fa3cef63 2020-07-23 stsp echo "A dotgotfoo.link" > $testroot/stdout.expected
2826 fa3cef63 2020-07-23 stsp echo "A zeta.link" >> $testroot/stdout.expected
2827 fa3cef63 2020-07-23 stsp echo "M alpha.link" >> $testroot/stdout.expected
2828 fa3cef63 2020-07-23 stsp echo "M epsilon.link" >> $testroot/stdout.expected
2829 fa3cef63 2020-07-23 stsp echo "D nonexistent.link" >> $testroot/stdout.expected
2830 fa3cef63 2020-07-23 stsp echo "Created commit $commit_id" >> $testroot/stdout.expected
2831 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2833 fa3cef63 2020-07-23 stsp if [ "$ret" != "0" ]; then
2834 fa3cef63 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2835 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2839 fa3cef63 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id > $testroot/stdout
2841 fa3cef63 2020-07-23 stsp if [ "$ret" != "0" ]; then
2842 fa3cef63 2020-07-23 stsp echo "got tree command failed unexpectedly" >&2
2843 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2847 fa3cef63 2020-07-23 stsp cat > $testroot/stdout.expected <<EOF
2849 fa3cef63 2020-07-23 stsp alpha.link@ -> beta
2851 fa3cef63 2020-07-23 stsp dotgotfoo.link
2853 fa3cef63 2020-07-23 stsp epsilon.link@ -> gamma
2855 fa3cef63 2020-07-23 stsp passwd.link@ -> /etc/passwd
2856 fa3cef63 2020-07-23 stsp zeta.link@ -> gamma/delta
2858 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2860 fa3cef63 2020-07-23 stsp if [ "$ret" != "0" ]; then
2861 fa3cef63 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2865 fa3cef63 2020-07-23 stsp if [ -h $testroot/wt/alpha.link ]; then
2866 fa3cef63 2020-07-23 stsp echo "alpha.link is a symlink"
2867 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2871 fa3cef63 2020-07-23 stsp echo 'this is regular file alpha.link' > $testroot/content.expected
2872 fa3cef63 2020-07-23 stsp cp $testroot/wt/alpha.link $testroot/content
2873 c631b115 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2875 c631b115 2020-07-23 stsp if [ "$ret" != "0" ]; then
2876 c631b115 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2877 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2881 fa3cef63 2020-07-23 stsp if [ ! -h $testroot/wt/dotgotbar.link ]; then
2882 fa3cef63 2020-07-23 stsp echo "dotgotbar.link is not a symlink"
2883 fa3cef63 2020-07-23 stsp test_done "$testroot" "1"
2886 fa3cef63 2020-07-23 stsp readlink $testroot/wt/dotgotbar.link > $testroot/stdout
2887 fa3cef63 2020-07-23 stsp echo ".got/bar" > $testroot/stdout.expected
2888 fa3cef63 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2890 fa3cef63 2020-07-23 stsp if [ "$ret" != "0" ]; then
2891 fa3cef63 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2892 fa3cef63 2020-07-23 stsp test_done "$testroot" "$ret"
2896 c631b115 2020-07-23 stsp if [ -h $testroot/wt/dotgotfoo.link ]; then
2897 c631b115 2020-07-23 stsp echo "dotgotfoo.link is a symlink"
2898 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2901 c631b115 2020-07-23 stsp echo "this is regular file foo" > $testroot/content.expected
2902 c631b115 2020-07-23 stsp cp $testroot/wt/dotgotfoo.link $testroot/content
2903 c631b115 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2905 c631b115 2020-07-23 stsp if [ "$ret" != "0" ]; then
2906 c631b115 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2907 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2911 c631b115 2020-07-23 stsp if ! [ -h $testroot/wt/epsilon.link ]; then
2912 c631b115 2020-07-23 stsp echo "epsilon.link is not a symlink"
2913 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2917 c631b115 2020-07-23 stsp readlink $testroot/wt/epsilon.link > $testroot/stdout
2918 c631b115 2020-07-23 stsp echo "gamma" > $testroot/stdout.expected
2919 c631b115 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2921 c631b115 2020-07-23 stsp if [ "$ret" != "0" ]; then
2922 c631b115 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2923 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2927 c631b115 2020-07-23 stsp if [ -h $testroot/wt/passwd.link ]; then
2928 c631b115 2020-07-23 stsp echo "passwd.link is a symlink"
2929 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2932 c631b115 2020-07-23 stsp echo -n "/etc/passwd" > $testroot/content.expected
2933 c631b115 2020-07-23 stsp cp $testroot/wt/passwd.link $testroot/content
2934 c631b115 2020-07-23 stsp cmp -s $testroot/content.expected $testroot/content
2936 c631b115 2020-07-23 stsp if [ "$ret" != "0" ]; then
2937 c631b115 2020-07-23 stsp diff -u $testroot/content.expected $testroot/content
2938 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2942 c631b115 2020-07-23 stsp if ! [ -h $testroot/wt/zeta.link ]; then
2943 c631b115 2020-07-23 stsp echo "zeta.link is not a symlink"
2944 c631b115 2020-07-23 stsp test_done "$testroot" "1"
2948 c631b115 2020-07-23 stsp readlink $testroot/wt/zeta.link > $testroot/stdout
2949 c631b115 2020-07-23 stsp echo "gamma/delta" > $testroot/stdout.expected
2950 c631b115 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
2952 c631b115 2020-07-23 stsp if [ "$ret" != "0" ]; then
2953 c631b115 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
2954 c631b115 2020-07-23 stsp test_done "$testroot" "$ret"
2958 c631b115 2020-07-23 stsp test_done "$testroot" "0"
2961 7fb414ae 2020-08-08 stsp test_parseargs "$@"
2962 fccbfb98 2019-08-03 stsp run_test test_stage_basic
2963 31b20a6e 2019-08-06 stsp run_test test_stage_no_changes
2964 8b13ce36 2019-08-08 stsp run_test test_stage_unversioned
2965 8564cb21 2019-08-08 stsp run_test test_stage_nonexistent
2966 a4f692bb 2019-08-04 stsp run_test test_stage_list
2967 ebf48fd5 2019-08-03 stsp run_test test_stage_conflict
2968 735ef5ac 2019-08-03 stsp run_test test_stage_out_of_date
2969 d3e7c587 2019-08-03 stsp run_test test_double_stage
2970 c363b2c1 2019-08-03 stsp run_test test_stage_status
2971 1e1446d3 2019-08-03 stsp run_test test_stage_add_already_staged_file
2972 9acbc4fa 2019-08-03 stsp run_test test_stage_rm_already_staged_file
2973 24278f30 2019-08-03 stsp run_test test_stage_revert
2974 408b4ebc 2019-08-03 stsp run_test test_stage_diff
2975 b9622844 2019-08-03 stsp run_test test_stage_histedit
2976 243d7cf1 2019-08-03 stsp run_test test_stage_rebase
2977 a76c42e6 2019-08-03 stsp run_test test_stage_update
2978 f0b75401 2019-08-03 stsp run_test test_stage_commit_non_staged
2979 0f1cfa7f 2019-08-08 stsp run_test test_stage_commit_out_of_date
2980 5f8a88c6 2019-08-03 stsp run_test test_stage_commit
2981 dc424a06 2019-08-07 stsp run_test test_stage_patch
2982 af5a81b2 2019-08-08 stsp run_test test_stage_patch_twice
2983 dc424a06 2019-08-07 stsp run_test test_stage_patch_added
2984 e70a841e 2019-08-08 stsp run_test test_stage_patch_added_twice
2985 dc424a06 2019-08-07 stsp run_test test_stage_patch_removed
2986 e70a841e 2019-08-08 stsp run_test test_stage_patch_removed_twice
2987 b353a198 2019-08-07 stsp run_test test_stage_patch_quit
2988 eba70f38 2019-08-08 stsp run_test test_stage_patch_incomplete_script
2989 c631b115 2020-07-23 stsp run_test test_stage_symlink
2990 fa3cef63 2020-07-23 stsp run_test test_stage_patch_symlink
