Hash :
b90c3048
Author :
Date :
2020-04-19T09:10:52
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558
#!/bin/sh
#
# Copyright (c) 2019, 2020 Stefan Sperling <stsp@openbsd.org>
#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
#
# THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
# WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
# ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
# WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
# ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
# OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
. ./common.sh
function test_log_in_repo {
local testroot=`test_init log_in_repo`
local head_rev=`git_show_head $testroot/repo`
echo "commit $head_rev (master)" > $testroot/stdout.expected
for p in "" "." alpha epsilon epsilon/zeta; do
(cd $testroot/repo && got log $p | \
grep ^commit > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
done
for p in "" "." zeta; do
(cd $testroot/repo/epsilon && got log $p | \
grep ^commit > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
done
test_done "$testroot" "0"
}
function test_log_in_bare_repo {
local testroot=`test_init log_in_bare_repo`
local head_rev=`git_show_head $testroot/repo`
echo "commit $head_rev (master)" > $testroot/stdout.expected
for p in "" "." alpha epsilon epsilon/zeta; do
(cd $testroot/repo/.git && got log $p | \
grep ^commit > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
done
test_done "$testroot" "0"
}
function test_log_in_worktree {
local testroot=`test_init log_in_worktree 1`
make_test_tree $testroot/repo
mkdir -p $testroot/repo/epsilon/d
echo foo > $testroot/repo/epsilon/d/foo
(cd $testroot/repo && git add .)
git_commit $testroot/repo -m "adding the test tree"
local head_commit=`git_show_head $testroot/repo`
got checkout $testroot/repo $testroot/wt > /dev/null
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
return 1
fi
echo "commit $head_commit (master)" > $testroot/stdout.expected
for p in "" "." alpha epsilon; do
(cd $testroot/wt && got log $p | \
grep ^commit > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
done
for p in "" "." zeta; do
(cd $testroot/wt/epsilon && got log $p | \
grep ^commit > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
done
for p in "" "." foo; do
(cd $testroot/wt/epsilon && got log d/$p | \
grep ^commit > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
done
test_done "$testroot" "0"
}
function test_log_in_worktree_with_path_prefix {
local testroot=`test_init log_in_prefixed_worktree`
local head_rev=`git_show_head $testroot/repo`
echo "modified zeta" > $testroot/repo/epsilon/zeta
git_commit $testroot/repo -m "modified zeta"
local zeta_rev=`git_show_head $testroot/repo`
echo "modified delta" > $testroot/repo/gamma/delta
git_commit $testroot/repo -m "modified delta"
got checkout -p epsilon $testroot/repo $testroot/wt > /dev/null
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
return 1
fi
echo "commit $zeta_rev" > $testroot/stdout.expected
echo "commit $head_rev" >> $testroot/stdout.expected
for p in "" "." zeta; do
(cd $testroot/wt && got log $p | \
grep ^commit > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
done
test_done "$testroot" "0"
}
function test_log_tag {
local testroot=`test_init log_tag`
local commit_id=`git_show_head $testroot/repo`
local tag="1.0.0"
local tag2="2.0.0"
got checkout $testroot/repo $testroot/wt > /dev/null
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
return 1
fi
(cd $testroot/repo && git tag -a -m "test" $tag)
echo "commit $commit_id (master, tags/$tag)" > $testroot/stdout.expected
(cd $testroot/wt && got log -l1 -c $tag | grep ^commit \
> $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
# test a "lightweight" tag
(cd $testroot/repo && git tag $tag2)
echo "commit $commit_id (master, tags/$tag, tags/$tag2)" \
> $testroot/stdout.expected
(cd $testroot/wt && got log -l1 -c $tag2 | grep ^commit \
> $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
fi
test_done "$testroot" "$ret"
}
function test_log_limit {
local testroot=`test_init log_limit`
local commit_id0=`git_show_head $testroot/repo`
got checkout $testroot/repo $testroot/wt > /dev/null
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
return 1
fi
echo "modified alpha" > $testroot/wt/alpha
(cd $testroot/wt && got commit -m 'test log_limit' > /dev/null)
local commit_id1=`git_show_head $testroot/repo`
(cd $testroot/wt && got rm beta >/dev/null)
(cd $testroot/wt && got commit -m 'test log_limit' > /dev/null)
local commit_id2=`git_show_head $testroot/repo`
echo "new file" > $testroot/wt/new
(cd $testroot/wt && got add new >/dev/null)
(cd $testroot/wt && got commit -m 'test log_limit' > /dev/null)
local commit_id3=`git_show_head $testroot/repo`
# -l1 should print the first commit only
echo "commit $commit_id3 (master)" > $testroot/stdout.expected
(cd $testroot/wt && got log -l1 | grep ^commit > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
# env var can be used to set a log limit without -l option
echo "commit $commit_id3 (master)" > $testroot/stdout.expected
echo "commit $commit_id2" >> $testroot/stdout.expected
(cd $testroot/wt && env GOT_LOG_DEFAULT_LIMIT=2 got log | \
grep ^commit > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
# non-numeric env var is ignored
(cd $testroot/wt && env GOT_LOG_DEFAULT_LIMIT=foobar got log | \
grep ^commit > $testroot/stdout)
echo "commit $commit_id3 (master)" > $testroot/stdout.expected
echo "commit $commit_id2" >> $testroot/stdout.expected
echo "commit $commit_id1" >> $testroot/stdout.expected
echo "commit $commit_id0" >> $testroot/stdout.expected
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
# -l option takes precedence over env var
echo "commit $commit_id3 (master)" > $testroot/stdout.expected
echo "commit $commit_id2" >> $testroot/stdout.expected
echo "commit $commit_id1" >> $testroot/stdout.expected
echo "commit $commit_id0" >> $testroot/stdout.expected
(cd $testroot/wt && env GOT_LOG_DEFAULT_LIMIT=1 got log -l0 | \
grep ^commit > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
fi
test_done "$testroot" "0"
}
function test_log_nonexistent_path {
local testroot=`test_init log_nonexistent_path`
local head_rev=`git_show_head $testroot/repo`
echo "commit $head_rev (master)" > $testroot/stdout.expected
(cd $testroot/repo && got log this/does/not/exist \
> $testroot/stdout 2> $testroot/stderr)
ret="$?"
if [ "$ret" == "0" ]; then
echo "log command succeeded unexpectedly" >&2
test_done "$testroot" "1"
return 1
fi
echo -n > $testroot/stdout.expected
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
echo "got: this/does/not/exist: no such entry found in tree" \
> $testroot/stderr.expected
cmp -s $testroot/stderr.expected $testroot/stderr
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stderr.expected $testroot/stderr
fi
test_done "$testroot" "$ret"
}
function test_log_end_at_commit {
local testroot=`test_init log_end_at_commit`
local commit_id0=`git_show_head $testroot/repo`
got checkout $testroot/repo $testroot/wt > /dev/null
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
return 1
fi
echo "modified alpha" > $testroot/wt/alpha
(cd $testroot/wt && got commit -m 'test log_limit' > /dev/null)
local commit_id1=`git_show_head $testroot/repo`
(cd $testroot/wt && got rm beta >/dev/null)
(cd $testroot/wt && got commit -m 'test log_limit' > /dev/null)
local commit_id2=`git_show_head $testroot/repo`
echo "new file" > $testroot/wt/new
(cd $testroot/wt && got add new >/dev/null)
(cd $testroot/wt && got commit -m 'test log_limit' > /dev/null)
local commit_id3=`git_show_head $testroot/repo`
# Print commit 3 only
echo "commit $commit_id3 (master)" > $testroot/stdout.expected
(cd $testroot/wt && got log -x $commit_id3 | grep ^commit \
> $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
# Print commit 3 up to commit 1 inclusive
echo "commit $commit_id3 (master)" > $testroot/stdout.expected
echo "commit $commit_id2" >> $testroot/stdout.expected
echo "commit $commit_id1" >> $testroot/stdout.expected
(cd $testroot/wt && got log -c $commit_id3 -x $commit_id1 | \
grep ^commit > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
# Create commits on an unrelated branch
(cd $testroot/wt && got br foo > /dev/null)
echo bar >> $testroot/wt/alpha
(cd $testroot/wt && got commit -m "change on branch foo" >/dev/null)
local commit_id4=`git_show_branch_head $testroot/repo foo`
# Print commit 4 only (in work tree)
echo "commit $commit_id4 (foo)" > $testroot/stdout.expected
(cd $testroot/wt && got log -x foo | grep ^commit \
> $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
# Print commit 4 only (in repository)
echo "commit $commit_id4 (foo)" > $testroot/stdout.expected
(cd $testroot/repo && got log -c foo -x foo | grep ^commit \
> $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
# Repository's HEAD is on master branch so -x foo without an explicit
# '-c foo' start commit has no effect there
echo "commit $commit_id3 (master)" > $testroot/stdout.expected
echo "commit $commit_id2" >> $testroot/stdout.expected
echo "commit $commit_id1" >> $testroot/stdout.expected
echo "commit $commit_id0" >> $testroot/stdout.expected
(cd $testroot/repo && got log -x foo | grep ^commit \
> $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
# got will refuse -x with a non-existent commit
(cd $testroot/wt && got log -x nonexistent \
> $testroot/stdout 2> $testroot/stderr)
ret="$?"
if [ "$ret" == "0" ]; then
echo "log command succeeded unexpectedly" >&2
test_done "$testroot" "1"
return 1
fi
echo -n > $testroot/stdout.expected
echo "got: nonexistent: bad object id string" \
> $testroot/stderr.expected
cmp -s $testroot/stderr.expected $testroot/stderr
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stderr.expected $testroot/stderr
test_done "$testroot" "$ret"
return 1
fi
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
# try the same with the hash of an empty string which is very
# unlikely to match any object
local empty_sha1=da39a3ee5e6b4b0d3255bfef95601890afd80709
(cd $testroot/wt && got log -x $empty_sha1 \
> $testroot/stdout 2> $testroot/stderr)
ret="$?"
if [ "$ret" == "0" ]; then
echo "log command succeeded unexpectedly" >&2
test_done "$testroot" "1"
return 1
fi
echo -n > $testroot/stdout.expected
echo "got: $empty_sha1: object not found" > $testroot/stderr.expected
cmp -s $testroot/stderr.expected $testroot/stderr
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stderr.expected $testroot/stderr
test_done "$testroot" "$ret"
return 1
fi
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
test_done "$testroot" "0"
}
function test_log_reverse_display {
local testroot=`test_init log_reverse_display`
local commit_id0=`git_show_head $testroot/repo`
got checkout $testroot/repo $testroot/wt > /dev/null
ret="$?"
if [ "$ret" != "0" ]; then
test_done "$testroot" "$ret"
return 1
fi
echo "modified alpha" > $testroot/wt/alpha
(cd $testroot/wt && got commit -m 'commit1' > /dev/null)
local commit_id1=`git_show_head $testroot/repo`
(cd $testroot/wt && got rm beta >/dev/null)
(cd $testroot/wt && got commit -m 'commit2' > /dev/null)
local commit_id2=`git_show_head $testroot/repo`
echo "new file" > $testroot/wt/new
(cd $testroot/wt && got add new >/dev/null)
(cd $testroot/wt && got commit -m 'commit3' > /dev/null)
local commit_id3=`git_show_head $testroot/repo`
# -R alone should display all commits in reverse
echo "commit $commit_id0" > $testroot/stdout.expected
echo "commit $commit_id1" >> $testroot/stdout.expected
echo "commit $commit_id2" >> $testroot/stdout.expected
echo "commit $commit_id3 (master)" >> $testroot/stdout.expected
(cd $testroot/wt && got log -R | grep ^commit > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
# -R takes effect after the -l commit traversal limit
echo "commit $commit_id2" > $testroot/stdout.expected
echo "commit $commit_id3 (master)" >> $testroot/stdout.expected
(cd $testroot/wt && got log -R -l2 | grep ^commit > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
return 1
fi
# -R works with commit ranges specified via -c and -x
echo "commit $commit_id1" > $testroot/stdout.expected
echo "commit $commit_id2" >> $testroot/stdout.expected
echo "commit $commit_id3 (master)" >> $testroot/stdout.expected
(cd $testroot/wt && got log -R -c $commit_id3 -x $commit_id1 | \
grep ^commit > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
test_done "$testroot" "$ret"
fi
# commit matching with -s applies before -R
echo "commit $commit_id1" > $testroot/stdout.expected
echo "commit $commit_id2" >> $testroot/stdout.expected
(cd $testroot/wt && got log -R -s 'commit[12]' | \
grep ^commit > $testroot/stdout)
cmp -s $testroot/stdout.expected $testroot/stdout
ret="$?"
if [ "$ret" != "0" ]; then
diff -u $testroot/stdout.expected $testroot/stdout
fi
test_done "$testroot" "$ret"
}
run_test test_log_in_repo
run_test test_log_in_bare_repo
run_test test_log_in_worktree
run_test test_log_in_worktree_with_path_prefix
run_test test_log_tag
run_test test_log_limit
run_test test_log_nonexistent_path
run_test test_log_end_at_commit
run_test test_log_reverse_display