Re: [PATCH] mergetool--lib: add support for araxis merge

From: Markus Heidelberg <markus.heidelberg@web.de>
Date: May 23, 2009, 14:29 UTC
Message-ID: <200905231629.49569.markus.heidelberg@web.de>
In-Reply-To: <1242616700-26022-1-git-send-email-davvid@gmail.com>

David Aguilar, 18.05.2009:

Show 33 quoted lines

> Araxis merge is now a built-in diff/merge tool.
> This adds araxis to git-completion and updates
> the documentation as well.
> 
> Signed-off-by: David Aguilar <davvid@gmail.com>
> ---
> 
> This applies on top of the da/mergetool-lib branch
> currently in pu.
> 
> This is a rework of a patch to add araxis support
> to mergetool which originated on the msysgit list.
> The commented-out "-titleN:" options were
> intentionally left out of this patch because
> no amount of shell-quoting could get it to work
> when the title contained spaces.
> 
> http://groups.google.com/group/msysgit/browse_thread/thread/fa353fa2240594d7
> 
>  Documentation/git-difftool.txt         |    2 +-
>  Documentation/git-mergetool.txt        |    2 +-
>  Documentation/merge-config.txt         |    2 +-
>  contrib/completion/git-completion.bash |    2 +-
>  git-mergetool--lib.sh                  |   24 ++++++++++++++++++++++--
>  5 files changed, 26 insertions(+), 6 deletions(-)
> 
> diff --git a/git-mergetool--lib.sh b/git-mergetool--lib.sh
> @@ -263,6 +266,23 @@ run_merge_tool () {
>  			status=1
>  		fi
>  		;;
> +	araxis)
> +		if merge_mode; then

Here this is missing:
			touch "$BACKUP"

I had already mentioned it in a reply to your mail from May 03, maybe you have overseen it. But looking in my sent-mail I just noticed that my suggestion had an off-by-one-line error. Now it is correct.

Show 18 quoted lines

> +			if $base_present; then
> +				"$merge_tool_path" -wait -merge -3 -a1 \
> +					"$BASE" "$LOCAL" "$REMOTE" "$MERGED" \
> +					>/dev/null 2>&1
> +			else
> +				"$merge_tool_path" -wait -2 \
> +					"$LOCAL" "$REMOTE" "$MERGED" \
> +					>/dev/null 2>&1
> +			fi
> +			check_unchanged
> +		else
> +			"$merge_tool_path" -wait -2 "$LOCAL" "$REMOTE" \
> +				>/dev/null 2>&1
> +		fi
> +		;;
>  	*)
>  		merge_tool_cmd="$(get_merge_tool_cmd "$1")"
>  		if test -z "$merge_tool_cmd"; then