3 ## "dotest" is my stupid name for my patch-application script, which
4 ## I never got around to renaming after I tested it. We're now on the
5 ## second generation of scripts, still called "dotest".
7 ## Update: Ryan Anderson finally shamed me into naming this "applymbox".
9 ## You give it a mbox-format collection of emails, and it will try to
10 ## apply them to the kernel using "applypatch"
12 ## The patch application may fail in the middle. In which case:
13 ## (1) look at .dotest/patch and fix it up to apply
14 ## (2) re-run applymbox with -c .dotest/msg-number for the current one.
15 ## Pay a special attention to the commit log message if you do this and
16 ## use a Signoff_file, because applypatch wants to append the sign-off
17 ## message to msg-clean every time it is run.
19 ## git-am is supposed to be the newer and better tool for this job.
21 . git-sh-setup || die "Not a git archive"
24 echo >&2 "applymbox [-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]"
28 keep_subject= query_apply= continue= utf8= resume=t
29 while case "$#" in 0) break ;; esac
33 -k) keep_subject=-k ;;
35 -c) continue="$2"; resume=f; shift ;;
36 -m) fallback_3way=t ;;
47 num_msgs=$(git-mailsplit "$1" .dotest) || exit 1
48 echo "$num_msgs patch(es) to process."
52 files=$(git-diff-index --cached --name-only HEAD) || exit
54 echo "Dirty index: cannot apply patches (dirty: $files)" >&2
58 case "$query_apply" in
59 t) touch .dotest/.query_apply
61 case "$fall_back_3way" in
64 case "$keep_subject" in
65 -k) : >.dotest/.keep_subject
71 while case "$#" in 0) break;; esac
74 case "$resume,$continue" in
79 git-mailinfo $keep_subject $utf8 \
80 .dotest/msg .dotest/patch <$i >.dotest/info || exit 1
81 git-stripspace < .dotest/msg > .dotest/msg-clean
84 while :; # for fixing up and retry
86 git-applypatch .dotest/msg-clean .dotest/patch .dotest/info "$signoff"
89 # Remove the cleanly applied one to reduce clutter.
93 # 2 is a special exit code from applypatch to indicate that
94 # the patch wasn't applied, but continue anyway
98 if test -f .dotest/.query_apply
100 echo >&2 "* Patch failed."
101 echo >&2 "* You could fix it up in your editor and"
102 echo >&2 " retry. If you want to do so, say yes here"
103 echo >&2 " AFTER fixing .dotest/patch up."
104 echo >&2 -n "Retry [y/N]? "