1#!/bin/sh 2# 3# Copyright (c) 2005, 2006 Junio C Hamano 4 5USAGE='[--signoff] [--dotest=<dir>] [--keep] [--utf8 | --no-utf8] 6 [--3way] [--interactive] [--binary] 7 [--whitespace=<option>] [-C<n>] [-p<n>] 8 <mbox>|<Maildir>... 9 or, when resuming [--skip | --resolved]' 10. git-sh-setup 11set_reflog_action am 12require_work_tree 13 14git var GIT_COMMITTER_IDENT >/dev/null ||exit 15 16stop_here () { 17echo"$1">"$dotest/next" 18exit1 19} 20 21stop_here_user_resolve () { 22if[-n"$resolvemsg"];then 23printf'%s\n'"$resolvemsg" 24 stop_here $1 25fi 26 cmdline=$(basename $0) 27iftest''!="$interactive" 28then 29 cmdline="$cmdline-i" 30fi 31iftest''!="$threeway" 32then 33 cmdline="$cmdline-3" 34fi 35iftest'.dotest'!="$dotest" 36then 37 cmdline="$cmdline-d=$dotest" 38fi 39echo"When you have resolved this problem run\"$cmdline--resolved\"." 40echo"If you would prefer to skip this patch, instead run\"$cmdline--skip\"." 41 42 stop_here $1 43} 44 45go_next () { 46rm-f"$dotest/$msgnum""$dotest/msg""$dotest/msg-clean" \ 47"$dotest/patch""$dotest/info" 48echo"$next">"$dotest/next" 49 this=$next 50} 51 52cannot_fallback () { 53echo"$1" 54echo"Cannot fall back to three-way merge." 55exit1 56} 57 58fall_back_3way () { 59 O_OBJECT=`cd "$GIT_OBJECT_DIRECTORY" && pwd` 60 61rm-fr"$dotest"/patch-merge-* 62mkdir"$dotest/patch-merge-tmp-dir" 63 64# First see if the patch records the index info that we can use. 65 git apply --build-fake-ancestor"$dotest/patch-merge-tmp-index" \ 66"$dotest/patch"&& 67 GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ 68 git write-tree>"$dotest/patch-merge-base+"|| 69 cannot_fallback "Repository lacks necessary blobs to fall back on 3-way merge." 70 71echo Using index info to reconstruct a base tree... 72if GIT_INDEX_FILE="$dotest/patch-merge-tmp-index" \ 73 git apply $binary--cached<"$dotest/patch" 74then 75mv"$dotest/patch-merge-base+""$dotest/patch-merge-base" 76mv"$dotest/patch-merge-tmp-index""$dotest/patch-merge-index" 77else 78 cannot_fallback "Did you hand edit your patch? 79It does not apply to blobs recorded in its index." 80fi 81 82test -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")&& 85rm-fr"$dotest"/patch-merge-* ||exit1 86 87echo 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 92# patch did not touch, so recursive ends up canceling them, 93# saying that we reverted all those changes. 94 95eval GITHEAD_$his_tree='"$SUBJECT"' 96export GITHEAD_$his_tree 97 git-merge-recursive$orig_tree-- HEAD $his_tree|| { 98 git rerere 99echo Failed to merge in the changes. 100exit1 101} 102unset GITHEAD_$his_tree 103} 104 105reread_subject () { 106 git stripspace <"$1"|sed-e1q 107} 108 109prec=4 110dotest=.dotest sign= utf8=t keep= skip= interactive= resolved= binary= 111resolvemsg= resume= 112git_apply_opt= 113 114whiletest$#!=0 115do 116case"$1"in 117-d=*|--d=*|--do=*|--dot=*|--dote=*|--dotes=*|--dotest=*) 118 dotest=`expr "z$1" : 'z-[^=]*=\(.*\)'`;shift;; 119-d|--d|--do|--dot|--dote|--dotes|--dotest) 120case"$#"in1) usage ;;esac;shift 121 dotest="$1";shift;; 122 123-i|--i|--in|--int|--inte|--inter|--intera|--interac|--interact|\ 124--interacti|--interactiv|--interactive) 125 interactive=t;shift;; 126 127-b|--b|--bi|--bin|--bina|--binar|--binary) 128 binary=t;shift;; 129 130-3|--3|--3w|--3wa|--3way) 131 threeway=t;shift;; 132-s|--s|--si|--sig|--sign|--signo|--signof|--signoff) 133 sign=t;shift;; 134-u|--u|--ut|--utf|--utf8) 135 utf8=t;shift;;# this is now default 136--no-u|--no-ut|--no-utf|--no-utf8) 137 utf8=;shift;; 138-k|--k|--ke|--kee|--keep) 139 keep=t;shift;; 140 141-r|--r|--re|--res|--reso|--resol|--resolv|--resolve|--resolved) 142 resolved=t;shift;; 143 144--sk|--ski|--skip) 145 skip=t;shift;; 146 147--whitespace=*|-C*|-p*) 148 git_apply_opt="$git_apply_opt$1";shift;; 149 150--resolvemsg=*) 151 resolvemsg=${1#--resolvemsg=};shift;; 152 153--) 154shift;break;; 155-*) 156 usage ;; 157*) 158break;; 159esac 160done 161 162# If the dotest directory exists, but we have finished applying all the 163# patches in them, clear it out. 164iftest -d"$dotest"&& 165 last=$(cat "$dotest/last")&& 166 next=$(cat "$dotest/next")&& 167test$#!=0&& 168test"$next"-gt"$last" 169then 170rm-fr"$dotest" 171fi 172 173iftest -d"$dotest" 174then 175case"$#,$skip$resolved"in 1760,*t*) 177# Explicit resume command and we do not have file, so 178# we are happy. 179: ;; 1800,) 181# No file input but without resume parameters; catch 182# user error to feed us a patch from standard input 183# when there is already .dotest. This is somewhat 184# unreliable -- stdin could be /dev/null for example 185# and the caller did not intend to feed us a patch but 186# wanted to continue unattended. 187 tty -s 188;; 189*) 190 false 191;; 192esac|| 193 die "previous dotest directory$doteststill exists but mbox given." 194 resume=yes 195else 196# Make sure we are not given --skip nor --resolved 197test",$skip,$resolved,"= ,,, || 198 die "Resolve operation not in progress, we are not resuming." 199 200# Start afresh. 201mkdir-p"$dotest"||exit 202 203 git mailsplit -d"$prec"-o"$dotest"-b --"$@">"$dotest/last"|| { 204rm-fr"$dotest" 205exit1 206} 207 208# -b, -s, -u, -k and --whitespace flags are kept for the 209# resuming session after a patch failure. 210# -3 and -i can and must be given when resuming. 211echo"$binary">"$dotest/binary" 212echo"$ws">"$dotest/whitespace" 213echo"$sign">"$dotest/sign" 214echo"$utf8">"$dotest/utf8" 215echo"$keep">"$dotest/keep" 216echo1>"$dotest/next" 217fi 218 219case"$resolved"in 220'') 221 files=$(git diff-index --cached --name-only HEAD --)||exit 222if["$files"];then 223echo"Dirty index: cannot apply patches (dirty:$files)">&2 224exit1 225fi 226esac 227 228iftest"$(cat "$dotest/binary")"= t 229then 230 binary=--allow-binary-replacement 231fi 232iftest"$(cat "$dotest/utf8")"= t 233then 234 utf8=-u 235else 236 utf8=-n 237fi 238iftest"$(cat "$dotest/keep")"= t 239then 240 keep=-k 241fi 242ws=`cat "$dotest/whitespace"` 243iftest"$(cat "$dotest/sign")"= t 244then 245 SIGNOFF=`git-var GIT_COMMITTER_IDENT | sed -e ' 246 s/>.*/>/ 247 s/^/Signed-off-by: /' 248 ` 249else 250 SIGNOFF= 251fi 252 253last=`cat "$dotest/last"` 254this=`cat "$dotest/next"` 255iftest"$skip"= t 256then 257 git rerere clear 258 this=`expr "$this" + 1` 259 resume= 260fi 261 262iftest"$this"-gt"$last" 263then 264echo Nothing to do. 265rm-fr"$dotest" 266exit 267fi 268 269whiletest"$this"-le"$last" 270do 271 msgnum=`printf "%0${prec}d"$this` 272 next=`expr "$this" + 1` 273test -f"$dotest/$msgnum"|| { 274 resume= 275 go_next 276continue 277} 278 279# If we are not resuming, parse and extract the patch information 280# into separate files: 281# - info records the authorship and title 282# - msg is the rest of commit log message 283# - patch is the patch body. 284# 285# When we are resuming, these files are either already prepared 286# by the user, or the user can tell us to do so by --resolved flag. 287case"$resume"in 288'') 289 git mailinfo $keep $utf8"$dotest/msg""$dotest/patch" \ 290<"$dotest/$msgnum">"$dotest/info"|| 291 stop_here $this 292 293# skip pine's internal folder data 294grep'^Author: Mail System Internal Data$' \ 295<"$dotest"/info >/dev/null && 296 go_next &&continue 297 298test -s$dotest/patch|| { 299echo"Patch is empty. Was it split wrong?" 300 stop_here $this 301} 302 git stripspace <"$dotest/msg">"$dotest/msg-clean" 303;; 304esac 305 306 GIT_AUTHOR_NAME="$(sed -n '/^Author/ s/Author: //p' "$dotest/info")" 307 GIT_AUTHOR_EMAIL="$(sed -n '/^Email/ s/Email: //p' "$dotest/info")" 308 GIT_AUTHOR_DATE="$(sed -n '/^Date/ s/Date: //p' "$dotest/info")" 309 310iftest -z"$GIT_AUTHOR_EMAIL" 311then 312echo"Patch does not have a valid e-mail address." 313 stop_here $this 314fi 315 316export GIT_AUTHOR_NAME GIT_AUTHOR_EMAIL GIT_AUTHOR_DATE 317 318 SUBJECT="$(sed -n '/^Subject/ s/Subject: //p' "$dotest/info")" 319case"$keep_subject"in-k) SUBJECT="[PATCH]$SUBJECT";;esac 320 321case"$resume"in 322'') 323iftest''!="$SIGNOFF" 324then 325 LAST_SIGNED_OFF_BY=` 326 sed -ne '/^Signed-off-by: /p' \ 327 "$dotest/msg-clean" | 328 tail -n 1 329 ` 330 ADD_SIGNOFF=` 331 test "$LAST_SIGNED_OFF_BY" = "$SIGNOFF" || { 332 test '' = "$LAST_SIGNED_OFF_BY" && echo 333 echo "$SIGNOFF" 334 }` 335else 336 ADD_SIGNOFF= 337fi 338{ 339printf'%s\n'"$SUBJECT" 340iftest -s"$dotest/msg-clean" 341then 342echo 343cat"$dotest/msg-clean" 344fi 345iftest''!="$ADD_SIGNOFF" 346then 347echo"$ADD_SIGNOFF" 348fi 349} >"$dotest/final-commit" 350;; 351*) 352case"$resolved$interactive"in 353 tt) 354# This is used only for interactive view option. 355 git diff-index -p --cached HEAD -->"$dotest/patch" 356;; 357esac 358esac 359 360 resume= 361iftest"$interactive"= t 362then 363test -t0|| 364 die "cannot be interactive without stdin connected to a terminal." 365 action=again 366whiletest"$action"= again 367do 368echo"Commit Body is:" 369echo"--------------------------" 370cat"$dotest/final-commit" 371echo"--------------------------" 372printf"Apply? [y]es/[n]o/[e]dit/[v]iew patch/[a]ccept all " 373read reply 374case"$reply"in 375[yY]*) action=yes;; 376[aA]*) action=yes interactive= ;; 377[nN]*) action=skip ;; 378[eE]*) git_editor "$dotest/final-commit" 379 SUBJECT=$(reread_subject "$dotest/final-commit") 380 action=again ;; 381[vV]*) action=again 382 LESS=-S${PAGER:-less}"$dotest/patch";; 383*) action=again ;; 384esac 385done 386else 387 action=yes 388fi 389 390iftest$action= skip 391then 392 go_next 393continue 394fi 395 396iftest -x"$GIT_DIR"/hooks/applypatch-msg 397then 398"$GIT_DIR"/hooks/applypatch-msg"$dotest/final-commit"|| 399 stop_here $this 400fi 401 402echo 403printf'Applying %s\n'"$SUBJECT" 404echo 405 406case"$resolved"in 407'') 408 git apply $git_apply_opt $binary--index"$dotest/patch" 409 apply_status=$? 410;; 411 t) 412# Resolved means the user did all the hard work, and 413# we do not have to do any patch application. Just 414# trust what the user has in the index file and the 415# working tree. 416 resolved= 417 git diff-index --quiet --cached HEAD --&& { 418echo"No changes - did you forget to use 'git add'?" 419 stop_here_user_resolve $this 420} 421 unmerged=$(git ls-files -u) 422iftest -n"$unmerged" 423then 424echo"You still have unmerged paths in your index" 425echo"did you forget to use 'git add'?" 426 stop_here_user_resolve $this 427fi 428 apply_status=0 429 git rerere 430;; 431esac 432 433iftest$apply_status=1&&test"$threeway"= t 434then 435if(fall_back_3way) 436then 437# Applying the patch to an earlier tree and merging the 438# result may have produced the same tree as ours. 439 git diff-index --quiet --cached HEAD --&& { 440echo No changes -- Patch already applied. 441 go_next 442continue 443} 444# clear apply_status -- we have successfully merged. 445 apply_status=0 446fi 447fi 448iftest$apply_status!=0 449then 450echo Patch failed at$msgnum. 451 stop_here_user_resolve $this 452fi 453 454iftest -x"$GIT_DIR"/hooks/pre-applypatch 455then 456"$GIT_DIR"/hooks/pre-applypatch|| stop_here $this 457fi 458 459 tree=$(git write-tree)&& 460echo Wrote tree $tree&& 461 parent=$(git rev-parse --verify HEAD)&& 462 commit=$(git commit-tree $tree -p $parent <"$dotest/final-commit")&& 463echo Committed:$commit&& 464 git update-ref -m"$GIT_REFLOG_ACTION:$SUBJECT" HEAD $commit $parent|| 465 stop_here $this 466 467iftest -x"$GIT_DIR"/hooks/post-applypatch 468then 469"$GIT_DIR"/hooks/post-applypatch 470fi 471 472 go_next 473done 474 475rm-fr"$dotest"