1#!/bin/sh 2# 3# 4 5USAGE='[--signoff] [--dotest=<dir>] [--utf8] [--binary] [--3way] <mbox> 6 or, when resuming [--skip | --resolved]' 7. git-sh-setup 8 9stop_here () { 10echo"$1">"$dotest/next" 11exit1 12} 13 14go_next () { 15rm-f"$dotest/$msgnum""$dotest/msg""$dotest/msg-clean" \ 16"$dotest/patch""$dotest/info" 17echo"$next">"$dotest/next" 18 this=$next 19} 20 21fall_back_3way () { 22 O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd` 23 24rm-fr"$dotest"/patch-merge-* 25mkdir"$dotest/patch-merge-tmp-dir" 26 27# First see if the patch records the index info that we can use. 28if git-apply -z --index-info"$dotest/patch" \ 29>"$dotest/patch-merge-index-info"2>/dev/null && 30 GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ 31 git-update-index -z --index-info<"$dotest/patch-merge-index-info"&& 32 GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ 33 git-write-tree>"$dotest/patch-merge-base+"&& 34# index has the base tree now. 35( 36cd"$dotest/patch-merge-tmp-dir"&& 37 GIT_INDEX_FILE="../patch-merge-tmp-index" \ 38 GIT_OBJECT_DIRECTORY="$O_OBJECT" \ 39 git-apply$binary--index<../patch 40) 41then 42echo Using index info to reconstruct a base tree... 43mv"$dotest/patch-merge-base+""$dotest/patch-merge-base" 44mv"$dotest/patch-merge-tmp-index""$dotest/patch-merge-index" 45else 46# Otherwise, try nearby trees that can be used to apply the 47# patch. 48( 49 N=10 50 51# Hoping the patch is against our recent commits... 52 git-rev-list --max-count=$N HEAD 53 54# or hoping the patch is against known tags... 55 git-ls-remote --tags . 56) | 57whileread base junk 58do 59# See if we have it as a tree... 60 git-cat-file tree "$base">/dev/null 2>&1||continue 61 62rm-fr"$dotest"/patch-merge-* && 63mkdir"$dotest/patch-merge-tmp-dir"||break 64( 65cd"$dotest/patch-merge-tmp-dir"&& 66 GIT_INDEX_FILE=../patch-merge-tmp-index&& 67 GIT_OBJECT_DIRECTORY="$O_OBJECT"&& 68export GIT_INDEX_FILE GIT_OBJECT_DIRECTORY && 69 git-read-tree"$base"&& 70 git-apply$binary--index&& 71mv ../patch-merge-tmp-index ../patch-merge-index&& 72echo"$base">../patch-merge-base 73) <"$dotest/patch"2>/dev/null &&break 74done 75fi 76 77test -f"$dotest/patch-merge-index"&& 78 his_tree=$(GIT_INDEX_FILE="$dotest/patch-merge-index" git-write-tree)&& 79 orig_tree=$(cat "$dotest/patch-merge-base")&& 80rm-fr"$dotest"/patch-merge-* ||exit1 81 82echo Falling back to patching base and 3-way merge... 83 84# This is not so wrong. Depending on which base we picked, 85# orig_tree may be wildly different from ours, but his_tree 86# has the same set of wildly different changes in parts the 87# patch did not touch, so resolve ends up cancelling them, 88# saying that we reverted all those changes. 89 90 git-merge-resolve$orig_tree-- HEAD $his_tree|| { 91echo Failed to merge in the changes. 92exit1 93} 94} 95 96prec=4 97dotest=.dotest sign= utf8= keep= skip= interactive= resolved= binary= 98 99while case"$#"in0)break;;esac 100do 101case"$1"in 102-d=*|--d=*|--do=*|--dot=*|--dote=*|--dotes=*|--dotest=*) 103 dotest=`expr "$1" : '-[^=]*=\(.*\)'`;shift;; 104-d|--d|--do|--dot|--dote|--dotes|--dotest) 105case"$#"in1) usage ;;esac;shift 106 dotest="$1";shift;; 107 108-i|--i|--in|--int|--inte|--inter|--intera|--interac|--interact|\ 109--interacti|--interactiv|--interactive) 110 interactive=t;shift;; 111 112-b|--b|--bi|--bin|--bina|--binar|--binary) 113 binary=t;shift;; 114 115-3|--3|--3w|--3wa|--3way) 116 threeway=t;shift;; 117-s|--s|--si|--sig|--sign|--signo|--signof|--signoff) 118 sign=t;shift;; 119-u|--u|--ut|--utf|--utf8) 120 utf8=t;shift;; 121-k|--k|--ke|--kee|--keep) 122 keep=t;shift;; 123 124-r|--r|--re|--res|--reso|--resol|--resolv|--resolve|--resolved) 125 resolved=t;shift;; 126 127--sk|--ski|--skip) 128 skip=t;shift;; 129 130--) 131shift;break;; 132-*) 133 usage ;; 134*) 135break;; 136esac 137done 138 139# If the dotest directory exists, but we have finished applying all the 140# patches in them, clear it out. 141iftest -d"$dotest"&& 142 last=$(cat "$dotest/last")&& 143 next=$(cat "$dotest/next")&& 144test$#!=0&& 145test"$next"-gt"$last" 146then 147rm-fr"$dotest" 148fi 149 150iftest -d"$dotest" 151then 152test",$#,"=",0,"|| 153 die "previous dotest directory$doteststill exists but mbox given." 154 resume=yes 155else 156# Make sure we are not given --skip nor --resolved 157test",$skip,$resolved,"= ,,, || 158 die "we are not resuming." 159 160# Start afresh. 161mkdir-p"$dotest"||exit 162 163# cat does the right thing for us, including '-' to mean 164# standard input. 165cat"$@"| 166 git-mailsplit -d$prec"$dotest/">"$dotest/last"|| { 167rm-fr"$dotest" 168exit1 169} 170 171# -b, -s, -u and -k flags are kept for the resuming session after 172# a patch failure. 173# -3 and -i can and must be given when resuming. 174echo"$binary">"$dotest/binary" 175echo"$sign">"$dotest/sign" 176echo"$utf8">"$dotest/utf8" 177echo"$keep">"$dotest/keep" 178echo1>"$dotest/next" 179fi 180 181case"$resolved"in 182'') 183 files=$(git-diff-index --cached --name-only HEAD)||exit 184if["$files"];then 185echo"Dirty index: cannot apply patches (dirty:$files)">&2 186exit1 187fi 188esac 189 190iftest"$(cat "$dotest/binary")"= t 191then 192 binary=--allow-binary-replacement 193fi 194iftest"$(cat "$dotest/utf8")"= t 195then 196 utf8=-u 197fi 198iftest"$(cat "$dotest/keep")"= t 199then 200 keep=-k 201fi 202iftest"$(cat "$dotest/sign")"= t 203then 204 SIGNOFF=`git-var GIT_COMMITTER_IDENT | sed -e ' 205 s/>.*/>/ 206 s/^/Signed-off-by: /' 207 ` 208else 209 SIGNOFF= 210fi 211 212last=`cat "$dotest/last"` 213this=`cat "$dotest/next"` 214iftest"$skip"= t 215then 216 this=`expr "$this" + 1` 217fi 218 219iftest"$this"-gt"$last" 220then 221echo Nothing to do. 222rm-fr"$dotest" 223exit 224fi 225 226whiletest"$this"-le"$last" 227do 228 msgnum=`printf "%0${prec}d"$this` 229 next=`expr "$this" + 1` 230test -f"$dotest/$msgnum"|| { 231 go_next 232continue 233} 234 235# If we are not resuming, parse and extract the patch information 236# into separate files: 237# - info records the authorship and title 238# - msg is the rest of commit log message 239# - patch is the patch body. 240# 241# When we are resuming, these files are either already prepared 242# by the user, or the user can tell us to do so by --resolved flag. 243case"$resume"in 244'') 245 git-mailinfo$keep $utf8"$dotest/msg""$dotest/patch" \ 246<"$dotest/$msgnum">"$dotest/info"|| 247 stop_here $this 248 git-stripspace<"$dotest/msg">"$dotest/msg-clean" 249;; 250esac 251 252 GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")" 253 GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")" 254 GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")" 255export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE 256 257 SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")" 258case"$keep_subject"in-k) SUBJECT="[PATCH]$SUBJECT";;esac 259 260case"$resume"in 261'') 262iftest''!="$SIGNOFF" 263then 264 LAST_SIGNED_OFF_BY=` 265 sed -ne '/^Signed-off-by: /p' \ 266 "$dotest/msg-clean" | 267 tail -n 1 268 ` 269 ADD_SIGNOFF=` 270 test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || { 271 test '' = "$LAST_SIGNED_OFF_BY" && echo 272 echo "$SIGNOFF" 273 }` 274else 275 ADD_SIGNOFF= 276fi 277{ 278echo"$SUBJECT" 279iftest -s"$dotest/msg-clean" 280then 281echo 282cat"$dotest/msg-clean" 283fi 284iftest''!="$ADD_SIGNOFF" 285then 286echo"$ADD_SIGNOFF" 287fi 288} >"$dotest/final-commit" 289;; 290*) 291case"$resolved,$interactive"in 292 tt) 293# This is used only for interactive view option. 294 git-diff-index -p --cached HEAD >"$dotest/patch" 295;; 296esac 297esac 298 299 resume= 300iftest"$interactive"= t 301then 302test -t0|| 303 die "cannot be interactive without stdin connected to a terminal." 304 action=again 305whiletest"$action"= again 306do 307echo"Commit Body is:" 308echo"--------------------------" 309cat"$dotest/final-commit" 310echo"--------------------------" 311printf"Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " 312read reply 313case"$reply"in 314[yY]*) action=yes;; 315[aA]*) action=yes interactive= ;; 316[nN]*) action=skip ;; 317[eE]*)"${VISUAL:-${EDITOR:-vi}}""$dotest/final-commit" 318 action=again ;; 319[vV]*) action=again 320 LESS=-S${PAGER:-less}"$dotest/patch";; 321*) action=again ;; 322esac 323done 324else 325 action=yes 326fi 327 328iftest$action= skip 329then 330 go_next 331continue 332fi 333 334iftest -x"$GIT_DIR"/hooks/applypatch-msg 335then 336"$GIT_DIR"/hooks/applypatch-msg"$dotest/final-commit"|| 337 stop_here $this 338fi 339 340echo 341echo"Applying '$SUBJECT'" 342echo 343 344case"$resolved"in 345'') 346 git-apply$binary--index"$dotest/patch" 347 apply_status=$? 348;; 349 t) 350# Resolved means the user did all the hard work, and 351# we do not have to do any patch application. Just 352# trust what the user has in the index file and the 353# working tree. 354 resolved= 355 apply_status=0 356;; 357esac 358 359iftest$apply_status=1&&test"$threeway"= t 360then 361if(fall_back_3way) 362then 363# Applying the patch to an earlier tree and merging the 364# result may have produced the same tree as ours. 365 changed="$(git-diff-index --cached --name-only -z HEAD)" 366iftest''="$changed" 367then 368echo No changes -- Patch already applied. 369 go_next 370continue 371fi 372# clear apply_status -- we have successfully merged. 373 apply_status=0 374fi 375fi 376iftest$apply_status!=0 377then 378echo Patch failed at$msgnum. 379 stop_here $this 380fi 381 382iftest -x"$GIT_DIR"/hooks/pre-applypatch 383then 384"$GIT_DIR"/hooks/pre-applypatch|| stop_here $this 385fi 386 387 tree=$(git-write-tree)&& 388echo Wrote tree $tree&& 389 parent=$(git-rev-parse --verify HEAD)&& 390 commit=$(git-commit-tree $tree -p $parent <"$dotest/final-commit")&& 391echo Committed:$commit&& 392 git-update-ref HEAD $commit $parent|| 393 stop_here $this 394 395iftest -x"$GIT_DIR"/hooks/post-applypatch 396then 397"$GIT_DIR"/hooks/post-applypatch 398fi 399 400 go_next 401done 402 403rm-fr"$dotest"