delta/git.git/git-mergetool--lib.sh, branch mh/packed-refs-do-one-ref-recursion

doc: generate a list of valid merge tools

2013-02-03T05:46:52+00:00

Use the show_tool_names() function to build lists of all
the built-in tools supported by difftool and mergetool.
This frees us from needing to update the documentation
whenever a new tool is added.

Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

mergetool--lib: list user configured tools in '--tool-help'

2013-02-03T05:46:52+00:00

Signed-off-by: John Keeping 
Signed-off-by: Junio C Hamano

mergetool--lib: add functions for finding available tools

2013-02-03T05:46:52+00:00

Refactor show_tool_help() so that the tool-finding logic is broken out
into a separate show_tool_names() function.

Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

mergetool--lib: improve the help text in guess_merge_tool()

2013-01-29T22:31:22+00:00

This code path is only activated when the user does not have a valid
configured tool.  Add a message to guide new users towards configuring a
default tool.

Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

mergetool--lib: simplify command expressions

2013-01-29T22:30:46+00:00

Update variable assignments to always use $(command "$arg")
in their RHS instead of "$(command "$arg")" as the latter
is harder to read.  Make get_merge_tool_cmd() simpler by
avoiding "echo" and $(command) substitutions completely.

Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

mergetools: simplify how we handle "vim" and "defaults"

2013-01-29T03:00:38+00:00

Remove the exceptions for "vim" and "defaults" in the mergetool library
so that every filename in mergetools/ matches 1:1 with the name of a
valid built-in tool.

Define the trivial fallback definition of shell functions in-line in
git-mergetool-lib script, instead of dot-sourcing them from another
file.  The result is much easier to follow.

[jc: squashed in an update from John Keeping as well]

Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

mergetool--lib: don't call "exit" in setup_tool

2013-01-28T02:33:16+00:00

This will make it easier to use setup_tool in places where we expect
that the selected tool will not support the current mode.

We need to introduce a new return code for setup_tool to differentiate
between the case of "the selected tool is invalid" and "the selected
tool is not a built-in" since we must call setup_tool when a custom
'merge..path' is configured for a built-in tool but avoid failing
when the configured tool is not a built-in.

Signed-off-by: John Keeping 
Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

mergetool--lib: improve show_tool_help() output

2013-01-28T02:32:54+00:00

Check the can_diff and can_merge functions before deciding whether
to add the tool to the available/unavailable lists.  This makes
"--tool-help" context-sensitive so that "git mergetool --tool-help"
displays merge tools only and "git difftool --tool-help" displays
diff tools only.

Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

git-mergetool: don't hardcode 'mergetool' in show_tool_help

2013-01-25T19:07:54+00:00

When using show_tool_help from git-difftool we will want it to print
"git difftool" not "git mergetool" so use "git ${TOOL_MODE}tool".

Signed-off-by: John Keeping 
Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano

git-mergetool: remove redundant assignment

2013-01-25T19:07:39+00:00

TOOL_MODE is set at the top of git-mergetool.sh so there is no need to
set it again in show_tool_help.  Removing this lets us re-use
show_tool_help in git-difftool.

Signed-off-by: John Keeping 
Signed-off-by: David Aguilar 
Signed-off-by: Junio C Hamano