git/git-difftool.perl, branch v1.7.11

difftool: print list of valid tools with '--tool-help'

2012-04-23T19:00:42Z

Since bc7a96a (mergetool--lib: Refactor tools into separate files, 2011-08-18), it is possible to add a new diff tool by creating a simple script in the '$(git --exec-path)/mergetools' directory. Updating the difftool help text is still a manual process, and the documentation can easily go out of sync. This commit teaches difftool the '--tool-help' option, which: - Reads the list of valid tools from 'mergetools/*' - Determines which of them are actually installed - Determines which are capable of diffing (i.e. not just a merge tool) - Prints the resulting list for the user Signed-off-by: Tim Henigan Signed-off-by: Junio C Hamano

difftool: teach difftool to handle directory diffs

2012-04-23T18:59:34Z

When 'difftool' is called to compare a range of commits that modify more than one file, it opens a separate instance of the diff tool for each file that changed. The new '--dir-diff' option copies all the modified files to a temporary location and runs a directory diff on them in a single instance of the diff tool. Signed-off-by: Tim Henigan Signed-off-by: Junio C Hamano

difftool: eliminate setup_environment function

2012-03-23T18:46:26Z

Removing this function shortens the code and makes it easier to read. Now all environment variables are set as part of procedural operation. Signed-off-by: Tim Henigan Signed-off-by: Junio C Hamano

difftool: stop appending '.exe' to git

2012-03-23T18:46:26Z

The system call to Git works the same whether or not ".exe" is appended to "git". The extra code is not necessary. Signed-off-by: Tim Henigan Signed-off-by: Junio C Hamano

difftool: remove explicit change of PATH

2012-03-23T18:46:26Z

Adding the script directory to PATH is not needed. The script is located at '$(git --exec-path)', which is already on the PATH. Signed-off-by: Tim Henigan Signed-off-by: Junio C Hamano

difftool: exit(0) when usage is printed

2012-03-23T18:46:26Z

Prior to this commit, the script exited with an error whenever the usage string was printed, regardless of the reason it was done. In cases where usage was printed due to a user request (e.g. '-h' option), the script should exit without error (exit 0). This commit adds an argument to the usage function that allows the exit code to be specified when the function is called. Signed-off-by: Tim Henigan Signed-off-by: Junio C Hamano

difftool: add '--no-gui' option

2012-03-23T18:46:25Z

This commit teaches difftool to handle the '--no-gui' option. This option negates the existing '--gui' option. The last setting given on the command line wins. This allows a user to configure "[alias] mdt = difftool --gui", but still have the ability to override the setting without error: $ git mdt --no-gui Signed-off-by: Tim Henigan Signed-off-by: Junio C Hamano

difftool: parse options using Getopt::Long

2012-03-23T18:46:25Z

Replace custom option/argument parser with standard Getopt::Long module. This shortens the code and makes it easier to understand. Signed-off-by: Tim Henigan Signed-off-by: Junio C Hamano

use -h for synopsis and --help for manpage consistently

2011-10-05T17:47:10Z

A few scripted Porcelain implementations pretend as if the routine to show their own help messages are triggered upon "git cmd --help", but a command line parser of "git" will hijack such a request and shows the manpage for the cmd subcommand. Leaving the code to handle such input is simply misleading. Signed-off-by: Clemens Buchacher Signed-off-by: Junio C Hamano

difftool: Fix failure on Cygwin

2010-12-14T19:13:41Z

In particular, test 14 'difftool last flag wins' in t7800 fails. This is caused by git-difftool.perl passing both GIT_DIFFTOOL_NO_PROMPT (='true') and GIT_DIFFTOOL_PROMPT (='true') to the difftool helper script. Despite the appropriate key being deleted from the ENV hash, it seems that once a key has been set in the hash, it gets passed along to the system() call. (ie deleting the key does not do the equivalent of unsetenv()). In order to fix the problem, we keep track of the required prompt state while processing the arguments, and then set the relevant ENV hash key only once at the end. Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano