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 cf85a643 2024-04-09 thomas seq 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 cf85a643 2024-04-09 thomas seq 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 cf85a643 2024-04-09 thomas seq 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 cf85a643 2024-04-09 thomas seq 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
205 1faec3fb 2023-05-14 thomas Files where patch failed to apply: 2
208 49114f01 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
210 7dd42450 2022-03-13 thomas if [ $ret -ne 0 ]; then
211 49114f01 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
213 069bbb86 2022-03-07 thomas test_done $testroot $ret
216 069bbb86 2022-03-07 thomas test_patch_malformed() {
217 069bbb86 2022-03-07 thomas local testroot=`test_init patch_malformed`
219 069bbb86 2022-03-07 thomas got checkout $testroot/repo $testroot/wt > /dev/null
221 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
222 069bbb86 2022-03-07 thomas test_done $testroot $ret
226 069bbb86 2022-03-07 thomas # missing "@@"
227 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
228 069bbb86 2022-03-07 thomas --- alpha
229 069bbb86 2022-03-07 thomas +++ alpha
230 069bbb86 2022-03-07 thomas @@ -1 +1,2
231 069bbb86 2022-03-07 thomas +hatsuseno
235 069bbb86 2022-03-07 thomas echo -n > $testroot/stdout.expected
236 069bbb86 2022-03-07 thomas echo "got: malformed patch" > $testroot/stderr.expected
238 069bbb86 2022-03-07 thomas (cd $testroot/wt && got patch patch) \
239 069bbb86 2022-03-07 thomas > $testroot/stdout \
240 069bbb86 2022-03-07 thomas 2> $testroot/stderr
242 10cdd9aa 2022-03-08 thomas if [ $ret -eq 0 ]; then
243 069bbb86 2022-03-07 thomas echo "got managed to apply an invalid patch"
244 069bbb86 2022-03-07 thomas test_done $testroot 1
248 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
250 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
251 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
252 069bbb86 2022-03-07 thomas test_done $testroot $ret
256 069bbb86 2022-03-07 thomas cmp -s $testroot/stderr.expected $testroot/stderr
258 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
259 069bbb86 2022-03-07 thomas diff -u $testroot/stderr.expected $testroot/stderr
260 069bbb86 2022-03-07 thomas test_done $testroot $ret
264 069bbb86 2022-03-07 thomas # wrong first character
265 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
266 069bbb86 2022-03-07 thomas --- alpha
267 069bbb86 2022-03-07 thomas +++ alpha
268 069bbb86 2022-03-07 thomas @@ -1 +1,2 @@
269 069bbb86 2022-03-07 thomas +hatsuseno
273 88c260f4 2022-05-14 thomas (cd $testroot/wt && got patch patch) \
274 88c260f4 2022-05-14 thomas > $testroot/stdout \
275 88c260f4 2022-05-14 thomas 2> $testroot/stderr
277 88c260f4 2022-05-14 thomas if [ $ret -eq 0 ]; then
278 88c260f4 2022-05-14 thomas echo "got managed to apply an invalid patch"
279 88c260f4 2022-05-14 thomas test_done $testroot 1
283 88c260f4 2022-05-14 thomas cmp -s $testroot/stdout.expected $testroot/stdout
285 88c260f4 2022-05-14 thomas if [ $ret -ne 0 ]; then
286 88c260f4 2022-05-14 thomas diff -u $testroot/stdout.expected $testroot/stdout
287 88c260f4 2022-05-14 thomas test_done $testroot $ret
291 88c260f4 2022-05-14 thomas cmp -s $testroot/stderr.expected $testroot/stderr
293 88c260f4 2022-05-14 thomas if [ $ret -ne 0 ]; then
294 88c260f4 2022-05-14 thomas diff -u $testroot/stderr.expected $testroot/stderr
295 88c260f4 2022-05-14 thomas test_done $testroot $ret
299 88c260f4 2022-05-14 thomas # empty hunk
300 88c260f4 2022-05-14 thomas cat <<EOF > $testroot/wt/patch
301 88c260f4 2022-05-14 thomas diff --git a/alpha b/iota
302 88c260f4 2022-05-14 thomas --- a/alpha
303 88c260f4 2022-05-14 thomas +++ b/iota
304 88c260f4 2022-05-14 thomas @@ -0,0 +0,0 @@
307 069bbb86 2022-03-07 thomas (cd $testroot/wt && got patch patch) \
308 069bbb86 2022-03-07 thomas > $testroot/stdout \
309 069bbb86 2022-03-07 thomas 2> $testroot/stderr
311 10cdd9aa 2022-03-08 thomas if [ $ret -eq 0 ]; then
312 069bbb86 2022-03-07 thomas echo "got managed to apply an invalid patch"
313 069bbb86 2022-03-07 thomas test_done $testroot 1
317 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
319 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
320 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
321 069bbb86 2022-03-07 thomas test_done $testroot $ret
325 069bbb86 2022-03-07 thomas cmp -s $testroot/stderr.expected $testroot/stderr
327 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
328 069bbb86 2022-03-07 thomas diff -u $testroot/stderr.expected $testroot/stderr
329 069bbb86 2022-03-07 thomas test_done $testroot $ret
333 069bbb86 2022-03-07 thomas test_done $testroot $ret
336 069bbb86 2022-03-07 thomas test_patch_no_patch() {
337 069bbb86 2022-03-07 thomas local testroot=`test_init patch_no_patch`
339 069bbb86 2022-03-07 thomas got checkout $testroot/repo $testroot/wt > /dev/null
341 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
342 069bbb86 2022-03-07 thomas test_done $testroot $ret
346 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
347 069bbb86 2022-03-07 thomas hello world!
350 069bbb86 2022-03-07 thomas some other nonsense
353 069bbb86 2022-03-07 thomas there's no patch in here!
356 069bbb86 2022-03-07 thomas echo -n > $testroot/stdout.expected
357 069bbb86 2022-03-07 thomas echo "got: no patch found" > $testroot/stderr.expected
359 069bbb86 2022-03-07 thomas (cd $testroot/wt && got patch patch) \
360 069bbb86 2022-03-07 thomas > $testroot/stdout \
361 069bbb86 2022-03-07 thomas 2> $testroot/stderr
363 10cdd9aa 2022-03-08 thomas if [ $ret -eq 0 ]; then # should fail
364 069bbb86 2022-03-07 thomas test_done $testroot 1
368 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
370 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
371 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
372 069bbb86 2022-03-07 thomas test_done $testroot $ret
376 069bbb86 2022-03-07 thomas cmp -s $testroot/stderr.expected $testroot/stderr
378 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
379 069bbb86 2022-03-07 thomas diff -u $testroot/stderr.expected $testroot/stderr
380 069bbb86 2022-03-07 thomas test_done $testroot $ret
384 069bbb86 2022-03-07 thomas test_done $testroot $ret
387 069bbb86 2022-03-07 thomas test_patch_equals_for_context() {
388 9a49df74 2022-04-23 thomas local testroot=`test_init patch_equals_for_context`
390 069bbb86 2022-03-07 thomas got checkout $testroot/repo $testroot/wt > /dev/null
392 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
393 069bbb86 2022-03-07 thomas test_done $testroot $ret
397 069bbb86 2022-03-07 thomas cat <<EOF > $testroot/wt/patch
398 069bbb86 2022-03-07 thomas --- alpha
399 069bbb86 2022-03-07 thomas +++ alpha
400 069bbb86 2022-03-07 thomas @@ -1 +1,2 @@
401 069bbb86 2022-03-07 thomas +hatsuseno
405 069bbb86 2022-03-07 thomas echo "M alpha" > $testroot/stdout.expected
407 069bbb86 2022-03-07 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
409 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
410 069bbb86 2022-03-07 thomas test_done $testroot $ret
414 069bbb86 2022-03-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
416 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
417 069bbb86 2022-03-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
418 069bbb86 2022-03-07 thomas test_done $testroot $ret
422 069bbb86 2022-03-07 thomas echo hatsuseno > $testroot/wt/alpha.expected
423 069bbb86 2022-03-07 thomas echo alpha >> $testroot/wt/alpha.expected
424 069bbb86 2022-03-07 thomas cmp -s $testroot/wt/alpha.expected $testroot/wt/alpha
426 10cdd9aa 2022-03-08 thomas if [ $ret -ne 0 ]; then
427 069bbb86 2022-03-07 thomas diff -u $testroot/wt/alpha.expected $testroot/wt/alpha
429 069bbb86 2022-03-07 thomas test_done $testroot $ret
432 bb2ad8ff 2022-03-13 thomas test_patch_rename() {
433 bb2ad8ff 2022-03-13 thomas local testroot=`test_init patch_rename`
435 bb2ad8ff 2022-03-13 thomas got checkout $testroot/repo $testroot/wt > /dev/null
437 bb2ad8ff 2022-03-13 thomas if [ $ret -ne 0 ]; then
438 bb2ad8ff 2022-03-13 thomas test_done $testroot $ret
442 bb2ad8ff 2022-03-13 thomas cat <<EOF > $testroot/wt/patch
443 8afe1f71 2022-05-12 thomas diff --git a/beta b/iota
444 8afe1f71 2022-05-12 thomas similarity index 100%
445 8afe1f71 2022-05-12 thomas rename from beta
446 8afe1f71 2022-05-12 thomas rename to iota
447 be53ddb1 2022-03-22 thomas diff --git a/alpha b/eta
448 be53ddb1 2022-03-22 thomas --- a/alpha
449 be53ddb1 2022-03-22 thomas +++ b/eta
450 8afe1f71 2022-05-12 thomas @@ -1 +1 @@
455 8afe1f71 2022-05-12 thomas echo 'D beta' > $testroot/stdout.expected
456 8afe1f71 2022-05-12 thomas echo 'A iota' >> $testroot/stdout.expected
457 8afe1f71 2022-05-12 thomas echo 'D alpha' >> $testroot/stdout.expected
458 8afe1f71 2022-05-12 thomas echo 'A eta' >> $testroot/stdout.expected
460 bb2ad8ff 2022-03-13 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
462 bb2ad8ff 2022-03-13 thomas if [ $ret -ne 0 ]; then
463 bb2ad8ff 2022-03-13 thomas test_done $testroot $ret
467 bb2ad8ff 2022-03-13 thomas cmp -s $testroot/stdout.expected $testroot/stdout
469 bb2ad8ff 2022-03-13 thomas if [ $ret -ne 0 ]; then
470 bb2ad8ff 2022-03-13 thomas diff -u $testroot/stdout.expected $testroot/stdout
471 bb2ad8ff 2022-03-13 thomas test_done $testroot $ret
475 8afe1f71 2022-05-12 thomas if [ -f $testroot/wt/alpha -o -f $testroot/wt/beta ]; then
476 8afe1f71 2022-05-12 thomas echo "alpha or beta were not removed" >&2
477 bb2ad8ff 2022-03-13 thomas test_done $testroot 1
480 8afe1f71 2022-05-12 thomas if [ ! -f $testroot/wt/iota -o ! -f $testroot/wt/eta ]; then
481 8afe1f71 2022-05-12 thomas echo "iota or eta were not created" >&2
482 bb2ad8ff 2022-03-13 thomas test_done $testroot 1
486 8afe1f71 2022-05-12 thomas echo beta > $testroot/wt/iota.expected
487 8afe1f71 2022-05-12 thomas cmp -s $testroot/wt/iota.expected $testroot/wt/iota
489 bb2ad8ff 2022-03-13 thomas if [ $ret -ne 0 ]; then
490 8afe1f71 2022-05-12 thomas diff -u $testroot/wt/iota.expected $testroot/wt/iota
491 bb2ad8ff 2022-03-13 thomas test_done $testroot $ret
495 8afe1f71 2022-05-12 thomas echo eta > $testroot/wt/eta.expected
496 8afe1f71 2022-05-12 thomas cmp -s $testroot/wt/eta.expected $testroot/wt/eta
498 bb2ad8ff 2022-03-13 thomas if [ $ret -ne 0 ]; then
499 8afe1f71 2022-05-12 thomas diff -u $testroot/wt/eta.expected $testroot/wt/eta
500 bb2ad8ff 2022-03-13 thomas test_done $testroot $ret
504 bb2ad8ff 2022-03-13 thomas test_done $testroot $ret
507 10e55613 2022-03-22 thomas test_patch_illegal_status() {
508 10e55613 2022-03-22 thomas local testroot=`test_init patch_illegal_status`
510 10e55613 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
512 10e55613 2022-03-22 thomas if [ $ret -ne 0 ]; then
513 10e55613 2022-03-22 thomas test_done $testroot $ret
517 49114f01 2022-03-22 thomas # try to patch an obstructed file, add a versioned one, edit a
518 49114f01 2022-03-22 thomas # non existent file and an unversioned one, and remove a
519 49114f01 2022-03-22 thomas # non existent file.
520 10e55613 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
521 49114f01 2022-03-22 thomas --- alpha
522 49114f01 2022-03-22 thomas +++ alpha
523 49114f01 2022-03-22 thomas @@ -1 +1,2 @@
525 49114f01 2022-03-22 thomas +was edited
526 49114f01 2022-03-22 thomas --- /dev/null
528 49114f01 2022-03-22 thomas @@ -0,0 +1 @@
532 10e55613 2022-03-22 thomas @@ -1 +1 @@
535 49114f01 2022-03-22 thomas --- kappa
536 49114f01 2022-03-22 thomas +++ kappa
537 49114f01 2022-03-22 thomas @@ -1 +1 @@
540 49114f01 2022-03-22 thomas --- lambda
541 49114f01 2022-03-22 thomas +++ /dev/null
542 49114f01 2022-03-22 thomas @@ -1 +0,0 @@
546 49114f01 2022-03-22 thomas echo kappa > $testroot/wt/kappa
547 10e55613 2022-03-22 thomas rm $testroot/wt/alpha
548 10e55613 2022-03-22 thomas mkdir $testroot/wt/alpha
550 49114f01 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout \
551 10e55613 2022-03-22 thomas 2> $testroot/stderr
553 10e55613 2022-03-22 thomas if [ $ret -eq 0 ]; then
554 10e55613 2022-03-22 thomas echo "edited a missing file" >&2
555 4e2bdb0d 2022-06-13 thomas test_done $testroot 1
559 49114f01 2022-03-22 thomas cat <<EOF > $testroot/stdout.expected
565 1faec3fb 2023-05-14 thomas Files where patch failed to apply: 5
568 49114f01 2022-03-22 thomas cat <<EOF > $testroot/stderr.expected
569 49114f01 2022-03-22 thomas got: alpha: file has unexpected status
570 49114f01 2022-03-22 thomas got: beta: file has unexpected status
571 49114f01 2022-03-22 thomas got: iota: No such file or directory
572 49114f01 2022-03-22 thomas got: kappa: file has unexpected status
573 49114f01 2022-03-22 thomas got: lambda: No such file or directory
574 49114f01 2022-03-22 thomas got: patch failed to apply
577 49114f01 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
579 49114f01 2022-03-22 thomas if [ $ret -ne 0 ]; then
580 49114f01 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
581 10e55613 2022-03-22 thomas test_done $testroot $ret
585 10e55613 2022-03-22 thomas cmp -s $testroot/stderr.expected $testroot/stderr
587 49114f01 2022-03-22 thomas if [ $ret -ne 0 ]; then
588 10e55613 2022-03-22 thomas diff -u $testroot/stderr.expected $testroot/stderr
589 814624e7 2022-03-22 thomas test_done $testroot $ret
593 814624e7 2022-03-22 thomas (cd $testroot/wt && got status) > $testroot/stdout
594 814624e7 2022-03-22 thomas cat <<EOF > $testroot/stdout.expected
600 814624e7 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
602 814624e7 2022-03-22 thomas if [ $ret -ne 0 ]; then
603 814624e7 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
605 eaf99875 2022-03-22 thomas test_done $testroot $ret
608 eaf99875 2022-03-22 thomas test_patch_nop() {
609 eaf99875 2022-03-22 thomas local testroot=`test_init patch_nop`
611 eaf99875 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
613 eaf99875 2022-03-22 thomas if [ $ret -ne 0 ]; then
614 eaf99875 2022-03-22 thomas test_done $testroot $ret
618 eaf99875 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
619 eaf99875 2022-03-22 thomas --- alpha
620 eaf99875 2022-03-22 thomas +++ alpha
621 eaf99875 2022-03-22 thomas @@ -1 +1 @@
623 eaf99875 2022-03-22 thomas +cafe alpha
625 eaf99875 2022-03-22 thomas +++ /dev/null
626 eaf99875 2022-03-22 thomas @@ -1 +0,0 @@
628 be53ddb1 2022-03-22 thomas diff --git a/gamma/delta b/gamma/delta.new
629 eaf99875 2022-03-22 thomas --- gamma/delta
630 eaf99875 2022-03-22 thomas +++ gamma/delta.new
631 eaf99875 2022-03-22 thomas @@ -1 +1 @@
633 eaf99875 2022-03-22 thomas +delta updated and renamed!
636 eaf99875 2022-03-22 thomas (cd $testroot/wt && got patch -n patch)
638 eaf99875 2022-03-22 thomas if [ $ret -ne 0 ]; then
639 eaf99875 2022-03-22 thomas test_done $testroot $ret
643 eaf99875 2022-03-22 thomas # remove the patch to avoid the ? entry
644 eaf99875 2022-03-22 thomas rm $testroot/wt/patch
646 eaf99875 2022-03-22 thomas (cd $testroot/wt && got status) > $testroot/stdout
648 eaf99875 2022-03-22 thomas if [ $ret -ne 0 ]; then
649 eaf99875 2022-03-22 thomas test_done $testroot $ret
653 eaf99875 2022-03-22 thomas echo -n > $testroot/stdout.expected
654 eaf99875 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
656 eaf99875 2022-03-22 thomas if [ $ret -ne 0 ]; then
657 eaf99875 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
659 10e55613 2022-03-22 thomas test_done $testroot $ret
662 da09d8ed 2022-03-22 thomas test_patch_preserve_perm() {
663 da09d8ed 2022-03-22 thomas local testroot=`test_init patch_preserve_perm`
665 da09d8ed 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
667 da09d8ed 2022-03-22 thomas if [ $ret -ne 0 ]; then
668 da09d8ed 2022-03-22 thomas test_done $testroot $ret
672 da09d8ed 2022-03-22 thomas chmod +x $testroot/wt/alpha
673 da09d8ed 2022-03-22 thomas (cd $testroot/wt && got commit -m 'alpha executable') > /dev/null
675 da09d8ed 2022-03-22 thomas if [ $ret -ne 0 ]; then
676 da09d8ed 2022-03-22 thomas test_done $testroot $ret
680 da09d8ed 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
681 da09d8ed 2022-03-22 thomas --- alpha
682 da09d8ed 2022-03-22 thomas +++ alpha
683 da09d8ed 2022-03-22 thomas @@ -1 +1,2 @@
685 da09d8ed 2022-03-22 thomas +was edited
688 da09d8ed 2022-03-22 thomas (cd $testroot/wt && got patch patch) > /dev/null
690 da09d8ed 2022-03-22 thomas if [ $ret -ne 0 ]; then
691 da09d8ed 2022-03-22 thomas test_done $testroot $ret
695 da09d8ed 2022-03-22 thomas if [ ! -x $testroot/wt/alpha ]; then
696 da09d8ed 2022-03-22 thomas echo "alpha is no more executable!" >&2
697 da09d8ed 2022-03-22 thomas test_done $testroot 1
700 e0c1f81c 2022-03-22 thomas test_done $testroot 0
703 e0c1f81c 2022-03-22 thomas test_patch_create_dirs() {
704 e0c1f81c 2022-03-22 thomas local testroot=`test_init patch_create_dirs`
706 e0c1f81c 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
708 e0c1f81c 2022-03-22 thomas if [ $ret -ne 0 ]; then
709 e0c1f81c 2022-03-22 thomas test_done $testroot $ret
713 e0c1f81c 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
714 e0c1f81c 2022-03-22 thomas --- /dev/null
715 e0c1f81c 2022-03-22 thomas +++ iota/kappa/lambda
716 e0c1f81c 2022-03-22 thomas @@ -0,0 +1 @@
720 e0c1f81c 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
722 e0c1f81c 2022-03-22 thomas if [ $ret -ne 0 ]; then
723 e0c1f81c 2022-03-22 thomas test_done $testroot $ret
727 e0c1f81c 2022-03-22 thomas echo 'A iota/kappa/lambda' >> $testroot/stdout.expected
728 e0c1f81c 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
730 e0c1f81c 2022-03-22 thomas if [ $ret -ne 0 ]; then
731 e0c1f81c 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
732 e0c1f81c 2022-03-22 thomas test_done $testroot $ret
736 e0c1f81c 2022-03-22 thomas if [ ! -f $testroot/wt/iota/kappa/lambda ]; then
737 e0c1f81c 2022-03-22 thomas echo "file not created!" >&2
738 e0c1f81c 2022-03-22 thomas test_done $testroot $ret
741 da09d8ed 2022-03-22 thomas test_done $testroot 0
744 49114f01 2022-03-22 thomas test_patch_with_offset() {
745 49114f01 2022-03-22 thomas local testroot=`test_init patch_with_offset`
747 49114f01 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
749 49114f01 2022-03-22 thomas if [ $ret -ne 0 ]; then
750 49114f01 2022-03-22 thomas test_done $testroot $ret
754 49114f01 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
755 49114f01 2022-03-22 thomas --- numbers
756 49114f01 2022-03-22 thomas +++ numbers
757 49114f01 2022-03-22 thomas @@ -47,7 +47,7 @@
762 49114f01 2022-03-22 thomas +midway tru it!
766 49114f01 2022-03-22 thomas @@ -87,7 +87,7 @@
771 49114f01 2022-03-22 thomas +almost there!
777 cf85a643 2024-04-09 thomas seq 100 > $testroot/wt/numbers
778 7a9950a8 2022-11-18 thomas ed -s "$testroot/wt/numbers" <<EOF
780 cf85a643 2024-04-09 thomas 50r !seq 20
785 49114f01 2022-03-22 thomas (cd $testroot/wt && got add numbers && got commit -m '+numbers') \
786 49114f01 2022-03-22 thomas > /dev/null
788 49114f01 2022-03-22 thomas if [ $ret -ne 0 ]; then
789 49114f01 2022-03-22 thomas test_done $testroot $ret
793 49114f01 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
795 49114f01 2022-03-22 thomas if [ $ret -ne 0 ]; then
796 49114f01 2022-03-22 thomas test_done $testroot/wt $ret
800 49114f01 2022-03-22 thomas cat <<EOF > $testroot/stdout.expected
801 49114f01 2022-03-22 thomas M numbers
802 49114f01 2022-03-22 thomas @@ -47,7 +47,7 @@ applied with offset -10
803 49114f01 2022-03-22 thomas @@ -87,7 +87,7 @@ applied with offset 10
806 13b170bf 2024-04-25 thomas.ad cmp -s $testroot/stdout.expected $testroot/stdout
807 13b170bf 2024-04-25 thomas.ad ret=$?
808 13b170bf 2024-04-25 thomas.ad if [ $ret -ne 0 ]; then
809 13b170bf 2024-04-25 thomas.ad diff -u $testroot/stdout.expected $testroot/stdout
811 13b170bf 2024-04-25 thomas.ad test_done $testroot $ret
814 13b170bf 2024-04-25 thomas.ad test_patch_empty_file() {
815 13b170bf 2024-04-25 thomas.ad local testroot=`test_init patch_empty_file`
817 13b170bf 2024-04-25 thomas.ad got checkout $testroot/repo $testroot/wt > /dev/null
818 13b170bf 2024-04-25 thomas.ad ret=$?
819 13b170bf 2024-04-25 thomas.ad if [ $ret -ne 0 ]; then
820 13b170bf 2024-04-25 thomas.ad test_done $testroot $ret
821 13b170bf 2024-04-25 thomas.ad return 1
824 13b170bf 2024-04-25 thomas.ad echo -n > $testroot/wt/alpha
825 13b170bf 2024-04-25 thomas.ad (cd "$testroot/wt" && got commit -m 'edit alpha' alpha) >/dev/null
827 ec05a5de 2024-04-25 thomas.ad # try a patch which re-adds file contents; should suceeed
828 13b170bf 2024-04-25 thomas.ad cat <<EOF >$testroot/wt/patch
829 13b170bf 2024-04-25 thomas.ad --- alpha
830 13b170bf 2024-04-25 thomas.ad +++ alpha
831 13b170bf 2024-04-25 thomas.ad @@ -0,0 +1 @@
832 13b170bf 2024-04-25 thomas.ad +alpha
834 13b170bf 2024-04-25 thomas.ad (cd $testroot/wt && got patch patch) > $testroot/stdout
835 13b170bf 2024-04-25 thomas.ad ret=$?
836 13b170bf 2024-04-25 thomas.ad if [ $ret -ne 0 ]; then
837 13b170bf 2024-04-25 thomas.ad test_done $testroot $ret
838 13b170bf 2024-04-25 thomas.ad return 1
840 13b170bf 2024-04-25 thomas.ad echo 'M alpha' > $testroot/stdout.expected
841 be53ddb1 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
843 be53ddb1 2022-03-22 thomas if [ $ret -ne 0 ]; then
844 be53ddb1 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
845 ec05a5de 2024-04-25 thomas.ad test_done $testroot $ret
846 ec05a5de 2024-04-25 thomas.ad return 1
849 ec05a5de 2024-04-25 thomas.ad (cd $testroot/wt && got revert -R . > /dev/null)
851 ec05a5de 2024-04-25 thomas.ad # try a patch which edits the file; should fail
852 ec05a5de 2024-04-25 thomas.ad cat <<EOF >$testroot/wt/patch
853 ec05a5de 2024-04-25 thomas.ad --- alpha
854 ec05a5de 2024-04-25 thomas.ad +++ alpha
855 ec05a5de 2024-04-25 thomas.ad @@ -1 +1 @@
856 ec05a5de 2024-04-25 thomas.ad -alpha
859 ec05a5de 2024-04-25 thomas.ad (cd $testroot/wt && got patch patch) > $testroot/stdout \
860 ec05a5de 2024-04-25 thomas.ad 2> $testroot/stderr
861 ec05a5de 2024-04-25 thomas.ad ret=$?
862 ec05a5de 2024-04-25 thomas.ad if [ $ret -eq 0 ]; then
863 ec05a5de 2024-04-25 thomas.ad echo "got patch suceeded unexpectedly" >&2
864 ec05a5de 2024-04-25 thomas.ad test_done $testroot $ret
865 ec05a5de 2024-04-25 thomas.ad return 1
868 ec05a5de 2024-04-25 thomas.ad echo 'got: patch failed to apply' > $testroot/stderr.expected
869 ec05a5de 2024-04-25 thomas.ad cmp -s $testroot/stderr.expected $testroot/stderr
870 ec05a5de 2024-04-25 thomas.ad ret=$?
871 ec05a5de 2024-04-25 thomas.ad if [ $ret -ne 0 ]; then
872 ec05a5de 2024-04-25 thomas.ad diff -u $testroot/stderr.expected $testroot/stderr
873 ec05a5de 2024-04-25 thomas.ad test_done $testroot $ret
874 ec05a5de 2024-04-25 thomas.ad return 1
877 ec05a5de 2024-04-25 thomas.ad (cd $testroot/wt && got revert -R . > /dev/null)
879 ec05a5de 2024-04-25 thomas.ad # try a patch which deletes lines from the file; should fail
880 ec05a5de 2024-04-25 thomas.ad cat <<EOF >$testroot/wt/patch
881 ec05a5de 2024-04-25 thomas.ad --- alpha
882 ec05a5de 2024-04-25 thomas.ad +++ alpha
883 ec05a5de 2024-04-25 thomas.ad @@ -1,2 +0 @@
884 ec05a5de 2024-04-25 thomas.ad -alpha
887 ec05a5de 2024-04-25 thomas.ad (cd $testroot/wt && got patch patch) > $testroot/stdout \
888 ec05a5de 2024-04-25 thomas.ad 2> $testroot/stderr
889 ec05a5de 2024-04-25 thomas.ad ret=$?
890 ec05a5de 2024-04-25 thomas.ad if [ $ret -eq 0 ]; then
891 ec05a5de 2024-04-25 thomas.ad echo "got patch suceeded unexpectedly" >&2
892 ec05a5de 2024-04-25 thomas.ad test_done $testroot $ret
893 ec05a5de 2024-04-25 thomas.ad return 1
895 ec05a5de 2024-04-25 thomas.ad echo 'got: patch failed to apply' > $testroot/stderr.expected
896 ec05a5de 2024-04-25 thomas.ad cmp -s $testroot/stderr.expected $testroot/stderr
897 ec05a5de 2024-04-25 thomas.ad ret=$?
898 ec05a5de 2024-04-25 thomas.ad if [ $ret -ne 0 ]; then
899 ec05a5de 2024-04-25 thomas.ad diff -u $testroot/stderr.expected $testroot/stderr
901 be53ddb1 2022-03-22 thomas test_done $testroot $ret
904 be53ddb1 2022-03-22 thomas test_patch_prefer_new_path() {
905 be53ddb1 2022-03-22 thomas local testroot=`test_init patch_orig`
907 be53ddb1 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
909 be53ddb1 2022-03-22 thomas if [ $ret -ne 0 ]; then
910 be53ddb1 2022-03-22 thomas test_done $testroot $ret
914 be53ddb1 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
915 be53ddb1 2022-03-22 thomas --- alpha.orig
916 be53ddb1 2022-03-22 thomas +++ alpha
917 be53ddb1 2022-03-22 thomas @@ -1 +1,2 @@
919 be53ddb1 2022-03-22 thomas +was edited
922 be53ddb1 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
924 be53ddb1 2022-03-22 thomas if [ $ret -ne 0 ]; then
925 be53ddb1 2022-03-22 thomas test_done $testroot $ret
929 e1c219c8 2022-04-22 thomas echo 'M alpha' > $testroot/stdout.expected
930 49114f01 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
932 49114f01 2022-03-22 thomas if [ $ret -ne 0 ]; then
933 49114f01 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
935 49114f01 2022-03-22 thomas test_done $testroot $ret
938 ff7f34d3 2022-03-22 thomas test_patch_no_newline() {
939 ff7f34d3 2022-03-22 thomas local testroot=`test_init patch_no_newline`
941 ff7f34d3 2022-03-22 thomas got checkout $testroot/repo $testroot/wt > /dev/null
943 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
944 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
948 ff7f34d3 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
949 ff7f34d3 2022-03-22 thomas --- /dev/null
951 ff7f34d3 2022-03-22 thomas @@ -0,0 +1 @@
953 ff7f34d3 2022-03-22 thomas \ No newline at end of file
956 ff7f34d3 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
958 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
959 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
963 ff7f34d3 2022-03-22 thomas echo "A eta" > $testroot/stdout.expected
964 ff7f34d3 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
966 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
967 ff7f34d3 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
968 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
972 ff7f34d3 2022-03-22 thomas echo -n eta > $testroot/wt/eta.expected
973 ff7f34d3 2022-03-22 thomas cmp -s $testroot/wt/eta.expected $testroot/wt/eta
975 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
976 ff7f34d3 2022-03-22 thomas diff -u $testroot/wt/eta.expected $testroot/wt/eta
977 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
981 ff7f34d3 2022-03-22 thomas (cd $testroot/wt && got commit -m 'add eta') > /dev/null
983 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
984 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
988 ff7f34d3 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
991 ff7f34d3 2022-03-22 thomas @@ -1 +1 @@
993 ff7f34d3 2022-03-22 thomas \ No newline at end of file
995 ff7f34d3 2022-03-22 thomas \ No newline at end of file
998 ff7f34d3 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
1000 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
1001 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
1002 ff7f34d3 2022-03-22 thomas return 1
1005 ff7f34d3 2022-03-22 thomas echo "M eta" > $testroot/stdout.expected
1006 ff7f34d3 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1008 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
1009 ff7f34d3 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
1010 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
1011 ff7f34d3 2022-03-22 thomas return 1
1014 ff7f34d3 2022-03-22 thomas echo -n ETA > $testroot/wt/eta.expected
1015 ff7f34d3 2022-03-22 thomas cmp -s $testroot/wt/eta.expected $testroot/wt/eta
1017 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
1018 ff7f34d3 2022-03-22 thomas diff -u $testroot/wt/eta.expected $testroot/wt/eta
1019 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
1020 ff7f34d3 2022-03-22 thomas return 1
1023 ff7f34d3 2022-03-22 thomas (cd $testroot/wt && got commit -m 'edit eta') > /dev/null
1025 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
1026 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
1027 ff7f34d3 2022-03-22 thomas return 1
1030 ff7f34d3 2022-03-22 thomas cat <<EOF > $testroot/wt/patch
1033 ff7f34d3 2022-03-22 thomas @@ -1 +1 @@
1035 ff7f34d3 2022-03-22 thomas \ No newline at end of file
1039 ff7f34d3 2022-03-22 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
1041 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
1042 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
1043 ff7f34d3 2022-03-22 thomas return 1
1046 ff7f34d3 2022-03-22 thomas echo "M eta" > $testroot/stdout.expected
1047 ff7f34d3 2022-03-22 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1049 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
1050 ff7f34d3 2022-03-22 thomas diff -u $testroot/stdout.expected $testroot/stdout
1051 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
1052 ff7f34d3 2022-03-22 thomas return 1
1055 ff7f34d3 2022-03-22 thomas echo eta > $testroot/wt/eta.expected
1056 ff7f34d3 2022-03-22 thomas cmp -s $testroot/wt/eta.expected $testroot/wt/eta
1058 ff7f34d3 2022-03-22 thomas if [ $ret -ne 0 ]; then
1059 ff7f34d3 2022-03-22 thomas diff -u $testroot/wt/eta.expected $testroot/wt/eta
1061 ff7f34d3 2022-03-22 thomas test_done $testroot $ret
1064 d9db2ff9 2022-04-16 thomas test_patch_strip() {
1065 d9db2ff9 2022-04-16 thomas local testroot=`test_init patch_strip`
1067 d9db2ff9 2022-04-16 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1069 d9db2ff9 2022-04-16 thomas if [ $ret -ne 0 ]; then
1070 d9db2ff9 2022-04-16 thomas test_done $testroot $ret
1071 d9db2ff9 2022-04-16 thomas return 1
1074 d9db2ff9 2022-04-16 thomas cat <<EOF > $testroot/wt/patch
1075 d9db2ff9 2022-04-16 thomas --- foo/bar/alpha.orig
1076 d9db2ff9 2022-04-16 thomas +++ foo/bar/alpha
1077 d9db2ff9 2022-04-16 thomas @@ -1 +1 @@
1082 d9db2ff9 2022-04-16 thomas (cd $testroot/wt && got patch -p2 patch) > $testroot/stdout
1084 d9db2ff9 2022-04-16 thomas if [ $ret -ne 0 ]; then
1085 d9db2ff9 2022-04-16 thomas test_done $testroot $ret
1086 d9db2ff9 2022-04-16 thomas return 1
1089 d9db2ff9 2022-04-16 thomas echo "M alpha" >> $testroot/stdout.expected
1090 d9db2ff9 2022-04-16 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1092 d9db2ff9 2022-04-16 thomas if [ $ret -ne 0 ]; then
1093 d9db2ff9 2022-04-16 thomas diff -u $testroot/stdout.expected $testroot/stdout
1094 d9db2ff9 2022-04-16 thomas test_done $testroot $ret
1095 d9db2ff9 2022-04-16 thomas return 1
1098 d9db2ff9 2022-04-16 thomas (cd $testroot/wt && got revert alpha) > /dev/null 2>&1
1100 d9db2ff9 2022-04-16 thomas if [ $ret -ne 0 ]; then
1101 d9db2ff9 2022-04-16 thomas test_done $testroot $ret
1102 d9db2ff9 2022-04-16 thomas return 1
1105 d9db2ff9 2022-04-16 thomas (cd $testroot/wt && got patch -p3 patch) \
1106 d9db2ff9 2022-04-16 thomas 2> $testroot/stderr
1108 d9db2ff9 2022-04-16 thomas if [ $ret -eq 0 ]; then
1109 d9db2ff9 2022-04-16 thomas echo "stripped more components than available!"
1110 d9db2ff9 2022-04-16 thomas test_done $testroot 1
1111 d9db2ff9 2022-04-16 thomas return 1
1114 d9db2ff9 2022-04-16 thomas cat <<EOF > $testroot/stderr.expected
1115 d9db2ff9 2022-04-16 thomas got: can't strip 1 path-components from foo/bar/alpha: bad path
1118 d9db2ff9 2022-04-16 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1120 d9db2ff9 2022-04-16 thomas if [ $ret -ne 0 ]; then
1121 d9db2ff9 2022-04-16 thomas diff -u $testroot/stderr.expected $testroot/stderr
1123 d9db2ff9 2022-04-16 thomas test_done $testroot 0
1126 bb90ca7b 2022-07-03 thomas test_patch_whitespace() {
1127 bb90ca7b 2022-07-03 thomas local testroot=`test_init patch_whitespace`
1129 bb90ca7b 2022-07-03 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1131 bb90ca7b 2022-07-03 thomas if [ $ret -ne 0 ]; then
1132 bb90ca7b 2022-07-03 thomas test_done $testroot $ret
1133 bb90ca7b 2022-07-03 thomas return 1
1136 bb90ca7b 2022-07-03 thomas trailing=" "
1138 bb90ca7b 2022-07-03 thomas cat <<EOF > $testroot/wt/hello.c
1139 bb90ca7b 2022-07-03 thomas #include <stdio.h>
1142 bb90ca7b 2022-07-03 thomas main(void)
1144 bb90ca7b 2022-07-03 thomas /* the trailing whitespace is on purpose */
1145 bb90ca7b 2022-07-03 thomas printf("hello, world\n");$trailing
1146 bb90ca7b 2022-07-03 thomas return 0;
1150 bb90ca7b 2022-07-03 thomas (cd $testroot/wt && got add hello.c && got ci -m '+hello.c') \
1151 bb90ca7b 2022-07-03 thomas > /dev/null
1153 bb90ca7b 2022-07-03 thomas if [ $ret -ne 0 ]; then
1154 bb90ca7b 2022-07-03 thomas test_done $testroot $ret
1155 bb90ca7b 2022-07-03 thomas return 1
1158 bb90ca7b 2022-07-03 thomas # test with a diff with various whitespace corruptions
1159 bb90ca7b 2022-07-03 thomas cat <<EOF > $testroot/wt/patch
1160 bb90ca7b 2022-07-03 thomas --- hello.c
1161 bb90ca7b 2022-07-03 thomas +++ hello.c
1162 bb90ca7b 2022-07-03 thomas @@ -5,5 +5,5 @@
1164 bb90ca7b 2022-07-03 thomas /* the trailing whitespace is on purpose */
1165 bb90ca7b 2022-07-03 thomas printf("hello, world\n");
1166 bb90ca7b 2022-07-03 thomas - return 0;
1167 bb90ca7b 2022-07-03 thomas + return 5; /* always fails */
1171 bb90ca7b 2022-07-03 thomas (cd $testroot/wt && got patch patch) \
1172 bb90ca7b 2022-07-03 thomas 2>$testroot/stderr >$testroot/stdout
1174 bb90ca7b 2022-07-03 thomas if [ $ret -ne 0 ]; then
1175 bb90ca7b 2022-07-03 thomas echo "failed to apply diff" >&2
1176 bb90ca7b 2022-07-03 thomas test_done $testroot $ret
1177 bb90ca7b 2022-07-03 thomas return 1
1180 bb90ca7b 2022-07-03 thomas echo 'M hello.c' > $testroot/stdout.expected
1181 bb90ca7b 2022-07-03 thomas echo '@@ -5,5 +5,5 @@ hunk contains mangled whitespace' \
1182 bb90ca7b 2022-07-03 thomas >> $testroot/stdout.expected
1183 bb90ca7b 2022-07-03 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1185 bb90ca7b 2022-07-03 thomas if [ $ret -ne 0 ]; then
1186 bb90ca7b 2022-07-03 thomas diff -u $testroot/stdout.expected $testroot/stdout
1187 bb90ca7b 2022-07-03 thomas test_done $testroot $ret
1188 bb90ca7b 2022-07-03 thomas return 1
1191 bb90ca7b 2022-07-03 thomas cat <<EOF > $testroot/wt/hello.c.expected
1192 bb90ca7b 2022-07-03 thomas #include <stdio.h>
1195 bb90ca7b 2022-07-03 thomas main(void)
1197 bb90ca7b 2022-07-03 thomas /* the trailing whitespace is on purpose */
1198 bb90ca7b 2022-07-03 thomas printf("hello, world\n");$trailing
1199 bb90ca7b 2022-07-03 thomas return 5; /* always fails */
1203 bb90ca7b 2022-07-03 thomas cmp -s $testroot/wt/hello.c.expected $testroot/wt/hello.c
1205 bb90ca7b 2022-07-03 thomas if [ $ret -ne 0 ]; then
1206 bb90ca7b 2022-07-03 thomas diff -u $testroot/wt/hello.c.expected $testroot/wt/hello.c
1208 bb90ca7b 2022-07-03 thomas test_done $testroot $ret
1211 72f46891 2022-04-23 thomas test_patch_relative_paths() {
1212 9a49df74 2022-04-23 thomas local testroot=`test_init patch_relative_paths`
1214 72f46891 2022-04-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1216 72f46891 2022-04-23 thomas if [ $ret -ne 0 ]; then
1217 72f46891 2022-04-23 thomas test_done $testroot $ret
1218 72f46891 2022-04-23 thomas return 1
1221 72f46891 2022-04-23 thomas cat <<EOF > $testroot/wt/gamma/patch
1222 72f46891 2022-04-23 thomas --- delta
1223 72f46891 2022-04-23 thomas +++ delta
1224 72f46891 2022-04-23 thomas @@ -1 +1 @@
1227 72f46891 2022-04-23 thomas --- /dev/null
1229 72f46891 2022-04-23 thomas @@ -0,0 +1 @@
1233 72f46891 2022-04-23 thomas (cd $testroot/wt/gamma && got patch patch) > $testroot/stdout
1235 72f46891 2022-04-23 thomas if [ $ret -ne 0 ]; then
1236 72f46891 2022-04-23 thomas test_done $testroot $ret
1237 72f46891 2022-04-23 thomas return 1
1240 72f46891 2022-04-23 thomas echo 'M gamma/delta' > $testroot/stdout.expected
1241 72f46891 2022-04-23 thomas echo 'A gamma/eta' >> $testroot/stdout.expected
1243 cfbf5531 2022-04-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1245 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1246 cfbf5531 2022-04-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1248 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1251 cfbf5531 2022-04-23 thomas test_patch_with_path_prefix() {
1252 cfbf5531 2022-04-23 thomas local testroot=`test_init patch_with_path_prefix`
1254 cfbf5531 2022-04-23 thomas got checkout -p gamma $testroot/repo $testroot/wt > /dev/null
1256 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1257 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1258 cfbf5531 2022-04-23 thomas return 1
1261 cfbf5531 2022-04-23 thomas cat <<EOF > $testroot/wt/patch
1262 cfbf5531 2022-04-23 thomas --- delta
1263 cfbf5531 2022-04-23 thomas +++ delta
1264 cfbf5531 2022-04-23 thomas @@ -1 +1 @@
1267 cfbf5531 2022-04-23 thomas --- /dev/null
1269 cfbf5531 2022-04-23 thomas @@ -0,0 +1 @@
1273 cfbf5531 2022-04-23 thomas (cd $testroot/wt && got patch patch) > $testroot/stdout
1275 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1276 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1277 cfbf5531 2022-04-23 thomas return 1
1280 cfbf5531 2022-04-23 thomas echo 'M delta' > $testroot/stdout.expected
1281 cfbf5531 2022-04-23 thomas echo 'A eta' >> $testroot/stdout.expected
1283 cfbf5531 2022-04-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1285 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1286 cfbf5531 2022-04-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1288 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1291 cfbf5531 2022-04-23 thomas test_patch_relpath_with_path_prefix() {
1292 cfbf5531 2022-04-23 thomas local testroot=`test_init patch_relpaths_with_path_prefix`
1294 cfbf5531 2022-04-23 thomas got checkout -p gamma $testroot/repo $testroot/wt > /dev/null
1296 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1297 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1298 cfbf5531 2022-04-23 thomas return 1
1301 cfbf5531 2022-04-23 thomas mkdir -p $testroot/wt/epsilon/zeta/
1303 cfbf5531 2022-04-23 thomas cat <<EOF > $testroot/wt/patch
1304 cfbf5531 2022-04-23 thomas --- /dev/null
1305 cfbf5531 2022-04-23 thomas +++ zeta/theta
1306 cfbf5531 2022-04-23 thomas @@ -0,0 +1 @@
1310 cfbf5531 2022-04-23 thomas (cd $testroot/wt/epsilon/zeta && got patch -p1 $testroot/wt/patch) \
1311 cfbf5531 2022-04-23 thomas > $testroot/stdout
1313 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1314 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1315 cfbf5531 2022-04-23 thomas return 1
1318 cfbf5531 2022-04-23 thomas echo 'A epsilon/zeta/theta' >> $testroot/stdout.expected
1320 72f46891 2022-04-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1322 72f46891 2022-04-23 thomas if [ $ret -ne 0 ]; then
1323 72f46891 2022-04-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1324 cfbf5531 2022-04-23 thomas test_done $testroot $ret
1325 cfbf5531 2022-04-23 thomas return 1
1328 cfbf5531 2022-04-23 thomas echo 'theta' > $testroot/theta.expected
1329 cfbf5531 2022-04-23 thomas cmp -s $testroot/wt/epsilon/zeta/theta $testroot/theta.expected
1331 cfbf5531 2022-04-23 thomas if [ $ret -ne 0 ]; then
1332 cfbf5531 2022-04-23 thomas diff -u $testroot/wt/epsilon/zeta/theta $testroot/theta.expected
1334 72f46891 2022-04-23 thomas test_done $testroot $ret
1337 eaef698f 2022-04-23 thomas test_patch_reverse() {
1338 eaef698f 2022-04-23 thomas local testroot=`test_init patch_reverse`
1340 eaef698f 2022-04-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1342 eaef698f 2022-04-23 thomas if [ $ret -ne 0 ]; then
1343 eaef698f 2022-04-23 thomas test_done $testroot $ret
1344 eaef698f 2022-04-23 thomas return 1
1347 eaef698f 2022-04-23 thomas cat <<EOF > $testroot/wt/patch
1348 eaef698f 2022-04-23 thomas --- alpha
1349 eaef698f 2022-04-23 thomas +++ alpha
1350 eaef698f 2022-04-23 thomas @@ -1 +1 @@
1352 eaef698f 2022-04-23 thomas \ No newline at end of file
1356 eaef698f 2022-04-23 thomas (cd $testroot/wt && got patch -R patch) > $testroot/stdout
1358 eaef698f 2022-04-23 thomas if [ $ret -ne 0 ]; then
1359 eaef698f 2022-04-23 thomas test_done $testroot $ret
1360 eaef698f 2022-04-23 thomas return 1
1363 eaef698f 2022-04-23 thomas echo "M alpha" > $testroot/stdout.expected
1364 eaef698f 2022-04-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1366 eaef698f 2022-04-23 thomas if [ $ret -ne 0 ]; then
1367 eaef698f 2022-04-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1368 eaef698f 2022-04-23 thomas test_done $testroot $ret
1369 eaef698f 2022-04-23 thomas return 1
1372 eaef698f 2022-04-23 thomas echo -n ALPHA > $testroot/wt/alpha.expected
1373 eaef698f 2022-04-23 thomas cmp -s $testroot/wt/alpha.expected $testroot/wt/alpha
1375 eaef698f 2022-04-23 thomas if [ $ret -ne 0 ]; then
1376 eaef698f 2022-04-23 thomas diff -u $testroot/wt/alpha.expected $testroot/wt/alpha
1378 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1381 0f76ab83 2022-06-23 thomas test_patch_merge_simple() {
1382 0f76ab83 2022-06-23 thomas local testroot=`test_init patch_merge_simple`
1384 0f76ab83 2022-06-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1386 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1387 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1388 0f76ab83 2022-06-23 thomas return 1
1391 cf85a643 2024-04-09 thomas seq 10 > $testroot/wt/numbers
1392 25a880e1 2022-07-03 thomas chmod +x $testroot/wt/numbers
1393 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got add numbers && got commit -m +numbers) \
1394 0f76ab83 2022-06-23 thomas > /dev/null
1396 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1397 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1398 0f76ab83 2022-06-23 thomas return 1
1401 cf85a643 2024-04-09 thomas seq 10 | sed 's/4/four/g' > $testroot/wt/numbers
1403 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got diff > $testroot/old.diff \
1404 0f76ab83 2022-06-23 thomas && got revert numbers) >/dev/null
1406 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1407 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1408 0f76ab83 2022-06-23 thomas return 1
1411 cf85a643 2024-04-09 thomas seq 10 | sed 's/6/six/g' > $testroot/wt/numbers
1412 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got commit -m 'edit numbers') \
1413 0f76ab83 2022-06-23 thomas > /dev/null
1415 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1416 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1417 0f76ab83 2022-06-23 thomas return 1
1420 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got patch $testroot/old.diff) \
1421 762b8e82 2022-06-23 thomas > $testroot/stdout
1423 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1424 762b8e82 2022-06-23 thomas test_done $testroot $ret
1425 762b8e82 2022-06-23 thomas return 1
1428 762b8e82 2022-06-23 thomas echo 'G numbers' > $testroot/stdout.expected
1429 762b8e82 2022-06-23 thomas cmp -s $testroot/stdout $testroot/stdout.expected
1431 762b8e82 2022-06-23 thomas if [ $ret -ne 0 ]; then
1432 762b8e82 2022-06-23 thomas diff -u $testroot/stdout $testroot/stdout.expected
1433 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1434 0f76ab83 2022-06-23 thomas return 1
1437 cf85a643 2024-04-09 thomas seq 10 | sed -e s/4/four/ -e s/6/six/ > $testroot/wt/numbers.expected
1438 0f76ab83 2022-06-23 thomas cmp -s $testroot/wt/numbers $testroot/wt/numbers.expected
1440 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1441 0f76ab83 2022-06-23 thomas diff -u $testroot/wt/numbers $testroot/wt/numbers.expected
1442 25a880e1 2022-07-03 thomas test_done $testroot $ret
1443 25a880e1 2022-07-03 thomas return 1
1446 25a880e1 2022-07-03 thomas test -x $testroot/wt/numbers
1448 25a880e1 2022-07-03 thomas if [ $ret -ne 0 ]; then
1449 25a880e1 2022-07-03 thomas echo "numbers lost the executable bit" >&2
1451 19dd85cb 2022-07-01 thomas test_done $testroot $ret
1454 19dd85cb 2022-07-01 thomas test_patch_merge_gitdiff() {
1455 19dd85cb 2022-07-01 thomas local testroot=`test_init patch_merge_gitdiff`
1457 cf85a643 2024-04-09 thomas seq 10 > $testroot/repo/numbers
1458 d1e03b8c 2023-10-08 thomas git -C $testroot/repo add numbers && \
1459 d1e03b8c 2023-10-08 thomas git_commit $testroot/repo -m "nums"
1461 19dd85cb 2022-07-01 thomas if [ $ret -ne 0 ]; then
1462 19dd85cb 2022-07-01 thomas test_done $testroot $ret
1463 19dd85cb 2022-07-01 thomas return 1
1466 cf85a643 2024-04-09 thomas seq 10 | sed 's/4/four/g' > $testroot/repo/numbers
1467 d1e03b8c 2023-10-08 thomas git -C $testroot/repo diff > $testroot/old.diff
1469 19dd85cb 2022-07-01 thomas if [ $ret -ne 0 ]; then
1470 19dd85cb 2022-07-01 thomas test_done $testroot $ret
1471 19dd85cb 2022-07-01 thomas return 1
1474 19dd85cb 2022-07-01 thomas # restore numbers
1475 cf85a643 2024-04-09 thomas seq 10 > $testroot/repo/numbers
1477 cf85a643 2024-04-09 thomas seq 10 | sed 's/6/six/g' > $testroot/repo/numbers
1478 d1e03b8c 2023-10-08 thomas git -C $testroot/repo add numbers && \
1479 d1e03b8c 2023-10-08 thomas git_commit $testroot/repo -m "edit"
1481 19dd85cb 2022-07-01 thomas if [ $ret -ne 0 ]; then
1482 19dd85cb 2022-07-01 thomas test_done $testroot $ret
1483 19dd85cb 2022-07-01 thomas return 1
1486 19dd85cb 2022-07-01 thomas # now work with got:
1487 19dd85cb 2022-07-01 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1489 19dd85cb 2022-07-01 thomas if [ $ret -ne 0 ]; then
1490 19dd85cb 2022-07-01 thomas test_done $testroot $ret
1491 19dd85cb 2022-07-01 thomas return 1
1494 19dd85cb 2022-07-01 thomas (cd $testroot/wt && got patch $testroot/old.diff) > $testroot/stdout
1496 19dd85cb 2022-07-01 thomas if [ $ret -ne 0 ]; then
1497 19dd85cb 2022-07-01 thomas test_done $testroot $ret
1498 19dd85cb 2022-07-01 thomas return 1
1501 19dd85cb 2022-07-01 thomas echo 'G numbers' > $testroot/stdout.expected
1502 19dd85cb 2022-07-01 thomas cmp -s $testroot/stdout $testroot/stdout.expected
1504 19dd85cb 2022-07-01 thomas if [ $ret -ne 0 ]; then
1505 19dd85cb 2022-07-01 thomas diff -u $testroot/stdout $testroot/stdout.expected
1507 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1510 7d8bcb99 2022-07-28 thomas test_patch_merge_base_provided() {
1511 7d8bcb99 2022-07-28 thomas local testroot=`test_init patch_merge_base_provided`
1513 7d8bcb99 2022-07-28 thomas got checkout $testroot/repo $testroot/wt >/dev/null
1515 7d8bcb99 2022-07-28 thomas if [ $ret -ne 0 ]; then
1516 7d8bcb99 2022-07-28 thomas test_done $testroot $ret
1517 7d8bcb99 2022-07-28 thomas return 1
1520 cf85a643 2024-04-09 thomas seq 10 > $testroot/wt/numbers
1521 7d8bcb99 2022-07-28 thomas (cd $testroot/wt && got add numbers && got commit -m +numbers) \
1522 7d8bcb99 2022-07-28 thomas >/dev/null
1524 7d8bcb99 2022-07-28 thomas if [ $ret -ne 0 ]; then
1525 7d8bcb99 2022-07-28 thomas test_done $testroot $ret
1526 7d8bcb99 2022-07-28 thomas return 1
1529 7d8bcb99 2022-07-28 thomas local commit_id=`git_show_head $testroot/repo`
1531 cf85a643 2024-04-09 thomas seq 10 | sed s/4/four/ > $testroot/wt/numbers
1533 7d8bcb99 2022-07-28 thomas # get rid of the metadata
1534 7d8bcb99 2022-07-28 thomas (cd $testroot/wt && got diff | sed -n '/^---/,$p' > patch) \
1535 7d8bcb99 2022-07-28 thomas >/dev/null
1537 cf85a643 2024-04-09 thomas seq 10 | sed s/6/six/ > $testroot/wt/numbers
1538 7d8bcb99 2022-07-28 thomas (cd $testroot/wt && got commit -m 'edit numbers') >/dev/null
1540 7d8bcb99 2022-07-28 thomas if [ $ret -ne 0 ]; then
1541 7d8bcb99 2022-07-28 thomas test_done $testroot $ret
1542 7d8bcb99 2022-07-28 thomas return 1
1545 7d8bcb99 2022-07-28 thomas (cd $testroot/wt && got patch -c $commit_id patch) >$testroot/stdout
1547 7d8bcb99 2022-07-28 thomas if [ $ret -ne 0 ]; then
1548 7d8bcb99 2022-07-28 thomas test_done $testroot $ret
1549 7d8bcb99 2022-07-28 thomas return 1
1552 7d8bcb99 2022-07-28 thomas echo 'G numbers' > $testroot/stdout.expected
1553 7d8bcb99 2022-07-28 thomas cmp -s $testroot/stdout $testroot/stdout.expected
1555 7d8bcb99 2022-07-28 thomas if [ $ret -ne 0 ]; then
1556 7d8bcb99 2022-07-28 thomas diff -u $testroot/stdout $testroot/stdout.expected
1557 7d8bcb99 2022-07-28 thomas test_done $testroot $ret
1558 7d8bcb99 2022-07-28 thomas return 1
1561 cf85a643 2024-04-09 thomas seq 10 | sed -e s/4/four/ -e s/6/six/ > $testroot/wt/numbers.expected
1562 7d8bcb99 2022-07-28 thomas cmp -s $testroot/wt/numbers $testroot/wt/numbers.expected
1564 7d8bcb99 2022-07-28 thomas if [ $ret -ne 0 ]; then
1565 7d8bcb99 2022-07-28 thomas diff -u $testroot/wt/numbers $testroot/wt/numbers.expected
1567 7d8bcb99 2022-07-28 thomas test_done $testroot $ret
1570 0f76ab83 2022-06-23 thomas test_patch_merge_conflict() {
1571 0f76ab83 2022-06-23 thomas local testroot=`test_init patch_merge_conflict`
1573 0f76ab83 2022-06-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1575 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1576 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1577 0f76ab83 2022-06-23 thomas return 1
1580 cf85a643 2024-04-09 thomas seq 10 > $testroot/wt/numbers
1581 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got add numbers && got commit -m +numbers) \
1582 0f76ab83 2022-06-23 thomas > /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 016bfe4b 2022-06-23 thomas local commit_id=`git_show_head $testroot/repo`
1591 cf85a643 2024-04-09 thomas seq 10 | sed 's/6/six/g' > $testroot/wt/numbers
1592 68ceedb3 2022-07-03 thomas echo ALPHA > $testroot/wt/alpha
1594 0f76ab83 2022-06-23 thomas (cd $testroot/wt && got diff > $testroot/old.diff \
1595 68ceedb3 2022-07-03 thomas && got revert alpha numbers) >/dev/null
1597 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1598 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1599 0f76ab83 2022-06-23 thomas return 1
1602 cf85a643 2024-04-09 thomas seq 10 | sed 's/6/3+3/g' > $testroot/wt/numbers
1603 cf85a643 2024-04-09 thomas printf '%s\n' a b c > $testroot/wt/alpha
1604 68ceedb3 2022-07-03 thomas (cd $testroot/wt && got commit -m 'edit alpha and numbers') \
1605 0f76ab83 2022-06-23 thomas > /dev/null
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 (cd $testroot/wt && got patch $testroot/old.diff) \
1613 762b8e82 2022-06-23 thomas > $testroot/stdout 2>/dev/null
1615 0f76ab83 2022-06-23 thomas if [ $ret -eq 0 ]; then
1616 0f76ab83 2022-06-23 thomas echo "got patch merged a diff that should conflict" >&2
1617 8e6eb32a 2023-05-14 thomas test_done $testroot 1
1618 0f76ab83 2022-06-23 thomas return 1
1621 68ceedb3 2022-07-03 thomas echo 'C alpha' > $testroot/stdout.expected
1622 68ceedb3 2022-07-03 thomas echo 'C numbers' >> $testroot/stdout.expected
1623 1faec3fb 2023-05-14 thomas echo 'Files with merge conflicts: 2' >> $testroot/stdout.expected
1624 762b8e82 2022-06-23 thomas cmp -s $testroot/stdout $testroot/stdout.expected
1626 762b8e82 2022-06-23 thomas if [ $ret -ne 0 ]; then
1627 762b8e82 2022-06-23 thomas diff -u $testroot/stdout $testroot/stdout.expected
1628 762b8e82 2022-06-23 thomas test_done $testroot $ret
1629 762b8e82 2022-06-23 thomas return 1
1632 0f76ab83 2022-06-23 thomas # XXX: prefixing every line with a tab otherwise got thinks
1633 0f76ab83 2022-06-23 thomas # the file has conflicts in it.
1634 68ceedb3 2022-07-03 thomas cat <<-EOF > $testroot/wt/alpha.expected
1635 68ceedb3 2022-07-03 thomas <<<<<<< --- alpha
1637 68ceedb3 2022-07-03 thomas ||||||| commit $commit_id
1643 68ceedb3 2022-07-03 thomas >>>>>>> +++ alpha
1646 0f76ab83 2022-06-23 thomas cat <<-EOF > $testroot/wt/numbers.expected
1652 0f76ab83 2022-06-23 thomas <<<<<<< --- numbers
1654 016bfe4b 2022-06-23 thomas ||||||| commit $commit_id
1658 0f76ab83 2022-06-23 thomas >>>>>>> +++ numbers
1665 68ceedb3 2022-07-03 thomas cmp -s $testroot/wt/alpha $testroot/wt/alpha.expected
1667 68ceedb3 2022-07-03 thomas if [ $ret -ne 0 ]; then
1668 68ceedb3 2022-07-03 thomas diff -u $testroot/wt/alpha $testroot/wt/alpha.expected
1669 68ceedb3 2022-07-03 thomas test_done $testroot $ret
1670 68ceedb3 2022-07-03 thomas return 1
1673 0f76ab83 2022-06-23 thomas cmp -s $testroot/wt/numbers $testroot/wt/numbers.expected
1675 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1676 0f76ab83 2022-06-23 thomas diff -u $testroot/wt/numbers $testroot/wt/numbers.expected
1678 eaef698f 2022-04-23 thomas test_done $testroot $ret
1681 0f76ab83 2022-06-23 thomas test_patch_merge_unknown_blob() {
1682 0f76ab83 2022-06-23 thomas local testroot=`test_init patch_merge_unknown_blob`
1684 0f76ab83 2022-06-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1686 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1687 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1688 0f76ab83 2022-06-23 thomas return 1
1691 0f76ab83 2022-06-23 thomas cat <<EOF > $testroot/wt/patch
1692 0f76ab83 2022-06-23 thomas I've got a
1693 c9a4f4fa 2022-06-23 thomas diff aaaabbbbccccddddeeeeffff0000111122223333 foo/bar
1695 0f76ab83 2022-06-23 thomas blob - aaaabbbbccccddddeeeeffff0000111122223333
1696 0f76ab83 2022-06-23 thomas and also a
1697 c9a4f4fa 2022-06-23 thomas blob + 0000111122223333444455556666777788889999
1698 0f76ab83 2022-06-23 thomas for this dummy diff
1699 0f76ab83 2022-06-23 thomas --- alpha
1700 0f76ab83 2022-06-23 thomas +++ alpha
1701 0f76ab83 2022-06-23 thomas @@ -1 +1 @@
1704 0f76ab83 2022-06-23 thomas will it work?
1707 0f76ab83 2022-06-23 thomas (cd $testroot/wt/ && got patch patch) > $testroot/stdout
1709 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1710 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1711 0f76ab83 2022-06-23 thomas return 1
1714 0f76ab83 2022-06-23 thomas echo 'M alpha' > $testroot/stdout.expected
1715 0f76ab83 2022-06-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1717 0f76ab83 2022-06-23 thomas if [ $ret -ne 0 ]; then
1718 0f76ab83 2022-06-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1719 c9a4f4fa 2022-06-23 thomas test_done $testroot $ret
1720 c9a4f4fa 2022-06-23 thomas return 1
1723 c9a4f4fa 2022-06-23 thomas # try again without a `diff' header
1725 c9a4f4fa 2022-06-23 thomas cat <<EOF > $testroot/wt/patch
1726 c9a4f4fa 2022-06-23 thomas I've got a
1727 c9a4f4fa 2022-06-23 thomas blob - aaaabbbbccccddddeeeeffff0000111122223333
1728 c9a4f4fa 2022-06-23 thomas and also a
1729 c9a4f4fa 2022-06-23 thomas blob + 0000111122223333444455556666777788889999
1730 c9a4f4fa 2022-06-23 thomas for this dummy diff
1731 c9a4f4fa 2022-06-23 thomas --- alpha
1732 c9a4f4fa 2022-06-23 thomas +++ alpha
1733 c9a4f4fa 2022-06-23 thomas @@ -1 +1 @@
1736 c9a4f4fa 2022-06-23 thomas will it work?
1739 c9a4f4fa 2022-06-23 thomas (cd $testroot/wt && got revert alpha > /dev/null && got patch patch) \
1740 c9a4f4fa 2022-06-23 thomas > $testroot/stdout
1742 c9a4f4fa 2022-06-23 thomas if [ $ret -ne 0 ]; then
1743 c9a4f4fa 2022-06-23 thomas test_done $testroot $ret
1744 c9a4f4fa 2022-06-23 thomas return 1
1747 c9a4f4fa 2022-06-23 thomas echo 'M alpha' > $testroot/stdout.expected
1748 c9a4f4fa 2022-06-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1750 c9a4f4fa 2022-06-23 thomas if [ $ret -ne 0 ]; then
1751 c9a4f4fa 2022-06-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1752 19dd85cb 2022-07-01 thomas test_done $testroot $ret
1753 19dd85cb 2022-07-01 thomas return 1
1756 19dd85cb 2022-07-01 thomas # try again with a git-style diff
1758 19dd85cb 2022-07-01 thomas cat <<EOF > $testroot/wt/patch
1759 19dd85cb 2022-07-01 thomas diff --git a/alpha b/alpha
1760 19dd85cb 2022-07-01 thomas index 0123456789ab..abcdef012345 100644
1761 19dd85cb 2022-07-01 thomas --- a/alpha
1762 19dd85cb 2022-07-01 thomas +++ b/alpha
1763 19dd85cb 2022-07-01 thomas @@ -1 +1 @@
1768 19dd85cb 2022-07-01 thomas (cd $testroot/wt && got revert alpha > /dev/null && got patch patch) \
1769 19dd85cb 2022-07-01 thomas > $testroot/stdout
1771 19dd85cb 2022-07-01 thomas if [ $ret -ne 0 ]; then
1772 19dd85cb 2022-07-01 thomas test_done $testroot $ret
1773 19dd85cb 2022-07-01 thomas return 1
1776 19dd85cb 2022-07-01 thomas echo 'M alpha' > $testroot/stdout.expected
1777 19dd85cb 2022-07-01 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1779 19dd85cb 2022-07-01 thomas if [ $ret -ne 0 ]; then
1780 19dd85cb 2022-07-01 thomas diff -u $testroot/stdout.expected $testroot/stdout
1782 0f76ab83 2022-06-23 thomas test_done $testroot $ret
1785 f4602cbd 2022-07-23 thomas test_patch_merge_reverse() {
1786 f4602cbd 2022-07-23 thomas local testroot=`test_init patch_merge_simple`
1788 f4602cbd 2022-07-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1790 f4602cbd 2022-07-23 thomas if [ $ret -ne 0 ]; then
1791 f4602cbd 2022-07-23 thomas test_done $testroot $ret
1792 f4602cbd 2022-07-23 thomas return 1
1795 cf85a643 2024-04-09 thomas seq 10 > $testroot/wt/numbers
1796 f4602cbd 2022-07-23 thomas (cd $testroot/wt && got add numbers && got commit -m +numbers) \
1797 f4602cbd 2022-07-23 thomas > /dev/null
1799 f4602cbd 2022-07-23 thomas if [ $ret -ne 0 ]; then
1800 f4602cbd 2022-07-23 thomas test_done $testroot $ret
1801 f4602cbd 2022-07-23 thomas return 1
1804 f4602cbd 2022-07-23 thomas local commit_id=`git_show_head $testroot/repo`
1806 cf85a643 2024-04-09 thomas seq 10 | sed s/5/five/g > $testroot/wt/numbers
1807 f4602cbd 2022-07-23 thomas (cd $testroot/wt && got diff > $testroot/wt/patch \
1808 f4602cbd 2022-07-23 thomas && got commit -m 'edit numbers') > /dev/null
1810 f4602cbd 2022-07-23 thomas if [ $ret -ne 0 ]; then
1811 f4602cbd 2022-07-23 thomas test_done $testroot $ret
1812 f4602cbd 2022-07-23 thomas return 1
1815 cf85a643 2024-04-09 thomas seq 10 | sed -e s/5/five/g -e s/6/six/g > $testroot/wt/numbers
1816 f4602cbd 2022-07-23 thomas (cd $testroot/wt && got commit -m 'edit numbers again') >/dev/null
1818 f4602cbd 2022-07-23 thomas if [ $ret -ne 0 ]; then
1819 f4602cbd 2022-07-23 thomas test_done $testroot $ret
1820 f4602cbd 2022-07-23 thomas return 1
1823 f4602cbd 2022-07-23 thomas (cd $testroot/wt && got patch -R patch) >/dev/null 2>&1
1825 f4602cbd 2022-07-23 thomas if [ $ret -eq 0 ]; then
1826 f4602cbd 2022-07-23 thomas echo "unexpectedly reverted the patch" >&2
1827 f4602cbd 2022-07-23 thomas test_done $testroot 1
1828 f4602cbd 2022-07-23 thomas return 1
1831 f4602cbd 2022-07-23 thomas cat <<-EOF > $testroot/wt/numbers.expected
1836 f4602cbd 2022-07-23 thomas <<<<<<< --- numbers
1839 f4602cbd 2022-07-23 thomas ||||||| +++ numbers
1844 f4602cbd 2022-07-23 thomas >>>>>>> commit $commit_id
1851 f4602cbd 2022-07-23 thomas cmp -s $testroot/wt/numbers $testroot/wt/numbers.expected
1853 f4602cbd 2022-07-23 thomas if [ $ret -ne 0 ]; then
1854 f4602cbd 2022-07-23 thomas diff -u $testroot/wt/numbers $testroot/wt/numbers.expected
1856 37e766f4 2022-09-21 thomas test_done $testroot $ret
1859 37e766f4 2022-09-21 thomas test_patch_newfile_xbit_got_diff() {
1860 37e766f4 2022-09-21 thomas local testroot=`test_init patch_newfile_xbit`
1862 37e766f4 2022-09-21 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1864 37e766f4 2022-09-21 thomas if [ $ret -ne 0 ]; then
1865 37e766f4 2022-09-21 thomas test_done $testroot $ret
1866 37e766f4 2022-09-21 thomas return 1
1869 37e766f4 2022-09-21 thomas cat <<EOF > $testroot/wt/patch
1870 37e766f4 2022-09-21 thomas blob - /dev/null
1871 37e766f4 2022-09-21 thomas blob + abcdef0123456789abcdef012345678901234567 (mode 755)
1872 37e766f4 2022-09-21 thomas --- /dev/null
1873 37e766f4 2022-09-21 thomas +++ xfile
1874 37e766f4 2022-09-21 thomas @@ -0,0 +1,1 @@
1878 37e766f4 2022-09-21 thomas (cd $testroot/wt && got patch patch) > /dev/null
1880 37e766f4 2022-09-21 thomas if [ $ret -ne 0 ]; then
1881 37e766f4 2022-09-21 thomas test_done $testroot $ret
1882 37e766f4 2022-09-21 thomas return 1
1885 37e766f4 2022-09-21 thomas if [ ! -x $testroot/wt/xfile ]; then
1886 37e766f4 2022-09-21 thomas echo "failed to set xbit on newfile" >&2
1887 37e766f4 2022-09-21 thomas test_done $testroot 1
1888 37e766f4 2022-09-21 thomas return 1
1891 37e766f4 2022-09-21 thomas echo xfile > $testroot/wt/xfile.expected
1892 37e766f4 2022-09-21 thomas cmp -s $testroot/wt/xfile $testroot/wt/xfile.expected
1894 37e766f4 2022-09-21 thomas if [ $ret -ne 0 ]; then
1895 37e766f4 2022-09-21 thomas echo "fail"
1896 37e766f4 2022-09-21 thomas diff -u $testroot/wt/xfile $testroot/wt/xfile.expected
1899 f4602cbd 2022-07-23 thomas test_done $testroot $ret
1902 37e766f4 2022-09-21 thomas test_patch_newfile_xbit_git_diff() {
1903 37e766f4 2022-09-21 thomas local testroot=`test_init patch_newfile_xbit`
1905 37e766f4 2022-09-21 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1907 37e766f4 2022-09-21 thomas if [ $ret -ne 0 ]; then
1908 37e766f4 2022-09-21 thomas test_done $testroot $ret
1909 37e766f4 2022-09-21 thomas return 1
1912 37e766f4 2022-09-21 thomas cat <<EOF > $testroot/wt/patch
1913 37e766f4 2022-09-21 thomas diff --git a/xfile b/xfile
1914 37e766f4 2022-09-21 thomas new file mode 100755
1915 37e766f4 2022-09-21 thomas index 00000000..abcdef01
1916 37e766f4 2022-09-21 thomas --- /dev/null
1917 37e766f4 2022-09-21 thomas +++ b/xfile
1918 37e766f4 2022-09-21 thomas @@ -0,0 +1,1 @@
1922 37e766f4 2022-09-21 thomas (cd $testroot/wt && got patch patch) > /dev/null
1924 37e766f4 2022-09-21 thomas if [ $ret -ne 0 ]; then
1925 37e766f4 2022-09-21 thomas test_done $testroot $ret
1926 37e766f4 2022-09-21 thomas return 1
1929 37e766f4 2022-09-21 thomas if [ ! -x $testroot/wt/xfile ]; then
1930 37e766f4 2022-09-21 thomas echo "failed to set xbit on newfile" >&2
1931 37e766f4 2022-09-21 thomas test_done $testroot 1
1932 37e766f4 2022-09-21 thomas return 1
1935 37e766f4 2022-09-21 thomas echo xfile > $testroot/wt/xfile.expected
1936 37e766f4 2022-09-21 thomas cmp -s $testroot/wt/xfile $testroot/wt/xfile.expected
1938 37e766f4 2022-09-21 thomas if [ $ret -ne 0 ]; then
1939 37e766f4 2022-09-21 thomas echo "fail"
1940 37e766f4 2022-09-21 thomas diff -u $testroot/wt/xfile $testroot/wt/xfile.expected
1943 37e766f4 2022-09-21 thomas test_done $testroot $ret
1946 a2c162eb 2022-10-30 thomas test_patch_umask() {
1947 a2c162eb 2022-10-30 thomas local testroot=`test_init patch_umask`
1949 a2c162eb 2022-10-30 thomas got checkout "$testroot/repo" "$testroot/wt" >/dev/null
1951 a2c162eb 2022-10-30 thomas cat <<EOF >$testroot/wt/patch
1952 a2c162eb 2022-10-30 thomas --- alpha
1953 a2c162eb 2022-10-30 thomas +++ alpha
1954 a2c162eb 2022-10-30 thomas @@ -1 +1 @@
1956 a2c162eb 2022-10-30 thomas +modified alpha
1959 a2c162eb 2022-10-30 thomas # using a subshell to avoid clobbering global umask
1960 a2c162eb 2022-10-30 thomas (umask 077 && cd "$testroot/wt" && got patch <patch) >/dev/null
1962 a2c162eb 2022-10-30 thomas if [ $ret -ne 0 ]; then
1963 a2c162eb 2022-10-30 thomas test_done "$testroot" $ret
1964 a2c162eb 2022-10-30 thomas return 1
1967 a2c162eb 2022-10-30 thomas if ! ls -l "$testroot/wt/alpha" | grep -q ^-rw-------; then
1968 a2c162eb 2022-10-30 thomas echo "alpha is not 0600 after patch" >&2
1969 a2c162eb 2022-10-30 thomas ls -l "$testroot/wt/alpha" >&2
1970 a2c162eb 2022-10-30 thomas test_done "$testroot" 1
1971 a2c162eb 2022-10-30 thomas return 1
1974 a2c162eb 2022-10-30 thomas test_done "$testroot" 0
1977 650a3405 2023-01-02 thomas test_patch_remove_binary_file() {
1978 650a3405 2023-01-02 thomas local testroot=`test_init patch_remove_binary_file`
1980 650a3405 2023-01-02 thomas if ! got checkout $testroot/repo $testroot/wt >/dev/null; then
1981 650a3405 2023-01-02 thomas test_done $testroot $ret
1982 650a3405 2023-01-02 thomas return 1
1985 650a3405 2023-01-02 thomas dd if=/dev/zero of=$testroot/wt/x bs=1 count=16 2>/dev/null >&2
1986 650a3405 2023-01-02 thomas (cd $testroot/wt && got add x && got commit -m +x) >/dev/null
1988 650a3405 2023-01-02 thomas (cd $testroot/wt && \
1989 650a3405 2023-01-02 thomas got branch demo && \
1990 650a3405 2023-01-02 thomas got rm x && \
1991 650a3405 2023-01-02 thomas got ci -m -x &&
1992 650a3405 2023-01-02 thomas got up -b master) >/dev/null
1994 650a3405 2023-01-02 thomas echo 'D x' > $testroot/stdout.expected
1996 650a3405 2023-01-02 thomas (cd $testroot/wt && got log -c demo -l 1 -p >patch)
1998 650a3405 2023-01-02 thomas (cd $testroot/wt && got patch <patch) > $testroot/stdout
1999 650a3405 2023-01-02 thomas if [ $? -ne 0 ]; then
2000 650a3405 2023-01-02 thomas echo 'patch failed' >&2
2001 650a3405 2023-01-02 thomas test_done $testroot 1
2002 650a3405 2023-01-02 thomas return 1
2005 650a3405 2023-01-02 thomas if ! cmp -s $testroot/stdout.expected $testroot/stdout; then
2006 650a3405 2023-01-02 thomas diff -u $testroot/stdout.expected $testroot/stdout
2007 650a3405 2023-01-02 thomas test_done $testroot 1
2008 650a3405 2023-01-02 thomas return 1
2011 650a3405 2023-01-02 thomas # try again using a git produced diff
2012 650a3405 2023-01-02 thomas (cd $testroot/wt && got revert x) >/dev/null
2014 d1e03b8c 2023-10-08 thomas git -C $testroot/repo show demo >$testroot/wt/patch
2016 650a3405 2023-01-02 thomas (cd $testroot/wt && got patch <patch) > $testroot/stdout
2017 650a3405 2023-01-02 thomas if [ $? -ne 0 ]; then
2018 650a3405 2023-01-02 thomas echo 'patch failed' >&2
2019 650a3405 2023-01-02 thomas test_done $testroot 1
2020 650a3405 2023-01-02 thomas return 1
2023 650a3405 2023-01-02 thomas if ! cmp -s $testroot/stdout.expected $testroot/stdout; then
2024 650a3405 2023-01-02 thomas diff -u $testroot/stdout.expected $testroot/stdout
2025 650a3405 2023-01-02 thomas test_done $testroot 1
2026 650a3405 2023-01-02 thomas return 1
2029 650a3405 2023-01-02 thomas # try again using a diff(1) style patch
2030 650a3405 2023-01-02 thomas (cd $testroot/wt && got revert x) >/dev/null
2032 650a3405 2023-01-02 thomas echo "Binary files x and /dev/null differ" >$testroot/wt/patch
2033 650a3405 2023-01-02 thomas (cd $testroot/wt && got patch <patch) >$testroot/stdout
2034 650a3405 2023-01-02 thomas if [ $? -ne 0 ]; then
2035 650a3405 2023-01-02 thomas echo 'patch failed' >&2
2036 650a3405 2023-01-02 thomas test_done $testroot 1
2037 650a3405 2023-01-02 thomas return 1
2040 650a3405 2023-01-02 thomas if ! cmp -s $testroot/stdout.expected $testroot/stdout; then
2041 650a3405 2023-01-02 thomas diff -u $testroot/stdout.expected $testroot/stdout
2042 650a3405 2023-01-02 thomas test_done $testroot 1
2043 650a3405 2023-01-02 thomas return 1
2046 650a3405 2023-01-02 thomas test_done $testroot 0
2049 fb885120 2023-07-19 thomas test_patch_commit_keywords() {
2050 fb885120 2023-07-19 thomas local testroot=`test_init patch_commit_keywords`
2052 fb885120 2023-07-19 thomas got checkout $testroot/repo $testroot/wt >/dev/null
2054 fb885120 2023-07-19 thomas if [ $ret -ne 0 ]; then
2055 fb885120 2023-07-19 thomas test_done $testroot $ret
2056 fb885120 2023-07-19 thomas return 1
2059 cf85a643 2024-04-09 thomas seq 10 > $testroot/wt/numbers
2060 fb885120 2023-07-19 thomas (cd $testroot/wt && got add numbers && got commit -m +numbers) \
2061 fb885120 2023-07-19 thomas >/dev/null
2063 fb885120 2023-07-19 thomas if [ $ret -ne 0 ]; then
2064 fb885120 2023-07-19 thomas test_done $testroot $ret
2065 fb885120 2023-07-19 thomas return 1
2068 cf85a643 2024-04-09 thomas seq 10 | sed s/4/four/ > $testroot/wt/numbers
2070 fb885120 2023-07-19 thomas # get rid of the metadata
2071 fb885120 2023-07-19 thomas (cd $testroot/wt && got diff | sed -n '/^---/,$p' > patch) \
2072 fb885120 2023-07-19 thomas >/dev/null
2074 cf85a643 2024-04-09 thomas seq 10 | sed s/6/six/ > $testroot/wt/numbers
2075 fb885120 2023-07-19 thomas (cd $testroot/wt && got commit -m 'edit numbers') >/dev/null
2077 fb885120 2023-07-19 thomas if [ $ret -ne 0 ]; then
2078 fb885120 2023-07-19 thomas test_done $testroot $ret
2079 fb885120 2023-07-19 thomas return 1
2082 fb885120 2023-07-19 thomas (cd $testroot/wt && got patch -c :head:- patch) >$testroot/stdout
2084 fb885120 2023-07-19 thomas if [ $ret -ne 0 ]; then
2085 fb885120 2023-07-19 thomas test_done $testroot $ret
2086 fb885120 2023-07-19 thomas return 1
2089 fb885120 2023-07-19 thomas echo 'G numbers' > $testroot/stdout.expected
2090 fb885120 2023-07-19 thomas cmp -s $testroot/stdout $testroot/stdout.expected
2092 fb885120 2023-07-19 thomas if [ $ret -ne 0 ]; then
2093 fb885120 2023-07-19 thomas diff -u $testroot/stdout $testroot/stdout.expected
2094 fb885120 2023-07-19 thomas test_done $testroot $ret
2095 fb885120 2023-07-19 thomas return 1
2098 cf85a643 2024-04-09 thomas seq 10 | sed -e s/4/four/ -e s/6/six/ > $testroot/wt/numbers.expected
2099 fb885120 2023-07-19 thomas cmp -s $testroot/wt/numbers $testroot/wt/numbers.expected
2101 fb885120 2023-07-19 thomas if [ $ret -ne 0 ]; then
2102 fb885120 2023-07-19 thomas diff -u $testroot/wt/numbers $testroot/wt/numbers.expected
2105 fb885120 2023-07-19 thomas (cd "$testroot/wt" && got rv numbers > /dev/null)
2107 fb885120 2023-07-19 thomas (cd $testroot/wt && got patch -c :base:- patch) >$testroot/stdout
2109 fb885120 2023-07-19 thomas if [ $ret -ne 0 ]; then
2110 fb885120 2023-07-19 thomas test_done $testroot $ret
2111 fb885120 2023-07-19 thomas return 1
2114 fb885120 2023-07-19 thomas echo 'G numbers' > $testroot/stdout.expected
2115 fb885120 2023-07-19 thomas cmp -s $testroot/stdout $testroot/stdout.expected
2117 fb885120 2023-07-19 thomas if [ $ret -ne 0 ]; then
2118 fb885120 2023-07-19 thomas diff -u $testroot/stdout $testroot/stdout.expected
2119 fb885120 2023-07-19 thomas test_done $testroot $ret
2120 fb885120 2023-07-19 thomas return 1
2123 cf85a643 2024-04-09 thomas seq 10 | sed -e s/4/four/ -e s/6/six/ > $testroot/wt/numbers.expected
2124 fb885120 2023-07-19 thomas cmp -s $testroot/wt/numbers $testroot/wt/numbers.expected
2126 fb885120 2023-07-19 thomas if [ $ret -ne 0 ]; then
2127 fb885120 2023-07-19 thomas diff -u $testroot/wt/numbers $testroot/wt/numbers.expected
2130 fb885120 2023-07-19 thomas test_done $testroot $ret
2133 069bbb86 2022-03-07 thomas test_parseargs "$@"
2134 3b6e8f19 2022-08-06 thomas run_test test_patch_basic
2135 069bbb86 2022-03-07 thomas run_test test_patch_dont_apply
2136 069bbb86 2022-03-07 thomas run_test test_patch_malformed
2137 069bbb86 2022-03-07 thomas run_test test_patch_no_patch
2138 069bbb86 2022-03-07 thomas run_test test_patch_equals_for_context
2139 bb2ad8ff 2022-03-13 thomas run_test test_patch_rename
2140 10e55613 2022-03-22 thomas run_test test_patch_illegal_status
2141 eaf99875 2022-03-22 thomas run_test test_patch_nop
2142 da09d8ed 2022-03-22 thomas run_test test_patch_preserve_perm
2143 e0c1f81c 2022-03-22 thomas run_test test_patch_create_dirs
2144 49114f01 2022-03-22 thomas run_test test_patch_with_offset
2145 13b170bf 2024-04-25 thomas.ad run_test test_patch_empty_file
2146 be53ddb1 2022-03-22 thomas run_test test_patch_prefer_new_path
2147 ff7f34d3 2022-03-22 thomas run_test test_patch_no_newline
2148 d9db2ff9 2022-04-16 thomas run_test test_patch_strip
2149 bb90ca7b 2022-07-03 thomas run_test test_patch_whitespace
2150 72f46891 2022-04-23 thomas run_test test_patch_relative_paths
2151 cfbf5531 2022-04-23 thomas run_test test_patch_with_path_prefix
2152 cfbf5531 2022-04-23 thomas run_test test_patch_relpath_with_path_prefix
2153 eaef698f 2022-04-23 thomas run_test test_patch_reverse
2154 0f76ab83 2022-06-23 thomas run_test test_patch_merge_simple
2155 19dd85cb 2022-07-01 thomas run_test test_patch_merge_gitdiff
2156 7d8bcb99 2022-07-28 thomas run_test test_patch_merge_base_provided
2157 0f76ab83 2022-06-23 thomas run_test test_patch_merge_conflict
2158 0f76ab83 2022-06-23 thomas run_test test_patch_merge_unknown_blob
2159 f4602cbd 2022-07-23 thomas run_test test_patch_merge_reverse
2160 37e766f4 2022-09-21 thomas run_test test_patch_newfile_xbit_got_diff
2161 37e766f4 2022-09-21 thomas run_test test_patch_newfile_xbit_git_diff
2162 a2c162eb 2022-10-30 thomas run_test test_patch_umask
2163 650a3405 2023-01-02 thomas run_test test_patch_remove_binary_file
2164 fb885120 2023-07-19 thomas run_test test_patch_commit_keywords
