From df0ea99b25b5a19898c4fefa9bec4e82509b39c1 Mon Sep 17 00:00:00 2001 From: Zach Musgrave Date: Wed, 21 Sep 2022 15:50:04 -0700 Subject: [PATCH] Small refactoring to reduce env dependency --- go/cmd/dolt/commands/commit.go | 2 +- .../doltcore/dtestutils/testcommands/multienv.go | 2 +- go/libraries/doltcore/env/actions/commit.go | 10 +++------- go/libraries/doltcore/sqle/dsess/session.go | 2 +- 4 files changed, 6 insertions(+), 10 deletions(-) diff --git a/go/cmd/dolt/commands/commit.go b/go/cmd/dolt/commands/commit.go index 6e11825842..0fae3c6171 100644 --- a/go/cmd/dolt/commands/commit.go +++ b/go/cmd/dolt/commands/commit.go @@ -193,7 +193,7 @@ func performCommit(ctx context.Context, commandStr string, args []string, dEnv * mergeParentCommits = parentsHeadForAmend } - pendingCommit, err := actions.GetCommitStaged(ctx, roots, ws.MergeActive(), mergeParentCommits, dEnv.DbData(), actions.CommitStagedProps{ + pendingCommit, err := actions.GetCommitStaged(ctx, roots, ws.MergeActive(), mergeParentCommits, dEnv.DbData().Ddb, actions.CommitStagedProps{ Message: msg, Date: t, AllowEmpty: apr.Contains(cli.AllowEmptyFlag) || apr.Contains(cli.AmendFlag), diff --git a/go/libraries/doltcore/dtestutils/testcommands/multienv.go b/go/libraries/doltcore/dtestutils/testcommands/multienv.go index fe9cf574f1..39f057d106 100644 --- a/go/libraries/doltcore/dtestutils/testcommands/multienv.go +++ b/go/libraries/doltcore/dtestutils/testcommands/multienv.go @@ -245,7 +245,7 @@ func (mr *MultiRepoTestSetup) CommitWithWorkingSet(dbName string) *doltdb.Commit if err != nil { panic("couldn't get roots: " + err.Error()) } - pendingCommit, err := actions.GetCommitStaged(ctx, roots, ws.MergeActive(), mergeParentCommits, dEnv.DbData(), actions.CommitStagedProps{ + pendingCommit, err := actions.GetCommitStaged(ctx, roots, ws.MergeActive(), mergeParentCommits, dEnv.DbData().Ddb, actions.CommitStagedProps{ Message: "auto commit", Date: t, AllowEmpty: true, diff --git a/go/libraries/doltcore/env/actions/commit.go b/go/libraries/doltcore/env/actions/commit.go index 3dafbe6470..5796c69f05 100644 --- a/go/libraries/doltcore/env/actions/commit.go +++ b/go/libraries/doltcore/env/actions/commit.go @@ -130,19 +130,15 @@ func CommitStaged(ctx context.Context, roots doltdb.Roots, mergeActive bool, mer return c, nil } -// GetCommitStaged adds a new commit to HEAD with the given props, returning it as a PendingCommit that can be -// committed with doltdb.CommitWithWorkingSet +// GetCommitStaged returns a new pending commit with the roots and commit properties given. func GetCommitStaged( ctx context.Context, roots doltdb.Roots, mergeActive bool, mergeParents []*doltdb.Commit, - dbData env.DbData, + db *doltdb.DoltDB, props CommitStagedProps, ) (*doltdb.PendingCommit, error) { - ddb := dbData.Ddb - rsr := dbData.Rsr - if props.Message == "" { return nil, datas.ErrEmptyCommitMessage } @@ -194,5 +190,5 @@ func GetCommitStaged( return nil, err } - return ddb.NewPendingCommit(ctx, roots, mergeParents, meta) + return db.NewPendingCommit(ctx, roots, mergeParents, meta) } diff --git a/go/libraries/doltcore/sqle/dsess/session.go b/go/libraries/doltcore/sqle/dsess/session.go index 097fea2ad0..23d519d53f 100644 --- a/go/libraries/doltcore/sqle/dsess/session.go +++ b/go/libraries/doltcore/sqle/dsess/session.go @@ -414,7 +414,7 @@ func (d *DoltSession) NewPendingCommit(ctx *sql.Context, dbName string, roots do mergeParentCommits = []*doltdb.Commit{sessionState.WorkingSet.MergeState().Commit()} } - pendingCommit, err := actions.GetCommitStaged(ctx, roots, sessionState.WorkingSet.MergeActive(), mergeParentCommits, sessionState.dbData, props) + pendingCommit, err := actions.GetCommitStaged(ctx, roots, sessionState.WorkingSet.MergeActive(), mergeParentCommits, sessionState.dbData.Ddb, props) if _, ok := err.(actions.NothingStaged); err != nil && !ok { return nil, err }