git-fetch-pack: Implement client part of the multi_ack extension
[git/dscho.git] / git-am.sh
blob51ea168e03b0d1e4a906f5f17ead431ca3884502
1 #!/bin/sh
4 . git-sh-setup || die "Not a git archive"
6 files=$(git-diff-index --cached --name-only HEAD) || exit
7 if [ "$files" ]; then
8 echo "Dirty index: cannot apply patches (dirty: $files)" >&2
9 exit 1
12 usage () {
13 echo >&2 "usage: $0 [--signoff] [--dotest=<dir>] [--utf8] [--3way] <mbox>"
14 echo >&2 " or, when resuming"
15 echo >&2 " $0 [--skip]"
16 exit 1;
19 stop_here () {
20 echo "$1" >"$dotest/next"
21 exit 1
24 go_next () {
25 rm -f "$dotest/$msgnum" "$dotest/msg" "$dotest/msg-clean" \
26 "$dotest/patch" "$dotest/info"
27 echo "$next" >"$dotest/next"
28 this=$next
31 fall_back_3way () {
32 O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd`
34 rm -fr "$dotest"/patch-merge-*
35 mkdir "$dotest/patch-merge-tmp-dir"
37 # First see if the patch records the index info that we can use.
38 if git-apply -z --index-info "$dotest/patch" \
39 >"$dotest/patch-merge-index-info" 2>/dev/null &&
40 GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
41 git-update-index -z --index-info <"$dotest/patch-merge-index-info" &&
42 GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \
43 git-write-tree >"$dotest/patch-merge-base+" &&
44 # index has the base tree now.
46 cd "$dotest/patch-merge-tmp-dir" &&
47 GIT_INDEX_FILE="../patch-merge-tmp-index" \
48 GIT_OBJECT_DIRECTORY="$O_OBJECT" \
49 git-apply --index <../patch
51 then
52 echo Using index info to reconstruct a base tree...
53 mv "$dotest/patch-merge-base+" "$dotest/patch-merge-base"
54 mv "$dotest/patch-merge-tmp-index" "$dotest/patch-merge-index"
55 else
56 # Otherwise, try nearby trees that can be used to apply the
57 # patch.
59 N=10
61 # Hoping the patch is against our recent commits...
62 git-rev-list --max-count=$N HEAD
64 # or hoping the patch is against known tags...
65 git-ls-remote --tags .
66 ) |
67 while read base junk
69 # See if we have it as a tree...
70 git-cat-file tree "$base" >/dev/null 2>&1 || continue
72 rm -fr "$dotest"/patch-merge-* &&
73 mkdir "$dotest/patch-merge-tmp-dir" || break
75 cd "$dotest/patch-merge-tmp-dir" &&
76 GIT_INDEX_FILE=../patch-merge-tmp-index &&
77 GIT_OBJECT_DIRECTORY="$O_OBJECT" &&
78 export GIT_INDEX_FILE GIT_OBJECT_DIRECTORY &&
79 git-read-tree "$base" &&
80 git-apply --index &&
81 mv ../patch-merge-tmp-index ../patch-merge-index &&
82 echo "$base" >../patch-merge-base
83 ) <"$dotest/patch" 2>/dev/null && break
84 done
87 test -f "$dotest/patch-merge-index" &&
88 his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git-write-tree) &&
89 orig_tree=$(cat "$dotest/patch-merge-base") &&
90 rm -fr "$dotest"/patch-merge-* || exit 1
92 echo Falling back to patching base and 3-way merge...
94 # This is not so wrong. Depending on which base we picked,
95 # orig_tree may be wildly different from ours, but his_tree
96 # has the same set of wildly different changes in parts the
97 # patch did not touch, so resolve ends up cancelling them,
98 # saying that we reverted all those changes.
100 git-merge-resolve $orig_tree -- HEAD $his_tree || {
101 echo Failed to merge in the changes.
102 exit 1
106 prec=4
107 dotest=.dotest sign= utf8= keep= skip= interactive=
109 while case "$#" in 0) break;; esac
111 case "$1" in
112 -d=*|--d=*|--do=*|--dot=*|--dote=*|--dotes=*|--dotest=*)
113 dotest=`expr "$1" : '-[^=]*=\(.*\)'`; shift ;;
114 -d|--d|--do|--dot|--dote|--dotes|--dotest)
115 case "$#" in 1) usage ;; esac; shift
116 dotest="$1"; shift;;
118 -i|--i|--in|--int|--inte|--inter|--intera|--interac|--interact|\
119 --interacti|--interactiv|--interactive)
120 interactive=t; shift ;;
122 -3|--3|--3w|--3wa|--3way)
123 threeway=t; shift ;;
124 -s|--s|--si|--sig|--sign|--signo|--signof|--signoff)
125 sign=t; shift ;;
126 -u|--u|--ut|--utf|--utf8)
127 utf8=t; shift ;;
128 -k|--k|--ke|--kee|--keep)
129 keep=t; shift ;;
131 --sk|--ski|--skip)
132 skip=t; shift ;;
135 shift; break ;;
137 usage ;;
139 break ;;
140 esac
141 done
143 if test -d "$dotest" &&
144 last=$(cat "$dotest/last") &&
145 next=$(cat "$dotest/next") &&
146 test $# != 0 &&
147 test "$next" -gt "$last"
148 then
149 rm -fr "$dotest"
152 if test -d "$dotest"
153 then
154 test ",$#," = ",0," ||
155 die "previous dotest directory $dotest still exists but mbox given."
156 else
157 # Make sure we are not given --skip
158 test ",$skip," = ,, ||
159 die "we are not resuming."
161 # Start afresh.
162 mkdir -p "$dotest" || exit
164 # cat does the right thing for us, including '-' to mean
165 # standard input.
166 cat "$@" |
167 git-mailsplit -d$prec "$dotest/" >"$dotest/last" || {
168 rm -fr "$dotest"
169 exit 1
172 echo "$sign" >"$dotest/sign"
173 echo "$utf8" >"$dotest/utf8"
174 echo "$keep" >"$dotest/keep"
175 echo 1 >"$dotest/next"
178 if test "$(cat "$dotest/utf8")" = t
179 then
180 utf8=-u
182 if test "$(cat "$dotest/keep")" = t
183 then
184 keep=-k
186 if test "$(cat "$dotest/sign")" = t
187 then
188 SIGNOFF=`git-var GIT_COMMITTER_IDENT | sed -e '
189 s/>.*/>/
190 s/^/Signed-off-by: /'
192 else
193 SIGNOFF=
196 last=`cat "$dotest/last"`
197 this=`cat "$dotest/next"`
198 if test "$skip" = t
199 then
200 this=`expr "$this" + 1`
203 if test "$this" -gt "$last"
204 then
205 echo Nothing to do.
206 rm -fr "$dotest"
207 exit
210 while test "$this" -le "$last"
212 msgnum=`printf "%0${prec}d" $this`
213 next=`expr "$this" + 1`
214 test -f "$dotest/$msgnum" || {
215 go_next
216 continue
218 git-mailinfo $keep $utf8 "$dotest/msg" "$dotest/patch" \
219 <"$dotest/$msgnum" >"$dotest/info" ||
220 stop_here $this
221 git-stripspace < "$dotest/msg" > "$dotest/msg-clean"
223 GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")"
224 GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")"
225 GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")"
226 SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")"
227 export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE
229 case "$keep_subject" in -k) SUBJECT="[PATCH] $SUBJECT" ;; esac
230 if test '' != "$SIGNOFF"
231 then
232 LAST_SIGNED_OFF_BY=`
233 sed -ne '/^Signed-off-by: /p' "$dotest/msg-clean" |
234 tail -n 1
236 ADD_SIGNOFF=$(test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || {
237 test '' = "$LAST_SIGNED_OFF_BY" && echo
238 echo "$SIGNOFF"
240 else
241 ADD_SIGNOFF=
244 echo "$SUBJECT"
245 if test -s "$dotest/msg-clean"
246 then
247 echo
248 cat "$dotest/msg-clean"
250 if test '' != "$ADD_SIGNOFF"
251 then
252 echo "$ADD_SIGNOFF"
254 } >"$dotest/final-commit"
256 if test "$interactive" = t
257 then
258 test -t 0 ||
259 die "cannot be interactive without stdin connected to a terminal."
260 action=again
261 while test "$action" = again
263 echo "Commit Body is:"
264 echo "--------------------------"
265 cat "$dotest/final-commit"
266 echo "--------------------------"
267 echo -n "Apply? [y]es/[n]o/[e]dit/[a]ccept all "
268 read reply
269 case "$reply" in
270 y*|Y*) action=yes ;;
271 a*|A*) action=yes interactive= ;;
272 n*|N*) action=skip ;;
273 e*|E*) "${VISUAL:-${EDITOR:-vi}}" "$dotest/final-commit"
274 action=again ;;
275 esac
276 done
277 else
278 action=yes
281 if test $action = skip
282 then
283 go_next
284 continue
287 if test -x "$GIT_DIR"/hooks/applypatch-msg
288 then
289 "$GIT_DIR"/hooks/applypatch-msg "$dotest/final-commit" ||
290 stop_here $this
293 echo
294 echo "Applying '$SUBJECT'"
295 echo
297 git-apply --index "$dotest/patch"; apply_status=$?
298 if test $apply_status = 1 && test "$threeway" = t
299 then
300 if (fall_back_3way)
301 then
302 # Applying the patch to an earlier tree and merging the
303 # result may have produced the same tree as ours.
304 changed="$(git-diff-index --cached --name-only -z HEAD)"
305 if test '' = "$changed"
306 then
307 echo No changes -- Patch already applied.
308 go_next
309 continue
311 # clear apply_status -- we have successfully merged.
312 apply_status=0
315 if test $apply_status != 0
316 then
317 echo Patch failed at $msgnum.
318 stop_here $this
321 if test -x "$GIT_DIR"/hooks/pre-applypatch
322 then
323 "$GIT_DIR"/hooks/pre-applypatch || stop_here $this
326 tree=$(git-write-tree) &&
327 echo Wrote tree $tree &&
328 parent=$(git-rev-parse --verify HEAD) &&
329 commit=$(git-commit-tree $tree -p $parent <"$dotest/final-commit") &&
330 echo Committed: $commit &&
331 git-update-ref HEAD $commit $parent ||
332 stop_here $this
334 if test -x "$GIT_DIR"/hooks/post-applypatch
335 then
336 "$GIT_DIR"/hooks/post-applypatch
339 go_next
340 done
342 rm -fr "$dotest"