]>
Commit | Line | Data |
---|---|---|
1 | #!/bin/sh | |
2 | ## | |
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". | |
6 | ## | |
7 | ## Update: Ryan Anderson finally shamed me into naming this "applymbox". | |
8 | ## | |
9 | ## You give it a mbox-format collection of emails, and it will try to | |
10 | ## apply them to the kernel using "applypatch" | |
11 | ## | |
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. | |
18 | ## | |
19 | ## git-am is supposed to be the newer and better tool for this job. | |
20 | ||
21 | USAGE='[-u] [-k] [-q] [-m] (-c .dotest/<num> | mbox) [signoff]' | |
22 | . git-sh-setup | |
23 | ||
24 | git var GIT_COMMITTER_IDENT >/dev/null || exit | |
25 | ||
26 | keep_subject= query_apply= continue= utf8=-u resume=t | |
27 | while case "$#" in 0) break ;; esac | |
28 | do | |
29 | case "$1" in | |
30 | -u) utf8=-u ;; | |
31 | -n) utf8=-n ;; | |
32 | -k) keep_subject=-k ;; | |
33 | -q) query_apply=t ;; | |
34 | -c) continue="$2"; resume=f; shift ;; | |
35 | -m) fall_back_3way=t ;; | |
36 | -*) usage ;; | |
37 | *) break ;; | |
38 | esac | |
39 | shift | |
40 | done | |
41 | ||
42 | case "$continue" in | |
43 | '') | |
44 | rm -rf .dotest | |
45 | mkdir .dotest | |
46 | num_msgs=$(git-mailsplit "$1" .dotest) || exit 1 | |
47 | echo "$num_msgs patch(es) to process." | |
48 | shift | |
49 | esac | |
50 | ||
51 | files=$(git-diff-index --cached --name-only HEAD) || exit | |
52 | if [ "$files" ]; then | |
53 | echo "Dirty index: cannot apply patches (dirty: $files)" >&2 | |
54 | exit 1 | |
55 | fi | |
56 | ||
57 | case "$query_apply" in | |
58 | t) touch .dotest/.query_apply | |
59 | esac | |
60 | case "$fall_back_3way" in | |
61 | t) : >.dotest/.3way | |
62 | esac | |
63 | case "$keep_subject" in | |
64 | -k) : >.dotest/.keep_subject | |
65 | esac | |
66 | ||
67 | signoff="$1" | |
68 | set x .dotest/0* | |
69 | shift | |
70 | while case "$#" in 0) break;; esac | |
71 | do | |
72 | i="$1" | |
73 | case "$resume,$continue" in | |
74 | f,$i) resume=t;; | |
75 | f,*) shift | |
76 | continue;; | |
77 | *) | |
78 | git-mailinfo $keep_subject $utf8 \ | |
79 | .dotest/msg .dotest/patch <$i >.dotest/info || exit 1 | |
80 | git-stripspace < .dotest/msg > .dotest/msg-clean | |
81 | ;; | |
82 | esac | |
83 | while :; # for fixing up and retry | |
84 | do | |
85 | git-applypatch .dotest/msg-clean .dotest/patch .dotest/info "$signoff" | |
86 | case "$?" in | |
87 | 0) | |
88 | # Remove the cleanly applied one to reduce clutter. | |
89 | rm -f .dotest/$i | |
90 | ;; | |
91 | 2) | |
92 | # 2 is a special exit code from applypatch to indicate that | |
93 | # the patch wasn't applied, but continue anyway | |
94 | ;; | |
95 | *) | |
96 | ret=$? | |
97 | if test -f .dotest/.query_apply | |
98 | then | |
99 | echo >&2 "* Patch failed." | |
100 | echo >&2 "* You could fix it up in your editor and" | |
101 | echo >&2 " retry. If you want to do so, say yes here" | |
102 | echo >&2 " AFTER fixing .dotest/patch up." | |
103 | echo >&2 -n "Retry [y/N]? " | |
104 | read yesno | |
105 | case "$yesno" in | |
106 | [Yy]*) | |
107 | continue ;; | |
108 | esac | |
109 | fi | |
110 | exit $ret | |
111 | esac | |
112 | break | |
113 | done | |
114 | shift | |
115 | done | |
116 | # return to pristine | |
117 | rm -fr .dotest |