3 test_description
='Test diff-highlight'
6 TEST_OUTPUT_DIRECTORY
=$
(pwd)
7 TEST_DIRECTORY
="$CURR_DIR"/..
/..
/..
/t
8 DIFF_HIGHLIGHT
="$CURR_DIR"/..
/diff-highlight
10 CW
="$(printf "\033[7m
")" # white
11 CR
="$(printf "\033[27m
")" # reset
13 .
"$TEST_DIRECTORY"/test-lib.sh
15 if ! test_have_prereq PERL
17 skip_all
='skipping diff-highlight tests; perl not available'
21 # dh_test is a test helper function which takes 3 file names as parameters. The
22 # first 2 files are used to generate diff and commit output, which is then
23 # piped through diff-highlight. The 3rd file should contain the expected output
24 # of diff-highlight (minus the diff/commit header, ie. everything after and
25 # including the first @@ line).
34 git commit
-m "Add a file" &&
37 git
diff file >diff.raw
&&
38 git commit
-a -m "Update a file" &&
42 "$DIFF_HIGHLIGHT" <diff.raw | test_strip_patch_header
>diff.act
&&
43 "$DIFF_HIGHLIGHT" <commit.raw | test_strip_patch_header
>commit.act
&&
44 test_cmp
patch.exp
diff.act
&&
45 test_cmp
patch.exp commit.act
48 test_strip_patch_header
() {
52 # dh_test_setup_history generates a contrived graph such that we have at least
53 # 1 nesting (E) and 2 nestings (F).
59 # git log --all --graph
70 dh_test_setup_history
() {
71 echo "file1" >file1
&&
72 echo "file2" >file2
&&
73 echo "file3" >file3
&&
80 git checkout
-b branch
&&
83 git commit
-a -m "E" &&
87 git commit
-a -m "F" &&
89 git checkout master
&&
96 "$PERL_PATH" -pe 's/^\s+//'
100 # graphs start with * or |
101 # followed by a space or / or \
102 "$PERL_PATH" -pe 's@^((\*|\|)( |/|\\))+@@'
105 test_expect_success
'diff-highlight highlights the beginning of a line' '
127 test_expect_success
'diff-highlight highlights the end of a line' '
149 test_expect_success
'diff-highlight highlights the middle of a line' '
171 test_expect_success
'diff-highlight does not highlight whole line' '
193 test_expect_failure
'diff-highlight highlights mismatched hunk size' '
214 # These two code points share the same leading byte in UTF-8 representation;
215 # a naive byte-wise diff would highlight only the second byte.
217 # - U+00f3 ("o" with acute)
218 o_accent
=$
(printf '\303\263')
219 # - U+00f8 ("o" with stroke)
220 o_stroke
=$
(printf '\303\270')
222 test_expect_success
'diff-highlight treats multibyte utf-8 as a unit' '
223 echo "unic${o_accent}de" >a &&
224 echo "unic${o_stroke}de" >b &&
227 -unic${CW}${o_accent}${CR}de
228 +unic${CW}${o_stroke}${CR}de
232 # Unlike the UTF-8 above, these are combining code points which are meant
233 # to modify the character preceding them:
235 # - U+0301 (combining acute accent)
236 combine_accent
=$
(printf '\314\201')
237 # - U+0302 (combining circumflex)
238 combine_circum
=$
(printf '\314\202')
240 test_expect_failure
'diff-highlight treats combining code points as a unit' '
241 echo "unico${combine_accent}de" >a &&
242 echo "unico${combine_circum}de" >b &&
245 -unic${CW}o${combine_accent}${CR}de
246 +unic${CW}o${combine_circum}${CR}de
250 test_expect_success
'diff-highlight works with the --graph option' '
251 dh_test_setup_history &&
253 # topo-order so that the order of the commits is the same as with --graph
254 # trim graph elements so we can do a diff
255 # trim leading space because our trim_graph is not perfect
256 git log --branches -p --topo-order |
257 "$DIFF_HIGHLIGHT" | left_trim >graph.exp &&
258 git log --branches -p --graph |
259 "$DIFF_HIGHLIGHT" | trim_graph | left_trim >graph.act &&
260 test_cmp graph.exp graph.act
263 # Most combined diffs won't meet diff-highlight's line-number filter. So we
264 # create one here where one side drops a line and the other modifies it. That
265 # should result in a diff like:
270 # which naively looks like one side added "+resolved".
271 test_expect_success
'diff-highlight ignores combined diffs' '
272 echo "content" >file &&
274 git commit -m base &&
277 git commit -am master &&
279 git checkout -b other HEAD^ &&
280 echo "modified content" >file &&
281 git commit -am other &&
283 test_must_fail git merge master &&
284 echo "resolved content" >file &&
285 git commit -am resolved &&
287 cat >expect <<-\EOF &&
290 @@@ -1,1 -1,0 +1,1 @@@
295 git show -c | "$DIFF_HIGHLIGHT" >actual.raw &&
296 sed -n "/^---/,\$p" <actual.raw >actual &&
297 test_cmp expect actual