]>
Commit | Line | Data |
---|---|---|
d1c5f2a4 JH |
1 | #!/bin/sh |
2 | # | |
d64e6b04 | 3 | # Copyright (c) 2005, 2006 Junio C Hamano |
d1c5f2a4 | 4 | |
d84029b6 | 5 | USAGE='[--signoff] [--dotest=<dir>] [--utf8 | --no-utf8] [--binary] [--3way] |
2092a1fe | 6 | [--interactive] [--whitespace=<option>] [-C<n>] [-p<n>] <mbox>... |
cf1fe88c FK |
7 | or, when resuming [--skip | --resolved]' |
8 | . git-sh-setup | |
f9474132 | 9 | set_reflog_action am |
7eff28a9 | 10 | require_work_tree |
d1c5f2a4 | 11 | |
d64e6b04 JH |
12 | git var GIT_COMMITTER_IDENT >/dev/null || exit |
13 | ||
d1c5f2a4 JH |
14 | stop_here () { |
15 | echo "$1" >"$dotest/next" | |
16 | exit 1 | |
17 | } | |
18 | ||
ced9456a | 19 | stop_here_user_resolve () { |
cc120056 | 20 | if [ -n "$resolvemsg" ]; then |
a23bfaed | 21 | printf '%s\n' "$resolvemsg" |
cc120056 SE |
22 | stop_here $1 |
23 | fi | |
ced9456a RS |
24 | cmdline=$(basename $0) |
25 | if test '' != "$interactive" | |
26 | then | |
27 | cmdline="$cmdline -i" | |
28 | fi | |
29 | if test '' != "$threeway" | |
30 | then | |
31 | cmdline="$cmdline -3" | |
32 | fi | |
33 | if test '.dotest' != "$dotest" | |
34 | then | |
35 | cmdline="$cmdline -d=$dotest" | |
36 | fi | |
37 | echo "When you have resolved this problem run \"$cmdline --resolved\"." | |
38 | echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"." | |
39 | ||
40 | stop_here $1 | |
41 | } | |
42 | ||
d1c5f2a4 JH |
43 | go_next () { |
44 | rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \ | |
45 | "$dotest/patch" "$dotest/info" | |
46 | echo "$next" >"$dotest/next" | |
47 | this=$next | |
48 | } | |
49 | ||
fd7bcfb5 JH |
50 | cannot_fallback () { |
51 | echo "$1" | |
52 | echo "Cannot fall back to three-way merge." | |
53 | exit 1 | |
54 | } | |
55 | ||
d1c5f2a4 JH |
56 | fall_back_3way () { |
57 | O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd` | |
58 | ||
59 | rm -fr "$dotest"/patch-merge-* | |
60 | mkdir "$dotest/patch-merge-tmp-dir" | |
61 | ||
62 | # First see if the patch records the index info that we can use. | |
fd7bcfb5 JH |
63 | git-apply -z --index-info "$dotest/patch" \ |
64 | >"$dotest/patch-merge-index-info" && | |
65 | GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ | |
66 | git-update-index -z --index-info <"$dotest/patch-merge-index-info" && | |
67 | GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ | |
68 | git-write-tree >"$dotest/patch-merge-base+" || | |
b1440cc8 | 69 | cannot_fallback "Repository lacks necessary blobs to fall back on 3-way merge." |
fd7bcfb5 JH |
70 | |
71 | echo Using index info to reconstruct a base tree... | |
72 | if GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ | |
b7627278 | 73 | git-apply $binary --cached <"$dotest/patch" |
d1c5f2a4 | 74 | then |
d1c5f2a4 JH |
75 | mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base" |
76 | mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index" | |
fd7bcfb5 JH |
77 | else |
78 | cannot_fallback "Did you hand edit your patch? | |
79 | It does not apply to blobs recorded in its index." | |
d1c5f2a4 JH |
80 | fi |
81 | ||
82 | test -f "$dotest/patch-merge-index" && | |
83 | his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git-write-tree) && | |
84 | orig_tree=$(cat "$dotest/patch-merge-base") && | |
85 | rm -fr "$dotest"/patch-merge-* || exit 1 | |
86 | ||
87 | echo Falling back to patching base and 3-way merge... | |
88 | ||
89 | # This is not so wrong. Depending on which base we picked, | |
90 | # orig_tree may be wildly different from ours, but his_tree | |
91 | # has the same set of wildly different changes in parts the | |
579c9bb1 | 92 | # patch did not touch, so recursive ends up canceling them, |
d1c5f2a4 JH |
93 | # saying that we reverted all those changes. |
94 | ||
579c9bb1 SP |
95 | eval GITHEAD_$his_tree='"$SUBJECT"' |
96 | export GITHEAD_$his_tree | |
97 | git-merge-recursive $orig_tree -- HEAD $his_tree || { | |
1536dd9c JH |
98 | if test -d "$GIT_DIR/rr-cache" |
99 | then | |
100 | git-rerere | |
101 | fi | |
d1c5f2a4 JH |
102 | echo Failed to merge in the changes. |
103 | exit 1 | |
104 | } | |
579c9bb1 | 105 | unset GITHEAD_$his_tree |
d1c5f2a4 JH |
106 | } |
107 | ||
108 | prec=4 | |
67dad687 MT |
109 | dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary= resolvemsg= |
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 | ||
b3f041fb | 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 | '') | |
219 | files=$(git-diff-index --cached --name-only HEAD) || exit | |
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 | |
f131dd49 EW |
255 | if test -d "$GIT_DIR/rr-cache" |
256 | then | |
257 | git-rerere clear | |
258 | fi | |
d1c5f2a4 | 259 | this=`expr "$this" + 1` |
69224716 | 260 | resume= |
d1c5f2a4 JH |
261 | fi |
262 | ||
263 | if test "$this" -gt "$last" | |
264 | then | |
265 | echo Nothing to do. | |
266 | rm -fr "$dotest" | |
267 | exit | |
268 | fi | |
269 | ||
270 | while test "$this" -le "$last" | |
271 | do | |
272 | msgnum=`printf "%0${prec}d" $this` | |
273 | next=`expr "$this" + 1` | |
274 | test -f "$dotest/$msgnum" || { | |
69224716 | 275 | resume= |
d1c5f2a4 JH |
276 | go_next |
277 | continue | |
278 | } | |
0c15cc92 JH |
279 | |
280 | # If we are not resuming, parse and extract the patch information | |
281 | # into separate files: | |
282 | # - info records the authorship and title | |
283 | # - msg is the rest of commit log message | |
284 | # - patch is the patch body. | |
285 | # | |
286 | # When we are resuming, these files are either already prepared | |
287 | # by the user, or the user can tell us to do so by --resolved flag. | |
271440e3 JH |
288 | case "$resume" in |
289 | '') | |
290 | git-mailinfo $keep $utf8 "$dotest/msg" "$dotest/patch" \ | |
291 | <"$dotest/$msgnum" >"$dotest/info" || | |
292 | stop_here $this | |
87ab7992 | 293 | test -s $dotest/patch || { |
6777c380 | 294 | echo "Patch is empty. Was it split wrong?" |
87ab7992 DZ |
295 | stop_here $this |
296 | } | |
271440e3 JH |
297 | git-stripspace < "$dotest/msg" > "$dotest/msg-clean" |
298 | ;; | |
299 | esac | |
d1c5f2a4 JH |
300 | |
301 | GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")" | |
302 | GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")" | |
303 | GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")" | |
e0e3ba20 JH |
304 | |
305 | if test -z "$GIT_AUTHOR_EMAIL" | |
306 | then | |
307 | echo "Patch does not have a valid e-mail address." | |
308 | stop_here $this | |
309 | fi | |
310 | ||
2c674191 | 311 | export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE |
d1c5f2a4 | 312 | |
4bfb6b62 | 313 | SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")" |
d1c5f2a4 | 314 | case "$keep_subject" in -k) SUBJECT="[PATCH] $SUBJECT" ;; esac |
4bfb6b62 JH |
315 | |
316 | case "$resume" in | |
317 | '') | |
318 | if test '' != "$SIGNOFF" | |
319 | then | |
d1c5f2a4 | 320 | LAST_SIGNED_OFF_BY=` |
4bfb6b62 JH |
321 | sed -ne '/^Signed-off-by: /p' \ |
322 | "$dotest/msg-clean" | | |
323 | tail -n 1 | |
d1c5f2a4 | 324 | ` |
4bfb6b62 JH |
325 | ADD_SIGNOFF=` |
326 | test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || { | |
d1c5f2a4 JH |
327 | test '' = "$LAST_SIGNED_OFF_BY" && echo |
328 | echo "$SIGNOFF" | |
4bfb6b62 JH |
329 | }` |
330 | else | |
d1c5f2a4 | 331 | ADD_SIGNOFF= |
4bfb6b62 JH |
332 | fi |
333 | { | |
4b7cc26a | 334 | printf '%s\n' "$SUBJECT" |
d1c5f2a4 JH |
335 | if test -s "$dotest/msg-clean" |
336 | then | |
337 | echo | |
338 | cat "$dotest/msg-clean" | |
339 | fi | |
340 | if test '' != "$ADD_SIGNOFF" | |
341 | then | |
342 | echo "$ADD_SIGNOFF" | |
343 | fi | |
4bfb6b62 JH |
344 | } >"$dotest/final-commit" |
345 | ;; | |
0c15cc92 | 346 | *) |
6d28644d | 347 | case "$resolved$interactive" in |
0c15cc92 JH |
348 | tt) |
349 | # This is used only for interactive view option. | |
350 | git-diff-index -p --cached HEAD >"$dotest/patch" | |
351 | ;; | |
352 | esac | |
4bfb6b62 | 353 | esac |
d1c5f2a4 | 354 | |
4bfb6b62 | 355 | resume= |
d1c5f2a4 JH |
356 | if test "$interactive" = t |
357 | then | |
a1451104 JH |
358 | test -t 0 || |
359 | die "cannot be interactive without stdin connected to a terminal." | |
d1c5f2a4 JH |
360 | action=again |
361 | while test "$action" = again | |
362 | do | |
363 | echo "Commit Body is:" | |
364 | echo "--------------------------" | |
365 | cat "$dotest/final-commit" | |
366 | echo "--------------------------" | |
9754563c | 367 | printf "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " |
d1c5f2a4 JH |
368 | read reply |
369 | case "$reply" in | |
f89ad67f JH |
370 | [yY]*) action=yes ;; |
371 | [aA]*) action=yes interactive= ;; | |
372 | [nN]*) action=skip ;; | |
373 | [eE]*) "${VISUAL:-${EDITOR:-vi}}" "$dotest/final-commit" | |
d1c5f2a4 | 374 | action=again ;; |
f89ad67f JH |
375 | [vV]*) action=again |
376 | LESS=-S ${PAGER:-less} "$dotest/patch" ;; | |
377 | *) action=again ;; | |
d1c5f2a4 JH |
378 | esac |
379 | done | |
380 | else | |
381 | action=yes | |
382 | fi | |
383 | ||
384 | if test $action = skip | |
385 | then | |
386 | go_next | |
387 | continue | |
388 | fi | |
389 | ||
390 | if test -x "$GIT_DIR"/hooks/applypatch-msg | |
391 | then | |
392 | "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" || | |
393 | stop_here $this | |
394 | fi | |
395 | ||
396 | echo | |
4b7cc26a | 397 | printf 'Applying %s\n' "$SUBJECT" |
d1c5f2a4 JH |
398 | echo |
399 | ||
0c15cc92 JH |
400 | case "$resolved" in |
401 | '') | |
67dad687 | 402 | git-apply $git_apply_opt $binary --index "$dotest/patch" |
0c15cc92 JH |
403 | apply_status=$? |
404 | ;; | |
405 | t) | |
406 | # Resolved means the user did all the hard work, and | |
407 | # we do not have to do any patch application. Just | |
408 | # trust what the user has in the index file and the | |
409 | # working tree. | |
410 | resolved= | |
06aff47b | 411 | git-diff-index --quiet --cached HEAD && { |
64646d11 | 412 | echo "No changes - did you forget to use 'git add'?" |
ced9456a | 413 | stop_here_user_resolve $this |
06aff47b | 414 | } |
c1d1128b JH |
415 | unmerged=$(git-ls-files -u) |
416 | if test -n "$unmerged" | |
417 | then | |
418 | echo "You still have unmerged paths in your index" | |
64646d11 | 419 | echo "did you forget to use 'git add'?" |
ced9456a | 420 | stop_here_user_resolve $this |
c1d1128b | 421 | fi |
0c15cc92 | 422 | apply_status=0 |
f131dd49 EW |
423 | if test -d "$GIT_DIR/rr-cache" |
424 | then | |
425 | git rerere | |
426 | fi | |
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. | |
06aff47b AR |
436 | git-diff-index --quiet --cached HEAD && { |
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 | ||
456 | tree=$(git-write-tree) && | |
457 | echo Wrote tree $tree && | |
458 | parent=$(git-rev-parse --verify HEAD) && | |
459 | commit=$(git-commit-tree $tree -p $parent <"$dotest/final-commit") && | |
460 | echo Committed: $commit && | |
f9474132 | 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" |