3 069bbb86 2022-03-07 thomas # Copyright (c) 2022 Omar Polo <op@openbsd.org>
5 069bbb86 2022-03-07 thomas # Permission to use, copy, modify, and distribute this software for any
6 069bbb86 2022-03-07 thomas # purpose with or without fee is hereby granted, provided that the above
7 069bbb86 2022-03-07 thomas # copyright notice and this permission notice appear in all copies.
9 069bbb86 2022-03-07 thomas # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 069bbb86 2022-03-07 thomas # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 069bbb86 2022-03-07 thomas # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 069bbb86 2022-03-07 thomas # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 069bbb86 2022-03-07 thomas # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 069bbb86 2022-03-07 thomas # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 069bbb86 2022-03-07 thomas # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 069bbb86 2022-03-07 thomas . ./common.sh
19 069bbb86 2022-03-07 thomas test_patch_simple_add_file() {
20 069bbb86 2022-03-07 thomas local testroot=`test_init patch_simple_add_file`
22 069bbb86 2022-03-07 thomas got checkout $testroot/repo $testroot/wt > /dev/null
24 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
25 069bbb86 2022-03-07 thomas test_done $testroot $ret
29 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
30 069bbb86 2022-03-07 thomas --- /dev/null
32 069bbb86 2022-03-07 thomas @@ -0,0 +1 @@
36 069bbb86 2022-03-07 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
38 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
39 069bbb86 2022-03-07 thomas test_done $testroot $ret
43 069bbb86 2022-03-07 thomas echo "A eta" > $testroot/stdout.expected
44 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
46 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
47 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
48 069bbb86 2022-03-07 thomas test_done $testroot $ret
52 069bbb86 2022-03-07 thomas echo eta > $testroot/wt/eta.expected
53 069bbb86 2022-03-07 thomas cmp -s $testroot/wt/eta.expected $testroot/wt/eta
55 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
56 069bbb86 2022-03-07 thomas diff -u $testroot/wt/eta.expected $testroot/wt/eta
58 069bbb86 2022-03-07 thomas test_done $testroot $ret
61 069bbb86 2022-03-07 thomas test_patch_simple_rm_file() {
62 069bbb86 2022-03-07 thomas local testroot=`test_init patch_simple_rm_file`
64 069bbb86 2022-03-07 thomas got checkout $testroot/repo $testroot/wt > /dev/null
66 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
67 069bbb86 2022-03-07 thomas test_done $testroot $ret
71 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
73 069bbb86 2022-03-07 thomas +++ /dev/null
74 069bbb86 2022-03-07 thomas @@ -1 +0,0 @@
78 069bbb86 2022-03-07 thomas echo "D alpha" > $testroot/stdout.expected
80 069bbb86 2022-03-07 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
82 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
83 069bbb86 2022-03-07 thomas test_done $testroot $ret
87 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
89 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
90 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
91 069bbb86 2022-03-07 thomas test_done $testroot $ret
95 069bbb86 2022-03-07 thomas if [ -f $testroot/wt/alpha ]; then
97 069bbb86 2022-03-07 thomas echo "alpha still exists!"
99 069bbb86 2022-03-07 thomas test_done $testroot $ret
102 069bbb86 2022-03-07 thomas test_patch_simple_edit_file() {
103 069bbb86 2022-03-07 thomas local testroot=`test_init patch_simple_edit_file`
105 069bbb86 2022-03-07 thomas got checkout $testroot/repo $testroot/wt > /dev/null
107 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
108 069bbb86 2022-03-07 thomas test_done $testroot $ret
112 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
113 069bbb86 2022-03-07 thomas --- alpha
114 069bbb86 2022-03-07 thomas +++ alpha
115 069bbb86 2022-03-07 thomas @@ -1 +1 @@
117 069bbb86 2022-03-07 thomas +alpha is my favourite character
120 069bbb86 2022-03-07 thomas echo "M alpha" > $testroot/stdout.expected
122 069bbb86 2022-03-07 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
124 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
125 069bbb86 2022-03-07 thomas test_done $testroot $ret
129 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
131 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
132 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
133 069bbb86 2022-03-07 thomas test_done $testroot $ret
137 069bbb86 2022-03-07 thomas echo 'alpha is my favourite character' > $testroot/wt/alpha.expected
138 069bbb86 2022-03-07 thomas cmp -s $testroot/wt/alpha.expected $testroot/wt/alpha
140 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
141 069bbb86 2022-03-07 thomas diff -u $testroot/wt/alpha.expected $testroot/wt/alpha
143 069bbb86 2022-03-07 thomas test_done $testroot $ret
146 069bbb86 2022-03-07 thomas test_patch_prepend_line() {
147 069bbb86 2022-03-07 thomas local testroot=`test_init patch_prepend_line`
149 069bbb86 2022-03-07 thomas got checkout $testroot/repo $testroot/wt > /dev/null
151 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
152 069bbb86 2022-03-07 thomas test_done $testroot $ret
156 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
157 069bbb86 2022-03-07 thomas --- alpha
158 069bbb86 2022-03-07 thomas +++ alpha
159 069bbb86 2022-03-07 thomas @@ -1 +1,2 @@
160 069bbb86 2022-03-07 thomas +hatsuseno
164 069bbb86 2022-03-07 thomas echo "M alpha" > $testroot/stdout.expected
166 069bbb86 2022-03-07 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
168 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
169 069bbb86 2022-03-07 thomas test_done $testroot $ret
173 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
175 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
176 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
177 069bbb86 2022-03-07 thomas test_done $testroot $ret
181 069bbb86 2022-03-07 thomas echo hatsuseno > $testroot/wt/alpha.expected
182 069bbb86 2022-03-07 thomas echo alpha >> $testroot/wt/alpha.expected
183 069bbb86 2022-03-07 thomas cmp -s $testroot/wt/alpha.expected $testroot/wt/alpha
185 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
186 069bbb86 2022-03-07 thomas diff -u $testroot/wt/alpha.expected $testroot/wt/alpha
188 069bbb86 2022-03-07 thomas test_done $testroot $ret
191 069bbb86 2022-03-07 thomas test_patch_replace_line() {
192 069bbb86 2022-03-07 thomas local testroot=`test_init patch_replace_line`
194 069bbb86 2022-03-07 thomas got checkout $testroot/repo $testroot/wt > /dev/null
196 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
197 069bbb86 2022-03-07 thomas test_done $testroot $ret
201 069bbb86 2022-03-07 thomas jot 10 > $testroot/wt/numbers
202 069bbb86 2022-03-07 thomas (cd $testroot/wt/ && got add numbers && got ci -m 'add numbers') \
203 069bbb86 2022-03-07 thomas >/dev/null
205 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
206 069bbb86 2022-03-07 thomas test_done $testroot $ret
210 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
211 069bbb86 2022-03-07 thomas --- numbers
212 069bbb86 2022-03-07 thomas +++ numbers
213 069bbb86 2022-03-07 thomas @@ -3,7 +3,7 @@
224 069bbb86 2022-03-07 thomas echo "M numbers" > $testroot/stdout.expected
226 069bbb86 2022-03-07 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
228 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
229 069bbb86 2022-03-07 thomas test_done $testroot $ret
233 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
235 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
236 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
237 069bbb86 2022-03-07 thomas test_done $testroot $ret
241 069bbb86 2022-03-07 thomas jot 10 | sed 's/6/foo/' > $testroot/wt/numbers.expected
242 069bbb86 2022-03-07 thomas cmp -s $testroot/wt/numbers.expected $testroot/wt/numbers
244 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
245 069bbb86 2022-03-07 thomas diff -u $testroot/wt/numbers.expected $testroot/wt/numbers
247 069bbb86 2022-03-07 thomas test_done $testroot $ret
250 069bbb86 2022-03-07 thomas test_patch_multiple_hunks() {
251 02e4f0d8 2022-03-08 thomas local testroot=`test_init patch_replace_multiple_hunks`
253 069bbb86 2022-03-07 thomas got checkout $testroot/repo $testroot/wt > /dev/null
255 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
256 069bbb86 2022-03-07 thomas test_done $testroot $ret
260 069bbb86 2022-03-07 thomas jot 100 > $testroot/wt/numbers
261 069bbb86 2022-03-07 thomas (cd $testroot/wt/ && got add numbers && got ci -m 'add numbers') \
262 069bbb86 2022-03-07 thomas >/dev/null
264 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
265 069bbb86 2022-03-07 thomas test_done $testroot $ret
269 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
270 069bbb86 2022-03-07 thomas --- numbers
271 069bbb86 2022-03-07 thomas +++ numbers
272 069bbb86 2022-03-07 thomas @@ -3,7 +3,7 @@
281 069bbb86 2022-03-07 thomas @@ -57,7 +57,7 @@
290 069bbb86 2022-03-07 thomas @@ -98,3 +98,6 @@
299 069bbb86 2022-03-07 thomas echo "M numbers" > $testroot/stdout.expected
301 069bbb86 2022-03-07 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
303 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
304 069bbb86 2022-03-07 thomas test_done $testroot $ret
308 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
310 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
311 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
312 069bbb86 2022-03-07 thomas test_done $testroot $ret
316 069bbb86 2022-03-07 thomas jot 100 | sed -e 's/^6$/foo/' -e 's/^60$/foo foo/' \
317 069bbb86 2022-03-07 thomas > $testroot/wt/numbers.expected
318 069bbb86 2022-03-07 thomas echo "101" >> $testroot/wt/numbers.expected
319 069bbb86 2022-03-07 thomas echo "102" >> $testroot/wt/numbers.expected
320 069bbb86 2022-03-07 thomas echo "..." >> $testroot/wt/numbers.expected
322 069bbb86 2022-03-07 thomas cmp -s $testroot/wt/numbers.expected $testroot/wt/numbers
324 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
325 069bbb86 2022-03-07 thomas diff -u $testroot/wt/numbers.expected $testroot/wt/numbers
327 069bbb86 2022-03-07 thomas test_done $testroot $ret
330 069bbb86 2022-03-07 thomas test_patch_multiple_files() {
331 069bbb86 2022-03-07 thomas local testroot=`test_init patch_multiple_files`
333 069bbb86 2022-03-07 thomas got checkout $testroot/repo $testroot/wt > /dev/null
335 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
336 069bbb86 2022-03-07 thomas test_done $testroot $ret
340 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
341 069bbb86 2022-03-07 thomas --- alpha Mon Mar 7 19:02:07 2022
342 069bbb86 2022-03-07 thomas +++ alpha Mon Mar 7 19:01:53 2022
343 069bbb86 2022-03-07 thomas @@ -1 +1,3 @@
346 069bbb86 2022-03-07 thomas +available
347 069bbb86 2022-03-07 thomas --- beta Mon Mar 7 19:02:11 2022
348 069bbb86 2022-03-07 thomas +++ beta Mon Mar 7 19:01:46 2022
349 069bbb86 2022-03-07 thomas @@ -1 +1,3 @@
352 069bbb86 2022-03-07 thomas +improved
353 069bbb86 2022-03-07 thomas --- gamma/delta Mon Mar 7 19:02:17 2022
354 069bbb86 2022-03-07 thomas +++ gamma/delta Mon Mar 7 19:01:37 2022
355 069bbb86 2022-03-07 thomas @@ -1 +1 @@
357 069bbb86 2022-03-07 thomas +delta new
360 069bbb86 2022-03-07 thomas echo "M alpha" > $testroot/stdout.expected
361 069bbb86 2022-03-07 thomas echo "M beta" >> $testroot/stdout.expected
362 069bbb86 2022-03-07 thomas echo "M gamma/delta" >> $testroot/stdout.expected
364 069bbb86 2022-03-07 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
366 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
367 02e4f0d8 2022-03-08 thomas test_done $testroot $ret
371 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
373 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
374 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
375 069bbb86 2022-03-07 thomas test_done $testroot $ret
379 069bbb86 2022-03-07 thomas printf 'new\nalpha\navailable\n' > $testroot/wt/alpha.expected
380 069bbb86 2022-03-07 thomas printf 'beta\nwas\nimproved\n' > $testroot/wt/beta.expected
381 069bbb86 2022-03-07 thomas printf 'delta new\n' > $testroot/wt/gamma/delta.expected
383 069bbb86 2022-03-07 thomas for f in alpha beta gamma/delta; do
384 069bbb86 2022-03-07 thomas cmp -s $testroot/wt/$f.expected $testroot/wt/$f
386 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
387 069bbb86 2022-03-07 thomas diff -u $testroot/wt/$f.expected $testroot/wt/$f
388 069bbb86 2022-03-07 thomas test_done $testroot $ret
393 069bbb86 2022-03-07 thomas test_done $testroot 0
396 069bbb86 2022-03-07 thomas test_patch_dont_apply() {
397 069bbb86 2022-03-07 thomas local testroot=`test_init patch_dont_apply`
399 069bbb86 2022-03-07 thomas got checkout $testroot/repo $testroot/wt > /dev/null
401 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
402 069bbb86 2022-03-07 thomas test_done $testroot $ret
406 7dd42450 2022-03-13 thomas jot 100 > $testroot/wt/numbers
407 7dd42450 2022-03-13 thomas (cd $testroot/wt && got add numbers && got commit -m 'add numbers') \
408 7dd42450 2022-03-13 thomas >/dev/null
410 7dd42450 2022-03-13 thomas if [ $ret -ne 0 ]; then
411 7dd42450 2022-03-13 thomas test_done $testroot $ret
415 7dd42450 2022-03-13 thomas cat <<EOF > $testroot/wt/patch
416 49114f01 2022-03-22 thomas --- alpha
417 49114f01 2022-03-22 thomas +++ alpha
418 49114f01 2022-03-22 thomas @@ -1 +1,2 @@
419 49114f01 2022-03-22 thomas +hatsuseno
420 49114f01 2022-03-22 thomas alpha something
421 7dd42450 2022-03-13 thomas --- numbers
422 7dd42450 2022-03-13 thomas +++ /dev/null
423 7dd42450 2022-03-13 thomas @@ -1,9 +0,0 @@
435 49114f01 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout 2> /dev/null
437 7dd42450 2022-03-13 thomas if [ $ret -eq 0 ]; then # should fail
438 7dd42450 2022-03-13 thomas test_done $testroot 1
442 49114f01 2022-03-22 thomas cat <<EOF > $testroot/stdout.expected
444 49114f01 2022-03-22 thomas @@ -1,1 +1,2 @@ hunk failed to apply
445 49114f01 2022-03-22 thomas # numbers
446 49114f01 2022-03-22 thomas @@ -1,9 +0,0 @@ hunk failed to apply
449 49114f01 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
451 7dd42450 2022-03-13 thomas if [ $ret -ne 0 ]; then
452 49114f01 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
454 069bbb86 2022-03-07 thomas test_done $testroot $ret
457 069bbb86 2022-03-07 thomas test_patch_malformed() {
458 069bbb86 2022-03-07 thomas local testroot=`test_init patch_malformed`
460 069bbb86 2022-03-07 thomas got checkout $testroot/repo $testroot/wt > /dev/null
462 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
463 069bbb86 2022-03-07 thomas test_done $testroot $ret
467 069bbb86 2022-03-07 thomas # missing "@@"
468 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
469 069bbb86 2022-03-07 thomas --- alpha
470 069bbb86 2022-03-07 thomas +++ alpha
471 069bbb86 2022-03-07 thomas @@ -1 +1,2
472 069bbb86 2022-03-07 thomas +hatsuseno
476 069bbb86 2022-03-07 thomas echo -n > $testroot/stdout.expected
477 069bbb86 2022-03-07 thomas echo "got: malformed patch" > $testroot/stderr.expected
479 069bbb86 2022-03-07 thomas (cd $testroot/wt && got patch patch) \
480 069bbb86 2022-03-07 thomas > $testroot/stdout \
481 069bbb86 2022-03-07 thomas 2> $testroot/stderr
483 10cdd9aa 2022-03-08 thomas if [ $ret -eq 0 ]; then
484 069bbb86 2022-03-07 thomas echo "got managed to apply an invalid patch"
485 069bbb86 2022-03-07 thomas test_done $testroot 1
489 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
491 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
492 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
493 069bbb86 2022-03-07 thomas test_done $testroot $ret
497 069bbb86 2022-03-07 thomas cmp -s $testroot/stderr.expected $testroot/stderr
499 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
500 069bbb86 2022-03-07 thomas diff -u $testroot/stderr.expected $testroot/stderr
501 069bbb86 2022-03-07 thomas test_done $testroot $ret
505 069bbb86 2022-03-07 thomas # wrong first character
506 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
507 069bbb86 2022-03-07 thomas --- alpha
508 069bbb86 2022-03-07 thomas +++ alpha
509 069bbb86 2022-03-07 thomas @@ -1 +1,2 @@
510 069bbb86 2022-03-07 thomas +hatsuseno
514 88c260f4 2022-05-14 thomas (cd $testroot/wt && got patch patch) \
515 88c260f4 2022-05-14 thomas > $testroot/stdout \
516 88c260f4 2022-05-14 thomas 2> $testroot/stderr
518 88c260f4 2022-05-14 thomas if [ $ret -eq 0 ]; then
519 88c260f4 2022-05-14 thomas echo "got managed to apply an invalid patch"
520 88c260f4 2022-05-14 thomas test_done $testroot 1
524 88c260f4 2022-05-14 thomas cmp -s $testroot/stdout.expected $testroot/stdout
526 88c260f4 2022-05-14 thomas if [ $ret -ne 0 ]; then
527 88c260f4 2022-05-14 thomas diff -u $testroot/stdout.expected $testroot/stdout
528 88c260f4 2022-05-14 thomas test_done $testroot $ret
532 88c260f4 2022-05-14 thomas cmp -s $testroot/stderr.expected $testroot/stderr
534 88c260f4 2022-05-14 thomas if [ $ret -ne 0 ]; then
535 88c260f4 2022-05-14 thomas diff -u $testroot/stderr.expected $testroot/stderr
536 88c260f4 2022-05-14 thomas test_done $testroot $ret
540 88c260f4 2022-05-14 thomas # empty hunk
541 88c260f4 2022-05-14 thomas cat <<EOF > $testroot/wt/patch
542 88c260f4 2022-05-14 thomas diff --git a/alpha b/iota
543 88c260f4 2022-05-14 thomas --- a/alpha
544 88c260f4 2022-05-14 thomas +++ b/iota
545 88c260f4 2022-05-14 thomas @@ -0,0 +0,0 @@
548 069bbb86 2022-03-07 thomas (cd $testroot/wt && got patch patch) \
549 069bbb86 2022-03-07 thomas > $testroot/stdout \
550 069bbb86 2022-03-07 thomas 2> $testroot/stderr
552 10cdd9aa 2022-03-08 thomas if [ $ret -eq 0 ]; then
553 069bbb86 2022-03-07 thomas echo "got managed to apply an invalid patch"
554 069bbb86 2022-03-07 thomas test_done $testroot 1
558 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
560 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
561 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
562 069bbb86 2022-03-07 thomas test_done $testroot $ret
566 069bbb86 2022-03-07 thomas cmp -s $testroot/stderr.expected $testroot/stderr
568 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
569 069bbb86 2022-03-07 thomas diff -u $testroot/stderr.expected $testroot/stderr
570 069bbb86 2022-03-07 thomas test_done $testroot $ret
574 069bbb86 2022-03-07 thomas test_done $testroot $ret
577 069bbb86 2022-03-07 thomas test_patch_no_patch() {
578 069bbb86 2022-03-07 thomas local testroot=`test_init patch_no_patch`
580 069bbb86 2022-03-07 thomas got checkout $testroot/repo $testroot/wt > /dev/null
582 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
583 069bbb86 2022-03-07 thomas test_done $testroot $ret
587 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
588 069bbb86 2022-03-07 thomas hello world!
591 069bbb86 2022-03-07 thomas some other nonsense
594 069bbb86 2022-03-07 thomas there's no patch in here!
597 069bbb86 2022-03-07 thomas echo -n > $testroot/stdout.expected
598 069bbb86 2022-03-07 thomas echo "got: no patch found" > $testroot/stderr.expected
600 069bbb86 2022-03-07 thomas (cd $testroot/wt && got patch patch) \
601 069bbb86 2022-03-07 thomas > $testroot/stdout \
602 069bbb86 2022-03-07 thomas 2> $testroot/stderr
604 10cdd9aa 2022-03-08 thomas if [ $ret -eq 0 ]; then # should fail
605 069bbb86 2022-03-07 thomas test_done $testroot 1
609 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
611 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
612 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
613 069bbb86 2022-03-07 thomas test_done $testroot $ret
617 069bbb86 2022-03-07 thomas cmp -s $testroot/stderr.expected $testroot/stderr
619 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
620 069bbb86 2022-03-07 thomas diff -u $testroot/stderr.expected $testroot/stderr
621 069bbb86 2022-03-07 thomas test_done $testroot $ret
625 069bbb86 2022-03-07 thomas test_done $testroot $ret
628 069bbb86 2022-03-07 thomas test_patch_equals_for_context() {
629 9a49df74 2022-04-23 thomas local testroot=`test_init patch_equals_for_context`
631 069bbb86 2022-03-07 thomas got checkout $testroot/repo $testroot/wt > /dev/null
633 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
634 069bbb86 2022-03-07 thomas test_done $testroot $ret
638 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
639 069bbb86 2022-03-07 thomas --- alpha
640 069bbb86 2022-03-07 thomas +++ alpha
641 069bbb86 2022-03-07 thomas @@ -1 +1,2 @@
642 069bbb86 2022-03-07 thomas +hatsuseno
646 069bbb86 2022-03-07 thomas echo "M alpha" > $testroot/stdout.expected
648 069bbb86 2022-03-07 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
650 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
651 069bbb86 2022-03-07 thomas test_done $testroot $ret
655 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
657 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
658 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
659 069bbb86 2022-03-07 thomas test_done $testroot $ret
663 069bbb86 2022-03-07 thomas echo hatsuseno > $testroot/wt/alpha.expected
664 069bbb86 2022-03-07 thomas echo alpha >> $testroot/wt/alpha.expected
665 069bbb86 2022-03-07 thomas cmp -s $testroot/wt/alpha.expected $testroot/wt/alpha
667 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
668 069bbb86 2022-03-07 thomas diff -u $testroot/wt/alpha.expected $testroot/wt/alpha
670 069bbb86 2022-03-07 thomas test_done $testroot $ret
673 bb2ad8ff 2022-03-13 thomas test_patch_rename() {
674 bb2ad8ff 2022-03-13 thomas local testroot=`test_init patch_rename`
676 bb2ad8ff 2022-03-13 thomas got checkout $testroot/repo $testroot/wt > /dev/null
678 bb2ad8ff 2022-03-13 thomas if [ $ret -ne 0 ]; then
679 bb2ad8ff 2022-03-13 thomas test_done $testroot $ret
683 bb2ad8ff 2022-03-13 thomas cat <<EOF > $testroot/wt/patch
684 8afe1f71 2022-05-12 thomas diff --git a/beta b/iota
685 8afe1f71 2022-05-12 thomas similarity index 100%
686 8afe1f71 2022-05-12 thomas rename from beta
687 8afe1f71 2022-05-12 thomas rename to iota
688 be53ddb1 2022-03-22 thomas diff --git a/alpha b/eta
689 be53ddb1 2022-03-22 thomas --- a/alpha
690 be53ddb1 2022-03-22 thomas +++ b/eta
691 8afe1f71 2022-05-12 thomas @@ -1 +1 @@
696 8afe1f71 2022-05-12 thomas echo 'D beta' > $testroot/stdout.expected
697 8afe1f71 2022-05-12 thomas echo 'A iota' >> $testroot/stdout.expected
698 8afe1f71 2022-05-12 thomas echo 'D alpha' >> $testroot/stdout.expected
699 8afe1f71 2022-05-12 thomas echo 'A eta' >> $testroot/stdout.expected
701 bb2ad8ff 2022-03-13 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
703 bb2ad8ff 2022-03-13 thomas if [ $ret -ne 0 ]; then
704 bb2ad8ff 2022-03-13 thomas test_done $testroot $ret
708 bb2ad8ff 2022-03-13 thomas cmp -s $testroot/stdout.expected $testroot/stdout
710 bb2ad8ff 2022-03-13 thomas if [ $ret -ne 0 ]; then
711 bb2ad8ff 2022-03-13 thomas diff -u $testroot/stdout.expected $testroot/stdout
712 bb2ad8ff 2022-03-13 thomas test_done $testroot $ret
716 8afe1f71 2022-05-12 thomas if [ -f $testroot/wt/alpha -o -f $testroot/wt/beta ]; then
717 8afe1f71 2022-05-12 thomas echo "alpha or beta were not removed" >&2
718 bb2ad8ff 2022-03-13 thomas test_done $testroot 1
721 8afe1f71 2022-05-12 thomas if [ ! -f $testroot/wt/iota -o ! -f $testroot/wt/eta ]; then
722 8afe1f71 2022-05-12 thomas echo "iota or eta were not created" >&2
723 bb2ad8ff 2022-03-13 thomas test_done $testroot 1
727 8afe1f71 2022-05-12 thomas echo beta > $testroot/wt/iota.expected
728 8afe1f71 2022-05-12 thomas cmp -s $testroot/wt/iota.expected $testroot/wt/iota
730 bb2ad8ff 2022-03-13 thomas if [ $ret -ne 0 ]; then
731 8afe1f71 2022-05-12 thomas diff -u $testroot/wt/iota.expected $testroot/wt/iota
732 bb2ad8ff 2022-03-13 thomas test_done $testroot $ret
736 8afe1f71 2022-05-12 thomas echo eta > $testroot/wt/eta.expected
737 8afe1f71 2022-05-12 thomas cmp -s $testroot/wt/eta.expected $testroot/wt/eta
739 bb2ad8ff 2022-03-13 thomas if [ $ret -ne 0 ]; then
740 8afe1f71 2022-05-12 thomas diff -u $testroot/wt/eta.expected $testroot/wt/eta
741 bb2ad8ff 2022-03-13 thomas test_done $testroot $ret
745 bb2ad8ff 2022-03-13 thomas test_done $testroot $ret
748 10e55613 2022-03-22 thomas test_patch_illegal_status() {
749 10e55613 2022-03-22 thomas local testroot=`test_init patch_illegal_status`
751 10e55613 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
753 10e55613 2022-03-22 thomas if [ $ret -ne 0 ]; then
754 10e55613 2022-03-22 thomas test_done $testroot $ret
758 49114f01 2022-03-22 thomas # try to patch an obstructed file, add a versioned one, edit a
759 49114f01 2022-03-22 thomas # non existent file and an unversioned one, and remove a
760 49114f01 2022-03-22 thomas # non existent file.
761 10e55613 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
762 49114f01 2022-03-22 thomas --- alpha
763 49114f01 2022-03-22 thomas +++ alpha
764 49114f01 2022-03-22 thomas @@ -1 +1,2 @@
766 49114f01 2022-03-22 thomas +was edited
767 49114f01 2022-03-22 thomas --- /dev/null
769 49114f01 2022-03-22 thomas @@ -0,0 +1 @@
773 10e55613 2022-03-22 thomas @@ -1 +1 @@
776 49114f01 2022-03-22 thomas --- kappa
777 49114f01 2022-03-22 thomas +++ kappa
778 49114f01 2022-03-22 thomas @@ -1 +1 @@
781 49114f01 2022-03-22 thomas --- lambda
782 49114f01 2022-03-22 thomas +++ /dev/null
783 49114f01 2022-03-22 thomas @@ -1 +0,0 @@
787 49114f01 2022-03-22 thomas echo kappa > $testroot/wt/kappa
788 10e55613 2022-03-22 thomas rm $testroot/wt/alpha
789 10e55613 2022-03-22 thomas mkdir $testroot/wt/alpha
791 49114f01 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout \
792 10e55613 2022-03-22 thomas 2> $testroot/stderr
794 10e55613 2022-03-22 thomas if [ $ret -eq 0 ]; then
795 10e55613 2022-03-22 thomas echo "edited a missing file" >&2
796 4e2bdb0d 2022-06-13 thomas test_done $testroot 1
800 49114f01 2022-03-22 thomas cat <<EOF > $testroot/stdout.expected
808 49114f01 2022-03-22 thomas cat <<EOF > $testroot/stderr.expected
809 49114f01 2022-03-22 thomas got: alpha: file has unexpected status
810 49114f01 2022-03-22 thomas got: beta: file has unexpected status
811 49114f01 2022-03-22 thomas got: iota: No such file or directory
812 49114f01 2022-03-22 thomas got: kappa: file has unexpected status
813 49114f01 2022-03-22 thomas got: lambda: No such file or directory
814 49114f01 2022-03-22 thomas got: patch failed to apply
817 49114f01 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
819 49114f01 2022-03-22 thomas if [ $ret -ne 0 ]; then
820 49114f01 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
821 10e55613 2022-03-22 thomas test_done $testroot $ret
825 10e55613 2022-03-22 thomas cmp -s $testroot/stderr.expected $testroot/stderr
827 49114f01 2022-03-22 thomas if [ $ret -ne 0 ]; then
828 10e55613 2022-03-22 thomas diff -u $testroot/stderr.expected $testroot/stderr
829 814624e7 2022-03-22 thomas test_done $testroot $ret
833 814624e7 2022-03-22 thomas (cd $testroot/wt && got status) > $testroot/stdout
834 814624e7 2022-03-22 thomas cat <<EOF > $testroot/stdout.expected
840 814624e7 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
842 814624e7 2022-03-22 thomas if [ $ret -ne 0 ]; then
843 814624e7 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
845 eaf99875 2022-03-22 thomas test_done $testroot $ret
848 eaf99875 2022-03-22 thomas test_patch_nop() {
849 eaf99875 2022-03-22 thomas local testroot=`test_init patch_nop`
851 eaf99875 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
853 eaf99875 2022-03-22 thomas if [ $ret -ne 0 ]; then
854 eaf99875 2022-03-22 thomas test_done $testroot $ret
858 eaf99875 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
859 eaf99875 2022-03-22 thomas --- alpha
860 eaf99875 2022-03-22 thomas +++ alpha
861 eaf99875 2022-03-22 thomas @@ -1 +1 @@
863 eaf99875 2022-03-22 thomas +cafe alpha
865 eaf99875 2022-03-22 thomas +++ /dev/null
866 eaf99875 2022-03-22 thomas @@ -1 +0,0 @@
868 be53ddb1 2022-03-22 thomas diff --git a/gamma/delta b/gamma/delta.new
869 eaf99875 2022-03-22 thomas --- gamma/delta
870 eaf99875 2022-03-22 thomas +++ gamma/delta.new
871 eaf99875 2022-03-22 thomas @@ -1 +1 @@
873 eaf99875 2022-03-22 thomas +delta updated and renamed!
876 eaf99875 2022-03-22 thomas (cd $testroot/wt && got patch -n patch)
878 eaf99875 2022-03-22 thomas if [ $ret -ne 0 ]; then
879 eaf99875 2022-03-22 thomas test_done $testroot $ret
883 eaf99875 2022-03-22 thomas # remove the patch to avoid the ? entry
884 eaf99875 2022-03-22 thomas rm $testroot/wt/patch
886 eaf99875 2022-03-22 thomas (cd $testroot/wt && got status) > $testroot/stdout
888 eaf99875 2022-03-22 thomas if [ $ret -ne 0 ]; then
889 eaf99875 2022-03-22 thomas test_done $testroot $ret
893 eaf99875 2022-03-22 thomas echo -n > $testroot/stdout.expected
894 eaf99875 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
896 eaf99875 2022-03-22 thomas if [ $ret -ne 0 ]; then
897 eaf99875 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
899 10e55613 2022-03-22 thomas test_done $testroot $ret
902 da09d8ed 2022-03-22 thomas test_patch_preserve_perm() {
903 da09d8ed 2022-03-22 thomas local testroot=`test_init patch_preserve_perm`
905 da09d8ed 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
907 da09d8ed 2022-03-22 thomas if [ $ret -ne 0 ]; then
908 da09d8ed 2022-03-22 thomas test_done $testroot $ret
912 da09d8ed 2022-03-22 thomas chmod +x $testroot/wt/alpha
913 da09d8ed 2022-03-22 thomas (cd $testroot/wt && got commit -m 'alpha executable') > /dev/null
915 da09d8ed 2022-03-22 thomas if [ $ret -ne 0 ]; then
916 da09d8ed 2022-03-22 thomas test_done $testroot $ret
920 da09d8ed 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
921 da09d8ed 2022-03-22 thomas --- alpha
922 da09d8ed 2022-03-22 thomas +++ alpha
923 da09d8ed 2022-03-22 thomas @@ -1 +1,2 @@
925 da09d8ed 2022-03-22 thomas +was edited
928 da09d8ed 2022-03-22 thomas (cd $testroot/wt && got patch patch) > /dev/null
930 da09d8ed 2022-03-22 thomas if [ $ret -ne 0 ]; then
931 da09d8ed 2022-03-22 thomas test_done $testroot $ret
935 da09d8ed 2022-03-22 thomas if [ ! -x $testroot/wt/alpha ]; then
936 da09d8ed 2022-03-22 thomas echo "alpha is no more executable!" >&2
937 da09d8ed 2022-03-22 thomas test_done $testroot 1
940 e0c1f81c 2022-03-22 thomas test_done $testroot 0
943 e0c1f81c 2022-03-22 thomas test_patch_create_dirs() {
944 e0c1f81c 2022-03-22 thomas local testroot=`test_init patch_create_dirs`
946 e0c1f81c 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
948 e0c1f81c 2022-03-22 thomas if [ $ret -ne 0 ]; then
949 e0c1f81c 2022-03-22 thomas test_done $testroot $ret
953 e0c1f81c 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
954 e0c1f81c 2022-03-22 thomas --- /dev/null
955 e0c1f81c 2022-03-22 thomas +++ iota/kappa/lambda
956 e0c1f81c 2022-03-22 thomas @@ -0,0 +1 @@
960 e0c1f81c 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
962 e0c1f81c 2022-03-22 thomas if [ $ret -ne 0 ]; then
963 e0c1f81c 2022-03-22 thomas test_done $testroot $ret
967 e0c1f81c 2022-03-22 thomas echo 'A iota/kappa/lambda' >> $testroot/stdout.expected
968 e0c1f81c 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
970 e0c1f81c 2022-03-22 thomas if [ $ret -ne 0 ]; then
971 e0c1f81c 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
972 e0c1f81c 2022-03-22 thomas test_done $testroot $ret
976 e0c1f81c 2022-03-22 thomas if [ ! -f $testroot/wt/iota/kappa/lambda ]; then
977 e0c1f81c 2022-03-22 thomas echo "file not created!" >&2
978 e0c1f81c 2022-03-22 thomas test_done $testroot $ret
981 da09d8ed 2022-03-22 thomas test_done $testroot 0
984 49114f01 2022-03-22 thomas test_patch_with_offset() {
985 49114f01 2022-03-22 thomas local testroot=`test_init patch_with_offset`
987 49114f01 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
989 49114f01 2022-03-22 thomas if [ $ret -ne 0 ]; then
990 49114f01 2022-03-22 thomas test_done $testroot $ret
994 49114f01 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
995 49114f01 2022-03-22 thomas --- numbers
996 49114f01 2022-03-22 thomas +++ numbers
997 49114f01 2022-03-22 thomas @@ -47,7 +47,7 @@
1002 49114f01 2022-03-22 thomas +midway tru it!
1006 49114f01 2022-03-22 thomas @@ -87,7 +87,7 @@
1011 49114f01 2022-03-22 thomas +almost there!
1017 49114f01 2022-03-22 thomas jot 100 > $testroot/wt/numbers
1018 49114f01 2022-03-22 thomas ed $testroot/wt/numbers <<EOF > /dev/null 2> /dev/null
1020 49114f01 2022-03-22 thomas 50r !jot 20
1025 49114f01 2022-03-22 thomas (cd $testroot/wt && got add numbers && got commit -m '+numbers') \
1026 49114f01 2022-03-22 thomas > /dev/null
1028 49114f01 2022-03-22 thomas if [ $ret -ne 0 ]; then
1029 49114f01 2022-03-22 thomas test_done $testroot $ret
1030 49114f01 2022-03-22 thomas return 1
1033 49114f01 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
1035 49114f01 2022-03-22 thomas if [ $ret -ne 0 ]; then
1036 49114f01 2022-03-22 thomas test_done $testroot/wt $ret
1037 49114f01 2022-03-22 thomas return 1
1040 49114f01 2022-03-22 thomas cat <<EOF > $testroot/stdout.expected
1041 49114f01 2022-03-22 thomas M numbers
1042 49114f01 2022-03-22 thomas @@ -47,7 +47,7 @@ applied with offset -10
1043 49114f01 2022-03-22 thomas @@ -87,7 +87,7 @@ applied with offset 10
1046 be53ddb1 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1048 be53ddb1 2022-03-22 thomas if [ $ret -ne 0 ]; then
1049 be53ddb1 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
1051 be53ddb1 2022-03-22 thomas test_done $testroot $ret
1054 be53ddb1 2022-03-22 thomas test_patch_prefer_new_path() {
1055 be53ddb1 2022-03-22 thomas local testroot=`test_init patch_orig`
1057 be53ddb1 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1059 be53ddb1 2022-03-22 thomas if [ $ret -ne 0 ]; then
1060 be53ddb1 2022-03-22 thomas test_done $testroot $ret
1061 be53ddb1 2022-03-22 thomas return 1
1064 be53ddb1 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
1065 be53ddb1 2022-03-22 thomas --- alpha.orig
1066 be53ddb1 2022-03-22 thomas +++ alpha
1067 be53ddb1 2022-03-22 thomas @@ -1 +1,2 @@
1069 be53ddb1 2022-03-22 thomas +was edited
1072 be53ddb1 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
1074 be53ddb1 2022-03-22 thomas if [ $ret -ne 0 ]; then
1075 be53ddb1 2022-03-22 thomas test_done $testroot $ret
1076 be53ddb1 2022-03-22 thomas return 1
1079 e1c219c8 2022-04-22 thomas echo 'M alpha' > $testroot/stdout.expected
1080 49114f01 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1082 49114f01 2022-03-22 thomas if [ $ret -ne 0 ]; then
1083 49114f01 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
1085 49114f01 2022-03-22 thomas test_done $testroot $ret
1088 ff7f34d3 2022-03-22 thomas test_patch_no_newline() {
1089 ff7f34d3 2022-03-22 thomas local testroot=`test_init patch_no_newline`
1091 ff7f34d3 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1093 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
1094 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
1095 ff7f34d3 2022-03-22 thomas return 1
1098 ff7f34d3 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
1099 ff7f34d3 2022-03-22 thomas --- /dev/null
1101 ff7f34d3 2022-03-22 thomas @@ -0,0 +1 @@
1103 ff7f34d3 2022-03-22 thomas \ No newline at end of file
1106 ff7f34d3 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
1108 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
1109 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
1110 ff7f34d3 2022-03-22 thomas return 1
1113 ff7f34d3 2022-03-22 thomas echo "A eta" > $testroot/stdout.expected
1114 ff7f34d3 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1116 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
1117 ff7f34d3 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
1118 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
1119 ff7f34d3 2022-03-22 thomas return 1
1122 ff7f34d3 2022-03-22 thomas echo -n eta > $testroot/wt/eta.expected
1123 ff7f34d3 2022-03-22 thomas cmp -s $testroot/wt/eta.expected $testroot/wt/eta
1125 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
1126 ff7f34d3 2022-03-22 thomas diff -u $testroot/wt/eta.expected $testroot/wt/eta
1127 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
1128 ff7f34d3 2022-03-22 thomas return 1
1131 ff7f34d3 2022-03-22 thomas (cd $testroot/wt && got commit -m 'add eta') > /dev/null
1133 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
1134 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
1135 ff7f34d3 2022-03-22 thomas return 1
1138 ff7f34d3 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
1141 ff7f34d3 2022-03-22 thomas @@ -1 +1 @@
1143 ff7f34d3 2022-03-22 thomas \ No newline at end of file
1145 ff7f34d3 2022-03-22 thomas \ No newline at end of file
1148 ff7f34d3 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
1150 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
1151 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
1152 ff7f34d3 2022-03-22 thomas return 1
1155 ff7f34d3 2022-03-22 thomas echo "M eta" > $testroot/stdout.expected
1156 ff7f34d3 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1158 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
1159 ff7f34d3 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
1160 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
1161 ff7f34d3 2022-03-22 thomas return 1
1164 ff7f34d3 2022-03-22 thomas echo -n ETA > $testroot/wt/eta.expected
1165 ff7f34d3 2022-03-22 thomas cmp -s $testroot/wt/eta.expected $testroot/wt/eta
1167 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
1168 ff7f34d3 2022-03-22 thomas diff -u $testroot/wt/eta.expected $testroot/wt/eta
1169 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
1170 ff7f34d3 2022-03-22 thomas return 1
1173 ff7f34d3 2022-03-22 thomas (cd $testroot/wt && got commit -m 'edit eta') > /dev/null
1175 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
1176 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
1177 ff7f34d3 2022-03-22 thomas return 1
1180 ff7f34d3 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
1183 ff7f34d3 2022-03-22 thomas @@ -1 +1 @@
1185 ff7f34d3 2022-03-22 thomas \ No newline at end of file
1189 ff7f34d3 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
1191 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
1192 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
1193 ff7f34d3 2022-03-22 thomas return 1
1196 ff7f34d3 2022-03-22 thomas echo "M eta" > $testroot/stdout.expected
1197 ff7f34d3 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1199 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
1200 ff7f34d3 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
1201 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
1202 ff7f34d3 2022-03-22 thomas return 1
1205 ff7f34d3 2022-03-22 thomas echo eta > $testroot/wt/eta.expected
1206 ff7f34d3 2022-03-22 thomas cmp -s $testroot/wt/eta.expected $testroot/wt/eta
1208 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
1209 ff7f34d3 2022-03-22 thomas diff -u $testroot/wt/eta.expected $testroot/wt/eta
1211 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
1214 d9db2ff9 2022-04-16 thomas test_patch_strip() {
1215 d9db2ff9 2022-04-16 thomas local testroot=`test_init patch_strip`
1217 d9db2ff9 2022-04-16 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1219 d9db2ff9 2022-04-16 thomas if [ $ret -ne 0 ]; then
1220 d9db2ff9 2022-04-16 thomas test_done $testroot $ret
1221 d9db2ff9 2022-04-16 thomas return 1
1224 d9db2ff9 2022-04-16 thomas cat <<EOF > $testroot/wt/patch
1225 d9db2ff9 2022-04-16 thomas --- foo/bar/alpha.orig
1226 d9db2ff9 2022-04-16 thomas +++ foo/bar/alpha
1227 d9db2ff9 2022-04-16 thomas @@ -1 +1 @@
1232 d9db2ff9 2022-04-16 thomas (cd $testroot/wt && got patch -p2 patch) > $testroot/stdout
1234 d9db2ff9 2022-04-16 thomas if [ $ret -ne 0 ]; then
1235 d9db2ff9 2022-04-16 thomas test_done $testroot $ret
1236 d9db2ff9 2022-04-16 thomas return 1
1239 d9db2ff9 2022-04-16 thomas echo "M alpha" >> $testroot/stdout.expected
1240 d9db2ff9 2022-04-16 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1242 d9db2ff9 2022-04-16 thomas if [ $ret -ne 0 ]; then
1243 d9db2ff9 2022-04-16 thomas diff -u $testroot/stdout.expected $testroot/stdout
1244 d9db2ff9 2022-04-16 thomas test_done $testroot $ret
1245 d9db2ff9 2022-04-16 thomas return 1
1248 d9db2ff9 2022-04-16 thomas (cd $testroot/wt && got revert alpha) > /dev/null 2>&1
1250 d9db2ff9 2022-04-16 thomas if [ $ret -ne 0 ]; then
1251 d9db2ff9 2022-04-16 thomas test_done $testroot $ret
1252 d9db2ff9 2022-04-16 thomas return 1
1255 d9db2ff9 2022-04-16 thomas (cd $testroot/wt && got patch -p3 patch) \
1256 d9db2ff9 2022-04-16 thomas 2> $testroot/stderr
1258 d9db2ff9 2022-04-16 thomas if [ $ret -eq 0 ]; then
1259 d9db2ff9 2022-04-16 thomas echo "stripped more components than available!"
1260 d9db2ff9 2022-04-16 thomas test_done $testroot 1
1261 d9db2ff9 2022-04-16 thomas return 1
1264 d9db2ff9 2022-04-16 thomas cat <<EOF > $testroot/stderr.expected
1265 d9db2ff9 2022-04-16 thomas got: can't strip 1 path-components from foo/bar/alpha: bad path
1268 d9db2ff9 2022-04-16 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1270 d9db2ff9 2022-04-16 thomas if [ $ret -ne 0 ]; then
1271 d9db2ff9 2022-04-16 thomas diff -u $testroot/stderr.expected $testroot/stderr
1273 d9db2ff9 2022-04-16 thomas test_done $testroot 0
1276 72f46891 2022-04-23 thomas test_patch_relative_paths() {
1277 9a49df74 2022-04-23 thomas local testroot=`test_init patch_relative_paths`
1279 72f46891 2022-04-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1281 72f46891 2022-04-23 thomas if [ $ret -ne 0 ]; then
1282 72f46891 2022-04-23 thomas test_done $testroot $ret
1283 72f46891 2022-04-23 thomas return 1
1286 72f46891 2022-04-23 thomas cat <<EOF > $testroot/wt/gamma/patch
1287 72f46891 2022-04-23 thomas --- delta
1288 72f46891 2022-04-23 thomas +++ delta
1289 72f46891 2022-04-23 thomas @@ -1 +1 @@
1292 72f46891 2022-04-23 thomas --- /dev/null
1294 72f46891 2022-04-23 thomas @@ -0,0 +1 @@
1298 72f46891 2022-04-23 thomas (cd $testroot/wt/gamma && got patch patch) > $testroot/stdout
1300 72f46891 2022-04-23 thomas if [ $ret -ne 0 ]; then
1301 72f46891 2022-04-23 thomas test_done $testroot $ret
1302 72f46891 2022-04-23 thomas return 1
1305 72f46891 2022-04-23 thomas echo 'M gamma/delta' > $testroot/stdout.expected
1306 72f46891 2022-04-23 thomas echo 'A gamma/eta' >> $testroot/stdout.expected
1308 cfbf5531 2022-04-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1310 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1311 cfbf5531 2022-04-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1313 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1316 cfbf5531 2022-04-23 thomas test_patch_with_path_prefix() {
1317 cfbf5531 2022-04-23 thomas local testroot=`test_init patch_with_path_prefix`
1319 cfbf5531 2022-04-23 thomas got checkout -p gamma $testroot/repo $testroot/wt > /dev/null
1321 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1322 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1323 cfbf5531 2022-04-23 thomas return 1
1326 cfbf5531 2022-04-23 thomas cat <<EOF > $testroot/wt/patch
1327 cfbf5531 2022-04-23 thomas --- delta
1328 cfbf5531 2022-04-23 thomas +++ delta
1329 cfbf5531 2022-04-23 thomas @@ -1 +1 @@
1332 cfbf5531 2022-04-23 thomas --- /dev/null
1334 cfbf5531 2022-04-23 thomas @@ -0,0 +1 @@
1338 cfbf5531 2022-04-23 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
1340 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1341 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1342 cfbf5531 2022-04-23 thomas return 1
1345 cfbf5531 2022-04-23 thomas echo 'M delta' > $testroot/stdout.expected
1346 cfbf5531 2022-04-23 thomas echo 'A eta' >> $testroot/stdout.expected
1348 cfbf5531 2022-04-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1350 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1351 cfbf5531 2022-04-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1353 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1356 cfbf5531 2022-04-23 thomas test_patch_relpath_with_path_prefix() {
1357 cfbf5531 2022-04-23 thomas local testroot=`test_init patch_relpaths_with_path_prefix`
1359 cfbf5531 2022-04-23 thomas got checkout -p gamma $testroot/repo $testroot/wt > /dev/null
1361 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1362 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1363 cfbf5531 2022-04-23 thomas return 1
1366 cfbf5531 2022-04-23 thomas mkdir -p $testroot/wt/epsilon/zeta/
1368 cfbf5531 2022-04-23 thomas cat <<EOF > $testroot/wt/patch
1369 cfbf5531 2022-04-23 thomas --- /dev/null
1370 cfbf5531 2022-04-23 thomas +++ zeta/theta
1371 cfbf5531 2022-04-23 thomas @@ -0,0 +1 @@
1375 cfbf5531 2022-04-23 thomas (cd $testroot/wt/epsilon/zeta && got patch -p1 $testroot/wt/patch) \
1376 cfbf5531 2022-04-23 thomas > $testroot/stdout
1378 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1379 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1380 cfbf5531 2022-04-23 thomas return 1
1383 cfbf5531 2022-04-23 thomas echo 'A epsilon/zeta/theta' >> $testroot/stdout.expected
1385 72f46891 2022-04-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1387 72f46891 2022-04-23 thomas if [ $ret -ne 0 ]; then
1388 72f46891 2022-04-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1389 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1390 cfbf5531 2022-04-23 thomas return 1
1393 cfbf5531 2022-04-23 thomas echo 'theta' > $testroot/theta.expected
1394 cfbf5531 2022-04-23 thomas cmp -s $testroot/wt/epsilon/zeta/theta $testroot/theta.expected
1396 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1397 cfbf5531 2022-04-23 thomas diff -u $testroot/wt/epsilon/zeta/theta $testroot/theta.expected
1399 72f46891 2022-04-23 thomas test_done $testroot $ret
1402 eaef698f 2022-04-23 thomas test_patch_reverse() {
1403 eaef698f 2022-04-23 thomas local testroot=`test_init patch_reverse`
1405 eaef698f 2022-04-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1407 eaef698f 2022-04-23 thomas if [ $ret -ne 0 ]; then
1408 eaef698f 2022-04-23 thomas test_done $testroot $ret
1409 eaef698f 2022-04-23 thomas return 1
1412 eaef698f 2022-04-23 thomas cat <<EOF > $testroot/wt/patch
1413 eaef698f 2022-04-23 thomas --- alpha
1414 eaef698f 2022-04-23 thomas +++ alpha
1415 eaef698f 2022-04-23 thomas @@ -1 +1 @@
1417 eaef698f 2022-04-23 thomas \ No newline at end of file
1421 eaef698f 2022-04-23 thomas (cd $testroot/wt && got patch -R patch) > $testroot/stdout
1423 eaef698f 2022-04-23 thomas if [ $ret -ne 0 ]; then
1424 eaef698f 2022-04-23 thomas test_done $testroot $ret
1425 eaef698f 2022-04-23 thomas return 1
1428 eaef698f 2022-04-23 thomas echo "M alpha" > $testroot/stdout.expected
1429 eaef698f 2022-04-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1431 eaef698f 2022-04-23 thomas if [ $ret -ne 0 ]; then
1432 eaef698f 2022-04-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1433 eaef698f 2022-04-23 thomas test_done $testroot $ret
1434 eaef698f 2022-04-23 thomas return 1
1437 eaef698f 2022-04-23 thomas echo -n ALPHA > $testroot/wt/alpha.expected
1438 eaef698f 2022-04-23 thomas cmp -s $testroot/wt/alpha.expected $testroot/wt/alpha
1440 eaef698f 2022-04-23 thomas if [ $ret -ne 0 ]; then
1441 eaef698f 2022-04-23 thomas diff -u $testroot/wt/alpha.expected $testroot/wt/alpha
1443 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1446 0f76ab83 2022-06-23 thomas test_patch_merge_simple() {
1447 0f76ab83 2022-06-23 thomas local testroot=`test_init patch_merge_simple`
1449 0f76ab83 2022-06-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1451 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1452 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1453 0f76ab83 2022-06-23 thomas return 1
1456 0f76ab83 2022-06-23 thomas jot 10 > $testroot/wt/numbers
1457 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got add numbers && got commit -m +numbers) \
1458 0f76ab83 2022-06-23 thomas > /dev/null
1460 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1461 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1462 0f76ab83 2022-06-23 thomas return 1
1465 0f76ab83 2022-06-23 thomas jot 10 | sed 's/4/four/g' > $testroot/wt/numbers
1467 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got diff > $testroot/old.diff \
1468 0f76ab83 2022-06-23 thomas && got revert numbers) >/dev/null
1470 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1471 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1472 0f76ab83 2022-06-23 thomas return 1
1475 0f76ab83 2022-06-23 thomas jot 10 | sed 's/6/six/g' > $testroot/wt/numbers
1476 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got commit -m 'edit numbers') \
1477 0f76ab83 2022-06-23 thomas > /dev/null
1479 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1480 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1481 0f76ab83 2022-06-23 thomas return 1
1484 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got patch $testroot/old.diff) \
1485 0f76ab83 2022-06-23 thomas 2>&1 > /dev/null
1487 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1488 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1489 0f76ab83 2022-06-23 thomas return 1
1492 0f76ab83 2022-06-23 thomas jot 10 | sed -e s/4/four/ -e s/6/six/ > $testroot/wt/numbers.expected
1493 0f76ab83 2022-06-23 thomas cmp -s $testroot/wt/numbers $testroot/wt/numbers.expected
1495 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1496 0f76ab83 2022-06-23 thomas diff -u $testroot/wt/numbers $testroot/wt/numbers.expected
1498 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1501 0f76ab83 2022-06-23 thomas test_patch_merge_conflict() {
1502 0f76ab83 2022-06-23 thomas local testroot=`test_init patch_merge_conflict`
1504 0f76ab83 2022-06-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1506 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1507 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1508 0f76ab83 2022-06-23 thomas return 1
1511 0f76ab83 2022-06-23 thomas jot 10 > $testroot/wt/numbers
1512 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got add numbers && got commit -m +numbers) \
1513 0f76ab83 2022-06-23 thomas > /dev/null
1515 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1516 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1517 0f76ab83 2022-06-23 thomas return 1
1520 016bfe4b 2022-06-23 thomas local commit_id=`git_show_head $testroot/repo`
1522 0f76ab83 2022-06-23 thomas jot 10 | sed 's/6/six/g' > $testroot/wt/numbers
1524 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got diff > $testroot/old.diff \
1525 0f76ab83 2022-06-23 thomas && got revert numbers) >/dev/null
1527 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1528 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1529 0f76ab83 2022-06-23 thomas return 1
1532 0f76ab83 2022-06-23 thomas jot 10 | sed 's/6/3+3/g' > $testroot/wt/numbers
1533 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got commit -m 'edit numbers') \
1534 0f76ab83 2022-06-23 thomas > /dev/null
1536 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1537 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1538 0f76ab83 2022-06-23 thomas return 1
1541 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got patch $testroot/old.diff) \
1542 0f76ab83 2022-06-23 thomas >/dev/null 2>&1
1544 0f76ab83 2022-06-23 thomas if [ $ret -eq 0 ]; then
1545 0f76ab83 2022-06-23 thomas echo "got patch merged a diff that should conflict" >&2
1546 0f76ab83 2022-06-23 thomas test_done $testroot 0
1547 0f76ab83 2022-06-23 thomas return 1
1550 0f76ab83 2022-06-23 thomas # XXX: prefixing every line with a tab otherwise got thinks
1551 0f76ab83 2022-06-23 thomas # the file has conflicts in it.
1552 0f76ab83 2022-06-23 thomas cat <<-EOF > $testroot/wt/numbers.expected
1558 0f76ab83 2022-06-23 thomas <<<<<<< --- numbers
1560 016bfe4b 2022-06-23 thomas ||||||| commit $commit_id
1564 0f76ab83 2022-06-23 thomas >>>>>>> +++ numbers
1571 0f76ab83 2022-06-23 thomas cmp -s $testroot/wt/numbers $testroot/wt/numbers.expected
1573 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1574 0f76ab83 2022-06-23 thomas diff -u $testroot/wt/numbers $testroot/wt/numbers.expected
1576 eaef698f 2022-04-23 thomas test_done $testroot $ret
1579 0f76ab83 2022-06-23 thomas test_patch_merge_unknown_blob() {
1580 0f76ab83 2022-06-23 thomas local testroot=`test_init patch_merge_unknown_blob`
1582 0f76ab83 2022-06-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1584 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1585 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1586 0f76ab83 2022-06-23 thomas return 1
1589 0f76ab83 2022-06-23 thomas cat <<EOF > $testroot/wt/patch
1590 0f76ab83 2022-06-23 thomas I've got a
1591 c9a4f4fa 2022-06-23 thomas diff aaaabbbbccccddddeeeeffff0000111122223333 foo/bar
1593 0f76ab83 2022-06-23 thomas blob - aaaabbbbccccddddeeeeffff0000111122223333
1594 0f76ab83 2022-06-23 thomas and also a
1595 c9a4f4fa 2022-06-23 thomas blob + 0000111122223333444455556666777788889999
1596 0f76ab83 2022-06-23 thomas for this dummy diff
1597 0f76ab83 2022-06-23 thomas --- alpha
1598 0f76ab83 2022-06-23 thomas +++ alpha
1599 0f76ab83 2022-06-23 thomas @@ -1 +1 @@
1602 0f76ab83 2022-06-23 thomas will it work?
1605 0f76ab83 2022-06-23 thomas (cd $testroot/wt/ && got patch patch) > $testroot/stdout
1607 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1608 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1609 0f76ab83 2022-06-23 thomas return 1
1612 0f76ab83 2022-06-23 thomas echo 'M alpha' > $testroot/stdout.expected
1613 0f76ab83 2022-06-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1615 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1616 0f76ab83 2022-06-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1617 c9a4f4fa 2022-06-23 thomas test_done $testroot $ret
1618 c9a4f4fa 2022-06-23 thomas return 1
1621 c9a4f4fa 2022-06-23 thomas # try again without a `diff' header
1623 c9a4f4fa 2022-06-23 thomas cat <<EOF > $testroot/wt/patch
1624 c9a4f4fa 2022-06-23 thomas I've got a
1625 c9a4f4fa 2022-06-23 thomas blob - aaaabbbbccccddddeeeeffff0000111122223333
1626 c9a4f4fa 2022-06-23 thomas and also a
1627 c9a4f4fa 2022-06-23 thomas blob + 0000111122223333444455556666777788889999
1628 c9a4f4fa 2022-06-23 thomas for this dummy diff
1629 c9a4f4fa 2022-06-23 thomas --- alpha
1630 c9a4f4fa 2022-06-23 thomas +++ alpha
1631 c9a4f4fa 2022-06-23 thomas @@ -1 +1 @@
1634 c9a4f4fa 2022-06-23 thomas will it work?
1637 c9a4f4fa 2022-06-23 thomas (cd $testroot/wt && got revert alpha > /dev/null && got patch patch) \
1638 c9a4f4fa 2022-06-23 thomas > $testroot/stdout
1640 c9a4f4fa 2022-06-23 thomas if [ $ret -ne 0 ]; then
1641 c9a4f4fa 2022-06-23 thomas test_done $testroot $ret
1642 c9a4f4fa 2022-06-23 thomas return 1
1645 c9a4f4fa 2022-06-23 thomas echo 'M alpha' > $testroot/stdout.expected
1646 c9a4f4fa 2022-06-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1648 c9a4f4fa 2022-06-23 thomas if [ $ret -ne 0 ]; then
1649 c9a4f4fa 2022-06-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1651 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1654 069bbb86 2022-03-07 thomas test_parseargs "$@"
1655 069bbb86 2022-03-07 thomas run_test test_patch_simple_add_file
1656 069bbb86 2022-03-07 thomas run_test test_patch_simple_rm_file
1657 069bbb86 2022-03-07 thomas run_test test_patch_simple_edit_file
1658 069bbb86 2022-03-07 thomas run_test test_patch_prepend_line
1659 069bbb86 2022-03-07 thomas run_test test_patch_replace_line
1660 069bbb86 2022-03-07 thomas run_test test_patch_multiple_hunks
1661 069bbb86 2022-03-07 thomas run_test test_patch_multiple_files
1662 069bbb86 2022-03-07 thomas run_test test_patch_dont_apply
1663 069bbb86 2022-03-07 thomas run_test test_patch_malformed
1664 069bbb86 2022-03-07 thomas run_test test_patch_no_patch
1665 069bbb86 2022-03-07 thomas run_test test_patch_equals_for_context
1666 bb2ad8ff 2022-03-13 thomas run_test test_patch_rename
1667 10e55613 2022-03-22 thomas run_test test_patch_illegal_status
1668 eaf99875 2022-03-22 thomas run_test test_patch_nop
1669 da09d8ed 2022-03-22 thomas run_test test_patch_preserve_perm
1670 e0c1f81c 2022-03-22 thomas run_test test_patch_create_dirs
1671 49114f01 2022-03-22 thomas run_test test_patch_with_offset
1672 be53ddb1 2022-03-22 thomas run_test test_patch_prefer_new_path
1673 ff7f34d3 2022-03-22 thomas run_test test_patch_no_newline
1674 d9db2ff9 2022-04-16 thomas run_test test_patch_strip
1675 72f46891 2022-04-23 thomas run_test test_patch_relative_paths
1676 cfbf5531 2022-04-23 thomas run_test test_patch_with_path_prefix
1677 cfbf5531 2022-04-23 thomas run_test test_patch_relpath_with_path_prefix
1678 eaef698f 2022-04-23 thomas run_test test_patch_reverse
1679 0f76ab83 2022-06-23 thomas run_test test_patch_merge_simple
1680 0f76ab83 2022-06-23 thomas run_test test_patch_merge_conflict
1681 0f76ab83 2022-06-23 thomas run_test test_patch_merge_unknown_blob
