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 3b6e8f19 2022-08-06 thomas test_patch_basic() {
20 3b6e8f19 2022-08-06 thomas local testroot=`test_init patch_basic`
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 3b6e8f19 2022-08-06 thomas jot 100 > $testroot/wt/numbers
30 3b6e8f19 2022-08-06 thomas (cd $testroot/wt && got add numbers && got commit -m +numbers) \
31 3b6e8f19 2022-08-06 thomas >/dev/null
33 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
34 3b6e8f19 2022-08-06 thomas test_done "$testroot" $ret
38 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
41 069bbb86 2022-03-07 thomas @@ -1 +1 @@
43 069bbb86 2022-03-07 thomas +alpha is my favourite character
45 3b6e8f19 2022-08-06 thomas +++ /dev/null
46 3b6e8f19 2022-08-06 thomas @@ -1 +0,0 @@
48 3b6e8f19 2022-08-06 thomas --- gamma/delta
49 3b6e8f19 2022-08-06 thomas +++ gamma/delta
50 069bbb86 2022-03-07 thomas @@ -1 +1,2 @@
53 3b6e8f19 2022-08-06 thomas --- /dev/null
55 3b6e8f19 2022-08-06 thomas @@ -0,0 +5,5 @@
61 069bbb86 2022-03-07 thomas --- numbers
62 069bbb86 2022-03-07 thomas +++ numbers
63 069bbb86 2022-03-07 thomas @@ -3,7 +3,7 @@
72 069bbb86 2022-03-07 thomas @@ -57,7 +57,7 @@
81 069bbb86 2022-03-07 thomas @@ -98,3 +98,6 @@
90 ce3641f6 2022-10-16 thomas (cd $testroot/wt && got patch < patch) > $testroot/stdout
91 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
92 3b6e8f19 2022-08-06 thomas test_done "$testroot" $ret
96 3b6e8f19 2022-08-06 thomas echo 'M alpha' > $testroot/stdout.expected
97 3b6e8f19 2022-08-06 thomas echo 'D beta' >> $testroot/stdout.expected
98 3b6e8f19 2022-08-06 thomas echo 'M gamma/delta' >> $testroot/stdout.expected
99 3b6e8f19 2022-08-06 thomas echo 'A eta' >> $testroot/stdout.expected
100 3b6e8f19 2022-08-06 thomas echo 'M numbers' >> $testroot/stdout.expected
102 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
104 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
105 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
106 069bbb86 2022-03-07 thomas test_done $testroot $ret
110 3b6e8f19 2022-08-06 thomas echo 'alpha is my favourite character' > $testroot/wt/alpha.expected
111 3b6e8f19 2022-08-06 thomas cmp -s $testroot/wt/alpha.expected $testroot/wt/alpha
113 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
114 3b6e8f19 2022-08-06 thomas diff -u $testroot/wt/alpha.expected $testroot/wt/alpha
115 3b6e8f19 2022-08-06 thomas test_done "$testroot" $ret
119 3b6e8f19 2022-08-06 thomas if [ -f "$testroot/wt/beta" ]; then
120 3b6e8f19 2022-08-06 thomas echo "beta was not deleted!" >&2
121 3b6e8f19 2022-08-06 thomas test_done "$testroot" 1
125 3b6e8f19 2022-08-06 thomas echo 'this is:' > $testroot/wt/gamma/delta.expected
126 3b6e8f19 2022-08-06 thomas echo 'delta' >> $testroot/wt/gamma/delta.expected
127 3b6e8f19 2022-08-06 thomas cmp -s $testroot/wt/gamma/delta.expected $testroot/wt/gamma/delta
129 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
130 3b6e8f19 2022-08-06 thomas diff -u $testroot/wt/gamma/delta.expected $testroot/wt/gamma/delta
131 3b6e8f19 2022-08-06 thomas test_done "$testroot" $ret
135 3b6e8f19 2022-08-06 thomas jot 5 > $testroot/wt/eta.expected
136 3b6e8f19 2022-08-06 thomas cmp -s $testroot/wt/eta.expected $testroot/wt/eta
138 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
139 3b6e8f19 2022-08-06 thomas diff -u $testroot/wt/eta.expected $testroot/wt/eta
140 3b6e8f19 2022-08-06 thomas test_done "$testroot" $ret
144 3b6e8f19 2022-08-06 thomas jot 103 | sed -e 's/^6$/six/' -e 's/60/sixty/' \
145 3b6e8f19 2022-08-06 thomas > $testroot/wt/numbers.expected
146 3b6e8f19 2022-08-06 thomas cmp -s $testroot/wt/numbers.expected $testroot/wt/numbers
148 3b6e8f19 2022-08-06 thomas if [ $ret -ne 0 ]; then
149 3b6e8f19 2022-08-06 thomas diff -u $testroot/wt/numbers.expected $testroot/wt/numbers
151 3b6e8f19 2022-08-06 thomas test_done $testroot $ret
154 069bbb86 2022-03-07 thomas test_patch_dont_apply() {
155 069bbb86 2022-03-07 thomas local testroot=`test_init patch_dont_apply`
157 069bbb86 2022-03-07 thomas got checkout $testroot/repo $testroot/wt > /dev/null
159 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
160 069bbb86 2022-03-07 thomas test_done $testroot $ret
164 7dd42450 2022-03-13 thomas jot 100 > $testroot/wt/numbers
165 7dd42450 2022-03-13 thomas (cd $testroot/wt && got add numbers && got commit -m 'add numbers') \
166 7dd42450 2022-03-13 thomas >/dev/null
168 7dd42450 2022-03-13 thomas if [ $ret -ne 0 ]; then
169 7dd42450 2022-03-13 thomas test_done $testroot $ret
173 7dd42450 2022-03-13 thomas cat <<EOF > $testroot/wt/patch
174 49114f01 2022-03-22 thomas --- alpha
175 49114f01 2022-03-22 thomas +++ alpha
176 49114f01 2022-03-22 thomas @@ -1 +1,2 @@
177 49114f01 2022-03-22 thomas +hatsuseno
178 49114f01 2022-03-22 thomas alpha something
179 7dd42450 2022-03-13 thomas --- numbers
180 7dd42450 2022-03-13 thomas +++ /dev/null
181 7dd42450 2022-03-13 thomas @@ -1,9 +0,0 @@
193 49114f01 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout 2> /dev/null
195 7dd42450 2022-03-13 thomas if [ $ret -eq 0 ]; then # should fail
196 7dd42450 2022-03-13 thomas test_done $testroot 1
200 49114f01 2022-03-22 thomas cat <<EOF > $testroot/stdout.expected
202 49114f01 2022-03-22 thomas @@ -1,1 +1,2 @@ hunk failed to apply
203 49114f01 2022-03-22 thomas # numbers
204 49114f01 2022-03-22 thomas @@ -1,9 +0,0 @@ hunk failed to apply
207 49114f01 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
209 7dd42450 2022-03-13 thomas if [ $ret -ne 0 ]; then
210 49114f01 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
212 069bbb86 2022-03-07 thomas test_done $testroot $ret
215 069bbb86 2022-03-07 thomas test_patch_malformed() {
216 069bbb86 2022-03-07 thomas local testroot=`test_init patch_malformed`
218 069bbb86 2022-03-07 thomas got checkout $testroot/repo $testroot/wt > /dev/null
220 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
221 069bbb86 2022-03-07 thomas test_done $testroot $ret
225 069bbb86 2022-03-07 thomas # missing "@@"
226 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
227 069bbb86 2022-03-07 thomas --- alpha
228 069bbb86 2022-03-07 thomas +++ alpha
229 069bbb86 2022-03-07 thomas @@ -1 +1,2
230 069bbb86 2022-03-07 thomas +hatsuseno
234 069bbb86 2022-03-07 thomas echo -n > $testroot/stdout.expected
235 069bbb86 2022-03-07 thomas echo "got: malformed patch" > $testroot/stderr.expected
237 069bbb86 2022-03-07 thomas (cd $testroot/wt && got patch patch) \
238 069bbb86 2022-03-07 thomas > $testroot/stdout \
239 069bbb86 2022-03-07 thomas 2> $testroot/stderr
241 10cdd9aa 2022-03-08 thomas if [ $ret -eq 0 ]; then
242 069bbb86 2022-03-07 thomas echo "got managed to apply an invalid patch"
243 069bbb86 2022-03-07 thomas test_done $testroot 1
247 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
249 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
250 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
251 069bbb86 2022-03-07 thomas test_done $testroot $ret
255 069bbb86 2022-03-07 thomas cmp -s $testroot/stderr.expected $testroot/stderr
257 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
258 069bbb86 2022-03-07 thomas diff -u $testroot/stderr.expected $testroot/stderr
259 069bbb86 2022-03-07 thomas test_done $testroot $ret
263 069bbb86 2022-03-07 thomas # wrong first character
264 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
265 069bbb86 2022-03-07 thomas --- alpha
266 069bbb86 2022-03-07 thomas +++ alpha
267 069bbb86 2022-03-07 thomas @@ -1 +1,2 @@
268 069bbb86 2022-03-07 thomas +hatsuseno
272 88c260f4 2022-05-14 thomas (cd $testroot/wt && got patch patch) \
273 88c260f4 2022-05-14 thomas > $testroot/stdout \
274 88c260f4 2022-05-14 thomas 2> $testroot/stderr
276 88c260f4 2022-05-14 thomas if [ $ret -eq 0 ]; then
277 88c260f4 2022-05-14 thomas echo "got managed to apply an invalid patch"
278 88c260f4 2022-05-14 thomas test_done $testroot 1
282 88c260f4 2022-05-14 thomas cmp -s $testroot/stdout.expected $testroot/stdout
284 88c260f4 2022-05-14 thomas if [ $ret -ne 0 ]; then
285 88c260f4 2022-05-14 thomas diff -u $testroot/stdout.expected $testroot/stdout
286 88c260f4 2022-05-14 thomas test_done $testroot $ret
290 88c260f4 2022-05-14 thomas cmp -s $testroot/stderr.expected $testroot/stderr
292 88c260f4 2022-05-14 thomas if [ $ret -ne 0 ]; then
293 88c260f4 2022-05-14 thomas diff -u $testroot/stderr.expected $testroot/stderr
294 88c260f4 2022-05-14 thomas test_done $testroot $ret
298 88c260f4 2022-05-14 thomas # empty hunk
299 88c260f4 2022-05-14 thomas cat <<EOF > $testroot/wt/patch
300 88c260f4 2022-05-14 thomas diff --git a/alpha b/iota
301 88c260f4 2022-05-14 thomas --- a/alpha
302 88c260f4 2022-05-14 thomas +++ b/iota
303 88c260f4 2022-05-14 thomas @@ -0,0 +0,0 @@
306 069bbb86 2022-03-07 thomas (cd $testroot/wt && got patch patch) \
307 069bbb86 2022-03-07 thomas > $testroot/stdout \
308 069bbb86 2022-03-07 thomas 2> $testroot/stderr
310 10cdd9aa 2022-03-08 thomas if [ $ret -eq 0 ]; then
311 069bbb86 2022-03-07 thomas echo "got managed to apply an invalid patch"
312 069bbb86 2022-03-07 thomas test_done $testroot 1
316 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
318 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
319 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
320 069bbb86 2022-03-07 thomas test_done $testroot $ret
324 069bbb86 2022-03-07 thomas cmp -s $testroot/stderr.expected $testroot/stderr
326 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
327 069bbb86 2022-03-07 thomas diff -u $testroot/stderr.expected $testroot/stderr
328 069bbb86 2022-03-07 thomas test_done $testroot $ret
332 069bbb86 2022-03-07 thomas test_done $testroot $ret
335 069bbb86 2022-03-07 thomas test_patch_no_patch() {
336 069bbb86 2022-03-07 thomas local testroot=`test_init patch_no_patch`
338 069bbb86 2022-03-07 thomas got checkout $testroot/repo $testroot/wt > /dev/null
340 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
341 069bbb86 2022-03-07 thomas test_done $testroot $ret
345 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
346 069bbb86 2022-03-07 thomas hello world!
349 069bbb86 2022-03-07 thomas some other nonsense
352 069bbb86 2022-03-07 thomas there's no patch in here!
355 069bbb86 2022-03-07 thomas echo -n > $testroot/stdout.expected
356 069bbb86 2022-03-07 thomas echo "got: no patch found" > $testroot/stderr.expected
358 069bbb86 2022-03-07 thomas (cd $testroot/wt && got patch patch) \
359 069bbb86 2022-03-07 thomas > $testroot/stdout \
360 069bbb86 2022-03-07 thomas 2> $testroot/stderr
362 10cdd9aa 2022-03-08 thomas if [ $ret -eq 0 ]; then # should fail
363 069bbb86 2022-03-07 thomas test_done $testroot 1
367 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
369 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
370 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
371 069bbb86 2022-03-07 thomas test_done $testroot $ret
375 069bbb86 2022-03-07 thomas cmp -s $testroot/stderr.expected $testroot/stderr
377 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
378 069bbb86 2022-03-07 thomas diff -u $testroot/stderr.expected $testroot/stderr
379 069bbb86 2022-03-07 thomas test_done $testroot $ret
383 069bbb86 2022-03-07 thomas test_done $testroot $ret
386 069bbb86 2022-03-07 thomas test_patch_equals_for_context() {
387 9a49df74 2022-04-23 thomas local testroot=`test_init patch_equals_for_context`
389 069bbb86 2022-03-07 thomas got checkout $testroot/repo $testroot/wt > /dev/null
391 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
392 069bbb86 2022-03-07 thomas test_done $testroot $ret
396 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
397 069bbb86 2022-03-07 thomas --- alpha
398 069bbb86 2022-03-07 thomas +++ alpha
399 069bbb86 2022-03-07 thomas @@ -1 +1,2 @@
400 069bbb86 2022-03-07 thomas +hatsuseno
404 069bbb86 2022-03-07 thomas echo "M alpha" > $testroot/stdout.expected
406 069bbb86 2022-03-07 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
408 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
409 069bbb86 2022-03-07 thomas test_done $testroot $ret
413 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
415 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
416 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
417 069bbb86 2022-03-07 thomas test_done $testroot $ret
421 069bbb86 2022-03-07 thomas echo hatsuseno > $testroot/wt/alpha.expected
422 069bbb86 2022-03-07 thomas echo alpha >> $testroot/wt/alpha.expected
423 069bbb86 2022-03-07 thomas cmp -s $testroot/wt/alpha.expected $testroot/wt/alpha
425 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
426 069bbb86 2022-03-07 thomas diff -u $testroot/wt/alpha.expected $testroot/wt/alpha
428 069bbb86 2022-03-07 thomas test_done $testroot $ret
431 bb2ad8ff 2022-03-13 thomas test_patch_rename() {
432 bb2ad8ff 2022-03-13 thomas local testroot=`test_init patch_rename`
434 bb2ad8ff 2022-03-13 thomas got checkout $testroot/repo $testroot/wt > /dev/null
436 bb2ad8ff 2022-03-13 thomas if [ $ret -ne 0 ]; then
437 bb2ad8ff 2022-03-13 thomas test_done $testroot $ret
441 bb2ad8ff 2022-03-13 thomas cat <<EOF > $testroot/wt/patch
442 8afe1f71 2022-05-12 thomas diff --git a/beta b/iota
443 8afe1f71 2022-05-12 thomas similarity index 100%
444 8afe1f71 2022-05-12 thomas rename from beta
445 8afe1f71 2022-05-12 thomas rename to iota
446 be53ddb1 2022-03-22 thomas diff --git a/alpha b/eta
447 be53ddb1 2022-03-22 thomas --- a/alpha
448 be53ddb1 2022-03-22 thomas +++ b/eta
449 8afe1f71 2022-05-12 thomas @@ -1 +1 @@
454 8afe1f71 2022-05-12 thomas echo 'D beta' > $testroot/stdout.expected
455 8afe1f71 2022-05-12 thomas echo 'A iota' >> $testroot/stdout.expected
456 8afe1f71 2022-05-12 thomas echo 'D alpha' >> $testroot/stdout.expected
457 8afe1f71 2022-05-12 thomas echo 'A eta' >> $testroot/stdout.expected
459 bb2ad8ff 2022-03-13 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
461 bb2ad8ff 2022-03-13 thomas if [ $ret -ne 0 ]; then
462 bb2ad8ff 2022-03-13 thomas test_done $testroot $ret
466 bb2ad8ff 2022-03-13 thomas cmp -s $testroot/stdout.expected $testroot/stdout
468 bb2ad8ff 2022-03-13 thomas if [ $ret -ne 0 ]; then
469 bb2ad8ff 2022-03-13 thomas diff -u $testroot/stdout.expected $testroot/stdout
470 bb2ad8ff 2022-03-13 thomas test_done $testroot $ret
474 8afe1f71 2022-05-12 thomas if [ -f $testroot/wt/alpha -o -f $testroot/wt/beta ]; then
475 8afe1f71 2022-05-12 thomas echo "alpha or beta were not removed" >&2
476 bb2ad8ff 2022-03-13 thomas test_done $testroot 1
479 8afe1f71 2022-05-12 thomas if [ ! -f $testroot/wt/iota -o ! -f $testroot/wt/eta ]; then
480 8afe1f71 2022-05-12 thomas echo "iota or eta were not created" >&2
481 bb2ad8ff 2022-03-13 thomas test_done $testroot 1
485 8afe1f71 2022-05-12 thomas echo beta > $testroot/wt/iota.expected
486 8afe1f71 2022-05-12 thomas cmp -s $testroot/wt/iota.expected $testroot/wt/iota
488 bb2ad8ff 2022-03-13 thomas if [ $ret -ne 0 ]; then
489 8afe1f71 2022-05-12 thomas diff -u $testroot/wt/iota.expected $testroot/wt/iota
490 bb2ad8ff 2022-03-13 thomas test_done $testroot $ret
494 8afe1f71 2022-05-12 thomas echo eta > $testroot/wt/eta.expected
495 8afe1f71 2022-05-12 thomas cmp -s $testroot/wt/eta.expected $testroot/wt/eta
497 bb2ad8ff 2022-03-13 thomas if [ $ret -ne 0 ]; then
498 8afe1f71 2022-05-12 thomas diff -u $testroot/wt/eta.expected $testroot/wt/eta
499 bb2ad8ff 2022-03-13 thomas test_done $testroot $ret
503 bb2ad8ff 2022-03-13 thomas test_done $testroot $ret
506 10e55613 2022-03-22 thomas test_patch_illegal_status() {
507 10e55613 2022-03-22 thomas local testroot=`test_init patch_illegal_status`
509 10e55613 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
511 10e55613 2022-03-22 thomas if [ $ret -ne 0 ]; then
512 10e55613 2022-03-22 thomas test_done $testroot $ret
516 49114f01 2022-03-22 thomas # try to patch an obstructed file, add a versioned one, edit a
517 49114f01 2022-03-22 thomas # non existent file and an unversioned one, and remove a
518 49114f01 2022-03-22 thomas # non existent file.
519 10e55613 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
520 49114f01 2022-03-22 thomas --- alpha
521 49114f01 2022-03-22 thomas +++ alpha
522 49114f01 2022-03-22 thomas @@ -1 +1,2 @@
524 49114f01 2022-03-22 thomas +was edited
525 49114f01 2022-03-22 thomas --- /dev/null
527 49114f01 2022-03-22 thomas @@ -0,0 +1 @@
531 10e55613 2022-03-22 thomas @@ -1 +1 @@
534 49114f01 2022-03-22 thomas --- kappa
535 49114f01 2022-03-22 thomas +++ kappa
536 49114f01 2022-03-22 thomas @@ -1 +1 @@
539 49114f01 2022-03-22 thomas --- lambda
540 49114f01 2022-03-22 thomas +++ /dev/null
541 49114f01 2022-03-22 thomas @@ -1 +0,0 @@
545 49114f01 2022-03-22 thomas echo kappa > $testroot/wt/kappa
546 10e55613 2022-03-22 thomas rm $testroot/wt/alpha
547 10e55613 2022-03-22 thomas mkdir $testroot/wt/alpha
549 49114f01 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout \
550 10e55613 2022-03-22 thomas 2> $testroot/stderr
552 10e55613 2022-03-22 thomas if [ $ret -eq 0 ]; then
553 10e55613 2022-03-22 thomas echo "edited a missing file" >&2
554 4e2bdb0d 2022-06-13 thomas test_done $testroot 1
558 49114f01 2022-03-22 thomas cat <<EOF > $testroot/stdout.expected
566 49114f01 2022-03-22 thomas cat <<EOF > $testroot/stderr.expected
567 49114f01 2022-03-22 thomas got: alpha: file has unexpected status
568 49114f01 2022-03-22 thomas got: beta: file has unexpected status
569 49114f01 2022-03-22 thomas got: iota: No such file or directory
570 49114f01 2022-03-22 thomas got: kappa: file has unexpected status
571 49114f01 2022-03-22 thomas got: lambda: No such file or directory
572 49114f01 2022-03-22 thomas got: patch failed to apply
575 49114f01 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
577 49114f01 2022-03-22 thomas if [ $ret -ne 0 ]; then
578 49114f01 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
579 10e55613 2022-03-22 thomas test_done $testroot $ret
583 10e55613 2022-03-22 thomas cmp -s $testroot/stderr.expected $testroot/stderr
585 49114f01 2022-03-22 thomas if [ $ret -ne 0 ]; then
586 10e55613 2022-03-22 thomas diff -u $testroot/stderr.expected $testroot/stderr
587 814624e7 2022-03-22 thomas test_done $testroot $ret
591 814624e7 2022-03-22 thomas (cd $testroot/wt && got status) > $testroot/stdout
592 814624e7 2022-03-22 thomas cat <<EOF > $testroot/stdout.expected
598 814624e7 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
600 814624e7 2022-03-22 thomas if [ $ret -ne 0 ]; then
601 814624e7 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
603 eaf99875 2022-03-22 thomas test_done $testroot $ret
606 eaf99875 2022-03-22 thomas test_patch_nop() {
607 eaf99875 2022-03-22 thomas local testroot=`test_init patch_nop`
609 eaf99875 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
611 eaf99875 2022-03-22 thomas if [ $ret -ne 0 ]; then
612 eaf99875 2022-03-22 thomas test_done $testroot $ret
616 eaf99875 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
617 eaf99875 2022-03-22 thomas --- alpha
618 eaf99875 2022-03-22 thomas +++ alpha
619 eaf99875 2022-03-22 thomas @@ -1 +1 @@
621 eaf99875 2022-03-22 thomas +cafe alpha
623 eaf99875 2022-03-22 thomas +++ /dev/null
624 eaf99875 2022-03-22 thomas @@ -1 +0,0 @@
626 be53ddb1 2022-03-22 thomas diff --git a/gamma/delta b/gamma/delta.new
627 eaf99875 2022-03-22 thomas --- gamma/delta
628 eaf99875 2022-03-22 thomas +++ gamma/delta.new
629 eaf99875 2022-03-22 thomas @@ -1 +1 @@
631 eaf99875 2022-03-22 thomas +delta updated and renamed!
634 eaf99875 2022-03-22 thomas (cd $testroot/wt && got patch -n patch)
636 eaf99875 2022-03-22 thomas if [ $ret -ne 0 ]; then
637 eaf99875 2022-03-22 thomas test_done $testroot $ret
641 eaf99875 2022-03-22 thomas # remove the patch to avoid the ? entry
642 eaf99875 2022-03-22 thomas rm $testroot/wt/patch
644 eaf99875 2022-03-22 thomas (cd $testroot/wt && got status) > $testroot/stdout
646 eaf99875 2022-03-22 thomas if [ $ret -ne 0 ]; then
647 eaf99875 2022-03-22 thomas test_done $testroot $ret
651 eaf99875 2022-03-22 thomas echo -n > $testroot/stdout.expected
652 eaf99875 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
654 eaf99875 2022-03-22 thomas if [ $ret -ne 0 ]; then
655 eaf99875 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
657 10e55613 2022-03-22 thomas test_done $testroot $ret
660 da09d8ed 2022-03-22 thomas test_patch_preserve_perm() {
661 da09d8ed 2022-03-22 thomas local testroot=`test_init patch_preserve_perm`
663 da09d8ed 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
665 da09d8ed 2022-03-22 thomas if [ $ret -ne 0 ]; then
666 da09d8ed 2022-03-22 thomas test_done $testroot $ret
670 da09d8ed 2022-03-22 thomas chmod +x $testroot/wt/alpha
671 da09d8ed 2022-03-22 thomas (cd $testroot/wt && got commit -m 'alpha executable') > /dev/null
673 da09d8ed 2022-03-22 thomas if [ $ret -ne 0 ]; then
674 da09d8ed 2022-03-22 thomas test_done $testroot $ret
678 da09d8ed 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
679 da09d8ed 2022-03-22 thomas --- alpha
680 da09d8ed 2022-03-22 thomas +++ alpha
681 da09d8ed 2022-03-22 thomas @@ -1 +1,2 @@
683 da09d8ed 2022-03-22 thomas +was edited
686 da09d8ed 2022-03-22 thomas (cd $testroot/wt && got patch patch) > /dev/null
688 da09d8ed 2022-03-22 thomas if [ $ret -ne 0 ]; then
689 da09d8ed 2022-03-22 thomas test_done $testroot $ret
693 da09d8ed 2022-03-22 thomas if [ ! -x $testroot/wt/alpha ]; then
694 da09d8ed 2022-03-22 thomas echo "alpha is no more executable!" >&2
695 da09d8ed 2022-03-22 thomas test_done $testroot 1
698 e0c1f81c 2022-03-22 thomas test_done $testroot 0
701 e0c1f81c 2022-03-22 thomas test_patch_create_dirs() {
702 e0c1f81c 2022-03-22 thomas local testroot=`test_init patch_create_dirs`
704 e0c1f81c 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
706 e0c1f81c 2022-03-22 thomas if [ $ret -ne 0 ]; then
707 e0c1f81c 2022-03-22 thomas test_done $testroot $ret
711 e0c1f81c 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
712 e0c1f81c 2022-03-22 thomas --- /dev/null
713 e0c1f81c 2022-03-22 thomas +++ iota/kappa/lambda
714 e0c1f81c 2022-03-22 thomas @@ -0,0 +1 @@
718 e0c1f81c 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
720 e0c1f81c 2022-03-22 thomas if [ $ret -ne 0 ]; then
721 e0c1f81c 2022-03-22 thomas test_done $testroot $ret
725 e0c1f81c 2022-03-22 thomas echo 'A iota/kappa/lambda' >> $testroot/stdout.expected
726 e0c1f81c 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
728 e0c1f81c 2022-03-22 thomas if [ $ret -ne 0 ]; then
729 e0c1f81c 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
730 e0c1f81c 2022-03-22 thomas test_done $testroot $ret
734 e0c1f81c 2022-03-22 thomas if [ ! -f $testroot/wt/iota/kappa/lambda ]; then
735 e0c1f81c 2022-03-22 thomas echo "file not created!" >&2
736 e0c1f81c 2022-03-22 thomas test_done $testroot $ret
739 da09d8ed 2022-03-22 thomas test_done $testroot 0
742 49114f01 2022-03-22 thomas test_patch_with_offset() {
743 49114f01 2022-03-22 thomas local testroot=`test_init patch_with_offset`
745 49114f01 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
747 49114f01 2022-03-22 thomas if [ $ret -ne 0 ]; then
748 49114f01 2022-03-22 thomas test_done $testroot $ret
752 49114f01 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
753 49114f01 2022-03-22 thomas --- numbers
754 49114f01 2022-03-22 thomas +++ numbers
755 49114f01 2022-03-22 thomas @@ -47,7 +47,7 @@
760 49114f01 2022-03-22 thomas +midway tru it!
764 49114f01 2022-03-22 thomas @@ -87,7 +87,7 @@
769 49114f01 2022-03-22 thomas +almost there!
775 49114f01 2022-03-22 thomas jot 100 > $testroot/wt/numbers
776 7a9950a8 2022-11-18 thomas ed -s "$testroot/wt/numbers" <<EOF
778 49114f01 2022-03-22 thomas 50r !jot 20
783 49114f01 2022-03-22 thomas (cd $testroot/wt && got add numbers && got commit -m '+numbers') \
784 49114f01 2022-03-22 thomas > /dev/null
786 49114f01 2022-03-22 thomas if [ $ret -ne 0 ]; then
787 49114f01 2022-03-22 thomas test_done $testroot $ret
791 49114f01 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
793 49114f01 2022-03-22 thomas if [ $ret -ne 0 ]; then
794 49114f01 2022-03-22 thomas test_done $testroot/wt $ret
798 49114f01 2022-03-22 thomas cat <<EOF > $testroot/stdout.expected
799 49114f01 2022-03-22 thomas M numbers
800 49114f01 2022-03-22 thomas @@ -47,7 +47,7 @@ applied with offset -10
801 49114f01 2022-03-22 thomas @@ -87,7 +87,7 @@ applied with offset 10
804 be53ddb1 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
806 be53ddb1 2022-03-22 thomas if [ $ret -ne 0 ]; then
807 be53ddb1 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
809 be53ddb1 2022-03-22 thomas test_done $testroot $ret
812 be53ddb1 2022-03-22 thomas test_patch_prefer_new_path() {
813 be53ddb1 2022-03-22 thomas local testroot=`test_init patch_orig`
815 be53ddb1 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
817 be53ddb1 2022-03-22 thomas if [ $ret -ne 0 ]; then
818 be53ddb1 2022-03-22 thomas test_done $testroot $ret
822 be53ddb1 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
823 be53ddb1 2022-03-22 thomas --- alpha.orig
824 be53ddb1 2022-03-22 thomas +++ alpha
825 be53ddb1 2022-03-22 thomas @@ -1 +1,2 @@
827 be53ddb1 2022-03-22 thomas +was edited
830 be53ddb1 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
832 be53ddb1 2022-03-22 thomas if [ $ret -ne 0 ]; then
833 be53ddb1 2022-03-22 thomas test_done $testroot $ret
837 e1c219c8 2022-04-22 thomas echo 'M alpha' > $testroot/stdout.expected
838 49114f01 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
840 49114f01 2022-03-22 thomas if [ $ret -ne 0 ]; then
841 49114f01 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
843 49114f01 2022-03-22 thomas test_done $testroot $ret
846 ff7f34d3 2022-03-22 thomas test_patch_no_newline() {
847 ff7f34d3 2022-03-22 thomas local testroot=`test_init patch_no_newline`
849 ff7f34d3 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
851 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
852 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
856 ff7f34d3 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
857 ff7f34d3 2022-03-22 thomas --- /dev/null
859 ff7f34d3 2022-03-22 thomas @@ -0,0 +1 @@
861 ff7f34d3 2022-03-22 thomas \ No newline at end of file
864 ff7f34d3 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
866 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
867 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
871 ff7f34d3 2022-03-22 thomas echo "A eta" > $testroot/stdout.expected
872 ff7f34d3 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
874 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
875 ff7f34d3 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
876 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
880 ff7f34d3 2022-03-22 thomas echo -n eta > $testroot/wt/eta.expected
881 ff7f34d3 2022-03-22 thomas cmp -s $testroot/wt/eta.expected $testroot/wt/eta
883 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
884 ff7f34d3 2022-03-22 thomas diff -u $testroot/wt/eta.expected $testroot/wt/eta
885 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
889 ff7f34d3 2022-03-22 thomas (cd $testroot/wt && got commit -m 'add eta') > /dev/null
891 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
892 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
896 ff7f34d3 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
899 ff7f34d3 2022-03-22 thomas @@ -1 +1 @@
901 ff7f34d3 2022-03-22 thomas \ No newline at end of file
903 ff7f34d3 2022-03-22 thomas \ No newline at end of file
906 ff7f34d3 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
908 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
909 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
913 ff7f34d3 2022-03-22 thomas echo "M eta" > $testroot/stdout.expected
914 ff7f34d3 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
916 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
917 ff7f34d3 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
918 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
922 ff7f34d3 2022-03-22 thomas echo -n ETA > $testroot/wt/eta.expected
923 ff7f34d3 2022-03-22 thomas cmp -s $testroot/wt/eta.expected $testroot/wt/eta
925 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
926 ff7f34d3 2022-03-22 thomas diff -u $testroot/wt/eta.expected $testroot/wt/eta
927 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
931 ff7f34d3 2022-03-22 thomas (cd $testroot/wt && got commit -m 'edit eta') > /dev/null
933 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
934 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
938 ff7f34d3 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
941 ff7f34d3 2022-03-22 thomas @@ -1 +1 @@
943 ff7f34d3 2022-03-22 thomas \ No newline at end of file
947 ff7f34d3 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
949 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
950 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
954 ff7f34d3 2022-03-22 thomas echo "M eta" > $testroot/stdout.expected
955 ff7f34d3 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
957 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
958 ff7f34d3 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
959 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
963 ff7f34d3 2022-03-22 thomas echo eta > $testroot/wt/eta.expected
964 ff7f34d3 2022-03-22 thomas cmp -s $testroot/wt/eta.expected $testroot/wt/eta
966 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
967 ff7f34d3 2022-03-22 thomas diff -u $testroot/wt/eta.expected $testroot/wt/eta
969 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
972 d9db2ff9 2022-04-16 thomas test_patch_strip() {
973 d9db2ff9 2022-04-16 thomas local testroot=`test_init patch_strip`
975 d9db2ff9 2022-04-16 thomas got checkout $testroot/repo $testroot/wt > /dev/null
977 d9db2ff9 2022-04-16 thomas if [ $ret -ne 0 ]; then
978 d9db2ff9 2022-04-16 thomas test_done $testroot $ret
982 d9db2ff9 2022-04-16 thomas cat <<EOF > $testroot/wt/patch
983 d9db2ff9 2022-04-16 thomas --- foo/bar/alpha.orig
984 d9db2ff9 2022-04-16 thomas +++ foo/bar/alpha
985 d9db2ff9 2022-04-16 thomas @@ -1 +1 @@
990 d9db2ff9 2022-04-16 thomas (cd $testroot/wt && got patch -p2 patch) > $testroot/stdout
992 d9db2ff9 2022-04-16 thomas if [ $ret -ne 0 ]; then
993 d9db2ff9 2022-04-16 thomas test_done $testroot $ret
997 d9db2ff9 2022-04-16 thomas echo "M alpha" >> $testroot/stdout.expected
998 d9db2ff9 2022-04-16 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1000 d9db2ff9 2022-04-16 thomas if [ $ret -ne 0 ]; then
1001 d9db2ff9 2022-04-16 thomas diff -u $testroot/stdout.expected $testroot/stdout
1002 d9db2ff9 2022-04-16 thomas test_done $testroot $ret
1003 d9db2ff9 2022-04-16 thomas return 1
1006 d9db2ff9 2022-04-16 thomas (cd $testroot/wt && got revert alpha) > /dev/null 2>&1
1008 d9db2ff9 2022-04-16 thomas if [ $ret -ne 0 ]; then
1009 d9db2ff9 2022-04-16 thomas test_done $testroot $ret
1010 d9db2ff9 2022-04-16 thomas return 1
1013 d9db2ff9 2022-04-16 thomas (cd $testroot/wt && got patch -p3 patch) \
1014 d9db2ff9 2022-04-16 thomas 2> $testroot/stderr
1016 d9db2ff9 2022-04-16 thomas if [ $ret -eq 0 ]; then
1017 d9db2ff9 2022-04-16 thomas echo "stripped more components than available!"
1018 d9db2ff9 2022-04-16 thomas test_done $testroot 1
1019 d9db2ff9 2022-04-16 thomas return 1
1022 d9db2ff9 2022-04-16 thomas cat <<EOF > $testroot/stderr.expected
1023 d9db2ff9 2022-04-16 thomas got: can't strip 1 path-components from foo/bar/alpha: bad path
1026 d9db2ff9 2022-04-16 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1028 d9db2ff9 2022-04-16 thomas if [ $ret -ne 0 ]; then
1029 d9db2ff9 2022-04-16 thomas diff -u $testroot/stderr.expected $testroot/stderr
1031 d9db2ff9 2022-04-16 thomas test_done $testroot 0
1034 bb90ca7b 2022-07-03 thomas test_patch_whitespace() {
1035 bb90ca7b 2022-07-03 thomas local testroot=`test_init patch_whitespace`
1037 bb90ca7b 2022-07-03 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1039 bb90ca7b 2022-07-03 thomas if [ $ret -ne 0 ]; then
1040 bb90ca7b 2022-07-03 thomas test_done $testroot $ret
1041 bb90ca7b 2022-07-03 thomas return 1
1044 bb90ca7b 2022-07-03 thomas trailing=" "
1046 bb90ca7b 2022-07-03 thomas cat <<EOF > $testroot/wt/hello.c
1047 bb90ca7b 2022-07-03 thomas #include <stdio.h>
1050 bb90ca7b 2022-07-03 thomas main(void)
1052 bb90ca7b 2022-07-03 thomas /* the trailing whitespace is on purpose */
1053 bb90ca7b 2022-07-03 thomas printf("hello, world\n");$trailing
1054 bb90ca7b 2022-07-03 thomas return 0;
1058 bb90ca7b 2022-07-03 thomas (cd $testroot/wt && got add hello.c && got ci -m '+hello.c') \
1059 bb90ca7b 2022-07-03 thomas > /dev/null
1061 bb90ca7b 2022-07-03 thomas if [ $ret -ne 0 ]; then
1062 bb90ca7b 2022-07-03 thomas test_done $testroot $ret
1063 bb90ca7b 2022-07-03 thomas return 1
1066 bb90ca7b 2022-07-03 thomas # test with a diff with various whitespace corruptions
1067 bb90ca7b 2022-07-03 thomas cat <<EOF > $testroot/wt/patch
1068 bb90ca7b 2022-07-03 thomas --- hello.c
1069 bb90ca7b 2022-07-03 thomas +++ hello.c
1070 bb90ca7b 2022-07-03 thomas @@ -5,5 +5,5 @@
1072 bb90ca7b 2022-07-03 thomas /* the trailing whitespace is on purpose */
1073 bb90ca7b 2022-07-03 thomas printf("hello, world\n");
1074 bb90ca7b 2022-07-03 thomas - return 0;
1075 bb90ca7b 2022-07-03 thomas + return 5; /* always fails */
1079 bb90ca7b 2022-07-03 thomas (cd $testroot/wt && got patch patch) \
1080 bb90ca7b 2022-07-03 thomas 2>$testroot/stderr >$testroot/stdout
1082 bb90ca7b 2022-07-03 thomas if [ $ret -ne 0 ]; then
1083 bb90ca7b 2022-07-03 thomas echo "failed to apply diff" >&2
1084 bb90ca7b 2022-07-03 thomas test_done $testroot $ret
1085 bb90ca7b 2022-07-03 thomas return 1
1088 bb90ca7b 2022-07-03 thomas echo 'M hello.c' > $testroot/stdout.expected
1089 bb90ca7b 2022-07-03 thomas echo '@@ -5,5 +5,5 @@ hunk contains mangled whitespace' \
1090 bb90ca7b 2022-07-03 thomas >> $testroot/stdout.expected
1091 bb90ca7b 2022-07-03 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1093 bb90ca7b 2022-07-03 thomas if [ $ret -ne 0 ]; then
1094 bb90ca7b 2022-07-03 thomas diff -u $testroot/stdout.expected $testroot/stdout
1095 bb90ca7b 2022-07-03 thomas test_done $testroot $ret
1096 bb90ca7b 2022-07-03 thomas return 1
1099 bb90ca7b 2022-07-03 thomas cat <<EOF > $testroot/wt/hello.c.expected
1100 bb90ca7b 2022-07-03 thomas #include <stdio.h>
1103 bb90ca7b 2022-07-03 thomas main(void)
1105 bb90ca7b 2022-07-03 thomas /* the trailing whitespace is on purpose */
1106 bb90ca7b 2022-07-03 thomas printf("hello, world\n");$trailing
1107 bb90ca7b 2022-07-03 thomas return 5; /* always fails */
1111 bb90ca7b 2022-07-03 thomas cmp -s $testroot/wt/hello.c.expected $testroot/wt/hello.c
1113 bb90ca7b 2022-07-03 thomas if [ $ret -ne 0 ]; then
1114 bb90ca7b 2022-07-03 thomas diff -u $testroot/wt/hello.c.expected $testroot/wt/hello.c
1116 bb90ca7b 2022-07-03 thomas test_done $testroot $ret
1119 72f46891 2022-04-23 thomas test_patch_relative_paths() {
1120 9a49df74 2022-04-23 thomas local testroot=`test_init patch_relative_paths`
1122 72f46891 2022-04-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1124 72f46891 2022-04-23 thomas if [ $ret -ne 0 ]; then
1125 72f46891 2022-04-23 thomas test_done $testroot $ret
1126 72f46891 2022-04-23 thomas return 1
1129 72f46891 2022-04-23 thomas cat <<EOF > $testroot/wt/gamma/patch
1130 72f46891 2022-04-23 thomas --- delta
1131 72f46891 2022-04-23 thomas +++ delta
1132 72f46891 2022-04-23 thomas @@ -1 +1 @@
1135 72f46891 2022-04-23 thomas --- /dev/null
1137 72f46891 2022-04-23 thomas @@ -0,0 +1 @@
1141 72f46891 2022-04-23 thomas (cd $testroot/wt/gamma && got patch patch) > $testroot/stdout
1143 72f46891 2022-04-23 thomas if [ $ret -ne 0 ]; then
1144 72f46891 2022-04-23 thomas test_done $testroot $ret
1145 72f46891 2022-04-23 thomas return 1
1148 72f46891 2022-04-23 thomas echo 'M gamma/delta' > $testroot/stdout.expected
1149 72f46891 2022-04-23 thomas echo 'A gamma/eta' >> $testroot/stdout.expected
1151 cfbf5531 2022-04-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1153 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1154 cfbf5531 2022-04-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1156 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1159 cfbf5531 2022-04-23 thomas test_patch_with_path_prefix() {
1160 cfbf5531 2022-04-23 thomas local testroot=`test_init patch_with_path_prefix`
1162 cfbf5531 2022-04-23 thomas got checkout -p gamma $testroot/repo $testroot/wt > /dev/null
1164 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1165 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1166 cfbf5531 2022-04-23 thomas return 1
1169 cfbf5531 2022-04-23 thomas cat <<EOF > $testroot/wt/patch
1170 cfbf5531 2022-04-23 thomas --- delta
1171 cfbf5531 2022-04-23 thomas +++ delta
1172 cfbf5531 2022-04-23 thomas @@ -1 +1 @@
1175 cfbf5531 2022-04-23 thomas --- /dev/null
1177 cfbf5531 2022-04-23 thomas @@ -0,0 +1 @@
1181 cfbf5531 2022-04-23 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
1183 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1184 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1185 cfbf5531 2022-04-23 thomas return 1
1188 cfbf5531 2022-04-23 thomas echo 'M delta' > $testroot/stdout.expected
1189 cfbf5531 2022-04-23 thomas echo 'A eta' >> $testroot/stdout.expected
1191 cfbf5531 2022-04-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1193 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1194 cfbf5531 2022-04-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1196 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1199 cfbf5531 2022-04-23 thomas test_patch_relpath_with_path_prefix() {
1200 cfbf5531 2022-04-23 thomas local testroot=`test_init patch_relpaths_with_path_prefix`
1202 cfbf5531 2022-04-23 thomas got checkout -p gamma $testroot/repo $testroot/wt > /dev/null
1204 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1205 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1206 cfbf5531 2022-04-23 thomas return 1
1209 cfbf5531 2022-04-23 thomas mkdir -p $testroot/wt/epsilon/zeta/
1211 cfbf5531 2022-04-23 thomas cat <<EOF > $testroot/wt/patch
1212 cfbf5531 2022-04-23 thomas --- /dev/null
1213 cfbf5531 2022-04-23 thomas +++ zeta/theta
1214 cfbf5531 2022-04-23 thomas @@ -0,0 +1 @@
1218 cfbf5531 2022-04-23 thomas (cd $testroot/wt/epsilon/zeta && got patch -p1 $testroot/wt/patch) \
1219 cfbf5531 2022-04-23 thomas > $testroot/stdout
1221 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1222 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1223 cfbf5531 2022-04-23 thomas return 1
1226 cfbf5531 2022-04-23 thomas echo 'A epsilon/zeta/theta' >> $testroot/stdout.expected
1228 72f46891 2022-04-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1230 72f46891 2022-04-23 thomas if [ $ret -ne 0 ]; then
1231 72f46891 2022-04-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1232 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1233 cfbf5531 2022-04-23 thomas return 1
1236 cfbf5531 2022-04-23 thomas echo 'theta' > $testroot/theta.expected
1237 cfbf5531 2022-04-23 thomas cmp -s $testroot/wt/epsilon/zeta/theta $testroot/theta.expected
1239 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1240 cfbf5531 2022-04-23 thomas diff -u $testroot/wt/epsilon/zeta/theta $testroot/theta.expected
1242 72f46891 2022-04-23 thomas test_done $testroot $ret
1245 eaef698f 2022-04-23 thomas test_patch_reverse() {
1246 eaef698f 2022-04-23 thomas local testroot=`test_init patch_reverse`
1248 eaef698f 2022-04-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1250 eaef698f 2022-04-23 thomas if [ $ret -ne 0 ]; then
1251 eaef698f 2022-04-23 thomas test_done $testroot $ret
1252 eaef698f 2022-04-23 thomas return 1
1255 eaef698f 2022-04-23 thomas cat <<EOF > $testroot/wt/patch
1256 eaef698f 2022-04-23 thomas --- alpha
1257 eaef698f 2022-04-23 thomas +++ alpha
1258 eaef698f 2022-04-23 thomas @@ -1 +1 @@
1260 eaef698f 2022-04-23 thomas \ No newline at end of file
1264 eaef698f 2022-04-23 thomas (cd $testroot/wt && got patch -R patch) > $testroot/stdout
1266 eaef698f 2022-04-23 thomas if [ $ret -ne 0 ]; then
1267 eaef698f 2022-04-23 thomas test_done $testroot $ret
1268 eaef698f 2022-04-23 thomas return 1
1271 eaef698f 2022-04-23 thomas echo "M alpha" > $testroot/stdout.expected
1272 eaef698f 2022-04-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1274 eaef698f 2022-04-23 thomas if [ $ret -ne 0 ]; then
1275 eaef698f 2022-04-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1276 eaef698f 2022-04-23 thomas test_done $testroot $ret
1277 eaef698f 2022-04-23 thomas return 1
1280 eaef698f 2022-04-23 thomas echo -n ALPHA > $testroot/wt/alpha.expected
1281 eaef698f 2022-04-23 thomas cmp -s $testroot/wt/alpha.expected $testroot/wt/alpha
1283 eaef698f 2022-04-23 thomas if [ $ret -ne 0 ]; then
1284 eaef698f 2022-04-23 thomas diff -u $testroot/wt/alpha.expected $testroot/wt/alpha
1286 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1289 0f76ab83 2022-06-23 thomas test_patch_merge_simple() {
1290 0f76ab83 2022-06-23 thomas local testroot=`test_init patch_merge_simple`
1292 0f76ab83 2022-06-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1294 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1295 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1296 0f76ab83 2022-06-23 thomas return 1
1299 0f76ab83 2022-06-23 thomas jot 10 > $testroot/wt/numbers
1300 25a880e1 2022-07-03 thomas chmod +x $testroot/wt/numbers
1301 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got add numbers && got commit -m +numbers) \
1302 0f76ab83 2022-06-23 thomas > /dev/null
1304 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1305 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1306 0f76ab83 2022-06-23 thomas return 1
1309 0f76ab83 2022-06-23 thomas jot 10 | sed 's/4/four/g' > $testroot/wt/numbers
1311 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got diff > $testroot/old.diff \
1312 0f76ab83 2022-06-23 thomas && got revert numbers) >/dev/null
1314 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1315 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1316 0f76ab83 2022-06-23 thomas return 1
1319 0f76ab83 2022-06-23 thomas jot 10 | sed 's/6/six/g' > $testroot/wt/numbers
1320 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got commit -m 'edit numbers') \
1321 0f76ab83 2022-06-23 thomas > /dev/null
1323 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1324 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1325 0f76ab83 2022-06-23 thomas return 1
1328 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got patch $testroot/old.diff) \
1329 762b8e82 2022-06-23 thomas > $testroot/stdout
1331 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1332 762b8e82 2022-06-23 thomas test_done $testroot $ret
1333 762b8e82 2022-06-23 thomas return 1
1336 762b8e82 2022-06-23 thomas echo 'G numbers' > $testroot/stdout.expected
1337 762b8e82 2022-06-23 thomas cmp -s $testroot/stdout $testroot/stdout.expected
1339 762b8e82 2022-06-23 thomas if [ $ret -ne 0 ]; then
1340 762b8e82 2022-06-23 thomas diff -u $testroot/stdout $testroot/stdout.expected
1341 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1342 0f76ab83 2022-06-23 thomas return 1
1345 0f76ab83 2022-06-23 thomas jot 10 | sed -e s/4/four/ -e s/6/six/ > $testroot/wt/numbers.expected
1346 0f76ab83 2022-06-23 thomas cmp -s $testroot/wt/numbers $testroot/wt/numbers.expected
1348 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1349 0f76ab83 2022-06-23 thomas diff -u $testroot/wt/numbers $testroot/wt/numbers.expected
1350 25a880e1 2022-07-03 thomas test_done $testroot $ret
1351 25a880e1 2022-07-03 thomas return 1
1354 25a880e1 2022-07-03 thomas test -x $testroot/wt/numbers
1356 25a880e1 2022-07-03 thomas if [ $ret -ne 0 ]; then
1357 25a880e1 2022-07-03 thomas echo "numbers lost the executable bit" >&2
1359 19dd85cb 2022-07-01 thomas test_done $testroot $ret
1362 19dd85cb 2022-07-01 thomas test_patch_merge_gitdiff() {
1363 19dd85cb 2022-07-01 thomas local testroot=`test_init patch_merge_gitdiff`
1365 19dd85cb 2022-07-01 thomas jot 10 > $testroot/repo/numbers
1366 19dd85cb 2022-07-01 thomas (cd $testroot/repo && git add numbers && \
1367 19dd85cb 2022-07-01 thomas git_commit $testroot/repo -m "nums")
1369 19dd85cb 2022-07-01 thomas if [ $ret -ne 0 ]; then
1370 19dd85cb 2022-07-01 thomas test_done $testroot $ret
1371 19dd85cb 2022-07-01 thomas return 1
1374 19dd85cb 2022-07-01 thomas jot 10 | sed 's/4/four/g' > $testroot/repo/numbers
1375 19dd85cb 2022-07-01 thomas (cd $testroot/repo && git diff > $testroot/old.diff)
1377 19dd85cb 2022-07-01 thomas if [ $ret -ne 0 ]; then
1378 19dd85cb 2022-07-01 thomas test_done $testroot $ret
1379 19dd85cb 2022-07-01 thomas return 1
1382 19dd85cb 2022-07-01 thomas # restore numbers
1383 19dd85cb 2022-07-01 thomas jot 10 > $testroot/repo/numbers
1385 19dd85cb 2022-07-01 thomas jot 10 | sed 's/6/six/g' > $testroot/repo/numbers
1386 19dd85cb 2022-07-01 thomas (cd $testroot/repo && git add numbers && \
1387 19dd85cb 2022-07-01 thomas git_commit $testroot/repo -m "edit")
1389 19dd85cb 2022-07-01 thomas if [ $ret -ne 0 ]; then
1390 19dd85cb 2022-07-01 thomas test_done $testroot $ret
1391 19dd85cb 2022-07-01 thomas return 1
1394 19dd85cb 2022-07-01 thomas # now work with got:
1395 19dd85cb 2022-07-01 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1397 19dd85cb 2022-07-01 thomas if [ $ret -ne 0 ]; then
1398 19dd85cb 2022-07-01 thomas test_done $testroot $ret
1399 19dd85cb 2022-07-01 thomas return 1
1402 19dd85cb 2022-07-01 thomas (cd $testroot/wt && got patch $testroot/old.diff) > $testroot/stdout
1404 19dd85cb 2022-07-01 thomas if [ $ret -ne 0 ]; then
1405 19dd85cb 2022-07-01 thomas test_done $testroot $ret
1406 19dd85cb 2022-07-01 thomas return 1
1409 19dd85cb 2022-07-01 thomas echo 'G numbers' > $testroot/stdout.expected
1410 19dd85cb 2022-07-01 thomas cmp -s $testroot/stdout $testroot/stdout.expected
1412 19dd85cb 2022-07-01 thomas if [ $ret -ne 0 ]; then
1413 19dd85cb 2022-07-01 thomas diff -u $testroot/stdout $testroot/stdout.expected
1415 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1418 7d8bcb99 2022-07-28 thomas test_patch_merge_base_provided() {
1419 7d8bcb99 2022-07-28 thomas local testroot=`test_init patch_merge_base_provided`
1421 7d8bcb99 2022-07-28 thomas got checkout $testroot/repo $testroot/wt >/dev/null
1423 7d8bcb99 2022-07-28 thomas if [ $ret -ne 0 ]; then
1424 7d8bcb99 2022-07-28 thomas test_done $testroot $ret
1425 7d8bcb99 2022-07-28 thomas return 1
1428 7d8bcb99 2022-07-28 thomas jot 10 > $testroot/wt/numbers
1429 7d8bcb99 2022-07-28 thomas (cd $testroot/wt && got add numbers && got commit -m +numbers) \
1430 7d8bcb99 2022-07-28 thomas >/dev/null
1432 7d8bcb99 2022-07-28 thomas if [ $ret -ne 0 ]; then
1433 7d8bcb99 2022-07-28 thomas test_done $testroot $ret
1434 7d8bcb99 2022-07-28 thomas return 1
1437 7d8bcb99 2022-07-28 thomas local commit_id=`git_show_head $testroot/repo`
1439 7d8bcb99 2022-07-28 thomas jot 10 | sed s/4/four/ > $testroot/wt/numbers
1441 7d8bcb99 2022-07-28 thomas # get rid of the metadata
1442 7d8bcb99 2022-07-28 thomas (cd $testroot/wt && got diff | sed -n '/^---/,$p' > patch) \
1443 7d8bcb99 2022-07-28 thomas >/dev/null
1445 7d8bcb99 2022-07-28 thomas jot 10 | sed s/6/six/ > $testroot/wt/numbers
1446 7d8bcb99 2022-07-28 thomas (cd $testroot/wt && got commit -m 'edit numbers') >/dev/null
1448 7d8bcb99 2022-07-28 thomas if [ $ret -ne 0 ]; then
1449 7d8bcb99 2022-07-28 thomas test_done $testroot $ret
1450 7d8bcb99 2022-07-28 thomas return 1
1453 7d8bcb99 2022-07-28 thomas (cd $testroot/wt && got patch -c $commit_id patch) >$testroot/stdout
1455 7d8bcb99 2022-07-28 thomas if [ $ret -ne 0 ]; then
1456 7d8bcb99 2022-07-28 thomas test_done $testroot $ret
1457 7d8bcb99 2022-07-28 thomas return 1
1460 7d8bcb99 2022-07-28 thomas echo 'G numbers' > $testroot/stdout.expected
1461 7d8bcb99 2022-07-28 thomas cmp -s $testroot/stdout $testroot/stdout.expected
1463 7d8bcb99 2022-07-28 thomas if [ $ret -ne 0 ]; then
1464 7d8bcb99 2022-07-28 thomas diff -u $testroot/stdout $testroot/stdout.expected
1465 7d8bcb99 2022-07-28 thomas test_done $testroot $ret
1466 7d8bcb99 2022-07-28 thomas return 1
1469 7d8bcb99 2022-07-28 thomas jot 10 | sed -e s/4/four/ -e s/6/six/ > $testroot/wt/numbers.expected
1470 7d8bcb99 2022-07-28 thomas cmp -s $testroot/wt/numbers $testroot/wt/numbers.expected
1472 7d8bcb99 2022-07-28 thomas if [ $ret -ne 0 ]; then
1473 7d8bcb99 2022-07-28 thomas diff -u $testroot/wt/numbers $testroot/wt/numbers.expected
1475 7d8bcb99 2022-07-28 thomas test_done $testroot $ret
1478 0f76ab83 2022-06-23 thomas test_patch_merge_conflict() {
1479 0f76ab83 2022-06-23 thomas local testroot=`test_init patch_merge_conflict`
1481 0f76ab83 2022-06-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1483 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1484 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1485 0f76ab83 2022-06-23 thomas return 1
1488 0f76ab83 2022-06-23 thomas jot 10 > $testroot/wt/numbers
1489 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got add numbers && got commit -m +numbers) \
1490 0f76ab83 2022-06-23 thomas > /dev/null
1492 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1493 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1494 0f76ab83 2022-06-23 thomas return 1
1497 016bfe4b 2022-06-23 thomas local commit_id=`git_show_head $testroot/repo`
1499 0f76ab83 2022-06-23 thomas jot 10 | sed 's/6/six/g' > $testroot/wt/numbers
1500 68ceedb3 2022-07-03 thomas echo ALPHA > $testroot/wt/alpha
1502 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got diff > $testroot/old.diff \
1503 68ceedb3 2022-07-03 thomas && got revert alpha numbers) >/dev/null
1505 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1506 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1507 0f76ab83 2022-06-23 thomas return 1
1510 0f76ab83 2022-06-23 thomas jot 10 | sed 's/6/3+3/g' > $testroot/wt/numbers
1511 68ceedb3 2022-07-03 thomas jot -c 3 a > $testroot/wt/alpha
1512 68ceedb3 2022-07-03 thomas (cd $testroot/wt && got commit -m 'edit alpha and 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 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got patch $testroot/old.diff) \
1521 762b8e82 2022-06-23 thomas > $testroot/stdout 2>/dev/null
1523 0f76ab83 2022-06-23 thomas if [ $ret -eq 0 ]; then
1524 0f76ab83 2022-06-23 thomas echo "got patch merged a diff that should conflict" >&2
1525 0f76ab83 2022-06-23 thomas test_done $testroot 0
1526 0f76ab83 2022-06-23 thomas return 1
1529 68ceedb3 2022-07-03 thomas echo 'C alpha' > $testroot/stdout.expected
1530 68ceedb3 2022-07-03 thomas echo 'C numbers' >> $testroot/stdout.expected
1531 762b8e82 2022-06-23 thomas cmp -s $testroot/stdout $testroot/stdout.expected
1533 762b8e82 2022-06-23 thomas if [ $ret -ne 0 ]; then
1534 762b8e82 2022-06-23 thomas diff -u $testroot/stdout $testroot/stdout.expected
1535 762b8e82 2022-06-23 thomas test_done $testroot $ret
1536 762b8e82 2022-06-23 thomas return 1
1539 0f76ab83 2022-06-23 thomas # XXX: prefixing every line with a tab otherwise got thinks
1540 0f76ab83 2022-06-23 thomas # the file has conflicts in it.
1541 68ceedb3 2022-07-03 thomas cat <<-EOF > $testroot/wt/alpha.expected
1542 68ceedb3 2022-07-03 thomas <<<<<<< --- alpha
1544 68ceedb3 2022-07-03 thomas ||||||| commit $commit_id
1550 68ceedb3 2022-07-03 thomas >>>>>>> +++ alpha
1553 0f76ab83 2022-06-23 thomas cat <<-EOF > $testroot/wt/numbers.expected
1559 0f76ab83 2022-06-23 thomas <<<<<<< --- numbers
1561 016bfe4b 2022-06-23 thomas ||||||| commit $commit_id
1565 0f76ab83 2022-06-23 thomas >>>>>>> +++ numbers
1572 68ceedb3 2022-07-03 thomas cmp -s $testroot/wt/alpha $testroot/wt/alpha.expected
1574 68ceedb3 2022-07-03 thomas if [ $ret -ne 0 ]; then
1575 68ceedb3 2022-07-03 thomas diff -u $testroot/wt/alpha $testroot/wt/alpha.expected
1576 68ceedb3 2022-07-03 thomas test_done $testroot $ret
1577 68ceedb3 2022-07-03 thomas return 1
1580 0f76ab83 2022-06-23 thomas cmp -s $testroot/wt/numbers $testroot/wt/numbers.expected
1582 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1583 0f76ab83 2022-06-23 thomas diff -u $testroot/wt/numbers $testroot/wt/numbers.expected
1585 eaef698f 2022-04-23 thomas test_done $testroot $ret
1588 0f76ab83 2022-06-23 thomas test_patch_merge_unknown_blob() {
1589 0f76ab83 2022-06-23 thomas local testroot=`test_init patch_merge_unknown_blob`
1591 0f76ab83 2022-06-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1593 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1594 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1595 0f76ab83 2022-06-23 thomas return 1
1598 0f76ab83 2022-06-23 thomas cat <<EOF > $testroot/wt/patch
1599 0f76ab83 2022-06-23 thomas I've got a
1600 c9a4f4fa 2022-06-23 thomas diff aaaabbbbccccddddeeeeffff0000111122223333 foo/bar
1602 0f76ab83 2022-06-23 thomas blob - aaaabbbbccccddddeeeeffff0000111122223333
1603 0f76ab83 2022-06-23 thomas and also a
1604 c9a4f4fa 2022-06-23 thomas blob + 0000111122223333444455556666777788889999
1605 0f76ab83 2022-06-23 thomas for this dummy diff
1606 0f76ab83 2022-06-23 thomas --- alpha
1607 0f76ab83 2022-06-23 thomas +++ alpha
1608 0f76ab83 2022-06-23 thomas @@ -1 +1 @@
1611 0f76ab83 2022-06-23 thomas will it work?
1614 0f76ab83 2022-06-23 thomas (cd $testroot/wt/ && got patch patch) > $testroot/stdout
1616 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1617 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1618 0f76ab83 2022-06-23 thomas return 1
1621 0f76ab83 2022-06-23 thomas echo 'M alpha' > $testroot/stdout.expected
1622 0f76ab83 2022-06-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1624 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1625 0f76ab83 2022-06-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1626 c9a4f4fa 2022-06-23 thomas test_done $testroot $ret
1627 c9a4f4fa 2022-06-23 thomas return 1
1630 c9a4f4fa 2022-06-23 thomas # try again without a `diff' header
1632 c9a4f4fa 2022-06-23 thomas cat <<EOF > $testroot/wt/patch
1633 c9a4f4fa 2022-06-23 thomas I've got a
1634 c9a4f4fa 2022-06-23 thomas blob - aaaabbbbccccddddeeeeffff0000111122223333
1635 c9a4f4fa 2022-06-23 thomas and also a
1636 c9a4f4fa 2022-06-23 thomas blob + 0000111122223333444455556666777788889999
1637 c9a4f4fa 2022-06-23 thomas for this dummy diff
1638 c9a4f4fa 2022-06-23 thomas --- alpha
1639 c9a4f4fa 2022-06-23 thomas +++ alpha
1640 c9a4f4fa 2022-06-23 thomas @@ -1 +1 @@
1643 c9a4f4fa 2022-06-23 thomas will it work?
1646 c9a4f4fa 2022-06-23 thomas (cd $testroot/wt && got revert alpha > /dev/null && got patch patch) \
1647 c9a4f4fa 2022-06-23 thomas > $testroot/stdout
1649 c9a4f4fa 2022-06-23 thomas if [ $ret -ne 0 ]; then
1650 c9a4f4fa 2022-06-23 thomas test_done $testroot $ret
1651 c9a4f4fa 2022-06-23 thomas return 1
1654 c9a4f4fa 2022-06-23 thomas echo 'M alpha' > $testroot/stdout.expected
1655 c9a4f4fa 2022-06-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1657 c9a4f4fa 2022-06-23 thomas if [ $ret -ne 0 ]; then
1658 c9a4f4fa 2022-06-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1659 19dd85cb 2022-07-01 thomas test_done $testroot $ret
1660 19dd85cb 2022-07-01 thomas return 1
1663 19dd85cb 2022-07-01 thomas # try again with a git-style diff
1665 19dd85cb 2022-07-01 thomas cat <<EOF > $testroot/wt/patch
1666 19dd85cb 2022-07-01 thomas diff --git a/alpha b/alpha
1667 19dd85cb 2022-07-01 thomas index 0123456789ab..abcdef012345 100644
1668 19dd85cb 2022-07-01 thomas --- a/alpha
1669 19dd85cb 2022-07-01 thomas +++ b/alpha
1670 19dd85cb 2022-07-01 thomas @@ -1 +1 @@
1675 19dd85cb 2022-07-01 thomas (cd $testroot/wt && got revert alpha > /dev/null && got patch patch) \
1676 19dd85cb 2022-07-01 thomas > $testroot/stdout
1678 19dd85cb 2022-07-01 thomas if [ $ret -ne 0 ]; then
1679 19dd85cb 2022-07-01 thomas test_done $testroot $ret
1680 19dd85cb 2022-07-01 thomas return 1
1683 19dd85cb 2022-07-01 thomas echo 'M alpha' > $testroot/stdout.expected
1684 19dd85cb 2022-07-01 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1686 19dd85cb 2022-07-01 thomas if [ $ret -ne 0 ]; then
1687 19dd85cb 2022-07-01 thomas diff -u $testroot/stdout.expected $testroot/stdout
1689 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1692 f4602cbd 2022-07-23 thomas test_patch_merge_reverse() {
1693 f4602cbd 2022-07-23 thomas local testroot=`test_init patch_merge_simple`
1695 f4602cbd 2022-07-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1697 f4602cbd 2022-07-23 thomas if [ $ret -ne 0 ]; then
1698 f4602cbd 2022-07-23 thomas test_done $testroot $ret
1699 f4602cbd 2022-07-23 thomas return 1
1702 f4602cbd 2022-07-23 thomas jot 10 > $testroot/wt/numbers
1703 f4602cbd 2022-07-23 thomas (cd $testroot/wt && got add numbers && got commit -m +numbers) \
1704 f4602cbd 2022-07-23 thomas > /dev/null
1706 f4602cbd 2022-07-23 thomas if [ $ret -ne 0 ]; then
1707 f4602cbd 2022-07-23 thomas test_done $testroot $ret
1708 f4602cbd 2022-07-23 thomas return 1
1711 f4602cbd 2022-07-23 thomas local commit_id=`git_show_head $testroot/repo`
1713 f4602cbd 2022-07-23 thomas jot 10 | sed s/5/five/g > $testroot/wt/numbers
1714 f4602cbd 2022-07-23 thomas (cd $testroot/wt && got diff > $testroot/wt/patch \
1715 f4602cbd 2022-07-23 thomas && got commit -m 'edit numbers') > /dev/null
1717 f4602cbd 2022-07-23 thomas if [ $ret -ne 0 ]; then
1718 f4602cbd 2022-07-23 thomas test_done $testroot $ret
1719 f4602cbd 2022-07-23 thomas return 1
1722 f4602cbd 2022-07-23 thomas jot 10 | sed -e s/5/five/g -e s/6/six/g > $testroot/wt/numbers
1723 f4602cbd 2022-07-23 thomas (cd $testroot/wt && got commit -m 'edit numbers again') >/dev/null
1725 f4602cbd 2022-07-23 thomas if [ $ret -ne 0 ]; then
1726 f4602cbd 2022-07-23 thomas test_done $testroot $ret
1727 f4602cbd 2022-07-23 thomas return 1
1730 f4602cbd 2022-07-23 thomas (cd $testroot/wt && got patch -R patch) >/dev/null 2>&1
1732 f4602cbd 2022-07-23 thomas if [ $ret -eq 0 ]; then
1733 f4602cbd 2022-07-23 thomas echo "unexpectedly reverted the patch" >&2
1734 f4602cbd 2022-07-23 thomas test_done $testroot 1
1735 f4602cbd 2022-07-23 thomas return 1
1738 f4602cbd 2022-07-23 thomas cat <<-EOF > $testroot/wt/numbers.expected
1743 f4602cbd 2022-07-23 thomas <<<<<<< --- numbers
1746 f4602cbd 2022-07-23 thomas ||||||| +++ numbers
1751 f4602cbd 2022-07-23 thomas >>>>>>> commit $commit_id
1758 f4602cbd 2022-07-23 thomas cmp -s $testroot/wt/numbers $testroot/wt/numbers.expected
1760 f4602cbd 2022-07-23 thomas if [ $ret -ne 0 ]; then
1761 f4602cbd 2022-07-23 thomas diff -u $testroot/wt/numbers $testroot/wt/numbers.expected
1763 37e766f4 2022-09-21 thomas test_done $testroot $ret
1766 37e766f4 2022-09-21 thomas test_patch_newfile_xbit_got_diff() {
1767 37e766f4 2022-09-21 thomas local testroot=`test_init patch_newfile_xbit`
1769 37e766f4 2022-09-21 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1771 37e766f4 2022-09-21 thomas if [ $ret -ne 0 ]; then
1772 37e766f4 2022-09-21 thomas test_done $testroot $ret
1773 37e766f4 2022-09-21 thomas return 1
1776 37e766f4 2022-09-21 thomas cat <<EOF > $testroot/wt/patch
1777 37e766f4 2022-09-21 thomas blob - /dev/null
1778 37e766f4 2022-09-21 thomas blob + abcdef0123456789abcdef012345678901234567 (mode 755)
1779 37e766f4 2022-09-21 thomas --- /dev/null
1780 37e766f4 2022-09-21 thomas +++ xfile
1781 37e766f4 2022-09-21 thomas @@ -0,0 +1,1 @@
1785 37e766f4 2022-09-21 thomas (cd $testroot/wt && got patch patch) > /dev/null
1787 37e766f4 2022-09-21 thomas if [ $ret -ne 0 ]; then
1788 37e766f4 2022-09-21 thomas test_done $testroot $ret
1789 37e766f4 2022-09-21 thomas return 1
1792 37e766f4 2022-09-21 thomas if [ ! -x $testroot/wt/xfile ]; then
1793 37e766f4 2022-09-21 thomas echo "failed to set xbit on newfile" >&2
1794 37e766f4 2022-09-21 thomas test_done $testroot 1
1795 37e766f4 2022-09-21 thomas return 1
1798 37e766f4 2022-09-21 thomas echo xfile > $testroot/wt/xfile.expected
1799 37e766f4 2022-09-21 thomas cmp -s $testroot/wt/xfile $testroot/wt/xfile.expected
1801 37e766f4 2022-09-21 thomas if [ $ret -ne 0 ]; then
1802 37e766f4 2022-09-21 thomas echo "fail"
1803 37e766f4 2022-09-21 thomas diff -u $testroot/wt/xfile $testroot/wt/xfile.expected
1806 f4602cbd 2022-07-23 thomas test_done $testroot $ret
1809 37e766f4 2022-09-21 thomas test_patch_newfile_xbit_git_diff() {
1810 37e766f4 2022-09-21 thomas local testroot=`test_init patch_newfile_xbit`
1812 37e766f4 2022-09-21 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1814 37e766f4 2022-09-21 thomas if [ $ret -ne 0 ]; then
1815 37e766f4 2022-09-21 thomas test_done $testroot $ret
1816 37e766f4 2022-09-21 thomas return 1
1819 37e766f4 2022-09-21 thomas cat <<EOF > $testroot/wt/patch
1820 37e766f4 2022-09-21 thomas diff --git a/xfile b/xfile
1821 37e766f4 2022-09-21 thomas new file mode 100755
1822 37e766f4 2022-09-21 thomas index 00000000..abcdef01
1823 37e766f4 2022-09-21 thomas --- /dev/null
1824 37e766f4 2022-09-21 thomas +++ b/xfile
1825 37e766f4 2022-09-21 thomas @@ -0,0 +1,1 @@
1829 37e766f4 2022-09-21 thomas (cd $testroot/wt && got patch patch) > /dev/null
1831 37e766f4 2022-09-21 thomas if [ $ret -ne 0 ]; then
1832 37e766f4 2022-09-21 thomas test_done $testroot $ret
1833 37e766f4 2022-09-21 thomas return 1
1836 37e766f4 2022-09-21 thomas if [ ! -x $testroot/wt/xfile ]; then
1837 37e766f4 2022-09-21 thomas echo "failed to set xbit on newfile" >&2
1838 37e766f4 2022-09-21 thomas test_done $testroot 1
1839 37e766f4 2022-09-21 thomas return 1
1842 37e766f4 2022-09-21 thomas echo xfile > $testroot/wt/xfile.expected
1843 37e766f4 2022-09-21 thomas cmp -s $testroot/wt/xfile $testroot/wt/xfile.expected
1845 37e766f4 2022-09-21 thomas if [ $ret -ne 0 ]; then
1846 37e766f4 2022-09-21 thomas echo "fail"
1847 37e766f4 2022-09-21 thomas diff -u $testroot/wt/xfile $testroot/wt/xfile.expected
1850 37e766f4 2022-09-21 thomas test_done $testroot $ret
1853 a2c162eb 2022-10-30 thomas test_patch_umask() {
1854 a2c162eb 2022-10-30 thomas local testroot=`test_init patch_umask`
1856 a2c162eb 2022-10-30 thomas got checkout "$testroot/repo" "$testroot/wt" >/dev/null
1858 a2c162eb 2022-10-30 thomas cat <<EOF >$testroot/wt/patch
1859 a2c162eb 2022-10-30 thomas --- alpha
1860 a2c162eb 2022-10-30 thomas +++ alpha
1861 a2c162eb 2022-10-30 thomas @@ -1 +1 @@
1863 a2c162eb 2022-10-30 thomas +modified alpha
1866 a2c162eb 2022-10-30 thomas # using a subshell to avoid clobbering global umask
1867 a2c162eb 2022-10-30 thomas (umask 077 && cd "$testroot/wt" && got patch <patch) >/dev/null
1869 a2c162eb 2022-10-30 thomas if [ $ret -ne 0 ]; then
1870 a2c162eb 2022-10-30 thomas test_done "$testroot" $ret
1871 a2c162eb 2022-10-30 thomas return 1
1874 a2c162eb 2022-10-30 thomas if ! ls -l "$testroot/wt/alpha" | grep -q ^-rw-------; then
1875 a2c162eb 2022-10-30 thomas echo "alpha is not 0600 after patch" >&2
1876 a2c162eb 2022-10-30 thomas ls -l "$testroot/wt/alpha" >&2
1877 a2c162eb 2022-10-30 thomas test_done "$testroot" 1
1878 a2c162eb 2022-10-30 thomas return 1
1881 a2c162eb 2022-10-30 thomas test_done "$testroot" 0
1884 650a3405 2023-01-02 thomas test_patch_remove_binary_file() {
1885 650a3405 2023-01-02 thomas local testroot=`test_init patch_remove_binary_file`
1887 650a3405 2023-01-02 thomas if ! got checkout $testroot/repo $testroot/wt >/dev/null; then
1888 650a3405 2023-01-02 thomas test_done $testroot $ret
1889 650a3405 2023-01-02 thomas return 1
1892 650a3405 2023-01-02 thomas dd if=/dev/zero of=$testroot/wt/x bs=1 count=16 2>/dev/null >&2
1893 650a3405 2023-01-02 thomas (cd $testroot/wt && got add x && got commit -m +x) >/dev/null
1895 650a3405 2023-01-02 thomas (cd $testroot/wt && \
1896 650a3405 2023-01-02 thomas got branch demo && \
1897 650a3405 2023-01-02 thomas got rm x && \
1898 650a3405 2023-01-02 thomas got ci -m -x &&
1899 650a3405 2023-01-02 thomas got up -b master) >/dev/null
1901 650a3405 2023-01-02 thomas echo 'D x' > $testroot/stdout.expected
1903 650a3405 2023-01-02 thomas (cd $testroot/wt && got log -c demo -l 1 -p >patch)
1905 650a3405 2023-01-02 thomas (cd $testroot/wt && got patch <patch) > $testroot/stdout
1906 650a3405 2023-01-02 thomas if [ $? -ne 0 ]; then
1907 650a3405 2023-01-02 thomas echo 'patch failed' >&2
1908 650a3405 2023-01-02 thomas test_done $testroot 1
1909 650a3405 2023-01-02 thomas return 1
1912 650a3405 2023-01-02 thomas if ! cmp -s $testroot/stdout.expected $testroot/stdout; then
1913 650a3405 2023-01-02 thomas diff -u $testroot/stdout.expected $testroot/stdout
1914 650a3405 2023-01-02 thomas test_done $testroot 1
1915 650a3405 2023-01-02 thomas return 1
1918 650a3405 2023-01-02 thomas # try again using a git produced diff
1919 650a3405 2023-01-02 thomas (cd $testroot/wt && got revert x) >/dev/null
1921 650a3405 2023-01-02 thomas (cd $testroot/repo && git show demo) >$testroot/wt/patch
1923 650a3405 2023-01-02 thomas (cd $testroot/wt && got patch <patch) > $testroot/stdout
1924 650a3405 2023-01-02 thomas if [ $? -ne 0 ]; then
1925 650a3405 2023-01-02 thomas echo 'patch failed' >&2
1926 650a3405 2023-01-02 thomas test_done $testroot 1
1927 650a3405 2023-01-02 thomas return 1
1930 650a3405 2023-01-02 thomas if ! cmp -s $testroot/stdout.expected $testroot/stdout; then
1931 650a3405 2023-01-02 thomas diff -u $testroot/stdout.expected $testroot/stdout
1932 650a3405 2023-01-02 thomas test_done $testroot 1
1933 650a3405 2023-01-02 thomas return 1
1936 650a3405 2023-01-02 thomas # try again using a diff(1) style patch
1937 650a3405 2023-01-02 thomas (cd $testroot/wt && got revert x) >/dev/null
1939 650a3405 2023-01-02 thomas echo "Binary files x and /dev/null differ" >$testroot/wt/patch
1940 650a3405 2023-01-02 thomas (cd $testroot/wt && got patch <patch) >$testroot/stdout
1941 650a3405 2023-01-02 thomas if [ $? -ne 0 ]; then
1942 650a3405 2023-01-02 thomas echo 'patch failed' >&2
1943 650a3405 2023-01-02 thomas test_done $testroot 1
1944 650a3405 2023-01-02 thomas return 1
1947 650a3405 2023-01-02 thomas if ! cmp -s $testroot/stdout.expected $testroot/stdout; then
1948 650a3405 2023-01-02 thomas diff -u $testroot/stdout.expected $testroot/stdout
1949 650a3405 2023-01-02 thomas test_done $testroot 1
1950 650a3405 2023-01-02 thomas return 1
1953 650a3405 2023-01-02 thomas test_done $testroot 0
1956 069bbb86 2022-03-07 thomas test_parseargs "$@"
1957 3b6e8f19 2022-08-06 thomas run_test test_patch_basic
1958 069bbb86 2022-03-07 thomas run_test test_patch_dont_apply
1959 069bbb86 2022-03-07 thomas run_test test_patch_malformed
1960 069bbb86 2022-03-07 thomas run_test test_patch_no_patch
1961 069bbb86 2022-03-07 thomas run_test test_patch_equals_for_context
1962 bb2ad8ff 2022-03-13 thomas run_test test_patch_rename
1963 10e55613 2022-03-22 thomas run_test test_patch_illegal_status
1964 eaf99875 2022-03-22 thomas run_test test_patch_nop
1965 da09d8ed 2022-03-22 thomas run_test test_patch_preserve_perm
1966 e0c1f81c 2022-03-22 thomas run_test test_patch_create_dirs
1967 49114f01 2022-03-22 thomas run_test test_patch_with_offset
1968 be53ddb1 2022-03-22 thomas run_test test_patch_prefer_new_path
1969 ff7f34d3 2022-03-22 thomas run_test test_patch_no_newline
1970 d9db2ff9 2022-04-16 thomas run_test test_patch_strip
1971 bb90ca7b 2022-07-03 thomas run_test test_patch_whitespace
1972 72f46891 2022-04-23 thomas run_test test_patch_relative_paths
1973 cfbf5531 2022-04-23 thomas run_test test_patch_with_path_prefix
1974 cfbf5531 2022-04-23 thomas run_test test_patch_relpath_with_path_prefix
1975 eaef698f 2022-04-23 thomas run_test test_patch_reverse
1976 0f76ab83 2022-06-23 thomas run_test test_patch_merge_simple
1977 19dd85cb 2022-07-01 thomas run_test test_patch_merge_gitdiff
1978 7d8bcb99 2022-07-28 thomas run_test test_patch_merge_base_provided
1979 0f76ab83 2022-06-23 thomas run_test test_patch_merge_conflict
1980 0f76ab83 2022-06-23 thomas run_test test_patch_merge_unknown_blob
1981 f4602cbd 2022-07-23 thomas run_test test_patch_merge_reverse
1982 37e766f4 2022-09-21 thomas run_test test_patch_newfile_xbit_got_diff
1983 37e766f4 2022-09-21 thomas run_test test_patch_newfile_xbit_git_diff
1984 a2c162eb 2022-10-30 thomas run_test test_patch_umask
1985 650a3405 2023-01-02 thomas run_test test_patch_remove_binary_file
