3 # Copyright (c) 2005, 2006 Junio C Hamano
5 USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way]
6 [--interactive] [--whitespace=<option>] <mbox>...
7 or, when resuming [--skip | --resolved]'
12 git var GIT_COMMITTER_IDENT >/dev/null || exit
15 echo "$1" >"$dotest/next"
19 stop_here_user_resolve () {
20 if [ -n "$resolvemsg" ]; then
24 cmdline=$(basename $0)
25 if test '' != "$interactive"
29 if test '' != "$threeway"
33 if test '.dotest' != "$dotest"
35 cmdline="$cmdline -d=$dotest"
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\"."
44 rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \
45 "$dotest/patch" "$dotest/info"
46 echo "$next" >"$dotest/next"
52 echo "Cannot fall back to three-way merge."
57 O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd`
59 rm -fr "$dotest"/patch-merge-*
60 mkdir "$dotest/patch-merge-tmp-dir"
62 # First see if the patch records the index info that we can use.
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+" ||
69 cannot_fallback "Patch does not record usable index information."
71 echo Using index info to reconstruct a base tree...
72 if GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
73 git-apply $binary --cached <"$dotest/patch"
75 mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
76 mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
78 cannot_fallback "Did you hand edit your patch?
79 It does not apply to blobs recorded in its index."
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
87 echo Falling back to patching base and 3-way merge...
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
92 # patch did not touch, so recursive ends up canceling them,
93 # saying that we reverted all those changes.
95 eval GITHEAD_$his_tree='"$SUBJECT"'
96 export GITHEAD_$his_tree
97 git-merge-recursive $orig_tree -- HEAD $his_tree || {
98 if test -d "$GIT_DIR/rr-cache"
102 echo Failed to merge in the changes.
105 unset GITHEAD_$his_tree
109 dotest=.dotest sign= utf8= keep= skip= interactive= resolved= binary= ws= resolvemsg=
111 while case "$#" in 0) break;; esac
114 -d=*|--d=*|--do=*|--dot=*|--dote=*|--dotes=*|--dotest=*)
115 dotest=`expr "z$1" : 'z-[^=]*=\(.*\)'`; shift ;;
116 -d|--d|--do|--dot|--dote|--dotes|--dotest)
117 case "$#" in 1) usage ;; esac; shift
120 -i|--i|--in|--int|--inte|--inter|--intera|--interac|--interact|\
121 --interacti|--interactiv|--interactive)
122 interactive=t; shift ;;
124 -b|--b|--bi|--bin|--bina|--binar|--binary)
127 -3|--3|--3w|--3wa|--3way)
129 -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
131 -u|--u|--ut|--utf|--utf8)
133 -k|--k|--ke|--kee|--keep)
136 -r|--r|--re|--res|--reso|--resol|--resolv|--resolve|--resolved)
146 resolvemsg=$(echo "$1" | sed -e "s/^--resolvemsg=//"); shift ;;
157 # If the dotest directory exists, but we have finished applying all the
158 # patches in them, clear it out.
159 if test -d "$dotest" &&
160 last=$(cat "$dotest/last") &&
161 next=$(cat "$dotest/next") &&
163 test "$next" -gt "$last"
170 case "$#,$skip$resolved" in
172 # Explicit resume command and we do not have file, so
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.
188 die "previous dotest directory $dotest still exists but mbox given."
191 # Make sure we are not given --skip nor --resolved
192 test ",$skip,$resolved," = ,,, ||
193 die "Resolve operation not in progress, we are not resuming."
196 mkdir -p "$dotest" || exit
198 git-mailsplit -d"$prec" -o"$dotest" -b -- "$@" > "$dotest/last" || {
203 # -b, -s, -u, -k and --whitespace flags are kept for the
204 # resuming session after a patch failure.
205 # -3 and -i can and must be given when resuming.
206 echo "$binary" >"$dotest/binary"
207 echo " $ws" >"$dotest/whitespace"
208 echo "$sign" >"$dotest/sign"
209 echo "$utf8" >"$dotest/utf8"
210 echo "$keep" >"$dotest/keep"
211 echo 1 >"$dotest/next"
216 files=$(git-diff-index --cached --name-only HEAD) || exit
217 if [ "$files" ]; then
218 echo "Dirty index: cannot apply patches (dirty: $files)" >&2
223 if test "$(cat "$dotest/binary")" = t
225 binary=--allow-binary-replacement
227 if test "$(cat "$dotest/utf8")" = t
231 if test "$(cat "$dotest/keep")" = t
235 ws=`cat "$dotest/whitespace"`
236 if test "$(cat "$dotest/sign")" = t
238 SIGNOFF=`git-var GIT_COMMITTER_IDENT | sed -e '
240 s/^/Signed-off-by: /'
246 last=`cat "$dotest/last"`
247 this=`cat "$dotest/next"`
250 if test -d "$GIT_DIR/rr-cache"
254 this=`expr "$this" + 1`
258 if test "$this" -gt "$last"
265 while test "$this" -le "$last"
267 msgnum=`printf "%0${prec}d" $this`
268 next=`expr "$this" + 1`
269 test -f "$dotest/$msgnum" || {
275 # If we are not resuming, parse and extract the patch information
276 # into separate files:
277 # - info records the authorship and title
278 # - msg is the rest of commit log message
279 # - patch is the patch body.
281 # When we are resuming, these files are either already prepared
282 # by the user, or the user can tell us to do so by --resolved flag.
285 git-mailinfo $keep $utf8 "$dotest/msg" "$dotest/patch" \
286 <"$dotest/$msgnum" >"$dotest/info" ||
288 git-stripspace < "$dotest/msg" > "$dotest/msg-clean"
292 GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")"
293 GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
294 GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"
296 if test -z "$GIT_AUTHOR_EMAIL"
298 echo "Patch does not have a valid e-mail address."
302 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
304 SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")"
305 case "$keep_subject" in -k) SUBJECT="[PATCH] $SUBJECT" ;; esac
309 if test '' != "$SIGNOFF"
312 sed -ne '/^Signed-off-by: /p' \
313 "$dotest/msg-clean" |
317 test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || {
318 test '' = "$LAST_SIGNED_OFF_BY" && echo
326 if test -s "$dotest/msg-clean"
329 cat "$dotest/msg-clean"
331 if test '' != "$ADD_SIGNOFF"
335 } >"$dotest/final-commit"
338 case "$resolved$interactive" in
340 # This is used only for interactive view option.
341 git-diff-index -p --cached HEAD >"$dotest/patch"
347 if test "$interactive" = t
350 die "cannot be interactive without stdin connected to a terminal."
352 while test "$action" = again
354 echo "Commit Body is:"
355 echo "--------------------------"
356 cat "$dotest/final-commit"
357 echo "--------------------------"
358 printf "Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all "
362 [aA]*) action=yes interactive= ;;
363 [nN]*) action=skip ;;
364 [eE]*) "${VISUAL:-${EDITOR:-vi}}" "$dotest/final-commit"
367 LESS=-S ${PAGER:-less} "$dotest/patch" ;;
375 if test $action = skip
381 if test -x "$GIT_DIR"/hooks/applypatch-msg
383 "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" ||
388 echo "Applying '$SUBJECT'"
393 git-apply $binary --index $ws "$dotest/patch"
397 # Resolved means the user did all the hard work, and
398 # we do not have to do any patch application. Just
399 # trust what the user has in the index file and the
402 changed="$(git-diff-index --cached --name-only HEAD)"
403 if test '' = "$changed"
405 echo "No changes - did you forget to use 'git add'?"
406 stop_here_user_resolve $this
408 unmerged=$(git-ls-files -u)
409 if test -n "$unmerged"
411 echo "You still have unmerged paths in your index"
412 echo "did you forget to use 'git add'?"
413 stop_here_user_resolve $this
416 if test -d "$GIT_DIR/rr-cache"
423 if test $apply_status = 1 && test "$threeway" = t
427 # Applying the patch to an earlier tree and merging the
428 # result may have produced the same tree as ours.
429 changed="$(git-diff-index --cached --name-only HEAD)"
430 if test '' = "$changed"
432 echo No changes -- Patch already applied.
436 # clear apply_status -- we have successfully merged.
440 if test $apply_status != 0
442 echo Patch failed at $msgnum.
443 stop_here_user_resolve $this
446 if test -x "$GIT_DIR"/hooks/pre-applypatch
448 "$GIT_DIR"/hooks/pre-applypatch || stop_here $this
451 tree=$(git-write-tree) &&
452 echo Wrote tree $tree &&
453 parent=$(git-rev-parse --verify HEAD) &&
454 commit=$(git-commit-tree $tree -p $parent <"$dotest/final-commit") &&
455 echo Committed: $commit &&
456 git-update-ref -m "$GIT_REFLOG_ACTION: $SUBJECT" HEAD $commit $parent ||
459 if test -x "$GIT_DIR"/hooks/post-applypatch
461 "$GIT_DIR"/hooks/post-applypatch