]>
Commit | Line | Data |
---|---|---|
d1c5f2a4 JH |
1 | #!/bin/sh |
2 | # | |
3 | # | |
d1c5f2a4 | 4 | |
cf1fe88c FK |
5 | USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox> |
6 | or, when resuming [--skip | --resolved]' | |
7 | . git-sh-setup | |
d1c5f2a4 JH |
8 | |
9 | stop_here () { | |
10 | echo "$1" >"$dotest/next" | |
11 | exit 1 | |
12 | } | |
13 | ||
14 | go_next () { | |
15 | rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \ | |
16 | "$dotest/patch" "$dotest/info" | |
17 | echo "$next" >"$dotest/next" | |
18 | this=$next | |
19 | } | |
20 | ||
21 | fall_back_3way () { | |
22 | O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd` | |
23 | ||
24 | rm -fr "$dotest"/patch-merge-* | |
25 | mkdir "$dotest/patch-merge-tmp-dir" | |
26 | ||
27 | # First see if the patch records the index info that we can use. | |
22943f1a | 28 | if git-apply -z --index-info "$dotest/patch" \ |
d1c5f2a4 JH |
29 | >"$dotest/patch-merge-index-info" 2>/dev/null && |
30 | GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ | |
22943f1a | 31 | git-update-index -z --index-info <"$dotest/patch-merge-index-info" && |
d1c5f2a4 JH |
32 | GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ |
33 | git-write-tree >"$dotest/patch-merge-base+" && | |
34 | # index has the base tree now. | |
35 | ( | |
36 | cd "$dotest/patch-merge-tmp-dir" && | |
37 | GIT_INDEX_FILE="../patch-merge-tmp-index" \ | |
38 | GIT_OBJECT_DIRECTORY="$O_OBJECT" \ | |
087b6742 | 39 | git-apply $binary --index <../patch |
d1c5f2a4 JH |
40 | ) |
41 | then | |
42 | echo Using index info to reconstruct a base tree... | |
43 | mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base" | |
44 | mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index" | |
45 | else | |
46 | # Otherwise, try nearby trees that can be used to apply the | |
47 | # patch. | |
48 | ( | |
49 | N=10 | |
50 | ||
51 | # Hoping the patch is against our recent commits... | |
52 | git-rev-list --max-count=$N HEAD | |
53 | ||
54 | # or hoping the patch is against known tags... | |
55 | git-ls-remote --tags . | |
56 | ) | | |
57 | while read base junk | |
58 | do | |
59 | # See if we have it as a tree... | |
60 | git-cat-file tree "$base" >/dev/null 2>&1 || continue | |
61 | ||
62 | rm -fr "$dotest"/patch-merge-* && | |
63 | mkdir "$dotest/patch-merge-tmp-dir" || break | |
64 | ( | |
65 | cd "$dotest/patch-merge-tmp-dir" && | |
66 | GIT_INDEX_FILE=../patch-merge-tmp-index && | |
67 | GIT_OBJECT_DIRECTORY="$O_OBJECT" && | |
68 | export GIT_INDEX_FILE GIT_OBJECT_DIRECTORY && | |
69 | git-read-tree "$base" && | |
087b6742 | 70 | git-apply $binary --index && |
d1c5f2a4 JH |
71 | mv ../patch-merge-tmp-index ../patch-merge-index && |
72 | echo "$base" >../patch-merge-base | |
73 | ) <"$dotest/patch" 2>/dev/null && break | |
74 | done | |
75 | fi | |
76 | ||
77 | test -f "$dotest/patch-merge-index" && | |
78 | his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git-write-tree) && | |
79 | orig_tree=$(cat "$dotest/patch-merge-base") && | |
80 | rm -fr "$dotest"/patch-merge-* || exit 1 | |
81 | ||
82 | echo Falling back to patching base and 3-way merge... | |
83 | ||
84 | # This is not so wrong. Depending on which base we picked, | |
85 | # orig_tree may be wildly different from ours, but his_tree | |
86 | # has the same set of wildly different changes in parts the | |
87 | # patch did not touch, so resolve ends up cancelling them, | |
88 | # saying that we reverted all those changes. | |
89 | ||
90 | git-merge-resolve $orig_tree -- HEAD $his_tree || { | |
91 | echo Failed to merge in the changes. | |
92 | exit 1 | |
93 | } | |
94 | } | |
95 | ||
96 | prec=4 | |
087b6742 | 97 | dotest=.dotest sign= utf8= keep= skip= interactive= resolved= binary= |
d1c5f2a4 JH |
98 | |
99 | while case "$#" in 0) break;; esac | |
100 | do | |
101 | case "$1" in | |
102 | -d=*|--d=*|--do=*|--dot=*|--dote=*|--dotes=*|--dotest=*) | |
103 | dotest=`expr "$1" : '-[^=]*=\(.*\)'`; shift ;; | |
104 | -d|--d|--do|--dot|--dote|--dotes|--dotest) | |
105 | case "$#" in 1) usage ;; esac; shift | |
106 | dotest="$1"; shift;; | |
107 | ||
108 | -i|--i|--in|--int|--inte|--inter|--intera|--interac|--interact|\ | |
109 | --interacti|--interactiv|--interactive) | |
110 | interactive=t; shift ;; | |
111 | ||
087b6742 JH |
112 | -b|--b|--bi|--bin|--bina|--binar|--binary) |
113 | binary=t; shift ;; | |
114 | ||
d1c5f2a4 JH |
115 | -3|--3|--3w|--3wa|--3way) |
116 | threeway=t; shift ;; | |
117 | -s|--s|--si|--sig|--sign|--signo|--signof|--signoff) | |
118 | sign=t; shift ;; | |
119 | -u|--u|--ut|--utf|--utf8) | |
120 | utf8=t; shift ;; | |
121 | -k|--k|--ke|--kee|--keep) | |
122 | keep=t; shift ;; | |
123 | ||
0c15cc92 JH |
124 | -r|--r|--re|--res|--reso|--resol|--resolv|--resolve|--resolved) |
125 | resolved=t; shift ;; | |
126 | ||
d1c5f2a4 JH |
127 | --sk|--ski|--skip) |
128 | skip=t; shift ;; | |
129 | ||
130 | --) | |
131 | shift; break ;; | |
132 | -*) | |
133 | usage ;; | |
134 | *) | |
135 | break ;; | |
136 | esac | |
137 | done | |
138 | ||
0c15cc92 JH |
139 | # If the dotest directory exists, but we have finished applying all the |
140 | # patches in them, clear it out. | |
d1c5f2a4 JH |
141 | if test -d "$dotest" && |
142 | last=$(cat "$dotest/last") && | |
143 | next=$(cat "$dotest/next") && | |
144 | test $# != 0 && | |
145 | test "$next" -gt "$last" | |
146 | then | |
147 | rm -fr "$dotest" | |
148 | fi | |
149 | ||
150 | if test -d "$dotest" | |
151 | then | |
152 | test ",$#," = ",0," || | |
153 | die "previous dotest directory $dotest still exists but mbox given." | |
271440e3 | 154 | resume=yes |
d1c5f2a4 | 155 | else |
0c15cc92 JH |
156 | # Make sure we are not given --skip nor --resolved |
157 | test ",$skip,$resolved," = ,,, || | |
158 | die "we are not resuming." | |
d1c5f2a4 JH |
159 | |
160 | # Start afresh. | |
161 | mkdir -p "$dotest" || exit | |
162 | ||
b3f041fb | 163 | git-mailsplit -d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" || { |
d1c5f2a4 JH |
164 | rm -fr "$dotest" |
165 | exit 1 | |
166 | } | |
167 | ||
087b6742 | 168 | # -b, -s, -u and -k flags are kept for the resuming session after |
0c15cc92 JH |
169 | # a patch failure. |
170 | # -3 and -i can and must be given when resuming. | |
087b6742 | 171 | echo "$binary" >"$dotest/binary" |
d1c5f2a4 JH |
172 | echo "$sign" >"$dotest/sign" |
173 | echo "$utf8" >"$dotest/utf8" | |
174 | echo "$keep" >"$dotest/keep" | |
d1c5f2a4 JH |
175 | echo 1 >"$dotest/next" |
176 | fi | |
177 | ||
0c15cc92 JH |
178 | case "$resolved" in |
179 | '') | |
180 | files=$(git-diff-index --cached --name-only HEAD) || exit | |
181 | if [ "$files" ]; then | |
182 | echo "Dirty index: cannot apply patches (dirty: $files)" >&2 | |
183 | exit 1 | |
184 | fi | |
185 | esac | |
186 | ||
087b6742 JH |
187 | if test "$(cat "$dotest/binary")" = t |
188 | then | |
189 | binary=--allow-binary-replacement | |
190 | fi | |
d1c5f2a4 JH |
191 | if test "$(cat "$dotest/utf8")" = t |
192 | then | |
193 | utf8=-u | |
194 | fi | |
195 | if test "$(cat "$dotest/keep")" = t | |
196 | then | |
197 | keep=-k | |
198 | fi | |
199 | if test "$(cat "$dotest/sign")" = t | |
200 | then | |
201 | SIGNOFF=`git-var GIT_COMMITTER_IDENT | sed -e ' | |
202 | s/>.*/>/ | |
203 | s/^/Signed-off-by: /' | |
204 | ` | |
205 | else | |
206 | SIGNOFF= | |
207 | fi | |
d1c5f2a4 JH |
208 | |
209 | last=`cat "$dotest/last"` | |
210 | this=`cat "$dotest/next"` | |
211 | if test "$skip" = t | |
212 | then | |
213 | this=`expr "$this" + 1` | |
214 | fi | |
215 | ||
216 | if test "$this" -gt "$last" | |
217 | then | |
218 | echo Nothing to do. | |
219 | rm -fr "$dotest" | |
220 | exit | |
221 | fi | |
222 | ||
223 | while test "$this" -le "$last" | |
224 | do | |
225 | msgnum=`printf "%0${prec}d" $this` | |
226 | next=`expr "$this" + 1` | |
227 | test -f "$dotest/$msgnum" || { | |
228 | go_next | |
229 | continue | |
230 | } | |
0c15cc92 JH |
231 | |
232 | # If we are not resuming, parse and extract the patch information | |
233 | # into separate files: | |
234 | # - info records the authorship and title | |
235 | # - msg is the rest of commit log message | |
236 | # - patch is the patch body. | |
237 | # | |
238 | # When we are resuming, these files are either already prepared | |
239 | # by the user, or the user can tell us to do so by --resolved flag. | |
271440e3 JH |
240 | case "$resume" in |
241 | '') | |
242 | git-mailinfo $keep $utf8 "$dotest/msg" "$dotest/patch" \ | |
243 | <"$dotest/$msgnum" >"$dotest/info" || | |
244 | stop_here $this | |
245 | git-stripspace < "$dotest/msg" > "$dotest/msg-clean" | |
246 | ;; | |
247 | esac | |
d1c5f2a4 JH |
248 | |
249 | GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")" | |
250 | GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")" | |
251 | GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")" | |
e0e3ba20 JH |
252 | |
253 | if test -z "$GIT_AUTHOR_EMAIL" | |
254 | then | |
255 | echo "Patch does not have a valid e-mail address." | |
256 | stop_here $this | |
257 | fi | |
258 | ||
2c674191 | 259 | export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE |
d1c5f2a4 | 260 | |
4bfb6b62 | 261 | SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")" |
d1c5f2a4 | 262 | case "$keep_subject" in -k) SUBJECT="[PATCH] $SUBJECT" ;; esac |
4bfb6b62 JH |
263 | |
264 | case "$resume" in | |
265 | '') | |
266 | if test '' != "$SIGNOFF" | |
267 | then | |
d1c5f2a4 | 268 | LAST_SIGNED_OFF_BY=` |
4bfb6b62 JH |
269 | sed -ne '/^Signed-off-by: /p' \ |
270 | "$dotest/msg-clean" | | |
271 | tail -n 1 | |
d1c5f2a4 | 272 | ` |
4bfb6b62 JH |
273 | ADD_SIGNOFF=` |
274 | test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || { | |
d1c5f2a4 JH |
275 | test '' = "$LAST_SIGNED_OFF_BY" && echo |
276 | echo "$SIGNOFF" | |
4bfb6b62 JH |
277 | }` |
278 | else | |
d1c5f2a4 | 279 | ADD_SIGNOFF= |
4bfb6b62 JH |
280 | fi |
281 | { | |
d1c5f2a4 JH |
282 | echo "$SUBJECT" |
283 | if test -s "$dotest/msg-clean" | |
284 | then | |
285 | echo | |
286 | cat "$dotest/msg-clean" | |
287 | fi | |
288 | if test '' != "$ADD_SIGNOFF" | |
289 | then | |
290 | echo "$ADD_SIGNOFF" | |
291 | fi | |
4bfb6b62 JH |
292 | } >"$dotest/final-commit" |
293 | ;; | |
0c15cc92 JH |
294 | *) |
295 | case "$resolved,$interactive" in | |
296 | tt) | |
297 | # This is used only for interactive view option. | |
298 | git-diff-index -p --cached HEAD >"$dotest/patch" | |
299 | ;; | |
300 | esac | |
4bfb6b62 | 301 | esac |
d1c5f2a4 | 302 | |
4bfb6b62 | 303 | resume= |
d1c5f2a4 JH |
304 | if test "$interactive" = t |
305 | then | |
a1451104 JH |
306 | test -t 0 || |
307 | die "cannot be interactive without stdin connected to a terminal." | |
d1c5f2a4 JH |
308 | action=again |
309 | while test "$action" = again | |
310 | do | |
311 | echo "Commit Body is:" | |
312 | echo "--------------------------" | |
313 | cat "$dotest/final-commit" | |
314 | echo "--------------------------" | |
9754563c | 315 | printf "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " |
d1c5f2a4 JH |
316 | read reply |
317 | case "$reply" in | |
f89ad67f JH |
318 | [yY]*) action=yes ;; |
319 | [aA]*) action=yes interactive= ;; | |
320 | [nN]*) action=skip ;; | |
321 | [eE]*) "${VISUAL:-${EDITOR:-vi}}" "$dotest/final-commit" | |
d1c5f2a4 | 322 | action=again ;; |
f89ad67f JH |
323 | [vV]*) action=again |
324 | LESS=-S ${PAGER:-less} "$dotest/patch" ;; | |
325 | *) action=again ;; | |
d1c5f2a4 JH |
326 | esac |
327 | done | |
328 | else | |
329 | action=yes | |
330 | fi | |
331 | ||
332 | if test $action = skip | |
333 | then | |
334 | go_next | |
335 | continue | |
336 | fi | |
337 | ||
338 | if test -x "$GIT_DIR"/hooks/applypatch-msg | |
339 | then | |
340 | "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" || | |
341 | stop_here $this | |
342 | fi | |
343 | ||
344 | echo | |
345 | echo "Applying '$SUBJECT'" | |
346 | echo | |
347 | ||
0c15cc92 JH |
348 | case "$resolved" in |
349 | '') | |
087b6742 | 350 | git-apply $binary --index "$dotest/patch" |
0c15cc92 JH |
351 | apply_status=$? |
352 | ;; | |
353 | t) | |
354 | # Resolved means the user did all the hard work, and | |
355 | # we do not have to do any patch application. Just | |
356 | # trust what the user has in the index file and the | |
357 | # working tree. | |
358 | resolved= | |
359 | apply_status=0 | |
360 | ;; | |
361 | esac | |
362 | ||
d1c5f2a4 JH |
363 | if test $apply_status = 1 && test "$threeway" = t |
364 | then | |
73319032 | 365 | if (fall_back_3way) |
d1c5f2a4 | 366 | then |
73319032 JH |
367 | # Applying the patch to an earlier tree and merging the |
368 | # result may have produced the same tree as ours. | |
369 | changed="$(git-diff-index --cached --name-only -z HEAD)" | |
370 | if test '' = "$changed" | |
371 | then | |
372 | echo No changes -- Patch already applied. | |
373 | go_next | |
374 | continue | |
375 | fi | |
376 | # clear apply_status -- we have successfully merged. | |
377 | apply_status=0 | |
d1c5f2a4 JH |
378 | fi |
379 | fi | |
380 | if test $apply_status != 0 | |
381 | then | |
382 | echo Patch failed at $msgnum. | |
383 | stop_here $this | |
384 | fi | |
385 | ||
386 | if test -x "$GIT_DIR"/hooks/pre-applypatch | |
387 | then | |
388 | "$GIT_DIR"/hooks/pre-applypatch || stop_here $this | |
389 | fi | |
390 | ||
391 | tree=$(git-write-tree) && | |
392 | echo Wrote tree $tree && | |
393 | parent=$(git-rev-parse --verify HEAD) && | |
394 | commit=$(git-commit-tree $tree -p $parent <"$dotest/final-commit") && | |
395 | echo Committed: $commit && | |
396 | git-update-ref HEAD $commit $parent || | |
397 | stop_here $this | |
398 | ||
399 | if test -x "$GIT_DIR"/hooks/post-applypatch | |
400 | then | |
401 | "$GIT_DIR"/hooks/post-applypatch | |
402 | fi | |
403 | ||
404 | go_next | |
405 | done | |
406 | ||
407 | rm -fr "$dotest" |