refactored errors

go/cmd/dolt/commands/commit.go

@@ -136,7 +136,7 @@ func handleCommitErr(ctx context.Context, dEnv *env.DoltEnv, err error, usage cl
 		return 0
 	}
 
-	if err == actions.ErrNameNotConfigured {
+	if err == doltdb.ErrNameNotConfigured {
 		bdr := errhand.BuildDError("Could not determine %s.", env.UserNameKey)
 		bdr.AddDetails("Log into DoltHub: dolt login")
 		bdr.AddDetails("OR add name to config: dolt config [--global|--local] --add %[1]s \"FIRST LAST\"", env.UserNameKey)
@@ -144,7 +144,7 @@ func handleCommitErr(ctx context.Context, dEnv *env.DoltEnv, err error, usage cl
 		return HandleVErrAndExitCode(bdr.Build(), usage)
 	}
 
-	if err == actions.ErrEmailNotConfigured {
+	if err == doltdb.ErrEmailNotConfigured {
 		bdr := errhand.BuildDError("Could not determine %s.", env.UserEmailKey)
 		bdr.AddDetails("Log into DoltHub: dolt login")
 		bdr.AddDetails("OR add email to config: dolt config [--global|--local] --add %[1]s \"EMAIL_ADDRESS\"", env.UserEmailKey)
@@ -152,7 +152,7 @@ func handleCommitErr(ctx context.Context, dEnv *env.DoltEnv, err error, usage cl
 		return HandleVErrAndExitCode(bdr.Build(), usage)
 	}
 
-	if err == actions.ErrEmptyCommitMessage {
+	if err == doltdb.ErrEmptyCommitMessage {
 		bdr := errhand.BuildDError("Aborting commit due to empty commit message.")
 		return HandleVErrAndExitCode(bdr.Build(), usage)
 	}

go/libraries/doltcore/doltdb/commit_meta.go

@@ -35,6 +35,10 @@ const (
 	commitMetaVersion = "1.0"
 )
 
+var ErrNameNotConfigured = errors.New("Aborting commit due to empty committer name. Is your config set?")
+var ErrEmailNotConfigured = errors.New("Aborting commit due to empty committer email. Is your config set?")
+var ErrEmptyCommitMessage = errors.New("Aborting commit due to empty commit message.")
+
 var CommitNowFunc = time.Now
 var CommitLoc = time.Local
 
@@ -64,15 +68,15 @@ func NewCommitMetaWithUserTS(name, email, desc string, userTS time.Time) (*Commi
 	d := strings.TrimSpace(desc)
 
 	if n == "" {
-		return nil, errors.New("Aborting commit due to empty committer name. Is your config set?")
+		return nil, ErrNameNotConfigured
 	}
 
 	if e == "" {
-		return nil, errors.New("Aborting commit due to empty committer email. Is your config set?")
+		return nil, ErrEmailNotConfigured
 	}
 
 	if d == "" {
-		return nil, errors.New("aborting commit due to empty commit message")
+		return nil, ErrEmptyCommitMessage
 	}
 
 	ns := uint64(CommitNowFunc().UnixNano())

go/libraries/doltcore/env/actions/commit.go

@@ -16,7 +16,6 @@ package actions
 
 import (
 	"context"
-	"errors"
 	"fmt"
 	"sort"
 	"time"
@@ -30,9 +29,6 @@ import (
 	"github.com/dolthub/dolt/go/store/hash"
 )
 
-var ErrNameNotConfigured = errors.New("name not configured")
-var ErrEmailNotConfigured = errors.New("email not configured")
-
 type CommitStagedProps struct {
 	Message          string
 	Date             time.Time
@@ -47,7 +43,7 @@ func GetNameAndEmail(cfg config.ReadableConfig) (string, string, error) {
 	name, err := cfg.GetString(env.UserNameKey)
 
 	if err == config.ErrConfigParamNotFound {
-		return "", "", ErrNameNotConfigured
+		return "", "", doltdb.ErrNameNotConfigured
 	} else if err != nil {
 		return "", "", err
 	}
@@ -55,7 +51,7 @@ func GetNameAndEmail(cfg config.ReadableConfig) (string, string, error) {
 	email, err := cfg.GetString(env.UserEmailKey)
 
 	if err == config.ErrConfigParamNotFound {
-		return "", "", ErrEmailNotConfigured
+		return "", "", doltdb.ErrEmailNotConfigured
 	} else if err != nil {
 		return "", "", err
 	}
@@ -71,7 +67,7 @@ func CommitStaged(ctx context.Context, dbData env.DbData, props CommitStagedProp
 	drw := dbData.Drw
 
 	if props.Message == "" {
-		return "", ErrEmptyCommitMessage
+		return "", doltdb.ErrEmptyCommitMessage
 	}
 
 	staged, notStaged, err := diff.GetStagedUnstagedTableDeltas(ctx, ddb, rsr)