1 #!/bin/sh
2 #
3 # Copyright (c) 2019 Stefan Sperling <stsp@openbsd.org>
4 #
5 # Permission to use, copy, modify, and distribute this software for any
6 # purpose with or without fee is hereby granted, provided that the above
7 # copyright notice and this permission notice appear in all copies.
8 #
9 # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
16 
17 . ./common.sh
18 
19 function test_diff_basic {
20 	local testroot=`test_init diff_basic`
21 	local head_rev=`git_show_head $testroot/repo`
22 
23 	got checkout $testroot/repo $testroot/wt > /dev/null
24 	ret="$?"
25 	if [ "$ret" != "0" ]; then
26 		test_done "$testroot" "$ret"
27 		return 1
28 	fi
29 
30 	echo "modified alpha" > $testroot/wt/alpha
31 	(cd $testroot/wt && got rm beta >/dev/null)
32 	echo "new file" > $testroot/wt/new
33 	(cd $testroot/wt && got add new >/dev/null)
34 
35 	echo "diff $head_rev $testroot/wt" > $testroot/stdout.expected
36 	echo -n 'blob - ' >> $testroot/stdout.expected
37 	got tree -r $testroot/repo -i | grep 'alpha$' | cut -d' ' -f 1 \
38 		>> $testroot/stdout.expected
39 	echo 'file + alpha' >> $testroot/stdout.expected
40 	echo '--- alpha' >> $testroot/stdout.expected
41 	echo '+++ alpha' >> $testroot/stdout.expected
42 	echo '@@ -1 +1 @@' >> $testroot/stdout.expected
43 	echo '-alpha' >> $testroot/stdout.expected
44 	echo '+modified alpha' >> $testroot/stdout.expected
45 	echo -n 'blob - ' >> $testroot/stdout.expected
46 	got tree -r $testroot/repo -i | grep 'beta$' | cut -d' ' -f 1 \
47 		>> $testroot/stdout.expected
48 	echo 'file + /dev/null' >> $testroot/stdout.expected
49 	echo '--- beta' >> $testroot/stdout.expected
50 	echo '+++ beta' >> $testroot/stdout.expected
51 	echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
52 	echo '-beta' >> $testroot/stdout.expected
53 	echo 'blob - /dev/null' >> $testroot/stdout.expected
54 	echo 'file + new' >> $testroot/stdout.expected
55 	echo '--- new' >> $testroot/stdout.expected
56 	echo '+++ new' >> $testroot/stdout.expected
57 	echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
58 	echo '+new file' >> $testroot/stdout.expected
59 
60 	(cd $testroot/wt && got diff > $testroot/stdout)
61 	cmp -s $testroot/stdout.expected $testroot/stdout
62 	ret="$?"
63 	if [ "$ret" != "0" ]; then
64 		diff -u $testroot/stdout.expected $testroot/stdout
65 		test_done "$testroot" "$ret"
66 		return 1
67 	fi
68 
69 	# diff non-existent path
70 	(cd $testroot/wt && got diff nonexistent > $testroot/stdout \
71 		2> $testroot/stderr)
72 
73 	echo -n > $testroot/stdout.expected
74 	cmp -s $testroot/stdout.expected $testroot/stdout
75 	ret="$?"
76 	if [ "$ret" != "0" ]; then
77 		diff -u $testroot/stdout.expected $testroot/stdout
78 		test_done "$testroot" "$ret"
79 		return 1
80 	fi
81 
82 	echo "got: nonexistent: No such file or directory" \
83 		> $testroot/stderr.expected
84 	cmp -s $testroot/stderr.expected $testroot/stderr
85 	ret="$?"
86 	if [ "$ret" != "0" ]; then
87 		diff -u $testroot/stderr.expected $testroot/stderr
88 	fi
89 	test_done "$testroot" "$ret"
90 }
91 
92 function test_diff_shows_conflict {
93 	local testroot=`test_init diff_shows_conflict 1`
94 
95 	echo "1" > $testroot/repo/numbers
96 	echo "2" >> $testroot/repo/numbers
97 	echo "3" >> $testroot/repo/numbers
98 	echo "4" >> $testroot/repo/numbers
99 	echo "5" >> $testroot/repo/numbers
100 	echo "6" >> $testroot/repo/numbers
101 	echo "7" >> $testroot/repo/numbers
102 	echo "8" >> $testroot/repo/numbers
103 	(cd $testroot/repo && git add numbers)
104 	git_commit $testroot/repo -m "added numbers file"
105 	local base_commit=`git_show_head $testroot/repo`
106 
107 	got checkout $testroot/repo $testroot/wt > /dev/null
108 	ret="$?"
109 	if [ "$ret" != "0" ]; then
110 		test_done "$testroot" "$ret"
111 		return 1
112 	fi
113 
114 	sed -i 's/2/22/' $testroot/repo/numbers
115 	sed -i 's/8/33/' $testroot/repo/numbers
116 	git_commit $testroot/repo -m "modified line 2"
117 	local head_rev=`git_show_head $testroot/repo`
118 
119 	# modify lines 2 and 8 in conflicting ways
120 	sed -i 's/2/77/' $testroot/wt/numbers
121 	sed -i 's/8/88/' $testroot/wt/numbers
122 
123 	echo "C  numbers" > $testroot/stdout.expected
124 	echo -n "Updated to commit $head_rev" >> $testroot/stdout.expected
125 	echo >> $testroot/stdout.expected
126 
127 	(cd $testroot/wt && got update > $testroot/stdout)
128 
129 	cmp -s $testroot/stdout.expected $testroot/stdout
130 	ret="$?"
131 	if [ "$ret" != "0" ]; then
132 		diff -u $testroot/stdout.expected $testroot/stdout
133 		test_done "$testroot" "$ret"
134 		return 1
135 	fi
136 
137 	echo "diff $head_rev $testroot/wt" > $testroot/stdout.expected
138 	echo -n 'blob - ' >> $testroot/stdout.expected
139 	got tree -r $testroot/repo -i | grep 'numbers$' | cut -d' ' -f 1 \
140 		>> $testroot/stdout.expected
141 	echo 'file + numbers' >> $testroot/stdout.expected
142 	echo '--- numbers' >> $testroot/stdout.expected
143 	echo '+++ numbers' >> $testroot/stdout.expected
144 	echo '@@ -1,8 +1,20 @@' >> $testroot/stdout.expected
145 	echo ' 1' >> $testroot/stdout.expected
146 	echo "+<<<<<<< merged change: commit $head_rev" \
147 		>> $testroot/stdout.expected
148 	echo ' 22' >> $testroot/stdout.expected
149 	echo "+||||||| 3-way merge base: commit $base_commit" \
150 		>> $testroot/stdout.expected
151 	echo '+2' >> $testroot/stdout.expected
152 	echo '+=======' >> $testroot/stdout.expected
153 	echo '+77' >> $testroot/stdout.expected
154 	echo '+>>>>>>>' >> $testroot/stdout.expected
155 	echo ' 3' >> $testroot/stdout.expected
156 	echo ' 4' >> $testroot/stdout.expected
157 	echo ' 5' >> $testroot/stdout.expected
158 	echo ' 6' >> $testroot/stdout.expected
159 	echo ' 7' >> $testroot/stdout.expected
160 	echo "+<<<<<<< merged change: commit $head_rev" \
161 		>> $testroot/stdout.expected
162 	echo ' 33' >> $testroot/stdout.expected
163 	echo "+||||||| 3-way merge base: commit $base_commit" \
164 		>> $testroot/stdout.expected
165 	echo '+8' >> $testroot/stdout.expected
166 	echo '+=======' >> $testroot/stdout.expected
167 	echo '+88' >> $testroot/stdout.expected
168 	echo '+>>>>>>>' >> $testroot/stdout.expected
169 
170 	(cd $testroot/wt && got diff > $testroot/stdout)
171 
172 	cmp -s $testroot/stdout.expected $testroot/stdout
173 	ret="$?"
174 	if [ "$ret" != "0" ]; then
175 		diff -u $testroot/stdout.expected $testroot/stdout
176 	fi
177 	test_done "$testroot" "$ret"
178 }
179 
180 function test_diff_tag {
181 	local testroot=`test_init diff_tag`
182 	local commit_id0=`git_show_head $testroot/repo`
183 	local tag1=1.0.0
184 	local tag2=2.0.0
185 
186 	echo "modified alpha" > $testroot/repo/alpha
187 	git_commit $testroot/repo -m "changed alpha"
188 	local commit_id1=`git_show_head $testroot/repo`
189 
190 	(cd $testroot/repo && git tag -m "test" $tag1)
191 
192 	echo "new file" > $testroot/repo/new
193 	(cd $testroot/repo && git add new)
194 	git_commit $testroot/repo -m "new file"
195 	local commit_id2=`git_show_head $testroot/repo`
196 
197 	(cd $testroot/repo && git tag -m "test" $tag2)
198 
199 	echo "diff $commit_id0 refs/tags/$tag1" > $testroot/stdout.expected
200 	echo -n 'blob - ' >> $testroot/stdout.expected
201 	got tree -r $testroot/repo -c $commit_id0 -i | grep 'alpha$' | \
202 		cut -d' ' -f 1 >> $testroot/stdout.expected
203 	echo -n 'blob + ' >> $testroot/stdout.expected
204 	got tree -r $testroot/repo -i | grep 'alpha$' | cut -d' ' -f 1 \
205 		>> $testroot/stdout.expected
206 	echo '--- alpha' >> $testroot/stdout.expected
207 	echo '+++ alpha' >> $testroot/stdout.expected
208 	echo '@@ -1 +1 @@' >> $testroot/stdout.expected
209 	echo '-alpha' >> $testroot/stdout.expected
210 	echo '+modified alpha' >> $testroot/stdout.expected
211 
212 	got diff -r $testroot/repo $commit_id0 $tag1 > $testroot/stdout
213 	cmp -s $testroot/stdout.expected $testroot/stdout
214 	ret="$?"
215 	if [ "$ret" != "0" ]; then
216 		diff -u $testroot/stdout.expected $testroot/stdout
217 		test_done "$testroot" "$ret"
218 		return 1
219 	fi
220 
221 	echo "diff refs/tags/$tag1 refs/tags/$tag2" > $testroot/stdout.expected
222 	echo "blob - /dev/null" >> $testroot/stdout.expected
223 	echo -n 'blob + ' >> $testroot/stdout.expected
224 	got tree -r $testroot/repo -i -c $commit_id2 | grep 'new$' | \
225 		cut -d' ' -f 1 | tr -d '\n' >> $testroot/stdout.expected
226 	echo " (mode 644)" >> $testroot/stdout.expected
227 	echo '--- /dev/null' >> $testroot/stdout.expected
228 	echo '+++ new' >> $testroot/stdout.expected
229 	echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
230 	echo '+new file' >> $testroot/stdout.expected
231 
232 	got diff -r $testroot/repo $tag1 $tag2 > $testroot/stdout
233 	cmp -s $testroot/stdout.expected $testroot/stdout
234 	ret="$?"
235 	if [ "$ret" != "0" ]; then
236 		diff -u $testroot/stdout.expected $testroot/stdout
237 	fi
238 	test_done "$testroot" "$ret"
239 }
240 
241 function test_diff_ignore_whitespace {
242 	local testroot=`test_init diff_ignore_whitespace`
243 	local commit_id0=`git_show_head $testroot/repo`
244 
245 	got checkout $testroot/repo $testroot/wt > /dev/null
246 	ret="$?"
247 	if [ "$ret" != "0" ]; then
248 		test_done "$testroot" "$ret"
249 		return 1
250 	fi
251 
252 	echo "alpha   " > $testroot/wt/alpha
253 
254 	(cd $testroot/wt && got diff -w > $testroot/stdout)
255 
256 	echo "diff $commit_id0 $testroot/wt" > $testroot/stdout.expected
257 	echo -n 'blob - ' >> $testroot/stdout.expected
258 	got tree -r $testroot/repo -c $commit_id0 -i | grep 'alpha$' | \
259 		cut -d' ' -f 1 >> $testroot/stdout.expected
260 	echo 'file + alpha' >> $testroot/stdout.expected
261 
262 	cmp -s $testroot/stdout.expected $testroot/stdout
263 	ret="$?"
264 	if [ "$ret" != "0" ]; then
265 		diff -u $testroot/stdout.expected $testroot/stdout
266 	fi
267 	test_done "$testroot" "$ret"
268 }
269 
270 run_test test_diff_basic
271 run_test test_diff_shows_conflict
272 run_test test_diff_tag
273 run_test test_diff_ignore_whitespace