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

   1 #!/bin/sh
   2 #
   3 # This program resolves merge conflicts in git
   4 #
   5 # Copyright (c) 2006 Theodore Y. Ts'o
   6 # Copyright (c) 2009-2016 David Aguilar
   7 #
   8 # This file is licensed under the GPL v2, or a later version
   9 # at the discretion of Junio C Hamano.
  10 #
  11
  12 USAGE='[--tool=tool] [--tool-help] [-y|--no-prompt|--prompt] [-g|--gui|--no-gui] [-O<orderfile>] [file to merge] ...'
  13 SUBDIRECTORY_OK=Yes
  14 NONGIT_OK=Yes
  15 OPTIONS_SPEC=
  16 TOOL_MODE=merge
  17 . git-sh-setup
  18 . git-mergetool--lib
  19
  20 # Returns true if the mode reflects a symlink
  21 is_symlink () {
  22         test "$1" = 120000
  23 }
  24
  25 is_submodule () {
  26         test "$1" = 160000
  27 }
  28
  29 local_present () {
  30         test -n "$local_mode"
  31 }
  32
  33 remote_present () {
  34         test -n "$remote_mode"
  35 }
  36
  37 base_present () {
  38         test -n "$base_mode"
  39 }
  40
  41 mergetool_tmpdir_init () {
  42         if test "$(git config --bool mergetool.writeToTemp)" != true
  43         then
  44                 MERGETOOL_TMPDIR=.
  45                 return 0
  46         fi
  47         if MERGETOOL_TMPDIR=$(mktemp -d -t "git-mergetool-XXXXXX" 2>/dev/null)
  48         then
  49                 return 0
  50         fi
  51         die "error: mktemp is needed when 'mergetool.writeToTemp' is true"
  52 }
  53
  54 cleanup_temp_files () {
  55         if test "$1" = --save-backup
  56         then
  57                 rm -rf -- "$MERGED.orig"
  58                 test -e "$BACKUP" && mv -- "$BACKUP" "$MERGED.orig"
  59                 rm -f -- "$LOCAL" "$REMOTE" "$BASE"
  60         else
  61                 rm -f -- "$LOCAL" "$REMOTE" "$BASE" "$BACKUP"
  62         fi
  63         if test "$MERGETOOL_TMPDIR" != "."
  64         then
  65                 rmdir "$MERGETOOL_TMPDIR"
  66         fi
  67 }
  68
  69 describe_file () {
  70         mode="$1"
  71         branch="$2"
  72         file="$3"
  73
  74         printf "  {%s}: " "$branch"
  75         if test -z "$mode"
  76         then
  77                 echo "deleted"
  78         elif is_symlink "$mode"
  79         then
  80                 echo "a symbolic link -> '$(cat "$file")'"
  81         elif is_submodule "$mode"
  82         then
  83                 echo "submodule commit $file"
  84         elif base_present
  85         then
  86                 echo "modified file"
  87         else
  88                 echo "created file"
  89         fi
  90 }
  91
  92 resolve_symlink_merge () {
  93         while true
  94         do
  95                 printf "Use (l)ocal or (r)emote, or (a)bort? "
  96                 read ans || return 1
  97                 case "$ans" in
  98                 [lL]*)
  99                         git checkout-index -f --stage=2 -- "$MERGED"
 100                         git add -- "$MERGED"
 101                         cleanup_temp_files --save-backup
 102                         return 0
 103                         ;;
 104                 [rR]*)
 105                         git checkout-index -f --stage=3 -- "$MERGED"
 106                         git add -- "$MERGED"
 107                         cleanup_temp_files --save-backup
 108                         return 0
 109                         ;;
 110                 [aA]*)
 111                         return 1
 112                         ;;
 113                 esac
 114         done
 115 }
 116
 117 resolve_deleted_merge () {
 118         while true
 119         do
 120                 if base_present
 121                 then
 122                         printf "Use (m)odified or (d)eleted file, or (a)bort? "
 123                 else
 124                         printf "Use (c)reated or (d)eleted file, or (a)bort? "
 125                 fi
 126                 read ans || return 1
 127                 case "$ans" in
 128                 [mMcC]*)
 129                         git add -- "$MERGED"
 130                         if test "$merge_keep_backup" = "true"
 131                         then
 132                                 cleanup_temp_files --save-backup
 133                         else
 134                                 cleanup_temp_files
 135                         fi
 136                         return 0
 137                         ;;
 138                 [dD]*)
 139                         git rm -- "$MERGED" > /dev/null
 140                         cleanup_temp_files
 141                         return 0
 142                         ;;
 143                 [aA]*)
 144                         if test "$merge_keep_temporaries" = "false"
 145                         then
 146                                 cleanup_temp_files
 147                         fi
 148                         return 1
 149                         ;;
 150                 esac
 151         done
 152 }
 153
 154 resolve_submodule_merge () {
 155         while true
 156         do
 157                 printf "Use (l)ocal or (r)emote, or (a)bort? "
 158                 read ans || return 1
 159                 case "$ans" in
 160                 [lL]*)
 161                         if ! local_present
 162                         then
 163                                 if test -n "$(git ls-tree HEAD -- "$MERGED")"
 164                                 then
 165                                         # Local isn't present, but it's a subdirectory
 166                                         git ls-tree --full-name -r HEAD -- "$MERGED" |
 167                                         git update-index --index-info || exit $?
 168                                 else
 169                                         test -e "$MERGED" && mv -- "$MERGED" "$BACKUP"
 170                                         git update-index --force-remove "$MERGED"
 171                                         cleanup_temp_files --save-backup
 172                                 fi
 173                         elif is_submodule "$local_mode"
 174                         then
 175                                 stage_submodule "$MERGED" "$local_sha1"
 176                         else
 177                                 git checkout-index -f --stage=2 -- "$MERGED"
 178                                 git add -- "$MERGED"
 179                         fi
 180                         return 0
 181                         ;;
 182                 [rR]*)
 183                         if ! remote_present
 184                         then
 185                                 if test -n "$(git ls-tree MERGE_HEAD -- "$MERGED")"
 186                                 then
 187                                         # Remote isn't present, but it's a subdirectory
 188                                         git ls-tree --full-name -r MERGE_HEAD -- "$MERGED" |
 189                                         git update-index --index-info || exit $?
 190                                 else
 191                                         test -e "$MERGED" && mv -- "$MERGED" "$BACKUP"
 192                                         git update-index --force-remove "$MERGED"
 193                                 fi
 194                         elif is_submodule "$remote_mode"
 195                         then
 196                                 ! is_submodule "$local_mode" &&
 197                                 test -e "$MERGED" &&
 198                                 mv -- "$MERGED" "$BACKUP"
 199                                 stage_submodule "$MERGED" "$remote_sha1"
 200                         else
 201                                 test -e "$MERGED" && mv -- "$MERGED" "$BACKUP"
 202                                 git checkout-index -f --stage=3 -- "$MERGED"
 203                                 git add -- "$MERGED"
 204                         fi
 205                         cleanup_temp_files --save-backup
 206                         return 0
 207                         ;;
 208                 [aA]*)
 209                         return 1
 210                         ;;
 211                 esac
 212         done
 213 }
 214
 215 stage_submodule () {
 216         path="$1"
 217         submodule_sha1="$2"
 218         mkdir -p "$path" ||
 219         die "fatal: unable to create directory for module at $path"
 220         # Find $path relative to work tree
 221         work_tree_root=$(cd_to_toplevel && pwd)
 222         work_rel_path=$(cd "$path" &&
 223                 GIT_WORK_TREE="${work_tree_root}" git rev-parse --show-prefix
 224         )
 225         test -n "$work_rel_path" ||
 226         die "fatal: unable to get path of module $path relative to work tree"
 227         git update-index --add --replace --cacheinfo 160000 "$submodule_sha1" "${work_rel_path%/}" || die
 228 }
 229
 230 checkout_staged_file () {
 231         tmpfile="$(git checkout-index --temp --stage="$1" "$2" 2>/dev/null)" &&
 232         tmpfile=${tmpfile%%'    '*}
 233
 234         if test $? -eq 0 && test -n "$tmpfile"
 235         then
 236                 mv -- "$(git rev-parse --show-cdup)$tmpfile" "$3"
 237         else
 238                 >"$3"
 239         fi
 240 }
 241
 242 hide_resolved () {
 243         git merge-file --ours -q -p "$LOCAL" "$BASE" "$REMOTE" >"$LCONFL"
 244         git merge-file --theirs -q -p "$LOCAL" "$BASE" "$REMOTE" >"$RCONFL"
 245         mv -- "$LCONFL" "$LOCAL"
 246         mv -- "$RCONFL" "$REMOTE"
 247 }
 248
 249 merge_file () {
 250         MERGED="$1"
 251
 252         f=$(git ls-files -u -- "$MERGED")
 253         if test -z "$f"
 254         then
 255                 if test ! -f "$MERGED"
 256                 then
 257                         echo "$MERGED: file not found"
 258                 else
 259                         echo "$MERGED: file does not need merging"
 260                 fi
 261                 return 1
 262         fi
 263
 264         # extract file extension from the last path component
 265         case "${MERGED##*/}" in
 266         *.*)
 267                 ext=.${MERGED##*.}
 268                 BASE=${MERGED%"$ext"}
 269                 ;;
 270         *)
 271                 BASE=$MERGED
 272                 ext=
 273         esac
 274
 275         mergetool_tmpdir_init
 276
 277         if test "$MERGETOOL_TMPDIR" != "."
 278         then
 279                 # If we're using a temporary directory then write to the
 280                 # top-level of that directory.
 281                 BASE=${BASE##*/}
 282         fi
 283
 284         BACKUP="$MERGETOOL_TMPDIR/${BASE}_BACKUP_$$$ext"
 285         LOCAL="$MERGETOOL_TMPDIR/${BASE}_LOCAL_$$$ext"
 286         LCONFL="$MERGETOOL_TMPDIR/${BASE}_LOCAL_LCONFL_$$$ext"
 287         REMOTE="$MERGETOOL_TMPDIR/${BASE}_REMOTE_$$$ext"
 288         RCONFL="$MERGETOOL_TMPDIR/${BASE}_REMOTE_RCONFL_$$$ext"
 289         BASE="$MERGETOOL_TMPDIR/${BASE}_BASE_$$$ext"
 290
 291         base_mode= local_mode= remote_mode=
 292
 293         # here, $IFS is just a LF
 294         for line in $f
 295         do
 296                 mode=${line%% *}                # 1st word
 297                 sha1=${line#"$mode "}
 298                 sha1=${sha1%% *}                # 2nd word
 299                 case "${line#$mode $sha1 }" in  # remainder
 300                 '1      '*)
 301                         base_mode=$mode
 302                         ;;
 303                 '2      '*)
 304                         local_mode=$mode local_sha1=$sha1
 305                         ;;
 306                 '3      '*)
 307                         remote_mode=$mode remote_sha1=$sha1
 308                         ;;
 309                 esac
 310         done
 311
 312         if is_submodule "$local_mode" || is_submodule "$remote_mode"
 313         then
 314                 echo "Submodule merge conflict for '$MERGED':"
 315                 describe_file "$local_mode" "local" "$local_sha1"
 316                 describe_file "$remote_mode" "remote" "$remote_sha1"
 317                 resolve_submodule_merge
 318                 return
 319         fi
 320
 321         if test -f "$MERGED"
 322         then
 323                 mv -- "$MERGED" "$BACKUP"
 324                 cp -- "$BACKUP" "$MERGED"
 325         fi
 326         # Create a parent directory to handle delete/delete conflicts
 327         # where the base's directory no longer exists.
 328         mkdir -p "$(dirname "$MERGED")"
 329
 330         checkout_staged_file 1 "$MERGED" "$BASE"
 331         checkout_staged_file 2 "$MERGED" "$LOCAL"
 332         checkout_staged_file 3 "$MERGED" "$REMOTE"
 333
 334         if test "$(git config --type=bool mergetool.hideResolved)" != "false"
 335         then
 336                 hide_resolved
 337         fi
 338
 339         if test -z "$local_mode" || test -z "$remote_mode"
 340         then
 341                 echo "Deleted merge conflict for '$MERGED':"
 342                 describe_file "$local_mode" "local" "$LOCAL"
 343                 describe_file "$remote_mode" "remote" "$REMOTE"
 344                 resolve_deleted_merge
 345                 status=$?
 346                 rmdir -p "$(dirname "$MERGED")" 2>/dev/null
 347                 return $status
 348         fi
 349
 350         if is_symlink "$local_mode" || is_symlink "$remote_mode"
 351         then
 352                 echo "Symbolic link merge conflict for '$MERGED':"
 353                 describe_file "$local_mode" "local" "$LOCAL"
 354                 describe_file "$remote_mode" "remote" "$REMOTE"
 355                 resolve_symlink_merge
 356                 return
 357         fi
 358
 359         echo "Normal merge conflict for '$MERGED':"
 360         describe_file "$local_mode" "local" "$LOCAL"
 361         describe_file "$remote_mode" "remote" "$REMOTE"
 362         if test "$guessed_merge_tool" = true || test "$prompt" = true
 363         then
 364                 printf "Hit return to start merge resolution tool (%s): " "$merge_tool"
 365                 read ans || return 1
 366         fi
 367
 368         if base_present
 369         then
 370                 present=true
 371         else
 372                 present=false
 373         fi
 374
 375         if ! run_merge_tool "$merge_tool" "$present"
 376         then
 377                 echo "merge of $MERGED failed" 1>&2
 378                 mv -- "$BACKUP" "$MERGED"
 379
 380                 if test "$merge_keep_temporaries" = "false"
 381                 then
 382                         cleanup_temp_files
 383                 fi
 384
 385                 return 1
 386         fi
 387
 388         if test "$merge_keep_backup" = "true"
 389         then
 390                 mv -- "$BACKUP" "$MERGED.orig"
 391         else
 392                 rm -- "$BACKUP"
 393         fi
 394
 395         git add -- "$MERGED"
 396         cleanup_temp_files
 397         return 0
 398 }
 399
 400 prompt_after_failed_merge () {
 401         while true
 402         do
 403                 printf "Continue merging other unresolved paths [y/n]? "
 404                 read ans || return 1
 405                 case "$ans" in
 406                 [yY]*)
 407                         return 0
 408                         ;;
 409                 [nN]*)
 410                         return 1
 411                         ;;
 412                 esac
 413         done
 414 }
 415
 416 print_noop_and_exit () {
 417         echo "No files need merging"
 418         exit 0
 419 }
 420
 421 main () {
 422         prompt=$(git config --bool mergetool.prompt)
 423         GIT_MERGETOOL_GUI=false
 424         guessed_merge_tool=false
 425         orderfile=
 426
 427         while test $# != 0
 428         do
 429                 case "$1" in
 430                 --tool-help=*)
 431                         TOOL_MODE=${1#--tool-help=}
 432                         show_tool_help
 433                         ;;
 434                 --tool-help)
 435                         show_tool_help
 436                         ;;
 437                 -t|--tool*)
 438                         case "$#,$1" in
 439                         *,*=*)
 440                                 merge_tool=${1#*=}
 441                                 ;;
 442                         1,*)
 443                                 usage ;;
 444                         *)
 445                                 merge_tool="$2"
 446                                 shift ;;
 447                         esac
 448                         ;;
 449                 --no-gui)
 450                         GIT_MERGETOOL_GUI=false
 451                         ;;
 452                 -g|--gui)
 453                         GIT_MERGETOOL_GUI=true
 454                         ;;
 455                 -y|--no-prompt)
 456                         prompt=false
 457                         ;;
 458                 --prompt)
 459                         prompt=true
 460                         ;;
 461                 -O*)
 462                         orderfile="${1#-O}"
 463                         ;;
 464                 --)
 465                         shift
 466                         break
 467                         ;;
 468                 -*)
 469                         usage
 470                         ;;
 471                 *)
 472                         break
 473                         ;;
 474                 esac
 475                 shift
 476         done
 477
 478         git_dir_init
 479         require_work_tree
 480
 481         if test -z "$merge_tool"
 482         then
 483                 if ! merge_tool=$(get_merge_tool)
 484                 then
 485                         guessed_merge_tool=true
 486                 fi
 487         fi
 488         merge_keep_backup="$(git config --bool mergetool.keepBackup || echo true)"
 489         merge_keep_temporaries="$(git config --bool mergetool.keepTemporaries || echo false)"
 490
 491         prefix=$(git rev-parse --show-prefix) || exit 1
 492         cd_to_toplevel
 493
 494         if test -n "$orderfile"
 495         then
 496                 orderfile=$(
 497                         git rev-parse --prefix "$prefix" -- "$orderfile" |
 498                         sed -e 1d
 499                 )
 500         fi
 501
 502         if test $# -eq 0 && test -e "$GIT_DIR/MERGE_RR"
 503         then
 504                 set -- $(git rerere remaining)
 505                 if test $# -eq 0
 506                 then
 507                         print_noop_and_exit
 508                 fi
 509         elif test $# -ge 0
 510         then
 511                 # rev-parse provides the -- needed for 'set'
 512                 eval "set $(git rev-parse --sq --prefix "$prefix" -- "$@")"
 513         fi
 514
 515         files=$(git -c core.quotePath=false \
 516                 diff --name-only --diff-filter=U \
 517                 ${orderfile:+"-O$orderfile"} -- "$@")
 518
 519         if test -z "$files"
 520         then
 521                 print_noop_and_exit
 522         fi
 523
 524         printf "Merging:\n"
 525         printf "%s\n" "$files"
 526
 527         rc=0
 528         set -- $files
 529         while test $# -ne 0
 530         do
 531                 printf "\n"
 532                 if ! merge_file "$1"
 533                 then
 534                         rc=1
 535                         test $# -ne 1 && prompt_after_failed_merge || exit 1
 536                 fi
 537                 shift
 538         done
 539
 540         exit $rc
 541 }
 542
 543 main "$@"