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 
106 	got checkout $testroot/repo $testroot/wt > /dev/null
107 	ret="$?"
108 	if [ "$ret" != "0" ]; then
109 		test_done "$testroot" "$ret"
110 		return 1
111 	fi
112 
113 	sed -i 's/2/22/' $testroot/repo/numbers
114 	sed -i 's/8/33/' $testroot/repo/numbers
115 	git_commit $testroot/repo -m "modified line 2"
116 	local head_rev=`git_show_head $testroot/repo`
117 
118 	# modify lines 2 and 8 in conflicting ways
119 	sed -i 's/2/77/' $testroot/wt/numbers
120 	sed -i 's/8/88/' $testroot/wt/numbers
121 
122 	echo "C  numbers" > $testroot/stdout.expected
123 	echo -n "Updated to commit $head_rev" >> $testroot/stdout.expected
124 	echo >> $testroot/stdout.expected
125 
126 	(cd $testroot/wt && got update > $testroot/stdout)
127 
128 	cmp -s $testroot/stdout.expected $testroot/stdout
129 	ret="$?"
130 	if [ "$ret" != "0" ]; then
131 		diff -u $testroot/stdout.expected $testroot/stdout
132 		test_done "$testroot" "$ret"
133 		return 1
134 	fi
135 
136 	echo "diff $head_rev $testroot/wt" > $testroot/stdout.expected
137 	echo -n 'blob - ' >> $testroot/stdout.expected
138 	got tree -r $testroot/repo -i | grep 'numbers$' | cut -d' ' -f 1 \
139 		>> $testroot/stdout.expected
140 	echo 'file + numbers' >> $testroot/stdout.expected
141 	echo '--- numbers' >> $testroot/stdout.expected
142 	echo '+++ numbers' >> $testroot/stdout.expected
143 	echo '@@ -1,8 +1,20 @@' >> $testroot/stdout.expected
144 	echo ' 1' >> $testroot/stdout.expected
145 	echo "+<<<<<<< commit $head_rev" >> $testroot/stdout.expected
146 	echo ' 22' >> $testroot/stdout.expected
147 	echo '+|||||||' >> $testroot/stdout.expected
148 	echo '+2' >> $testroot/stdout.expected
149 	echo '+=======' >> $testroot/stdout.expected
150 	echo '+77' >> $testroot/stdout.expected
151 	echo '+>>>>>>> numbers' >> $testroot/stdout.expected
152 	echo ' 3' >> $testroot/stdout.expected
153 	echo ' 4' >> $testroot/stdout.expected
154 	echo ' 5' >> $testroot/stdout.expected
155 	echo ' 6' >> $testroot/stdout.expected
156 	echo ' 7' >> $testroot/stdout.expected
157 	echo "+<<<<<<< commit $head_rev" >> $testroot/stdout.expected
158 	echo ' 33' >> $testroot/stdout.expected
159 	echo '+|||||||' >> $testroot/stdout.expected
160 	echo '+8' >> $testroot/stdout.expected
161 	echo '+=======' >> $testroot/stdout.expected
162 	echo '+88' >> $testroot/stdout.expected
163 	echo '+>>>>>>> numbers' >> $testroot/stdout.expected
164 
165 	(cd $testroot/wt && got diff > $testroot/stdout)
166 
167 	cmp -s $testroot/stdout.expected $testroot/stdout
168 	ret="$?"
169 	if [ "$ret" != "0" ]; then
170 		diff -u $testroot/stdout.expected $testroot/stdout
171 	fi
172 	test_done "$testroot" "$ret"
173 }
174 
175 function test_diff_tag {
176 	local testroot=`test_init diff_tag`
177 	local commit_id0=`git_show_head $testroot/repo`
178 	local tag1=1.0.0
179 	local tag2=2.0.0
180 
181 	echo "modified alpha" > $testroot/repo/alpha
182 	git_commit $testroot/repo -m "changed alpha"
183 	local commit_id1=`git_show_head $testroot/repo`
184 
185 	(cd $testroot/repo && git tag -m "test" $tag1)
186 
187 	echo "new file" > $testroot/repo/new
188 	(cd $testroot/repo && git add new)
189 	git_commit $testroot/repo -m "new file"
190 	local commit_id2=`git_show_head $testroot/repo`
191 
192 	(cd $testroot/repo && git tag -m "test" $tag2)
193 
194 	echo "diff $commit_id0 refs/tags/$tag1" > $testroot/stdout.expected
195 	echo -n 'blob - ' >> $testroot/stdout.expected
196 	got tree -r $testroot/repo -c $commit_id0 -i | grep 'alpha$' | \
197 		cut -d' ' -f 1 >> $testroot/stdout.expected
198 	echo -n 'blob + ' >> $testroot/stdout.expected
199 	got tree -r $testroot/repo -i | grep 'alpha$' | cut -d' ' -f 1 \
200 		>> $testroot/stdout.expected
201 	echo '--- alpha' >> $testroot/stdout.expected
202 	echo '+++ alpha' >> $testroot/stdout.expected
203 	echo '@@ -1 +1 @@' >> $testroot/stdout.expected
204 	echo '-alpha' >> $testroot/stdout.expected
205 	echo '+modified alpha' >> $testroot/stdout.expected
206 
207 	got diff -r $testroot/repo $commit_id0 $tag1 > $testroot/stdout
208 	cmp -s $testroot/stdout.expected $testroot/stdout
209 	ret="$?"
210 	if [ "$ret" != "0" ]; then
211 		diff -u $testroot/stdout.expected $testroot/stdout
212 		test_done "$testroot" "$ret"
213 		return 1
214 	fi
215 
216 	echo "diff refs/tags/$tag1 refs/tags/$tag2" > $testroot/stdout.expected
217 	echo "blob - /dev/null" >> $testroot/stdout.expected
218 	echo -n 'blob + ' >> $testroot/stdout.expected
219 	got tree -r $testroot/repo -i -c $commit_id2 | grep 'new$' | \
220 		cut -d' ' -f 1 >> $testroot/stdout.expected
221 	echo '--- /dev/null' >> $testroot/stdout.expected
222 	echo '+++ new' >> $testroot/stdout.expected
223 	echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
224 	echo '+new file' >> $testroot/stdout.expected
225 
226 	got diff -r $testroot/repo $tag1 $tag2 > $testroot/stdout
227 	cmp -s $testroot/stdout.expected $testroot/stdout
228 	ret="$?"
229 	if [ "$ret" != "0" ]; then
230 		diff -u $testroot/stdout.expected $testroot/stdout
231 	fi
232 	test_done "$testroot" "$ret"
233 }
234 
235 function test_diff_ignore_whitespace {
236 	local testroot=`test_init diff_ignore_whitespace`
237 	local commit_id0=`git_show_head $testroot/repo`
238 
239 	got checkout $testroot/repo $testroot/wt > /dev/null
240 	ret="$?"
241 	if [ "$ret" != "0" ]; then
242 		test_done "$testroot" "$ret"
243 		return 1
244 	fi
245 
246 	echo "alpha   " > $testroot/wt/alpha
247 
248 	(cd $testroot/wt && got diff -w > $testroot/stdout)
249 
250 	echo "diff $commit_id0 $testroot/wt" > $testroot/stdout.expected
251 	echo -n 'blob - ' >> $testroot/stdout.expected
252 	got tree -r $testroot/repo -c $commit_id0 -i | grep 'alpha$' | \
253 		cut -d' ' -f 1 >> $testroot/stdout.expected
254 	echo 'file + alpha' >> $testroot/stdout.expected
255 
256 	cmp -s $testroot/stdout.expected $testroot/stdout
257 	ret="$?"
258 	if [ "$ret" != "0" ]; then
259 		diff -u $testroot/stdout.expected $testroot/stdout
260 	fi
261 	test_done "$testroot" "$ret"
262 }
263 
264 run_test test_diff_basic
265 run_test test_diff_shows_conflict
266 run_test test_diff_tag
267 run_test test_diff_ignore_whitespace