Merge pull request #35 from liquidata-inc/km/dolt/fix-ancestor-spelling

dolt/go: Fix spelling on ancestor

go/cmd/dolt/commands/utils.go

@@ -102,7 +102,7 @@ func ResolveCommitWithVErr(dEnv *env.DoltEnv, cSpecStr, cwb string) (*doltdb.Com
 	cm, err := dEnv.DoltDB.Resolve(context.TODO(), cs)
 
 	if err != nil {
-		if err == doltdb.ErrInvalidAnscestorSpec {
+		if err == doltdb.ErrInvalidAncestorSpec {
 			return nil, errhand.BuildDError("'%s' is an invalid ancestor spec", cs.ASpec.SpecStr).Build()
 		} else if doltdb.IsNotFoundErr(err) {
 			return nil, errhand.BuildDError("'%s' not found", cSpecStr).Build()

go/libraries/doltcore/doltdb/anscestor_spec_test.go

@@ -50,7 +50,7 @@ func TestParseInstructions(t *testing.T) {
 	}
 }
 
-func TestSplitAnscestorSpec(t *testing.T) {
+func TestSplitAncestorSpec(t *testing.T) {
 	tests := []struct {
 		inputStr         string
 		expectedCSpecStr string

go/libraries/doltcore/doltdb/commit.go

@@ -165,9 +165,9 @@ func (c *Commit) GetRootValue() (*RootValue, error) {
 	return nil, errHasNoRootValue
 }
 
-var ErrNoCommonAnscestor = errors.New("no common anscestor")
+var ErrNoCommonAncestor = errors.New("no common ancestor")
 
-func GetCommitAnscestor(ctx context.Context, cm1, cm2 *Commit) (*Commit, error) {
+func GetCommitAncestor(ctx context.Context, cm1, cm2 *Commit) (*Commit, error) {
 	ref1, err := types.NewRef(cm1.commitSt, cm1.vrw.Format())
 
 	if err != nil {
@@ -209,14 +209,14 @@ func getCommitAncestorRef(ctx context.Context, ref1, ref2 types.Ref, vrw types.V
 	}
 
 	if !ok {
-		return types.Ref{}, ErrNoCommonAnscestor
+		return types.Ref{}, ErrNoCommonAncestor
 	}
 
 	return ancestorRef, nil
 }
 
 func (c *Commit) CanFastForwardTo(ctx context.Context, new *Commit) (bool, error) {
-	ancestor, err := GetCommitAnscestor(ctx, c, new)
+	ancestor, err := GetCommitAncestor(ctx, c, new)
 
 	if err != nil {
 		return false, err
@@ -235,7 +235,7 @@ func (c *Commit) CanFastForwardTo(ctx context.Context, new *Commit) (bool, error
 }
 
 func (c *Commit) CanFastReverseTo(ctx context.Context, new *Commit) (bool, error) {
-	ancestor, err := GetCommitAnscestor(ctx, c, new)
+	ancestor, err := GetCommitAncestor(ctx, c, new)
 
 	if err != nil {
 		return false, err

go/libraries/doltcore/doltdb/doltdb.go

@@ -242,11 +242,11 @@ func walkAncestorSpec(ctx context.Context, db datas.Database, commitSt types.Str
 			}
 
 			if commitStPtr == nil {
-				return types.EmptyStruct(db.Format()), ErrInvalidAnscestorSpec
+				return types.EmptyStruct(db.Format()), ErrInvalidAncestorSpec
 			}
 			commitSt = *commitStPtr
 		} else {
-			return types.EmptyStruct(db.Format()), ErrInvalidAnscestorSpec
+			return types.EmptyStruct(db.Format()), ErrInvalidAncestorSpec
 		}
 	}
 

go/libraries/doltcore/doltdb/errors.go

@@ -19,7 +19,7 @@ import "errors"
 var ErrInvBranchName = errors.New("not a valid user branch name")
 var ErrInvTableName = errors.New("not a valid table name")
 var ErrInvHash = errors.New("not a valid hash")
-var ErrInvalidAnscestorSpec = errors.New("invalid anscestor spec")
+var ErrInvalidAncestorSpec = errors.New("invalid ancestor spec")
 var ErrInvalidBranchOrHash = errors.New("string is not a valid branch or hash")
 
 var ErrFoundHashNotACommit = errors.New("the value retrieved for this hash is not a commit")
@@ -39,7 +39,7 @@ var ErrIsBehind = errors.New("cannot reverse from b to a. b is a is behind a alr
 
 func IsInvalidFormatErr(err error) bool {
 	switch err {
-	case ErrInvBranchName, ErrInvTableName, ErrInvHash, ErrInvalidAnscestorSpec, ErrInvalidBranchOrHash:
+	case ErrInvBranchName, ErrInvTableName, ErrInvHash, ErrInvalidAncestorSpec, ErrInvalidBranchOrHash:
 		return true
 	default:
 		return false

go/libraries/doltcore/merge/merge.go

@@ -41,7 +41,7 @@ type Merger struct {
 }
 
 func NewMerger(ctx context.Context, commit, mergeCommit *doltdb.Commit, vrw types.ValueReadWriter) (*Merger, error) {
-	ancestor, err := doltdb.GetCommitAnscestor(ctx, commit, mergeCommit)
+	ancestor, err := doltdb.GetCommitAncestor(ctx, commit, mergeCommit)
 
 	if err != nil {
 		return nil, err