[thirdparty/git.git] / mergetools / vimdiff

# This script can be run in two different contexts:
#
#   - From git, when the user invokes the "vimdiff" merge tool. In this context
#     this script expects the following environment variables (among others) to
#     be defined (which is something "git" takes care of):
#
#       - $BASE
#       - $LOCAL
#       - $REMOTE
#       - $MERGED
#
#     In this mode, all this script does is to run the next command:
#
#         vim -f -c ... $LOCAL $BASE $REMOTE $MERGED
#
#     ...where the "..." string depends on the value of the
#     "mergetool.vimdiff.layout" configuration variable and is used to open vim
#     with a certain layout of buffers, windows and tabs.
#
#   - From a script inside the unit tests framework folder ("t" folder) by
#     sourcing this script and then manually calling "run_unit_tests", which
#     will run a battery of unit tests to make sure nothing breaks.
#     In this context this script does not expect any particular environment
#     variable to be set.


################################################################################
## Internal functions (not meant to be used outside this script)
################################################################################

debug_print () {
	# Send message to stderr if global variable GIT_MERGETOOL_VIMDIFF_DEBUG
	# is set.

	if test -n "$GIT_MERGETOOL_VIMDIFF_DEBUG"
	then
		>&2 echo "$@"
	fi
}

substring () {
	# Return a substring of $1 containing $3 characters starting at
	# zero-based offset $2.
	#
	# Examples:
	#
	#   substring "Hello world" 0 4  --> "Hell"
	#   substring "Hello world" 3 4  --> "lo w"
	#   substring "Hello world" 3 10 --> "lo world"

	STRING=$1
	START=$2
	LEN=$3

	echo "$STRING" | cut -c$(( START + 1 ))-$(( START + $LEN ))
}

gen_cmd_aux () {
	# Auxiliary function used from "gen_cmd()".
	# Read that other function documentation for more details.

	LAYOUT=$1
	CMD=$2  # This is a second (hidden) argument used for recursion

	debug_print
	debug_print "LAYOUT    : $LAYOUT"
	debug_print "CMD       : $CMD"

	start=0
	end=${#LAYOUT}

	nested=0
	nested_min=100


	# Step 1:
	#
	# Increase/decrease "start"/"end" indices respectively to get rid of
	# outer parenthesis.
	#
	# Example:
	#
	#   - BEFORE: (( LOCAL , BASE ) / MERGED )
	#   - AFTER :  ( LOCAL , BASE ) / MERGED

	oldIFS=$IFS
	IFS=#
	for c in $(echo "$LAYOUT" | sed 's:.:&#:g')
	do
		if test "$c" = " "
		then
			continue
		fi

		if test "$c" = "("
		then
			nested=$(( nested + 1 ))
			continue
		fi

		if test "$c" = ")"
		then
			nested=$(( nested - 1 ))
			continue
		fi

		if test "$nested" -lt "$nested_min"
		then
			nested_min=$nested
		fi
	done
	IFS=$oldIFS

	debug_print "NESTED MIN: $nested_min"

	while test "$nested_min" -gt "0"
	do
		start=$(( start + 1 ))
		end=$(( end - 1 ))

		start_minus_one=$(( start - 1 ))

		while ! test "$(substring "$LAYOUT" "$start_minus_one" 1)" = "("
		do
			start=$(( start + 1 ))
			start_minus_one=$(( start_minus_one + 1 ))
		done

		while ! test "$(substring "$LAYOUT" "$end" 1)" = ")"
		do
			end=$(( end - 1 ))
		done

		nested_min=$(( nested_min - 1 ))
	done

	debug_print "CLEAN     : $(substring "$LAYOUT" "$start" "$(( end - start ))")"


	# Step 2:
	#
	# Search for all valid separators ("/" or ",") which are *not*
	# inside parenthesis. Save the index at which each of them makes the
	# first appearance.

	index_horizontal_split=""
	index_vertical_split=""

	nested=0
	i=$(( start - 1 ))

	oldIFS=$IFS
	IFS=#
	for c in $(substring "$LAYOUT" "$start" "$(( end - start ))" | sed 's:.:&#:g');
	do
		i=$(( i + 1 ))

		if test "$c" = " "
		then
			continue
		fi

		if test "$c" = "("
		then
			nested=$(( nested + 1 ))
			continue
		fi

		if test "$c" = ")"
		then
			nested=$(( nested - 1 ))
			continue
		fi

		if test "$nested" = 0
		then
			current=$c

			if test "$current" = "/"
			then
				if test -z "$index_horizontal_split"
				then
					index_horizontal_split=$i
				fi

			elif test "$current" = ","
			then
				if test -z "$index_vertical_split"
				then
					index_vertical_split=$i
				fi
			fi
		fi
	done
	IFS=$oldIFS


	# Step 3:
	#
	# Process the separator with the highest order of precedence
	# (";" has the highest precedence and "|" the lowest one).
	#
	# By "process" I mean recursively call this function twice: the first
	# one with the substring at the left of the separator and the second one
	# with the one at its right.

	terminate="false"

	if ! test -z "$index_horizontal_split"
	then
		before="leftabove split"
		after="wincmd j"
		index=$index_horizontal_split
		terminate="true"

	elif ! test -z "$index_vertical_split"
	then
		before="leftabove vertical split"
		after="wincmd l"
		index=$index_vertical_split
		terminate="true"
	fi

	if  test "$terminate" = "true"
	then
		CMD="$CMD | $before"
		CMD=$(gen_cmd_aux "$(substring "$LAYOUT" "$start" "$(( index - start ))")" "$CMD")
		CMD="$CMD | $after"
		CMD=$(gen_cmd_aux "$(substring "$LAYOUT" "$(( index + 1 ))" "$(( ${#LAYOUT} - index ))")" "$CMD")
		echo "$CMD"
		return
	fi


	# Step 4:
	#
	# If we reach this point, it means there are no separators and we just
	# need to print the command to display the specified buffer

	target=$(substring "$LAYOUT" "$start" "$(( end - start ))" | sed 's:[ @();|-]::g')

	if test "$target" = "LOCAL"
	then
		CMD="$CMD | 1b"

	elif test "$target" = "BASE"
	then
		CMD="$CMD | 2b"

	elif test "$target" = "REMOTE"
	then
		CMD="$CMD | 3b"

	elif test "$target" = "MERGED"
	then
		CMD="$CMD | 4b"

	else
		CMD="$CMD | ERROR: >$target<"
	fi

	echo "$CMD"
	return
}


gen_cmd () {
	# This function returns (in global variable FINAL_CMD) the string that
	# you can use when invoking "vim" (as shown next) to obtain a given
	# layout:
	#
	#   $ vim -f $FINAL_CMD "$LOCAL" "$BASE" "$REMOTE" "$MERGED"
	#
	# It takes one single argument: a string containing the desired layout
	# definition.
	#
	# The syntax of the "layout definitions" is explained in "Documentation/
	# mergetools/vimdiff.txt" but you can already intuitively understand how
	# it works by knowing that...
	#
	#   * "+" means "a new vim tab"
	#   * "/" means "a new vim horizontal split"
	#   * "," means "a new vim vertical split"
	#
	# It also returns (in global variable FINAL_TARGET) the name ("LOCAL",
	# "BASE", "REMOTE" or "MERGED") of the file that is marked with an "@",
	# or "MERGED" if none of them is.
	#
	# Example:
	#
	#     gen_cmd "@LOCAL , REMOTE"
	#     |
	#     `-> FINAL_CMD    == "-c \"echo | leftabove vertical split | 1b | wincmd l | 3b | tabdo windo diffthis\" -c \"tabfirst\""
	#         FINAL_TARGET == "LOCAL"

	LAYOUT=$1


	# Search for a "@" in one of the files identifiers ("LOCAL", "BASE",
	# "REMOTE", "MERGED"). If not found, use "MERGE" as the default file
	# where changes will be saved.

	if echo "$LAYOUT" | grep @LOCAL >/dev/null
	then
		FINAL_TARGET="LOCAL"
	elif echo "$LAYOUT" | grep @BASE >/dev/null
	then
		FINAL_TARGET="BASE"
	else
		FINAL_TARGET="MERGED"
	fi


	# Obtain the first part of vim "-c" option to obtain the desired layout

	CMD=
	oldIFS=$IFS
	IFS=+
	for tab in $LAYOUT
	do
		if test -z "$CMD"
		then
			CMD="echo" # vim "nop" operator
		else
			CMD="$CMD | tabnew"
		fi

		# If this is a single window diff with all the buffers
		if ! echo "$tab" | grep ",\|/" >/dev/null
		then
			CMD="$CMD | silent execute 'bufdo diffthis'"
		fi

		CMD=$(gen_cmd_aux "$tab" "$CMD")
	done
	IFS=$oldIFS

	CMD="$CMD | execute 'tabdo windo diffthis'"

	FINAL_CMD="-c \"set hidden diffopt-=hiddenoff | $CMD | tabfirst\""
}


################################################################################
## API functions (called from "git-mergetool--lib.sh")
################################################################################

diff_cmd () {
	"$merge_tool_path" -R -f -d \
		-c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
}


diff_cmd_help () {
	TOOL=$1

	case "$TOOL" in
	nvimdiff*)
		printf "Use Neovim"
		;;
	gvimdiff*)
		printf "Use gVim (requires a graphical session)"
		;;
	vimdiff*)
		printf "Use Vim"
		;;
	esac

	return 0
}


merge_cmd () {
	TOOL=$1

	layout=$(git config "mergetool.$TOOL.layout")

	# backward compatibility:
	if test -z "$layout"
	then
		layout=$(git config mergetool.vimdiff.layout)
	fi

	case "$TOOL" in
	*vimdiff)
		if test -z "$layout"
		then
			# Default layout when none is specified
			layout="(LOCAL,BASE,REMOTE)/MERGED"
		fi
		;;
	*vimdiff1)
		layout="@LOCAL,REMOTE"
		;;
	*vimdiff2)
		layout="LOCAL,MERGED,REMOTE"
		;;
	*vimdiff3)
		layout="MERGED"
		;;
	esac

	gen_cmd "$layout"

	debug_print ""
	debug_print "FINAL CMD : $FINAL_CMD"
	debug_print "FINAL TAR : $FINAL_TARGET"

	if $base_present
	then
		eval '"$merge_tool_path"' \
			-f "$FINAL_CMD" '"$LOCAL"' '"$BASE"' '"$REMOTE"' '"$MERGED"'
	else
		# If there is no BASE (example: a merge conflict in a new file
		# with the same name created in both braches which didn't exist
		# before), close all BASE windows using vim's "quit" command

		FINAL_CMD=$(echo "$FINAL_CMD" | \
			sed -e 's:2b:quit:g' -e 's:3b:2b:g' -e 's:4b:3b:g')

		eval '"$merge_tool_path"' \
			-f "$FINAL_CMD" '"$LOCAL"' '"$REMOTE"' '"$MERGED"'
	fi

	ret="$?"

	if test "$ret" -eq 0
	then
		case "$FINAL_TARGET" in
		LOCAL)
			source_path="$LOCAL"
			;;
		REMOTE)
			source_path="$REMOTE"
			;;
		MERGED|*)
			# Do nothing
			source_path=
			;;
		esac

		if test -n "$source_path"
		then
			cp "$source_path" "$MERGED"
		fi
	fi

	return "$ret"
}


merge_cmd_help () {
	TOOL=$1

	case "$TOOL" in
	nvimdiff*)
		printf "Use Neovim "
		;;
	gvimdiff*)
		printf "Use gVim (requires a graphical session) "
		;;
	vimdiff*)
		printf "Use Vim "
		;;
	esac

	case "$TOOL" in
	*1)
		echo "with a 2 panes layout (LOCAL and REMOTE)"
		;;
	*2)
		echo "with a 3 panes layout (LOCAL, MERGED and REMOTE)"
		;;
	*3)
		echo "where only the MERGED file is shown"
		;;
	*)
		echo "with a custom layout (see \`git help mergetool\`'s \`BACKEND SPECIFIC HINTS\` section)"
		;;
	esac

	return 0
}


translate_merge_tool_path () {
	case "$1" in
	nvimdiff*)
		echo nvim
		;;
	gvimdiff*)
		echo gvim
		;;
	vimdiff*)
		echo vim
		;;
	esac
}


exit_code_trustable () {
	true
}


list_tool_variants () {
	if test "$TOOL_MODE" = "diff"
	then
		for prefix in '' g n
		do
			echo "${prefix}vimdiff"
		done
	else
		for prefix in '' g n
		do
			for suffix in '' 1 2 3
			do
				echo "${prefix}vimdiff${suffix}"
			done
		done
	fi
}


################################################################################
## Unit tests (called from scripts inside the "t" folder)
################################################################################

run_unit_tests () {
	# Function to make sure that we don't break anything when modifying this
	# script.

	NUMBER_OF_TEST_CASES=16

	TEST_CASE_01="(LOCAL,BASE,REMOTE)/MERGED"   # default behaviour
	TEST_CASE_02="@LOCAL,REMOTE"                # when using vimdiff1
	TEST_CASE_03="LOCAL,MERGED,REMOTE"          # when using vimdiff2
	TEST_CASE_04="MERGED"                       # when using vimdiff3
	TEST_CASE_05="LOCAL/MERGED/REMOTE"
	TEST_CASE_06="(LOCAL/REMOTE),MERGED"
	TEST_CASE_07="MERGED,(LOCAL/REMOTE)"
	TEST_CASE_08="(LOCAL,REMOTE)/MERGED"
	TEST_CASE_09="MERGED/(LOCAL,REMOTE)"
	TEST_CASE_10="(LOCAL/BASE/REMOTE),MERGED"
	TEST_CASE_11="(LOCAL,BASE,REMOTE)/MERGED+BASE,LOCAL+BASE,REMOTE+(LOCAL/BASE/REMOTE),MERGED"
	TEST_CASE_12="((LOCAL,REMOTE)/BASE),MERGED"
	TEST_CASE_13="((LOCAL,REMOTE)/BASE),((LOCAL/REMOTE),MERGED)"
	TEST_CASE_14="BASE,REMOTE+BASE,LOCAL"
	TEST_CASE_15="  ((  (LOCAL , BASE , REMOTE) / MERGED))   +(BASE)   , LOCAL+ BASE , REMOTE+ (((LOCAL / BASE / REMOTE)) ,    MERGED   )  "
	TEST_CASE_16="LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE + (LOCAL / BASE / REMOTE),MERGED"

	EXPECTED_CMD_01="-c \"set hidden diffopt-=hiddenoff | echo | leftabove split | leftabove vertical split | 1b | wincmd l | leftabove vertical split | 2b | wincmd l | 3b | wincmd j | 4b | execute 'tabdo windo diffthis' | tabfirst\""
	EXPECTED_CMD_02="-c \"set hidden diffopt-=hiddenoff | echo | leftabove vertical split | 1b | wincmd l | 3b | execute 'tabdo windo diffthis' | tabfirst\""
	EXPECTED_CMD_03="-c \"set hidden diffopt-=hiddenoff | echo | leftabove vertical split | 1b | wincmd l | leftabove vertical split | 4b | wincmd l | 3b | execute 'tabdo windo diffthis' | tabfirst\""
	EXPECTED_CMD_04="-c \"set hidden diffopt-=hiddenoff | echo | silent execute 'bufdo diffthis' | 4b | execute 'tabdo windo diffthis' | tabfirst\""
	EXPECTED_CMD_05="-c \"set hidden diffopt-=hiddenoff | echo | leftabove split | 1b | wincmd j | leftabove split | 4b | wincmd j | 3b | execute 'tabdo windo diffthis' | tabfirst\""
	EXPECTED_CMD_06="-c \"set hidden diffopt-=hiddenoff | echo | leftabove vertical split | leftabove split | 1b | wincmd j | 3b | wincmd l | 4b | execute 'tabdo windo diffthis' | tabfirst\""
	EXPECTED_CMD_07="-c \"set hidden diffopt-=hiddenoff | echo | leftabove vertical split | 4b | wincmd l | leftabove split | 1b | wincmd j | 3b | execute 'tabdo windo diffthis' | tabfirst\""
	EXPECTED_CMD_08="-c \"set hidden diffopt-=hiddenoff | echo | leftabove split | leftabove vertical split | 1b | wincmd l | 3b | wincmd j | 4b | execute 'tabdo windo diffthis' | tabfirst\""
	EXPECTED_CMD_09="-c \"set hidden diffopt-=hiddenoff | echo | leftabove split | 4b | wincmd j | leftabove vertical split | 1b | wincmd l | 3b | execute 'tabdo windo diffthis' | tabfirst\""
	EXPECTED_CMD_10="-c \"set hidden diffopt-=hiddenoff | echo | leftabove vertical split | leftabove split | 1b | wincmd j | leftabove split | 2b | wincmd j | 3b | wincmd l | 4b | execute 'tabdo windo diffthis' | tabfirst\""
	EXPECTED_CMD_11="-c \"set hidden diffopt-=hiddenoff | echo | leftabove split | leftabove vertical split | 1b | wincmd l | leftabove vertical split | 2b | wincmd l | 3b | wincmd j | 4b | tabnew | leftabove vertical split | 2b | wincmd l | 1b | tabnew | leftabove vertical split | 2b | wincmd l | 3b | tabnew | leftabove vertical split | leftabove split | 1b | wincmd j | leftabove split | 2b | wincmd j | 3b | wincmd l | 4b | execute 'tabdo windo diffthis' | tabfirst\""
	EXPECTED_CMD_12="-c \"set hidden diffopt-=hiddenoff | echo | leftabove vertical split | leftabove split | leftabove vertical split | 1b | wincmd l | 3b | wincmd j | 2b | wincmd l | 4b | execute 'tabdo windo diffthis' | tabfirst\""
	EXPECTED_CMD_13="-c \"set hidden diffopt-=hiddenoff | echo | leftabove vertical split | leftabove split | leftabove vertical split | 1b | wincmd l | 3b | wincmd j | 2b | wincmd l | leftabove vertical split | leftabove split | 1b | wincmd j | 3b | wincmd l | 4b | execute 'tabdo windo diffthis' | tabfirst\""
	EXPECTED_CMD_14="-c \"set hidden diffopt-=hiddenoff | echo | leftabove vertical split | 2b | wincmd l | 3b | tabnew | leftabove vertical split | 2b | wincmd l | 1b | execute 'tabdo windo diffthis' | tabfirst\""
	EXPECTED_CMD_15="-c \"set hidden diffopt-=hiddenoff | echo | leftabove split | leftabove vertical split | 1b | wincmd l | leftabove vertical split | 2b | wincmd l | 3b | wincmd j | 4b | tabnew | leftabove vertical split | 2b | wincmd l | 1b | tabnew | leftabove vertical split | 2b | wincmd l | 3b | tabnew | leftabove vertical split | leftabove split | 1b | wincmd j | leftabove split | 2b | wincmd j | 3b | wincmd l | 4b | execute 'tabdo windo diffthis' | tabfirst\""
	EXPECTED_CMD_16="-c \"set hidden diffopt-=hiddenoff | echo | leftabove split | leftabove vertical split | 1b | wincmd l | leftabove vertical split | 2b | wincmd l | 3b | wincmd j | 4b | tabnew | leftabove vertical split | 2b | wincmd l | 1b | tabnew | leftabove vertical split | 2b | wincmd l | 3b | tabnew | leftabove vertical split | leftabove split | 1b | wincmd j | leftabove split | 2b | wincmd j | 3b | wincmd l | 4b | execute 'tabdo windo diffthis' | tabfirst\""

	EXPECTED_TARGET_01="MERGED"
	EXPECTED_TARGET_02="LOCAL"
	EXPECTED_TARGET_03="MERGED"
	EXPECTED_TARGET_04="MERGED"
	EXPECTED_TARGET_05="MERGED"
	EXPECTED_TARGET_06="MERGED"
	EXPECTED_TARGET_07="MERGED"
	EXPECTED_TARGET_08="MERGED"
	EXPECTED_TARGET_09="MERGED"
	EXPECTED_TARGET_10="MERGED"
	EXPECTED_TARGET_11="MERGED"
	EXPECTED_TARGET_12="MERGED"
	EXPECTED_TARGET_13="MERGED"
	EXPECTED_TARGET_14="MERGED"
	EXPECTED_TARGET_15="MERGED"
	EXPECTED_TARGET_16="MERGED"

	at_least_one_ko="false"

	for i in $(seq -w 1 99)
	do
		if test "$i" -gt $NUMBER_OF_TEST_CASES
		then
			break
		fi

		gen_cmd "$(eval echo \${TEST_CASE_"$i"})"

		if test "$FINAL_CMD" = "$(eval echo \${EXPECTED_CMD_"$i"})" \
			&& test "$FINAL_TARGET" = "$(eval echo \${EXPECTED_TARGET_"$i"})"
		then
			printf "Test Case #%02d: OK\n" "$(echo "$i" | sed 's/^0*//')"
		else
			printf "Test Case #%02d: KO !!!!\n" "$(echo "$i" | sed 's/^0*//')"
			echo "  FINAL_CMD              : $FINAL_CMD"
			echo "  FINAL_CMD (expected)   : $(eval echo \${EXPECTED_CMD_"$i"})"
			echo "  FINAL_TARGET           : $FINAL_TARGET"
			echo "  FINAL_TARGET (expected): $(eval echo \${EXPECTED_TARGET_"$i"})"
			at_least_one_ko="true"
		fi
	done

	# verify that `merge_cmd` handles paths with spaces
	record_parameters () {
		>actual
		for arg
		do
			echo "$arg" >>actual
		done
	}

	base_present=false
	LOCAL='lo cal'
	BASE='ba se'
	REMOTE="' '"
	MERGED='mer ged'
	merge_tool_path=record_parameters

	merge_cmd vimdiff || at_least_one_ko=true

	cat >expect <<-\EOF
	-f
	-c
	set hidden diffopt-=hiddenoff | echo | leftabove split | leftabove vertical split | 1b | wincmd l | leftabove vertical split | quit | wincmd l | 2b | wincmd j | 3b | execute 'tabdo windo diffthis' | tabfirst
	lo cal
	' '
	mer ged
	EOF

	diff -u expect actual || at_least_one_ko=true

	if test "$at_least_one_ko" = "true"
	then
		return 255
	else
		return 0
	fi
}
Commit	Line	Data
00417974 FR	1	# This script can be run in two different contexts:
	2	#
	3	# - From git, when the user invokes the "vimdiff" merge tool. In this context
	4	# this script expects the following environment variables (among others) to
	5	# be defined (which is something "git" takes care of):
	6	#
	7	# - $BASE
	8	# - $LOCAL
	9	# - $REMOTE
	10	# - $MERGED
	11	#
	12	# In this mode, all this script does is to run the next command:
	13	#
	14	# vim -f -c ... $LOCAL $BASE $REMOTE $MERGED
	15	#
	16	# ...where the "..." string depends on the value of the
	17	# "mergetool.vimdiff.layout" configuration variable and is used to open vim
	18	# with a certain layout of buffers, windows and tabs.
	19	#
	20	# - From a script inside the unit tests framework folder ("t" folder) by
	21	# sourcing this script and then manually calling "run_unit_tests", which
	22	# will run a battery of unit tests to make sure nothing breaks.
	23	# In this context this script does not expect any particular environment
	24	# variable to be set.
	25
	26
	27	################################################################################
	28	## Internal functions (not meant to be used outside this script)
	29	################################################################################
	30
	31	debug_print () {
d6191837 FC	32	# Send message to stderr if global variable GIT_MERGETOOL_VIMDIFF_DEBUG
d6191837 FC	33	# is set.
00417974 FR	34
	35	if test -n "$GIT_MERGETOOL_VIMDIFF_DEBUG"
	36	then
	37	>&2 echo "$@"
	38	fi
	39	}
	40
	41	substring () {
	42	# Return a substring of $1 containing $3 characters starting at
	43	# zero-based offset $2.
	44	#
	45	# Examples:
	46	#
	47	# substring "Hello world" 0 4 --> "Hell"
	48	# substring "Hello world" 3 4 --> "lo w"
	49	# substring "Hello world" 3 10 --> "lo world"
	50
	51	STRING=$1
	52	START=$2
	53	LEN=$3
	54
	55	echo "$STRING" \| cut -c$(( START + 1 ))-$(( START + $LEN ))
	56	}
	57
	58	gen_cmd_aux () {
	59	# Auxiliary function used from "gen_cmd()".
	60	# Read that other function documentation for more details.
	61
	62	LAYOUT=$1
	63	CMD=$2 # This is a second (hidden) argument used for recursion
	64
	65	debug_print
	66	debug_print "LAYOUT : $LAYOUT"
	67	debug_print "CMD : $CMD"
	68
00417974 FR	69	start=0
	70	end=${#LAYOUT}
	71
	72	nested=0
	73	nested_min=100
	74
	75
	76	# Step 1:
	77	#
	78	# Increase/decrease "start"/"end" indices respectively to get rid of
	79	# outer parenthesis.
	80	#
	81	# Example:
	82	#
	83	# - BEFORE: (( LOCAL , BASE ) / MERGED )
	84	# - AFTER : ( LOCAL , BASE ) / MERGED
	85
	86	oldIFS=$IFS
	87	IFS=#
	88	for c in $(echo "$LAYOUT" \| sed 's:.:&#:g')
	89	do
	90	if test "$c" = " "
	91	then
	92	continue
	93	fi
	94
	95	if test "$c" = "("
	96	then
	97	nested=$(( nested + 1 ))
	98	continue
	99	fi
	100
	101	if test "$c" = ")"
	102	then
	103	nested=$(( nested - 1 ))
	104	continue
	105	fi
	106
	107	if test "$nested" -lt "$nested_min"
	108	then
	109	nested_min=$nested
	110	fi
	111	done
	112	IFS=$oldIFS
	113
	114	debug_print "NESTED MIN: $nested_min"
	115
	116	while test "$nested_min" -gt "0"
	117	do
	118	start=$(( start + 1 ))
	119	end=$(( end - 1 ))
	120
	121	start_minus_one=$(( start - 1 ))
	122
	123	while ! test "$(substring "$LAYOUT" "$start_minus_one" 1)" = "("
	124	do
	125	start=$(( start + 1 ))
	126	start_minus_one=$(( start_minus_one + 1 ))
	127	done
	128
	129	while ! test "$(substring "$LAYOUT" "$end" 1)" = ")"
	130	do
	131	end=$(( end - 1 ))
	132	done
133
134	nested_min=$(( nested_min - 1 ))
135	done
136
137	debug_print "CLEAN : $(substring "$LAYOUT" "$start" "$(( end - start ))")"
138
139
140	# Step 2:
141	#
ffcc33f6	142	# Search for all valid separators ("/" or ",") which are not
00417974 FR	143	# inside parenthesis. Save the index at which each of them makes the
	144	# first appearance.
	145
00417974 FR	146	index_horizontal_split=""
	147	index_vertical_split=""
	148
	149	nested=0
	150	i=$(( start - 1 ))
	151
	152	oldIFS=$IFS
	153	IFS=#
	154	for c in $(substring "$LAYOUT" "$start" "$(( end - start ))" \| sed 's:.:&#:g');
	155	do
	156	i=$(( i + 1 ))
	157
	158	if test "$c" = " "
	159	then
	160	continue
	161	fi
	162
	163	if test "$c" = "("
	164	then
	165	nested=$(( nested + 1 ))
	166	continue
	167	fi
	168
	169	if test "$c" = ")"
	170	then
	171	nested=$(( nested - 1 ))
	172	continue
	173	fi
	174
	175	if test "$nested" = 0
	176	then
	177	current=$c
	178
ffcc33f6	179	if test "$current" = "/"
00417974 FR	180	then
	181	if test -z "$index_horizontal_split"
	182	then
	183	index_horizontal_split=$i
	184	fi
	185
	186	elif test "$current" = ","
	187	then
	188	if test -z "$index_vertical_split"
	189	then
	190	index_vertical_split=$i
	191	fi
	192	fi
	193	fi
	194	done
	195	IFS=$oldIFS
	196
	197
	198	# Step 3:
	199	#
	200	# Process the separator with the highest order of precedence
	201	# (";" has the highest precedence and "\|" the lowest one).
	202	#
	203	# By "process" I mean recursively call this function twice: the first
	204	# one with the substring at the left of the separator and the second one
	205	# with the one at its right.
	206
	207	terminate="false"
	208
ffcc33f6	209	if ! test -z "$index_horizontal_split"
00417974	210	then
f3d7623a	211	before="leftabove split"
00417974 FR	212	after="wincmd j"
	213	index=$index_horizontal_split
	214	terminate="true"
	215
	216	elif ! test -z "$index_vertical_split"
	217	then
f3d7623a	218	before="leftabove vertical split"
00417974 FR	219	after="wincmd l"
	220	index=$index_vertical_split
	221	terminate="true"
	222	fi
	223
	224	if test "$terminate" = "true"
	225	then
	226	CMD="$CMD \| $before"
	227	CMD=$(gen_cmd_aux "$(substring "$LAYOUT" "$start" "$(( index - start ))")" "$CMD")
	228	CMD="$CMD \| $after"
	229	CMD=$(gen_cmd_aux "$(substring "$LAYOUT" "$(( index + 1 ))" "$(( ${#LAYOUT} - index ))")" "$CMD")
	230	echo "$CMD"
	231	return
	232	fi
	233
	234
	235	# Step 4:
	236	#
	237	# If we reach this point, it means there are no separators and we just
	238	# need to print the command to display the specified buffer
	239
	240	target=$(substring "$LAYOUT" "$start" "$(( end - start ))" \| sed 's:[ @();\|-]::g')
	241
	242	if test "$target" = "LOCAL"
	243	then
	244	CMD="$CMD \| 1b"
	245
	246	elif test "$target" = "BASE"
	247	then
	248	CMD="$CMD \| 2b"
	249
	250	elif test "$target" = "REMOTE"
	251	then
	252	CMD="$CMD \| 3b"
	253
	254	elif test "$target" = "MERGED"
	255	then
	256	CMD="$CMD \| 4b"
	257
	258	else
	259	CMD="$CMD \| ERROR: >$target<"
	260	fi
	261
	262	echo "$CMD"
	263	return
	264	}
	265
	266
	267	gen_cmd () {
	268	# This function returns (in global variable FINAL_CMD) the string that
	269	# you can use when invoking "vim" (as shown next) to obtain a given
	270	# layout:
	271	#
	272	# $ vim -f $FINAL_CMD "$LOCAL" "$BASE" "$REMOTE" "$MERGED"
	273	#
	274	# It takes one single argument: a string containing the desired layout
	275	# definition.
	276	#
	277	# The syntax of the "layout definitions" is explained in "Documentation/
	278	# mergetools/vimdiff.txt" but you can already intuitively understand how
	279	# it works by knowing that...
	280	#
	281	# * "+" means "a new vim tab"
	282	# * "/" means "a new vim horizontal split"
283	# * "," means "a new vim vertical split"
284	#
285	# It also returns (in global variable FINAL_TARGET) the name ("LOCAL",
286	# "BASE", "REMOTE" or "MERGED") of the file that is marked with an "@",
287	# or "MERGED" if none of them is.
288	#
289	# Example:
290	#
291	# gen_cmd "@LOCAL , REMOTE"
292	# \|
f3d7623a	293	# `-> FINAL_CMD == "-c \"echo \| leftabove vertical split \| 1b \| wincmd l \| 3b \| tabdo windo diffthis\" -c \"tabfirst\""
00417974 FR	294	# FINAL_TARGET == "LOCAL"
	295
	296	LAYOUT=$1
	297
	298
	299	# Search for a "@" in one of the files identifiers ("LOCAL", "BASE",
	300	# "REMOTE", "MERGED"). If not found, use "MERGE" as the default file
	301	# where changes will be saved.
	302
	303	if echo "$LAYOUT" \| grep @LOCAL >/dev/null
	304	then
	305	FINAL_TARGET="LOCAL"
	306	elif echo "$LAYOUT" \| grep @BASE >/dev/null
	307	then
	308	FINAL_TARGET="BASE"
	309	else
	310	FINAL_TARGET="MERGED"
	311	fi
	312
	313
	314	# Obtain the first part of vim "-c" option to obtain the desired layout
	315
ffcc33f6 FC	316	CMD=
	317	oldIFS=$IFS
	318	IFS=+
	319	for tab in $LAYOUT
	320	do
	321	if test -z "$CMD"
	322	then
	323	CMD="echo" # vim "nop" operator
	324	else
	325	CMD="$CMD \| tabnew"
	326	fi
	327
b6014eea FC	328	# If this is a single window diff with all the buffers
	329	if ! echo "$tab" \| grep ",\\|/" >/dev/null
	330	then
	331	CMD="$CMD \| silent execute 'bufdo diffthis'"
	332	fi
	333
ffcc33f6 FC	334	CMD=$(gen_cmd_aux "$tab" "$CMD")
	335	done
	336	IFS=$oldIFS
00417974	337
34133d96	338	CMD="$CMD \| execute 'tabdo windo diffthis'"
00417974	339
34133d96	340	FINAL_CMD="-c \"set hidden diffopt-=hiddenoff \| $CMD \| tabfirst\""
00417974 FR	341	}
	342
	343
	344	################################################################################
	345	## API functions (called from "git-mergetool--lib.sh")
	346	################################################################################
	347
bc7a96a8	348	diff_cmd () {
b2a6b712 DA	349	"$merge_tool_path" -R -f -d \
b2a6b712 DA	350	-c 'wincmd l' -c 'cd $GIT_PREFIX' "$LOCAL" "$REMOTE"
bc7a96a8 DA	351	}
bc7a96a8 DA	352
00417974	353
7b5cf8be FR	354	diff_cmd_help () {
	355	TOOL=$1
	356
	357	case "$TOOL" in
	358	nvimdiff*)
	359	printf "Use Neovim"
	360	;;
	361	gvimdiff*)
	362	printf "Use gVim (requires a graphical session)"
	363	;;
	364	vimdiff*)
	365	printf "Use Vim"
	366	;;
	367	esac
	368
	369	return 0
	370	}
	371
	372
bc7a96a8	373	merge_cmd () {
b21d1642 KM	374	TOOL=$1
	375
	376	layout=$(git config "mergetool.$TOOL.layout")
	377
	378	# backward compatibility:
	379	if test -z "$layout"
	380	then
	381	layout=$(git config mergetool.vimdiff.layout)
	382	fi
00417974	383
b21d1642	384	case "$TOOL" in
11868978	385	*vimdiff)
00417974	386	if test -z "$layout"
bc7a96a8	387	then
00417974 FR	388	# Default layout when none is specified
00417974 FR	389	layout="(LOCAL,BASE,REMOTE)/MERGED"
bc7a96a8 DA	390	fi
bc7a96a8 DA	391	;;
30bb8088	392	*vimdiff1)
00417974	393	layout="@LOCAL,REMOTE"
30bb8088	394	;;
11868978	395	*vimdiff2)
00417974	396	layout="LOCAL,MERGED,REMOTE"
bc7a96a8	397	;;
11868978	398	*vimdiff3)
00417974	399	layout="MERGED"
7c147b77	400	;;
bc7a96a8	401	esac
00417974 FR	402
	403	gen_cmd "$layout"
	404
	405	debug_print ""
	406	debug_print "FINAL CMD : $FINAL_CMD"
	407	debug_print "FINAL TAR : $FINAL_TARGET"
	408
	409	if $base_present
	410	then
ccc7b514 JS	411	eval '"$merge_tool_path"' \
ccc7b514 JS	412	-f "$FINAL_CMD" '"$LOCAL"' '"$BASE"' '"$REMOTE"' '"$MERGED"'
00417974 FR	413	else
	414	# If there is no BASE (example: a merge conflict in a new file
	415	# with the same name created in both braches which didn't exist
	416	# before), close all BASE windows using vim's "quit" command
	417
	418	FINAL_CMD=$(echo "$FINAL_CMD" \| \
	419	sed -e 's:2b:quit:g' -e 's:3b:2b:g' -e 's:4b:3b:g')
	420
ccc7b514 JS	421	eval '"$merge_tool_path"' \
ccc7b514 JS	422	-f "$FINAL_CMD" '"$LOCAL"' '"$REMOTE"' '"$MERGED"'
00417974 FR	423	fi
	424
	425	ret="$?"
	426
	427	if test "$ret" -eq 0
	428	then
	429	case "$FINAL_TARGET" in
	430	LOCAL)
	431	source_path="$LOCAL"
	432	;;
	433	REMOTE)
	434	source_path="$REMOTE"
	435	;;
	436	MERGED\|*)
	437	# Do nothing
	438	source_path=
	439	;;
	440	esac
	441
	442	if test -n "$source_path"
	443	then
	444	cp "$source_path" "$MERGED"
	445	fi
	446	fi
	447
	448	return "$ret"
bc7a96a8 DA	449	}
bc7a96a8 DA	450
00417974	451
7b5cf8be FR	452	merge_cmd_help () {
	453	TOOL=$1
	454
	455	case "$TOOL" in
	456	nvimdiff*)
	457	printf "Use Neovim "
	458	;;
	459	gvimdiff*)
	460	printf "Use gVim (requires a graphical session) "
	461	;;
	462	vimdiff*)
	463	printf "Use Vim "
	464	;;
	465	esac
	466
	467	case "$TOOL" in
	468	*1)
	469	echo "with a 2 panes layout (LOCAL and REMOTE)"
	470	;;
	471	*2)
	472	echo "with a 3 panes layout (LOCAL, MERGED and REMOTE)"
	473	;;
	474	*3)
	475	echo "where only the MERGED file is shown"
	476	;;
	477	*)
	478	echo "with a custom layout (see \`git help mergetool\`'s \`BACKEND SPECIFIC HINTS\` section)"
	479	;;
	480	esac
	481
	482	return 0
	483	}
	484
	485
00417974	486	translate_merge_tool_path () {
bc7a96a8	487	case "$1" in
11868978	488	nvimdiff*)
	489	echo nvim
	490	;;
	491	gvimdiff*)
bc7a96a8 DA	492	echo gvim
bc7a96a8 DA	493	;;
11868978	494	vimdiff*)
bc7a96a8 DA	495	echo vim
	496	;;
	497	esac
	498	}
29672844	499
00417974	500
29672844 DA	501	exit_code_trustable () {
	502	true
	503	}
83bbf9b9	504
00417974	505
83bbf9b9	506	list_tool_variants () {
00417974 FR	507	if test "$TOOL_MODE" = "diff"
	508	then
	509	for prefix in '' g n
	510	do
	511	echo "${prefix}vimdiff"
83bbf9b9	512	done
00417974 FR	513	else
	514	for prefix in '' g n
	515	do
	516	for suffix in '' 1 2 3
	517	do
	518	echo "${prefix}vimdiff${suffix}"
	519	done
	520	done
	521	fi
	522	}
	523
	524
	525	################################################################################
	526	## Unit tests (called from scripts inside the "t" folder)
	527	################################################################################
	528
	529	run_unit_tests () {
	530	# Function to make sure that we don't break anything when modifying this
	531	# script.
	532
	533	NUMBER_OF_TEST_CASES=16
	534
	535	TEST_CASE_01="(LOCAL,BASE,REMOTE)/MERGED" # default behaviour
	536	TEST_CASE_02="@LOCAL,REMOTE" # when using vimdiff1
	537	TEST_CASE_03="LOCAL,MERGED,REMOTE" # when using vimdiff2
	538	TEST_CASE_04="MERGED" # when using vimdiff3
	539	TEST_CASE_05="LOCAL/MERGED/REMOTE"
	540	TEST_CASE_06="(LOCAL/REMOTE),MERGED"
	541	TEST_CASE_07="MERGED,(LOCAL/REMOTE)"
	542	TEST_CASE_08="(LOCAL,REMOTE)/MERGED"
	543	TEST_CASE_09="MERGED/(LOCAL,REMOTE)"
	544	TEST_CASE_10="(LOCAL/BASE/REMOTE),MERGED"
	545	TEST_CASE_11="(LOCAL,BASE,REMOTE)/MERGED+BASE,LOCAL+BASE,REMOTE+(LOCAL/BASE/REMOTE),MERGED"
	546	TEST_CASE_12="((LOCAL,REMOTE)/BASE),MERGED"
	547	TEST_CASE_13="((LOCAL,REMOTE)/BASE),((LOCAL/REMOTE),MERGED)"
	548	TEST_CASE_14="BASE,REMOTE+BASE,LOCAL"
	549	TEST_CASE_15=" (( (LOCAL , BASE , REMOTE) / MERGED)) +(BASE) , LOCAL+ BASE , REMOTE+ (((LOCAL / BASE / REMOTE)) , MERGED ) "
	550	TEST_CASE_16="LOCAL,BASE,REMOTE / MERGED + BASE,LOCAL + BASE,REMOTE + (LOCAL / BASE / REMOTE),MERGED"
	551
34133d96 FC	552	EXPECTED_CMD_01="-c \"set hidden diffopt-=hiddenoff \| echo \| leftabove split \| leftabove vertical split \| 1b \| wincmd l \| leftabove vertical split \| 2b \| wincmd l \| 3b \| wincmd j \| 4b \| execute 'tabdo windo diffthis' \| tabfirst\""
	553	EXPECTED_CMD_02="-c \"set hidden diffopt-=hiddenoff \| echo \| leftabove vertical split \| 1b \| wincmd l \| 3b \| execute 'tabdo windo diffthis' \| tabfirst\""
	554	EXPECTED_CMD_03="-c \"set hidden diffopt-=hiddenoff \| echo \| leftabove vertical split \| 1b \| wincmd l \| leftabove vertical split \| 4b \| wincmd l \| 3b \| execute 'tabdo windo diffthis' \| tabfirst\""
	555	EXPECTED_CMD_04="-c \"set hidden diffopt-=hiddenoff \| echo \| silent execute 'bufdo diffthis' \| 4b \| execute 'tabdo windo diffthis' \| tabfirst\""
	556	EXPECTED_CMD_05="-c \"set hidden diffopt-=hiddenoff \| echo \| leftabove split \| 1b \| wincmd j \| leftabove split \| 4b \| wincmd j \| 3b \| execute 'tabdo windo diffthis' \| tabfirst\""
	557	EXPECTED_CMD_06="-c \"set hidden diffopt-=hiddenoff \| echo \| leftabove vertical split \| leftabove split \| 1b \| wincmd j \| 3b \| wincmd l \| 4b \| execute 'tabdo windo diffthis' \| tabfirst\""
	558	EXPECTED_CMD_07="-c \"set hidden diffopt-=hiddenoff \| echo \| leftabove vertical split \| 4b \| wincmd l \| leftabove split \| 1b \| wincmd j \| 3b \| execute 'tabdo windo diffthis' \| tabfirst\""
	559	EXPECTED_CMD_08="-c \"set hidden diffopt-=hiddenoff \| echo \| leftabove split \| leftabove vertical split \| 1b \| wincmd l \| 3b \| wincmd j \| 4b \| execute 'tabdo windo diffthis' \| tabfirst\""
	560	EXPECTED_CMD_09="-c \"set hidden diffopt-=hiddenoff \| echo \| leftabove split \| 4b \| wincmd j \| leftabove vertical split \| 1b \| wincmd l \| 3b \| execute 'tabdo windo diffthis' \| tabfirst\""
	561	EXPECTED_CMD_10="-c \"set hidden diffopt-=hiddenoff \| echo \| leftabove vertical split \| leftabove split \| 1b \| wincmd j \| leftabove split \| 2b \| wincmd j \| 3b \| wincmd l \| 4b \| execute 'tabdo windo diffthis' \| tabfirst\""
	562	EXPECTED_CMD_11="-c \"set hidden diffopt-=hiddenoff \| echo \| leftabove split \| leftabove vertical split \| 1b \| wincmd l \| leftabove vertical split \| 2b \| wincmd l \| 3b \| wincmd j \| 4b \| tabnew \| leftabove vertical split \| 2b \| wincmd l \| 1b \| tabnew \| leftabove vertical split \| 2b \| wincmd l \| 3b \| tabnew \| leftabove vertical split \| leftabove split \| 1b \| wincmd j \| leftabove split \| 2b \| wincmd j \| 3b \| wincmd l \| 4b \| execute 'tabdo windo diffthis' \| tabfirst\""
	563	EXPECTED_CMD_12="-c \"set hidden diffopt-=hiddenoff \| echo \| leftabove vertical split \| leftabove split \| leftabove vertical split \| 1b \| wincmd l \| 3b \| wincmd j \| 2b \| wincmd l \| 4b \| execute 'tabdo windo diffthis' \| tabfirst\""
	564	EXPECTED_CMD_13="-c \"set hidden diffopt-=hiddenoff \| echo \| leftabove vertical split \| leftabove split \| leftabove vertical split \| 1b \| wincmd l \| 3b \| wincmd j \| 2b \| wincmd l \| leftabove vertical split \| leftabove split \| 1b \| wincmd j \| 3b \| wincmd l \| 4b \| execute 'tabdo windo diffthis' \| tabfirst\""
	565	EXPECTED_CMD_14="-c \"set hidden diffopt-=hiddenoff \| echo \| leftabove vertical split \| 2b \| wincmd l \| 3b \| tabnew \| leftabove vertical split \| 2b \| wincmd l \| 1b \| execute 'tabdo windo diffthis' \| tabfirst\""
	566	EXPECTED_CMD_15="-c \"set hidden diffopt-=hiddenoff \| echo \| leftabove split \| leftabove vertical split \| 1b \| wincmd l \| leftabove vertical split \| 2b \| wincmd l \| 3b \| wincmd j \| 4b \| tabnew \| leftabove vertical split \| 2b \| wincmd l \| 1b \| tabnew \| leftabove vertical split \| 2b \| wincmd l \| 3b \| tabnew \| leftabove vertical split \| leftabove split \| 1b \| wincmd j \| leftabove split \| 2b \| wincmd j \| 3b \| wincmd l \| 4b \| execute 'tabdo windo diffthis' \| tabfirst\""
	567	EXPECTED_CMD_16="-c \"set hidden diffopt-=hiddenoff \| echo \| leftabove split \| leftabove vertical split \| 1b \| wincmd l \| leftabove vertical split \| 2b \| wincmd l \| 3b \| wincmd j \| 4b \| tabnew \| leftabove vertical split \| 2b \| wincmd l \| 1b \| tabnew \| leftabove vertical split \| 2b \| wincmd l \| 3b \| tabnew \| leftabove vertical split \| leftabove split \| 1b \| wincmd j \| leftabove split \| 2b \| wincmd j \| 3b \| wincmd l \| 4b \| execute 'tabdo windo diffthis' \| tabfirst\""
00417974 FR	568
	569	EXPECTED_TARGET_01="MERGED"
	570	EXPECTED_TARGET_02="LOCAL"
	571	EXPECTED_TARGET_03="MERGED"
	572	EXPECTED_TARGET_04="MERGED"
	573	EXPECTED_TARGET_05="MERGED"
	574	EXPECTED_TARGET_06="MERGED"
	575	EXPECTED_TARGET_07="MERGED"
	576	EXPECTED_TARGET_08="MERGED"
	577	EXPECTED_TARGET_09="MERGED"
	578	EXPECTED_TARGET_10="MERGED"
	579	EXPECTED_TARGET_11="MERGED"
	580	EXPECTED_TARGET_12="MERGED"
	581	EXPECTED_TARGET_13="MERGED"
	582	EXPECTED_TARGET_14="MERGED"
	583	EXPECTED_TARGET_15="MERGED"
	584	EXPECTED_TARGET_16="MERGED"
	585
	586	at_least_one_ko="false"
	587
	588	for i in $(seq -w 1 99)
	589	do
	590	if test "$i" -gt $NUMBER_OF_TEST_CASES
	591	then
	592	break
	593	fi
	594
	595	gen_cmd "$(eval echo \${TEST_CASE_"$i"})"
	596
	597	if test "$FINAL_CMD" = "$(eval echo \${EXPECTED_CMD_"$i"})" \
	598	&& test "$FINAL_TARGET" = "$(eval echo \${EXPECTED_TARGET_"$i"})"
	599	then
	600	printf "Test Case #%02d: OK\n" "$(echo "$i" \| sed 's/^0*//')"
	601	else
	602	printf "Test Case #%02d: KO !!!!\n" "$(echo "$i" \| sed 's/^0*//')"
	603	echo " FINAL_CMD : $FINAL_CMD"
	604	echo " FINAL_CMD (expected) : $(eval echo \${EXPECTED_CMD_"$i"})"
	605	echo " FINAL_TARGET : $FINAL_TARGET"
	606	echo " FINAL_TARGET (expected): $(eval echo \${EXPECTED_TARGET_"$i"})"
	607	at_least_one_ko="true"
	608	fi
83bbf9b9	609	done
00417974	610
ccc7b514 JS	611	# verify that `merge_cmd` handles paths with spaces
	612	record_parameters () {
	613	>actual
	614	for arg
	615	do
	616	echo "$arg" >>actual
	617	done
	618	}
	619
	620	base_present=false
	621	LOCAL='lo cal'
	622	BASE='ba se'
	623	REMOTE="' '"
	624	MERGED='mer ged'
	625	merge_tool_path=record_parameters
	626
	627	merge_cmd vimdiff \|\| at_least_one_ko=true
	628
	629	cat >expect <<-\EOF
	630	-f
	631	-c
34133d96	632	set hidden diffopt-=hiddenoff \| echo \| leftabove split \| leftabove vertical split \| 1b \| wincmd l \| leftabove vertical split \| quit \| wincmd l \| 2b \| wincmd j \| 3b \| execute 'tabdo windo diffthis' \| tabfirst
ccc7b514 JS	633	lo cal
	634	' '
	635	mer ged
	636	EOF
	637
	638	diff -u expect actual \|\| at_least_one_ko=true
	639
00417974 FR	640	if test "$at_least_one_ko" = "true"
	641	then
	642	return 255
	643	else
	644	return 0
	645	fi
83bbf9b9	646	}