3 35dc4510 2019-02-04 stsp # Copyright (c) 2019 Stefan Sperling <stsp@openbsd.org>
5 35dc4510 2019-02-04 stsp # Permission to use, copy, modify, and distribute this software for any
6 35dc4510 2019-02-04 stsp # purpose with or without fee is hereby granted, provided that the above
7 35dc4510 2019-02-04 stsp # copyright notice and this permission notice appear in all copies.
9 35dc4510 2019-02-04 stsp # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 35dc4510 2019-02-04 stsp # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 35dc4510 2019-02-04 stsp # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 35dc4510 2019-02-04 stsp # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 35dc4510 2019-02-04 stsp # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 35dc4510 2019-02-04 stsp # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 35dc4510 2019-02-04 stsp # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 35dc4510 2019-02-04 stsp . ./common.sh
19 f6cae3ed 2020-09-13 naddy test_status_basic() {
20 35dc4510 2019-02-04 stsp local testroot=`test_init status_basic`
22 35dc4510 2019-02-04 stsp got checkout $testroot/repo $testroot/wt > /dev/null
24 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
25 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
29 35dc4510 2019-02-04 stsp echo "modified alpha" > $testroot/wt/alpha
30 2ec1f75b 2019-03-26 stsp (cd $testroot/wt && got rm beta >/dev/null)
31 35dc4510 2019-02-04 stsp echo "unversioned file" > $testroot/wt/foo
32 35dc4510 2019-02-04 stsp rm $testroot/wt/epsilon/zeta
33 14e5d4dc 2019-02-05 stsp touch $testroot/wt/beta
34 d00136be 2019-03-26 stsp echo "new file" > $testroot/wt/new
35 d00136be 2019-03-26 stsp (cd $testroot/wt && got add new >/dev/null)
36 40b289d7 2019-09-07 stsp mkdir -m 0000 $testroot/wt/bar
38 35dc4510 2019-02-04 stsp echo 'M alpha' > $testroot/stdout.expected
39 2ec1f75b 2019-03-26 stsp echo 'D beta' >> $testroot/stdout.expected
40 35dc4510 2019-02-04 stsp echo '! epsilon/zeta' >> $testroot/stdout.expected
41 35dc4510 2019-02-04 stsp echo '? foo' >> $testroot/stdout.expected
42 d00136be 2019-03-26 stsp echo 'A new' >> $testroot/stdout.expected
44 35dc4510 2019-02-04 stsp (cd $testroot/wt && got status > $testroot/stdout)
46 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
48 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
49 35dc4510 2019-02-04 stsp diff -u $testroot/stdout.expected $testroot/stdout
51 40b289d7 2019-09-07 stsp chmod 700 $testroot/wt/bar
52 40b289d7 2019-09-07 stsp rmdir $testroot/wt/bar
53 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
56 f6cae3ed 2020-09-13 naddy test_status_subdir_no_mods() {
57 f02ba292 2019-02-05 stsp local testroot=`test_init status_subdir_no_mods 1`
59 f02ba292 2019-02-05 stsp mkdir $testroot/repo/Basic/
60 f02ba292 2019-02-05 stsp mkdir $testroot/repo/Basic/Targets/
61 f02ba292 2019-02-05 stsp touch $testroot/repo/Basic/Targets/AArch64.cpp
62 f02ba292 2019-02-05 stsp touch $testroot/repo/Basic/Targets.cpp
63 f02ba292 2019-02-05 stsp touch $testroot/repo/Basic/Targets.h
64 f02ba292 2019-02-05 stsp (cd $testroot/repo && git add .)
65 f02ba292 2019-02-05 stsp git_commit $testroot/repo -m "add subdir with files"
67 f02ba292 2019-02-05 stsp got checkout $testroot/repo $testroot/wt > /dev/null
69 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
70 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
74 f02ba292 2019-02-05 stsp touch $testroot/stdout.expected
76 f02ba292 2019-02-05 stsp # This used to erroneously print:
78 f02ba292 2019-02-05 stsp # ! Basic/Targets.cpp
79 f02ba292 2019-02-05 stsp # ? Basic/Targets.cpp
80 f02ba292 2019-02-05 stsp (cd $testroot/wt && got status > $testroot/stdout)
82 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
84 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
85 f02ba292 2019-02-05 stsp diff -u $testroot/stdout.expected $testroot/stdout
87 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
90 f6cae3ed 2020-09-13 naddy test_status_subdir_no_mods2() {
91 f02ba292 2019-02-05 stsp local testroot=`test_init status_subdir_no_mods2 1`
93 f02ba292 2019-02-05 stsp mkdir $testroot/repo/AST
94 f02ba292 2019-02-05 stsp touch $testroot/repo/AST/APValue.cpp
95 f02ba292 2019-02-05 stsp mkdir $testroot/repo/ASTMatchers
96 f02ba292 2019-02-05 stsp touch $testroot/repo/ASTMatchers/ASTMatchFinder.cpp
97 f02ba292 2019-02-05 stsp mkdir $testroot/repo/Frontend
98 f02ba292 2019-02-05 stsp touch $testroot/repo/Frontend/ASTConsumers.cpp
99 f02ba292 2019-02-05 stsp mkdir $testroot/repo/Frontend/Rewrite
100 f02ba292 2019-02-05 stsp touch $testroot/repo/Frontend/Rewrite/CMakeLists.txt
101 f02ba292 2019-02-05 stsp mkdir $testroot/repo/FrontendTool
102 f02ba292 2019-02-05 stsp touch $testroot/repo/FrontendTool/CMakeLists.txt
103 f02ba292 2019-02-05 stsp touch $testroot/repo/FrontendTool/ExecuteCompilerInvocation.cpp
104 f02ba292 2019-02-05 stsp (cd $testroot/repo && git add .)
105 f02ba292 2019-02-05 stsp git_commit $testroot/repo -m "add subdir with files"
107 f02ba292 2019-02-05 stsp got checkout $testroot/repo $testroot/wt > /dev/null
109 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
110 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
114 f02ba292 2019-02-05 stsp touch $testroot/stdout.expected
116 f02ba292 2019-02-05 stsp # This used to erroneously print:
118 f02ba292 2019-02-05 stsp # ! AST/APValue.cpp
119 f02ba292 2019-02-05 stsp # ? AST/APValue.cpp
120 f02ba292 2019-02-05 stsp # ! Frontend/ASTConsumers.cpp
121 f02ba292 2019-02-05 stsp # ! Frontend/Rewrite/CMakeLists.txt
122 f02ba292 2019-02-05 stsp # ? Frontend/ASTConsumers.cpp
123 f02ba292 2019-02-05 stsp # ? Frontend/Rewrite/CMakeLists.txt
124 f02ba292 2019-02-05 stsp (cd $testroot/wt && got status > $testroot/stdout)
126 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
128 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
129 f02ba292 2019-02-05 stsp diff -u $testroot/stdout.expected $testroot/stdout
131 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
134 f6cae3ed 2020-09-13 naddy test_status_obstructed() {
135 0dbc2271 2019-02-05 stsp local testroot=`test_init status_obstructed`
137 0dbc2271 2019-02-05 stsp got checkout $testroot/repo $testroot/wt > /dev/null
139 e60e7f5b 2019-02-10 stsp if [ "$ret" != "0" ]; then
140 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
144 0dbc2271 2019-02-05 stsp rm $testroot/wt/epsilon/zeta
145 0dbc2271 2019-02-05 stsp mkdir $testroot/wt/epsilon/zeta
147 0dbc2271 2019-02-05 stsp echo '~ epsilon/zeta' > $testroot/stdout.expected
149 0dbc2271 2019-02-05 stsp (cd $testroot/wt && got status > $testroot/stdout)
151 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
153 a062651c 2019-07-27 stsp if [ "$ret" != "0" ]; then
154 0dbc2271 2019-02-05 stsp diff -u $testroot/stdout.expected $testroot/stdout
156 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
159 f6cae3ed 2020-09-13 naddy test_status_shows_local_mods_after_update() {
160 02c07007 2019-02-10 stsp local testroot=`test_init status_shows_local_mods_after_update 1`
162 02c07007 2019-02-10 stsp echo "1" > $testroot/repo/numbers
163 02c07007 2019-02-10 stsp echo "2" >> $testroot/repo/numbers
164 02c07007 2019-02-10 stsp echo "3" >> $testroot/repo/numbers
165 02c07007 2019-02-10 stsp echo "4" >> $testroot/repo/numbers
166 02c07007 2019-02-10 stsp echo "5" >> $testroot/repo/numbers
167 02c07007 2019-02-10 stsp echo "6" >> $testroot/repo/numbers
168 02c07007 2019-02-10 stsp echo "7" >> $testroot/repo/numbers
169 02c07007 2019-02-10 stsp echo "8" >> $testroot/repo/numbers
170 02c07007 2019-02-10 stsp (cd $testroot/repo && git add numbers)
171 02c07007 2019-02-10 stsp git_commit $testroot/repo -m "added numbers file"
173 02c07007 2019-02-10 stsp got checkout $testroot/repo $testroot/wt > /dev/null
175 02c07007 2019-02-10 stsp if [ "$ret" != "0" ]; then
176 02c07007 2019-02-10 stsp test_done "$testroot" "$ret"
180 02c07007 2019-02-10 stsp sed -i 's/2/22/' $testroot/repo/numbers
181 02c07007 2019-02-10 stsp git_commit $testroot/repo -m "modified line 2"
183 02c07007 2019-02-10 stsp # modify line 7; both changes should merge cleanly
184 02c07007 2019-02-10 stsp sed -i 's/7/77/' $testroot/wt/numbers
186 02c07007 2019-02-10 stsp echo "G numbers" > $testroot/stdout.expected
187 02c07007 2019-02-10 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
188 02c07007 2019-02-10 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
189 02c07007 2019-02-10 stsp echo >> $testroot/stdout.expected
191 02c07007 2019-02-10 stsp (cd $testroot/wt && got update > $testroot/stdout)
193 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
195 02c07007 2019-02-10 stsp if [ "$ret" != "0" ]; then
196 02c07007 2019-02-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
197 02c07007 2019-02-10 stsp test_done "$testroot" "$ret"
201 02c07007 2019-02-10 stsp echo 'M numbers' > $testroot/stdout.expected
203 02c07007 2019-02-10 stsp (cd $testroot/wt && got status > $testroot/stdout)
205 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
207 02c07007 2019-02-10 stsp if [ "$ret" != "0" ]; then
208 02c07007 2019-02-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
210 e60e7f5b 2019-02-10 stsp test_done "$testroot" "$ret"
213 f6cae3ed 2020-09-13 naddy test_status_unversioned_subdirs() {
214 18831e78 2019-02-10 stsp local testroot=`test_init status_unversioned_subdirs 1`
216 18831e78 2019-02-10 stsp mkdir $testroot/repo/cdfs/
217 18831e78 2019-02-10 stsp touch $testroot/repo/cdfs/Makefile
218 18831e78 2019-02-10 stsp mkdir $testroot/repo/common/
219 18831e78 2019-02-10 stsp touch $testroot/repo/common/Makefile
220 18831e78 2019-02-10 stsp mkdir $testroot/repo/iso/
221 18831e78 2019-02-10 stsp touch $testroot/repo/iso/Makefile
222 18831e78 2019-02-10 stsp mkdir $testroot/repo/ramdisk/
223 18831e78 2019-02-10 stsp touch $testroot/repo/ramdisk/Makefile
224 18831e78 2019-02-10 stsp touch $testroot/repo/ramdisk/list.local
225 18831e78 2019-02-10 stsp mkdir $testroot/repo/ramdisk_cd/
226 18831e78 2019-02-10 stsp touch $testroot/repo/ramdisk_cd/Makefile
227 18831e78 2019-02-10 stsp touch $testroot/repo/ramdisk_cd/list.local
228 18831e78 2019-02-10 stsp (cd $testroot/repo && git add .)
229 18831e78 2019-02-10 stsp git_commit $testroot/repo -m "first commit"
231 18831e78 2019-02-10 stsp got checkout $testroot/repo $testroot/wt > /dev/null
233 18831e78 2019-02-10 stsp if [ "$ret" != "0" ]; then
234 18831e78 2019-02-10 stsp test_done "$testroot" "$ret"
238 18831e78 2019-02-10 stsp mkdir $testroot/wt/cdfs/obj
239 18831e78 2019-02-10 stsp mkdir $testroot/wt/ramdisk/obj
240 18831e78 2019-02-10 stsp mkdir $testroot/wt/ramdisk_cd/obj
241 18831e78 2019-02-10 stsp mkdir $testroot/wt/iso/obj
243 18831e78 2019-02-10 stsp echo -n > $testroot/stdout.expected
245 18831e78 2019-02-10 stsp # This used to erroneously print:
247 18831e78 2019-02-10 stsp # ! ramdisk_cd/Makefile
248 18831e78 2019-02-10 stsp # ! ramdisk_cd/list.local
249 18831e78 2019-02-10 stsp # ? ramdisk_cd/Makefile
250 18831e78 2019-02-10 stsp # ? ramdisk_cd/list.local
251 18831e78 2019-02-10 stsp (cd $testroot/wt && got status > $testroot/stdout)
253 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
255 18831e78 2019-02-10 stsp if [ "$ret" != "0" ]; then
256 18831e78 2019-02-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
258 18831e78 2019-02-10 stsp test_done "$testroot" "$ret"
261 f6cae3ed 2020-09-13 naddy test_status_symlink() {
262 00bb5ea0 2020-07-23 stsp local testroot=`test_init status_symlink`
264 2c201a36 2019-02-10 stsp mkdir $testroot/repo/ramdisk/
265 2c201a36 2019-02-10 stsp touch $testroot/repo/ramdisk/Makefile
266 d4ae64fa 2020-07-23 stsp (cd $testroot/repo && ln -s alpha alpha.link)
267 d4ae64fa 2020-07-23 stsp (cd $testroot/repo && ln -s epsilon epsilon.link)
268 d4ae64fa 2020-07-23 stsp (cd $testroot/repo && ln -s nonexistent nonexistent.link)
269 2c201a36 2019-02-10 stsp (cd $testroot/repo && git add .)
270 2c201a36 2019-02-10 stsp git_commit $testroot/repo -m "first commit"
272 2c201a36 2019-02-10 stsp got checkout $testroot/repo $testroot/wt > /dev/null
274 2c201a36 2019-02-10 stsp if [ "$ret" != "0" ]; then
275 2c201a36 2019-02-10 stsp test_done "$testroot" "$ret"
279 2c201a36 2019-02-10 stsp ln -s /usr/obj/distrib/i386/ramdisk $testroot/wt/ramdisk/obj
281 00bb5ea0 2020-07-23 stsp echo "? ramdisk/obj" > $testroot/stdout.expected
283 00bb5ea0 2020-07-23 stsp (cd $testroot/wt && got status > $testroot/stdout)
285 00bb5ea0 2020-07-23 stsp cmp -s $testroot/stdout.expected $testroot/stdout
287 00bb5ea0 2020-07-23 stsp if [ "$ret" != "0" ]; then
288 00bb5ea0 2020-07-23 stsp diff -u $testroot/stdout.expected $testroot/stdout
289 00bb5ea0 2020-07-23 stsp test_done "$testroot" "$ret"
293 d4ae64fa 2020-07-23 stsp (cd $testroot/wt && ln -sf beta alpha.link)
294 d4ae64fa 2020-07-23 stsp (cd $testroot/wt && ln -sfh gamma epsilon.link)
296 00bb5ea0 2020-07-23 stsp (cd $testroot/wt && ln -s /etc/passwd passwd.link)
297 00bb5ea0 2020-07-23 stsp (cd $testroot/wt && ln -s ../beta epsilon/beta.link)
298 d4ae64fa 2020-07-23 stsp (cd $testroot/wt && got add passwd.link epsilon/beta.link > /dev/null)
300 d4ae64fa 2020-07-23 stsp (cd $testroot/wt && got rm nonexistent.link > /dev/null)
302 d4ae64fa 2020-07-23 stsp echo 'M alpha.link' > $testroot/stdout.expected
303 00bb5ea0 2020-07-23 stsp echo 'A epsilon/beta.link' >> $testroot/stdout.expected
304 d4ae64fa 2020-07-23 stsp echo 'M epsilon.link' >> $testroot/stdout.expected
305 d4ae64fa 2020-07-23 stsp echo 'D nonexistent.link' >> $testroot/stdout.expected
306 00bb5ea0 2020-07-23 stsp echo 'A passwd.link' >> $testroot/stdout.expected
307 00bb5ea0 2020-07-23 stsp echo "? ramdisk/obj" >> $testroot/stdout.expected
309 3cbbd752 2019-02-19 stsp (cd $testroot/wt && got status > $testroot/stdout)
311 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
313 3cbbd752 2019-02-19 stsp if [ "$ret" != "0" ]; then
314 3cbbd752 2019-02-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
316 3cbbd752 2019-02-19 stsp test_done "$testroot" "$ret"
319 f6cae3ed 2020-09-13 naddy test_status_shows_no_mods_after_complete_merge() {
320 3cbbd752 2019-02-19 stsp local testroot=`test_init status_shows_no_mods_after_complete_merge 1`
322 3cbbd752 2019-02-19 stsp # make this file larger than the usual blob buffer size of 8192
323 3cbbd752 2019-02-19 stsp echo -n > $testroot/repo/numbers
324 3cbbd752 2019-02-19 stsp for i in `jot 16384`; do
325 3cbbd752 2019-02-19 stsp echo "$i" >> $testroot/repo/numbers
328 3cbbd752 2019-02-19 stsp (cd $testroot/repo && git add numbers)
329 3cbbd752 2019-02-19 stsp git_commit $testroot/repo -m "added numbers file"
331 3cbbd752 2019-02-19 stsp got checkout $testroot/repo $testroot/wt > /dev/null
333 3cbbd752 2019-02-19 stsp if [ "$ret" != "0" ]; then
334 3cbbd752 2019-02-19 stsp test_done "$testroot" "$ret"
338 3cbbd752 2019-02-19 stsp sed -i 's/2/22/' $testroot/repo/numbers
339 3cbbd752 2019-02-19 stsp git_commit $testroot/repo -m "modified line 2"
342 3cbbd752 2019-02-19 stsp # modify line 2 again; no local changes are left after merge
343 3cbbd752 2019-02-19 stsp sed -i 's/2/22/' $testroot/wt/numbers
345 3cbbd752 2019-02-19 stsp echo "G numbers" > $testroot/stdout.expected
346 3cbbd752 2019-02-19 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
347 3cbbd752 2019-02-19 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
348 3cbbd752 2019-02-19 stsp echo >> $testroot/stdout.expected
350 3cbbd752 2019-02-19 stsp (cd $testroot/wt && got update > $testroot/stdout)
352 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
354 3cbbd752 2019-02-19 stsp if [ "$ret" != "0" ]; then
355 3cbbd752 2019-02-19 stsp diff -u $testroot/stdout.expected $testroot/stdout
356 3cbbd752 2019-02-19 stsp test_done "$testroot" "$ret"
360 2c201a36 2019-02-10 stsp echo -n > $testroot/stdout.expected
362 2c201a36 2019-02-10 stsp (cd $testroot/wt && got status > $testroot/stdout)
364 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
366 2c201a36 2019-02-10 stsp if [ "$ret" != "0" ]; then
367 2c201a36 2019-02-10 stsp diff -u $testroot/stdout.expected $testroot/stdout
369 2c201a36 2019-02-10 stsp test_done "$testroot" "$ret"
372 f6cae3ed 2020-09-13 naddy test_status_shows_conflict() {
373 7154f6ce 2019-03-27 stsp local testroot=`test_init status_shows_conflict 1`
375 7154f6ce 2019-03-27 stsp echo "1" > $testroot/repo/numbers
376 7154f6ce 2019-03-27 stsp echo "2" >> $testroot/repo/numbers
377 7154f6ce 2019-03-27 stsp echo "3" >> $testroot/repo/numbers
378 7154f6ce 2019-03-27 stsp echo "4" >> $testroot/repo/numbers
379 7154f6ce 2019-03-27 stsp echo "5" >> $testroot/repo/numbers
380 7154f6ce 2019-03-27 stsp echo "6" >> $testroot/repo/numbers
381 7154f6ce 2019-03-27 stsp echo "7" >> $testroot/repo/numbers
382 7154f6ce 2019-03-27 stsp echo "8" >> $testroot/repo/numbers
383 7154f6ce 2019-03-27 stsp (cd $testroot/repo && git add numbers)
384 7154f6ce 2019-03-27 stsp git_commit $testroot/repo -m "added numbers file"
386 7154f6ce 2019-03-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
388 7154f6ce 2019-03-27 stsp if [ "$ret" != "0" ]; then
389 7154f6ce 2019-03-27 stsp test_done "$testroot" "$ret"
393 7154f6ce 2019-03-27 stsp sed -i 's/2/22/' $testroot/repo/numbers
394 7154f6ce 2019-03-27 stsp git_commit $testroot/repo -m "modified line 2"
396 7154f6ce 2019-03-27 stsp # modify line 2 in a conflicting way
397 7154f6ce 2019-03-27 stsp sed -i 's/2/77/' $testroot/wt/numbers
399 7154f6ce 2019-03-27 stsp echo "C numbers" > $testroot/stdout.expected
400 7154f6ce 2019-03-27 stsp echo -n "Updated to commit " >> $testroot/stdout.expected
401 7154f6ce 2019-03-27 stsp git_show_head $testroot/repo >> $testroot/stdout.expected
402 7154f6ce 2019-03-27 stsp echo >> $testroot/stdout.expected
403 9627c110 2020-04-18 stsp echo "Files with new merge conflicts: 1" >> $testroot/stdout.expected
405 7154f6ce 2019-03-27 stsp (cd $testroot/wt && got update > $testroot/stdout)
407 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
409 7154f6ce 2019-03-27 stsp if [ "$ret" != "0" ]; then
410 7154f6ce 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
411 7154f6ce 2019-03-27 stsp test_done "$testroot" "$ret"
415 7154f6ce 2019-03-27 stsp echo 'C numbers' > $testroot/stdout.expected
417 7154f6ce 2019-03-27 stsp (cd $testroot/wt && got status > $testroot/stdout)
419 c577a9ce 2019-07-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
421 c577a9ce 2019-07-27 stsp if [ "$ret" != "0" ]; then
422 c577a9ce 2019-07-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
424 c577a9ce 2019-07-27 stsp test_done "$testroot" "$ret"
427 f6cae3ed 2020-09-13 naddy test_status_empty_dir() {
428 c577a9ce 2019-07-27 stsp local testroot=`test_init status_empty_dir`
430 c577a9ce 2019-07-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
432 c577a9ce 2019-07-27 stsp if [ "$ret" != "0" ]; then
433 c577a9ce 2019-07-27 stsp test_done "$testroot" "$ret"
437 c577a9ce 2019-07-27 stsp rm $testroot/wt/epsilon/zeta
439 c577a9ce 2019-07-27 stsp echo '! epsilon/zeta' > $testroot/stdout.expected
441 c577a9ce 2019-07-27 stsp (cd $testroot/wt && got status epsilon > $testroot/stdout)
443 c577a9ce 2019-07-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
445 c577a9ce 2019-07-27 stsp if [ "$ret" != "0" ]; then
446 c577a9ce 2019-07-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
448 c577a9ce 2019-07-27 stsp test_done "$testroot" "$ret"
451 f6cae3ed 2020-09-13 naddy test_status_empty_dir_unversioned_file() {
452 c577a9ce 2019-07-27 stsp local testroot=`test_init status_empty_dir_unversioned_file`
454 c577a9ce 2019-07-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
456 c577a9ce 2019-07-27 stsp if [ "$ret" != "0" ]; then
457 c577a9ce 2019-07-27 stsp test_done "$testroot" "$ret"
461 c577a9ce 2019-07-27 stsp rm $testroot/wt/epsilon/zeta
462 c577a9ce 2019-07-27 stsp touch $testroot/wt/epsilon/unversioned
464 c577a9ce 2019-07-27 stsp echo '? epsilon/unversioned' > $testroot/stdout.expected
465 c577a9ce 2019-07-27 stsp echo '! epsilon/zeta' >> $testroot/stdout.expected
467 c577a9ce 2019-07-27 stsp (cd $testroot/wt && got status epsilon > $testroot/stdout)
469 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
471 7154f6ce 2019-03-27 stsp if [ "$ret" != "0" ]; then
472 7154f6ce 2019-03-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
474 7154f6ce 2019-03-27 stsp test_done "$testroot" "$ret"
477 f6cae3ed 2020-09-13 naddy test_status_many_paths() {
478 72ea6654 2019-07-27 stsp local testroot=`test_init status_many_paths`
480 72ea6654 2019-07-27 stsp got checkout $testroot/repo $testroot/wt > /dev/null
482 72ea6654 2019-07-27 stsp if [ "$ret" != "0" ]; then
483 72ea6654 2019-07-27 stsp test_done "$testroot" "$ret"
487 72ea6654 2019-07-27 stsp echo "modified alpha" > $testroot/wt/alpha
488 72ea6654 2019-07-27 stsp (cd $testroot/wt && got rm beta >/dev/null)
489 72ea6654 2019-07-27 stsp echo "unversioned file" > $testroot/wt/foo
490 72ea6654 2019-07-27 stsp rm $testroot/wt/epsilon/zeta
491 72ea6654 2019-07-27 stsp touch $testroot/wt/beta
492 72ea6654 2019-07-27 stsp echo "new file" > $testroot/wt/new
493 72ea6654 2019-07-27 stsp mkdir $testroot/wt/newdir
494 72ea6654 2019-07-27 stsp (cd $testroot/wt && got add new >/dev/null)
496 72ea6654 2019-07-27 stsp (cd $testroot/wt && got status newdir > $testroot/stdout.expected)
497 72ea6654 2019-07-27 stsp (cd $testroot/wt && got status alpha >> $testroot/stdout.expected)
498 72ea6654 2019-07-27 stsp (cd $testroot/wt && got status epsilon >> $testroot/stdout.expected)
499 72ea6654 2019-07-27 stsp (cd $testroot/wt && got status foo >> $testroot/stdout.expected)
500 72ea6654 2019-07-27 stsp (cd $testroot/wt && got status new >> $testroot/stdout.expected)
501 72ea6654 2019-07-27 stsp (cd $testroot/wt && got status beta >> $testroot/stdout.expected)
502 72ea6654 2019-07-27 stsp (cd $testroot/wt && got status . >> $testroot/stdout.expected)
504 72ea6654 2019-07-27 stsp (cd $testroot/wt && got status newdir alpha epsilon foo new beta . \
505 72ea6654 2019-07-27 stsp > $testroot/stdout)
507 6841da00 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
509 6841da00 2019-08-08 stsp if [ "$ret" != "0" ]; then
510 6841da00 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
512 6841da00 2019-08-08 stsp test_done "$testroot" "$ret"
515 f6cae3ed 2020-09-13 naddy test_status_cvsignore() {
516 6841da00 2019-08-08 stsp local testroot=`test_init status_cvsignore`
518 6841da00 2019-08-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
520 6841da00 2019-08-08 stsp if [ "$ret" != "0" ]; then
521 6841da00 2019-08-08 stsp test_done "$testroot" "$ret"
525 6841da00 2019-08-08 stsp echo "unversioned file" > $testroot/wt/foo
526 6841da00 2019-08-08 stsp echo "unversioned file" > $testroot/wt/foop
527 3143d852 2020-06-25 stsp echo "unversioned file" > $testroot/wt/epsilon/foo
528 6841da00 2019-08-08 stsp echo "unversioned file" > $testroot/wt/epsilon/bar
529 6841da00 2019-08-08 stsp echo "unversioned file" > $testroot/wt/epsilon/boo
530 6841da00 2019-08-08 stsp echo "unversioned file" > $testroot/wt/epsilon/moo
531 3143d852 2020-06-25 stsp mkdir -p $testroot/wt/epsilon/new/
532 3143d852 2020-06-25 stsp echo "unversioned file" > $testroot/wt/epsilon/new/foo
533 3143d852 2020-06-25 stsp echo "**/foo" > $testroot/wt/.cvsignore
534 6841da00 2019-08-08 stsp echo "bar" > $testroot/wt/epsilon/.cvsignore
535 6841da00 2019-08-08 stsp echo "moo" >> $testroot/wt/epsilon/.cvsignore
537 6841da00 2019-08-08 stsp echo '? .cvsignore' > $testroot/stdout.expected
538 6841da00 2019-08-08 stsp echo '? epsilon/.cvsignore' >> $testroot/stdout.expected
539 6841da00 2019-08-08 stsp echo '? epsilon/boo' >> $testroot/stdout.expected
540 6841da00 2019-08-08 stsp echo '? foop' >> $testroot/stdout.expected
541 6841da00 2019-08-08 stsp (cd $testroot/wt && got status > $testroot/stdout)
543 3143d852 2020-06-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
545 3143d852 2020-06-25 stsp if [ "$ret" != "0" ]; then
546 3143d852 2020-06-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
547 3143d852 2020-06-25 stsp test_done "$testroot" "$ret"
551 3143d852 2020-06-25 stsp echo '? epsilon/.cvsignore' > $testroot/stdout.expected
552 3143d852 2020-06-25 stsp echo '? epsilon/boo' >> $testroot/stdout.expected
553 3143d852 2020-06-25 stsp (cd $testroot/wt && got status epsilon > $testroot/stdout)
555 b80270a7 2019-08-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
557 b80270a7 2019-08-08 stsp if [ "$ret" != "0" ]; then
558 b80270a7 2019-08-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
559 b80270a7 2019-08-08 stsp test_done "$testroot" "$ret"
563 3143d852 2020-06-25 stsp echo -n '' > $testroot/stdout.expected
564 3143d852 2020-06-25 stsp (cd $testroot/wt && got status epsilon/new > $testroot/stdout)
566 3143d852 2020-06-25 stsp cmp -s $testroot/stdout.expected $testroot/stdout
568 3143d852 2020-06-25 stsp if [ "$ret" != "0" ]; then
569 3143d852 2020-06-25 stsp diff -u $testroot/stdout.expected $testroot/stdout
570 3143d852 2020-06-25 stsp test_done "$testroot" "$ret"
574 b80270a7 2019-08-08 stsp echo '? .cvsignore' > $testroot/stdout.expected
575 b80270a7 2019-08-08 stsp echo '? epsilon/.cvsignore' >> $testroot/stdout.expected
576 b80270a7 2019-08-08 stsp echo '? epsilon/boo' >> $testroot/stdout.expected
577 bd8de430 2019-10-04 stsp echo '? foop' >> $testroot/stdout.expected
578 bd8de430 2019-10-04 stsp (cd $testroot/wt/gamma && got status > $testroot/stdout)
580 bd8de430 2019-10-04 stsp cmp -s $testroot/stdout.expected $testroot/stdout
582 bd8de430 2019-10-04 stsp if [ "$ret" != "0" ]; then
583 bd8de430 2019-10-04 stsp diff -u $testroot/stdout.expected $testroot/stdout
585 bd8de430 2019-10-04 stsp test_done "$testroot" "$ret"
588 f6cae3ed 2020-09-13 naddy test_status_gitignore() {
589 bd8de430 2019-10-04 stsp local testroot=`test_init status_gitignore`
591 bd8de430 2019-10-04 stsp got checkout $testroot/repo $testroot/wt > /dev/null
593 bd8de430 2019-10-04 stsp if [ "$ret" != "0" ]; then
594 bd8de430 2019-10-04 stsp test_done "$testroot" "$ret"
598 bd8de430 2019-10-04 stsp echo "unversioned file" > $testroot/wt/foo
599 bd8de430 2019-10-04 stsp echo "unversioned file" > $testroot/wt/foop
600 bd8de430 2019-10-04 stsp echo "unversioned file" > $testroot/wt/barp
601 bd8de430 2019-10-04 stsp echo "unversioned file" > $testroot/wt/epsilon/bar
602 bd8de430 2019-10-04 stsp echo "unversioned file" > $testroot/wt/epsilon/boo
603 bd8de430 2019-10-04 stsp echo "unversioned file" > $testroot/wt/epsilon/moo
604 bd8de430 2019-10-04 stsp mkdir -p $testroot/wt/a/b/c/
605 bd8de430 2019-10-04 stsp echo "unversioned file" > $testroot/wt/a/b/c/foo
606 bd8de430 2019-10-04 stsp echo "unversioned file" > $testroot/wt/a/b/c/zoo
607 bd8de430 2019-10-04 stsp echo "foo" > $testroot/wt/.gitignore
608 bd8de430 2019-10-04 stsp echo "bar*" >> $testroot/wt/.gitignore
609 bd8de430 2019-10-04 stsp echo "epsilon/**" >> $testroot/wt/.gitignore
610 bd8de430 2019-10-04 stsp echo "a/**/foo" >> $testroot/wt/.gitignore
611 bd8de430 2019-10-04 stsp echo "**/zoo" >> $testroot/wt/.gitignore
613 bd8de430 2019-10-04 stsp echo '? .gitignore' > $testroot/stdout.expected
614 b80270a7 2019-08-08 stsp echo '? foop' >> $testroot/stdout.expected
615 bd8de430 2019-10-04 stsp (cd $testroot/wt && got status > $testroot/stdout)
617 bd8de430 2019-10-04 stsp cmp -s $testroot/stdout.expected $testroot/stdout
619 bd8de430 2019-10-04 stsp if [ "$ret" != "0" ]; then
620 bd8de430 2019-10-04 stsp diff -u $testroot/stdout.expected $testroot/stdout
621 bd8de430 2019-10-04 stsp test_done "$testroot" "$ret"
625 bd8de430 2019-10-04 stsp echo '? .gitignore' > $testroot/stdout.expected
626 bd8de430 2019-10-04 stsp echo '? foop' >> $testroot/stdout.expected
627 b80270a7 2019-08-08 stsp (cd $testroot/wt/gamma && got status > $testroot/stdout)
629 72ea6654 2019-07-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
631 72ea6654 2019-07-27 stsp if [ "$ret" != "0" ]; then
632 72ea6654 2019-07-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
634 72ea6654 2019-07-27 stsp test_done "$testroot" "$ret"
637 f6cae3ed 2020-09-13 naddy test_status_status_code() {
638 081470ac 2020-08-13 stsp local testroot=`test_init status_status_code`
640 081470ac 2020-08-13 stsp got checkout $testroot/repo $testroot/wt > /dev/null
642 081470ac 2020-08-13 stsp if [ "$ret" != "0" ]; then
643 081470ac 2020-08-13 stsp test_done "$testroot" "$ret"
647 081470ac 2020-08-13 stsp echo "modified alpha" > $testroot/wt/alpha
648 081470ac 2020-08-13 stsp (cd $testroot/wt && got rm beta >/dev/null)
649 081470ac 2020-08-13 stsp echo "unversioned file" > $testroot/wt/foo
650 081470ac 2020-08-13 stsp rm $testroot/wt/epsilon/zeta
651 081470ac 2020-08-13 stsp touch $testroot/wt/beta
652 081470ac 2020-08-13 stsp echo "new file" > $testroot/wt/new
653 081470ac 2020-08-13 stsp (cd $testroot/wt && got add new >/dev/null)
655 081470ac 2020-08-13 stsp (cd $testroot/wt && got status -s xDM \
656 081470ac 2020-08-13 stsp > $testroot/stdout 2> $testroot/stderr)
658 54c39596 2020-12-28 stsp if [ "$ret" = "0" ]; then
659 081470ac 2020-08-13 stsp echo "status succeeded unexpectedly" >&2
660 081470ac 2020-08-13 stsp test_done "$testroot" "1"
664 081470ac 2020-08-13 stsp echo "got: invalid status code 'x'" > $testroot/stderr.expected
665 081470ac 2020-08-13 stsp cmp -s $testroot/stderr.expected $testroot/stderr
667 081470ac 2020-08-13 stsp if [ "$ret" != "0" ]; then
668 081470ac 2020-08-13 stsp diff -u $testroot/stderr.expected $testroot/stderr
669 081470ac 2020-08-13 stsp test_done "$testroot" "$ret"
673 081470ac 2020-08-13 stsp echo 'M alpha' > $testroot/stdout.expected
674 081470ac 2020-08-13 stsp (cd $testroot/wt && got status -s M > $testroot/stdout)
675 081470ac 2020-08-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
677 081470ac 2020-08-13 stsp if [ "$ret" != "0" ]; then
678 081470ac 2020-08-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
679 081470ac 2020-08-13 stsp test_done "$testroot" "$ret"
683 081470ac 2020-08-13 stsp echo 'D beta' > $testroot/stdout.expected
684 081470ac 2020-08-13 stsp (cd $testroot/wt && got status -s D > $testroot/stdout)
685 081470ac 2020-08-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
687 081470ac 2020-08-13 stsp if [ "$ret" != "0" ]; then
688 081470ac 2020-08-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
689 081470ac 2020-08-13 stsp test_done "$testroot" "$ret"
693 081470ac 2020-08-13 stsp echo '! epsilon/zeta' > $testroot/stdout.expected
694 081470ac 2020-08-13 stsp echo '? foo' >> $testroot/stdout.expected
695 081470ac 2020-08-13 stsp (cd $testroot/wt && got status -s \!? > $testroot/stdout)
696 081470ac 2020-08-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
698 081470ac 2020-08-13 stsp if [ "$ret" != "0" ]; then
699 081470ac 2020-08-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
700 081470ac 2020-08-13 stsp test_done "$testroot" "$ret"
704 081470ac 2020-08-13 stsp echo 'A new' > $testroot/stdout.expected
705 081470ac 2020-08-13 stsp (cd $testroot/wt && got status -s A > $testroot/stdout)
706 081470ac 2020-08-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
708 081470ac 2020-08-13 stsp if [ "$ret" != "0" ]; then
709 081470ac 2020-08-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
710 081470ac 2020-08-13 stsp test_done "$testroot" "$ret"
714 081470ac 2020-08-13 stsp (cd $testroot/wt && got stage new > $testroot/stdout)
716 081470ac 2020-08-13 stsp echo ' A new' > $testroot/stdout.expected
717 081470ac 2020-08-13 stsp (cd $testroot/wt && got status -s A > $testroot/stdout)
718 081470ac 2020-08-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
720 081470ac 2020-08-13 stsp if [ "$ret" != "0" ]; then
721 081470ac 2020-08-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
722 081470ac 2020-08-13 stsp test_done "$testroot" "$ret"
726 081470ac 2020-08-13 stsp echo 'changed file new' > $testroot/wt/new
728 081470ac 2020-08-13 stsp echo 'MA new' > $testroot/stdout.expected
729 081470ac 2020-08-13 stsp (cd $testroot/wt && got status -s A > $testroot/stdout)
730 081470ac 2020-08-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
732 081470ac 2020-08-13 stsp if [ "$ret" != "0" ]; then
733 081470ac 2020-08-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
734 081470ac 2020-08-13 stsp test_done "$testroot" "$ret"
738 081470ac 2020-08-13 stsp echo 'M alpha' > $testroot/stdout.expected
739 081470ac 2020-08-13 stsp echo 'MA new' >> $testroot/stdout.expected
740 081470ac 2020-08-13 stsp (cd $testroot/wt && got status -s M > $testroot/stdout)
741 081470ac 2020-08-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
743 081470ac 2020-08-13 stsp if [ "$ret" != "0" ]; then
744 081470ac 2020-08-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
745 081470ac 2020-08-13 stsp test_done "$testroot" "$ret"
749 081470ac 2020-08-13 stsp test_done "$testroot" "$ret"
752 4a26d3f8 2020-10-07 stsp test_status_empty_file() {
753 4a26d3f8 2020-10-07 stsp local testroot=`test_init status_empty_file`
755 4a26d3f8 2020-10-07 stsp got checkout $testroot/repo $testroot/wt > /dev/null
757 4a26d3f8 2020-10-07 stsp if [ "$ret" != "0" ]; then
758 4a26d3f8 2020-10-07 stsp test_done "$testroot" "$ret"
762 4a26d3f8 2020-10-07 stsp echo -n "" > $testroot/wt/empty
763 4a26d3f8 2020-10-07 stsp (cd $testroot/wt && got add empty >/dev/null)
765 4a26d3f8 2020-10-07 stsp echo 'A empty' > $testroot/stdout.expected
767 4a26d3f8 2020-10-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
769 4a26d3f8 2020-10-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
771 4a26d3f8 2020-10-07 stsp if [ "$ret" != "0" ]; then
772 4a26d3f8 2020-10-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
773 4a26d3f8 2020-10-07 stsp test_done "$testroot" "$ret"
777 4a26d3f8 2020-10-07 stsp (cd $testroot/wt && got commit -m "empty file" >/dev/null)
779 4a26d3f8 2020-10-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
781 4a26d3f8 2020-10-07 stsp echo -n > $testroot/stdout.expected
782 4a26d3f8 2020-10-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
784 4a26d3f8 2020-10-07 stsp if [ "$ret" != "0" ]; then
785 4a26d3f8 2020-10-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
786 4a26d3f8 2020-10-07 stsp test_done "$testroot" "$ret"
790 4a26d3f8 2020-10-07 stsp # update the timestamp; this used to make the file show up as:
792 4a26d3f8 2020-10-07 stsp # which should not happen
793 4a26d3f8 2020-10-07 stsp touch $testroot/wt/empty
795 4a26d3f8 2020-10-07 stsp (cd $testroot/wt && got status > $testroot/stdout)
797 4a26d3f8 2020-10-07 stsp echo -n > $testroot/stdout.expected
798 4a26d3f8 2020-10-07 stsp cmp -s $testroot/stdout.expected $testroot/stdout
800 4a26d3f8 2020-10-07 stsp if [ "$ret" != "0" ]; then
801 4a26d3f8 2020-10-07 stsp diff -u $testroot/stdout.expected $testroot/stdout
803 4a26d3f8 2020-10-07 stsp test_done "$testroot" "$ret"
806 7fb414ae 2020-08-08 stsp test_parseargs "$@"
807 35dc4510 2019-02-04 stsp run_test test_status_basic
808 f02ba292 2019-02-05 stsp run_test test_status_subdir_no_mods
809 f02ba292 2019-02-05 stsp run_test test_status_subdir_no_mods2
810 0dbc2271 2019-02-05 stsp run_test test_status_obstructed
811 02c07007 2019-02-10 stsp run_test test_status_shows_local_mods_after_update
812 18831e78 2019-02-10 stsp run_test test_status_unversioned_subdirs
813 00bb5ea0 2020-07-23 stsp run_test test_status_symlink
814 3cbbd752 2019-02-19 stsp run_test test_status_shows_no_mods_after_complete_merge
815 7154f6ce 2019-03-27 stsp run_test test_status_shows_conflict
816 c577a9ce 2019-07-27 stsp run_test test_status_empty_dir
817 c577a9ce 2019-07-27 stsp run_test test_status_empty_dir_unversioned_file
818 72ea6654 2019-07-27 stsp run_test test_status_many_paths
819 6841da00 2019-08-08 stsp run_test test_status_cvsignore
820 bd8de430 2019-10-04 stsp run_test test_status_gitignore
821 081470ac 2020-08-13 stsp run_test test_status_status_code
822 4a26d3f8 2020-10-07 stsp run_test test_status_empty_file