git.oblomov.eu Git - git/blob - git-am.sh

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