]>
Commit | Line | Data |
---|---|---|
d1c5f2a4 JH |
1 | #!/bin/sh |
2 | # | |
d64e6b04 | 3 | # Copyright (c) 2005, 2006 Junio C Hamano |
d1c5f2a4 | 4 | |
1560be16 BH |
5 | USAGE='[--signoff] [--dotest=<dir>] [--keep] [--utf8 | --no-utf8] |
6 | [--3way] [--interactive] [--binary] | |
7 | [--whitespace=<option>] [-C<n>] [-p<n>] | |
8 | <mbox>|<Maildir>... | |
cf1fe88c FK |
9 | or, when resuming [--skip | --resolved]' |
10 | . git-sh-setup | |
f9474132 | 11 | set_reflog_action am |
7eff28a9 | 12 | require_work_tree |
d1c5f2a4 | 13 | |
d64e6b04 JH |
14 | git var GIT_COMMITTER_IDENT >/dev/null || exit |
15 | ||
d1c5f2a4 JH |
16 | stop_here () { |
17 | echo "$1" >"$dotest/next" | |
18 | exit 1 | |
19 | } | |
20 | ||
ced9456a | 21 | stop_here_user_resolve () { |
cc120056 | 22 | if [ -n "$resolvemsg" ]; then |
a23bfaed | 23 | printf '%s\n' "$resolvemsg" |
cc120056 SE |
24 | stop_here $1 |
25 | fi | |
ced9456a RS |
26 | cmdline=$(basename $0) |
27 | if test '' != "$interactive" | |
28 | then | |
29 | cmdline="$cmdline -i" | |
30 | fi | |
31 | if test '' != "$threeway" | |
32 | then | |
33 | cmdline="$cmdline -3" | |
34 | fi | |
35 | if test '.dotest' != "$dotest" | |
36 | then | |
37 | cmdline="$cmdline -d=$dotest" | |
38 | fi | |
39 | echo "When you have resolved this problem run \"$cmdline --resolved\"." | |
40 | echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"." | |
41 | ||
42 | stop_here $1 | |
43 | } | |
44 | ||
d1c5f2a4 JH |
45 | go_next () { |
46 | rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \ | |
47 | "$dotest/patch" "$dotest/info" | |
48 | echo "$next" >"$dotest/next" | |
49 | this=$next | |
50 | } | |
51 | ||
fd7bcfb5 JH |
52 | cannot_fallback () { |
53 | echo "$1" | |
54 | echo "Cannot fall back to three-way merge." | |
55 | exit 1 | |
56 | } | |
57 | ||
d1c5f2a4 JH |
58 | fall_back_3way () { |
59 | O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd` | |
60 | ||
61 | rm -fr "$dotest"/patch-merge-* | |
62 | mkdir "$dotest/patch-merge-tmp-dir" | |
63 | ||
64 | # First see if the patch records the index info that we can use. | |
5be60078 | 65 | git apply -z --index-info "$dotest/patch" \ |
fd7bcfb5 JH |
66 | >"$dotest/patch-merge-index-info" && |
67 | GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ | |
5be60078 | 68 | git update-index -z --index-info <"$dotest/patch-merge-index-info" && |
fd7bcfb5 | 69 | GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ |
5be60078 | 70 | git write-tree >"$dotest/patch-merge-base+" || |
b1440cc8 | 71 | cannot_fallback "Repository lacks necessary blobs to fall back on 3-way merge." |
fd7bcfb5 JH |
72 | |
73 | echo Using index info to reconstruct a base tree... | |
74 | if GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ | |
5be60078 | 75 | git apply $binary --cached <"$dotest/patch" |
d1c5f2a4 | 76 | then |
d1c5f2a4 JH |
77 | mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base" |
78 | mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index" | |
fd7bcfb5 JH |
79 | else |
80 | cannot_fallback "Did you hand edit your patch? | |
81 | It does not apply to blobs recorded in its index." | |
d1c5f2a4 JH |
82 | fi |
83 | ||
84 | test -f "$dotest/patch-merge-index" && | |
5be60078 | 85 | his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git write-tree) && |
d1c5f2a4 JH |
86 | orig_tree=$(cat "$dotest/patch-merge-base") && |
87 | rm -fr "$dotest"/patch-merge-* || exit 1 | |
88 | ||
89 | echo Falling back to patching base and 3-way merge... | |
90 | ||
91 | # This is not so wrong. Depending on which base we picked, | |
92 | # orig_tree may be wildly different from ours, but his_tree | |
93 | # has the same set of wildly different changes in parts the | |
579c9bb1 | 94 | # patch did not touch, so recursive ends up canceling them, |
d1c5f2a4 JH |
95 | # saying that we reverted all those changes. |
96 | ||
579c9bb1 SP |
97 | eval GITHEAD_$his_tree='"$SUBJECT"' |
98 | export GITHEAD_$his_tree | |
99 | git-merge-recursive $orig_tree -- HEAD $his_tree || { | |
b4372ef1 | 100 | git rerere |
d1c5f2a4 JH |
101 | echo Failed to merge in the changes. |
102 | exit 1 | |
103 | } | |
579c9bb1 | 104 | unset GITHEAD_$his_tree |
d1c5f2a4 JH |
105 | } |
106 | ||
107 | prec=4 | |
3f0a8f3c GP |
108 | dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary= |
109 | resolvemsg= resume= | |
67dad687 | 110 | git_apply_opt= |
d1c5f2a4 JH |
111 | |
112 | while case "$#" in 0) break;; esac | |
113 | do | |
114 | case "$1" in | |
115 | -d=*|--d=*|--do=*|--dot=*|--dote=*|--dotes=*|--dotest=*) | |
8096fae7 | 116 | dotest=`expr "z$1" : 'z-[^=]*=\(.*\)'`; shift ;; |
d1c5f2a4 JH |
117 | -d|--d|--do|--dot|--dote|--dotes|--dotest) |
118 | case "$#" in 1) usage ;; esac; shift | |
119 | dotest="$1"; shift;; | |
120 | ||
121 | -i|--i|--in|--int|--inte|--inter|--intera|--interac|--interact|\ | |
122 | --interacti|--interactiv|--interactive) | |
123 | interactive=t; shift ;; | |
124 | ||
087b6742 JH |
125 | -b|--b|--bi|--bin|--bina|--binar|--binary) |
126 | binary=t; shift ;; | |
127 | ||
d1c5f2a4 JH |
128 | -3|--3|--3w|--3wa|--3way) |
129 | threeway=t; shift ;; | |
130 | -s|--s|--si|--sig|--sign|--signo|--signof|--signoff) | |
131 | sign=t; shift ;; | |
132 | -u|--u|--ut|--utf|--utf8) | |
3cf167ba | 133 | utf8=t; shift ;; # this is now default |
d84029b6 JH |
134 | --no-u|--no-ut|--no-utf|--no-utf8) |
135 | utf8=; shift ;; | |
d1c5f2a4 JH |
136 | -k|--k|--ke|--kee|--keep) |
137 | keep=t; shift ;; | |
138 | ||
0c15cc92 JH |
139 | -r|--r|--re|--res|--reso|--resol|--resolv|--resolve|--resolved) |
140 | resolved=t; shift ;; | |
141 | ||
d1c5f2a4 JH |
142 | --sk|--ski|--skip) |
143 | skip=t; shift ;; | |
144 | ||
2092a1fe | 145 | --whitespace=*|-C*|-p*) |
67dad687 | 146 | git_apply_opt="$git_apply_opt $1"; shift ;; |
8c31cb82 | 147 | |
cc120056 | 148 | --resolvemsg=*) |
a23bfaed | 149 | resolvemsg=${1#--resolvemsg=}; shift ;; |
cc120056 | 150 | |
d1c5f2a4 JH |
151 | --) |
152 | shift; break ;; | |
153 | -*) | |
154 | usage ;; | |
155 | *) | |
156 | break ;; | |
157 | esac | |
158 | done | |
159 | ||
0c15cc92 JH |
160 | # If the dotest directory exists, but we have finished applying all the |
161 | # patches in them, clear it out. | |
d1c5f2a4 JH |
162 | if test -d "$dotest" && |
163 | last=$(cat "$dotest/last") && | |
164 | next=$(cat "$dotest/next") && | |
165 | test $# != 0 && | |
166 | test "$next" -gt "$last" | |
167 | then | |
168 | rm -fr "$dotest" | |
169 | fi | |
170 | ||
171 | if test -d "$dotest" | |
172 | then | |
c95b1389 JH |
173 | case "$#,$skip$resolved" in |
174 | 0,*t*) | |
175 | # Explicit resume command and we do not have file, so | |
176 | # we are happy. | |
177 | : ;; | |
178 | 0,) | |
179 | # No file input but without resume parameters; catch | |
180 | # user error to feed us a patch from standard input | |
181 | # when there is already .dotest. This is somewhat | |
182 | # unreliable -- stdin could be /dev/null for example | |
183 | # and the caller did not intend to feed us a patch but | |
184 | # wanted to continue unattended. | |
185 | tty -s | |
186 | ;; | |
187 | *) | |
188 | false | |
189 | ;; | |
190 | esac || | |
191 | die "previous dotest directory $dotest still exists but mbox given." | |
271440e3 | 192 | resume=yes |
d1c5f2a4 | 193 | else |
0c15cc92 JH |
194 | # Make sure we are not given --skip nor --resolved |
195 | test ",$skip,$resolved," = ,,, || | |
cc120056 | 196 | die "Resolve operation not in progress, we are not resuming." |
d1c5f2a4 JH |
197 | |
198 | # Start afresh. | |
199 | mkdir -p "$dotest" || exit | |
200 | ||
5be60078 | 201 | git mailsplit -d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" || { |
d1c5f2a4 JH |
202 | rm -fr "$dotest" |
203 | exit 1 | |
204 | } | |
205 | ||
8c31cb82 JH |
206 | # -b, -s, -u, -k and --whitespace flags are kept for the |
207 | # resuming session after a patch failure. | |
0c15cc92 | 208 | # -3 and -i can and must be given when resuming. |
087b6742 | 209 | echo "$binary" >"$dotest/binary" |
8c31cb82 | 210 | echo " $ws" >"$dotest/whitespace" |
d1c5f2a4 JH |
211 | echo "$sign" >"$dotest/sign" |
212 | echo "$utf8" >"$dotest/utf8" | |
213 | echo "$keep" >"$dotest/keep" | |
d1c5f2a4 JH |
214 | echo 1 >"$dotest/next" |
215 | fi | |
216 | ||
0c15cc92 JH |
217 | case "$resolved" in |
218 | '') | |
5be60078 | 219 | files=$(git diff-index --cached --name-only HEAD) || exit |
0c15cc92 JH |
220 | if [ "$files" ]; then |
221 | echo "Dirty index: cannot apply patches (dirty: $files)" >&2 | |
222 | exit 1 | |
223 | fi | |
224 | esac | |
225 | ||
087b6742 JH |
226 | if test "$(cat "$dotest/binary")" = t |
227 | then | |
228 | binary=--allow-binary-replacement | |
229 | fi | |
d1c5f2a4 JH |
230 | if test "$(cat "$dotest/utf8")" = t |
231 | then | |
232 | utf8=-u | |
bb1091a4 JH |
233 | else |
234 | utf8=-n | |
d1c5f2a4 JH |
235 | fi |
236 | if test "$(cat "$dotest/keep")" = t | |
237 | then | |
238 | keep=-k | |
239 | fi | |
8c31cb82 | 240 | ws=`cat "$dotest/whitespace"` |
d1c5f2a4 JH |
241 | if test "$(cat "$dotest/sign")" = t |
242 | then | |
243 | SIGNOFF=`git-var GIT_COMMITTER_IDENT | sed -e ' | |
244 | s/>.*/>/ | |
245 | s/^/Signed-off-by: /' | |
246 | ` | |
247 | else | |
248 | SIGNOFF= | |
249 | fi | |
d1c5f2a4 JH |
250 | |
251 | last=`cat "$dotest/last"` | |
252 | this=`cat "$dotest/next"` | |
253 | if test "$skip" = t | |
254 | then | |
b4372ef1 | 255 | git rerere clear |
d1c5f2a4 | 256 | this=`expr "$this" + 1` |
69224716 | 257 | resume= |
d1c5f2a4 JH |
258 | fi |
259 | ||
260 | if test "$this" -gt "$last" | |
261 | then | |
262 | echo Nothing to do. | |
263 | rm -fr "$dotest" | |
264 | exit | |
265 | fi | |
266 | ||
267 | while test "$this" -le "$last" | |
268 | do | |
269 | msgnum=`printf "%0${prec}d" $this` | |
270 | next=`expr "$this" + 1` | |
271 | test -f "$dotest/$msgnum" || { | |
69224716 | 272 | resume= |
d1c5f2a4 JH |
273 | go_next |
274 | continue | |
275 | } | |
0c15cc92 JH |
276 | |
277 | # If we are not resuming, parse and extract the patch information | |
278 | # into separate files: | |
279 | # - info records the authorship and title | |
280 | # - msg is the rest of commit log message | |
281 | # - patch is the patch body. | |
282 | # | |
283 | # When we are resuming, these files are either already prepared | |
284 | # by the user, or the user can tell us to do so by --resolved flag. | |
271440e3 JH |
285 | case "$resume" in |
286 | '') | |
5be60078 | 287 | git mailinfo $keep $utf8 "$dotest/msg" "$dotest/patch" \ |
271440e3 JH |
288 | <"$dotest/$msgnum" >"$dotest/info" || |
289 | stop_here $this | |
ca193cf1 JS |
290 | |
291 | # skip pine's internal folder data | |
292 | grep '^Author: Mail System Internal Data$' \ | |
293 | <"$dotest"/info >/dev/null && | |
294 | go_next && continue | |
295 | ||
87ab7992 | 296 | test -s $dotest/patch || { |
6777c380 | 297 | echo "Patch is empty. Was it split wrong?" |
87ab7992 DZ |
298 | stop_here $this |
299 | } | |
5be60078 | 300 | git stripspace < "$dotest/msg" > "$dotest/msg-clean" |
271440e3 JH |
301 | ;; |
302 | esac | |
d1c5f2a4 JH |
303 | |
304 | GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")" | |
305 | GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")" | |
306 | GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")" | |
e0e3ba20 JH |
307 | |
308 | if test -z "$GIT_AUTHOR_EMAIL" | |
309 | then | |
310 | echo "Patch does not have a valid e-mail address." | |
311 | stop_here $this | |
312 | fi | |
313 | ||
2c674191 | 314 | export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE |
d1c5f2a4 | 315 | |
4bfb6b62 | 316 | SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")" |
d1c5f2a4 | 317 | case "$keep_subject" in -k) SUBJECT="[PATCH] $SUBJECT" ;; esac |
4bfb6b62 JH |
318 | |
319 | case "$resume" in | |
320 | '') | |
321 | if test '' != "$SIGNOFF" | |
322 | then | |
d1c5f2a4 | 323 | LAST_SIGNED_OFF_BY=` |
4bfb6b62 JH |
324 | sed -ne '/^Signed-off-by: /p' \ |
325 | "$dotest/msg-clean" | | |
326 | tail -n 1 | |
d1c5f2a4 | 327 | ` |
4bfb6b62 JH |
328 | ADD_SIGNOFF=` |
329 | test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || { | |
d1c5f2a4 JH |
330 | test '' = "$LAST_SIGNED_OFF_BY" && echo |
331 | echo "$SIGNOFF" | |
4bfb6b62 JH |
332 | }` |
333 | else | |
d1c5f2a4 | 334 | ADD_SIGNOFF= |
4bfb6b62 JH |
335 | fi |
336 | { | |
4b7cc26a | 337 | printf '%s\n' "$SUBJECT" |
d1c5f2a4 JH |
338 | if test -s "$dotest/msg-clean" |
339 | then | |
340 | echo | |
341 | cat "$dotest/msg-clean" | |
342 | fi | |
343 | if test '' != "$ADD_SIGNOFF" | |
344 | then | |
345 | echo "$ADD_SIGNOFF" | |
346 | fi | |
4bfb6b62 JH |
347 | } >"$dotest/final-commit" |
348 | ;; | |
0c15cc92 | 349 | *) |
6d28644d | 350 | case "$resolved$interactive" in |
0c15cc92 JH |
351 | tt) |
352 | # This is used only for interactive view option. | |
5be60078 | 353 | git diff-index -p --cached HEAD >"$dotest/patch" |
0c15cc92 JH |
354 | ;; |
355 | esac | |
4bfb6b62 | 356 | esac |
d1c5f2a4 | 357 | |
4bfb6b62 | 358 | resume= |
d1c5f2a4 JH |
359 | if test "$interactive" = t |
360 | then | |
a1451104 JH |
361 | test -t 0 || |
362 | die "cannot be interactive without stdin connected to a terminal." | |
d1c5f2a4 JH |
363 | action=again |
364 | while test "$action" = again | |
365 | do | |
366 | echo "Commit Body is:" | |
367 | echo "--------------------------" | |
368 | cat "$dotest/final-commit" | |
369 | echo "--------------------------" | |
9754563c | 370 | printf "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " |
d1c5f2a4 JH |
371 | read reply |
372 | case "$reply" in | |
f89ad67f JH |
373 | [yY]*) action=yes ;; |
374 | [aA]*) action=yes interactive= ;; | |
375 | [nN]*) action=skip ;; | |
ef0c2abf | 376 | [eE]*) git_editor "$dotest/final-commit" |
d1c5f2a4 | 377 | action=again ;; |
f89ad67f JH |
378 | [vV]*) action=again |
379 | LESS=-S ${PAGER:-less} "$dotest/patch" ;; | |
380 | *) action=again ;; | |
d1c5f2a4 JH |
381 | esac |
382 | done | |
383 | else | |
384 | action=yes | |
385 | fi | |
386 | ||
387 | if test $action = skip | |
388 | then | |
389 | go_next | |
390 | continue | |
391 | fi | |
392 | ||
393 | if test -x "$GIT_DIR"/hooks/applypatch-msg | |
394 | then | |
395 | "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" || | |
396 | stop_here $this | |
397 | fi | |
398 | ||
399 | echo | |
4b7cc26a | 400 | printf 'Applying %s\n' "$SUBJECT" |
d1c5f2a4 JH |
401 | echo |
402 | ||
0c15cc92 JH |
403 | case "$resolved" in |
404 | '') | |
5be60078 | 405 | git apply $git_apply_opt $binary --index "$dotest/patch" |
0c15cc92 JH |
406 | apply_status=$? |
407 | ;; | |
408 | t) | |
409 | # Resolved means the user did all the hard work, and | |
410 | # we do not have to do any patch application. Just | |
411 | # trust what the user has in the index file and the | |
412 | # working tree. | |
413 | resolved= | |
5be60078 | 414 | git diff-index --quiet --cached HEAD && { |
64646d11 | 415 | echo "No changes - did you forget to use 'git add'?" |
ced9456a | 416 | stop_here_user_resolve $this |
06aff47b | 417 | } |
5be60078 | 418 | unmerged=$(git ls-files -u) |
c1d1128b JH |
419 | if test -n "$unmerged" |
420 | then | |
421 | echo "You still have unmerged paths in your index" | |
64646d11 | 422 | echo "did you forget to use 'git add'?" |
ced9456a | 423 | stop_here_user_resolve $this |
c1d1128b | 424 | fi |
0c15cc92 | 425 | apply_status=0 |
b4372ef1 | 426 | git rerere |
0c15cc92 JH |
427 | ;; |
428 | esac | |
429 | ||
d1c5f2a4 JH |
430 | if test $apply_status = 1 && test "$threeway" = t |
431 | then | |
73319032 | 432 | if (fall_back_3way) |
d1c5f2a4 | 433 | then |
73319032 JH |
434 | # Applying the patch to an earlier tree and merging the |
435 | # result may have produced the same tree as ours. | |
5be60078 | 436 | git diff-index --quiet --cached HEAD && { |
06aff47b AR |
437 | echo No changes -- Patch already applied. |
438 | go_next | |
439 | continue | |
440 | } | |
73319032 JH |
441 | # clear apply_status -- we have successfully merged. |
442 | apply_status=0 | |
d1c5f2a4 JH |
443 | fi |
444 | fi | |
445 | if test $apply_status != 0 | |
446 | then | |
447 | echo Patch failed at $msgnum. | |
ced9456a | 448 | stop_here_user_resolve $this |
d1c5f2a4 JH |
449 | fi |
450 | ||
451 | if test -x "$GIT_DIR"/hooks/pre-applypatch | |
452 | then | |
453 | "$GIT_DIR"/hooks/pre-applypatch || stop_here $this | |
454 | fi | |
455 | ||
5be60078 | 456 | tree=$(git write-tree) && |
d1c5f2a4 | 457 | echo Wrote tree $tree && |
5be60078 JH |
458 | parent=$(git rev-parse --verify HEAD) && |
459 | commit=$(git commit-tree $tree -p $parent <"$dotest/final-commit") && | |
d1c5f2a4 | 460 | echo Committed: $commit && |
5be60078 | 461 | git update-ref -m "$GIT_REFLOG_ACTION: $SUBJECT" HEAD $commit $parent || |
d1c5f2a4 JH |
462 | stop_here $this |
463 | ||
464 | if test -x "$GIT_DIR"/hooks/post-applypatch | |
465 | then | |
466 | "$GIT_DIR"/hooks/post-applypatch | |
467 | fi | |
468 | ||
469 | go_next | |
470 | done | |
471 | ||
472 | rm -fr "$dotest" |