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 95adcdca 2019-03-27 stsp function 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`
23 95adcdca 2019-03-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
25 95adcdca 2019-03-27 stsp if [ "$ret" != "0" ]; then
26 95adcdca 2019-03-27 stsp test_done "$testroot" "$ret"
30 95adcdca 2019-03-27 stsp echo "modified alpha" > $testroot/wt/alpha
31 95adcdca 2019-03-27 stsp (cd $testroot/wt && got rm beta >/dev/null)
32 95adcdca 2019-03-27 stsp echo "new file" > $testroot/wt/new
33 95adcdca 2019-03-27 stsp (cd $testroot/wt && got add new >/dev/null)
35 95adcdca 2019-03-27 stsp echo "diff $head_rev $testroot/wt" > $testroot/stdout.expected
36 95adcdca 2019-03-27 stsp echo -n 'blob - ' >> $testroot/stdout.expected
37 95adcdca 2019-03-27 stsp got tree -r $testroot/repo -i | grep 'alpha$' | cut -d' ' -f 1 \
38 95adcdca 2019-03-27 stsp >> $testroot/stdout.expected
39 95adcdca 2019-03-27 stsp echo 'file + alpha' >> $testroot/stdout.expected
40 95adcdca 2019-03-27 stsp echo '--- alpha' >> $testroot/stdout.expected
41 95adcdca 2019-03-27 stsp echo '+++ alpha' >> $testroot/stdout.expected
42 95adcdca 2019-03-27 stsp echo '@@ -1 +1 @@' >> $testroot/stdout.expected
43 95adcdca 2019-03-27 stsp echo '-alpha' >> $testroot/stdout.expected
44 95adcdca 2019-03-27 stsp echo '+modified alpha' >> $testroot/stdout.expected
45 95adcdca 2019-03-27 stsp echo -n 'blob - ' >> $testroot/stdout.expected
46 95adcdca 2019-03-27 stsp got tree -r $testroot/repo -i | grep 'beta$' | cut -d' ' -f 1 \
47 95adcdca 2019-03-27 stsp >> $testroot/stdout.expected
48 95adcdca 2019-03-27 stsp echo 'file + /dev/null' >> $testroot/stdout.expected
49 95adcdca 2019-03-27 stsp echo '--- beta' >> $testroot/stdout.expected
50 95adcdca 2019-03-27 stsp echo '+++ beta' >> $testroot/stdout.expected
51 95adcdca 2019-03-27 stsp echo '@@ -1 +0,0 @@' >> $testroot/stdout.expected
52 95adcdca 2019-03-27 stsp echo '-beta' >> $testroot/stdout.expected
53 95adcdca 2019-03-27 stsp echo 'blob - /dev/null' >> $testroot/stdout.expected
54 95adcdca 2019-03-27 stsp echo 'file + new' >> $testroot/stdout.expected
55 95adcdca 2019-03-27 stsp echo '--- new' >> $testroot/stdout.expected
56 95adcdca 2019-03-27 stsp echo '+++ new' >> $testroot/stdout.expected
57 95adcdca 2019-03-27 stsp echo '@@ -0,0 +1 @@' >> $testroot/stdout.expected
58 95adcdca 2019-03-27 stsp echo '+new file' >> $testroot/stdout.expected
60 95adcdca 2019-03-27 stsp (cd $testroot/wt && got diff > $testroot/stdout)
61 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
63 95adcdca 2019-03-27 stsp if [ "$ret" != "0" ]; then
64 95adcdca 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
66 95adcdca 2019-03-27 stsp test_done "$testroot" "$ret"
69 95adcdca 2019-03-27 stsp function test_diff_shows_conflict {
70 95adcdca 2019-03-27 stsp local testroot=`test_init diff_shows_conflict 1`
72 95adcdca 2019-03-27 stsp echo "1" > $testroot/repo/numbers
73 95adcdca 2019-03-27 stsp echo "2" >> $testroot/repo/numbers
74 95adcdca 2019-03-27 stsp echo "3" >> $testroot/repo/numbers
75 95adcdca 2019-03-27 stsp echo "4" >> $testroot/repo/numbers
76 95adcdca 2019-03-27 stsp echo "5" >> $testroot/repo/numbers
77 95adcdca 2019-03-27 stsp echo "6" >> $testroot/repo/numbers
78 95adcdca 2019-03-27 stsp echo "7" >> $testroot/repo/numbers
79 95adcdca 2019-03-27 stsp echo "8" >> $testroot/repo/numbers
80 95adcdca 2019-03-27 stsp (cd $testroot/repo && git add numbers)
81 95adcdca 2019-03-27 stsp git_commit $testroot/repo -m "added numbers file"
83 95adcdca 2019-03-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
85 95adcdca 2019-03-27 stsp if [ "$ret" != "0" ]; then
86 95adcdca 2019-03-27 stsp test_done "$testroot" "$ret"
90 95adcdca 2019-03-27 stsp sed -i 's/2/22/' $testroot/repo/numbers
91 95adcdca 2019-03-27 stsp git_commit $testroot/repo -m "modified line 2"
92 95adcdca 2019-03-27 stsp local head_rev=`git_show_head $testroot/repo`
94 95adcdca 2019-03-27 stsp # modify line 2 in a conflicting way
95 95adcdca 2019-03-27 stsp sed -i 's/2/77/' $testroot/wt/numbers
97 95adcdca 2019-03-27 stsp echo "C numbers" > $testroot/stdout.expected
98 95adcdca 2019-03-27 stsp echo -n "Updated to commit $head_rev" >> $testroot/stdout.expected
99 95adcdca 2019-03-27 stsp echo >> $testroot/stdout.expected
101 95adcdca 2019-03-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
103 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
105 95adcdca 2019-03-27 stsp if [ "$ret" != "0" ]; then
106 95adcdca 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
107 95adcdca 2019-03-27 stsp test_done "$testroot" "$ret"
111 95adcdca 2019-03-27 stsp echo "diff $head_rev $testroot/wt" > $testroot/stdout.expected
112 95adcdca 2019-03-27 stsp echo -n 'blob - ' >> $testroot/stdout.expected
113 95adcdca 2019-03-27 stsp got tree -r $testroot/repo -i | grep 'numbers$' | cut -d' ' -f 1 \
114 95adcdca 2019-03-27 stsp >> $testroot/stdout.expected
115 95adcdca 2019-03-27 stsp echo 'file + numbers' >> $testroot/stdout.expected
116 95adcdca 2019-03-27 stsp echo '--- numbers' >> $testroot/stdout.expected
117 95adcdca 2019-03-27 stsp echo '+++ numbers' >> $testroot/stdout.expected
118 95adcdca 2019-03-27 stsp echo '@@ -1,5 +1,9 @@' >> $testroot/stdout.expected
119 95adcdca 2019-03-27 stsp echo ' 1' >> $testroot/stdout.expected
120 95adcdca 2019-03-27 stsp echo "+<<<<<<< commit $head_rev" >> $testroot/stdout.expected
121 95adcdca 2019-03-27 stsp echo ' 22' >> $testroot/stdout.expected
122 95adcdca 2019-03-27 stsp echo '+=======' >> $testroot/stdout.expected
123 95adcdca 2019-03-27 stsp echo '+77' >> $testroot/stdout.expected
124 95adcdca 2019-03-27 stsp echo '+>>>>>>> numbers' >> $testroot/stdout.expected
125 95adcdca 2019-03-27 stsp echo ' 3' >> $testroot/stdout.expected
126 95adcdca 2019-03-27 stsp echo ' 4' >> $testroot/stdout.expected
127 95adcdca 2019-03-27 stsp echo ' 5' >> $testroot/stdout.expected
129 95adcdca 2019-03-27 stsp (cd $testroot/wt && got diff > $testroot/stdout)
131 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
133 95adcdca 2019-03-27 stsp if [ "$ret" != "0" ]; then
134 95adcdca 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
136 95adcdca 2019-03-27 stsp test_done "$testroot" "$ret"
139 95adcdca 2019-03-27 stsp run_test test_diff_basic
140 95adcdca 2019-03-27 stsp run_test test_diff_shows_conflict
