mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-20 10:09:03 -06:00
Code Issues Packages Projects Releases 135 Wiki Activity

Prefer method name "...WithCommitMetaGenerator"

Browse Source 
Since we already have a type called CommitMeta.
This commit is contained in:
Solipsis
2023-03-21 23:15:01 -07:00
parent 81b6643c7c
commit 349a7e2b7c
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
go/cmd/dolt/commands/init.go
View File

@@ -155,12 +155,12 @@ func (cmd InitCmd) Exec(ctx context.Context, commandStr string, args []string, d
}
requiresFunHash := apr.Contains(funHashFlag)
generator := datas.MakeCommitMetaGenerator(name, email, t)
commitMetaGenerator := datas.MakeCommitMetaGenerator(name, email, t)
if requiresFunHash {
generator = datas.MakeFunCommitMetaGenerator(name, email, t)
commitMetaGenerator = datas.MakeFunCommitMetaGenerator(name, email, t)
}
err := dEnv.InitRepoWithCommitMeta(context.Background(), types.Format_Default, initBranch, commitMeta)
err := dEnv.InitRepoWithCommitMetaGenerator(context.Background(), types.Format_Default, initBranch, commitMetaGenerator)
if err != nil {
cli.PrintErrln(color.RedString("Failed to initialize directory as a data repo. %s", err.Error()))
return 1

10
go/libraries/doltcore/doltdb/doltdb.go
View File

@@ -143,11 +143,11 @@ func (ddb *DoltDB) CSMetricsSummary() string {
// WriteEmptyRepo will create initialize the given db with a master branch which points to a commit which has valid
// metadata for the creation commit, and an empty RootValue.
func (ddb *DoltDB) WriteEmptyRepo(ctx context.Context, initBranch, name, email string) error {
return ddb.WriteEmptyRepoWithCommitMeta(ctx, initBranch, datas.MakeCommitMetaGenerator(name, email, datas.CommitNowFunc()))
return ddb.WriteEmptyRepoWithCommitMetaGenerator(ctx, initBranch, datas.MakeCommitMetaGenerator(name, email, datas.CommitNowFunc()))
}
func (ddb *DoltDB) WriteEmptyRepoWithCommitMeta(ctx context.Context, initBranch string, commitMeta datas.CommitMetaGenerator) error {
return ddb.WriteEmptyRepoWithCommitMetaAndDefaultBranch(ctx, commitMeta, ref.NewBranchRef(initBranch))
func (ddb *DoltDB) WriteEmptyRepoWithCommitMetaGenerator(ctx context.Context, initBranch string, commitMeta datas.CommitMetaGenerator) error {
return ddb.WriteEmptyRepoWithCommitMetaGeneratorAndDefaultBranch(ctx, commitMeta, ref.NewBranchRef(initBranch))
}
func (ddb *DoltDB) WriteEmptyRepoWithCommitTimeAndDefaultBranch(
@@ -156,10 +156,10 @@ func (ddb *DoltDB) WriteEmptyRepoWithCommitTimeAndDefaultBranch(
t time.Time,
init ref.BranchRef,
) error {
return ddb.WriteEmptyRepoWithCommitMetaAndDefaultBranch(ctx, datas.MakeCommitMetaGenerator(name, email, t), init)
return ddb.WriteEmptyRepoWithCommitMetaGeneratorAndDefaultBranch(ctx, datas.MakeCommitMetaGenerator(name, email, t), init)
}
func (ddb *DoltDB) WriteEmptyRepoWithCommitMetaAndDefaultBranch(
func (ddb *DoltDB) WriteEmptyRepoWithCommitMetaGeneratorAndDefaultBranch(
ctx context.Context,
commitMetaGenerator datas.CommitMetaGenerator,
init ref.BranchRef,

18
go/libraries/doltcore/env/environment.go vendored
View File

@@ -349,10 +349,10 @@ func (dEnv *DoltEnv) InitRepo(ctx context.Context, nbf *types.NomsBinFormat, nam
}
func (dEnv *DoltEnv) InitRepoWithTime(ctx context.Context, nbf *types.NomsBinFormat, name, email, branchName string, t time.Time) error { // should remove name and email args
return dEnv.InitRepoWithCommitMeta(ctx, nbf, branchName, datas.MakeCommitMetaGenerator(name, email, t))
return dEnv.InitRepoWithCommitMetaGenerator(ctx, nbf, branchName, datas.MakeCommitMetaGenerator(name, email, t))
}
func (dEnv *DoltEnv) InitRepoWithCommitMeta(ctx context.Context, nbf *types.NomsBinFormat, branchName string, commitMeta datas.CommitMetaGenerator) error {
func (dEnv *DoltEnv) InitRepoWithCommitMetaGenerator(ctx context.Context, nbf *types.NomsBinFormat, branchName string, commitMeta datas.CommitMetaGenerator) error {
doltDir, err := dEnv.createDirectories(".")
if err != nil {
@@ -362,7 +362,7 @@ func (dEnv *DoltEnv) InitRepoWithCommitMeta(ctx context.Context, nbf *types.Noms
err = dEnv.configureRepo(doltDir)
if err == nil {
err = dEnv.InitDBAndRepoStateWithCommitMeta(ctx, nbf, branchName, commitMeta)
err = dEnv.InitDBAndRepoStateWithCommitMetaGenerator(ctx, nbf, branchName, commitMeta)
}
if err != nil {
@@ -443,11 +443,11 @@ func (dEnv *DoltEnv) configureRepo(doltDir string) error {
// Inits the dolt DB of this environment with an empty commit at the time given and writes default docs to disk.
// Writes new repo state with a main branch and current root hash.
func (dEnv *DoltEnv) InitDBAndRepoState(ctx context.Context, nbf *types.NomsBinFormat, name, email, branchName string, t time.Time) error {
return dEnv.InitDBAndRepoStateWithCommitMeta(ctx, nbf, branchName, datas.MakeCommitMetaGenerator(name, email, t))
return dEnv.InitDBAndRepoStateWithCommitMetaGenerator(ctx, nbf, branchName, datas.MakeCommitMetaGenerator(name, email, t))
}
func (dEnv *DoltEnv) InitDBAndRepoStateWithCommitMeta(ctx context.Context, nbf *types.NomsBinFormat, branchName string, commitMeta datas.CommitMetaGenerator) error {
err := dEnv.InitDBWithCommitMeta(ctx, nbf, branchName, commitMeta)
func (dEnv *DoltEnv) InitDBAndRepoStateWithCommitMetaGenerator(ctx context.Context, nbf *types.NomsBinFormat, branchName string, commitMeta datas.CommitMetaGenerator) error {
err := dEnv.InitDBWithCommitMetaGenerator(ctx, nbf, branchName, commitMeta)
if err != nil {
return err
}
@@ -458,17 +458,17 @@ func (dEnv *DoltEnv) InitDBAndRepoStateWithCommitMeta(ctx context.Context, nbf *
// Inits the dolt DB of this environment with an empty commit at the time given and writes default docs to disk.
// Does not update repo state.
func (dEnv *DoltEnv) InitDBWithTime(ctx context.Context, nbf *types.NomsBinFormat, name, email, branchName string, t time.Time) error {
return dEnv.InitDBWithCommitMeta(ctx, nbf, branchName, datas.MakeCommitMetaGenerator(name, email, t))
return dEnv.InitDBWithCommitMetaGenerator(ctx, nbf, branchName, datas.MakeCommitMetaGenerator(name, email, t))
}
func (dEnv *DoltEnv) InitDBWithCommitMeta(ctx context.Context, nbf *types.NomsBinFormat, branchName string, commitMeta datas.CommitMetaGenerator) error {
func (dEnv *DoltEnv) InitDBWithCommitMetaGenerator(ctx context.Context, nbf *types.NomsBinFormat, branchName string, commitMeta datas.CommitMetaGenerator) error {
var err error
dEnv.DoltDB, err = doltdb.LoadDoltDB(ctx, nbf, dEnv.urlStr, dEnv.FS)
if err != nil {
return err
}
err = dEnv.DoltDB.WriteEmptyRepoWithCommitMeta(ctx, branchName, commitMeta)
err = dEnv.DoltDB.WriteEmptyRepoWithCommitMetaGenerator(ctx, branchName, commitMeta)
if err != nil {
return fmt.Errorf("%w: %v", doltdb.ErrNomsIO, err)
}