Files
dolt/integration-tests/bats/log.bats
2023-03-31 18:56:42 -07:00

645 lines
21 KiB
Bash
Executable File

#!/usr/bin/env bats
load $BATS_TEST_DIRNAME/helper/common.bash
setup() {
setup_common
}
teardown() {
assert_feature_version
teardown_common
}
@test "log: on initialized repo" {
run dolt log
[ "$status" -eq "0" ]
[[ "$output" =~ "Initialize data repository" ]] || false
}
@test "log: log respects branches" {
dolt branch branch1
dolt commit --allow-empty -m "commit 1 MAIN"
dolt commit --allow-empty -m "commit 2 MAIN"
dolt commit --allow-empty -m "commit 3 MAIN"
run dolt log
[ $status -eq 0 ]
[[ "$output" =~ "MAIN" ]] || false
[[ ! "$output" =~ "BRANCH1" ]] || false
dolt checkout branch1
dolt commit --allow-empty -m "commit 1 BRANCH1"
dolt commit --allow-empty -m "commit 2 BRANCH1"
dolt commit --allow-empty -m "commit 3 BRANCH1"
run dolt log
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ "$output" =~ "BRANCH1" ]] || false
dolt checkout main
run dolt log
[ $status -eq 0 ]
[[ "$output" =~ "MAIN" ]] || false
[[ ! "$output" =~ "BRANCH1" ]] || false
}
@test "log: two and three dot log" {
dolt sql -q "create table testtable (pk int PRIMARY KEY)"
dolt add .
dolt commit -m "commit 1 MAIN"
dolt commit --allow-empty -m "commit 2 MAIN"
dolt checkout -b branchA
dolt commit --allow-empty -m "commit 1 BRANCHA"
dolt commit --allow-empty -m "commit 2 BRANCHA"
dolt checkout -b branchB
dolt commit --allow-empty -m "commit 1 BRANCHB"
dolt checkout branchA
dolt commit --allow-empty -m "commit 3 BRANCHA"
run dolt log branchA
[ $status -eq 0 ]
[[ "$output" =~ "MAIN" ]] || false
[[ "$output" =~ "BRANCHA" ]] || false
run dolt log main
[ $status -eq 0 ]
[[ "$output" =~ "MAIN" ]] || false
[[ ! "$output" =~ "BRANCHA" ]] || false
dolt checkout main
dolt commit --allow-empty -m "commit 3 AFTER"
# # # # # # # # # # # # # # # # # # # # # # #
# #
# 1B (branchB) #
# / #
# 1A - 2A - 3A (branchA) #
# / #
# (init) - 1M - 2M - 3M (main) #
# #
# # # # # # # # # # # # # # # # # # # # # # #
# Valid two dot
run dolt log main..branchA
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ ! "$output" =~ "AFTER" ]] || false
[[ "$output" =~ "BRANCHA" ]] || false
run dolt log ^main branchA
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ ! "$output" =~ "AFTER" ]] || false
[[ "$output" =~ "BRANCHA" ]] || false
run dolt log branchA ^main
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ ! "$output" =~ "AFTER" ]] || false
[[ "$output" =~ "BRANCHA" ]] || false
run dolt log branchA --not main
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ ! "$output" =~ "AFTER" ]] || false
[[ "$output" =~ "BRANCHA" ]] || false
run dolt log branchA..main
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ "$output" =~ "AFTER" ]] || false
[[ ! "$output" =~ "BRANCHA" ]] || false
run dolt log main..main
[ $status -eq 0 ]
run dolt log main^..branchA
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ ! "$output" =~ "AFTER" ]] || false
[[ "$output" =~ "BRANCHA" ]] || false
run dolt log ^main^ branchA
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ ! "$output" =~ "AFTER" ]] || false
[[ "$output" =~ "BRANCHA" ]] || false
run dolt log branchA --not main^
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ ! "$output" =~ "AFTER" ]] || false
[[ "$output" =~ "BRANCHA" ]] || false
run dolt log ^main ^branchA
[ $status -eq 0 ]
# Valid three dot
run dolt log main...branchA
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ "$output" =~ "AFTER" ]] || false
[[ "$output" =~ "BRANCHA" ]] || false
run dolt log branchA...main
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ "$output" =~ "AFTER" ]] || false
[[ "$output" =~ "BRANCHA" ]] || false
run dolt log main branchA --not $(dolt merge-base main branchA)
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ "$output" =~ "AFTER" ]] || false
[[ "$output" =~ "BRANCHA" ]] || false
run dolt log branchB...branchA
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ ! "$output" =~ "AFTER" ]] || false
[[ "$output" =~ "BRANCHA" ]] || false
[[ "$output" =~ "BRANCHB" ]] || false
# Multiple refs
run dolt log branchB branchA
[ $status -eq 0 ]
[[ "$output" =~ "MAIN" ]] || false
[[ ! "$output" =~ "AFTER" ]] || false
[[ "$output" =~ "BRANCHA" ]] || false
[[ "$output" =~ "BRANCHB" ]] || false
run dolt log main branchA
[ $status -eq 0 ]
[[ "$output" =~ "MAIN" ]] || false
[[ "$output" =~ "AFTER" ]] || false
[[ "$output" =~ "BRANCHA" ]] || false
[[ ! "$output" =~ "BRANCHB" ]] || false
run dolt log main branchB branchA
[ $status -eq 0 ]
[[ "$output" =~ "MAIN" ]] || false
[[ "$output" =~ "AFTER" ]] || false
[[ "$output" =~ "BRANCHA" ]] || false
[[ "$output" =~ "BRANCHB" ]] || false
run dolt log branchB main ^branchA
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ "$output" =~ "AFTER" ]] || false
[[ ! "$output" =~ "BRANCHA" ]] || false
[[ "$output" =~ "BRANCHB" ]] || false
run dolt log branchB main --not branchA
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ "$output" =~ "AFTER" ]] || false
[[ ! "$output" =~ "BRANCHA" ]] || false
[[ "$output" =~ "BRANCHB" ]] || false
run dolt log branchB main --not branchA --oneline
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ "$output" =~ "AFTER" ]] || false
[[ ! "$output" =~ "BRANCHA" ]] || false
[[ "$output" =~ "BRANCHB" ]] || false
run dolt log branchB main ^branchA ^main
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ ! "$output" =~ "AFTER" ]] || false
[[ ! "$output" =~ "BRANCHA" ]] || false
[[ "$output" =~ "BRANCHB" ]] || false
run dolt log branchB main --not branchA main
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ ! "$output" =~ "AFTER" ]] || false
[[ ! "$output" =~ "BRANCHA" ]] || false
[[ "$output" =~ "BRANCHB" ]] || false
run dolt log branchB main --not branchA main --oneline
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ ! "$output" =~ "AFTER" ]] || false
[[ ! "$output" =~ "BRANCHA" ]] || false
[[ "$output" =~ "BRANCHB" ]] || false
# Invalid
run dolt log main..branchA testtable
[ $status -eq 1 ]
run dolt log testtable main..branchA
[ $status -eq 1 ]
run dolt log main...branchA testtable
[ $status -eq 1 ]
run dolt log testtable main...branchA
[ $status -eq 1 ]
run dolt log ^main branchA testtable
[ $status -eq 1 ]
run dolt log branchA testtable --not main
[ $status -eq 1 ]
run dolt log main..branchA main
[ $status -eq 1 ]
run dolt log main main..branchA
[ $status -eq 1 ]
run dolt log main...branchA main
[ $status -eq 1 ]
run dolt log main main...branchA
[ $status -eq 1 ]
run dolt log ^main testtable
[ $status -eq 1 ]
run dolt log testtable ^main
[ $status -eq 1 ]
run dolt log ^branchA --not main
[ $status -eq 1 ]
run dolt log main..branchA --not main
[ $status -eq 1 ]
run dolt log main..branchA --not ^main
[ $status -eq 1 ]
run dolt log main...branchA --not main
[ $status -eq 1 ]
run dolt log main...branchA --not ^main
[ $status -eq 1 ]
}
@test "log: branch name and table name are the same" {
dolt commit --allow-empty -m "commit 1 MAIN"
dolt commit --allow-empty -m "commit 2 MAIN"
dolt checkout -b myname
dolt sql -q "create table myname (pk int PRIMARY KEY)"
dolt add .
dolt commit -m "commit 1 BRANCH1"
dolt commit --allow-empty -m "commit 2 BRANCH1"
dolt commit --allow-empty -m "commit 3 BRANCH1"
# Should default to branch name if one argument provided
run dolt log myname
[ $status -eq 0 ]
[[ "$output" =~ "MAIN" ]] || false
[[ "$output" =~ "BRANCH1" ]] || false
# Should default to first argument as branch name, second argument as table name (if table exists) if two arguments provided
run dolt log myname myname
[ $status -eq 0 ]
[[ ! "$output" =~ "MAIN" ]] || false
[[ "$output" =~ "BRANCH1" ]] || false
# Table main does not exist
run dolt log main main
[ $status -eq 1 ]
}
@test "log: with -n specified" {
dolt sql -q "create table test (pk int, c1 int, primary key(pk))"
dolt add test
dolt commit -m "first commit"
run dolt log
[ $status -eq 0 ]
[[ "$output" =~ "first commit" ]] || false
[[ "$output" =~ "Initialize data repository" ]] || false
run dolt log -n 1
[ $status -eq 0 ]
[[ "$output" =~ "first commit" ]] || false
[[ ! "$output" =~ "Initialize data repository" ]] || false
}
@test "log: on fast-forward merge commits" {
dolt sql -q "create table test (pk int, c1 int, primary key(pk))"
dolt add test
dolt commit -m "Commit1"
dolt checkout -b test-branch
dolt sql -q "insert into test values (0,0)"
dolt add test
dolt commit -m "Commit2"
dolt checkout main
dolt merge test-branch
run dolt log
[ $status -eq 0 ]
[[ "$output" =~ "Commit1" ]] || false
[[ "$output" =~ "Commit2" ]] || false
[[ "$output" =~ "Initialize data repository" ]] || false
[[ ! "$output" =~ "Merge:" ]] || false
}
@test "log: properly orders merge commits" {
dolt sql -q "create table test (pk int, c1 int, primary key(pk))"
dolt add test
dolt commit -m "Commit1"
dolt checkout -b test-branch
dolt sql -q "insert into test values (0,0)"
dolt add test
dolt commit -m "Commit2"
dolt checkout main
dolt sql -q "insert into test values (1,1)"
dolt add test
dolt commit -m "Commit3"
dolt merge test-branch --no-commit
run dolt log
[ $status -eq 0 ]
[[ "$output" =~ "Commit1" ]] || false
[[ "$output" =~ "Commit3" ]] || false
[[ "$output" =~ "Initialize data repository" ]] || false
[[ ! "$output" =~ "Merge:" ]] || false
[[ ! "$output" =~ "Commit2" ]] || false
dolt add test
dolt commit -m "MergeCommit"
run dolt log
[ $status -eq 0 ]
regex='Merge:.*MergeCommit.*Commit3.*Commit2.*Commit1.*Initialize data repository'
[[ "$output" =~ $regex ]] || false
run dolt log -n 5
regex='Merge:.*MergeCommit.*Commit3.*Commit2.*Commit1.*Initialize data repository'
[[ "$output" =~ $regex ]] || false
run dolt log -n 4
regex='Merge:.*MergeCommit.*Commit3.*Commit2.*Commit1'
[[ "$output" =~ $regex ]] || false
run dolt log -n 3
regex='Merge:.*MergeCommit.*Commit3.*Commit2'
[[ "$output" =~ $regex ]] || false
run dolt log -n 2
regex='Merge:.*MergeCommit.*Commit3'
[[ "$output" =~ $regex ]] || false
run dolt log -n 1
regex='Merge:.*MergeCommit.*'
[[ "$output" =~ $regex ]] || false
}
@test "log: Properly throws an error when neither a valid commit hash nor a valid table are passed" {
run dolt log notvalid
[ "$status" -eq "1" ]
[[ "$output" =~ "error: table notvalid does not exist" ]] || false
}
@test "log: Log on a table has basic functionality" {
dolt sql -q "create table test (pk int PRIMARY KEY)"
dolt add .
dolt commit -am "first commit"
run dolt log test
[ $status -eq 0 ]
[[ "$output" =~ "first commit" ]] || false
[[ ! "$output" =~ "Initialize data repository" ]] || false
dolt sql -q "INSERT INTO test VALUES (1)"
dolt commit -am "second commit"
run dolt log test
[ $status -eq 0 ]
[[ "$output" =~ "second commit" ]] || false
[[ "$output" =~ "first commit" ]] || false
[[ ! "$output" =~ "Initialize data repository" ]] || false
dolt sql -q "create table test2 (pk int PRIMARY KEY)"
dolt add .
dolt commit -am "third commit"
# Validate we only look at the right commits
run dolt log test
[ $status -eq 0 ]
[[ "$output" =~ "second commit" ]] || false
[[ "$output" =~ "first commit" ]] || false
[[ ! "$output" =~ "Initialize data repository" ]] || false
[[ ! "$output" =~ "third commit" ]] || false
}
@test "log: Log on a table works with -n" {
dolt sql -q "create table test (pk int PRIMARY KEY)"
dolt add .
dolt commit -am "first commit"
run dolt log -n 1 test
[ $status -eq 0 ]
[[ "$output" =~ "first commit" ]] || false
dolt sql -q "INSERT INTO test VALUES (1)"
dolt commit -am "second commit"
run dolt log -n 2 test
[ $status -eq 0 ]
[[ "$output" =~ "second commit" ]] || false
[[ "$output" =~ "first commit" ]] || false
dolt sql -q "create table test2 (pk int PRIMARY KEY)"
dolt add .
dolt commit -am "third commit"
dolt sql -q "insert into test2 values (4)"
dolt commit -am "fourth commit"
# Validate we only look at the right commits
run dolt log test -n 1
[ $status -eq 0 ]
[[ "$output" =~ "second commit" ]] || false
[[ ! "$output" =~ "first commit" ]] || false
[[ ! "$output" =~ "Initialize data repository" ]] || false
[[ ! "$output" =~ "third commit" ]] || false
[[ ! "$output" =~ "fourth commit" ]] || false
run dolt log test -n 100
[ $status -eq 0 ]
[[ "$output" =~ "second commit" ]] || false
[[ "$output" =~ "first commit" ]] || false
[[ ! "$output" =~ "Initialize data repository" ]] || false
[[ ! "$output" =~ "third commit" ]] || false
[[ ! "$output" =~ "fourth commit" ]] || false
}
@test "log: Log on a table works with merge commits" {
dolt sql -q "create table test (pk int, c1 int, primary key(pk))"
dolt add test
dolt commit -m "Commit1"
dolt checkout -b test-branch
dolt sql -q "insert into test values (0,0)"
dolt add test
dolt commit -m "Commit2"
dolt checkout main
dolt sql -q "insert into test values (1,1)"
dolt add test
dolt commit -m "Commit3"
dolt merge test-branch --no-commit
run dolt log test
[ $status -eq 0 ]
[[ "$output" =~ "Commit1" ]] || false
[[ "$output" =~ "Commit3" ]] || false
[[ ! "$output" =~ "Initialize data repository" ]] || false
[[ ! "$output" =~ "Merge:" ]] || false
[[ ! "$output" =~ "Commit2" ]]
dolt add test
dolt commit -m "MergeCommit"
run dolt log test
[ $status -eq 0 ]
[[ "$output" =~ "MergeCommit" ]] || false
[[ "$output" =~ "Merge:" ]] || false
[[ "$output" =~ "Commit1" ]] || false
[[ "$output" =~ "Commit3" ]] || false
[[ "$output" =~ "Commit2" ]] || false
[[ ! "$output" =~ "Initialize data repository" ]] || false
}
@test "log: dolt log with ref and table" {
dolt sql -q "create table test (pk int, c1 int, primary key(pk))"
dolt add test
dolt commit -m "Commit1"
dolt checkout -b test-branch
dolt sql -q "insert into test values (0,0)"
dolt add test
dolt commit -m "Commit2"
dolt checkout main
run dolt log test-branch test
[ $status -eq 0 ]
[[ "$output" =~ "Commit2" ]] || false
[[ "$output" =~ "Commit1" ]] || false
}
@test "log: dolt log with table deleted between revisions" {
dolt sql -q "create table test (pk int, c1 int, primary key(pk))"
dolt add test
dolt commit -m "Commit1"
dolt sql -q "DROP TABLE test"
dolt add test
dolt commit -m "Commit 2"
run dolt log test
[ $status -eq 1 ]
[[ "$output" =~ "error: table test does not exist" ]] || false
dolt sql -q "create table test (pk int, c1 int, primary key(pk))"
dolt add test
dolt commit -m "Commit3"
run dolt log test
[[ "$output" =~ "Commit3" ]] || false
[[ "$output" =~ "Commit1" ]] || false
! [[ "$output" =~ "Commit2" ]] || false
}
@test "log: --merges, --parents, --min-parents option" {
dolt sql -q "create table test (pk int, c1 int, primary key(pk))"
dolt add -A
dolt commit -m "Created table"
dolt checkout -b branch1
dolt sql -q "insert into test values (0,0)"
dolt add -A
dolt commit -m "Inserted 0,0"
dolt checkout main
dolt checkout -b branch2
dolt sql -q "insert into test values (1,1)"
dolt add -A
dolt commit -m "Inserted 1,1"
dolt checkout main
# Should be fast-forward
dolt merge branch1
# An actual merge
dolt merge branch2 -m "Merged branch2"
# Only shows merge commits
run dolt log --merges
[ $status -eq 0 ]
[[ "$output" =~ "Merged" ]] || false
[[ ! "$output" =~ "0,0" ]] || false
# Only shows merge commits but use --min-parents 2
run dolt log --min-parents 2
[ $status -eq 0 ]
[[ "$output" =~ "Merged" ]] || false
[[ ! "$output" =~ "0,0" ]] || false
# Show everything but the first commit
run dolt log --min-parents 1
[ $status -eq 0 ]
[[ "$output" =~ "0,0" ]] || false
[[ ! "$output" =~ "Initialize data repository" ]] || false
# each commit gets its parents in the log
run dolt log --parents
[ $status -eq 0 ]
regex='commit .* .*\n'
[[ "$output" =~ $regex ]] || false
}
@test "log: --oneline only shows commit message in one line" {
dolt commit --allow-empty -m "a message 1"
dolt commit --allow-empty -m "a message 2"
run dolt log --oneline
[[ !("$output" =~ "Author") ]] || false
[[ !("$output" =~ "Date") ]] || false
[[ !("$output" =~ "commit") ]] || false
res=$(dolt log --oneline | wc -l)
[ "$res" -eq 3 ] # don't forget initial commit
dolt commit --allow-empty -m "a message 3"
res=$(dolt log --oneline | wc -l)
[ "$res" -eq 4 ] # exactly 1 line is added
}
@test "log: --decorate=short shows trimmed branches and tags" {
dolt tag tag_v0
run dolt log --decorate=short
[[ "$output" =~ "commit" ]] || false
[[ "$output" =~ "Author" ]] || false
[[ "$output" =~ "Date" ]] || false
[[ "$output" =~ "main" ]] || false
[[ "$output" =~ "tag: tag_v0" ]] || false
[[ !("$output" =~ "/refs/heads/") ]] || false
[[ !("$output" =~ "/refs/tags/") ]] || false
}
@test "log: --decorate=full shows full branches and tags" {
dolt tag tag_v0
run dolt log --decorate=full
[[ "$output" =~ "commit" ]] || false
[[ "$output" =~ "Author" ]] || false
[[ "$output" =~ "Date" ]] || false
[[ "$output" =~ "refs/heads/main" ]] || false
[[ "$output" =~ "tag: refs/tags/tag_v0" ]] || false
}
@test "log: --decorate=no doesn't show branches or tags" {
dolt tag tag_v0
run dolt log --decorate=no
[[ "$output" =~ "commit" ]] || false
[[ "$output" =~ "Author" ]] || false
[[ "$output" =~ "Date" ]] || false
[[ !("$output" =~ "main") ]] || false
[[ !("$output" =~ "tag_v0") ]] || false
}
@test "log: decorate and oneline work together" {
dolt commit --allow-empty -m "a message 1"
dolt commit --allow-empty -m "a message 2"
run dolt log --oneline --decorate=full
[[ !("$output" =~ "commit") ]] || false
[[ !("$output" =~ "Author") ]] || false
[[ !("$output" =~ "Date") ]] || false
[[ "$output" =~ "refs/heads/main" ]] || false
res=$(dolt log --oneline --decorate=full | wc -l)
[ "$res" -eq 3 ] # don't forget initial commit
dolt commit --allow-empty -m "a message 3"
res=$(dolt log --oneline | wc -l)
[ "$res" -eq 4 ] # exactly 1 line is added
}
@test "log: --decorate=notanoption throws error" {
run dolt log --decorate=notanoption
[ "$status" -eq 1 ]
[[ "$output" =~ "fatal: invalid --decorate option" ]] || false
}
@test "log: check pager" {
skiponwindows "Need to install expect and make this script work on windows."
dolt commit --allow-empty -m "commit 1"
dolt commit --allow-empty -m "commit 2"
dolt commit --allow-empty -m "commit 3"
dolt commit --allow-empty -m "commit 4"
dolt commit --allow-empty -m "commit 5"
dolt commit --allow-empty -m "commit 6"
dolt commit --allow-empty -m "commit 7"
dolt commit --allow-empty -m "commit 8"
dolt commit --allow-empty -m "commit 9"
dolt commit --allow-empty -m "commit 10"
dolt commit --allow-empty -m "commit 11"
dolt commit --allow-empty -m "commit 12"
dolt commit --allow-empty -m "commit 13"
dolt commit --allow-empty -m "commit 14"
dolt commit --allow-empty -m "commit 15"
dolt commit --allow-empty -m "commit 16"
run expect $BATS_TEST_DIRNAME/log.expect
[ "$status" -eq 0 ]
}
@test "log: string formatting characters are escaped" {
run dolt commit --allow-empty -m "% should be escaped"
[[ "$output" =~ "% should be escaped" ]] || false
}
@test "log: identify HEAD" {
dolt commit --allow-empty -m "commit 1"
dolt tag commit1
dolt commit --allow-empty -m "commit 2"
dolt tag commit2
run dolt log commit1
[[ !("$output" =~ "HEAD") ]] || false
run dolt log commit2
[[ "$output" =~ "HEAD" ]] || false
}