3 95adcdca 2019-03-27 stsp # Copyright (c) 2019 Stefan Sperling <stsp@openbsd.org>
5 95adcdca 2019-03-27 stsp # Permission to use, copy, modify, and distribute this software for any
6 95adcdca 2019-03-27 stsp # purpose with or without fee is hereby granted, provided that the above
7 95adcdca 2019-03-27 stsp # copyright notice and this permission notice appear in all copies.
9 95adcdca 2019-03-27 stsp # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 95adcdca 2019-03-27 stsp # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 95adcdca 2019-03-27 stsp # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 95adcdca 2019-03-27 stsp # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 95adcdca 2019-03-27 stsp # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 95adcdca 2019-03-27 stsp # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 95adcdca 2019-03-27 stsp # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 95adcdca 2019-03-27 stsp . ./common.sh
19 f6cae3ed 2020-09-13 naddy test_diff_basic() {
20 95adcdca 2019-03-27 stsp local testroot=`test_init diff_basic`
21 95adcdca 2019-03-27 stsp local head_rev=`git_show_head $testroot/repo`
22 4ad4d490 2022-08-30 thomas local alpha_blobid=`get_blob_id $testroot/repo "" alpha`
24 95adcdca 2019-03-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
26 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
27 95adcdca 2019-03-27 stsp test_done "$testroot" "$ret"
31 95adcdca 2019-03-27 stsp echo "modified alpha" > $testroot/wt/alpha
32 95adcdca 2019-03-27 stsp (cd $testroot/wt && got rm beta >/dev/null)
33 95adcdca 2019-03-27 stsp echo "new file" > $testroot/wt/new
34 95adcdca 2019-03-27 stsp (cd $testroot/wt && got add new >/dev/null)
36 9b4458b4 2022-06-26 thomas echo "diff $testroot/wt" > $testroot/stdout.expected
37 9b4458b4 2022-06-26 thomas echo "commit - $head_rev" >> $testroot/stdout.expected
38 9b4458b4 2022-06-26 thomas echo "path + $testroot/wt" >> $testroot/stdout.expected
39 95adcdca 2019-03-27 stsp echo -n 'blob - ' >> $testroot/stdout.expected
40 95adcdca 2019-03-27 stsp got tree -r $testroot/repo -i | grep 'alpha$' | cut -d' ' -f 1 \
41 95adcdca 2019-03-27 stsp >> $testroot/stdout.expected
42 95adcdca 2019-03-27 stsp echo 'file + alpha' >> $testroot/stdout.expected
43 95adcdca 2019-03-27 stsp echo '--- alpha' >> $testroot/stdout.expected
44 95adcdca 2019-03-27 stsp echo '+++ alpha' >> $testroot/stdout.expected
45 95adcdca 2019-03-27 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
46 95adcdca 2019-03-27 stsp echo '-alpha' >> $testroot/stdout.expected
47 95adcdca 2019-03-27 stsp echo '+modified alpha' >> $testroot/stdout.expected
48 95adcdca 2019-03-27 stsp echo -n 'blob - ' >> $testroot/stdout.expected
49 95adcdca 2019-03-27 stsp got tree -r $testroot/repo -i | grep 'beta$' | cut -d' ' -f 1 \
50 95adcdca 2019-03-27 stsp >> $testroot/stdout.expected
51 95adcdca 2019-03-27 stsp echo 'file + /dev/null' >> $testroot/stdout.expected
52 95adcdca 2019-03-27 stsp echo '--- beta' >> $testroot/stdout.expected
53 1cb46f00 2020-11-21 stsp echo '+++ /dev/null' >> $testroot/stdout.expected
54 95adcdca 2019-03-27 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
55 95adcdca 2019-03-27 stsp echo '-beta' >> $testroot/stdout.expected
56 95adcdca 2019-03-27 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
57 6d054bb9 2022-09-23 thomas echo 'file + new (mode 644)' >> $testroot/stdout.expected
58 1cb46f00 2020-11-21 stsp echo '--- /dev/null' >> $testroot/stdout.expected
59 95adcdca 2019-03-27 stsp echo '+++ new' >> $testroot/stdout.expected
60 95adcdca 2019-03-27 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
61 95adcdca 2019-03-27 stsp echo '+new file' >> $testroot/stdout.expected
63 95adcdca 2019-03-27 stsp (cd $testroot/wt && got diff > $testroot/stdout)
64 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
66 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
67 95adcdca 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
68 2a06fe5f 2019-08-24 stsp test_done "$testroot" "$ret"
72 30f6c0c6 2021-10-08 thomas # 'got diff' in a repository without any arguments is an error
73 30f6c0c6 2021-10-08 thomas (cd $testroot/repo && got diff 2> $testroot/stderr)
74 30f6c0c6 2021-10-08 thomas echo "got: no got work tree found" > $testroot/stderr.expected
75 30f6c0c6 2021-10-08 thomas cmp -s $testroot/stderr.expected $testroot/stderr
77 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
78 30f6c0c6 2021-10-08 thomas diff -u $testroot/stderr.expected $testroot/stderr
79 30f6c0c6 2021-10-08 thomas test_done "$testroot" "$ret"
83 30f6c0c6 2021-10-08 thomas # 'got diff' in a repository with two arguments requires that
84 30f6c0c6 2021-10-08 thomas # both named objects exist
85 30f6c0c6 2021-10-08 thomas (cd $testroot/repo && got diff $head_rev foo 2> $testroot/stderr)
86 30f6c0c6 2021-10-08 thomas echo "got: foo: object not found" > $testroot/stderr.expected
87 30f6c0c6 2021-10-08 thomas cmp -s $testroot/stderr.expected $testroot/stderr
89 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
90 30f6c0c6 2021-10-08 thomas diff -u $testroot/stderr.expected $testroot/stderr
91 30f6c0c6 2021-10-08 thomas test_done "$testroot" "$ret"
95 2a06fe5f 2019-08-24 stsp # diff non-existent path
96 2a06fe5f 2019-08-24 stsp (cd $testroot/wt && got diff nonexistent > $testroot/stdout \
97 2a06fe5f 2019-08-24 stsp 2> $testroot/stderr)
99 2a06fe5f 2019-08-24 stsp echo -n > $testroot/stdout.expected
100 2a06fe5f 2019-08-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
102 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
103 2a06fe5f 2019-08-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
104 2a06fe5f 2019-08-24 stsp test_done "$testroot" "$ret"
108 2a06fe5f 2019-08-24 stsp echo "got: nonexistent: No such file or directory" \
109 30f6c0c6 2021-10-08 thomas > $testroot/stderr.expected
110 30f6c0c6 2021-10-08 thomas cmp -s $testroot/stderr.expected $testroot/stderr
112 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
113 30f6c0c6 2021-10-08 thomas diff -u $testroot/stderr.expected $testroot/stderr
114 30f6c0c6 2021-10-08 thomas test_done "$testroot" "$ret"
118 30f6c0c6 2021-10-08 thomas echo "modified zeta" > $testroot/wt/epsilon/zeta
120 30f6c0c6 2021-10-08 thomas # diff several paths in a work tree
121 9b4458b4 2022-06-26 thomas echo "diff $testroot/wt" > $testroot/stdout.expected
122 9b4458b4 2022-06-26 thomas echo "commit - $head_rev" >> $testroot/stdout.expected
123 9b4458b4 2022-06-26 thomas echo "path + $testroot/wt" >> $testroot/stdout.expected
124 30f6c0c6 2021-10-08 thomas echo -n 'blob - ' >> $testroot/stdout.expected
125 30f6c0c6 2021-10-08 thomas got tree -r $testroot/repo -i | grep 'alpha$' | cut -d' ' -f 1 \
126 30f6c0c6 2021-10-08 thomas >> $testroot/stdout.expected
127 30f6c0c6 2021-10-08 thomas echo 'file + alpha' >> $testroot/stdout.expected
128 30f6c0c6 2021-10-08 thomas echo '--- alpha' >> $testroot/stdout.expected
129 30f6c0c6 2021-10-08 thomas echo '+++ alpha' >> $testroot/stdout.expected
130 30f6c0c6 2021-10-08 thomas echo '@@ -1 +1 @@' >> $testroot/stdout.expected
131 30f6c0c6 2021-10-08 thomas echo '-alpha' >> $testroot/stdout.expected
132 30f6c0c6 2021-10-08 thomas echo '+modified alpha' >> $testroot/stdout.expected
133 30f6c0c6 2021-10-08 thomas echo -n 'blob - ' >> $testroot/stdout.expected
134 f1417e9f 2021-10-12 thomas got tree -r $testroot/repo -i | grep 'beta$' | cut -d' ' -f 1 \
135 f1417e9f 2021-10-12 thomas >> $testroot/stdout.expected
136 f1417e9f 2021-10-12 thomas echo 'file + /dev/null' >> $testroot/stdout.expected
137 f1417e9f 2021-10-12 thomas echo '--- beta' >> $testroot/stdout.expected
138 f1417e9f 2021-10-12 thomas echo '+++ /dev/null' >> $testroot/stdout.expected
139 f1417e9f 2021-10-12 thomas echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
140 f1417e9f 2021-10-12 thomas echo '-beta' >> $testroot/stdout.expected
141 f1417e9f 2021-10-12 thomas echo -n 'blob - ' >> $testroot/stdout.expected
142 30f6c0c6 2021-10-08 thomas got tree -r $testroot/repo -i epsilon | grep 'zeta$' | cut -d' ' -f 1 \
143 30f6c0c6 2021-10-08 thomas >> $testroot/stdout.expected
144 30f6c0c6 2021-10-08 thomas echo 'file + epsilon/zeta' >> $testroot/stdout.expected
145 30f6c0c6 2021-10-08 thomas echo '--- epsilon/zeta' >> $testroot/stdout.expected
146 30f6c0c6 2021-10-08 thomas echo '+++ epsilon/zeta' >> $testroot/stdout.expected
147 30f6c0c6 2021-10-08 thomas echo '@@ -1 +1 @@' >> $testroot/stdout.expected
148 30f6c0c6 2021-10-08 thomas echo '-zeta' >> $testroot/stdout.expected
149 30f6c0c6 2021-10-08 thomas echo '+modified zeta' >> $testroot/stdout.expected
150 f1417e9f 2021-10-12 thomas echo 'blob - /dev/null' >> $testroot/stdout.expected
151 6d054bb9 2022-09-23 thomas echo 'file + new (mode 644)' >> $testroot/stdout.expected
152 f1417e9f 2021-10-12 thomas echo '--- /dev/null' >> $testroot/stdout.expected
153 f1417e9f 2021-10-12 thomas echo '+++ new' >> $testroot/stdout.expected
154 f1417e9f 2021-10-12 thomas echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
155 f1417e9f 2021-10-12 thomas echo '+new file' >> $testroot/stdout.expected
157 30f6c0c6 2021-10-08 thomas (cd $testroot/wt && got diff new alpha epsilon beta > $testroot/stdout)
158 30f6c0c6 2021-10-08 thomas cmp -s $testroot/stdout.expected $testroot/stdout
160 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
161 30f6c0c6 2021-10-08 thomas diff -u $testroot/stdout.expected $testroot/stdout
162 30f6c0c6 2021-10-08 thomas test_done "$testroot" "$ret"
166 f1417e9f 2021-10-12 thomas # different order of arguments results in same output order
167 f1417e9f 2021-10-12 thomas (cd $testroot/wt && got diff alpha new epsilon beta \
168 30f6c0c6 2021-10-08 thomas > $testroot/stdout 2> $testroot/stderr)
170 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
171 30f6c0c6 2021-10-08 thomas echo "diff failed unexpectedly" >&2
172 30f6c0c6 2021-10-08 thomas test_done "$testroot" "1"
175 30f6c0c6 2021-10-08 thomas cmp -s $testroot/stdout.expected $testroot/stdout
177 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
178 30f6c0c6 2021-10-08 thomas diff -u $testroot/stdout.expected $testroot/stdout
179 30f6c0c6 2021-10-08 thomas test_done "$testroot" "$ret"
183 f1417e9f 2021-10-12 thomas # a branch 'new' should not collide with path 'new' if more
184 f1417e9f 2021-10-12 thomas # than two arguments are passed
185 f1417e9f 2021-10-12 thomas got br -r $testroot/repo -c master new > /dev/null
186 f1417e9f 2021-10-12 thomas (cd $testroot/wt && got diff new alpha epsilon beta \
187 30f6c0c6 2021-10-08 thomas > $testroot/stdout 2> $testroot/stderr)
189 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
190 30f6c0c6 2021-10-08 thomas echo "diff failed unexpectedly" >&2
191 30f6c0c6 2021-10-08 thomas test_done "$testroot" "1"
194 30f6c0c6 2021-10-08 thomas cmp -s $testroot/stdout.expected $testroot/stdout
196 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
197 30f6c0c6 2021-10-08 thomas diff -u $testroot/stdout.expected $testroot/stdout
198 30f6c0c6 2021-10-08 thomas test_done "$testroot" "$ret"
202 30f6c0c6 2021-10-08 thomas # Two arguments are interpreted as objects if a colliding path exists
203 30f6c0c6 2021-10-08 thomas echo master > $testroot/wt/master
204 30f6c0c6 2021-10-08 thomas (cd $testroot/wt && got add master > /dev/null)
205 30f6c0c6 2021-10-08 thomas (cd $testroot/wt && got diff master new > $testroot/stdout)
207 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
208 30f6c0c6 2021-10-08 thomas echo "diff failed unexpectedly" >&2
209 30f6c0c6 2021-10-08 thomas test_done "$testroot" "1"
212 30f6c0c6 2021-10-08 thomas echo "diff refs/heads/master refs/heads/new" > $testroot/stdout.expected
213 9b4458b4 2022-06-26 thomas echo "commit - $head_rev" >> $testroot/stdout.expected
214 9b4458b4 2022-06-26 thomas echo "commit + $head_rev" >> $testroot/stdout.expected
215 30f6c0c6 2021-10-08 thomas # diff between the branches is empty
216 30f6c0c6 2021-10-08 thomas cmp -s $testroot/stdout.expected $testroot/stdout
218 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
219 30f6c0c6 2021-10-08 thomas diff -u $testroot/stdout.expected $testroot/stdout
220 30f6c0c6 2021-10-08 thomas test_done "$testroot" "$ret"
223 30f6c0c6 2021-10-08 thomas # same without a work tree
224 30f6c0c6 2021-10-08 thomas (cd $testroot/repo && got diff master new > $testroot/stdout)
226 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
227 30f6c0c6 2021-10-08 thomas echo "diff failed unexpectedly" >&2
228 30f6c0c6 2021-10-08 thomas test_done "$testroot" "1"
231 30f6c0c6 2021-10-08 thomas echo "diff refs/heads/master refs/heads/new" > $testroot/stdout.expected
232 9b4458b4 2022-06-26 thomas echo "commit - $head_rev" >> $testroot/stdout.expected
233 9b4458b4 2022-06-26 thomas echo "commit + $head_rev" >> $testroot/stdout.expected
234 30f6c0c6 2021-10-08 thomas cmp -s $testroot/stdout.expected $testroot/stdout
236 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
237 30f6c0c6 2021-10-08 thomas diff -u $testroot/stdout.expected $testroot/stdout
238 30f6c0c6 2021-10-08 thomas test_done "$testroot" "$ret"
241 30f6c0c6 2021-10-08 thomas # same with -r argument
242 30f6c0c6 2021-10-08 thomas got diff -r $testroot/repo master new > $testroot/stdout
244 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
245 30f6c0c6 2021-10-08 thomas echo "diff failed unexpectedly" >&2
246 30f6c0c6 2021-10-08 thomas test_done "$testroot" "1"
249 30f6c0c6 2021-10-08 thomas echo "diff refs/heads/master refs/heads/new" > $testroot/stdout.expected
250 9b4458b4 2022-06-26 thomas echo "commit - $head_rev" >> $testroot/stdout.expected
251 9b4458b4 2022-06-26 thomas echo "commit + $head_rev" >> $testroot/stdout.expected
252 30f6c0c6 2021-10-08 thomas cmp -s $testroot/stdout.expected $testroot/stdout
254 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
255 30f6c0c6 2021-10-08 thomas diff -u $testroot/stdout.expected $testroot/stdout
256 30f6c0c6 2021-10-08 thomas test_done "$testroot" "$ret"
260 30f6c0c6 2021-10-08 thomas # -P can be used to force use of paths
261 30f6c0c6 2021-10-08 thomas (cd $testroot/wt && got diff -P new master > $testroot/stdout)
263 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
264 30f6c0c6 2021-10-08 thomas echo "diff failed unexpectedly" >&2
265 30f6c0c6 2021-10-08 thomas test_done "$testroot" "1"
268 9b4458b4 2022-06-26 thomas echo "diff $testroot/wt" > $testroot/stdout.expected
269 9b4458b4 2022-06-26 thomas echo "commit - $head_rev" >> $testroot/stdout.expected
270 9b4458b4 2022-06-26 thomas echo "path + $testroot/wt" >> $testroot/stdout.expected
271 30f6c0c6 2021-10-08 thomas echo 'blob - /dev/null' >> $testroot/stdout.expected
272 6d054bb9 2022-09-23 thomas echo 'file + master (mode 644)' >> $testroot/stdout.expected
273 30f6c0c6 2021-10-08 thomas echo '--- /dev/null' >> $testroot/stdout.expected
274 30f6c0c6 2021-10-08 thomas echo '+++ master' >> $testroot/stdout.expected
275 30f6c0c6 2021-10-08 thomas echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
276 30f6c0c6 2021-10-08 thomas echo '+master' >> $testroot/stdout.expected
277 f1417e9f 2021-10-12 thomas echo 'blob - /dev/null' >> $testroot/stdout.expected
278 6d054bb9 2022-09-23 thomas echo 'file + new (mode 644)' >> $testroot/stdout.expected
279 f1417e9f 2021-10-12 thomas echo '--- /dev/null' >> $testroot/stdout.expected
280 f1417e9f 2021-10-12 thomas echo '+++ new' >> $testroot/stdout.expected
281 f1417e9f 2021-10-12 thomas echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
282 f1417e9f 2021-10-12 thomas echo '+new file' >> $testroot/stdout.expected
283 30f6c0c6 2021-10-08 thomas cmp -s $testroot/stdout.expected $testroot/stdout
285 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
286 30f6c0c6 2021-10-08 thomas diff -u $testroot/stdout.expected $testroot/stdout
287 30f6c0c6 2021-10-08 thomas test_done "$testroot" "$ret"
291 30f6c0c6 2021-10-08 thomas # -P can only be used in a work tree
292 30f6c0c6 2021-10-08 thomas got diff -r $testroot/repo -P new master 2> $testroot/stderr
294 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
295 30f6c0c6 2021-10-08 thomas echo "diff succeeded unexpectedly" >&2
296 30f6c0c6 2021-10-08 thomas test_done "$testroot" "1"
299 30f6c0c6 2021-10-08 thomas echo "got: -P option can only be used when diffing a work tree" \
300 2a06fe5f 2019-08-24 stsp > $testroot/stderr.expected
301 2a06fe5f 2019-08-24 stsp cmp -s $testroot/stderr.expected $testroot/stderr
303 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
304 2a06fe5f 2019-08-24 stsp diff -u $testroot/stderr.expected $testroot/stderr
305 30f6c0c6 2021-10-08 thomas test_done "$testroot" "$ret"
309 30f6c0c6 2021-10-08 thomas # a single argument which can be resolved to a path is not ambiguous
310 9b4458b4 2022-06-26 thomas echo "diff $testroot/wt" > $testroot/stdout.expected
311 9b4458b4 2022-06-26 thomas echo "commit - $head_rev" >> $testroot/stdout.expected
312 9b4458b4 2022-06-26 thomas echo "path + $testroot/wt" >> $testroot/stdout.expected
313 30f6c0c6 2021-10-08 thomas echo 'blob - /dev/null' >> $testroot/stdout.expected
314 6d054bb9 2022-09-23 thomas echo 'file + new (mode 644)' >> $testroot/stdout.expected
315 30f6c0c6 2021-10-08 thomas echo '--- /dev/null' >> $testroot/stdout.expected
316 30f6c0c6 2021-10-08 thomas echo '+++ new' >> $testroot/stdout.expected
317 30f6c0c6 2021-10-08 thomas echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
318 30f6c0c6 2021-10-08 thomas echo '+new file' >> $testroot/stdout.expected
319 30f6c0c6 2021-10-08 thomas (cd $testroot/wt && got diff new > $testroot/stdout)
321 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
322 30f6c0c6 2021-10-08 thomas echo "diff failed unexpectedly" >&2
323 30f6c0c6 2021-10-08 thomas test_done "$testroot" "1"
326 30f6c0c6 2021-10-08 thomas cmp -s $testroot/stdout.expected $testroot/stdout
328 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
329 30f6c0c6 2021-10-08 thomas diff -u $testroot/stdout.expected $testroot/stdout
330 30f6c0c6 2021-10-08 thomas test_done "$testroot" "$ret"
334 30f6c0c6 2021-10-08 thomas # diff with just one object ID argument results in
335 30f6c0c6 2021-10-08 thomas # interpretation of argument as a path
336 30f6c0c6 2021-10-08 thomas (cd $testroot/wt && got diff $head_rev 2> $testroot/stderr)
338 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
339 30f6c0c6 2021-10-08 thomas echo "diff succeeded unexpectedly" >&2
340 30f6c0c6 2021-10-08 thomas test_done "$testroot" "1"
343 30f6c0c6 2021-10-08 thomas echo "got: $head_rev: No such file or directory" \
344 30f6c0c6 2021-10-08 thomas > $testroot/stderr.expected
345 30f6c0c6 2021-10-08 thomas cmp -s $testroot/stderr.expected $testroot/stderr
347 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
348 30f6c0c6 2021-10-08 thomas diff -u $testroot/stderr.expected $testroot/stderr
349 30f6c0c6 2021-10-08 thomas test_done "$testroot" "$ret"
353 30f6c0c6 2021-10-08 thomas # diff with more than two object arguments results in
354 30f6c0c6 2021-10-08 thomas # interpretation of arguments as paths
355 30f6c0c6 2021-10-08 thomas (cd $testroot/wt && got diff new $head_rev master \
356 30f6c0c6 2021-10-08 thomas > $testroot/stout 2> $testroot/stderr)
358 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
359 30f6c0c6 2021-10-08 thomas echo "diff succeeded unexpectedly" >&2
360 30f6c0c6 2021-10-08 thomas test_done "$testroot" "1"
364 9b4458b4 2022-06-26 thomas echo "diff $testroot/wt" > $testroot/stdout.expected
365 9b4458b4 2022-06-26 thomas echo "commit - $head_rev" >> $testroot/stdout.expected
366 9b4458b4 2022-06-26 thomas echo "path + $testroot/wt" >> $testroot/stdout.expected
367 30f6c0c6 2021-10-08 thomas echo 'blob - /dev/null' >> $testroot/stdout.expected
368 6d054bb9 2022-09-23 thomas echo 'file + new (mode 644)' >> $testroot/stdout.expected
369 30f6c0c6 2021-10-08 thomas echo '--- /dev/null' >> $testroot/stdout.expected
370 30f6c0c6 2021-10-08 thomas echo '+++ new' >> $testroot/stdout.expected
371 30f6c0c6 2021-10-08 thomas echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
372 30f6c0c6 2021-10-08 thomas echo '+new file' >> $testroot/stdout.expected
373 30f6c0c6 2021-10-08 thomas cmp -s $testroot/stdout.expected $testroot/stdout
375 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
376 30f6c0c6 2021-10-08 thomas diff -u $testroot/stdout.expected $testroot/stdout
377 30f6c0c6 2021-10-08 thomas test_done "$testroot" "$ret"
381 30f6c0c6 2021-10-08 thomas echo "got: $head_rev: No such file or directory" \
382 30f6c0c6 2021-10-08 thomas > $testroot/stderr.expected
383 30f6c0c6 2021-10-08 thomas cmp -s $testroot/stderr.expected $testroot/stderr
385 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
386 30f6c0c6 2021-10-08 thomas diff -u $testroot/stderr.expected $testroot/stderr
390 4ad4d490 2022-08-30 thomas # diff two blob ids
391 4ad4d490 2022-08-30 thomas (cd $testroot/wt && got commit -m 'edit' alpha >/dev/null)
392 4ad4d490 2022-08-30 thomas local alpha_new_blobid=`get_blob_id $testroot/repo "" alpha`
393 3870c091 2022-08-31 thomas (cd $testroot/wt && got diff $alpha_blobid $alpha_new_blobid) \
394 3870c091 2022-08-31 thomas > $testroot/diff
396 4ad4d490 2022-08-30 thomas if [ $ret -ne 0 ]; then
397 4ad4d490 2022-08-30 thomas echo "diff failed unexpectedly" >&2
398 4ad4d490 2022-08-30 thomas test_done "$testroot" "$ret"
402 4ad4d490 2022-08-30 thomas cat <<EOF >$testroot/diff.expected
403 4ad4d490 2022-08-30 thomas blob - $alpha_blobid
404 4ad4d490 2022-08-30 thomas blob + $alpha_new_blobid
405 4ad4d490 2022-08-30 thomas --- $alpha_blobid
406 4ad4d490 2022-08-30 thomas +++ $alpha_new_blobid
407 4ad4d490 2022-08-30 thomas @@ -1 +1 @@
409 4ad4d490 2022-08-30 thomas +modified alpha
412 4ad4d490 2022-08-30 thomas cmp -s $testroot/diff.expected $testroot/diff
414 4ad4d490 2022-08-30 thomas if [ $ret -ne 0 ]; then
416 4ad4d490 2022-08-30 thomas diff -u $testroot/diff.expected $testroot/diff
417 4ad4d490 2022-08-30 thomas test_done "$testroot" "$ret"
421 95adcdca 2019-03-27 stsp test_done "$testroot" "$ret"
424 f6cae3ed 2020-09-13 naddy test_diff_shows_conflict() {
425 95adcdca 2019-03-27 stsp local testroot=`test_init diff_shows_conflict 1`
427 95adcdca 2019-03-27 stsp echo "1" > $testroot/repo/numbers
428 95adcdca 2019-03-27 stsp echo "2" >> $testroot/repo/numbers
429 95adcdca 2019-03-27 stsp echo "3" >> $testroot/repo/numbers
430 95adcdca 2019-03-27 stsp echo "4" >> $testroot/repo/numbers
431 95adcdca 2019-03-27 stsp echo "5" >> $testroot/repo/numbers
432 95adcdca 2019-03-27 stsp echo "6" >> $testroot/repo/numbers
433 95adcdca 2019-03-27 stsp echo "7" >> $testroot/repo/numbers
434 95adcdca 2019-03-27 stsp echo "8" >> $testroot/repo/numbers
435 95adcdca 2019-03-27 stsp (cd $testroot/repo && git add numbers)
436 95adcdca 2019-03-27 stsp git_commit $testroot/repo -m "added numbers file"
437 f69721c3 2019-10-21 stsp local base_commit=`git_show_head $testroot/repo`
439 95adcdca 2019-03-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
441 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
442 95adcdca 2019-03-27 stsp test_done "$testroot" "$ret"
446 c206b220 2021-10-09 thomas sed -i '' -e 's/2/22/' $testroot/repo/numbers
447 c206b220 2021-10-09 thomas sed -i '' -e 's/8/33/' $testroot/repo/numbers
448 95adcdca 2019-03-27 stsp git_commit $testroot/repo -m "modified line 2"
449 95adcdca 2019-03-27 stsp local head_rev=`git_show_head $testroot/repo`
451 d136cfcb 2019-10-12 stsp # modify lines 2 and 8 in conflicting ways
452 c206b220 2021-10-09 thomas sed -i '' -e 's/2/77/' $testroot/wt/numbers
453 c206b220 2021-10-09 thomas sed -i '' -e 's/8/88/' $testroot/wt/numbers
455 95adcdca 2019-03-27 stsp echo "C numbers" > $testroot/stdout.expected
456 4f3c844b 2021-09-14 stsp echo -n "Updated to refs/heads/master: $head_rev" \
457 4f3c844b 2021-09-14 stsp >> $testroot/stdout.expected
458 95adcdca 2019-03-27 stsp echo >> $testroot/stdout.expected
459 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
461 95adcdca 2019-03-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
463 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
465 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
466 95adcdca 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
467 95adcdca 2019-03-27 stsp test_done "$testroot" "$ret"
471 9b4458b4 2022-06-26 thomas echo "diff $testroot/wt" > $testroot/stdout.expected
472 9b4458b4 2022-06-26 thomas echo "commit - $head_rev" >> $testroot/stdout.expected
473 9b4458b4 2022-06-26 thomas echo "path + $testroot/wt" >> $testroot/stdout.expected
474 95adcdca 2019-03-27 stsp echo -n 'blob - ' >> $testroot/stdout.expected
475 95adcdca 2019-03-27 stsp got tree -r $testroot/repo -i | grep 'numbers$' | cut -d' ' -f 1 \
476 95adcdca 2019-03-27 stsp >> $testroot/stdout.expected
477 95adcdca 2019-03-27 stsp echo 'file + numbers' >> $testroot/stdout.expected
478 95adcdca 2019-03-27 stsp echo '--- numbers' >> $testroot/stdout.expected
479 95adcdca 2019-03-27 stsp echo '+++ numbers' >> $testroot/stdout.expected
480 d136cfcb 2019-10-12 stsp echo '@@ -1,8 +1,20 @@' >> $testroot/stdout.expected
481 95adcdca 2019-03-27 stsp echo ' 1' >> $testroot/stdout.expected
482 f69721c3 2019-10-21 stsp echo "+<<<<<<< merged change: commit $head_rev" \
483 f69721c3 2019-10-21 stsp >> $testroot/stdout.expected
484 95adcdca 2019-03-27 stsp echo ' 22' >> $testroot/stdout.expected
485 f69721c3 2019-10-21 stsp echo "+||||||| 3-way merge base: commit $base_commit" \
486 f69721c3 2019-10-21 stsp >> $testroot/stdout.expected
487 d136cfcb 2019-10-12 stsp echo '+2' >> $testroot/stdout.expected
488 95adcdca 2019-03-27 stsp echo '+=======' >> $testroot/stdout.expected
489 95adcdca 2019-03-27 stsp echo '+77' >> $testroot/stdout.expected
490 f69721c3 2019-10-21 stsp echo '+>>>>>>>' >> $testroot/stdout.expected
491 95adcdca 2019-03-27 stsp echo ' 3' >> $testroot/stdout.expected
492 95adcdca 2019-03-27 stsp echo ' 4' >> $testroot/stdout.expected
493 95adcdca 2019-03-27 stsp echo ' 5' >> $testroot/stdout.expected
494 d136cfcb 2019-10-12 stsp echo ' 6' >> $testroot/stdout.expected
495 d136cfcb 2019-10-12 stsp echo ' 7' >> $testroot/stdout.expected
496 f69721c3 2019-10-21 stsp echo "+<<<<<<< merged change: commit $head_rev" \
497 f69721c3 2019-10-21 stsp >> $testroot/stdout.expected
498 d136cfcb 2019-10-12 stsp echo ' 33' >> $testroot/stdout.expected
499 f69721c3 2019-10-21 stsp echo "+||||||| 3-way merge base: commit $base_commit" \
500 f69721c3 2019-10-21 stsp >> $testroot/stdout.expected
501 d136cfcb 2019-10-12 stsp echo '+8' >> $testroot/stdout.expected
502 d136cfcb 2019-10-12 stsp echo '+=======' >> $testroot/stdout.expected
503 d136cfcb 2019-10-12 stsp echo '+88' >> $testroot/stdout.expected
504 f69721c3 2019-10-21 stsp echo '+>>>>>>>' >> $testroot/stdout.expected
506 95adcdca 2019-03-27 stsp (cd $testroot/wt && got diff > $testroot/stdout)
508 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
510 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
511 95adcdca 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
513 95adcdca 2019-03-27 stsp test_done "$testroot" "$ret"
516 f6cae3ed 2020-09-13 naddy test_diff_tag() {
517 d24820bf 2019-08-11 stsp local testroot=`test_init diff_tag`
518 d24820bf 2019-08-11 stsp local commit_id0=`git_show_head $testroot/repo`
519 d24820bf 2019-08-11 stsp local tag1=1.0.0
520 d24820bf 2019-08-11 stsp local tag2=2.0.0
522 d24820bf 2019-08-11 stsp echo "modified alpha" > $testroot/repo/alpha
523 d24820bf 2019-08-11 stsp git_commit $testroot/repo -m "changed alpha"
524 d24820bf 2019-08-11 stsp local commit_id1=`git_show_head $testroot/repo`
526 d24820bf 2019-08-11 stsp (cd $testroot/repo && git tag -m "test" $tag1)
528 d24820bf 2019-08-11 stsp echo "new file" > $testroot/repo/new
529 d24820bf 2019-08-11 stsp (cd $testroot/repo && git add new)
530 d24820bf 2019-08-11 stsp git_commit $testroot/repo -m "new file"
531 d24820bf 2019-08-11 stsp local commit_id2=`git_show_head $testroot/repo`
533 d24820bf 2019-08-11 stsp (cd $testroot/repo && git tag -m "test" $tag2)
535 562580bc 2020-01-14 stsp echo "diff $commit_id0 refs/tags/$tag1" > $testroot/stdout.expected
536 9b4458b4 2022-06-26 thomas echo "commit - $commit_id0" >> $testroot/stdout.expected
537 9b4458b4 2022-06-26 thomas echo "commit + $commit_id1" >> $testroot/stdout.expected
538 562580bc 2020-01-14 stsp echo -n 'blob - ' >> $testroot/stdout.expected
539 562580bc 2020-01-14 stsp got tree -r $testroot/repo -c $commit_id0 -i | grep 'alpha$' | \
540 562580bc 2020-01-14 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
541 562580bc 2020-01-14 stsp echo -n 'blob + ' >> $testroot/stdout.expected
542 562580bc 2020-01-14 stsp got tree -r $testroot/repo -i | grep 'alpha$' | cut -d' ' -f 1 \
543 562580bc 2020-01-14 stsp >> $testroot/stdout.expected
544 562580bc 2020-01-14 stsp echo '--- alpha' >> $testroot/stdout.expected
545 562580bc 2020-01-14 stsp echo '+++ alpha' >> $testroot/stdout.expected
546 562580bc 2020-01-14 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
547 562580bc 2020-01-14 stsp echo '-alpha' >> $testroot/stdout.expected
548 562580bc 2020-01-14 stsp echo '+modified alpha' >> $testroot/stdout.expected
550 562580bc 2020-01-14 stsp got diff -r $testroot/repo $commit_id0 $tag1 > $testroot/stdout
551 562580bc 2020-01-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
553 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
554 562580bc 2020-01-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
555 562580bc 2020-01-14 stsp test_done "$testroot" "$ret"
559 562580bc 2020-01-14 stsp echo "diff refs/tags/$tag1 refs/tags/$tag2" > $testroot/stdout.expected
560 9b4458b4 2022-06-26 thomas echo "commit - $commit_id1" >> $testroot/stdout.expected
561 9b4458b4 2022-06-26 thomas echo "commit + $commit_id2" >> $testroot/stdout.expected
562 562580bc 2020-01-14 stsp echo "blob - /dev/null" >> $testroot/stdout.expected
563 562580bc 2020-01-14 stsp echo -n 'blob + ' >> $testroot/stdout.expected
564 562580bc 2020-01-14 stsp got tree -r $testroot/repo -i -c $commit_id2 | grep 'new$' | \
565 562580bc 2020-01-14 stsp cut -d' ' -f 1 | tr -d '\n' >> $testroot/stdout.expected
566 562580bc 2020-01-14 stsp echo " (mode 644)" >> $testroot/stdout.expected
567 562580bc 2020-01-14 stsp echo '--- /dev/null' >> $testroot/stdout.expected
568 562580bc 2020-01-14 stsp echo '+++ new' >> $testroot/stdout.expected
569 562580bc 2020-01-14 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
570 562580bc 2020-01-14 stsp echo '+new file' >> $testroot/stdout.expected
572 562580bc 2020-01-14 stsp got diff -r $testroot/repo $tag1 $tag2 > $testroot/stdout
573 562580bc 2020-01-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
575 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
576 562580bc 2020-01-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
578 562580bc 2020-01-14 stsp test_done "$testroot" "$ret"
581 f6cae3ed 2020-09-13 naddy test_diff_lightweight_tag() {
582 562580bc 2020-01-14 stsp local testroot=`test_init diff_tag`
583 562580bc 2020-01-14 stsp local commit_id0=`git_show_head $testroot/repo`
584 562580bc 2020-01-14 stsp local tag1=1.0.0
585 562580bc 2020-01-14 stsp local tag2=2.0.0
587 562580bc 2020-01-14 stsp echo "modified alpha" > $testroot/repo/alpha
588 562580bc 2020-01-14 stsp git_commit $testroot/repo -m "changed alpha"
589 562580bc 2020-01-14 stsp local commit_id1=`git_show_head $testroot/repo`
591 562580bc 2020-01-14 stsp (cd $testroot/repo && git tag $tag1)
593 562580bc 2020-01-14 stsp echo "new file" > $testroot/repo/new
594 562580bc 2020-01-14 stsp (cd $testroot/repo && git add new)
595 562580bc 2020-01-14 stsp git_commit $testroot/repo -m "new file"
596 562580bc 2020-01-14 stsp local commit_id2=`git_show_head $testroot/repo`
598 562580bc 2020-01-14 stsp (cd $testroot/repo && git tag $tag2)
600 d24820bf 2019-08-11 stsp echo "diff $commit_id0 refs/tags/$tag1" > $testroot/stdout.expected
601 9b4458b4 2022-06-26 thomas echo "commit - $commit_id0" >> $testroot/stdout.expected
602 9b4458b4 2022-06-26 thomas echo "commit + $commit_id1" >> $testroot/stdout.expected
603 d24820bf 2019-08-11 stsp echo -n 'blob - ' >> $testroot/stdout.expected
604 d24820bf 2019-08-11 stsp got tree -r $testroot/repo -c $commit_id0 -i | grep 'alpha$' | \
605 d24820bf 2019-08-11 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
606 d24820bf 2019-08-11 stsp echo -n 'blob + ' >> $testroot/stdout.expected
607 d24820bf 2019-08-11 stsp got tree -r $testroot/repo -i | grep 'alpha$' | cut -d' ' -f 1 \
608 d24820bf 2019-08-11 stsp >> $testroot/stdout.expected
609 d24820bf 2019-08-11 stsp echo '--- alpha' >> $testroot/stdout.expected
610 d24820bf 2019-08-11 stsp echo '+++ alpha' >> $testroot/stdout.expected
611 d24820bf 2019-08-11 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
612 d24820bf 2019-08-11 stsp echo '-alpha' >> $testroot/stdout.expected
613 d24820bf 2019-08-11 stsp echo '+modified alpha' >> $testroot/stdout.expected
615 d24820bf 2019-08-11 stsp got diff -r $testroot/repo $commit_id0 $tag1 > $testroot/stdout
616 d24820bf 2019-08-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
618 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
619 d24820bf 2019-08-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
620 d24820bf 2019-08-11 stsp test_done "$testroot" "$ret"
624 d24820bf 2019-08-11 stsp echo "diff refs/tags/$tag1 refs/tags/$tag2" > $testroot/stdout.expected
625 9b4458b4 2022-06-26 thomas echo "commit - $commit_id1" >> $testroot/stdout.expected
626 9b4458b4 2022-06-26 thomas echo "commit + $commit_id2" >> $testroot/stdout.expected
627 d24820bf 2019-08-11 stsp echo "blob - /dev/null" >> $testroot/stdout.expected
628 d24820bf 2019-08-11 stsp echo -n 'blob + ' >> $testroot/stdout.expected
629 d24820bf 2019-08-11 stsp got tree -r $testroot/repo -i -c $commit_id2 | grep 'new$' | \
630 46f68b20 2019-10-19 stsp cut -d' ' -f 1 | tr -d '\n' >> $testroot/stdout.expected
631 46f68b20 2019-10-19 stsp echo " (mode 644)" >> $testroot/stdout.expected
632 d24820bf 2019-08-11 stsp echo '--- /dev/null' >> $testroot/stdout.expected
633 d24820bf 2019-08-11 stsp echo '+++ new' >> $testroot/stdout.expected
634 d24820bf 2019-08-11 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
635 d24820bf 2019-08-11 stsp echo '+new file' >> $testroot/stdout.expected
637 d24820bf 2019-08-11 stsp got diff -r $testroot/repo $tag1 $tag2 > $testroot/stdout
638 d24820bf 2019-08-11 stsp cmp -s $testroot/stdout.expected $testroot/stdout
640 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
641 d24820bf 2019-08-11 stsp diff -u $testroot/stdout.expected $testroot/stdout
643 d24820bf 2019-08-11 stsp test_done "$testroot" "$ret"
646 f6cae3ed 2020-09-13 naddy test_diff_ignore_whitespace() {
647 63035f9f 2019-10-06 stsp local testroot=`test_init diff_ignore_whitespace`
648 63035f9f 2019-10-06 stsp local commit_id0=`git_show_head $testroot/repo`
650 63035f9f 2019-10-06 stsp got checkout $testroot/repo $testroot/wt > /dev/null
652 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
653 63035f9f 2019-10-06 stsp test_done "$testroot" "$ret"
657 63035f9f 2019-10-06 stsp echo "alpha " > $testroot/wt/alpha
659 63035f9f 2019-10-06 stsp (cd $testroot/wt && got diff -w > $testroot/stdout)
661 9b4458b4 2022-06-26 thomas echo "diff $testroot/wt" > $testroot/stdout.expected
662 9b4458b4 2022-06-26 thomas echo "commit - $commit_id0" >> $testroot/stdout.expected
663 9b4458b4 2022-06-26 thomas echo "path + $testroot/wt" >> $testroot/stdout.expected
664 63035f9f 2019-10-06 stsp echo -n 'blob - ' >> $testroot/stdout.expected
665 63035f9f 2019-10-06 stsp got tree -r $testroot/repo -c $commit_id0 -i | grep 'alpha$' | \
666 63035f9f 2019-10-06 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
667 63035f9f 2019-10-06 stsp echo 'file + alpha' >> $testroot/stdout.expected
669 63035f9f 2019-10-06 stsp cmp -s $testroot/stdout.expected $testroot/stdout
671 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
672 63035f9f 2019-10-06 stsp diff -u $testroot/stdout.expected $testroot/stdout
674 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
677 f6cae3ed 2020-09-13 naddy test_diff_submodule_of_same_repo() {
678 e7303626 2020-05-14 stsp local testroot=`test_init diff_submodule_of_same_repo`
680 e7303626 2020-05-14 stsp (cd $testroot && git clone -q repo repo2 >/dev/null)
681 bf3ab206 2022-10-24 thomas (cd $testroot/repo && git -c protocol.file.allow=always \
682 bf3ab206 2022-10-24 thomas submodule -q add ../repo2)
683 e7303626 2020-05-14 stsp (cd $testroot/repo && git commit -q -m 'adding submodule')
685 e7303626 2020-05-14 stsp epsilon_id=$(got tree -r $testroot/repo -i | grep 'epsilon/$' | \
686 e7303626 2020-05-14 stsp cut -d ' ' -f 1)
687 e7303626 2020-05-14 stsp submodule_id=$(got tree -r $testroot/repo -i | grep 'repo2\$$' | \
688 e7303626 2020-05-14 stsp cut -d ' ' -f 1)
690 e7303626 2020-05-14 stsp # Attempt a (nonsensical) diff between a tree object and a submodule.
691 e7303626 2020-05-14 stsp # Currently fails with "wrong type of object" error
692 e7303626 2020-05-14 stsp got diff -r $testroot/repo $epsilon_id $submodule_id \
693 e7303626 2020-05-14 stsp > $testroot/stdout 2> $testroot/stderr
695 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
696 e7303626 2020-05-14 stsp echo "diff command succeeded unexpectedly" >&2
697 e7303626 2020-05-14 stsp test_done "$testroot" "1"
700 e7303626 2020-05-14 stsp echo "got: wrong type of object" > $testroot/stderr.expected
702 e7303626 2020-05-14 stsp cmp -s $testroot/stderr.expected $testroot/stderr
704 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
705 e7303626 2020-05-14 stsp diff -u $testroot/stderr.expected $testroot/stderr
708 63035f9f 2019-10-06 stsp test_done "$testroot" "$ret"
711 f6cae3ed 2020-09-13 naddy test_diff_symlinks_in_work_tree() {
712 39449a05 2020-07-23 stsp local testroot=`test_init diff_symlinks_in_work_tree`
714 39449a05 2020-07-23 stsp (cd $testroot/repo && ln -s alpha alpha.link)
715 39449a05 2020-07-23 stsp (cd $testroot/repo && ln -s epsilon epsilon.link)
716 39449a05 2020-07-23 stsp (cd $testroot/repo && ln -s /etc/passwd passwd.link)
717 39449a05 2020-07-23 stsp (cd $testroot/repo && ln -s ../beta epsilon/beta.link)
718 39449a05 2020-07-23 stsp (cd $testroot/repo && ln -s nonexistent nonexistent.link)
719 39449a05 2020-07-23 stsp (cd $testroot/repo && ln -s .got/foo dotgotfoo.link)
720 39449a05 2020-07-23 stsp (cd $testroot/repo && git add .)
721 39449a05 2020-07-23 stsp git_commit $testroot/repo -m "add symlinks"
722 39449a05 2020-07-23 stsp local commit_id1=`git_show_head $testroot/repo`
724 39449a05 2020-07-23 stsp got checkout $testroot/repo $testroot/wt > /dev/null
726 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
727 39449a05 2020-07-23 stsp test_done "$testroot" "$ret"
731 39449a05 2020-07-23 stsp (cd $testroot/wt && ln -sf beta alpha.link)
732 dd6165e4 2021-09-21 thomas.ad (cd $testroot/wt && ln -sfT gamma epsilon.link)
733 39449a05 2020-07-23 stsp (cd $testroot/wt && ln -sf ../gamma/delta epsilon/beta.link)
734 39449a05 2020-07-23 stsp echo -n '.got/bar' > $testroot/wt/dotgotfoo.link
735 39449a05 2020-07-23 stsp (cd $testroot/wt && got rm nonexistent.link > /dev/null)
736 39449a05 2020-07-23 stsp (cd $testroot/wt && ln -sf epsilon/zeta zeta.link)
737 39449a05 2020-07-23 stsp (cd $testroot/wt && got add zeta.link > /dev/null)
738 39449a05 2020-07-23 stsp (cd $testroot/wt && got diff > $testroot/stdout)
740 9b4458b4 2022-06-26 thomas echo "diff $testroot/wt" > $testroot/stdout.expected
741 9b4458b4 2022-06-26 thomas echo "commit - $commit_id1" >> $testroot/stdout.expected
742 9b4458b4 2022-06-26 thomas echo "path + $testroot/wt" >> $testroot/stdout.expected
743 39449a05 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
744 39449a05 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id1 -i | \
745 39449a05 2020-07-23 stsp grep 'alpha.link@ -> alpha$' | \
746 39449a05 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
747 39449a05 2020-07-23 stsp echo 'file + alpha.link' >> $testroot/stdout.expected
748 39449a05 2020-07-23 stsp echo '--- alpha.link' >> $testroot/stdout.expected
749 39449a05 2020-07-23 stsp echo '+++ alpha.link' >> $testroot/stdout.expected
750 39449a05 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
751 39449a05 2020-07-23 stsp echo '-alpha' >> $testroot/stdout.expected
752 39449a05 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
753 39449a05 2020-07-23 stsp echo '+beta' >> $testroot/stdout.expected
754 39449a05 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
755 39449a05 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
756 39449a05 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id1 -i | \
757 39449a05 2020-07-23 stsp grep 'dotgotfoo.link@ -> .got/foo$' | \
758 39449a05 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
759 39449a05 2020-07-23 stsp echo 'file + dotgotfoo.link' >> $testroot/stdout.expected
760 39449a05 2020-07-23 stsp echo '--- dotgotfoo.link' >> $testroot/stdout.expected
761 39449a05 2020-07-23 stsp echo '+++ dotgotfoo.link' >> $testroot/stdout.expected
762 39449a05 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
763 39449a05 2020-07-23 stsp echo '-.got/foo' >> $testroot/stdout.expected
764 39449a05 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
765 39449a05 2020-07-23 stsp echo '+.got/bar' >> $testroot/stdout.expected
766 39449a05 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
767 39449a05 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
768 39449a05 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id1 -i epsilon | \
769 39449a05 2020-07-23 stsp grep 'beta.link@ -> ../beta$' | \
770 39449a05 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
771 39449a05 2020-07-23 stsp echo 'file + epsilon/beta.link' >> $testroot/stdout.expected
772 39449a05 2020-07-23 stsp echo '--- epsilon/beta.link' >> $testroot/stdout.expected
773 39449a05 2020-07-23 stsp echo '+++ epsilon/beta.link' >> $testroot/stdout.expected
774 39449a05 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
775 39449a05 2020-07-23 stsp echo '-../beta' >> $testroot/stdout.expected
776 39449a05 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
777 39449a05 2020-07-23 stsp echo '+../gamma/delta' >> $testroot/stdout.expected
778 4135d7d0 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
779 4135d7d0 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
780 4135d7d0 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id1 -i | \
781 4135d7d0 2020-07-23 stsp grep 'epsilon.link@ -> epsilon$' | \
782 4135d7d0 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
783 4135d7d0 2020-07-23 stsp echo 'file + epsilon.link' >> $testroot/stdout.expected
784 4135d7d0 2020-07-23 stsp echo '--- epsilon.link' >> $testroot/stdout.expected
785 4135d7d0 2020-07-23 stsp echo '+++ epsilon.link' >> $testroot/stdout.expected
786 4135d7d0 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
787 4135d7d0 2020-07-23 stsp echo '-epsilon' >> $testroot/stdout.expected
788 39449a05 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
789 4135d7d0 2020-07-23 stsp echo '+gamma' >> $testroot/stdout.expected
790 4135d7d0 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
791 39449a05 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
792 39449a05 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id1 -i | \
793 39449a05 2020-07-23 stsp grep 'nonexistent.link@ -> nonexistent$' | \
794 39449a05 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
795 39449a05 2020-07-23 stsp echo 'file + /dev/null' >> $testroot/stdout.expected
796 39449a05 2020-07-23 stsp echo '--- nonexistent.link' >> $testroot/stdout.expected
797 1cb46f00 2020-11-21 stsp echo '+++ /dev/null' >> $testroot/stdout.expected
798 39449a05 2020-07-23 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
799 39449a05 2020-07-23 stsp echo '-nonexistent' >> $testroot/stdout.expected
800 39449a05 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
801 39449a05 2020-07-23 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
802 6d054bb9 2022-09-23 thomas echo 'file + zeta.link (mode 120000)' >> $testroot/stdout.expected
803 1cb46f00 2020-11-21 stsp echo '--- /dev/null' >> $testroot/stdout.expected
804 40dde666 2020-07-23 stsp echo '+++ zeta.link' >> $testroot/stdout.expected
805 40dde666 2020-07-23 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
806 40dde666 2020-07-23 stsp echo '+epsilon/zeta' >> $testroot/stdout.expected
807 40dde666 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
809 40dde666 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
811 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
812 40dde666 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
814 40dde666 2020-07-23 stsp test_done "$testroot" "$ret"
817 f6cae3ed 2020-09-13 naddy test_diff_symlinks_in_repo() {
818 40dde666 2020-07-23 stsp local testroot=`test_init diff_symlinks_in_repo`
820 40dde666 2020-07-23 stsp (cd $testroot/repo && ln -s alpha alpha.link)
821 40dde666 2020-07-23 stsp (cd $testroot/repo && ln -s epsilon epsilon.link)
822 40dde666 2020-07-23 stsp (cd $testroot/repo && ln -s /etc/passwd passwd.link)
823 40dde666 2020-07-23 stsp (cd $testroot/repo && ln -s ../beta epsilon/beta.link)
824 40dde666 2020-07-23 stsp (cd $testroot/repo && ln -s nonexistent nonexistent.link)
825 40dde666 2020-07-23 stsp (cd $testroot/repo && ln -s .got/foo dotgotfoo.link)
826 40dde666 2020-07-23 stsp (cd $testroot/repo && git add .)
827 40dde666 2020-07-23 stsp git_commit $testroot/repo -m "add symlinks"
828 40dde666 2020-07-23 stsp local commit_id1=`git_show_head $testroot/repo`
830 40dde666 2020-07-23 stsp (cd $testroot/repo && ln -sf beta alpha.link)
831 dd6165e4 2021-09-21 thomas.ad (cd $testroot/repo && ln -sfT gamma epsilon.link)
832 40dde666 2020-07-23 stsp (cd $testroot/repo && ln -sf ../gamma/delta epsilon/beta.link)
833 40dde666 2020-07-23 stsp (cd $testroot/repo && ln -sf .got/bar $testroot/repo/dotgotfoo.link)
834 40dde666 2020-07-23 stsp (cd $testroot/repo && git rm -q nonexistent.link)
835 40dde666 2020-07-23 stsp (cd $testroot/repo && ln -sf epsilon/zeta zeta.link)
836 40dde666 2020-07-23 stsp (cd $testroot/repo && git add .)
837 40dde666 2020-07-23 stsp git_commit $testroot/repo -m "change symlinks"
838 40dde666 2020-07-23 stsp local commit_id2=`git_show_head $testroot/repo`
840 40dde666 2020-07-23 stsp got diff -r $testroot/repo $commit_id1 $commit_id2 > $testroot/stdout
842 40dde666 2020-07-23 stsp echo "diff $commit_id1 $commit_id2" > $testroot/stdout.expected
843 9b4458b4 2022-06-26 thomas echo "commit - $commit_id1" >> $testroot/stdout.expected
844 9b4458b4 2022-06-26 thomas echo "commit + $commit_id2" >> $testroot/stdout.expected
845 40dde666 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
846 40dde666 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id1 -i | \
847 40dde666 2020-07-23 stsp grep 'alpha.link@ -> alpha$' | \
848 40dde666 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
849 40dde666 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
850 40dde666 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id2 -i | \
851 40dde666 2020-07-23 stsp grep 'alpha.link@ -> beta$' | \
852 40dde666 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
853 40dde666 2020-07-23 stsp echo '--- alpha.link' >> $testroot/stdout.expected
854 40dde666 2020-07-23 stsp echo '+++ alpha.link' >> $testroot/stdout.expected
855 40dde666 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
856 40dde666 2020-07-23 stsp echo '-alpha' >> $testroot/stdout.expected
857 40dde666 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
858 40dde666 2020-07-23 stsp echo '+beta' >> $testroot/stdout.expected
859 40dde666 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
860 40dde666 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
861 40dde666 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id1 -i | \
862 40dde666 2020-07-23 stsp grep 'dotgotfoo.link@ -> .got/foo$' | \
863 40dde666 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
864 40dde666 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
865 40dde666 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id2 -i | \
866 40dde666 2020-07-23 stsp grep 'dotgotfoo.link@ -> .got/bar$' | \
867 40dde666 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
868 40dde666 2020-07-23 stsp echo '--- dotgotfoo.link' >> $testroot/stdout.expected
869 40dde666 2020-07-23 stsp echo '+++ dotgotfoo.link' >> $testroot/stdout.expected
870 40dde666 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
871 40dde666 2020-07-23 stsp echo '-.got/foo' >> $testroot/stdout.expected
872 40dde666 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
873 40dde666 2020-07-23 stsp echo '+.got/bar' >> $testroot/stdout.expected
874 40dde666 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
875 40dde666 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
876 40dde666 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id1 -i epsilon | \
877 40dde666 2020-07-23 stsp grep 'beta.link@ -> ../beta$' | \
878 40dde666 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
879 40dde666 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
880 40dde666 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id2 -i epsilon | \
881 40dde666 2020-07-23 stsp grep 'beta.link@ -> ../gamma/delta$' | \
882 40dde666 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
883 40dde666 2020-07-23 stsp echo '--- epsilon/beta.link' >> $testroot/stdout.expected
884 40dde666 2020-07-23 stsp echo '+++ epsilon/beta.link' >> $testroot/stdout.expected
885 40dde666 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
886 40dde666 2020-07-23 stsp echo '-../beta' >> $testroot/stdout.expected
887 40dde666 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
888 40dde666 2020-07-23 stsp echo '+../gamma/delta' >> $testroot/stdout.expected
889 40dde666 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
890 40dde666 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
891 40dde666 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id1 -i | \
892 40dde666 2020-07-23 stsp grep 'epsilon.link@ -> epsilon$' | \
893 40dde666 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
894 40dde666 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
895 40dde666 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id2 -i | \
896 40dde666 2020-07-23 stsp grep 'epsilon.link@ -> gamma$' | \
897 40dde666 2020-07-23 stsp cut -d' ' -f 1 >> $testroot/stdout.expected
898 40dde666 2020-07-23 stsp echo '--- epsilon.link' >> $testroot/stdout.expected
899 40dde666 2020-07-23 stsp echo '+++ epsilon.link' >> $testroot/stdout.expected
900 40dde666 2020-07-23 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
901 40dde666 2020-07-23 stsp echo '-epsilon' >> $testroot/stdout.expected
902 40dde666 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
903 40dde666 2020-07-23 stsp echo '+gamma' >> $testroot/stdout.expected
904 40dde666 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
905 40dde666 2020-07-23 stsp echo -n 'blob - ' >> $testroot/stdout.expected
906 40dde666 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id1 -i | \
907 40dde666 2020-07-23 stsp grep 'nonexistent.link@ -> nonexistent$' | \
908 40dde666 2020-07-23 stsp cut -d' ' -f 1 | sed -e 's/$/ (mode 120000)/' \
909 40dde666 2020-07-23 stsp >> $testroot/stdout.expected
910 40dde666 2020-07-23 stsp echo 'blob + /dev/null' >> $testroot/stdout.expected
911 40dde666 2020-07-23 stsp echo '--- nonexistent.link' >> $testroot/stdout.expected
912 40dde666 2020-07-23 stsp echo '+++ /dev/null' >> $testroot/stdout.expected
913 40dde666 2020-07-23 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
914 40dde666 2020-07-23 stsp echo '-nonexistent' >> $testroot/stdout.expected
915 40dde666 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
916 40dde666 2020-07-23 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
917 40dde666 2020-07-23 stsp echo -n 'blob + ' >> $testroot/stdout.expected
918 40dde666 2020-07-23 stsp got tree -r $testroot/repo -c $commit_id2 -i | \
919 40dde666 2020-07-23 stsp grep 'zeta.link@ -> epsilon/zeta$' | \
920 40dde666 2020-07-23 stsp cut -d' ' -f 1 | sed -e 's/$/ (mode 120000)/' \
921 40dde666 2020-07-23 stsp >> $testroot/stdout.expected
922 40dde666 2020-07-23 stsp echo '--- /dev/null' >> $testroot/stdout.expected
923 39449a05 2020-07-23 stsp echo '+++ zeta.link' >> $testroot/stdout.expected
924 39449a05 2020-07-23 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
925 39449a05 2020-07-23 stsp echo '+epsilon/zeta' >> $testroot/stdout.expected
926 39449a05 2020-07-23 stsp echo '\ No newline at end of file' >> $testroot/stdout.expected
928 39449a05 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
930 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
931 39449a05 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
933 dffd0deb 2020-11-20 stsp test_done "$testroot" "$ret"
936 dffd0deb 2020-11-20 stsp test_diff_binary_files() {
937 dffd0deb 2020-11-20 stsp local testroot=`test_init diff_binary_files`
938 dffd0deb 2020-11-20 stsp local head_rev=`git_show_head $testroot/repo`
940 dffd0deb 2020-11-20 stsp got checkout $testroot/repo $testroot/wt > /dev/null
942 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
943 dffd0deb 2020-11-20 stsp test_done "$testroot" "$ret"
947 dffd0deb 2020-11-20 stsp printf '\377\377\0\0\377\377\0\0' > $testroot/wt/foo
948 dffd0deb 2020-11-20 stsp (cd $testroot/wt && got add foo >/dev/null)
950 9b4458b4 2022-06-26 thomas echo "diff $testroot/wt" > $testroot/stdout.expected
951 9b4458b4 2022-06-26 thomas echo "commit - $head_rev" >> $testroot/stdout.expected
952 9b4458b4 2022-06-26 thomas echo "path + $testroot/wt" >> $testroot/stdout.expected
953 64453f7e 2020-11-21 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
954 6d054bb9 2022-09-23 thomas echo 'file + foo (mode 644)' >> $testroot/stdout.expected
955 1cb46f00 2020-11-21 stsp echo "Binary files /dev/null and foo differ" \
956 1cb46f00 2020-11-21 stsp >> $testroot/stdout.expected
958 64453f7e 2020-11-21 stsp (cd $testroot/wt && got diff > $testroot/stdout)
959 64453f7e 2020-11-21 stsp cmp -s $testroot/stdout.expected $testroot/stdout
961 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
962 64453f7e 2020-11-21 stsp diff -a -u $testroot/stdout.expected $testroot/stdout
963 64453f7e 2020-11-21 stsp test_done "$testroot" "$ret"
967 9b4458b4 2022-06-26 thomas echo "diff $testroot/wt" > $testroot/stdout.expected
968 9b4458b4 2022-06-26 thomas echo "commit - $head_rev" >> $testroot/stdout.expected
969 9b4458b4 2022-06-26 thomas echo "path + $testroot/wt" >> $testroot/stdout.expected
970 dffd0deb 2020-11-20 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
971 6d054bb9 2022-09-23 thomas echo 'file + foo (mode 644)' >> $testroot/stdout.expected
972 1cb46f00 2020-11-21 stsp echo '--- /dev/null' >> $testroot/stdout.expected
973 dffd0deb 2020-11-20 stsp echo '+++ foo' >> $testroot/stdout.expected
974 dffd0deb 2020-11-20 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
975 dffd0deb 2020-11-20 stsp printf '+\377\377\0\0\377\377\0\0\n' >> $testroot/stdout.expected
976 578133c9 2020-11-28 naddy printf '\\ No newline at end of file\n' >> $testroot/stdout.expected
978 64453f7e 2020-11-21 stsp (cd $testroot/wt && got diff -a > $testroot/stdout)
979 dffd0deb 2020-11-20 stsp cmp -s $testroot/stdout.expected $testroot/stdout
981 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
982 dffd0deb 2020-11-20 stsp diff -a -u $testroot/stdout.expected $testroot/stdout
983 dffd0deb 2020-11-20 stsp test_done "$testroot" "$ret"
987 dffd0deb 2020-11-20 stsp (cd $testroot/wt && got commit -m 'add binary file' > /dev/null)
988 dffd0deb 2020-11-20 stsp local head_rev=`git_show_head $testroot/repo`
990 dffd0deb 2020-11-20 stsp printf '\377\200\0\0\377\200\0\0' > $testroot/wt/foo
992 9b4458b4 2022-06-26 thomas echo "diff $testroot/wt" > $testroot/stdout.expected
993 9b4458b4 2022-06-26 thomas echo "commit - $head_rev" >> $testroot/stdout.expected
994 9b4458b4 2022-06-26 thomas echo "path + $testroot/wt" >> $testroot/stdout.expected
995 dffd0deb 2020-11-20 stsp echo -n 'blob - ' >> $testroot/stdout.expected
996 dffd0deb 2020-11-20 stsp got tree -r $testroot/repo -i | grep 'foo$' | cut -d' ' -f 1 \
997 dffd0deb 2020-11-20 stsp >> $testroot/stdout.expected
998 dffd0deb 2020-11-20 stsp echo 'file + foo' >> $testroot/stdout.expected
999 dffd0deb 2020-11-20 stsp echo '--- foo' >> $testroot/stdout.expected
1000 dffd0deb 2020-11-20 stsp echo '+++ foo' >> $testroot/stdout.expected
1001 dffd0deb 2020-11-20 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
1002 578133c9 2020-11-28 naddy printf -- '-\377\377\0\0\377\377\0\0\n' >> $testroot/stdout.expected
1003 578133c9 2020-11-28 naddy printf '\\ No newline at end of file\n' >> $testroot/stdout.expected
1004 dffd0deb 2020-11-20 stsp printf '+\377\200\0\0\377\200\0\0\n' >> $testroot/stdout.expected
1005 578133c9 2020-11-28 naddy printf '\\ No newline at end of file\n' >> $testroot/stdout.expected
1007 64453f7e 2020-11-21 stsp (cd $testroot/wt && got diff -a > $testroot/stdout)
1008 dffd0deb 2020-11-20 stsp cmp -s $testroot/stdout.expected $testroot/stdout
1010 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1011 dffd0deb 2020-11-20 stsp diff -a -u $testroot/stdout.expected $testroot/stdout
1013 cc8021af 2021-10-12 thomas test_done "$testroot" "$ret"
1016 cc8021af 2021-10-12 thomas test_diff_commits() {
1017 cc8021af 2021-10-12 thomas local testroot=`test_init diff_commits`
1018 cc8021af 2021-10-12 thomas local commit_id0=`git_show_head $testroot/repo`
1019 e80ef83e 2023-01-10 thomas local alpha_id0=`get_blob_id $testroot/repo "" alpha`
1020 e80ef83e 2023-01-10 thomas local beta_id0=`get_blob_id $testroot/repo "" beta`
1022 cc8021af 2021-10-12 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1024 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1025 cc8021af 2021-10-12 thomas test_done "$testroot" "$ret"
1026 cc8021af 2021-10-12 thomas return 1
1029 cc8021af 2021-10-12 thomas echo "modified alpha" > $testroot/wt/alpha
1030 cc8021af 2021-10-12 thomas (cd $testroot/wt && got rm beta >/dev/null)
1031 cc8021af 2021-10-12 thomas echo "new file" > $testroot/wt/new
1032 cc8021af 2021-10-12 thomas (cd $testroot/wt && got add new >/dev/null)
1033 cc8021af 2021-10-12 thomas (cd $testroot/wt && got commit -m 'committing changes' >/dev/null)
1034 cc8021af 2021-10-12 thomas local commit_id1=`git_show_head $testroot/repo`
1036 cc8021af 2021-10-12 thomas alpha_id1=`get_blob_id $testroot/repo "" alpha`
1037 cc8021af 2021-10-12 thomas new_id1=`get_blob_id $testroot/repo "" new`
1039 cc8021af 2021-10-12 thomas echo "diff $commit_id0 refs/heads/master" > $testroot/stdout.expected
1040 9b4458b4 2022-06-26 thomas echo "commit - $commit_id0" >> $testroot/stdout.expected
1041 9b4458b4 2022-06-26 thomas echo "commit + $commit_id1" >> $testroot/stdout.expected
1042 cc8021af 2021-10-12 thomas echo "blob - $alpha_id0" >> $testroot/stdout.expected
1043 cc8021af 2021-10-12 thomas echo "blob + $alpha_id1" >> $testroot/stdout.expected
1044 cc8021af 2021-10-12 thomas echo '--- alpha' >> $testroot/stdout.expected
1045 cc8021af 2021-10-12 thomas echo '+++ alpha' >> $testroot/stdout.expected
1046 cc8021af 2021-10-12 thomas echo '@@ -1 +1 @@' >> $testroot/stdout.expected
1047 cc8021af 2021-10-12 thomas echo '-alpha' >> $testroot/stdout.expected
1048 cc8021af 2021-10-12 thomas echo '+modified alpha' >> $testroot/stdout.expected
1049 cc8021af 2021-10-12 thomas echo "blob - $beta_id0 (mode 644)" >> $testroot/stdout.expected
1050 cc8021af 2021-10-12 thomas echo 'blob + /dev/null' >> $testroot/stdout.expected
1051 cc8021af 2021-10-12 thomas echo '--- beta' >> $testroot/stdout.expected
1052 cc8021af 2021-10-12 thomas echo '+++ /dev/null' >> $testroot/stdout.expected
1053 cc8021af 2021-10-12 thomas echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
1054 cc8021af 2021-10-12 thomas echo '-beta' >> $testroot/stdout.expected
1055 cc8021af 2021-10-12 thomas echo 'blob - /dev/null' >> $testroot/stdout.expected
1056 cc8021af 2021-10-12 thomas echo "blob + $new_id1 (mode 644)" >> $testroot/stdout.expected
1057 cc8021af 2021-10-12 thomas echo '--- /dev/null' >> $testroot/stdout.expected
1058 cc8021af 2021-10-12 thomas echo '+++ new' >> $testroot/stdout.expected
1059 cc8021af 2021-10-12 thomas echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
1060 cc8021af 2021-10-12 thomas echo '+new file' >> $testroot/stdout.expected
1062 cc8021af 2021-10-12 thomas (cd $testroot/wt && got diff -c master > $testroot/stdout)
1063 cc8021af 2021-10-12 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1065 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1066 cc8021af 2021-10-12 thomas diff -u $testroot/stdout.expected $testroot/stdout
1067 cc8021af 2021-10-12 thomas test_done "$testroot" "$ret"
1068 cc8021af 2021-10-12 thomas return 1
1071 cc8021af 2021-10-12 thomas # same diff with explicit parent commit ID
1072 cc8021af 2021-10-12 thomas (cd $testroot/wt && got diff -c $commit_id0 -c master \
1073 cc8021af 2021-10-12 thomas > $testroot/stdout)
1074 cc8021af 2021-10-12 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1076 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1077 cc8021af 2021-10-12 thomas diff -u $testroot/stdout.expected $testroot/stdout
1078 cc8021af 2021-10-12 thomas test_done "$testroot" "$ret"
1079 cc8021af 2021-10-12 thomas return 1
1082 cc8021af 2021-10-12 thomas # same diff with commit object IDs
1083 cc8021af 2021-10-12 thomas echo "diff $commit_id0 $commit_id1" > $testroot/stdout.expected
1084 9b4458b4 2022-06-26 thomas echo "commit - $commit_id0" >> $testroot/stdout.expected
1085 9b4458b4 2022-06-26 thomas echo "commit + $commit_id1" >> $testroot/stdout.expected
1086 cc8021af 2021-10-12 thomas echo "blob - $alpha_id0" >> $testroot/stdout.expected
1087 cc8021af 2021-10-12 thomas echo "blob + $alpha_id1" >> $testroot/stdout.expected
1088 cc8021af 2021-10-12 thomas echo '--- alpha' >> $testroot/stdout.expected
1089 cc8021af 2021-10-12 thomas echo '+++ alpha' >> $testroot/stdout.expected
1090 cc8021af 2021-10-12 thomas echo '@@ -1 +1 @@' >> $testroot/stdout.expected
1091 cc8021af 2021-10-12 thomas echo '-alpha' >> $testroot/stdout.expected
1092 cc8021af 2021-10-12 thomas echo '+modified alpha' >> $testroot/stdout.expected
1093 cc8021af 2021-10-12 thomas echo "blob - $beta_id0 (mode 644)" >> $testroot/stdout.expected
1094 cc8021af 2021-10-12 thomas echo 'blob + /dev/null' >> $testroot/stdout.expected
1095 cc8021af 2021-10-12 thomas echo '--- beta' >> $testroot/stdout.expected
1096 cc8021af 2021-10-12 thomas echo '+++ /dev/null' >> $testroot/stdout.expected
1097 cc8021af 2021-10-12 thomas echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
1098 cc8021af 2021-10-12 thomas echo '-beta' >> $testroot/stdout.expected
1099 cc8021af 2021-10-12 thomas echo 'blob - /dev/null' >> $testroot/stdout.expected
1100 cc8021af 2021-10-12 thomas echo "blob + $new_id1 (mode 644)" >> $testroot/stdout.expected
1101 cc8021af 2021-10-12 thomas echo '--- /dev/null' >> $testroot/stdout.expected
1102 cc8021af 2021-10-12 thomas echo '+++ new' >> $testroot/stdout.expected
1103 cc8021af 2021-10-12 thomas echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
1104 cc8021af 2021-10-12 thomas echo '+new file' >> $testroot/stdout.expected
1105 cc8021af 2021-10-12 thomas (cd $testroot/wt && got diff -c $commit_id0 -c $commit_id1 \
1106 cc8021af 2021-10-12 thomas > $testroot/stdout)
1107 cc8021af 2021-10-12 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1109 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1110 cc8021af 2021-10-12 thomas diff -u $testroot/stdout.expected $testroot/stdout
1111 cc8021af 2021-10-12 thomas test_done "$testroot" "$ret"
1112 cc8021af 2021-10-12 thomas return 1
1115 cc8021af 2021-10-12 thomas # same diff, filtered by paths
1116 cc8021af 2021-10-12 thomas echo "diff $commit_id0 $commit_id1" > $testroot/stdout.expected
1117 9b4458b4 2022-06-26 thomas echo "commit - $commit_id0" >> $testroot/stdout.expected
1118 9b4458b4 2022-06-26 thomas echo "commit + $commit_id1" >> $testroot/stdout.expected
1119 cc8021af 2021-10-12 thomas echo "blob - $alpha_id0" >> $testroot/stdout.expected
1120 cc8021af 2021-10-12 thomas echo "blob + $alpha_id1" >> $testroot/stdout.expected
1121 cc8021af 2021-10-12 thomas echo '--- alpha' >> $testroot/stdout.expected
1122 cc8021af 2021-10-12 thomas echo '+++ alpha' >> $testroot/stdout.expected
1123 cc8021af 2021-10-12 thomas echo '@@ -1 +1 @@' >> $testroot/stdout.expected
1124 cc8021af 2021-10-12 thomas echo '-alpha' >> $testroot/stdout.expected
1125 cc8021af 2021-10-12 thomas echo '+modified alpha' >> $testroot/stdout.expected
1126 cc8021af 2021-10-12 thomas (cd $testroot/repo && got diff -c $commit_id0 -c $commit_id1 alpha \
1127 cc8021af 2021-10-12 thomas > $testroot/stdout)
1128 cc8021af 2021-10-12 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1130 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1131 cc8021af 2021-10-12 thomas diff -u $testroot/stdout.expected $testroot/stdout
1132 cc8021af 2021-10-12 thomas test_done "$testroot" "$ret"
1133 cc8021af 2021-10-12 thomas return 1
1135 cc8021af 2021-10-12 thomas # same in a work tree
1136 cc8021af 2021-10-12 thomas (cd $testroot/wt && got diff -c $commit_id0 -c $commit_id1 alpha \
1137 cc8021af 2021-10-12 thomas > $testroot/stdout)
1138 cc8021af 2021-10-12 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1140 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1141 cc8021af 2021-10-12 thomas diff -u $testroot/stdout.expected $testroot/stdout
1142 cc8021af 2021-10-12 thomas test_done "$testroot" "$ret"
1143 cc8021af 2021-10-12 thomas return 1
1146 cc8021af 2021-10-12 thomas echo "diff $commit_id0 $commit_id1" > $testroot/stdout.expected
1147 9b4458b4 2022-06-26 thomas echo "commit - $commit_id0" >> $testroot/stdout.expected
1148 9b4458b4 2022-06-26 thomas echo "commit + $commit_id1" >> $testroot/stdout.expected
1149 cc8021af 2021-10-12 thomas echo "blob - $beta_id0 (mode 644)" >> $testroot/stdout.expected
1150 cc8021af 2021-10-12 thomas echo 'blob + /dev/null' >> $testroot/stdout.expected
1151 cc8021af 2021-10-12 thomas echo '--- beta' >> $testroot/stdout.expected
1152 cc8021af 2021-10-12 thomas echo '+++ /dev/null' >> $testroot/stdout.expected
1153 cc8021af 2021-10-12 thomas echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
1154 cc8021af 2021-10-12 thomas echo '-beta' >> $testroot/stdout.expected
1155 cc8021af 2021-10-12 thomas echo 'blob - /dev/null' >> $testroot/stdout.expected
1156 cc8021af 2021-10-12 thomas echo "blob + $new_id1 (mode 644)" >> $testroot/stdout.expected
1157 cc8021af 2021-10-12 thomas echo '--- /dev/null' >> $testroot/stdout.expected
1158 cc8021af 2021-10-12 thomas echo '+++ new' >> $testroot/stdout.expected
1159 cc8021af 2021-10-12 thomas echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
1160 cc8021af 2021-10-12 thomas echo '+new file' >> $testroot/stdout.expected
1161 cc8021af 2021-10-12 thomas (cd $testroot/repo && got diff -c $commit_id0 -c $commit_id1 \
1162 cc8021af 2021-10-12 thomas beta new > $testroot/stdout)
1163 cc8021af 2021-10-12 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1165 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1166 cc8021af 2021-10-12 thomas diff -u $testroot/stdout.expected $testroot/stdout
1167 cc8021af 2021-10-12 thomas test_done "$testroot" "$ret"
1168 cc8021af 2021-10-12 thomas return 1
1171 cc8021af 2021-10-12 thomas # more than two -c options are not allowed
1172 cc8021af 2021-10-12 thomas (cd $testroot/repo && got diff -c $commit_id0 -c $commit_id1 -c foo \
1173 cc8021af 2021-10-12 thomas 2> $testroot/stderr)
1175 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
1176 cc8021af 2021-10-12 thomas echo "diff succeeded unexpectedly" >&2
1177 cc8021af 2021-10-12 thomas test_done "$testroot" "1"
1178 cc8021af 2021-10-12 thomas return 1
1180 cc8021af 2021-10-12 thomas echo "got: too many -c options used" > $testroot/stderr.expected
1181 cc8021af 2021-10-12 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1183 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1184 cc8021af 2021-10-12 thomas diff -u $testroot/stderr.expected $testroot/stderr
1185 cc8021af 2021-10-12 thomas test_done "$testroot" "$ret"
1186 cc8021af 2021-10-12 thomas return 1
1189 cc8021af 2021-10-12 thomas # use of -c options implies a repository diff; use with -P is an error
1190 cc8021af 2021-10-12 thomas (cd $testroot/wt && got diff -c $commit_id0 -c $commit_id1 -P foo \
1191 cc8021af 2021-10-12 thomas 2> $testroot/stderr)
1193 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
1194 cc8021af 2021-10-12 thomas echo "diff succeeded unexpectedly" >&2
1195 cc8021af 2021-10-12 thomas test_done "$testroot" "1"
1196 cc8021af 2021-10-12 thomas return 1
1198 cc8021af 2021-10-12 thomas echo "got: -P option can only be used when diffing a work tree" \
1199 cc8021af 2021-10-12 thomas > $testroot/stderr.expected
1200 cc8021af 2021-10-12 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1202 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1203 cc8021af 2021-10-12 thomas diff -u $testroot/stderr.expected $testroot/stderr
1204 cc8021af 2021-10-12 thomas test_done "$testroot" "$ret"
1205 cc8021af 2021-10-12 thomas return 1
1208 cc8021af 2021-10-12 thomas # use of -c options implies a repository diff; use with -s is an error
1209 cc8021af 2021-10-12 thomas (cd $testroot/wt && got diff -c $commit_id0 -c $commit_id1 -s foo \
1210 cc8021af 2021-10-12 thomas 2> $testroot/stderr)
1212 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
1213 cc8021af 2021-10-12 thomas echo "diff succeeded unexpectedly" >&2
1214 cc8021af 2021-10-12 thomas test_done "$testroot" "1"
1215 cc8021af 2021-10-12 thomas return 1
1217 cc8021af 2021-10-12 thomas echo "got: -s option can only be used when diffing a work tree" \
1218 cc8021af 2021-10-12 thomas > $testroot/stderr.expected
1219 cc8021af 2021-10-12 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1221 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1222 cc8021af 2021-10-12 thomas diff -u $testroot/stderr.expected $testroot/stderr
1223 cc8021af 2021-10-12 thomas test_done "$testroot" "$ret"
1224 cc8021af 2021-10-12 thomas return 1
1227 cc8021af 2021-10-12 thomas # three arguments imply use of path filtering (repository case)
1228 cc8021af 2021-10-12 thomas (cd $testroot/repo && got diff $commit_id0 $commit_id1 foo \
1229 cc8021af 2021-10-12 thomas 2> $testroot/stderr)
1231 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
1232 cc8021af 2021-10-12 thomas echo "diff succeeded unexpectedly" >&2
1233 cc8021af 2021-10-12 thomas test_done "$testroot" "1"
1234 cc8021af 2021-10-12 thomas return 1
1236 cc8021af 2021-10-12 thomas echo "got: specified paths cannot be resolved: no got work tree found" \
1237 cc8021af 2021-10-12 thomas > $testroot/stderr.expected
1238 cc8021af 2021-10-12 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1240 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1241 cc8021af 2021-10-12 thomas diff -u $testroot/stderr.expected $testroot/stderr
1242 cc8021af 2021-10-12 thomas test_done "$testroot" "$ret"
1243 cc8021af 2021-10-12 thomas return 1
1246 cc8021af 2021-10-12 thomas # three arguments imply use of path filtering (work tree case)
1247 f1417e9f 2021-10-12 thomas (cd $testroot/wt && got diff $commit_id0 master foo \
1248 cc8021af 2021-10-12 thomas 2> $testroot/stderr)
1250 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
1251 cc8021af 2021-10-12 thomas echo "diff succeeded unexpectedly" >&2
1252 cc8021af 2021-10-12 thomas test_done "$testroot" "1"
1253 cc8021af 2021-10-12 thomas return 1
1255 cc8021af 2021-10-12 thomas echo "got: $commit_id0: No such file or directory" \
1256 cc8021af 2021-10-12 thomas > $testroot/stderr.expected
1257 cc8021af 2021-10-12 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1259 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1260 cc8021af 2021-10-12 thomas diff -u $testroot/stderr.expected $testroot/stderr
1262 39449a05 2020-07-23 stsp test_done "$testroot" "$ret"
1265 47d17b68 2022-02-12 thomas test_diff_ignored_file() {
1266 47d17b68 2022-02-12 thomas local testroot=`test_init diff_ignored_file`
1268 47d17b68 2022-02-12 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1270 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1271 47d17b68 2022-02-12 thomas test_done "$testroot" "$ret"
1272 47d17b68 2022-02-12 thomas return 1
1275 47d17b68 2022-02-12 thomas echo 1 > $testroot/wt/number
1276 47d17b68 2022-02-12 thomas (cd $testroot/wt && got add number >/dev/null)
1277 47d17b68 2022-02-12 thomas (cd $testroot/wt && got commit -m 'add number' >/dev/null)
1279 47d17b68 2022-02-12 thomas echo "**/number" > $testroot/wt/.gitignore
1281 47d17b68 2022-02-12 thomas echo 2 > $testroot/wt/number
1282 47d17b68 2022-02-12 thomas (cd $testroot/wt && got diff number | sed '1,/^@@/d' > $testroot/stdout)
1284 47d17b68 2022-02-12 thomas echo "-1" > $testroot/stdout.expected
1285 47d17b68 2022-02-12 thomas echo "+2" >> $testroot/stdout.expected
1287 47d17b68 2022-02-12 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1289 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
1290 47d17b68 2022-02-12 thomas diff -u $testroot/stdout.expected $testroot/stdout
1292 47d17b68 2022-02-12 thomas test_done "$testroot" "$ret"
1295 831297da 2022-07-26 thomas test_diff_crlf() {
1296 831297da 2022-07-26 thomas local testroot=`test_init diff_crlf`
1298 831297da 2022-07-26 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1300 831297da 2022-07-26 thomas if [ $ret -ne 0 ]; then
1301 831297da 2022-07-26 thomas test_done "$testroot" $ret
1302 831297da 2022-07-26 thomas return 1
1305 831297da 2022-07-26 thomas printf 'test\r\n' > $testroot/wt/crlf
1306 831297da 2022-07-26 thomas (cd $testroot/wt && got add crlf && got commit -m +crlf) >/dev/null
1308 831297da 2022-07-26 thomas if [ $ret -ne 0 ]; then
1309 831297da 2022-07-26 thomas test_done "$testroot" $ret
1310 831297da 2022-07-26 thomas return 1
1313 831297da 2022-07-26 thomas printf 'test 2\r\n' > $testroot/wt/crlf
1314 831297da 2022-07-26 thomas (cd $testroot/wt && got diff | sed -n '/^---/,$p' > $testroot/stdout)
1315 831297da 2022-07-26 thomas cat <<EOF > $testroot/stdout.expected
1316 831297da 2022-07-26 thomas --- crlf
1317 831297da 2022-07-26 thomas +++ crlf
1318 831297da 2022-07-26 thomas @@ -1 +1 @@
1323 6d054bb9 2022-09-23 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1325 6d054bb9 2022-09-23 thomas if [ $ret -ne 0 ]; then
1326 6d054bb9 2022-09-23 thomas diff -u $testroot/stdout.expected $testroot/stdout
1328 6d054bb9 2022-09-23 thomas test_done "$testroot" $ret
1331 6d054bb9 2022-09-23 thomas test_diff_worktree_newfile_xbit() {
1332 6d054bb9 2022-09-23 thomas local testroot=`test_init diff_worktree_newfile_xbit`
1334 6d054bb9 2022-09-23 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1336 6d054bb9 2022-09-23 thomas if [ $ret -ne 0 ]; then
1337 6d054bb9 2022-09-23 thomas test_done "$testroot" $ret
1338 6d054bb9 2022-09-23 thomas return 1
1341 6d054bb9 2022-09-23 thomas echo xfile > $testroot/wt/xfile
1342 6d054bb9 2022-09-23 thomas chmod +x $testroot/wt/xfile
1343 6d054bb9 2022-09-23 thomas (cd $testroot/wt && got add xfile) > /dev/null
1345 6d054bb9 2022-09-23 thomas if [ $ret -ne 0 ]; then
1346 6d054bb9 2022-09-23 thomas test_done "$testroot" $ret
1347 6d054bb9 2022-09-23 thomas return 1
1349 6d054bb9 2022-09-23 thomas (cd $testroot/wt && got diff) > $testroot/stdout
1351 6d054bb9 2022-09-23 thomas if [ $ret -ne 0 ]; then
1352 6d054bb9 2022-09-23 thomas test_done "$testroot" $ret
1353 6d054bb9 2022-09-23 thomas return 1
1356 6d054bb9 2022-09-23 thomas local commit_id=`git_show_head $testroot/repo`
1357 6d054bb9 2022-09-23 thomas cat <<EOF > $testroot/stdout.expected
1358 6d054bb9 2022-09-23 thomas diff $testroot/wt
1359 6d054bb9 2022-09-23 thomas commit - $commit_id
1360 6d054bb9 2022-09-23 thomas path + $testroot/wt
1361 6d054bb9 2022-09-23 thomas blob - /dev/null
1362 6d054bb9 2022-09-23 thomas file + xfile (mode 755)
1363 6d054bb9 2022-09-23 thomas --- /dev/null
1364 6d054bb9 2022-09-23 thomas +++ xfile
1365 6d054bb9 2022-09-23 thomas @@ -0,0 +1 @@
1369 831297da 2022-07-26 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1371 831297da 2022-07-26 thomas if [ $ret -ne 0 ]; then
1372 6d054bb9 2022-09-23 thomas echo "failed to record mode 755"
1373 831297da 2022-07-26 thomas diff -u $testroot/stdout.expected $testroot/stdout
1375 831297da 2022-07-26 thomas test_done "$testroot" $ret
1378 e80ef83e 2023-01-10 thomas test_diff_commit_diffstat() {
1379 e80ef83e 2023-01-10 thomas local testroot=`test_init diff_commit_diffstat`
1380 e80ef83e 2023-01-10 thomas local commit_id0=`git_show_head $testroot/repo`
1381 e80ef83e 2023-01-10 thomas local alpha_id0=`get_blob_id $testroot/repo "" alpha`
1382 e80ef83e 2023-01-10 thomas local beta_id0=`get_blob_id $testroot/repo "" beta`
1384 e80ef83e 2023-01-10 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1386 e80ef83e 2023-01-10 thomas if [ $ret -ne 0 ]; then
1387 e80ef83e 2023-01-10 thomas test_done "$testroot" "$ret"
1388 e80ef83e 2023-01-10 thomas return 1
1391 e80ef83e 2023-01-10 thomas echo "modified alpha" > $testroot/wt/alpha
1392 e80ef83e 2023-01-10 thomas (cd $testroot/wt && got rm beta >/dev/null)
1393 e80ef83e 2023-01-10 thomas echo "new file" > $testroot/wt/new
1394 e80ef83e 2023-01-10 thomas (cd $testroot/wt && got add new >/dev/null)
1395 e80ef83e 2023-01-10 thomas (cd $testroot/wt && got commit -m 'committing changes' >/dev/null)
1396 e80ef83e 2023-01-10 thomas local commit_id1=`git_show_head $testroot/repo`
1398 9c677dea 2023-01-10 thomas local alpha_id1=`get_blob_id $testroot/repo "" alpha`
1399 9c677dea 2023-01-10 thomas local new_id1=`get_blob_id $testroot/repo "" new`
1401 e80ef83e 2023-01-10 thomas cat <<EOF >$testroot/stdout.expected
1402 e80ef83e 2023-01-10 thomas diffstat $commit_id0 refs/heads/master
1403 e80ef83e 2023-01-10 thomas M alpha | 1+ 1-
1404 e80ef83e 2023-01-10 thomas D beta | 0+ 1-
1405 e80ef83e 2023-01-10 thomas A new | 1+ 0-
1407 e80ef83e 2023-01-10 thomas 3 files changed, 2 insertions(+), 2 deletions(-)
1411 e80ef83e 2023-01-10 thomas echo "diff $commit_id0 refs/heads/master" >> $testroot/stdout.expected
1412 e80ef83e 2023-01-10 thomas echo "commit - $commit_id0" >> $testroot/stdout.expected
1413 e80ef83e 2023-01-10 thomas echo "commit + $commit_id1" >> $testroot/stdout.expected
1414 e80ef83e 2023-01-10 thomas echo "blob - $alpha_id0" >> $testroot/stdout.expected
1415 e80ef83e 2023-01-10 thomas echo "blob + $alpha_id1" >> $testroot/stdout.expected
1416 e80ef83e 2023-01-10 thomas echo '--- alpha' >> $testroot/stdout.expected
1417 e80ef83e 2023-01-10 thomas echo '+++ alpha' >> $testroot/stdout.expected
1418 e80ef83e 2023-01-10 thomas echo '@@ -1 +1 @@' >> $testroot/stdout.expected
1419 e80ef83e 2023-01-10 thomas echo '-alpha' >> $testroot/stdout.expected
1420 e80ef83e 2023-01-10 thomas echo '+modified alpha' >> $testroot/stdout.expected
1421 e80ef83e 2023-01-10 thomas echo "blob - $beta_id0 (mode 644)" >> $testroot/stdout.expected
1422 e80ef83e 2023-01-10 thomas echo 'blob + /dev/null' >> $testroot/stdout.expected
1423 e80ef83e 2023-01-10 thomas echo '--- beta' >> $testroot/stdout.expected
1424 e80ef83e 2023-01-10 thomas echo '+++ /dev/null' >> $testroot/stdout.expected
1425 e80ef83e 2023-01-10 thomas echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
1426 e80ef83e 2023-01-10 thomas echo '-beta' >> $testroot/stdout.expected
1427 e80ef83e 2023-01-10 thomas echo 'blob - /dev/null' >> $testroot/stdout.expected
1428 e80ef83e 2023-01-10 thomas echo "blob + $new_id1 (mode 644)" >> $testroot/stdout.expected
1429 e80ef83e 2023-01-10 thomas echo '--- /dev/null' >> $testroot/stdout.expected
1430 e80ef83e 2023-01-10 thomas echo '+++ new' >> $testroot/stdout.expected
1431 e80ef83e 2023-01-10 thomas echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
1432 e80ef83e 2023-01-10 thomas echo '+new file' >> $testroot/stdout.expected
1434 e80ef83e 2023-01-10 thomas (cd $testroot/wt && got diff -d -c master > $testroot/stdout)
1435 e80ef83e 2023-01-10 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1437 e80ef83e 2023-01-10 thomas if [ $ret -ne 0 ]; then
1438 e80ef83e 2023-01-10 thomas diff -u $testroot/stdout.expected $testroot/stdout
1439 e80ef83e 2023-01-10 thomas test_done "$testroot" "$ret"
1440 e80ef83e 2023-01-10 thomas return 1
1443 e80ef83e 2023-01-10 thomas # same diffstat with explicit parent commit ID
1444 e80ef83e 2023-01-10 thomas (cd $testroot/wt && got diff -d -c $commit_id0 -c master \
1445 e80ef83e 2023-01-10 thomas > $testroot/stdout)
1446 e80ef83e 2023-01-10 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1448 e80ef83e 2023-01-10 thomas if [ $ret -ne 0 ]; then
1449 e80ef83e 2023-01-10 thomas diff -u $testroot/stdout.expected $testroot/stdout
1450 e80ef83e 2023-01-10 thomas test_done "$testroot" "$ret"
1451 e80ef83e 2023-01-10 thomas return 1
1454 e80ef83e 2023-01-10 thomas cat <<EOF >$testroot/stdout.expected
1455 e80ef83e 2023-01-10 thomas diffstat $commit_id0 $commit_id1
1456 e80ef83e 2023-01-10 thomas M alpha | 1+ 1-
1457 e80ef83e 2023-01-10 thomas D beta | 0+ 1-
1458 e80ef83e 2023-01-10 thomas A new | 1+ 0-
1460 e80ef83e 2023-01-10 thomas 3 files changed, 2 insertions(+), 2 deletions(-)
1464 e80ef83e 2023-01-10 thomas # same diffstat with commit object IDs
1465 e80ef83e 2023-01-10 thomas echo "diff $commit_id0 $commit_id1" >> $testroot/stdout.expected
1466 e80ef83e 2023-01-10 thomas echo "commit - $commit_id0" >> $testroot/stdout.expected
1467 e80ef83e 2023-01-10 thomas echo "commit + $commit_id1" >> $testroot/stdout.expected
1468 e80ef83e 2023-01-10 thomas echo "blob - $alpha_id0" >> $testroot/stdout.expected
1469 e80ef83e 2023-01-10 thomas echo "blob + $alpha_id1" >> $testroot/stdout.expected
1470 e80ef83e 2023-01-10 thomas echo '--- alpha' >> $testroot/stdout.expected
1471 e80ef83e 2023-01-10 thomas echo '+++ alpha' >> $testroot/stdout.expected
1472 e80ef83e 2023-01-10 thomas echo '@@ -1 +1 @@' >> $testroot/stdout.expected
1473 e80ef83e 2023-01-10 thomas echo '-alpha' >> $testroot/stdout.expected
1474 e80ef83e 2023-01-10 thomas echo '+modified alpha' >> $testroot/stdout.expected
1475 e80ef83e 2023-01-10 thomas echo "blob - $beta_id0 (mode 644)" >> $testroot/stdout.expected
1476 e80ef83e 2023-01-10 thomas echo 'blob + /dev/null' >> $testroot/stdout.expected
1477 e80ef83e 2023-01-10 thomas echo '--- beta' >> $testroot/stdout.expected
1478 e80ef83e 2023-01-10 thomas echo '+++ /dev/null' >> $testroot/stdout.expected
1479 e80ef83e 2023-01-10 thomas echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
1480 e80ef83e 2023-01-10 thomas echo '-beta' >> $testroot/stdout.expected
1481 e80ef83e 2023-01-10 thomas echo 'blob - /dev/null' >> $testroot/stdout.expected
1482 e80ef83e 2023-01-10 thomas echo "blob + $new_id1 (mode 644)" >> $testroot/stdout.expected
1483 e80ef83e 2023-01-10 thomas echo '--- /dev/null' >> $testroot/stdout.expected
1484 e80ef83e 2023-01-10 thomas echo '+++ new' >> $testroot/stdout.expected
1485 e80ef83e 2023-01-10 thomas echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
1486 e80ef83e 2023-01-10 thomas echo '+new file' >> $testroot/stdout.expected
1487 e80ef83e 2023-01-10 thomas (cd $testroot/wt && got diff -d -c $commit_id0 -c $commit_id1 \
1488 e80ef83e 2023-01-10 thomas > $testroot/stdout)
1489 e80ef83e 2023-01-10 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1491 e80ef83e 2023-01-10 thomas if [ $ret -ne 0 ]; then
1492 e80ef83e 2023-01-10 thomas diff -u $testroot/stdout.expected $testroot/stdout
1493 e80ef83e 2023-01-10 thomas test_done "$testroot" "$ret"
1494 e80ef83e 2023-01-10 thomas return 1
1497 e80ef83e 2023-01-10 thomas cat <<EOF >$testroot/stdout.expected
1498 e80ef83e 2023-01-10 thomas diffstat $commit_id0 $commit_id1
1499 e80ef83e 2023-01-10 thomas M alpha | 1+ 1-
1501 28466fca 2023-01-19 thomas 1 file changed, 1 insertion(+), 1 deletion(-)
1505 e80ef83e 2023-01-10 thomas # same diffstat filtered by path "alpha"
1506 e80ef83e 2023-01-10 thomas echo "diff $commit_id0 $commit_id1" >> $testroot/stdout.expected
1507 e80ef83e 2023-01-10 thomas echo "commit - $commit_id0" >> $testroot/stdout.expected
1508 e80ef83e 2023-01-10 thomas echo "commit + $commit_id1" >> $testroot/stdout.expected
1509 e80ef83e 2023-01-10 thomas echo "blob - $alpha_id0" >> $testroot/stdout.expected
1510 e80ef83e 2023-01-10 thomas echo "blob + $alpha_id1" >> $testroot/stdout.expected
1511 e80ef83e 2023-01-10 thomas echo '--- alpha' >> $testroot/stdout.expected
1512 e80ef83e 2023-01-10 thomas echo '+++ alpha' >> $testroot/stdout.expected
1513 e80ef83e 2023-01-10 thomas echo '@@ -1 +1 @@' >> $testroot/stdout.expected
1514 e80ef83e 2023-01-10 thomas echo '-alpha' >> $testroot/stdout.expected
1515 e80ef83e 2023-01-10 thomas echo '+modified alpha' >> $testroot/stdout.expected
1516 e80ef83e 2023-01-10 thomas (cd $testroot/repo && got diff -d -c $commit_id0 -c $commit_id1 alpha \
1517 e80ef83e 2023-01-10 thomas > $testroot/stdout)
1518 e80ef83e 2023-01-10 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1520 e80ef83e 2023-01-10 thomas if [ $ret -ne 0 ]; then
1521 e80ef83e 2023-01-10 thomas diff -u $testroot/stdout.expected $testroot/stdout
1522 e80ef83e 2023-01-10 thomas test_done "$testroot" "$ret"
1523 e80ef83e 2023-01-10 thomas return 1
1525 e80ef83e 2023-01-10 thomas # same diffstat in work tree
1526 e80ef83e 2023-01-10 thomas (cd $testroot/wt && got diff -d -c $commit_id0 -c $commit_id1 alpha \
1527 e80ef83e 2023-01-10 thomas > $testroot/stdout)
1528 e80ef83e 2023-01-10 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1530 e80ef83e 2023-01-10 thomas if [ $ret -ne 0 ]; then
1531 e80ef83e 2023-01-10 thomas diff -u $testroot/stdout.expected $testroot/stdout
1532 e80ef83e 2023-01-10 thomas test_done "$testroot" "$ret"
1533 e80ef83e 2023-01-10 thomas return 1
1536 e80ef83e 2023-01-10 thomas cat <<EOF >$testroot/stdout.expected
1537 e80ef83e 2023-01-10 thomas diffstat $commit_id0 $commit_id1
1538 e80ef83e 2023-01-10 thomas D beta | 0+ 1-
1539 e80ef83e 2023-01-10 thomas A new | 1+ 0-
1541 28466fca 2023-01-19 thomas 2 files changed, 1 insertion(+), 1 deletion(-)
1545 e80ef83e 2023-01-10 thomas # same diffstat filtered by paths "beta" and "new"
1546 e80ef83e 2023-01-10 thomas echo "diff $commit_id0 $commit_id1" >> $testroot/stdout.expected
1547 e80ef83e 2023-01-10 thomas echo "commit - $commit_id0" >> $testroot/stdout.expected
1548 e80ef83e 2023-01-10 thomas echo "commit + $commit_id1" >> $testroot/stdout.expected
1549 e80ef83e 2023-01-10 thomas echo "blob - $beta_id0 (mode 644)" >> $testroot/stdout.expected
1550 e80ef83e 2023-01-10 thomas echo 'blob + /dev/null' >> $testroot/stdout.expected
1551 e80ef83e 2023-01-10 thomas echo '--- beta' >> $testroot/stdout.expected
1552 e80ef83e 2023-01-10 thomas echo '+++ /dev/null' >> $testroot/stdout.expected
1553 e80ef83e 2023-01-10 thomas echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
1554 e80ef83e 2023-01-10 thomas echo '-beta' >> $testroot/stdout.expected
1555 e80ef83e 2023-01-10 thomas echo 'blob - /dev/null' >> $testroot/stdout.expected
1556 e80ef83e 2023-01-10 thomas echo "blob + $new_id1 (mode 644)" >> $testroot/stdout.expected
1557 e80ef83e 2023-01-10 thomas echo '--- /dev/null' >> $testroot/stdout.expected
1558 e80ef83e 2023-01-10 thomas echo '+++ new' >> $testroot/stdout.expected
1559 e80ef83e 2023-01-10 thomas echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
1560 e80ef83e 2023-01-10 thomas echo '+new file' >> $testroot/stdout.expected
1561 e80ef83e 2023-01-10 thomas (cd $testroot/repo && got diff -d -c $commit_id0 -c $commit_id1 \
1562 e80ef83e 2023-01-10 thomas beta new > $testroot/stdout)
1563 e80ef83e 2023-01-10 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1565 e80ef83e 2023-01-10 thomas if [ $ret -ne 0 ]; then
1566 e80ef83e 2023-01-10 thomas diff -u $testroot/stdout.expected $testroot/stdout
1568 e80ef83e 2023-01-10 thomas test_done "$testroot" "$ret"
1571 e80ef83e 2023-01-10 thomas test_diff_worktree_diffstat() {
1572 e80ef83e 2023-01-10 thomas local testroot=`test_init diff_worktree_diffstat`
1573 e80ef83e 2023-01-10 thomas local head_rev=`git_show_head $testroot/repo`
1574 e80ef83e 2023-01-10 thomas local alpha_blobid=`get_blob_id $testroot/repo "" alpha`
1576 e80ef83e 2023-01-10 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1578 e80ef83e 2023-01-10 thomas if [ $ret -ne 0 ]; then
1579 e80ef83e 2023-01-10 thomas test_done "$testroot" "$ret"
1580 e80ef83e 2023-01-10 thomas return 1
1583 e80ef83e 2023-01-10 thomas echo "modified alpha" > $testroot/wt/alpha
1584 e80ef83e 2023-01-10 thomas (cd $testroot/wt && got rm beta >/dev/null)
1585 e80ef83e 2023-01-10 thomas echo "new file" > $testroot/wt/new
1586 e80ef83e 2023-01-10 thomas (cd $testroot/wt && got add new >/dev/null)
1588 e80ef83e 2023-01-10 thomas cat <<EOF >$testroot/stdout.expected
1589 e80ef83e 2023-01-10 thomas diffstat $testroot/wt
1590 e80ef83e 2023-01-10 thomas M alpha | 1+ 1-
1591 e80ef83e 2023-01-10 thomas D beta | 0+ 1-
1592 e80ef83e 2023-01-10 thomas A new | 1+ 0-
1594 e80ef83e 2023-01-10 thomas 3 files changed, 2 insertions(+), 2 deletions(-)
1598 e80ef83e 2023-01-10 thomas echo "diff $testroot/wt" >> $testroot/stdout.expected
1599 e80ef83e 2023-01-10 thomas echo "commit - $head_rev" >> $testroot/stdout.expected
1600 e80ef83e 2023-01-10 thomas echo "path + $testroot/wt" >> $testroot/stdout.expected
1601 e80ef83e 2023-01-10 thomas echo -n 'blob - ' >> $testroot/stdout.expected
1602 e80ef83e 2023-01-10 thomas got tree -r $testroot/repo -i | grep 'alpha$' | cut -d' ' -f 1 \
1603 e80ef83e 2023-01-10 thomas >> $testroot/stdout.expected
1604 e80ef83e 2023-01-10 thomas echo 'file + alpha' >> $testroot/stdout.expected
1605 e80ef83e 2023-01-10 thomas echo '--- alpha' >> $testroot/stdout.expected
1606 e80ef83e 2023-01-10 thomas echo '+++ alpha' >> $testroot/stdout.expected
1607 e80ef83e 2023-01-10 thomas echo '@@ -1 +1 @@' >> $testroot/stdout.expected
1608 e80ef83e 2023-01-10 thomas echo '-alpha' >> $testroot/stdout.expected
1609 e80ef83e 2023-01-10 thomas echo '+modified alpha' >> $testroot/stdout.expected
1610 e80ef83e 2023-01-10 thomas echo -n 'blob - ' >> $testroot/stdout.expected
1611 e80ef83e 2023-01-10 thomas got tree -r $testroot/repo -i | grep 'beta$' | cut -d' ' -f 1 \
1612 e80ef83e 2023-01-10 thomas >> $testroot/stdout.expected
1613 e80ef83e 2023-01-10 thomas echo 'file + /dev/null' >> $testroot/stdout.expected
1614 e80ef83e 2023-01-10 thomas echo '--- beta' >> $testroot/stdout.expected
1615 e80ef83e 2023-01-10 thomas echo '+++ /dev/null' >> $testroot/stdout.expected
1616 e80ef83e 2023-01-10 thomas echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
1617 e80ef83e 2023-01-10 thomas echo '-beta' >> $testroot/stdout.expected
1618 e80ef83e 2023-01-10 thomas echo 'blob - /dev/null' >> $testroot/stdout.expected
1619 e80ef83e 2023-01-10 thomas echo 'file + new (mode 644)' >> $testroot/stdout.expected
1620 e80ef83e 2023-01-10 thomas echo '--- /dev/null' >> $testroot/stdout.expected
1621 e80ef83e 2023-01-10 thomas echo '+++ new' >> $testroot/stdout.expected
1622 e80ef83e 2023-01-10 thomas echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
1623 e80ef83e 2023-01-10 thomas echo '+new file' >> $testroot/stdout.expected
1625 e80ef83e 2023-01-10 thomas (cd $testroot/wt && got diff -d > $testroot/stdout)
1626 e80ef83e 2023-01-10 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1628 e80ef83e 2023-01-10 thomas if [ $ret -ne 0 ]; then
1629 e80ef83e 2023-01-10 thomas diff -u $testroot/stdout.expected $testroot/stdout
1630 e80ef83e 2023-01-10 thomas test_done "$testroot" "$ret"
1631 e80ef83e 2023-01-10 thomas return 1
1634 e80ef83e 2023-01-10 thomas echo "modified zeta" > $testroot/wt/epsilon/zeta
1636 e80ef83e 2023-01-10 thomas cat <<EOF >$testroot/stdout.expected
1637 e80ef83e 2023-01-10 thomas diffstat $testroot/wt
1638 e80ef83e 2023-01-10 thomas M alpha | 1+ 1-
1639 e80ef83e 2023-01-10 thomas D beta | 0+ 1-
1640 e80ef83e 2023-01-10 thomas M epsilon/zeta | 1+ 1-
1641 e80ef83e 2023-01-10 thomas A new | 1+ 0-
1643 e80ef83e 2023-01-10 thomas 4 files changed, 3 insertions(+), 3 deletions(-)
1647 e80ef83e 2023-01-10 thomas # specify paths to diffstat
1648 e80ef83e 2023-01-10 thomas echo "diff $testroot/wt" >> $testroot/stdout.expected
1649 e80ef83e 2023-01-10 thomas echo "commit - $head_rev" >> $testroot/stdout.expected
1650 e80ef83e 2023-01-10 thomas echo "path + $testroot/wt" >> $testroot/stdout.expected
1651 e80ef83e 2023-01-10 thomas echo -n 'blob - ' >> $testroot/stdout.expected
1652 e80ef83e 2023-01-10 thomas got tree -r $testroot/repo -i | grep 'alpha$' | cut -d' ' -f 1 \
1653 e80ef83e 2023-01-10 thomas >> $testroot/stdout.expected
1654 e80ef83e 2023-01-10 thomas echo 'file + alpha' >> $testroot/stdout.expected
1655 e80ef83e 2023-01-10 thomas echo '--- alpha' >> $testroot/stdout.expected
1656 e80ef83e 2023-01-10 thomas echo '+++ alpha' >> $testroot/stdout.expected
1657 e80ef83e 2023-01-10 thomas echo '@@ -1 +1 @@' >> $testroot/stdout.expected
1658 e80ef83e 2023-01-10 thomas echo '-alpha' >> $testroot/stdout.expected
1659 e80ef83e 2023-01-10 thomas echo '+modified alpha' >> $testroot/stdout.expected
1660 e80ef83e 2023-01-10 thomas echo -n 'blob - ' >> $testroot/stdout.expected
1661 e80ef83e 2023-01-10 thomas got tree -r $testroot/repo -i | grep 'beta$' | cut -d' ' -f 1 \
1662 e80ef83e 2023-01-10 thomas >> $testroot/stdout.expected
1663 e80ef83e 2023-01-10 thomas echo 'file + /dev/null' >> $testroot/stdout.expected
1664 e80ef83e 2023-01-10 thomas echo '--- beta' >> $testroot/stdout.expected
1665 e80ef83e 2023-01-10 thomas echo '+++ /dev/null' >> $testroot/stdout.expected
1666 e80ef83e 2023-01-10 thomas echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
1667 e80ef83e 2023-01-10 thomas echo '-beta' >> $testroot/stdout.expected
1668 e80ef83e 2023-01-10 thomas echo -n 'blob - ' >> $testroot/stdout.expected
1669 e80ef83e 2023-01-10 thomas got tree -r $testroot/repo -i epsilon | grep 'zeta$' | cut -d' ' -f 1 \
1670 e80ef83e 2023-01-10 thomas >> $testroot/stdout.expected
1671 e80ef83e 2023-01-10 thomas echo 'file + epsilon/zeta' >> $testroot/stdout.expected
1672 e80ef83e 2023-01-10 thomas echo '--- epsilon/zeta' >> $testroot/stdout.expected
1673 e80ef83e 2023-01-10 thomas echo '+++ epsilon/zeta' >> $testroot/stdout.expected
1674 e80ef83e 2023-01-10 thomas echo '@@ -1 +1 @@' >> $testroot/stdout.expected
1675 e80ef83e 2023-01-10 thomas echo '-zeta' >> $testroot/stdout.expected
1676 e80ef83e 2023-01-10 thomas echo '+modified zeta' >> $testroot/stdout.expected
1677 e80ef83e 2023-01-10 thomas echo 'blob - /dev/null' >> $testroot/stdout.expected
1678 e80ef83e 2023-01-10 thomas echo 'file + new (mode 644)' >> $testroot/stdout.expected
1679 e80ef83e 2023-01-10 thomas echo '--- /dev/null' >> $testroot/stdout.expected
1680 e80ef83e 2023-01-10 thomas echo '+++ new' >> $testroot/stdout.expected
1681 e80ef83e 2023-01-10 thomas echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
1682 e80ef83e 2023-01-10 thomas echo '+new file' >> $testroot/stdout.expected
1684 e80ef83e 2023-01-10 thomas (cd $testroot/wt && got diff -d new alpha epsilon beta > $testroot/stdout)
1685 e80ef83e 2023-01-10 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1687 e80ef83e 2023-01-10 thomas if [ $ret -ne 0 ]; then
1688 e80ef83e 2023-01-10 thomas diff -u $testroot/stdout.expected $testroot/stdout
1689 e80ef83e 2023-01-10 thomas test_done "$testroot" "$ret"
1690 e80ef83e 2023-01-10 thomas return 1
1693 e80ef83e 2023-01-10 thomas # same diff irrespective of argument order
1694 e80ef83e 2023-01-10 thomas (cd $testroot/wt && got diff -d alpha new epsilon beta \
1695 e80ef83e 2023-01-10 thomas > $testroot/stdout 2> $testroot/stderr)
1697 e80ef83e 2023-01-10 thomas if [ $ret -ne 0 ]; then
1698 e80ef83e 2023-01-10 thomas echo "diff failed unexpectedly" >&2
1699 e80ef83e 2023-01-10 thomas test_done "$testroot" "1"
1700 e80ef83e 2023-01-10 thomas return 1
1702 e80ef83e 2023-01-10 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1704 e80ef83e 2023-01-10 thomas if [ $ret -ne 0 ]; then
1705 e80ef83e 2023-01-10 thomas diff -u $testroot/stdout.expected $testroot/stdout
1706 e80ef83e 2023-01-10 thomas test_done "$testroot" "$ret"
1707 e80ef83e 2023-01-10 thomas return 1
1710 e80ef83e 2023-01-10 thomas # force paths with -P
1711 e80ef83e 2023-01-10 thomas echo master > $testroot/wt/master
1712 e80ef83e 2023-01-10 thomas (cd $testroot/wt && got add master > /dev/null)
1713 e80ef83e 2023-01-10 thomas (cd $testroot/wt && got diff -d -P new master > $testroot/stdout)
1715 e80ef83e 2023-01-10 thomas if [ $ret -ne 0 ]; then
1716 e80ef83e 2023-01-10 thomas echo "diff failed unexpectedly" >&2
1717 e80ef83e 2023-01-10 thomas test_done "$testroot" "1"
1718 e80ef83e 2023-01-10 thomas return 1
1721 e80ef83e 2023-01-10 thomas cat <<EOF >$testroot/stdout.expected
1722 e80ef83e 2023-01-10 thomas diffstat $testroot/wt
1723 e80ef83e 2023-01-10 thomas A master | 1+ 0-
1724 e80ef83e 2023-01-10 thomas A new | 1+ 0-
1726 e80ef83e 2023-01-10 thomas 2 files changed, 2 insertions(+), 0 deletions(-)
1730 e80ef83e 2023-01-10 thomas echo "diff $testroot/wt" >> $testroot/stdout.expected
1731 e80ef83e 2023-01-10 thomas echo "commit - $head_rev" >> $testroot/stdout.expected
1732 e80ef83e 2023-01-10 thomas echo "path + $testroot/wt" >> $testroot/stdout.expected
1733 e80ef83e 2023-01-10 thomas echo 'blob - /dev/null' >> $testroot/stdout.expected
1734 e80ef83e 2023-01-10 thomas echo 'file + master (mode 644)' >> $testroot/stdout.expected
1735 e80ef83e 2023-01-10 thomas echo '--- /dev/null' >> $testroot/stdout.expected
1736 e80ef83e 2023-01-10 thomas echo '+++ master' >> $testroot/stdout.expected
1737 e80ef83e 2023-01-10 thomas echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
1738 e80ef83e 2023-01-10 thomas echo '+master' >> $testroot/stdout.expected
1739 e80ef83e 2023-01-10 thomas echo 'blob - /dev/null' >> $testroot/stdout.expected
1740 e80ef83e 2023-01-10 thomas echo 'file + new (mode 644)' >> $testroot/stdout.expected
1741 e80ef83e 2023-01-10 thomas echo '--- /dev/null' >> $testroot/stdout.expected
1742 e80ef83e 2023-01-10 thomas echo '+++ new' >> $testroot/stdout.expected
1743 e80ef83e 2023-01-10 thomas echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
1744 e80ef83e 2023-01-10 thomas echo '+new file' >> $testroot/stdout.expected
1745 e80ef83e 2023-01-10 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1747 e80ef83e 2023-01-10 thomas if [ $ret -ne 0 ]; then
1748 e80ef83e 2023-01-10 thomas diff -u $testroot/stdout.expected $testroot/stdout
1749 e80ef83e 2023-01-10 thomas test_done "$testroot" "$ret"
1750 e80ef83e 2023-01-10 thomas return 1
1753 e80ef83e 2023-01-10 thomas # diff two blob ids
1754 e80ef83e 2023-01-10 thomas (cd $testroot/wt && got commit -m 'edit' alpha >/dev/null)
1755 e80ef83e 2023-01-10 thomas local alpha_new_blobid=`get_blob_id $testroot/repo "" alpha`
1756 e80ef83e 2023-01-10 thomas (cd $testroot/wt && got diff -d $alpha_blobid $alpha_new_blobid) \
1757 e80ef83e 2023-01-10 thomas > $testroot/stdout
1759 e80ef83e 2023-01-10 thomas if [ $ret -ne 0 ]; then
1760 e80ef83e 2023-01-10 thomas echo "diff failed unexpectedly" >&2
1761 e80ef83e 2023-01-10 thomas test_done "$testroot" "$ret"
1762 e80ef83e 2023-01-10 thomas return 1
1765 71d196c9 2023-01-19 thomas short_alpha_id=$(printf '%.10s' $alpha_blobid)
1766 71d196c9 2023-01-19 thomas short_alpha_new_id=$(printf '%.10s' $alpha_new_blobid)
1767 e80ef83e 2023-01-10 thomas cat <<EOF >$testroot/stdout.expected
1768 e80ef83e 2023-01-10 thomas diffstat $alpha_blobid $alpha_new_blobid
1769 e80ef83e 2023-01-10 thomas M $short_alpha_id -> $short_alpha_new_id | 1+ 1-
1771 28466fca 2023-01-19 thomas 1 file changed, 1 insertion(+), 1 deletion(-)
1773 e80ef83e 2023-01-10 thomas blob - $alpha_blobid
1774 e80ef83e 2023-01-10 thomas blob + $alpha_new_blobid
1775 e80ef83e 2023-01-10 thomas --- $alpha_blobid
1776 e80ef83e 2023-01-10 thomas +++ $alpha_new_blobid
1777 e80ef83e 2023-01-10 thomas @@ -1 +1 @@
1779 e80ef83e 2023-01-10 thomas +modified alpha
1782 e80ef83e 2023-01-10 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1784 e80ef83e 2023-01-10 thomas if [ $ret -ne 0 ]; then
1785 e80ef83e 2023-01-10 thomas diff -u $testroot/stdout.expected $testroot/stdout
1787 e80ef83e 2023-01-10 thomas test_done "$testroot" "$ret"
1790 7fb414ae 2020-08-08 stsp test_parseargs "$@"
1791 95adcdca 2019-03-27 stsp run_test test_diff_basic
1792 95adcdca 2019-03-27 stsp run_test test_diff_shows_conflict
1793 d24820bf 2019-08-11 stsp run_test test_diff_tag
1794 562580bc 2020-01-14 stsp run_test test_diff_lightweight_tag
1795 63035f9f 2019-10-06 stsp run_test test_diff_ignore_whitespace
1796 e7303626 2020-05-14 stsp run_test test_diff_submodule_of_same_repo
1797 39449a05 2020-07-23 stsp run_test test_diff_symlinks_in_work_tree
1798 40dde666 2020-07-23 stsp run_test test_diff_symlinks_in_repo
1799 dffd0deb 2020-11-20 stsp run_test test_diff_binary_files
1800 cc8021af 2021-10-12 thomas run_test test_diff_commits
1801 47d17b68 2022-02-12 thomas run_test test_diff_ignored_file
1802 831297da 2022-07-26 thomas run_test test_diff_crlf
1803 6d054bb9 2022-09-23 thomas run_test test_diff_worktree_newfile_xbit
1804 e80ef83e 2023-01-10 thomas run_test test_diff_commit_diffstat
1805 e80ef83e 2023-01-10 thomas run_test test_diff_worktree_diffstat
