git-mergetool--lib.sh

   1 # git-mergetool--lib is a shell library for common merge tool functions
   2
   3 : ${MERGE_TOOLS_DIR=$(git --exec-path)/mergetools}
   4
   5 IFS='
   6 '
   7
   8 mode_ok () {
   9         if diff_mode
  10         then
  11                 can_diff
  12         elif merge_mode
  13         then
  14                 can_merge
  15         else
  16                 false
  17         fi
  18 }
  19
  20 is_available () {
  21         merge_tool_path=$(translate_merge_tool_path "$1") &&
  22         type "$merge_tool_path" >/dev/null 2>&1
  23 }
  24
  25 list_config_tools () {
  26         section=$1
  27         line_prefix=${2:-}
  28
  29         git config --get-regexp $section'\..*\.cmd' |
  30         while read -r key value
  31         do
  32                 toolname=${key#$section.}
  33                 toolname=${toolname%.cmd}
  34
  35                 printf "%s%s\n" "$line_prefix" "$toolname"
  36         done
  37 }
  38
  39 show_tool_names () {
  40         condition=${1:-true} per_line_prefix=${2:-} preamble=${3:-}
  41         not_found_msg=${4:-}
  42         extra_content=${5:-}
  43
  44         shown_any=
  45         ( cd "$MERGE_TOOLS_DIR" && ls ) | {
  46                 while read scriptname
  47                 do
  48                         setup_tool "$scriptname" 2>/dev/null
  49                         # We need an actual line feed here
  50                         variants="$variants
  51 $(list_tool_variants)"
  52                 done
  53                 variants="$(echo "$variants" | sort -u)"
  54
  55                 for toolname in $variants
  56                 do
  57                         if setup_tool "$toolname" 2>/dev/null &&
  58                                 (eval "$condition" "$toolname")
  59                         then
  60                                 if test -n "$preamble"
  61                                 then
  62                                         printf "%s\n" "$preamble"
  63                                         preamble=
  64                                 fi
  65                                 shown_any=yes
  66                                 printf "%s%-15s  %s\n" "$per_line_prefix" "$toolname" $(diff_mode && diff_cmd_help "$toolname" || merge_cmd_help "$toolname")
  67                         fi
  68                 done
  69
  70                 if test -n "$extra_content"
  71                 then
  72                         if test -n "$preamble"
  73                         then
  74                                 # Note: no '\n' here since we don't want a
  75                                 # blank line if there is no initial content.
  76                                 printf "%s" "$preamble"
  77                                 preamble=
  78                         fi
  79                         shown_any=yes
  80                         printf "\n%s\n" "$extra_content"
  81                 fi
  82
  83                 if test -n "$preamble" && test -n "$not_found_msg"
  84                 then
  85                         printf "%s\n" "$not_found_msg"
  86                 fi
  87
  88                 test -n "$shown_any"
  89         }
  90 }
  91
  92 diff_mode () {
  93         test "$TOOL_MODE" = diff
  94 }
  95
  96 merge_mode () {
  97         test "$TOOL_MODE" = merge
  98 }
  99
 100 get_gui_default () {
 101         if diff_mode
 102         then
 103                 GUI_DEFAULT_KEY="difftool.guiDefault"
 104         else
 105                 GUI_DEFAULT_KEY="mergetool.guiDefault"
 106         fi
 107         GUI_DEFAULT_CONFIG_LCASE=$(git config --default false --get "$GUI_DEFAULT_KEY" | tr 'A-Z' 'a-z')
 108         if test "$GUI_DEFAULT_CONFIG_LCASE" = "auto"
 109         then
 110                 if test -n "$DISPLAY"
 111                 then
 112                         GUI_DEFAULT=true
 113                 else
 114                         GUI_DEFAULT=false
 115                 fi
 116         else
 117                 GUI_DEFAULT=$(git config --default false --bool --get "$GUI_DEFAULT_KEY")
 118                 subshell_exit_status=$?
 119                 if test $subshell_exit_status -ne 0
 120                 then
 121                         exit $subshell_exit_status
 122                 fi
 123         fi
 124         echo $GUI_DEFAULT
 125 }
 126
 127 gui_mode () {
 128         if test -z "$GIT_MERGETOOL_GUI"
 129         then
 130                 GIT_MERGETOOL_GUI=$(get_gui_default)
 131                 if test $? -ne 0
 132                 then
 133                         exit 2
 134                 fi
 135         fi
 136         test "$GIT_MERGETOOL_GUI" = true
 137 }
 138
 139 translate_merge_tool_path () {
 140         echo "$1"
 141 }
 142
 143 check_unchanged () {
 144         if test "$MERGED" -nt "$BACKUP"
 145         then
 146                 return 0
 147         else
 148                 while true
 149                 do
 150                         echo "$MERGED seems unchanged."
 151                         printf "Was the merge successful [y/n]? "
 152                         read answer || return 1
 153                         case "$answer" in
 154                         y*|Y*) return 0 ;;
 155                         n*|N*) return 1 ;;
 156                         esac
 157                 done
 158         fi
 159 }
 160
 161 valid_tool () {
 162         setup_tool "$1" && return 0
 163         cmd=$(get_merge_tool_cmd "$1")
 164         test -n "$cmd"
 165 }
 166
 167 setup_user_tool () {
 168         merge_tool_cmd=$(get_merge_tool_cmd "$tool")
 169         test -n "$merge_tool_cmd" || return 1
 170
 171         diff_cmd () {
 172                 ( eval $merge_tool_cmd )
 173         }
 174
 175         merge_cmd () {
 176                 ( eval $merge_tool_cmd )
 177         }
 178
 179         list_tool_variants () {
 180                 echo "$tool"
 181         }
 182 }
 183
 184 setup_tool () {
 185         tool="$1"
 186
 187         # Fallback definitions, to be overridden by tools.
 188         can_merge () {
 189                 return 0
 190         }
 191
 192         can_diff () {
 193                 return 0
 194         }
 195
 196         diff_cmd () {
 197                 return 1
 198         }
 199
 200         diff_cmd_help () {
 201                 return 0
 202         }
 203
 204         merge_cmd () {
 205                 return 1
 206         }
 207
 208         merge_cmd_help () {
 209                 return 0
 210         }
 211
 212         hide_resolved_enabled () {
 213                 return 0
 214         }
 215
 216         translate_merge_tool_path () {
 217                 echo "$1"
 218         }
 219
 220         list_tool_variants () {
 221                 echo "$tool"
 222         }
 223
 224         # Most tools' exit codes cannot be trusted, so By default we ignore
 225         # their exit code and check the merged file's modification time in
 226         # check_unchanged() to determine whether or not the merge was
 227         # successful.  The return value from run_merge_cmd, by default, is
 228         # determined by check_unchanged().
 229         #
 230         # When a tool's exit code can be trusted then the return value from
 231         # run_merge_cmd is simply the tool's exit code, and check_unchanged()
 232         # is not called.
 233         #
 234         # The return value of exit_code_trustable() tells us whether or not we
 235         # can trust the tool's exit code.
 236         #
 237         # User-defined and built-in tools default to false.
 238         # Built-in tools advertise that their exit code is trustable by
 239         # redefining exit_code_trustable() to true.
 240
 241         exit_code_trustable () {
 242                 false
 243         }
 244
 245         if test -f "$MERGE_TOOLS_DIR/$tool"
 246         then
 247                 . "$MERGE_TOOLS_DIR/$tool"
 248         elif test -f "$MERGE_TOOLS_DIR/${tool%[0-9]}"
 249         then
 250                 . "$MERGE_TOOLS_DIR/${tool%[0-9]}"
 251         else
 252                 setup_user_tool
 253                 return $?
 254         fi
 255
 256         # Now let the user override the default command for the tool.  If
 257         # they have not done so then this will return 1 which we ignore.
 258         setup_user_tool
 259
 260         if ! list_tool_variants | grep -q "^$tool$"
 261         then
 262                 return 1
 263         fi
 264
 265         if merge_mode && ! can_merge
 266         then
 267                 echo "error: '$tool' can not be used to resolve merges" >&2
 268                 return 1
 269         elif diff_mode && ! can_diff
 270         then
 271                 echo "error: '$tool' can only be used to resolve merges" >&2
 272                 return 1
 273         fi
 274         return 0
 275 }
 276
 277 get_merge_tool_cmd () {
 278         merge_tool="$1"
 279         if diff_mode
 280         then
 281                 git config "difftool.$merge_tool.cmd" ||
 282                 git config "mergetool.$merge_tool.cmd"
 283         else
 284                 git config "mergetool.$merge_tool.cmd"
 285         fi
 286 }
 287
 288 trust_exit_code () {
 289         if git config --bool "mergetool.$1.trustExitCode"
 290         then
 291                 :; # OK
 292         elif exit_code_trustable
 293         then
 294                 echo true
 295         else
 296                 echo false
 297         fi
 298 }
 299
 300 initialize_merge_tool () {
 301         # Bring tool-specific functions into scope
 302         setup_tool "$1" || return 1
 303 }
 304
 305 # Entry point for running tools
 306 run_merge_tool () {
 307         # If GIT_PREFIX is empty then we cannot use it in tools
 308         # that expect to be able to chdir() to its value.
 309         GIT_PREFIX=${GIT_PREFIX:-.}
 310         export GIT_PREFIX
 311
 312         merge_tool_path=$(get_merge_tool_path "$1") || exit
 313         base_present="$2"
 314
 315         if merge_mode
 316         then
 317                 run_merge_cmd "$1"
 318         else
 319                 run_diff_cmd "$1"
 320         fi
 321 }
 322
 323 # Run a either a configured or built-in diff tool
 324 run_diff_cmd () {
 325         diff_cmd "$1"
 326 }
 327
 328 # Run a either a configured or built-in merge tool
 329 run_merge_cmd () {
 330         mergetool_trust_exit_code=$(trust_exit_code "$1")
 331         if test "$mergetool_trust_exit_code" = "true"
 332         then
 333                 merge_cmd "$1"
 334         else
 335                 touch "$BACKUP"
 336                 merge_cmd "$1"
 337                 check_unchanged
 338         fi
 339 }
 340
 341 list_merge_tool_candidates () {
 342         if merge_mode
 343         then
 344                 tools="tortoisemerge"
 345         else
 346                 tools="kompare"
 347         fi
 348         if test -n "$DISPLAY"
 349         then
 350                 if test -n "$GNOME_DESKTOP_SESSION_ID"
 351                 then
 352                         tools="meld opendiff kdiff3 tkdiff xxdiff $tools"
 353                 else
 354                         tools="opendiff kdiff3 tkdiff xxdiff meld $tools"
 355                 fi
 356                 tools="$tools gvimdiff diffuse diffmerge ecmerge"
 357                 tools="$tools p4merge araxis bc codecompare"
 358                 tools="$tools smerge"
 359         fi
 360         case "${VISUAL:-$EDITOR}" in
 361         *nvim*)
 362                 tools="$tools nvimdiff vimdiff emerge"
 363                 ;;
 364         *vim*)
 365                 tools="$tools vimdiff nvimdiff emerge"
 366                 ;;
 367         *)
 368                 tools="$tools emerge vimdiff nvimdiff"
 369                 ;;
 370         esac
 371 }
 372
 373 show_tool_help () {
 374         tool_opt="'git ${TOOL_MODE}tool --tool=<tool>'"
 375
 376         tab='   '
 377         LF='
 378 '
 379         any_shown=no
 380
 381         cmd_name=${TOOL_MODE}tool
 382         config_tools=$({
 383                 diff_mode && list_config_tools difftool "$tab$tab"
 384                 list_config_tools mergetool "$tab$tab"
 385         } | sort)
 386         extra_content=
 387         if test -n "$config_tools"
 388         then
 389                 extra_content="${tab}user-defined:${LF}$config_tools"
 390         fi
 391
 392         show_tool_names 'mode_ok && is_available' "$tab$tab" \
 393                 "$tool_opt may be set to one of the following:" \
 394                 "No suitable tool for 'git $cmd_name --tool=<tool>' found." \
 395                 "$extra_content" &&
 396                 any_shown=yes
 397
 398         show_tool_names 'mode_ok && ! is_available' "$tab$tab" \
 399                 "${LF}The following tools are valid, but not currently available:" &&
 400                 any_shown=yes
 401
 402         if test "$any_shown" = yes
 403         then
 404                 echo
 405                 echo "Some of the tools listed above only work in a windowed"
 406                 echo "environment. If run in a terminal-only session, they will fail."
 407         fi
 408         exit 0
 409 }
 410
 411 guess_merge_tool () {
 412         list_merge_tool_candidates
 413         cat >&2 <<-EOF
 414
 415         This message is displayed because '$TOOL_MODE.tool' is not configured.
 416         See 'git ${TOOL_MODE}tool --tool-help' or 'git help config' for more details.
 417         'git ${TOOL_MODE}tool' will now attempt to use one of the following tools:
 418         $tools
 419         EOF
 420
 421         # Loop over each candidate and stop when a valid merge tool is found.
 422         IFS=' '
 423         for tool in $tools
 424         do
 425                 is_available "$tool" && echo "$tool" && return 0
 426         done
 427
 428         echo >&2 "No known ${TOOL_MODE} tool is available."
 429         return 1
 430 }
 431
 432 get_configured_merge_tool () {
 433         keys=
 434         if diff_mode
 435         then
 436                 if gui_mode
 437                 then
 438                         keys="diff.guitool merge.guitool diff.tool merge.tool"
 439                 else
 440                         keys="diff.tool merge.tool"
 441                 fi
 442         else
 443                 if gui_mode
 444                 then
 445                         keys="merge.guitool merge.tool"
 446                 else
 447                         keys="merge.tool"
 448                 fi
 449         fi
 450
 451         merge_tool=$(
 452                 IFS=' '
 453                 for key in $keys
 454                 do
 455                         selected=$(git config $key)
 456                         if test -n "$selected"
 457                         then
 458                                 echo "$selected"
 459                                 return
 460                         fi
 461                 done)
 462
 463         if test -n "$merge_tool" && ! valid_tool "$merge_tool"
 464         then
 465                 echo >&2 "git config option $TOOL_MODE.${gui_prefix}tool set to unknown tool: $merge_tool"
 466                 echo >&2 "Resetting to default..."
 467                 return 1
 468         fi
 469         echo "$merge_tool"
 470 }
 471
 472 get_merge_tool_path () {
 473         # A merge tool has been set, so verify that it's valid.
 474         merge_tool="$1"
 475         if ! valid_tool "$merge_tool"
 476         then
 477                 echo >&2 "Unknown merge tool $merge_tool"
 478                 exit 1
 479         fi
 480         if diff_mode
 481         then
 482                 merge_tool_path=$(git config difftool."$merge_tool".path ||
 483                                   git config mergetool."$merge_tool".path)
 484         else
 485                 merge_tool_path=$(git config mergetool."$merge_tool".path)
 486         fi
 487         if test -z "$merge_tool_path"
 488         then
 489                 merge_tool_path=$(translate_merge_tool_path "$merge_tool")
 490         fi
 491         if test -z "$(get_merge_tool_cmd "$merge_tool")" &&
 492                 ! type "$merge_tool_path" >/dev/null 2>&1
 493         then
 494                 echo >&2 "The $TOOL_MODE tool $merge_tool is not available as"\
 495                          "'$merge_tool_path'"
 496                 exit 1
 497         fi
 498         echo "$merge_tool_path"
 499 }
 500
 501 get_merge_tool () {
 502         is_guessed=false
 503         # Check if a merge tool has been configured
 504         merge_tool=$(get_configured_merge_tool)
 505         subshell_exit_status=$?
 506         if test $subshell_exit_status -gt "1"
 507         then
 508                 exit $subshell_exit_status
 509         fi
 510         # Try to guess an appropriate merge tool if no tool has been set.
 511         if test -z "$merge_tool"
 512         then
 513                 merge_tool=$(guess_merge_tool) || exit
 514                 is_guessed=true
 515         fi
 516         echo "$merge_tool"
 517         test "$is_guessed" = false
 518 }
 519
 520 mergetool_find_win32_cmd () {
 521         executable=$1
 522         sub_directory=$2
 523
 524         # Use $executable if it exists in $PATH
 525         if type -p "$executable" >/dev/null 2>&1
 526         then
 527                 printf '%s' "$executable"
 528                 return
 529         fi
 530
 531         # Look for executable in the typical locations
 532         for directory in $(env | grep -Ei '^PROGRAM(FILES(\(X86\))?|W6432)=' |
 533                 cut -d '=' -f 2- | sort -u)
 534         do
 535                 if test -n "$directory" && test -x "$directory/$sub_directory/$executable"
 536                 then
 537                         printf '%s' "$directory/$sub_directory/$executable"
 538                         return
 539                 fi
 540         done
 541
 542         printf '%s' "$executable"
 543 }