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