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

git-difftool: use git-mergetool--lib for "--tool-help"

2013-01-25T19:08:55Z

The "--tool-help" option to git-difftool currently displays incorrect output since it uses the names of the files in "$GIT_EXEC_PATH/mergetools/" rather than the list of command names in git-mergetool--lib. Fix this by simply delegating the "--tool-help" argument to the show_tool_help function in git-mergetool--lib. Signed-off-by: John Keeping Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: silence warning

2012-08-21T22:27:15Z

Silence a warning given when running git difftool --dir-diff and there are no changes. This is because command_oneline returns undef when the command has no output, not ''. Signed-off-by: Ross Lagerwall Acked-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: Disable --symlinks on cygwin

2012-07-26T20:07:15Z

Symlinks are not ubiquitous on Windows so make --no-symlinks the default. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: Handle compare() returning -1

2012-07-26T20:06:00Z

Keep the temporary directory around when compare() cannot read its input files, which is indicated by -1. Defer tempdir creation to allow an early exit in setup_dir_diff(). Wrap the rest of the entry points in an exit_cleanup() function to handle removing temporary files and error reporting. Print the temporary files' location so that the user can recover them. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: Wrap long lines for readability

2012-07-26T18:59:35Z

Keep everything within 80 columns. Wrap the user-facing messages too. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: Check all return codes from compare()

2012-07-25T16:41:54Z

Handle the case where compare() is unable to read its inputs. Emit a warning so that the user knows that something went wrong. We may later want to restructure the code so that we can inhibit tempdir cleanup when this condition is reached. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: Handle finding mergetools/ in a path with spaces

2012-07-25T16:34:04Z

Use the original File::Find implementation from bf73fc2 (difftool: print list of valid tools with '--tool-help', 2012-03-29) so that we properly handle mergetools/ being located in a path containing spaces. One small difference is that we avoid using a global variable by passing a reference to the list of tools. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: Use symlinks when diffing against the worktree

2012-07-23T16:35:53Z

Teach difftool's --dir-diff mode to use symlinks to represent files from the working copy, and make it the default behavior for the non-Windows platforms. Using symlinks is simpler and safer since we do not need to worry about copying files back into the worktree. The old behavior is still available as --no-symlinks. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: Call the temp directory "git-difftool"

2012-07-23T04:43:04Z

The "diffall" name was left over from when this functionality was part of the "git-diffall" script in contrib/. Make the naming consistent. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

difftool: Move option values into a hash

2012-07-23T04:42:23Z

Shorten the "my" declaration for all of the option-specific variables by wrapping all of them in a hash. This also gives us a place to specify default values, should we need them. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano