mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-05 09:00:36 -06:00
Code Issues Packages Projects Releases 115 Wiki Activity

Moving storage format info to only be displayed when a new --verbose/-v flag is specified

Browse Source
This commit is contained in:
Jason Fulghum
2023-08-29 15:41:03 -07:00
parent cdae367bd6
commit 4c09863f14
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
go/cmd/dolt/commands/version.go
View File

@@ -26,6 +26,7 @@ import (
const (
featureVersionFlag = "feature"
verboseFlag = "verbose"
)
type VersionCmd struct {
@@ -55,6 +56,7 @@ func (cmd VersionCmd) Docs() *cli.CommandDocumentation {
func (cmd VersionCmd) ArgParser() *argparser.ArgParser {
ap := argparser.NewArgParserWithMaxArgs(cmd.Name(), 0)
ap.SupportsFlag(featureVersionFlag, "f", "query the feature version of this repository.")
ap.SupportsFlag(verboseFlag, "v", "include additional details on this repository's storage format.")
return ap
}
@@ -63,17 +65,19 @@ func (cmd VersionCmd) ArgParser() *argparser.ArgParser {
func (cmd VersionCmd) Exec(ctx context.Context, commandStr string, args []string, dEnv *env.DoltEnv, cliCtx cli.CliContext) int {
cli.Println("dolt version", cmd.VersionStr)
if dEnv.HasDoltDir() && dEnv.RSLoadErr == nil && !cli.CheckEnvIsValid(dEnv) {
return 2
} else if dEnv.HasDoltDir() && dEnv.RSLoadErr == nil {
nbf := dEnv.DoltDB.Format()
cli.Printf("database storage format: %s\n", dfunctions.GetStorageFormatDisplayString(nbf))
}
usage := func() {}
ap := cmd.ArgParser()
apr := cli.ParseArgsOrDie(ap, args, usage)
if apr.Contains(verboseFlag) {
if dEnv.HasDoltDir() && dEnv.RSLoadErr == nil && !cli.CheckEnvIsValid(dEnv) {
return 2
} else if dEnv.HasDoltDir() && dEnv.RSLoadErr == nil {
nbf := dEnv.DoltDB.Format()
cli.Printf("database storage format: %s\n", dfunctions.GetStorageFormatDisplayString(nbf))
}
}
var verr errhand.VerboseError
if apr.Contains(featureVersionFlag) {
if !cli.CheckEnvIsValid(dEnv) {

12
integration-tests/bats/init.bats
View File

@@ -183,7 +183,7 @@ teardown() {
run dolt init --new-format
[ $status -eq 0 ]
run dolt version
run dolt version -v
[ $status -eq 0 ]
[[ $output =~ "database storage format: NEW ( __DOLT__ )" ]] || false
@@ -197,7 +197,7 @@ teardown() {
run dolt init --new-format
[ $status -eq 0 ]
run dolt version
run dolt version --verbose
[ "$status" -eq 0 ]
[[ ! $output =~ "OLD ( __LD_1__ )" ]] || false
[[ $output =~ "NEW ( __DOLT__ )" ]] || false
@@ -207,7 +207,7 @@ teardown() {
[[ $output =~ "test" ]] || false
cd test
run dolt version
run dolt version --verbose
[ "$status" -eq 0 ]
[[ ! $output =~ "OLD ( __LD_1__ )" ]] || false
[[ $output =~ "NEW ( __DOLT__ )" ]] || false
@@ -228,13 +228,13 @@ teardown() {
run dolt init --new-format
[ $status -eq 0 ]
run dolt version
run dolt version --verbose
[ "$status" -eq 0 ]
[[ ! $output =~ "OLD ( __LD_1__ )" ]] || false
[[ $output =~ "NEW ( __DOLT__ )" ]] || false
cd ..
run dolt version
run dolt version --verbose
[ "$status" -eq 0 ]
! [[ $output =~ "no valid database in this directory" ]] || false
@@ -243,7 +243,7 @@ teardown() {
[[ $output =~ "test" ]] || false
cd test
run dolt version
run dolt version --verbose
[ "$status" -eq 0 ]
[[ "$output" =~ "__DOLT__" ]] || false
}