doc: describe git svn init --ignore-refs
[git/git-svn.git] / t / t4051-diff-function-context.sh
blob3e6b485ecba1a59e3d69edc3ac5a6f0f1d327bd3
1 #!/bin/sh
3 test_description='diff function context'
5 . ./test-lib.sh
7 dir="$TEST_DIRECTORY/t4051"
9 commit_and_tag () {
10 tag=$1 &&
11 shift &&
12 git add "$@" &&
13 test_tick &&
14 git commit -m "$tag" &&
15 git tag "$tag"
18 first_context_line () {
19 awk '
20 found {print; exit}
21 /^@@/ {found = 1}
25 last_context_line () {
26 sed -ne \$p
29 check_diff () {
30 name=$1
31 desc=$2
32 options="-W $3"
34 test_expect_success "$desc" '
35 git diff $options "$name^" "$name" >"$name.diff"
38 test_expect_success ' diff applies' '
39 test_when_finished "git reset --hard" &&
40 git checkout --detach "$name^" &&
41 git apply --index "$name.diff" &&
42 git diff --exit-code "$name"
46 test_expect_success 'setup' '
47 cat "$dir/includes.c" "$dir/dummy.c" "$dir/dummy.c" "$dir/hello.c" \
48 "$dir/dummy.c" "$dir/dummy.c" >file.c &&
49 commit_and_tag initial file.c &&
51 grep -v "delete me from hello" <file.c >file.c.new &&
52 mv file.c.new file.c &&
53 commit_and_tag changed_hello file.c &&
55 grep -v "delete me from includes" <file.c >file.c.new &&
56 mv file.c.new file.c &&
57 commit_and_tag changed_includes file.c &&
59 cat "$dir/appended1.c" >>file.c &&
60 commit_and_tag appended file.c &&
62 cat "$dir/appended2.c" >>file.c &&
63 commit_and_tag extended file.c &&
65 grep -v "Begin of second part" <file.c >file.c.new &&
66 mv file.c.new file.c &&
67 commit_and_tag long_common_tail file.c &&
69 git checkout initial &&
70 cat "$dir/hello.c" "$dir/dummy.c" >file.c &&
71 commit_and_tag hello_dummy file.c &&
73 # overlap function context of 1st change and -u context of 2nd change
74 grep -v "delete me from hello" <"$dir/hello.c" >file.c &&
75 sed "2a\\
76 extra line" <"$dir/dummy.c" >>file.c &&
77 commit_and_tag changed_hello_dummy file.c &&
79 git checkout initial &&
80 grep -v "delete me from hello" <file.c >file.c.new &&
81 mv file.c.new file.c &&
82 cat "$dir/appended1.c" >>file.c &&
83 commit_and_tag changed_hello_appended file.c
86 check_diff changed_hello 'changed function'
88 test_expect_success ' context includes begin' '
89 grep "^ .*Begin of hello" changed_hello.diff
92 test_expect_success ' context includes end' '
93 grep "^ .*End of hello" changed_hello.diff
96 test_expect_success ' context does not include other functions' '
97 test $(grep -c "^[ +-].*Begin" changed_hello.diff) -le 1
100 test_expect_success ' context does not include preceding empty lines' '
101 test "$(first_context_line <changed_hello.diff)" != " "
104 test_expect_success ' context does not include trailing empty lines' '
105 test "$(last_context_line <changed_hello.diff)" != " "
108 check_diff changed_includes 'changed includes'
110 test_expect_success ' context includes begin' '
111 grep "^ .*Begin.h" changed_includes.diff
114 test_expect_success ' context includes end' '
115 grep "^ .*End.h" changed_includes.diff
118 test_expect_success ' context does not include other functions' '
119 test $(grep -c "^[ +-].*Begin" changed_includes.diff) -le 1
122 test_expect_success ' context does not include trailing empty lines' '
123 test "$(last_context_line <changed_includes.diff)" != " "
126 check_diff appended 'appended function'
128 test_expect_success ' context includes begin' '
129 grep "^[+].*Begin of first part" appended.diff
132 test_expect_success ' context includes end' '
133 grep "^[+].*End of first part" appended.diff
136 test_expect_success ' context does not include other functions' '
137 test $(grep -c "^[ +-].*Begin" appended.diff) -le 1
140 check_diff extended 'appended function part'
142 test_expect_success ' context includes begin' '
143 grep "^ .*Begin of first part" extended.diff
146 test_expect_success ' context includes end' '
147 grep "^[+].*End of second part" extended.diff
150 test_expect_success ' context does not include other functions' '
151 test $(grep -c "^[ +-].*Begin" extended.diff) -le 2
154 test_expect_success ' context does not include preceding empty lines' '
155 test "$(first_context_line <extended.diff)" != " "
158 check_diff long_common_tail 'change with long common tail and no context' -U0
160 test_expect_success ' context includes begin' '
161 grep "^ .*Begin of first part" long_common_tail.diff
164 test_expect_success ' context includes end' '
165 grep "^ .*End of second part" long_common_tail.diff
168 test_expect_success ' context does not include other functions' '
169 test $(grep -c "^[ +-].*Begin" long_common_tail.diff) -le 2
172 test_expect_success ' context does not include preceding empty lines' '
173 test "$(first_context_line <long_common_tail.diff.diff)" != " "
176 check_diff changed_hello_appended 'changed function plus appended function'
178 test_expect_success ' context includes begin' '
179 grep "^ .*Begin of hello" changed_hello_appended.diff &&
180 grep "^[+].*Begin of first part" changed_hello_appended.diff
183 test_expect_success ' context includes end' '
184 grep "^ .*End of hello" changed_hello_appended.diff &&
185 grep "^[+].*End of first part" changed_hello_appended.diff
188 test_expect_success ' context does not include other functions' '
189 test $(grep -c "^[ +-].*Begin" changed_hello_appended.diff) -le 2
192 check_diff changed_hello_dummy 'changed two consecutive functions'
194 test_expect_success ' context includes begin' '
195 grep "^ .*Begin of hello" changed_hello_dummy.diff &&
196 grep "^ .*Begin of dummy" changed_hello_dummy.diff
199 test_expect_success ' context includes end' '
200 grep "^ .*End of hello" changed_hello_dummy.diff &&
201 grep "^ .*End of dummy" changed_hello_dummy.diff
204 test_expect_success ' overlapping hunks are merged' '
205 test $(grep -c "^@@" changed_hello_dummy.diff) -eq 1
208 test_done