Gecko [ www.foryou-vip.com ]

Name	Size	Permission	Date
mergetools	[ DIR ]	drwxrwxrwx	2020-08-24 23:42
git	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-add	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-add--interactive	36.78 KB	-rwxrwxrwx	2020-04-20 04:07
git-am	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-annotate	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-apply	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-archive	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-bisect	15.61 KB	-rwxrwxrwx	2020-04-20 04:07
git-bisect--helper	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-blame	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-branch	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-bundle	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-cat-file	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-check-attr	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-check-ignore	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-check-mailmap	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-check-ref-format	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-checkout	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-checkout-index	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-cherry	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-cherry-pick	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-clean	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-clone	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-column	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-commit	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-commit-tree	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-config	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-count-objects	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-credential	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-credential-cache	1006.94 KB	-rwxrwxrwx	2020-04-20 04:07
git-credential-cache--daemon	1019 KB	-rwxrwxrwx	2020-04-20 04:07
git-credential-store	1018.97 KB	-rwxrwxrwx	2020-04-20 04:07
git-daemon	1023.19 KB	-rwxrwxrwx	2020-04-20 04:07
git-describe	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-diff	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-diff-files	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-diff-index	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-diff-tree	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-difftool	12.24 KB	-rwxrwxrwx	2020-04-20 04:07
git-difftool--helper	2.19 KB	-rwxrwxrwx	2020-04-20 04:07
git-fast-export	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-fast-import	1.02 MB	-rwxrwxrwx	2020-04-20 04:07
git-fetch	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-fetch-pack	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-filter-branch	12.53 KB	-rwxrwxrwx	2020-04-20 04:07
git-fmt-merge-msg	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-for-each-ref	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-format-patch	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-fsck	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-fsck-objects	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-gc	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-get-tar-commit-id	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-grep	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-hash-object	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-help	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-http-backend	1019.19 KB	-rwxrwxrwx	2020-04-20 04:07
git-http-fetch	1.1 MB	-rwxrwxrwx	2020-04-20 04:07
git-http-push	1.11 MB	-rwxrwxrwx	2020-04-20 04:07
git-imap-send	1.11 MB	-rwxrwxrwx	2020-04-20 04:07
git-index-pack	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-init	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-init-db	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-instaweb	18.11 KB	-rwxrwxrwx	2020-04-20 04:07
git-interpret-trailers	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-log	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-ls-files	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-ls-remote	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-ls-tree	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-mailinfo	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-mailsplit	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-merge	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-merge-base	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-merge-file	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-merge-index	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-merge-octopus	2.42 KB	-rwxrwxrwx	2020-04-20 04:07
git-merge-one-file	3.62 KB	-rwxrwxrwx	2020-04-20 04:07
git-merge-ours	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-merge-recursive	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-merge-resolve	944 B	-rwxrwxrwx	2020-04-20 04:07
git-merge-subtree	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-merge-tree	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-mergetool	9.76 KB	-rwxrwxrwx	2020-04-20 04:07
git-mergetool--lib	7.79 KB	-rwxrwxrwx	2020-04-20 04:07
git-mktag	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-mktree	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-mv	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-name-rev	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-notes	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-pack-objects	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-pack-redundant	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-pack-refs	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-parse-remote	2.59 KB	-rwxrwxrwx	2020-04-20 04:07
git-patch-id	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-prune	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-prune-packed	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-pull	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-push	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-quiltimport	3.51 KB	-rwxrwxrwx	2020-04-20 04:07
git-read-tree	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-rebase	15.75 KB	-rwxrwxrwx	2020-04-20 04:07
git-rebase--am	2.41 KB	-rwxrwxrwx	2020-04-20 04:07
git-rebase--interactive	34.47 KB	-rwxrwxrwx	2020-04-20 04:07
git-rebase--merge	3.84 KB	-rwxrwxrwx	2020-04-20 04:07
git-receive-pack	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-reflog	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-relink	4.1 KB	-rwxrwxrwx	2020-04-20 04:07
git-remote	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-remote-ext	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-remote-fd	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-remote-ftp	1.11 MB	-rwxrwxrwx	2020-04-20 04:07
git-remote-ftps	1.11 MB	-rwxrwxrwx	2020-04-20 04:07
git-remote-http	1.11 MB	-rwxrwxrwx	2020-04-20 04:07
git-remote-https	1.11 MB	-rwxrwxrwx	2020-04-20 04:07
git-remote-testsvn	1.01 MB	-rwxrwxrwx	2020-04-20 04:07
git-repack	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-replace	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-request-pull	3.77 KB	-rwxrwxrwx	2020-04-20 04:07
git-rerere	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-reset	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-rev-list	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-rev-parse	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-revert	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-rm	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-send-pack	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-sh-i18n	2.3 KB	-rwxrwxrwx	2020-04-20 04:07
git-sh-i18n--envsubst	1006.86 KB	-rwxrwxrwx	2020-04-20 04:07
git-sh-prompt	15.73 KB	-rwxrwxrwx	2020-04-20 04:07
git-sh-setup	9.03 KB	-rwxrwxrwx	2020-04-20 04:07
git-shell	1006.97 KB	-rwxrwxrwx	2020-04-20 04:07
git-shortlog	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-show	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-show-branch	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-show-index	1006.86 KB	-rwxrwxrwx	2020-04-20 04:07
git-show-ref	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-stage	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-stash	13.9 KB	-rwxrwxrwx	2020-04-20 04:07
git-status	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-stripspace	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-submodule	27.18 KB	-rwxrwxrwx	2020-04-20 04:07
git-submodule--helper	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-subtree	16.02 KB	-rwxrwxrwx	2020-04-20 04:07
git-symbolic-ref	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-tag	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-unpack-file	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-unpack-objects	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-update-index	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-update-ref	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-update-server-info	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-upload-archive	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-upload-pack	1.06 MB	-rwxrwxrwx	2020-04-20 04:07
git-var	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-verify-commit	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-verify-pack	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-verify-tag	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-web--browse	4.3 KB	-rwxrwxrwx	2020-04-20 04:07
git-whatchanged	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-worktree	1.99 MB	-rwxrwxrwx	2020-04-20 04:07
git-write-tree	1.99 MB	-rwxrwxrwx	2020-04-20 04:07

Rename

# git-mergetool--lib is a shell library for common merge tool functions

: ${MERGE_TOOLS_DIR=$(git --exec-path)/mergetools}

IFS='
'

mode_ok () {
	if diff_mode
	then
		can_diff
	elif merge_mode
	then
		can_merge
	else
		false
	fi
}

is_available () {
	merge_tool_path=$(translate_merge_tool_path "$1") &&
	type "$merge_tool_path" >/dev/null 2>&1
}

list_config_tools () {
	section=$1
	line_prefix=${2:-}

git config --get-regexp $section'\..*\.cmd' |
	while read -r key value
	do
		toolname=${key#$section.}
		toolname=${toolname%.cmd}

printf "%s%s\n" "$line_prefix" "$toolname"
	done
}

show_tool_names () {
	condition=${1:-true} per_line_prefix=${2:-} preamble=${3:-}
	not_found_msg=${4:-}
	extra_content=${5:-}

shown_any=
	( cd "$MERGE_TOOLS_DIR" && ls ) | {
		while read toolname
		do
			if setup_tool "$toolname" 2>/dev/null &&
				(eval "$condition" "$toolname")
			then
				if test -n "$preamble"
				then
					printf "%s\n" "$preamble"
					preamble=
				fi
				shown_any=yes
				printf "%s%s\n" "$per_line_prefix" "$toolname"
			fi
		done

if test -n "$extra_content"
		then
			if test -n "$preamble"
			then
				# Note: no '\n' here since we don't want a
				# blank line if there is no initial content.
				printf "%s" "$preamble"
				preamble=
			fi
			shown_any=yes
			printf "\n%s\n" "$extra_content"
		fi

if test -n "$preamble" && test -n "$not_found_msg"
		then
			printf "%s\n" "$not_found_msg"
		fi

test -n "$shown_any"
	}
}

diff_mode() {
	test "$TOOL_MODE" = diff
}

merge_mode() {
	test "$TOOL_MODE" = merge
}

translate_merge_tool_path () {
	echo "$1"
}

check_unchanged () {
	if test "$MERGED" -nt "$BACKUP"
	then
		return 0
	else
		while true
		do
			echo "$MERGED seems unchanged."
			printf "Was the merge successful [y/n]? "
			read answer || return 1
			case "$answer" in
			y*|Y*) return 0 ;;
			n*|N*) return 1 ;;
			esac
		done
	fi
}

valid_tool () {
	setup_tool "$1" && return 0
	cmd=$(get_merge_tool_cmd "$1")
	test -n "$cmd"
}

setup_user_tool () {
	merge_tool_cmd=$(get_merge_tool_cmd "$tool")
	test -n "$merge_tool_cmd" || return 1

diff_cmd () {
		( eval $merge_tool_cmd )
	}

merge_cmd () {
		trust_exit_code=$(git config --bool \
			"mergetool.$1.trustExitCode" || echo false)
		if test "$trust_exit_code" = "false"
		then
			touch "$BACKUP"
			( eval $merge_tool_cmd )
			check_unchanged
		else
			( eval $merge_tool_cmd )
		fi
	}
}

setup_tool () {
	tool="$1"

# Fallback definitions, to be overridden by tools.
	can_merge () {
		return 0
	}

can_diff () {
		return 0
	}

diff_cmd () {
		return 1
	}

merge_cmd () {
		return 1
	}

translate_merge_tool_path () {
		echo "$1"
	}

if ! test -f "$MERGE_TOOLS_DIR/$tool"
	then
		setup_user_tool
		return $?
	fi

# Load the redefined functions
	. "$MERGE_TOOLS_DIR/$tool"
	# Now let the user override the default command for the tool.  If
	# they have not done so then this will return 1 which we ignore.
	setup_user_tool

if merge_mode && ! can_merge
	then
		echo "error: '$tool' can not be used to resolve merges" >&2
		return 1
	elif diff_mode && ! can_diff
	then
		echo "error: '$tool' can only be used to resolve merges" >&2
		return 1
	fi
	return 0
}

get_merge_tool_cmd () {
	merge_tool="$1"
	if diff_mode
	then
		git config "difftool.$merge_tool.cmd" ||
		git config "mergetool.$merge_tool.cmd"
	else
		git config "mergetool.$merge_tool.cmd"
	fi
}

# Entry point for running tools
run_merge_tool () {
	# If GIT_PREFIX is empty then we cannot use it in tools
	# that expect to be able to chdir() to its value.
	GIT_PREFIX=${GIT_PREFIX:-.}
	export GIT_PREFIX

merge_tool_path=$(get_merge_tool_path "$1") || exit
	base_present="$2"

# Bring tool-specific functions into scope
	setup_tool "$1" || return 1

if merge_mode
	then
		run_merge_cmd "$1"
	else
		run_diff_cmd "$1"
	fi
}

# Run a either a configured or built-in diff tool
run_diff_cmd () {
	diff_cmd "$1"
}

# Run a either a configured or built-in merge tool
run_merge_cmd () {
	merge_cmd "$1"
}

list_merge_tool_candidates () {
	if merge_mode
	then
		tools="tortoisemerge"
	else
		tools="kompare"
	fi
	if test -n "$DISPLAY"
	then
		if test -n "$GNOME_DESKTOP_SESSION_ID"
		then
			tools="meld opendiff kdiff3 tkdiff xxdiff $tools"
		else
			tools="opendiff kdiff3 tkdiff xxdiff meld $tools"
		fi
		tools="$tools gvimdiff diffuse diffmerge ecmerge"
		tools="$tools p4merge araxis bc codecompare"
	fi
	case "${VISUAL:-$EDITOR}" in
	*vim*)
		tools="$tools vimdiff emerge"
		;;
	*)
		tools="$tools emerge vimdiff"
		;;
	esac
}

show_tool_help () {
	tool_opt="'git ${TOOL_MODE}tool --tool=<tool>'"

tab='	'
	LF='
'
	any_shown=no

cmd_name=${TOOL_MODE}tool
	config_tools=$({
		diff_mode && list_config_tools difftool "$tab$tab"
		list_config_tools mergetool "$tab$tab"
	} | sort)
	extra_content=
	if test -n "$config_tools"
	then
		extra_content="${tab}user-defined:${LF}$config_tools"
	fi

show_tool_names 'mode_ok && is_available' "$tab$tab" \
		"$tool_opt may be set to one of the following:" \
		"No suitable tool for 'git $cmd_name --tool=<tool>' found." \
		"$extra_content" &&
		any_shown=yes

show_tool_names 'mode_ok && ! is_available' "$tab$tab" \
		"${LF}The following tools are valid, but not currently available:" &&
		any_shown=yes

if test "$any_shown" = yes
	then
		echo
		echo "Some of the tools listed above only work in a windowed"
		echo "environment. If run in a terminal-only session, they will fail."
	fi
	exit 0
}

guess_merge_tool () {
	list_merge_tool_candidates
	cat >&2 <<-EOF

This message is displayed because '$TOOL_MODE.tool' is not configured.
	See 'git ${TOOL_MODE}tool --tool-help' or 'git help config' for more details.
	'git ${TOOL_MODE}tool' will now attempt to use one of the following tools:
	$tools
	EOF

# Loop over each candidate and stop when a valid merge tool is found.
	IFS=' '
	for tool in $tools
	do
		is_available "$tool" && echo "$tool" && return 0
	done

echo >&2 "No known ${TOOL_MODE} tool is available."
	return 1
}

get_configured_merge_tool () {
	# Diff mode first tries diff.tool and falls back to merge.tool.
	# Merge mode only checks merge.tool
	if diff_mode
	then
		merge_tool=$(git config diff.tool || git config merge.tool)
	else
		merge_tool=$(git config merge.tool)
	fi
	if test -n "$merge_tool" && ! valid_tool "$merge_tool"
	then
		echo >&2 "git config option $TOOL_MODE.tool set to unknown tool: $merge_tool"
		echo >&2 "Resetting to default..."
		return 1
	fi
	echo "$merge_tool"
}

get_merge_tool_path () {
	# A merge tool has been set, so verify that it's valid.
	merge_tool="$1"
	if ! valid_tool "$merge_tool"
	then
		echo >&2 "Unknown merge tool $merge_tool"
		exit 1
	fi
	if diff_mode
	then
		merge_tool_path=$(git config difftool."$merge_tool".path ||
				  git config mergetool."$merge_tool".path)
	else
		merge_tool_path=$(git config mergetool."$merge_tool".path)
	fi
	if test -z "$merge_tool_path"
	then
		merge_tool_path=$(translate_merge_tool_path "$merge_tool")
	fi
	if test -z "$(get_merge_tool_cmd "$merge_tool")" &&
		! type "$merge_tool_path" >/dev/null 2>&1
	then
		echo >&2 "The $TOOL_MODE tool $merge_tool is not available as"\
			 "'$merge_tool_path'"
		exit 1
	fi
	echo "$merge_tool_path"
}

get_merge_tool () {
	# Check if a merge tool has been configured
	merge_tool=$(get_configured_merge_tool)
	# Try to guess an appropriate merge tool if no tool has been set.
	if test -z "$merge_tool"
	then
		merge_tool=$(guess_merge_tool) || exit
	fi
	echo "$merge_tool"
}

mergetool_find_win32_cmd () {
	executable=$1
	sub_directory=$2

# Use $executable if it exists in $PATH
	if type -p "$executable" >/dev/null 2>&1
	then
		printf '%s' "$executable"
		return
	fi

# Look for executable in the typical locations
	for directory in $(env | grep -Ei '^PROGRAM(FILES($X86$)?|W6432)=' |
		cut -d '=' -f 2- | sort -u)
	do
		if test -n "$directory" && test -x "$directory/$sub_directory/$executable"
		then
			printf '%s' "$directory/$sub_directory/$executable"
			return
		fi
	done

printf '%s' "$executable"
}