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