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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 d1e03b8c 2023-10-08 thomas git -C $testroot/repo 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 a796e0cb 2023-02-17 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
190 303e2782 2019-08-09 stsp test_done "$testroot" "$ret"
194 d1e03b8c 2023-10-08 thomas git -C $testroot/repo 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 fc414659 2022-04-16 thomas 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 d1e03b8c 2023-10-08 thomas git -C $testroot/repo 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 2f7ada20 2022-06-13 thomas test_log_oneline() {
301 2f7ada20 2022-06-13 thomas local testroot=`test_init log_oneline`
302 2f7ada20 2022-06-13 thomas local commit_id0=`git_show_head $testroot/repo`
303 2f7ada20 2022-06-13 thomas got checkout $testroot/repo $testroot/wt > /dev/null
305 2f7ada20 2022-06-13 thomas if [ $ret -ne 0 ]; then
306 2f7ada20 2022-06-13 thomas test_done "$testroot" "$ret"
310 2f7ada20 2022-06-13 thomas echo "modified alpha" > $testroot/wt/alpha
311 2f7ada20 2022-06-13 thomas (cd $testroot/wt && got commit -m "test oneline
312 2f7ada20 2022-06-13 thomas no" > /dev/null)
313 2f7ada20 2022-06-13 thomas local commit_id1=`git_show_head $testroot/repo`
314 1d56c8ea 2022-06-13 thomas local author_time1=`git_show_author_time $testroot/repo`
316 2f7ada20 2022-06-13 thomas echo "modified beta" > $testroot/wt/beta
317 2f7ada20 2022-06-13 thomas (cd $testroot/wt && got commit -m " test oneline
318 2f7ada20 2022-06-13 thomas no" > /dev/null)
319 2f7ada20 2022-06-13 thomas local commit_id2=`git_show_head $testroot/repo`
320 1d56c8ea 2022-06-13 thomas local author_time2=`git_show_author_time $testroot/repo`
322 1c72bab5 2023-03-03 thomas d=`date -u -r $author_time1 +"%G-%m-%d"`
323 1d56c8ea 2022-06-13 thomas printf "$d %-7s test oneline\n" master > $testroot/stdout.expected
324 1c72bab5 2023-03-03 thomas d=`date -u -r $author_time2 +"%G-%m-%d"`
325 1d56c8ea 2022-06-13 thomas printf "$d %.7s test oneline\n" $commit_id1 >> $testroot/stdout.expected
327 2f7ada20 2022-06-13 thomas (cd $testroot/repo && got log -s | head -n 2 > $testroot/stdout)
328 2f7ada20 2022-06-13 thomas cmp -s $testroot/stdout.expected $testroot/stdout
330 2f7ada20 2022-06-13 thomas if [ $ret -ne 0 ]; then
331 2f7ada20 2022-06-13 thomas diff -u $testroot/stdout.expected $testroot/stdout
332 2f7ada20 2022-06-13 thomas test_done "$testroot" "$ret"
335 2f7ada20 2022-06-13 thomas 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 fc414659 2022-04-16 thomas 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 9b4458b4 2022-06-26 thomas echo "commit - $commit_id0" >> $testroot/stdout.expected
356 9b4458b4 2022-06-26 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 b6b86fd1 2022-08-30 thomas > $testroot/stdout 2> $testroot/stderr)
508 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 b6b86fd1 2022-08-30 thomas local empty_sha1=da39a3ee5e6b4b0d3255bfef95601890afd80709
534 b90c3048 2020-04-19 stsp (cd $testroot/wt && got log -x $empty_sha1 \
535 b6b86fd1 2022-08-30 thomas > $testroot/stdout 2> $testroot/stderr)
537 fc414659 2022-04-16 thomas 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 a3599220 2021-10-10 thomas echo "got: commit $empty_sha1: object not found" \
544 a3599220 2021-10-10 thomas > $testroot/stderr.expected
545 d1fe46f9 2020-04-18 stsp cmp -s $testroot/stderr.expected $testroot/stderr
547 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 2f7ada20 2022-06-13 thomas (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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 d1e03b8c 2023-10-08 thomas git -C $testroot/repo 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 27b10c3c 2022-07-04 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 fc414659 2022-04-16 thomas 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 75986fe9 2024-02-11 thomas test_log_merge_commit_nonexistent_path() {
773 75986fe9 2024-02-11 thomas local testroot=`test_init log_merge_commit_corner_case 1`
775 75986fe9 2024-02-11 thomas # Create the following commit graph (most recent commit shown first):
777 75986fe9 2024-02-11 thomas # o create dir/beta
779 75986fe9 2024-02-11 thomas # o merge (does not touch dir)
781 75986fe9 2024-02-11 thomas # o o changes which don't touch the directory "dir"
783 75986fe9 2024-02-11 thomas # o initial commit, which includes directory "dir" but not dir/beta
786 75986fe9 2024-02-11 thomas mkdir $testroot/repo/dir
787 75986fe9 2024-02-11 thomas touch $testroot/repo/dir/alpha
788 75986fe9 2024-02-11 thomas git -C $testroot/repo add dir/alpha
789 75986fe9 2024-02-11 thomas git_commit $testroot/repo -m "initial commit"
791 75986fe9 2024-02-11 thomas git -C $testroot/repo checkout -q -b aux
792 75986fe9 2024-02-11 thomas touch $testroot/repo/gamma
793 75986fe9 2024-02-11 thomas git -C $testroot/repo add gamma
794 75986fe9 2024-02-11 thomas git_commit $testroot/repo -m "change on aux"
796 75986fe9 2024-02-11 thomas git -C $testroot/repo checkout -q master
797 75986fe9 2024-02-11 thomas touch $testroot/repo/delta
798 75986fe9 2024-02-11 thomas git -C $testroot/repo add delta
799 75986fe9 2024-02-11 thomas git_commit $testroot/repo -m "change on master"
801 75986fe9 2024-02-11 thomas git -C $testroot/repo merge -q -m "merge" aux
803 75986fe9 2024-02-11 thomas touch $testroot/repo/dir/beta
804 75986fe9 2024-02-11 thomas git -C $testroot/repo add dir/beta
805 75986fe9 2024-02-11 thomas git_commit $testroot/repo -m "add beta"
807 75986fe9 2024-02-11 thomas head_commit=`git_show_head $testroot/repo`
809 75986fe9 2024-02-11 thomas got log -r $testroot/repo -b dir/beta | grep ^commit > $testroot/stdout
811 75986fe9 2024-02-11 thomas if [ $ret -ne 0 ]; then
812 75986fe9 2024-02-11 thomas echo "log command failed unexpectedly" >&2
813 75986fe9 2024-02-11 thomas test_done "$testroot" "1"
817 75986fe9 2024-02-11 thomas echo "commit $head_commit (master)" > $testroot/stdout.expected
818 75986fe9 2024-02-11 thomas cmp -s $testroot/stdout.expected $testroot/stdout
820 75986fe9 2024-02-11 thomas if [ $ret -ne 0 ]; then
821 75986fe9 2024-02-11 thomas diff -u $testroot/stdout.expected $testroot/stdout
823 75986fe9 2024-02-11 thomas test_done "$testroot" "$ret"
826 f6cae3ed 2020-09-13 naddy test_log_submodule() {
827 e7303626 2020-05-14 stsp local testroot=`test_init log_submodule`
829 e7303626 2020-05-14 stsp make_single_file_repo $testroot/repo2 foo
831 d1e03b8c 2023-10-08 thomas git -C $testroot/repo -c protocol.file.allow=always \
832 d1e03b8c 2023-10-08 thomas submodule -q add ../repo2
833 d1e03b8c 2023-10-08 thomas git -C $testroot/repo commit -q -m 'adding submodule'
834 e7303626 2020-05-14 stsp local head_commit=`git_show_head $testroot/repo`
836 e7303626 2020-05-14 stsp echo "commit $head_commit (master)" > $testroot/stdout.expected
838 e7303626 2020-05-14 stsp got log -r $testroot/repo -l1 repo2 | grep ^commit > $testroot/stdout
839 e7303626 2020-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
841 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
842 e7303626 2020-05-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
843 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
847 e7303626 2020-05-14 stsp echo " A .gitmodules" > $testroot/stdout.expected
849 e7303626 2020-05-14 stsp got log -r $testroot/repo -l1 -P repo2 | grep '^ [MDmA]' \
850 e7303626 2020-05-14 stsp > $testroot/stdout
851 e7303626 2020-05-14 stsp cmp -s $testroot/stdout.expected $testroot/stdout
853 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
854 e7303626 2020-05-14 stsp diff -u $testroot/stdout.expected $testroot/stdout
855 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
859 e7303626 2020-05-14 stsp got log -p -r $testroot/repo -l1 repo2 \
860 e7303626 2020-05-14 stsp > $testroot/stdout 2> $testroot/stderr
862 fc414659 2022-04-16 thomas if [ $ret -eq 0 ]; then
863 e7303626 2020-05-14 stsp echo "log command succeeded unexpectedly" >&2
864 e7303626 2020-05-14 stsp test_done "$testroot" "1"
867 e7303626 2020-05-14 stsp local submodule_id=$(got tree -r $testroot/repo -i | \
868 e7303626 2020-05-14 stsp grep 'repo2\$$' | cut -d ' ' -f1)
869 e7303626 2020-05-14 stsp echo "got: object $submodule_id not found" > $testroot/stderr.expected
871 e7303626 2020-05-14 stsp cmp -s $testroot/stderr.expected $testroot/stderr
873 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
874 e7303626 2020-05-14 stsp diff -u $testroot/stderr.expected $testroot/stderr
875 e7303626 2020-05-14 stsp test_done "$testroot" "$ret"
879 e7303626 2020-05-14 stsp echo "modified foo" > $testroot/repo2/foo
880 d1e03b8c 2023-10-08 thomas git -C $testroot/repo2 commit -q -a -m 'modified a submodule'
882 e7303626 2020-05-14 stsp # Update the repo/repo2 submodule link
883 d1e03b8c 2023-10-08 thomas git -C $testroot/repo/repo2 pull -q
884 d1e03b8c 2023-10-08 thomas git -C $testroot/repo add repo2
885 e7303626 2020-05-14 stsp git_commit $testroot/repo -m "changed submodule link"
887 e7303626 2020-05-14 stsp # log -P does not show the changed submodule path
888 e7303626 2020-05-14 stsp got log -P -r $testroot/repo -l1 repo2 > $testroot/stdout.full
890 fc414659 2022-04-16 thomas if [ $ret -ne 0 ]; then
891 e7303626 2020-05-14 stsp echo "log command failed unexpectedly" >&2
892 e7303626 2020-05-14 stsp test_done "$testroot" "1"
895 e7303626 2020-05-14 stsp grep '^ [MDmA]' $testroot/stdout.full > $testroot/stdout
897 e7303626 2020-05-14 stsp echo -n > $testroot/stdout.expected
898 96479155 2023-01-07 thomas cmp -s $testroot/stdout.expected $testroot/stdout
900 96479155 2023-01-07 thomas if [ $ret -ne 0 ]; then
901 96479155 2023-01-07 thomas diff -u $testroot/stdout.expected $testroot/stdout
903 96479155 2023-01-07 thomas test_done "$testroot" "$ret"
906 96479155 2023-01-07 thomas test_log_diffstat() {
907 96479155 2023-01-07 thomas local testroot=`test_init log_diffstat`
909 96479155 2023-01-07 thomas got checkout $testroot/repo $testroot/wt > /dev/null
911 96479155 2023-01-07 thomas if [ $ret -ne 0 ]; then
912 96479155 2023-01-07 thomas test_done "$testroot" "$ret"
916 8d5e5160 2023-01-07 thomas printf "modified\nalpha.\n" > $testroot/wt/alpha
917 96479155 2023-01-07 thomas (cd $testroot/wt && got commit -m 'log_diffstat mod file' > /dev/null)
919 96479155 2023-01-07 thomas (cd $testroot/wt && got rm beta >/dev/null)
920 96479155 2023-01-07 thomas (cd $testroot/wt && chmod +x epsilon/zeta >/dev/null)
921 96479155 2023-01-07 thomas (cd $testroot/wt && got commit -m 'log_diffstat rm file' > /dev/null)
923 96479155 2023-01-07 thomas echo "new file" > $testroot/wt/new
924 96479155 2023-01-07 thomas (cd $testroot/wt && got add new >/dev/null)
925 96479155 2023-01-07 thomas (cd $testroot/wt && got commit -m 'log_diffstat add file' > /dev/null)
927 8d5e5160 2023-01-07 thomas cat <<EOF >$testroot/stdout.expected
928 8d5e5160 2023-01-07 thomas A new | 1+ 0-
930 28466fca 2023-01-19 thomas 1 file changed, 1 insertion(+), 0 deletions(-)
931 8d5e5160 2023-01-07 thomas D beta | 0+ 1-
932 8d5e5160 2023-01-07 thomas m epsilon/zeta | 0+ 0-
934 28466fca 2023-01-19 thomas 2 files changed, 0 insertions(+), 1 deletion(-)
935 8d5e5160 2023-01-07 thomas M alpha | 2+ 1-
937 28466fca 2023-01-19 thomas 1 file changed, 2 insertions(+), 1 deletion(-)
938 8d5e5160 2023-01-07 thomas A alpha | 1+ 0-
939 8d5e5160 2023-01-07 thomas A beta | 1+ 0-
940 8d5e5160 2023-01-07 thomas A epsilon/zeta | 1+ 0-
941 8d5e5160 2023-01-07 thomas A gamma/delta | 1+ 0-
943 8d5e5160 2023-01-07 thomas 4 files changed, 4 insertions(+), 0 deletions(-)
946 947f374d 2023-08-08 thomas # try different -dPp combinations
947 947f374d 2023-08-08 thomas for flags in -d -dP -dp -dPp; do
948 947f374d 2023-08-08 thomas (cd $testroot/wt && got log $flags | grep -A2 '^ [MDmA]' | \
949 947f374d 2023-08-08 thomas sed '/^--/d' > $testroot/stdout)
951 947f374d 2023-08-08 thomas cmp -s $testroot/stdout.expected $testroot/stdout
953 947f374d 2023-08-08 thomas if [ $ret -ne 0 ]; then
954 947f374d 2023-08-08 thomas diff -u $testroot/stdout.expected $testroot/stdout
955 947f374d 2023-08-08 thomas test_done "$testroot" "$ret"
960 947f374d 2023-08-08 thomas test_done "$testroot" "0"
963 9139e004 2023-07-17 thomas test_log_commit_keywords() {
964 9139e004 2023-07-17 thomas local testroot=$(test_init log_commit_keywords)
965 9139e004 2023-07-17 thomas local commit_time=`git_show_author_time $testroot/repo`
966 9139e004 2023-07-17 thomas local d=`date -u -r $commit_time +"%G-%m-%d"`
968 8642913b 2023-07-26 thomas set -- "$(git_show_head $testroot/repo)"
970 9139e004 2023-07-17 thomas got checkout $testroot/repo $testroot/wt > /dev/null
972 9139e004 2023-07-17 thomas if [ $ret -ne 0 ]; then
973 9139e004 2023-07-17 thomas echo "checkout failed unexpectedly" >&2
974 9139e004 2023-07-17 thomas test_done "$testroot" "$ret"
978 9139e004 2023-07-17 thomas for i in $(seq 16); do
979 9139e004 2023-07-17 thomas echo "alpha change $i" > "$testroot/wt/alpha"
981 9139e004 2023-07-17 thomas (cd "$testroot/wt" && got ci -m "commit number $i" > /dev/null)
983 9139e004 2023-07-17 thomas if [ $ret -ne 0 ]; then
984 9139e004 2023-07-17 thomas echo "commit failed unexpectedly" >&2
985 9139e004 2023-07-17 thomas test_done "$testroot" "$ret"
988 8642913b 2023-07-26 thomas set -- "$@" "$(git_show_head $testroot/repo)"
991 9139e004 2023-07-17 thomas for i in $(seq 16 2); do
992 9139e004 2023-07-17 thomas printf '%s %.7s commit number %s\n' \
993 8642913b 2023-07-26 thomas "$d" $(pop_idx $i $@) "$(( i-1 ))" \
994 9139e004 2023-07-17 thomas >> $testroot/stdout.expected
997 947f374d 2023-08-08 thomas got log -r "$testroot/repo" -s -cmaster:- -l15 > $testroot/stdout
999 9139e004 2023-07-17 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1001 9139e004 2023-07-17 thomas if [ $ret -ne 0 ]; then
1002 9139e004 2023-07-17 thomas diff -u $testroot/stdout.expected $testroot/stdout
1003 9139e004 2023-07-17 thomas test_done "$testroot" "$ret"
1004 9139e004 2023-07-17 thomas return 1
1007 947f374d 2023-08-08 thomas # request same set of commits now with log -x
1008 947f374d 2023-08-08 thomas got log -r "$testroot/repo" -s -cmaster:- -xmaster:-15 > \
1009 947f374d 2023-08-08 thomas $testroot/stdout
1011 947f374d 2023-08-08 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1013 947f374d 2023-08-08 thomas if [ $ret -ne 0 ]; then
1014 947f374d 2023-08-08 thomas diff -u $testroot/stdout.expected $testroot/stdout
1015 947f374d 2023-08-08 thomas test_done "$testroot" "$ret"
1016 947f374d 2023-08-08 thomas return 1
1019 9139e004 2023-07-17 thomas (cd $testroot/wt && got update -c:head:-8 > /dev/null)
1021 9139e004 2023-07-17 thomas if [ $ret -ne 0 ]; then
1022 9139e004 2023-07-17 thomas echo "update failed unexpectedly" >&2
1023 9139e004 2023-07-17 thomas test_done "$testroot" "1"
1024 9139e004 2023-07-17 thomas return 1
1027 9139e004 2023-07-17 thomas echo -n > "$testroot/stdout.expected"
1029 9139e004 2023-07-17 thomas for i in $(seq 9 2); do
1030 9139e004 2023-07-17 thomas printf '%s %.7s commit number %s\n' \
1031 8642913b 2023-07-26 thomas "$d" $(pop_idx $i $@) "$(( i-1 ))" \
1032 9139e004 2023-07-17 thomas >> $testroot/stdout.expected
1034 8642913b 2023-07-26 thomas printf '%s %.7s adding the test tree\n' "$d" $(pop_idx 1 $@) >> \
1035 9139e004 2023-07-17 thomas $testroot/stdout.expected
1037 947f374d 2023-08-08 thomas (cd $testroot/wt && got log -s -c:base > $testroot/stdout)
1039 9139e004 2023-07-17 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1041 9139e004 2023-07-17 thomas if [ $ret -ne 0 ]; then
1042 9139e004 2023-07-17 thomas diff -u $testroot/stdout.expected $testroot/stdout
1043 9139e004 2023-07-17 thomas test_done "$testroot" "$ret"
1044 9139e004 2023-07-17 thomas return 1
1047 947f374d 2023-08-08 thomas # from head to the base commit using -x
1048 947f374d 2023-08-08 thomas printf '%s %-7s commit number 16\n' "$d" "master" > \
1049 947f374d 2023-08-08 thomas $testroot/stdout.expected
1050 947f374d 2023-08-08 thomas for i in $(seq 16 9); do
1051 947f374d 2023-08-08 thomas printf '%s %.7s commit number %s\n' \
1052 947f374d 2023-08-08 thomas "$d" $(pop_idx $i $@) $(( i-1 )) \
1053 947f374d 2023-08-08 thomas >> $testroot/stdout.expected
1056 947f374d 2023-08-08 thomas (cd $testroot/wt && got log -s -c:head -x:base > $testroot/stdout)
1058 947f374d 2023-08-08 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1060 947f374d 2023-08-08 thomas if [ $ret -ne 0 ]; then
1061 947f374d 2023-08-08 thomas diff -u $testroot/stdout.expected $testroot/stdout
1062 947f374d 2023-08-08 thomas test_done "$testroot" "$ret"
1063 947f374d 2023-08-08 thomas return 1
1066 9139e004 2023-07-17 thomas # if + modifier is too great, use HEAD commit
1067 9139e004 2023-07-17 thomas printf '%s %-7s commit number %s\n' "$d" master 16 > \
1068 9139e004 2023-07-17 thomas $testroot/stdout.expected
1069 8642913b 2023-07-26 thomas printf '%s %.7s commit number %s\n' "$d" $(pop_idx 16 $@) 15 >> \
1070 9139e004 2023-07-17 thomas $testroot/stdout.expected
1072 947f374d 2023-08-08 thomas (cd $testroot/wt && got log -s -c:base:+20 -l2 > $testroot/stdout)
1074 9139e004 2023-07-17 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1076 9139e004 2023-07-17 thomas if [ $ret -ne 0 ]; then
1077 9139e004 2023-07-17 thomas diff -u $testroot/stdout.expected $testroot/stdout
1078 9139e004 2023-07-17 thomas test_done "$testroot" "$ret"
1079 9139e004 2023-07-17 thomas return 1
1082 9139e004 2023-07-17 thomas # if - modifier is too great, use root commit
1083 8642913b 2023-07-26 thomas printf '%s %.7s adding the test tree\n' "$d" $(pop_idx 1 $@) > \
1084 9139e004 2023-07-17 thomas $testroot/stdout.expected
1086 947f374d 2023-08-08 thomas (cd $testroot/wt && got log -s -c:base:-10 > $testroot/stdout)
1087 9139e004 2023-07-17 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1089 9139e004 2023-07-17 thomas if [ $ret -ne 0 ]; then
1090 9139e004 2023-07-17 thomas diff -u $testroot/stdout.expected $testroot/stdout
1091 9139e004 2023-07-17 thomas test_done "$testroot" "$ret"
1092 9139e004 2023-07-17 thomas return 1
1095 8642913b 2023-07-26 thomas got br -r "$testroot/repo" -c $(pop_idx 1 $@) base+
1097 8642913b 2023-07-26 thomas printf '%s %.7s commit number 1\n' "$d" $(pop_idx 2 $@) > \
1098 9139e004 2023-07-17 thomas $testroot/stdout.expected
1100 947f374d 2023-08-08 thomas (cd $testroot/wt && got log -s -cbase+:+ -l1 > $testroot/stdout)
1102 9139e004 2023-07-17 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1104 9139e004 2023-07-17 thomas if [ $ret -ne 0 ]; then
1105 9139e004 2023-07-17 thomas diff -u $testroot/stdout.expected $testroot/stdout
1106 9139e004 2023-07-17 thomas test_done "$testroot" "$ret"
1107 9139e004 2023-07-17 thomas return 1
1110 8642913b 2023-07-26 thomas got br -r "$testroot/repo" -c $(pop_idx 3 $@) head-1
1112 8642913b 2023-07-26 thomas printf '%s %.7s commit number 1\n' "$d" $(pop_idx 2 $@) > \
1113 9139e004 2023-07-17 thomas $testroot/stdout.expected
1115 947f374d 2023-08-08 thomas (cd $testroot/wt && got log -s -chead-1:- -l1 > $testroot/stdout)
1117 9139e004 2023-07-17 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1119 9139e004 2023-07-17 thomas if [ $ret -ne 0 ]; then
1120 9139e004 2023-07-17 thomas diff -u $testroot/stdout.expected $testroot/stdout
1121 9139e004 2023-07-17 thomas test_done "$testroot" "$ret"
1122 9139e004 2023-07-17 thomas return 1
1125 8642913b 2023-07-26 thomas got br -r "$testroot/repo" -c $(pop_idx 16 $@) base-1+2
1127 8642913b 2023-07-26 thomas printf '%s %.7s commit number 12\n' "$d" $(pop_idx 13 $@) > \
1128 9139e004 2023-07-17 thomas $testroot/stdout.expected
1130 947f374d 2023-08-08 thomas (cd $testroot/wt && got log -s -cbase-1+2:-3 -l1 > $testroot/stdout)
1132 9139e004 2023-07-17 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1134 9139e004 2023-07-17 thomas if [ $ret -ne 0 ]; then
1135 9139e004 2023-07-17 thomas diff -u $testroot/stdout.expected $testroot/stdout
1136 fb885120 2023-07-19 thomas test_done "$testroot" "$ret"
1137 fb885120 2023-07-19 thomas return 1
1140 fb885120 2023-07-19 thomas echo "got: '::base:+': invalid commit keyword" > \
1141 fb885120 2023-07-19 thomas $testroot/stderr.expected
1143 fb885120 2023-07-19 thomas (cd $testroot/wt && got log -c::base:+ 2> $testroot/stderr)
1145 947f374d 2023-08-08 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1147 fb885120 2023-07-19 thomas if [ $ret -ne 0 ]; then
1148 947f374d 2023-08-08 thomas diff -u $testroot/stderr.expected $testroot/stderr
1149 fb885120 2023-07-19 thomas test_done "$testroot" "$ret"
1150 fb885120 2023-07-19 thomas return 1
1153 fb885120 2023-07-19 thomas echo "got: ':head:-:': invalid commit keyword" > \
1154 fb885120 2023-07-19 thomas $testroot/stderr.expected
1156 fb885120 2023-07-19 thomas (cd $testroot/wt && got log -c:head:-: 2> $testroot/stderr)
1158 947f374d 2023-08-08 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1160 fb885120 2023-07-19 thomas if [ $ret -ne 0 ]; then
1161 947f374d 2023-08-08 thomas diff -u $testroot/stderr.expected $testroot/stderr
1162 fb885120 2023-07-19 thomas test_done "$testroot" "$ret"
1163 fb885120 2023-07-19 thomas return 1
1166 fb885120 2023-07-19 thomas echo "got: 'master::+': invalid commit keyword" > \
1167 fb885120 2023-07-19 thomas $testroot/stderr.expected
1169 fb885120 2023-07-19 thomas (cd $testroot/wt && got log -cmaster::+ 2> $testroot/stderr)
1171 947f374d 2023-08-08 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1173 fb885120 2023-07-19 thomas if [ $ret -ne 0 ]; then
1174 947f374d 2023-08-08 thomas diff -u $testroot/stderr.expected $testroot/stderr
1175 fb885120 2023-07-19 thomas test_done "$testroot" "$ret"
1176 fb885120 2023-07-19 thomas return 1
1179 fb885120 2023-07-19 thomas echo "got: 'master:1+': invalid commit keyword" > \
1180 fb885120 2023-07-19 thomas $testroot/stderr.expected
1182 fb885120 2023-07-19 thomas (cd $testroot/wt && got log -cmaster:1+ 2> $testroot/stderr)
1184 947f374d 2023-08-08 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1186 fb885120 2023-07-19 thomas if [ $ret -ne 0 ]; then
1187 947f374d 2023-08-08 thomas diff -u $testroot/stderr.expected $testroot/stderr
1188 fb885120 2023-07-19 thomas test_done "$testroot" "$ret"
1189 fb885120 2023-07-19 thomas return 1
1192 fb885120 2023-07-19 thomas echo "got: ':base:-1:base:-1': invalid commit keyword" > \
1193 fb885120 2023-07-19 thomas $testroot/stderr.expected
1195 fb885120 2023-07-19 thomas (cd $testroot/wt && got log -c:base:-1:base:-1 2> $testroot/stderr)
1197 947f374d 2023-08-08 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1199 fb885120 2023-07-19 thomas if [ $ret -ne 0 ]; then
1200 947f374d 2023-08-08 thomas diff -u $testroot/stderr.expected $testroot/stderr
1201 fb885120 2023-07-19 thomas test_done "$testroot" "$ret"
1202 fb885120 2023-07-19 thomas return 1
1205 fb885120 2023-07-19 thomas echo "got: 'main:-main:-': invalid commit keyword" > \
1206 fb885120 2023-07-19 thomas $testroot/stderr.expected
1208 fb885120 2023-07-19 thomas (cd $testroot/wt && got log -cmain:-main:- 2> $testroot/stderr)
1210 947f374d 2023-08-08 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1212 fb885120 2023-07-19 thomas if [ $ret -ne 0 ]; then
1213 947f374d 2023-08-08 thomas diff -u $testroot/stderr.expected $testroot/stderr
1214 fb885120 2023-07-19 thomas test_done "$testroot" "$ret"
1215 fb885120 2023-07-19 thomas return 1
1218 fb885120 2023-07-19 thomas echo "got: ':base:*1': invalid commit keyword" > \
1219 fb885120 2023-07-19 thomas $testroot/stderr.expected
1221 fb885120 2023-07-19 thomas (cd $testroot/wt && got log -c:base:*1 2> $testroot/stderr)
1223 947f374d 2023-08-08 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1225 fb885120 2023-07-19 thomas if [ $ret -ne 0 ]; then
1226 947f374d 2023-08-08 thomas diff -u $testroot/stderr.expected $testroot/stderr
1227 fb885120 2023-07-19 thomas test_done "$testroot" "$ret"
1228 fb885120 2023-07-19 thomas return 1
1231 fb885120 2023-07-19 thomas echo "got: reference null not found" > $testroot/stderr.expected
1233 fb885120 2023-07-19 thomas (cd $testroot/wt && got log -cnull:+ 2> $testroot/stderr)
1235 fb885120 2023-07-19 thomas cmp -s $testroot/stderr.expected $testroot/stderr
1237 fb885120 2023-07-19 thomas if [ $ret -ne 0 ]; then
1238 fb885120 2023-07-19 thomas diff -u $testroot/stderr.expected $testroot/stderr
1241 9139e004 2023-07-17 thomas test_done "$testroot" "$ret"
1244 e6fdf1dd 2024-03-30 thomas test_log_toposort() {
1245 e6fdf1dd 2024-03-30 thomas local testroot=`test_init log_toposort`
1246 e6fdf1dd 2024-03-30 thomas local commit0=`git_show_head $testroot/repo`
1247 e6fdf1dd 2024-03-30 thomas local author_time0=`git_show_author_time $testroot/repo`
1249 e6fdf1dd 2024-03-30 thomas got checkout $testroot/repo $testroot/wt > /dev/null
1251 e6fdf1dd 2024-03-30 thomas if [ $ret -ne 0 ]; then
1252 e6fdf1dd 2024-03-30 thomas test_done "$testroot" "$ret"
1253 e6fdf1dd 2024-03-30 thomas return 1
1256 e6fdf1dd 2024-03-30 thomas echo aaa > $testroot/wt/alpha
1257 e6fdf1dd 2024-03-30 thomas (cd $testroot/wt && got commit -m 'change alpha' >/dev/null)
1258 e6fdf1dd 2024-03-30 thomas local commit1=`git_show_head $testroot/repo`
1259 e6fdf1dd 2024-03-30 thomas local author_time1=`git_show_author_time $testroot/repo`
1261 e6fdf1dd 2024-03-30 thomas got branch -r $testroot/repo -c $commit0 newbranch
1262 e6fdf1dd 2024-03-30 thomas (cd $testroot/wt && got update -b newbranch > /dev/null)
1263 e6fdf1dd 2024-03-30 thomas echo ddd > $testroot/wt/gamma/delta
1264 e6fdf1dd 2024-03-30 thomas (cd $testroot/wt && got commit -m 'change delta' >/dev/null)
1265 e6fdf1dd 2024-03-30 thomas local commit2=`git_show_branch_head $testroot/repo newbranch`
1266 e6fdf1dd 2024-03-30 thomas local author_time2=`git_show_author_time $testroot/repo newbranch`
1268 e6fdf1dd 2024-03-30 thomas echo zzz > $testroot/wt/epsilon/zeta
1269 e6fdf1dd 2024-03-30 thomas (cd $testroot/wt && got commit -m 'change zeta' >/dev/null)
1270 e6fdf1dd 2024-03-30 thomas local commit3=`git_show_head $testroot/repo`
1271 e6fdf1dd 2024-03-30 thomas local author_time3=`git_show_author_time $testroot/repo newbranch`
1273 e6fdf1dd 2024-03-30 thomas (cd $testroot/wt && got update -b master > /dev/null)
1274 e6fdf1dd 2024-03-30 thomas (cd $testroot/wt && got merge newbranch > /dev/null)
1275 e6fdf1dd 2024-03-30 thomas local merge_commit=`git_show_head $testroot/repo`
1276 e6fdf1dd 2024-03-30 thomas local merge_time=`git_show_author_time $testroot/repo`
1278 e6fdf1dd 2024-03-30 thomas local short_commit0=`trim_obj_id 33 $commit0`
1279 e6fdf1dd 2024-03-30 thomas local short_commit1=`trim_obj_id 33 $commit1`
1280 e6fdf1dd 2024-03-30 thomas local short_commit2=`trim_obj_id 33 $commit2`
1281 e6fdf1dd 2024-03-30 thomas local short_commit3=`trim_obj_id 33 $commit3`
1283 e6fdf1dd 2024-03-30 thomas d_0=`date -u -r $author_time0 +"%G-%m-%d"`
1284 e6fdf1dd 2024-03-30 thomas d_1=`date -u -r $author_time1 +"%G-%m-%d"`
1285 e6fdf1dd 2024-03-30 thomas d_2=`date -u -r $author_time2 +"%G-%m-%d"`
1286 e6fdf1dd 2024-03-30 thomas d_3=`date -u -r $author_time3 +"%G-%m-%d"`
1287 e6fdf1dd 2024-03-30 thomas d_m=`date -u -r $merge_time +"%G-%m-%d"`
1289 e6fdf1dd 2024-03-30 thomas got log -r $testroot/repo -s -b -t > $testroot/stdout
1290 e6fdf1dd 2024-03-30 thomas cat > $testroot/stdout.expected <<EOF
1291 e6fdf1dd 2024-03-30 thomas $d_m master merge refs/heads/newbranch into refs/heads/master
1292 e6fdf1dd 2024-03-30 thomas $d_1 $short_commit1 change alpha
1293 e6fdf1dd 2024-03-30 thomas $d_3 newbranch change zeta
1294 e6fdf1dd 2024-03-30 thomas $d_2 $short_commit2 change delta
1295 e6fdf1dd 2024-03-30 thomas $d_0 $short_commit0 adding the test tree
1297 e6fdf1dd 2024-03-30 thomas cmp -s $testroot/stdout.expected $testroot/stdout
1299 e6fdf1dd 2024-03-30 thomas if [ $ret -ne 0 ]; then
1300 e6fdf1dd 2024-03-30 thomas diff -u $testroot/stdout.expected $testroot/stdout
1302 e6fdf1dd 2024-03-30 thomas test_done "$testroot" "$ret"
1306 7fb414ae 2020-08-08 stsp test_parseargs "$@"
1307 e7301579 2019-03-18 stsp run_test test_log_in_repo
1308 b70703ad 2019-03-18 stsp run_test test_log_in_bare_repo
1309 cbd1af7a 2019-03-18 stsp run_test test_log_in_worktree
1310 dfe70b4b 2019-08-27 stsp run_test test_log_in_worktree_with_path_prefix
1311 303e2782 2019-08-09 stsp run_test test_log_tag
1312 b1ebc001 2019-08-13 stsp run_test test_log_limit
1313 2f7ada20 2022-06-13 thomas run_test test_log_oneline
1314 2e8c69d1 2020-05-04 stsp run_test test_log_patch_added_file
1315 5175b31a 2020-01-04 stsp run_test test_log_nonexistent_path
1316 d1fe46f9 2020-04-18 stsp run_test test_log_end_at_commit
1317 dbec59df 2020-04-18 stsp run_test test_log_reverse_display
1318 50f2fada 2020-04-24 stsp run_test test_log_in_worktree_different_repo
1319 0208f208 2020-05-05 stsp run_test test_log_changed_paths
1320 75986fe9 2024-02-11 thomas run_test test_log_merge_commit_nonexistent_path
1321 e7303626 2020-05-14 stsp run_test test_log_submodule
1322 96479155 2023-01-07 thomas run_test test_log_diffstat
1323 9139e004 2023-07-17 thomas run_test test_log_commit_keywords
1324 e6fdf1dd 2024-03-30 thomas run_test test_log_toposort
