You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
358 lines
9.6 KiB
358 lines
9.6 KiB
#!/bin/sh |
|
# |
|
# Copyright (c) 2009, 2010, 2012, 2013 David Aguilar |
|
# |
|
|
|
test_description='git-difftool |
|
|
|
Testing basic diff tool invocation |
|
' |
|
|
|
. ./test-lib.sh |
|
|
|
difftool_test_setup () |
|
{ |
|
test_config diff.tool test-tool && |
|
test_config difftool.test-tool.cmd 'cat "$LOCAL"' && |
|
test_config difftool.bogus-tool.cmd false |
|
} |
|
|
|
prompt_given () |
|
{ |
|
prompt="$1" |
|
test "$prompt" = "Launch 'test-tool' [Y/n]: branch" |
|
} |
|
|
|
stdin_contains () |
|
{ |
|
grep >/dev/null "$1" |
|
} |
|
|
|
stdin_doesnot_contain () |
|
{ |
|
! stdin_contains "$1" |
|
} |
|
|
|
# Create a file on master and change it on branch |
|
test_expect_success PERL 'setup' ' |
|
echo master >file && |
|
git add file && |
|
git commit -m "added file" && |
|
|
|
git checkout -b branch master && |
|
echo branch >file && |
|
git commit -a -m "branch changed file" && |
|
git checkout master |
|
' |
|
|
|
# Configure a custom difftool.<tool>.cmd and use it |
|
test_expect_success PERL 'custom commands' ' |
|
difftool_test_setup && |
|
test_config difftool.test-tool.cmd "cat \"\$REMOTE\"" && |
|
echo master >expect && |
|
git difftool --no-prompt branch >actual && |
|
test_cmp expect actual && |
|
|
|
test_config difftool.test-tool.cmd "cat \"\$LOCAL\"" && |
|
echo branch >expect && |
|
git difftool --no-prompt branch >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success PERL 'custom tool commands override built-ins' ' |
|
test_config difftool.vimdiff.cmd "cat \"\$REMOTE\"" && |
|
echo master >expect && |
|
git difftool --tool vimdiff --no-prompt branch >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success PERL 'difftool ignores bad --tool values' ' |
|
: >expect && |
|
test_expect_code 1 \ |
|
git difftool --no-prompt --tool=bad-tool branch >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success PERL 'difftool forwards arguments to diff' ' |
|
difftool_test_setup && |
|
>for-diff && |
|
git add for-diff && |
|
echo changes>for-diff && |
|
git add for-diff && |
|
: >expect && |
|
git difftool --cached --no-prompt -- for-diff >actual && |
|
test_cmp expect actual && |
|
git reset -- for-diff && |
|
rm for-diff |
|
' |
|
|
|
test_expect_success PERL 'difftool honors --gui' ' |
|
difftool_test_setup && |
|
test_config merge.tool bogus-tool && |
|
test_config diff.tool bogus-tool && |
|
test_config diff.guitool test-tool && |
|
|
|
echo branch >expect && |
|
git difftool --no-prompt --gui branch >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success PERL 'difftool --gui last setting wins' ' |
|
difftool_test_setup && |
|
: >expect && |
|
git difftool --no-prompt --gui --no-gui >actual && |
|
test_cmp expect actual && |
|
|
|
test_config merge.tool bogus-tool && |
|
test_config diff.tool bogus-tool && |
|
test_config diff.guitool test-tool && |
|
echo branch >expect && |
|
git difftool --no-prompt --no-gui --gui branch >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success PERL 'difftool --gui works without configured diff.guitool' ' |
|
difftool_test_setup && |
|
echo branch >expect && |
|
git difftool --no-prompt --gui branch >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
# Specify the diff tool using $GIT_DIFF_TOOL |
|
test_expect_success PERL 'GIT_DIFF_TOOL variable' ' |
|
difftool_test_setup && |
|
git config --unset diff.tool && |
|
echo branch >expect && |
|
GIT_DIFF_TOOL=test-tool git difftool --no-prompt branch >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
# Test the $GIT_*_TOOL variables and ensure |
|
# that $GIT_DIFF_TOOL always wins unless --tool is specified |
|
test_expect_success PERL 'GIT_DIFF_TOOL overrides' ' |
|
difftool_test_setup && |
|
test_config diff.tool bogus-tool && |
|
test_config merge.tool bogus-tool && |
|
|
|
echo branch >expect && |
|
GIT_DIFF_TOOL=test-tool git difftool --no-prompt branch >actual && |
|
test_cmp expect actual && |
|
|
|
test_config diff.tool bogus-tool && |
|
test_config merge.tool bogus-tool && |
|
GIT_DIFF_TOOL=bogus-tool \ |
|
git difftool --no-prompt --tool=test-tool branch >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
# Test that we don't have to pass --no-prompt to difftool |
|
# when $GIT_DIFFTOOL_NO_PROMPT is true |
|
test_expect_success PERL 'GIT_DIFFTOOL_NO_PROMPT variable' ' |
|
difftool_test_setup && |
|
echo branch >expect && |
|
GIT_DIFFTOOL_NO_PROMPT=true git difftool branch >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
# git-difftool supports the difftool.prompt variable. |
|
# Test that GIT_DIFFTOOL_PROMPT can override difftool.prompt = false |
|
test_expect_success PERL 'GIT_DIFFTOOL_PROMPT variable' ' |
|
difftool_test_setup && |
|
test_config difftool.prompt false && |
|
echo >input && |
|
GIT_DIFFTOOL_PROMPT=true git difftool branch <input >output && |
|
prompt=$(tail -1 <output) && |
|
prompt_given "$prompt" |
|
' |
|
|
|
# Test that we don't have to pass --no-prompt when difftool.prompt is false |
|
test_expect_success PERL 'difftool.prompt config variable is false' ' |
|
difftool_test_setup && |
|
test_config difftool.prompt false && |
|
echo branch >expect && |
|
git difftool branch >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
# Test that we don't have to pass --no-prompt when mergetool.prompt is false |
|
test_expect_success PERL 'difftool merge.prompt = false' ' |
|
difftool_test_setup && |
|
test_might_fail git config --unset difftool.prompt && |
|
test_config mergetool.prompt false && |
|
echo branch >expect && |
|
git difftool branch >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
# Test that the -y flag can override difftool.prompt = true |
|
test_expect_success PERL 'difftool.prompt can overridden with -y' ' |
|
difftool_test_setup && |
|
test_config difftool.prompt true && |
|
echo branch >expect && |
|
git difftool -y branch >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
# Test that the --prompt flag can override difftool.prompt = false |
|
test_expect_success PERL 'difftool.prompt can overridden with --prompt' ' |
|
difftool_test_setup && |
|
test_config difftool.prompt false && |
|
echo >input && |
|
git difftool --prompt branch <input >output && |
|
prompt=$(tail -1 <output) && |
|
prompt_given "$prompt" |
|
' |
|
|
|
# Test that the last flag passed on the command-line wins |
|
test_expect_success PERL 'difftool last flag wins' ' |
|
difftool_test_setup && |
|
echo branch >expect && |
|
git difftool --prompt --no-prompt branch >actual && |
|
test_cmp expect actual && |
|
echo >input && |
|
git difftool --no-prompt --prompt branch <input >output && |
|
prompt=$(tail -1 <output) && |
|
prompt_given "$prompt" |
|
' |
|
|
|
# git-difftool falls back to git-mergetool config variables |
|
# so test that behavior here |
|
test_expect_success PERL 'difftool + mergetool config variables' ' |
|
test_config merge.tool test-tool && |
|
test_config mergetool.test-tool.cmd "cat \$LOCAL" && |
|
echo branch >expect && |
|
git difftool --no-prompt branch >actual && |
|
test_cmp expect actual && |
|
|
|
# set merge.tool to something bogus, diff.tool to test-tool |
|
test_config merge.tool bogus-tool && |
|
test_config diff.tool test-tool && |
|
git difftool --no-prompt branch >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success PERL 'difftool.<tool>.path' ' |
|
test_config difftool.tkdiff.path echo && |
|
git difftool --tool=tkdiff --no-prompt branch >output && |
|
lines=$(grep file output | wc -l) && |
|
test "$lines" -eq 1 |
|
' |
|
|
|
test_expect_success PERL 'difftool --extcmd=cat' ' |
|
echo branch >expect && |
|
echo master >>expect && |
|
git difftool --no-prompt --extcmd=cat branch >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success PERL 'difftool --extcmd cat' ' |
|
echo branch >expect && |
|
echo master >>expect && |
|
git difftool --no-prompt --extcmd=cat branch >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success PERL 'difftool -x cat' ' |
|
echo branch >expect && |
|
echo master >>expect && |
|
git difftool --no-prompt -x cat branch >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success PERL 'difftool --extcmd echo arg1' ' |
|
echo file >expect && |
|
git difftool --no-prompt \ |
|
--extcmd sh\ -c\ \"echo\ \$1\" branch >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success PERL 'difftool --extcmd cat arg1' ' |
|
echo master >expect && |
|
git difftool --no-prompt \ |
|
--extcmd sh\ -c\ \"cat\ \$1\" branch >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
test_expect_success PERL 'difftool --extcmd cat arg2' ' |
|
echo branch >expect && |
|
git difftool --no-prompt \ |
|
--extcmd sh\ -c\ \"cat\ \$2\" branch >actual && |
|
test_cmp expect actual |
|
' |
|
|
|
# Create a second file on master and a different version on branch |
|
test_expect_success PERL 'setup with 2 files different' ' |
|
echo m2 >file2 && |
|
git add file2 && |
|
git commit -m "added file2" && |
|
|
|
git checkout branch && |
|
echo br2 >file2 && |
|
git add file2 && |
|
git commit -a -m "branch changed file2" && |
|
git checkout master |
|
' |
|
|
|
test_expect_success PERL 'say no to the first file' ' |
|
(echo n && echo) >input && |
|
git difftool -x cat branch <input >output && |
|
stdin_contains m2 <output && |
|
stdin_contains br2 <output && |
|
stdin_doesnot_contain master <output && |
|
stdin_doesnot_contain branch <output |
|
' |
|
|
|
test_expect_success PERL 'say no to the second file' ' |
|
(echo && echo n) >input && |
|
git difftool -x cat branch <input >output && |
|
stdin_contains master <output && |
|
stdin_contains branch <output && |
|
stdin_doesnot_contain m2 <output && |
|
stdin_doesnot_contain br2 <output |
|
' |
|
|
|
test_expect_success PERL 'difftool --tool-help' ' |
|
git difftool --tool-help >output && |
|
stdin_contains tool <output |
|
' |
|
|
|
test_expect_success PERL 'setup change in subdirectory' ' |
|
git checkout master && |
|
mkdir sub && |
|
echo master >sub/sub && |
|
git add sub/sub && |
|
git commit -m "added sub/sub" && |
|
echo test >>file && |
|
echo test >>sub/sub && |
|
git add . && |
|
git commit -m "modified both" |
|
' |
|
|
|
test_expect_success PERL 'difftool -d' ' |
|
git difftool -d --extcmd ls branch >output && |
|
stdin_contains sub <output && |
|
stdin_contains file <output |
|
' |
|
|
|
test_expect_success PERL 'difftool --dir-diff' ' |
|
git difftool --dir-diff --extcmd ls branch >output && |
|
stdin_contains sub <output && |
|
stdin_contains file <output |
|
' |
|
|
|
test_expect_success PERL 'difftool --dir-diff ignores --prompt' ' |
|
git difftool --dir-diff --prompt --extcmd ls branch >output && |
|
stdin_contains sub <output && |
|
stdin_contains file <output |
|
' |
|
|
|
test_expect_success PERL 'difftool --dir-diff from subdirectory' ' |
|
( |
|
cd sub && |
|
git difftool --dir-diff --extcmd ls branch >output && |
|
stdin_contains sub <output && |
|
stdin_contains file <output |
|
) |
|
' |
|
|
|
test_done
|
|
|