Andrew's git - gitweb.git/blob

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