3 5aa81393 2020-01-06 stsp # Copyright (c) 2019, 2020 Stefan Sperling <stsp@openbsd.org>
5 cbd1af7a 2019-03-18 stsp # Permission to use, copy, modify, and distribute this software for any
6 cbd1af7a 2019-03-18 stsp # purpose with or without fee is hereby granted, provided that the above
7 cbd1af7a 2019-03-18 stsp # copyright notice and this permission notice appear in all copies.
9 cbd1af7a 2019-03-18 stsp # THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
10 cbd1af7a 2019-03-18 stsp # WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
11 cbd1af7a 2019-03-18 stsp # MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
12 cbd1af7a 2019-03-18 stsp # ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
13 cbd1af7a 2019-03-18 stsp # WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
14 cbd1af7a 2019-03-18 stsp # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
15 cbd1af7a 2019-03-18 stsp # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
17 cbd1af7a 2019-03-18 stsp . ./common.sh
19 f6cae3ed 2020-09-13 naddy test_log_in_repo() {
20 e7301579 2019-03-18 stsp local testroot=`test_init log_in_repo`
21 e7301579 2019-03-18 stsp local head_rev=`git_show_head $testroot/repo`
23 e7301579 2019-03-18 stsp echo "commit $head_rev (master)" > $testroot/stdout.expected
25 e7301579 2019-03-18 stsp for p in "" "." alpha epsilon epsilon/zeta; do
26 e7301579 2019-03-18 stsp (cd $testroot/repo && got log $p | \
27 e7301579 2019-03-18 stsp grep ^commit > $testroot/stdout)
28 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
30 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
31 e7301579 2019-03-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
32 e7301579 2019-03-18 stsp test_done "$testroot" "$ret"
37 b70703ad 2019-03-18 stsp for p in "" "." zeta; do
38 b70703ad 2019-03-18 stsp (cd $testroot/repo/epsilon && got log $p | \
39 b70703ad 2019-03-18 stsp grep ^commit > $testroot/stdout)
40 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
42 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
43 b70703ad 2019-03-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
44 b70703ad 2019-03-18 stsp test_done "$testroot" "$ret"
49 e7301579 2019-03-18 stsp test_done "$testroot" "0"
52 f6cae3ed 2020-09-13 naddy test_log_in_bare_repo() {
53 b70703ad 2019-03-18 stsp local testroot=`test_init log_in_bare_repo`
54 b70703ad 2019-03-18 stsp local head_rev=`git_show_head $testroot/repo`
56 b70703ad 2019-03-18 stsp echo "commit $head_rev (master)" > $testroot/stdout.expected
58 b70703ad 2019-03-18 stsp for p in "" "." alpha epsilon epsilon/zeta; do
59 b70703ad 2019-03-18 stsp (cd $testroot/repo/.git && got log $p | \
60 b70703ad 2019-03-18 stsp grep ^commit > $testroot/stdout)
61 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
63 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
64 b70703ad 2019-03-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
65 b70703ad 2019-03-18 stsp test_done "$testroot" "$ret"
70 b70703ad 2019-03-18 stsp test_done "$testroot" "0"
73 f6cae3ed 2020-09-13 naddy test_log_in_worktree() {
74 f43793a4 2020-01-27 stsp local testroot=`test_init log_in_worktree 1`
76 f43793a4 2020-01-27 stsp make_test_tree $testroot/repo
77 f43793a4 2020-01-27 stsp mkdir -p $testroot/repo/epsilon/d
78 f43793a4 2020-01-27 stsp echo foo > $testroot/repo/epsilon/d/foo
79 f43793a4 2020-01-27 stsp (cd $testroot/repo && git add .)
80 f43793a4 2020-01-27 stsp git_commit $testroot/repo -m "adding the test tree"
81 f43793a4 2020-01-27 stsp local head_commit=`git_show_head $testroot/repo`
83 cbd1af7a 2019-03-18 stsp got checkout $testroot/repo $testroot/wt > /dev/null
85 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
86 cbd1af7a 2019-03-18 stsp test_done "$testroot" "$ret"
90 f43793a4 2020-01-27 stsp echo "commit $head_commit (master)" > $testroot/stdout.expected
92 cbd1af7a 2019-03-18 stsp for p in "" "." alpha epsilon; do
93 cbd1af7a 2019-03-18 stsp (cd $testroot/wt && got log $p | \
94 cbd1af7a 2019-03-18 stsp grep ^commit > $testroot/stdout)
95 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
97 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
98 cbd1af7a 2019-03-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
99 cbd1af7a 2019-03-18 stsp test_done "$testroot" "$ret"
104 cbd1af7a 2019-03-18 stsp for p in "" "." zeta; do
105 cbd1af7a 2019-03-18 stsp (cd $testroot/wt/epsilon && got log $p | \
106 cbd1af7a 2019-03-18 stsp grep ^commit > $testroot/stdout)
107 8d301dd9 2019-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
109 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
110 cbd1af7a 2019-03-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
111 cbd1af7a 2019-03-18 stsp test_done "$testroot" "$ret"
116 f43793a4 2020-01-27 stsp for p in "" "." foo; do
117 f43793a4 2020-01-27 stsp (cd $testroot/wt/epsilon && got log d/$p | \
118 f43793a4 2020-01-27 stsp grep ^commit > $testroot/stdout)
119 f43793a4 2020-01-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
121 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
122 f43793a4 2020-01-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
123 f43793a4 2020-01-27 stsp test_done "$testroot" "$ret"
128 cbd1af7a 2019-03-18 stsp test_done "$testroot" "0"
131 f6cae3ed 2020-09-13 naddy test_log_in_worktree_with_path_prefix() {
132 0c2ef172 2023-02-13 op local testroot=`test_init log_in_worktree_with_path_prefix`
133 0cfcb52d 2019-08-27 stsp local head_rev=`git_show_head $testroot/repo`
135 0cfcb52d 2019-08-27 stsp echo "modified zeta" > $testroot/repo/epsilon/zeta
136 0cfcb52d 2019-08-27 stsp git_commit $testroot/repo -m "modified zeta"
137 0cfcb52d 2019-08-27 stsp local zeta_rev=`git_show_head $testroot/repo`
139 0cfcb52d 2019-08-27 stsp echo "modified delta" > $testroot/repo/gamma/delta
140 0cfcb52d 2019-08-27 stsp git_commit $testroot/repo -m "modified delta"
141 603cdeb0 2020-10-22 stsp local delta_rev=`git_show_head $testroot/repo`
143 0cfcb52d 2019-08-27 stsp got checkout -p epsilon $testroot/repo $testroot/wt > /dev/null
145 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
146 603cdeb0 2020-10-22 stsp test_done "$testroot" "$ret"
150 603cdeb0 2020-10-22 stsp echo "commit $delta_rev (master)" > $testroot/stdout.expected
151 603cdeb0 2020-10-22 stsp echo "commit $zeta_rev" >> $testroot/stdout.expected
152 603cdeb0 2020-10-22 stsp echo "commit $head_rev" >> $testroot/stdout.expected
154 603cdeb0 2020-10-22 stsp (cd $testroot/wt && got log | grep ^commit > $testroot/stdout)
155 603cdeb0 2020-10-22 stsp cmp -s $testroot/stdout.expected $testroot/stdout
157 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
158 603cdeb0 2020-10-22 stsp diff -u $testroot/stdout.expected $testroot/stdout
159 0cfcb52d 2019-08-27 stsp test_done "$testroot" "$ret"
163 0cfcb52d 2019-08-27 stsp echo "commit $zeta_rev" > $testroot/stdout.expected
164 0cfcb52d 2019-08-27 stsp echo "commit $head_rev" >> $testroot/stdout.expected
166 603cdeb0 2020-10-22 stsp for p in "." zeta; do
167 0cfcb52d 2019-08-27 stsp (cd $testroot/wt && got log $p | \
168 0cfcb52d 2019-08-27 stsp grep ^commit > $testroot/stdout)
169 0cfcb52d 2019-08-27 stsp cmp -s $testroot/stdout.expected $testroot/stdout
171 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
172 0cfcb52d 2019-08-27 stsp diff -u $testroot/stdout.expected $testroot/stdout
173 0cfcb52d 2019-08-27 stsp test_done "$testroot" "$ret"
178 0cfcb52d 2019-08-27 stsp test_done "$testroot" "0"
181 f6cae3ed 2020-09-13 naddy test_log_tag() {
182 303e2782 2019-08-09 stsp local testroot=`test_init log_tag`
183 303e2782 2019-08-09 stsp local commit_id=`git_show_head $testroot/repo`
184 303e2782 2019-08-09 stsp local tag="1.0.0"
185 5a8ddf14 2019-08-13 stsp local tag2="2.0.0"
187 303e2782 2019-08-09 stsp got checkout $testroot/repo $testroot/wt > /dev/null
189 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
190 303e2782 2019-08-09 stsp test_done "$testroot" "$ret"
194 303e2782 2019-08-09 stsp (cd $testroot/repo && git tag -a -m "test" $tag)
196 a436ad14 2019-08-13 stsp echo "commit $commit_id (master, tags/$tag)" > $testroot/stdout.expected
197 303e2782 2019-08-09 stsp (cd $testroot/wt && got log -l1 -c $tag | grep ^commit \
198 303e2782 2019-08-09 stsp > $testroot/stdout)
199 303e2782 2019-08-09 stsp cmp -s $testroot/stdout.expected $testroot/stdout
201 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
202 303e2782 2019-08-09 stsp diff -u $testroot/stdout.expected $testroot/stdout
203 5a8ddf14 2019-08-13 stsp test_done "$testroot" "$ret"
207 992eb9d8 2020-02-07 tracey # test a "lightweight" tag
208 5a8ddf14 2019-08-13 stsp (cd $testroot/repo && git tag $tag2)
210 5a8ddf14 2019-08-13 stsp echo "commit $commit_id (master, tags/$tag, tags/$tag2)" \
211 5a8ddf14 2019-08-13 stsp > $testroot/stdout.expected
212 5a8ddf14 2019-08-13 stsp (cd $testroot/wt && got log -l1 -c $tag2 | grep ^commit \
213 5a8ddf14 2019-08-13 stsp > $testroot/stdout)
214 5a8ddf14 2019-08-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
216 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
217 5a8ddf14 2019-08-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
219 303e2782 2019-08-09 stsp test_done "$testroot" "$ret"
222 f6cae3ed 2020-09-13 naddy test_log_limit() {
223 b1ebc001 2019-08-13 stsp local testroot=`test_init log_limit`
224 b1ebc001 2019-08-13 stsp local commit_id0=`git_show_head $testroot/repo`
226 b1ebc001 2019-08-13 stsp got checkout $testroot/repo $testroot/wt > /dev/null
228 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
229 b1ebc001 2019-08-13 stsp test_done "$testroot" "$ret"
233 b1ebc001 2019-08-13 stsp echo "modified alpha" > $testroot/wt/alpha
234 b1ebc001 2019-08-13 stsp (cd $testroot/wt && got commit -m 'test log_limit' > /dev/null)
235 b1ebc001 2019-08-13 stsp local commit_id1=`git_show_head $testroot/repo`
237 b1ebc001 2019-08-13 stsp (cd $testroot/wt && got rm beta >/dev/null)
238 b1ebc001 2019-08-13 stsp (cd $testroot/wt && got commit -m 'test log_limit' > /dev/null)
239 b1ebc001 2019-08-13 stsp local commit_id2=`git_show_head $testroot/repo`
241 b1ebc001 2019-08-13 stsp echo "new file" > $testroot/wt/new
242 b1ebc001 2019-08-13 stsp (cd $testroot/wt && got add new >/dev/null)
243 b1ebc001 2019-08-13 stsp (cd $testroot/wt && got commit -m 'test log_limit' > /dev/null)
244 b1ebc001 2019-08-13 stsp local commit_id3=`git_show_head $testroot/repo`
246 b1ebc001 2019-08-13 stsp # -l1 should print the first commit only
247 b1ebc001 2019-08-13 stsp echo "commit $commit_id3 (master)" > $testroot/stdout.expected
248 b1ebc001 2019-08-13 stsp (cd $testroot/wt && got log -l1 | grep ^commit > $testroot/stdout)
249 b1ebc001 2019-08-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
251 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
252 b1ebc001 2019-08-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
253 b1ebc001 2019-08-13 stsp test_done "$testroot" "$ret"
257 b1ebc001 2019-08-13 stsp # env var can be used to set a log limit without -l option
258 b1ebc001 2019-08-13 stsp echo "commit $commit_id3 (master)" > $testroot/stdout.expected
259 b1ebc001 2019-08-13 stsp echo "commit $commit_id2" >> $testroot/stdout.expected
260 b1ebc001 2019-08-13 stsp (cd $testroot/wt && env GOT_LOG_DEFAULT_LIMIT=2 got log | \
261 b1ebc001 2019-08-13 stsp grep ^commit > $testroot/stdout)
262 b1ebc001 2019-08-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
264 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
265 b1ebc001 2019-08-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
266 b1ebc001 2019-08-13 stsp test_done "$testroot" "$ret"
270 b1ebc001 2019-08-13 stsp # non-numeric env var is ignored
271 b1ebc001 2019-08-13 stsp (cd $testroot/wt && env GOT_LOG_DEFAULT_LIMIT=foobar got log | \
272 b1ebc001 2019-08-13 stsp grep ^commit > $testroot/stdout)
273 b1ebc001 2019-08-13 stsp echo "commit $commit_id3 (master)" > $testroot/stdout.expected
274 b1ebc001 2019-08-13 stsp echo "commit $commit_id2" >> $testroot/stdout.expected
275 b1ebc001 2019-08-13 stsp echo "commit $commit_id1" >> $testroot/stdout.expected
276 b1ebc001 2019-08-13 stsp echo "commit $commit_id0" >> $testroot/stdout.expected
277 b1ebc001 2019-08-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
279 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
280 b1ebc001 2019-08-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
281 b1ebc001 2019-08-13 stsp test_done "$testroot" "$ret"
285 b1ebc001 2019-08-13 stsp # -l option takes precedence over env var
286 b1ebc001 2019-08-13 stsp echo "commit $commit_id3 (master)" > $testroot/stdout.expected
287 b1ebc001 2019-08-13 stsp echo "commit $commit_id2" >> $testroot/stdout.expected
288 b1ebc001 2019-08-13 stsp echo "commit $commit_id1" >> $testroot/stdout.expected
289 b1ebc001 2019-08-13 stsp echo "commit $commit_id0" >> $testroot/stdout.expected
290 b1ebc001 2019-08-13 stsp (cd $testroot/wt && env GOT_LOG_DEFAULT_LIMIT=1 got log -l0 | \
291 b1ebc001 2019-08-13 stsp grep ^commit > $testroot/stdout)
292 b1ebc001 2019-08-13 stsp cmp -s $testroot/stdout.expected $testroot/stdout
294 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
295 b1ebc001 2019-08-13 stsp diff -u $testroot/stdout.expected $testroot/stdout
297 b1ebc001 2019-08-13 stsp test_done "$testroot" "0"
300 c1c775eb 2022-06-08 stsp test_log_oneline() {
301 c1c775eb 2022-06-08 stsp local testroot=`test_init log_oneline`
302 c1c775eb 2022-06-08 stsp local commit_id0=`git_show_head $testroot/repo`
303 c1c775eb 2022-06-08 stsp got checkout $testroot/repo $testroot/wt > /dev/null
305 c1c775eb 2022-06-08 stsp if [ $ret -ne 0 ]; then
306 c1c775eb 2022-06-08 stsp test_done "$testroot" "$ret"
310 c1c775eb 2022-06-08 stsp echo "modified alpha" > $testroot/wt/alpha
311 c1c775eb 2022-06-08 stsp (cd $testroot/wt && got commit -m "test oneline
312 c1c775eb 2022-06-08 stsp no" > /dev/null)
313 c1c775eb 2022-06-08 stsp local commit_id1=`git_show_head $testroot/repo`
314 783ffc01 2022-06-13 stsp local author_time1=`git_show_author_time $testroot/repo`
316 c1c775eb 2022-06-08 stsp echo "modified beta" > $testroot/wt/beta
317 c1c775eb 2022-06-08 stsp (cd $testroot/wt && got commit -m " test oneline
318 c1c775eb 2022-06-08 stsp no" > /dev/null)
319 c1c775eb 2022-06-08 stsp local commit_id2=`git_show_head $testroot/repo`
320 783ffc01 2022-06-13 stsp local author_time2=`git_show_author_time $testroot/repo`
322 783ffc01 2022-06-13 stsp d=`date -u -r $author_time1 +"%G-%m-%d"`
323 783ffc01 2022-06-13 stsp printf "$d %-7s test oneline\n" master > $testroot/stdout.expected
324 783ffc01 2022-06-13 stsp d=`date -u -r $author_time2 +"%G-%m-%d"`
325 783ffc01 2022-06-13 stsp printf "$d %.7s test oneline\n" $commit_id1 >> $testroot/stdout.expected
327 c1c775eb 2022-06-08 stsp (cd $testroot/repo && got log -s | head -n 2 > $testroot/stdout)
328 c1c775eb 2022-06-08 stsp cmp -s $testroot/stdout.expected $testroot/stdout
330 c1c775eb 2022-06-08 stsp if [ $ret -ne 0 ]; then
331 c1c775eb 2022-06-08 stsp diff -u $testroot/stdout.expected $testroot/stdout
332 c1c775eb 2022-06-08 stsp test_done "$testroot" "$ret"
335 c1c775eb 2022-06-08 stsp test_done "$testroot" "0"
338 f6cae3ed 2020-09-13 naddy test_log_patch_added_file() {
339 2e8c69d1 2020-05-04 stsp local testroot=`test_init log_patch_added_file`
340 2e8c69d1 2020-05-04 stsp local commit_id0=`git_show_head $testroot/repo`
342 2e8c69d1 2020-05-04 stsp got checkout $testroot/repo $testroot/wt > /dev/null
344 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
345 2e8c69d1 2020-05-04 stsp test_done "$testroot" "$ret"
349 2e8c69d1 2020-05-04 stsp echo "new file" > $testroot/wt/new
350 2e8c69d1 2020-05-04 stsp (cd $testroot/wt && got add new >/dev/null)
351 2e8c69d1 2020-05-04 stsp (cd $testroot/wt && got commit -m 'test log_limit' > /dev/null)
352 2e8c69d1 2020-05-04 stsp local commit_id1=`git_show_head $testroot/repo`
354 2e8c69d1 2020-05-04 stsp echo "commit $commit_id1 (master)" > $testroot/stdout.expected
355 8469d821 2022-06-25 stsp echo "commit - $commit_id0" >> $testroot/stdout.expected
356 8469d821 2022-06-25 stsp echo "commit + $commit_id1" >> $testroot/stdout.expected
357 2e8c69d1 2020-05-04 stsp # This used to fail with 'got: no such entry found in tree'
358 2e8c69d1 2020-05-04 stsp (cd $testroot/wt && got log -l1 -p new > $testroot/stdout.patch)
360 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
361 2e8c69d1 2020-05-04 stsp echo "got log command failed unexpectedly" >&2
362 2e8c69d1 2020-05-04 stsp test_done "$testroot" "$ret"
365 2e8c69d1 2020-05-04 stsp grep ^commit $testroot/stdout.patch > $testroot/stdout
366 2e8c69d1 2020-05-04 stsp cmp -s $testroot/stdout.expected $testroot/stdout
368 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
369 2e8c69d1 2020-05-04 stsp diff -u $testroot/stdout.expected $testroot/stdout
371 2e8c69d1 2020-05-04 stsp test_done "$testroot" "$ret"
374 f6cae3ed 2020-09-13 naddy test_log_nonexistent_path() {
375 5175b31a 2020-01-04 stsp local testroot=`test_init log_nonexistent_path`
376 5175b31a 2020-01-04 stsp local head_rev=`git_show_head $testroot/repo`
378 5175b31a 2020-01-04 stsp echo "commit $head_rev (master)" > $testroot/stdout.expected
380 5175b31a 2020-01-04 stsp (cd $testroot/repo && got log this/does/not/exist \
381 5175b31a 2020-01-04 stsp > $testroot/stdout 2> $testroot/stderr)
383 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
384 5175b31a 2020-01-04 stsp echo "log command succeeded unexpectedly" >&2
385 5175b31a 2020-01-04 stsp test_done "$testroot" "1"
389 5175b31a 2020-01-04 stsp echo -n > $testroot/stdout.expected
390 5175b31a 2020-01-04 stsp cmp -s $testroot/stdout.expected $testroot/stdout
392 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
393 5175b31a 2020-01-04 stsp diff -u $testroot/stdout.expected $testroot/stdout
394 5175b31a 2020-01-04 stsp test_done "$testroot" "$ret"
398 5175b31a 2020-01-04 stsp echo "got: this/does/not/exist: no such entry found in tree" \
399 5175b31a 2020-01-04 stsp > $testroot/stderr.expected
400 5175b31a 2020-01-04 stsp cmp -s $testroot/stderr.expected $testroot/stderr
402 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
403 5175b31a 2020-01-04 stsp diff -u $testroot/stderr.expected $testroot/stderr
405 5175b31a 2020-01-04 stsp test_done "$testroot" "$ret"
408 f6cae3ed 2020-09-13 naddy test_log_end_at_commit() {
409 d1fe46f9 2020-04-18 stsp local testroot=`test_init log_end_at_commit`
410 d1fe46f9 2020-04-18 stsp local commit_id0=`git_show_head $testroot/repo`
412 d1fe46f9 2020-04-18 stsp got checkout $testroot/repo $testroot/wt > /dev/null
414 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
415 d1fe46f9 2020-04-18 stsp test_done "$testroot" "$ret"
419 d1fe46f9 2020-04-18 stsp echo "modified alpha" > $testroot/wt/alpha
420 d1fe46f9 2020-04-18 stsp (cd $testroot/wt && got commit -m 'test log_limit' > /dev/null)
421 d1fe46f9 2020-04-18 stsp local commit_id1=`git_show_head $testroot/repo`
423 d1fe46f9 2020-04-18 stsp (cd $testroot/wt && got rm beta >/dev/null)
424 d1fe46f9 2020-04-18 stsp (cd $testroot/wt && got commit -m 'test log_limit' > /dev/null)
425 d1fe46f9 2020-04-18 stsp local commit_id2=`git_show_head $testroot/repo`
427 d1fe46f9 2020-04-18 stsp echo "new file" > $testroot/wt/new
428 d1fe46f9 2020-04-18 stsp (cd $testroot/wt && got add new >/dev/null)
429 d1fe46f9 2020-04-18 stsp (cd $testroot/wt && got commit -m 'test log_limit' > /dev/null)
430 d1fe46f9 2020-04-18 stsp local commit_id3=`git_show_head $testroot/repo`
432 d1fe46f9 2020-04-18 stsp # Print commit 3 only
433 d1fe46f9 2020-04-18 stsp echo "commit $commit_id3 (master)" > $testroot/stdout.expected
434 d1fe46f9 2020-04-18 stsp (cd $testroot/wt && got log -x $commit_id3 | grep ^commit \
435 d1fe46f9 2020-04-18 stsp > $testroot/stdout)
436 d1fe46f9 2020-04-18 stsp cmp -s $testroot/stdout.expected $testroot/stdout
438 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
439 d1fe46f9 2020-04-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
440 d1fe46f9 2020-04-18 stsp test_done "$testroot" "$ret"
444 d1fe46f9 2020-04-18 stsp # Print commit 3 up to commit 1 inclusive
445 d1fe46f9 2020-04-18 stsp echo "commit $commit_id3 (master)" > $testroot/stdout.expected
446 d1fe46f9 2020-04-18 stsp echo "commit $commit_id2" >> $testroot/stdout.expected
447 d1fe46f9 2020-04-18 stsp echo "commit $commit_id1" >> $testroot/stdout.expected
448 d1fe46f9 2020-04-18 stsp (cd $testroot/wt && got log -c $commit_id3 -x $commit_id1 | \
449 d1fe46f9 2020-04-18 stsp grep ^commit > $testroot/stdout)
450 d1fe46f9 2020-04-18 stsp cmp -s $testroot/stdout.expected $testroot/stdout
452 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
453 d1fe46f9 2020-04-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
454 d1fe46f9 2020-04-18 stsp test_done "$testroot" "$ret"
458 d1fe46f9 2020-04-18 stsp # Create commits on an unrelated branch
459 d1fe46f9 2020-04-18 stsp (cd $testroot/wt && got br foo > /dev/null)
460 d1fe46f9 2020-04-18 stsp echo bar >> $testroot/wt/alpha
461 d1fe46f9 2020-04-18 stsp (cd $testroot/wt && got commit -m "change on branch foo" >/dev/null)
462 d1fe46f9 2020-04-18 stsp local commit_id4=`git_show_branch_head $testroot/repo foo`
464 d1fe46f9 2020-04-18 stsp # Print commit 4 only (in work tree)
465 d1fe46f9 2020-04-18 stsp echo "commit $commit_id4 (foo)" > $testroot/stdout.expected
466 d1fe46f9 2020-04-18 stsp (cd $testroot/wt && got log -x foo | grep ^commit \
467 d1fe46f9 2020-04-18 stsp > $testroot/stdout)
468 d1fe46f9 2020-04-18 stsp cmp -s $testroot/stdout.expected $testroot/stdout
470 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
471 d1fe46f9 2020-04-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
472 d1fe46f9 2020-04-18 stsp test_done "$testroot" "$ret"
476 d1fe46f9 2020-04-18 stsp # Print commit 4 only (in repository)
477 d1fe46f9 2020-04-18 stsp echo "commit $commit_id4 (foo)" > $testroot/stdout.expected
478 d1fe46f9 2020-04-18 stsp (cd $testroot/repo && got log -c foo -x foo | grep ^commit \
479 d1fe46f9 2020-04-18 stsp > $testroot/stdout)
480 d1fe46f9 2020-04-18 stsp cmp -s $testroot/stdout.expected $testroot/stdout
482 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
483 d1fe46f9 2020-04-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
484 d1fe46f9 2020-04-18 stsp test_done "$testroot" "$ret"
488 d1fe46f9 2020-04-18 stsp # Repository's HEAD is on master branch so -x foo without an explicit
489 d1fe46f9 2020-04-18 stsp # '-c foo' start commit has no effect there
490 d1fe46f9 2020-04-18 stsp echo "commit $commit_id3 (master)" > $testroot/stdout.expected
491 d1fe46f9 2020-04-18 stsp echo "commit $commit_id2" >> $testroot/stdout.expected
492 d1fe46f9 2020-04-18 stsp echo "commit $commit_id1" >> $testroot/stdout.expected
493 d1fe46f9 2020-04-18 stsp echo "commit $commit_id0" >> $testroot/stdout.expected
494 d1fe46f9 2020-04-18 stsp (cd $testroot/repo && got log -x foo | grep ^commit \
495 d1fe46f9 2020-04-18 stsp > $testroot/stdout)
496 d1fe46f9 2020-04-18 stsp cmp -s $testroot/stdout.expected $testroot/stdout
498 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
499 d1fe46f9 2020-04-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
500 d1fe46f9 2020-04-18 stsp test_done "$testroot" "$ret"
504 d1fe46f9 2020-04-18 stsp # got will refuse -x with a non-existent commit
505 d1fe46f9 2020-04-18 stsp (cd $testroot/wt && got log -x nonexistent \
506 5e91dae4 2022-08-30 stsp > $testroot/stdout 2> $testroot/stderr)
508 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
509 d1fe46f9 2020-04-18 stsp echo "log command succeeded unexpectedly" >&2
510 d1fe46f9 2020-04-18 stsp test_done "$testroot" "1"
513 d1fe46f9 2020-04-18 stsp echo -n > $testroot/stdout.expected
514 7f9bfb31 2020-11-01 stsp echo "got: reference nonexistent not found" \
515 d1fe46f9 2020-04-18 stsp > $testroot/stderr.expected
516 d1fe46f9 2020-04-18 stsp cmp -s $testroot/stderr.expected $testroot/stderr
518 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
519 d1fe46f9 2020-04-18 stsp diff -u $testroot/stderr.expected $testroot/stderr
520 d1fe46f9 2020-04-18 stsp test_done "$testroot" "$ret"
523 d1fe46f9 2020-04-18 stsp cmp -s $testroot/stdout.expected $testroot/stdout
525 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
526 d1fe46f9 2020-04-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
527 d1fe46f9 2020-04-18 stsp test_done "$testroot" "$ret"
531 d1fe46f9 2020-04-18 stsp # try the same with the hash of an empty string which is very
532 d1fe46f9 2020-04-18 stsp # unlikely to match any object
533 5e91dae4 2022-08-30 stsp local empty_sha1=da39a3ee5e6b4b0d3255bfef95601890afd80709
534 b90c3048 2020-04-19 stsp (cd $testroot/wt && got log -x $empty_sha1 \
535 5e91dae4 2022-08-30 stsp > $testroot/stdout 2> $testroot/stderr)
537 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
538 d1fe46f9 2020-04-18 stsp echo "log command succeeded unexpectedly" >&2
539 d1fe46f9 2020-04-18 stsp test_done "$testroot" "1"
542 d1fe46f9 2020-04-18 stsp echo -n > $testroot/stdout.expected
543 138e4f47 2021-10-09 stsp echo "got: commit $empty_sha1: object not found" \
544 138e4f47 2021-10-09 stsp > $testroot/stderr.expected
545 d1fe46f9 2020-04-18 stsp cmp -s $testroot/stderr.expected $testroot/stderr
547 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
548 d1fe46f9 2020-04-18 stsp diff -u $testroot/stderr.expected $testroot/stderr
549 d1fe46f9 2020-04-18 stsp test_done "$testroot" "$ret"
552 d1fe46f9 2020-04-18 stsp cmp -s $testroot/stdout.expected $testroot/stdout
554 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
555 d1fe46f9 2020-04-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
556 d1fe46f9 2020-04-18 stsp test_done "$testroot" "$ret"
560 d1fe46f9 2020-04-18 stsp test_done "$testroot" "0"
563 f6cae3ed 2020-09-13 naddy test_log_reverse_display() {
564 dbec59df 2020-04-18 stsp local testroot=`test_init log_reverse_display`
565 dbec59df 2020-04-18 stsp local commit_id0=`git_show_head $testroot/repo`
567 dbec59df 2020-04-18 stsp got checkout $testroot/repo $testroot/wt > /dev/null
569 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
570 dbec59df 2020-04-18 stsp test_done "$testroot" "$ret"
574 dbec59df 2020-04-18 stsp echo "modified alpha" > $testroot/wt/alpha
575 dbec59df 2020-04-18 stsp (cd $testroot/wt && got commit -m 'commit1' > /dev/null)
576 dbec59df 2020-04-18 stsp local commit_id1=`git_show_head $testroot/repo`
578 dbec59df 2020-04-18 stsp (cd $testroot/wt && got rm beta >/dev/null)
579 dbec59df 2020-04-18 stsp (cd $testroot/wt && got commit -m 'commit2' > /dev/null)
580 dbec59df 2020-04-18 stsp local commit_id2=`git_show_head $testroot/repo`
582 dbec59df 2020-04-18 stsp echo "new file" > $testroot/wt/new
583 dbec59df 2020-04-18 stsp (cd $testroot/wt && got add new >/dev/null)
584 dbec59df 2020-04-18 stsp (cd $testroot/wt && got commit -m 'commit3' > /dev/null)
585 dbec59df 2020-04-18 stsp local commit_id3=`git_show_head $testroot/repo`
587 dbec59df 2020-04-18 stsp # -R alone should display all commits in reverse
588 dbec59df 2020-04-18 stsp echo "commit $commit_id0" > $testroot/stdout.expected
589 dbec59df 2020-04-18 stsp echo "commit $commit_id1" >> $testroot/stdout.expected
590 dbec59df 2020-04-18 stsp echo "commit $commit_id2" >> $testroot/stdout.expected
591 dbec59df 2020-04-18 stsp echo "commit $commit_id3 (master)" >> $testroot/stdout.expected
592 dbec59df 2020-04-18 stsp (cd $testroot/wt && got log -R | grep ^commit > $testroot/stdout)
593 dbec59df 2020-04-18 stsp cmp -s $testroot/stdout.expected $testroot/stdout
595 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
596 dbec59df 2020-04-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
597 dbec59df 2020-04-18 stsp test_done "$testroot" "$ret"
601 dbec59df 2020-04-18 stsp # -R takes effect after the -l commit traversal limit
602 dbec59df 2020-04-18 stsp echo "commit $commit_id2" > $testroot/stdout.expected
603 dbec59df 2020-04-18 stsp echo "commit $commit_id3 (master)" >> $testroot/stdout.expected
604 dbec59df 2020-04-18 stsp (cd $testroot/wt && got log -R -l2 | grep ^commit > $testroot/stdout)
605 dbec59df 2020-04-18 stsp cmp -s $testroot/stdout.expected $testroot/stdout
607 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
608 dbec59df 2020-04-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
609 dbec59df 2020-04-18 stsp test_done "$testroot" "$ret"
613 dbec59df 2020-04-18 stsp # -R works with commit ranges specified via -c and -x
614 dbec59df 2020-04-18 stsp echo "commit $commit_id1" > $testroot/stdout.expected
615 dbec59df 2020-04-18 stsp echo "commit $commit_id2" >> $testroot/stdout.expected
616 dbec59df 2020-04-18 stsp echo "commit $commit_id3 (master)" >> $testroot/stdout.expected
617 dbec59df 2020-04-18 stsp (cd $testroot/wt && got log -R -c $commit_id3 -x $commit_id1 | \
618 dbec59df 2020-04-18 stsp grep ^commit > $testroot/stdout)
619 dbec59df 2020-04-18 stsp cmp -s $testroot/stdout.expected $testroot/stdout
621 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
622 dbec59df 2020-04-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
623 dbec59df 2020-04-18 stsp test_done "$testroot" "$ret"
627 dbec59df 2020-04-18 stsp # commit matching with -s applies before -R
628 dbec59df 2020-04-18 stsp echo "commit $commit_id1" > $testroot/stdout.expected
629 dbec59df 2020-04-18 stsp echo "commit $commit_id2" >> $testroot/stdout.expected
630 c1c775eb 2022-06-08 stsp (cd $testroot/wt && got log -R -S 'commit[12]' | \
631 dbec59df 2020-04-18 stsp grep ^commit > $testroot/stdout)
632 dbec59df 2020-04-18 stsp cmp -s $testroot/stdout.expected $testroot/stdout
634 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
635 dbec59df 2020-04-18 stsp diff -u $testroot/stdout.expected $testroot/stdout
636 502b9684 2020-07-31 stsp test_done "$testroot" "$ret"
640 502b9684 2020-07-31 stsp # -R works in combination with -P
641 502b9684 2020-07-31 stsp echo "" > $testroot/stdout.expected
642 502b9684 2020-07-31 stsp (cd $testroot/wt && got log -R -P | grep -E '^(commit| [MDmA])' \
643 502b9684 2020-07-31 stsp > $testroot/stdout)
644 502b9684 2020-07-31 stsp echo "commit $commit_id0" > $testroot/stdout.expected
645 502b9684 2020-07-31 stsp echo " A alpha" >> $testroot/stdout.expected
646 502b9684 2020-07-31 stsp echo " A beta" >> $testroot/stdout.expected
647 502b9684 2020-07-31 stsp echo " A epsilon/zeta" >> $testroot/stdout.expected
648 502b9684 2020-07-31 stsp echo " A gamma/delta" >> $testroot/stdout.expected
649 502b9684 2020-07-31 stsp echo "commit $commit_id1" >> $testroot/stdout.expected
650 502b9684 2020-07-31 stsp echo " M alpha" >> $testroot/stdout.expected
651 502b9684 2020-07-31 stsp echo "commit $commit_id2" >> $testroot/stdout.expected
652 502b9684 2020-07-31 stsp echo " D beta" >> $testroot/stdout.expected
653 502b9684 2020-07-31 stsp echo "commit $commit_id3 (master)" >> $testroot/stdout.expected
654 502b9684 2020-07-31 stsp echo " A new" >> $testroot/stdout.expected
655 502b9684 2020-07-31 stsp cmp -s $testroot/stdout.expected $testroot/stdout
657 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
658 502b9684 2020-07-31 stsp diff -u $testroot/stdout.expected $testroot/stdout
660 dbec59df 2020-04-18 stsp test_done "$testroot" "$ret"
663 f6cae3ed 2020-09-13 naddy test_log_in_worktree_different_repo() {
664 50f2fada 2020-04-24 stsp local testroot=`test_init log_in_worktree_different_repo 1`
666 50f2fada 2020-04-24 stsp make_test_tree $testroot/repo
667 50f2fada 2020-04-24 stsp mkdir -p $testroot/repo/epsilon/d
668 50f2fada 2020-04-24 stsp echo foo > $testroot/repo/epsilon/d/foo
669 50f2fada 2020-04-24 stsp (cd $testroot/repo && git add .)
670 50f2fada 2020-04-24 stsp git_commit $testroot/repo -m "adding the test tree"
671 50f2fada 2020-04-24 stsp local head_commit=`git_show_head $testroot/repo`
673 02a5c5d0 2022-07-04 stsp gotadmin init $testroot/other-repo
674 50f2fada 2020-04-24 stsp mkdir -p $testroot/tree
675 50f2fada 2020-04-24 stsp make_test_tree $testroot/tree
676 50f2fada 2020-04-24 stsp got import -mm -b foo -r $testroot/other-repo $testroot/tree >/dev/null
677 50f2fada 2020-04-24 stsp got checkout -b foo $testroot/other-repo $testroot/wt > /dev/null
679 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
680 50f2fada 2020-04-24 stsp test_done "$testroot" "$ret"
684 50f2fada 2020-04-24 stsp echo "commit $head_commit (master)" > $testroot/stdout.expected
686 50f2fada 2020-04-24 stsp # 'got log' used to fail with "reference refs/heads/foo not found"
687 50f2fada 2020-04-24 stsp # even though that reference belongs to an unrelated repository
688 50f2fada 2020-04-24 stsp # found via a worktree via the current working directory
689 50f2fada 2020-04-24 stsp for p in "" alpha epsilon; do
690 50f2fada 2020-04-24 stsp (cd $testroot/wt && got log -r $testroot/repo $p | \
691 50f2fada 2020-04-24 stsp grep ^commit > $testroot/stdout)
692 50f2fada 2020-04-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
694 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
695 50f2fada 2020-04-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
696 50f2fada 2020-04-24 stsp test_done "$testroot" "$ret"
701 50f2fada 2020-04-24 stsp for p in "" epsilon/zeta; do
702 50f2fada 2020-04-24 stsp (cd $testroot/wt/epsilon && got log -r $testroot/repo $p | \
703 50f2fada 2020-04-24 stsp grep ^commit > $testroot/stdout)
704 50f2fada 2020-04-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
706 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
707 50f2fada 2020-04-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
708 50f2fada 2020-04-24 stsp test_done "$testroot" "$ret"
713 50f2fada 2020-04-24 stsp for p in "" foo; do
714 50f2fada 2020-04-24 stsp (cd $testroot/wt/epsilon && got log -r $testroot/repo epsilon/d/$p | \
715 50f2fada 2020-04-24 stsp grep ^commit > $testroot/stdout)
716 50f2fada 2020-04-24 stsp cmp -s $testroot/stdout.expected $testroot/stdout
718 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
719 50f2fada 2020-04-24 stsp diff -u $testroot/stdout.expected $testroot/stdout
720 50f2fada 2020-04-24 stsp test_done "$testroot" "$ret"
725 50f2fada 2020-04-24 stsp test_done "$testroot" "0"
728 f6cae3ed 2020-09-13 naddy test_log_changed_paths() {
729 0208f208 2020-05-05 stsp local testroot=`test_init log_changed_paths`
730 0208f208 2020-05-05 stsp local commit_id0=`git_show_head $testroot/repo`
732 0208f208 2020-05-05 stsp got checkout $testroot/repo $testroot/wt > /dev/null
734 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
735 0208f208 2020-05-05 stsp test_done "$testroot" "$ret"
739 0208f208 2020-05-05 stsp echo "modified alpha" > $testroot/wt/alpha
740 0208f208 2020-05-05 stsp (cd $testroot/wt && got commit -m 'test log_changed_paths' > /dev/null)
741 0208f208 2020-05-05 stsp local commit_id1=`git_show_head $testroot/repo`
743 0208f208 2020-05-05 stsp (cd $testroot/wt && got rm beta >/dev/null)
744 0208f208 2020-05-05 stsp (cd $testroot/wt && chmod +x epsilon/zeta >/dev/null)
745 0208f208 2020-05-05 stsp (cd $testroot/wt && got commit -m 'test log_changed_paths' > /dev/null)
746 0208f208 2020-05-05 stsp local commit_id2=`git_show_head $testroot/repo`
748 0208f208 2020-05-05 stsp echo "new file" > $testroot/wt/new
749 0208f208 2020-05-05 stsp (cd $testroot/wt && got add new >/dev/null)
750 0208f208 2020-05-05 stsp (cd $testroot/wt && got commit -m 'test log_changed_paths' > /dev/null)
751 0208f208 2020-05-05 stsp local commit_id3=`git_show_head $testroot/repo`
753 0208f208 2020-05-05 stsp (cd $testroot/wt && got log -P | grep '^ [MDmA]' > $testroot/stdout)
755 0208f208 2020-05-05 stsp echo " A new" > $testroot/stdout.expected
756 0208f208 2020-05-05 stsp echo " D beta" >> $testroot/stdout.expected
757 0208f208 2020-05-05 stsp echo " m epsilon/zeta" >> $testroot/stdout.expected
758 0208f208 2020-05-05 stsp echo " M alpha" >> $testroot/stdout.expected
759 0208f208 2020-05-05 stsp echo " A alpha" >> $testroot/stdout.expected
760 0208f208 2020-05-05 stsp echo " A beta" >> $testroot/stdout.expected
761 0208f208 2020-05-05 stsp echo " A epsilon/zeta" >> $testroot/stdout.expected
762 0208f208 2020-05-05 stsp echo " A gamma/delta" >> $testroot/stdout.expected
764 e7303626 2020-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
766 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
767 e7303626 2020-05-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
769 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
772 f6cae3ed 2020-09-13 naddy test_log_submodule() {
773 e7303626 2020-05-14 stsp local testroot=`test_init log_submodule`
775 e7303626 2020-05-14 stsp make_single_file_repo $testroot/repo2 foo
777 f1aec6ed 2022-10-24 stsp (cd $testroot/repo && git -c protocol.file.allow=always \
778 f1aec6ed 2022-10-24 stsp submodule -q add ../repo2)
779 e7303626 2020-05-14 stsp (cd $testroot/repo && git commit -q -m 'adding submodule')
780 e7303626 2020-05-14 stsp local head_commit=`git_show_head $testroot/repo`
782 e7303626 2020-05-14 stsp echo "commit $head_commit (master)" > $testroot/stdout.expected
784 e7303626 2020-05-14 stsp got log -r $testroot/repo -l1 repo2 | grep ^commit > $testroot/stdout
785 e7303626 2020-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
787 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
788 e7303626 2020-05-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
789 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
793 e7303626 2020-05-14 stsp echo " A .gitmodules" > $testroot/stdout.expected
795 e7303626 2020-05-14 stsp got log -r $testroot/repo -l1 -P repo2 | grep '^ [MDmA]' \
796 e7303626 2020-05-14 stsp > $testroot/stdout
797 e7303626 2020-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
799 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
800 e7303626 2020-05-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
801 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
805 e7303626 2020-05-14 stsp got log -p -r $testroot/repo -l1 repo2 \
806 e7303626 2020-05-14 stsp > $testroot/stdout 2> $testroot/stderr
808 49c543a6 2022-03-31 naddy if [ $ret -eq 0 ]; then
809 e7303626 2020-05-14 stsp echo "log command succeeded unexpectedly" >&2
810 e7303626 2020-05-14 stsp test_done "$testroot" "1"
813 e7303626 2020-05-14 stsp local submodule_id=$(got tree -r $testroot/repo -i | \
814 e7303626 2020-05-14 stsp grep 'repo2\$$' | cut -d ' ' -f1)
815 e7303626 2020-05-14 stsp echo "got: object $submodule_id not found" > $testroot/stderr.expected
817 e7303626 2020-05-14 stsp cmp -s $testroot/stderr.expected $testroot/stderr
819 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
820 e7303626 2020-05-14 stsp diff -u $testroot/stderr.expected $testroot/stderr
821 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
825 e7303626 2020-05-14 stsp echo "modified foo" > $testroot/repo2/foo
826 e7303626 2020-05-14 stsp (cd $testroot/repo2 && git commit -q -a -m 'modified a submodule')
828 e7303626 2020-05-14 stsp # Update the repo/repo2 submodule link
829 e7303626 2020-05-14 stsp (cd $testroot/repo && git -C repo2 pull -q)
830 e7303626 2020-05-14 stsp (cd $testroot/repo && git add repo2)
831 e7303626 2020-05-14 stsp git_commit $testroot/repo -m "changed submodule link"
833 e7303626 2020-05-14 stsp # log -P does not show the changed submodule path
834 e7303626 2020-05-14 stsp got log -P -r $testroot/repo -l1 repo2 > $testroot/stdout.full
836 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
837 e7303626 2020-05-14 stsp echo "log command failed unexpectedly" >&2
838 e7303626 2020-05-14 stsp test_done "$testroot" "1"
841 e7303626 2020-05-14 stsp grep '^ [MDmA]' $testroot/stdout.full > $testroot/stdout
843 e7303626 2020-05-14 stsp echo -n > $testroot/stdout.expected
844 8f4e3da9 2023-01-07 mark cmp -s $testroot/stdout.expected $testroot/stdout
846 8f4e3da9 2023-01-07 mark if [ $ret -ne 0 ]; then
847 8f4e3da9 2023-01-07 mark diff -u $testroot/stdout.expected $testroot/stdout
849 8f4e3da9 2023-01-07 mark test_done "$testroot" "$ret"
852 8f4e3da9 2023-01-07 mark test_log_diffstat() {
853 8f4e3da9 2023-01-07 mark local testroot=`test_init log_diffstat`
855 8f4e3da9 2023-01-07 mark got checkout $testroot/repo $testroot/wt > /dev/null
857 8f4e3da9 2023-01-07 mark if [ $ret -ne 0 ]; then
858 8f4e3da9 2023-01-07 mark test_done "$testroot" "$ret"
862 5763426a 2023-01-07 op printf "modified\nalpha.\n" > $testroot/wt/alpha
863 8f4e3da9 2023-01-07 mark (cd $testroot/wt && got commit -m 'log_diffstat mod file' > /dev/null)
865 8f4e3da9 2023-01-07 mark (cd $testroot/wt && got rm beta >/dev/null)
866 8f4e3da9 2023-01-07 mark (cd $testroot/wt && chmod +x epsilon/zeta >/dev/null)
867 8f4e3da9 2023-01-07 mark (cd $testroot/wt && got commit -m 'log_diffstat rm file' > /dev/null)
869 8f4e3da9 2023-01-07 mark echo "new file" > $testroot/wt/new
870 8f4e3da9 2023-01-07 mark (cd $testroot/wt && got add new >/dev/null)
871 8f4e3da9 2023-01-07 mark (cd $testroot/wt && got commit -m 'log_diffstat add file' > /dev/null)
873 8f4e3da9 2023-01-07 mark (cd $testroot/wt && got log -d | grep -A2 '^ [MDmA]' | sed '/^--/d' > \
874 8f4e3da9 2023-01-07 mark $testroot/stdout)
876 5763426a 2023-01-07 op cat <<EOF >$testroot/stdout.expected
877 5763426a 2023-01-07 op A new | 1+ 0-
879 4a1a7373 2023-01-16 mark 1 file changed, 1 insertion(+), 0 deletions(-)
880 5763426a 2023-01-07 op D beta | 0+ 1-
881 5763426a 2023-01-07 op m epsilon/zeta | 0+ 0-
883 4a1a7373 2023-01-16 mark 2 files changed, 0 insertions(+), 1 deletion(-)
884 5763426a 2023-01-07 op M alpha | 2+ 1-
886 4a1a7373 2023-01-16 mark 1 file changed, 2 insertions(+), 1 deletion(-)
887 5763426a 2023-01-07 op A alpha | 1+ 0-
888 5763426a 2023-01-07 op A beta | 1+ 0-
889 5763426a 2023-01-07 op A epsilon/zeta | 1+ 0-
890 5763426a 2023-01-07 op A gamma/delta | 1+ 0-
892 5763426a 2023-01-07 op 4 files changed, 4 insertions(+), 0 deletions(-)
895 0208f208 2020-05-05 stsp cmp -s $testroot/stdout.expected $testroot/stdout
897 49c543a6 2022-03-31 naddy if [ $ret -ne 0 ]; then
898 0208f208 2020-05-05 stsp diff -u $testroot/stdout.expected $testroot/stdout
900 0208f208 2020-05-05 stsp test_done "$testroot" "$ret"
903 fd7552d2 2023-07-17 mark test_log_commit_keywords() {
904 fd7552d2 2023-07-17 mark local testroot=$(test_init log_commit_keywords)
905 fd7552d2 2023-07-17 mark local commit_time=`git_show_author_time $testroot/repo`
906 fd7552d2 2023-07-17 mark local d=`date -u -r $commit_time +"%G-%m-%d"`
908 fd7552d2 2023-07-17 mark set -A ids "$(git_show_head $testroot/repo)"
910 fd7552d2 2023-07-17 mark got checkout $testroot/repo $testroot/wt > /dev/null
912 fd7552d2 2023-07-17 mark if [ $ret -ne 0 ]; then
913 fd7552d2 2023-07-17 mark echo "checkout failed unexpectedly" >&2
914 fd7552d2 2023-07-17 mark test_done "$testroot" "$ret"
918 fd7552d2 2023-07-17 mark for i in $(seq 16); do
919 fd7552d2 2023-07-17 mark echo "alpha change $i" > "$testroot/wt/alpha"
921 fd7552d2 2023-07-17 mark (cd "$testroot/wt" && got ci -m "commit number $i" > /dev/null)
923 fd7552d2 2023-07-17 mark if [ $ret -ne 0 ]; then
924 fd7552d2 2023-07-17 mark echo "commit failed unexpectedly" >&2
925 fd7552d2 2023-07-17 mark test_done "$testroot" "$ret"
928 fd7552d2 2023-07-17 mark set -- "$ids" "$(git_show_head $testroot/repo)"
932 fd7552d2 2023-07-17 mark for i in $(seq 16 2); do
933 fd7552d2 2023-07-17 mark printf '%s %.7s commit number %s\n' \
934 fd7552d2 2023-07-17 mark "$d" $(pop_id $i $ids) "$(( i-1 ))" \
935 fd7552d2 2023-07-17 mark >> $testroot/stdout.expected
938 fd7552d2 2023-07-17 mark got log -r "$testroot/repo" -scmaster:- -l15 > $testroot/stdout
940 fd7552d2 2023-07-17 mark cmp -s $testroot/stdout.expected $testroot/stdout
942 fd7552d2 2023-07-17 mark if [ $ret -ne 0 ]; then
943 fd7552d2 2023-07-17 mark diff -u $testroot/stdout.expected $testroot/stdout
944 fd7552d2 2023-07-17 mark test_done "$testroot" "$ret"
948 fd7552d2 2023-07-17 mark (cd $testroot/wt && got update -c:head:-8 > /dev/null)
950 fd7552d2 2023-07-17 mark if [ $ret -ne 0 ]; then
951 fd7552d2 2023-07-17 mark echo "update failed unexpectedly" >&2
952 fd7552d2 2023-07-17 mark test_done "$testroot" "1"
956 fd7552d2 2023-07-17 mark echo -n > "$testroot/stdout.expected"
958 fd7552d2 2023-07-17 mark for i in $(seq 9 2); do
959 fd7552d2 2023-07-17 mark printf '%s %.7s commit number %s\n' \
960 fd7552d2 2023-07-17 mark "$d" $(pop_id $i $ids) "$(( i-1 ))" \
961 fd7552d2 2023-07-17 mark >> $testroot/stdout.expected
963 fd7552d2 2023-07-17 mark printf '%s %.7s adding the test tree\n' "$d" $(pop_id 1 $ids) >> \
964 fd7552d2 2023-07-17 mark $testroot/stdout.expected
966 fd7552d2 2023-07-17 mark (cd $testroot/wt && got log -sc:base > $testroot/stdout)
968 fd7552d2 2023-07-17 mark cmp -s $testroot/stdout.expected $testroot/stdout
970 fd7552d2 2023-07-17 mark if [ $ret -ne 0 ]; then
971 fd7552d2 2023-07-17 mark diff -u $testroot/stdout.expected $testroot/stdout
972 fd7552d2 2023-07-17 mark test_done "$testroot" "$ret"
976 fd7552d2 2023-07-17 mark # if + modifier is too great, use HEAD commit
977 fd7552d2 2023-07-17 mark printf '%s %-7s commit number %s\n' "$d" master 16 > \
978 fd7552d2 2023-07-17 mark $testroot/stdout.expected
979 fd7552d2 2023-07-17 mark printf '%s %.7s commit number %s\n' "$d" $(pop_id 16 $ids) 15 >> \
980 fd7552d2 2023-07-17 mark $testroot/stdout.expected
982 fd7552d2 2023-07-17 mark (cd $testroot/wt && got log -sc:base:+20 -l2 > $testroot/stdout)
984 fd7552d2 2023-07-17 mark cmp -s $testroot/stdout.expected $testroot/stdout
986 fd7552d2 2023-07-17 mark if [ $ret -ne 0 ]; then
987 fd7552d2 2023-07-17 mark diff -u $testroot/stdout.expected $testroot/stdout
988 fd7552d2 2023-07-17 mark test_done "$testroot" "$ret"
992 fd7552d2 2023-07-17 mark # if - modifier is too great, use root commit
993 fd7552d2 2023-07-17 mark printf '%s %.7s adding the test tree\n' "$d" $(pop_id 1 $ids) > \
994 fd7552d2 2023-07-17 mark $testroot/stdout.expected
996 fd7552d2 2023-07-17 mark (cd $testroot/wt && got log -sc:base:-10 > $testroot/stdout)
997 fd7552d2 2023-07-17 mark cmp -s $testroot/stdout.expected $testroot/stdout
999 fd7552d2 2023-07-17 mark if [ $ret -ne 0 ]; then
1000 fd7552d2 2023-07-17 mark diff -u $testroot/stdout.expected $testroot/stdout
1001 fd7552d2 2023-07-17 mark test_done "$testroot" "$ret"
1005 fd7552d2 2023-07-17 mark got br -r "$testroot/repo" -c $(pop_id 1 $ids) base+
1007 fd7552d2 2023-07-17 mark printf '%s %.7s commit number 1\n' "$d" $(pop_id 2 $ids) > \
1008 fd7552d2 2023-07-17 mark $testroot/stdout.expected
1010 fd7552d2 2023-07-17 mark (cd $testroot/wt && got log -scbase+:+ -l1 > $testroot/stdout)
1012 fd7552d2 2023-07-17 mark cmp -s $testroot/stdout.expected $testroot/stdout
1014 fd7552d2 2023-07-17 mark if [ $ret -ne 0 ]; then
1015 fd7552d2 2023-07-17 mark diff -u $testroot/stdout.expected $testroot/stdout
1016 fd7552d2 2023-07-17 mark test_done "$testroot" "$ret"
1020 fd7552d2 2023-07-17 mark got br -r "$testroot/repo" -c $(pop_id 3 $ids) head-1
1022 fd7552d2 2023-07-17 mark printf '%s %.7s commit number 1\n' "$d" $(pop_id 2 $ids) > \
1023 fd7552d2 2023-07-17 mark $testroot/stdout.expected
1025 fd7552d2 2023-07-17 mark (cd $testroot/wt && got log -schead-1:- -l1 > $testroot/stdout)
1027 fd7552d2 2023-07-17 mark cmp -s $testroot/stdout.expected $testroot/stdout
1029 fd7552d2 2023-07-17 mark if [ $ret -ne 0 ]; then
1030 fd7552d2 2023-07-17 mark diff -u $testroot/stdout.expected $testroot/stdout
1031 fd7552d2 2023-07-17 mark test_done "$testroot" "$ret"
1035 fd7552d2 2023-07-17 mark got br -r "$testroot/repo" -c $(pop_id 16 $ids) base-1+2
1037 fd7552d2 2023-07-17 mark printf '%s %.7s commit number 12\n' "$d" $(pop_id 13 $ids) > \
1038 fd7552d2 2023-07-17 mark $testroot/stdout.expected
1040 fd7552d2 2023-07-17 mark (cd $testroot/wt && got log -scbase-1+2:-3 -l1 > $testroot/stdout)
1042 fd7552d2 2023-07-17 mark cmp -s $testroot/stdout.expected $testroot/stdout
1044 fd7552d2 2023-07-17 mark if [ $ret -ne 0 ]; then
1045 fd7552d2 2023-07-17 mark diff -u $testroot/stdout.expected $testroot/stdout
1046 c8d1a97c 2023-07-17 mark test_done "$testroot" "$ret"
1050 c8d1a97c 2023-07-17 mark echo "got: '::base:+': invalid commit keyword" > \
1051 c8d1a97c 2023-07-17 mark $testroot/stderr.expected
1053 c8d1a97c 2023-07-17 mark (cd $testroot/wt && got log -c::base:+ 2> $testroot/stderr)
1055 c8d1a97c 2023-07-17 mark cmp -s $testroot/stdout.expected $testroot/stdout
1057 c8d1a97c 2023-07-17 mark if [ $ret -ne 0 ]; then
1058 c8d1a97c 2023-07-17 mark diff -u $testroot/stdout.expected $testroot/stdout
1059 c8d1a97c 2023-07-17 mark test_done "$testroot" "$ret"
1063 c8d1a97c 2023-07-17 mark echo "got: ':head:-:': invalid commit keyword" > \
1064 c8d1a97c 2023-07-17 mark $testroot/stderr.expected
1066 c8d1a97c 2023-07-17 mark (cd $testroot/wt && got log -c:head:-: 2> $testroot/stderr)
1068 c8d1a97c 2023-07-17 mark cmp -s $testroot/stdout.expected $testroot/stdout
1070 c8d1a97c 2023-07-17 mark if [ $ret -ne 0 ]; then
1071 c8d1a97c 2023-07-17 mark diff -u $testroot/stdout.expected $testroot/stdout
1072 c8d1a97c 2023-07-17 mark test_done "$testroot" "$ret"
1076 c8d1a97c 2023-07-17 mark echo "got: 'master::+': invalid commit keyword" > \
1077 c8d1a97c 2023-07-17 mark $testroot/stderr.expected
1079 c8d1a97c 2023-07-17 mark (cd $testroot/wt && got log -cmaster::+ 2> $testroot/stderr)
1081 c8d1a97c 2023-07-17 mark cmp -s $testroot/stdout.expected $testroot/stdout
1083 c8d1a97c 2023-07-17 mark if [ $ret -ne 0 ]; then
1084 c8d1a97c 2023-07-17 mark diff -u $testroot/stdout.expected $testroot/stdout
1085 c8d1a97c 2023-07-17 mark test_done "$testroot" "$ret"
1089 c8d1a97c 2023-07-17 mark echo "got: 'master:1+': invalid commit keyword" > \
1090 c8d1a97c 2023-07-17 mark $testroot/stderr.expected
1092 c8d1a97c 2023-07-17 mark (cd $testroot/wt && got log -cmaster:1+ 2> $testroot/stderr)
1094 c8d1a97c 2023-07-17 mark cmp -s $testroot/stdout.expected $testroot/stdout
1096 c8d1a97c 2023-07-17 mark if [ $ret -ne 0 ]; then
1097 c8d1a97c 2023-07-17 mark diff -u $testroot/stdout.expected $testroot/stdout
1098 c8d1a97c 2023-07-17 mark test_done "$testroot" "$ret"
1102 c8d1a97c 2023-07-17 mark echo "got: ':base:-1:base:-1': invalid commit keyword" > \
1103 c8d1a97c 2023-07-17 mark $testroot/stderr.expected
1105 c8d1a97c 2023-07-17 mark (cd $testroot/wt && got log -c:base:-1:base:-1 2> $testroot/stderr)
1107 c8d1a97c 2023-07-17 mark cmp -s $testroot/stdout.expected $testroot/stdout
1109 c8d1a97c 2023-07-17 mark if [ $ret -ne 0 ]; then
1110 c8d1a97c 2023-07-17 mark diff -u $testroot/stdout.expected $testroot/stdout
1111 c8d1a97c 2023-07-17 mark test_done "$testroot" "$ret"
1115 c8d1a97c 2023-07-17 mark echo "got: 'main:-main:-': invalid commit keyword" > \
1116 c8d1a97c 2023-07-17 mark $testroot/stderr.expected
1118 c8d1a97c 2023-07-17 mark (cd $testroot/wt && got log -cmain:-main:- 2> $testroot/stderr)
1120 c8d1a97c 2023-07-17 mark cmp -s $testroot/stdout.expected $testroot/stdout
1122 c8d1a97c 2023-07-17 mark if [ $ret -ne 0 ]; then
1123 c8d1a97c 2023-07-17 mark diff -u $testroot/stdout.expected $testroot/stdout
1124 c8d1a97c 2023-07-17 mark test_done "$testroot" "$ret"
1128 c8d1a97c 2023-07-17 mark echo "got: ':base:*1': invalid commit keyword" > \
1129 c8d1a97c 2023-07-17 mark $testroot/stderr.expected
1131 c8d1a97c 2023-07-17 mark (cd $testroot/wt && got log -c:base:*1 2> $testroot/stderr)
1133 c8d1a97c 2023-07-17 mark cmp -s $testroot/stdout.expected $testroot/stdout
1135 c8d1a97c 2023-07-17 mark if [ $ret -ne 0 ]; then
1136 c8d1a97c 2023-07-17 mark diff -u $testroot/stdout.expected $testroot/stdout
1137 c8d1a97c 2023-07-17 mark test_done "$testroot" "$ret"
1141 c8d1a97c 2023-07-17 mark echo "got: reference null not found" > $testroot/stderr.expected
1143 c8d1a97c 2023-07-17 mark (cd $testroot/wt && got log -cnull:+ 2> $testroot/stderr)
1145 c8d1a97c 2023-07-17 mark cmp -s $testroot/stderr.expected $testroot/stderr
1147 c8d1a97c 2023-07-17 mark if [ $ret -ne 0 ]; then
1148 c8d1a97c 2023-07-17 mark diff -u $testroot/stderr.expected $testroot/stderr
1151 fd7552d2 2023-07-17 mark test_done "$testroot" "$ret"
1154 7fb414ae 2020-08-08 stsp test_parseargs "$@"
1155 e7301579 2019-03-18 stsp run_test test_log_in_repo
1156 b70703ad 2019-03-18 stsp run_test test_log_in_bare_repo
1157 cbd1af7a 2019-03-18 stsp run_test test_log_in_worktree
1158 dfe70b4b 2019-08-27 stsp run_test test_log_in_worktree_with_path_prefix
1159 303e2782 2019-08-09 stsp run_test test_log_tag
1160 b1ebc001 2019-08-13 stsp run_test test_log_limit
1161 c1c775eb 2022-06-08 stsp run_test test_log_oneline
1162 2e8c69d1 2020-05-04 stsp run_test test_log_patch_added_file
1163 5175b31a 2020-01-04 stsp run_test test_log_nonexistent_path
1164 d1fe46f9 2020-04-18 stsp run_test test_log_end_at_commit
1165 dbec59df 2020-04-18 stsp run_test test_log_reverse_display
1166 50f2fada 2020-04-24 stsp run_test test_log_in_worktree_different_repo
1167 0208f208 2020-05-05 stsp run_test test_log_changed_paths
1168 e7303626 2020-05-14 stsp run_test test_log_submodule
1169 8f4e3da9 2023-01-07 mark run_test test_log_diffstat
1170 fd7552d2 2023-07-17 mark run_test test_log_commit_keywords
