mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-24 11:39:18 -05:00
Code Issues Packages Projects Releases 169 Wiki Activity

Some more small fixes

Browse Source
This commit is contained in:
Nathan Gabrielson
2025-06-10 13:04:10 -07:00
parent b0e5eee980
commit 37deab0d41
5 changed files with 37 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/cmd/dolt/cli/arg_parser_helpers.go
+1 -1
View File
@@ -107,7 +107,7 @@ func CreateMergeArgParser() *argparser.ArgParser {
func CreateStashArgParser() *argparser.ArgParser {
ap := argparser.NewArgParserWithMaxArgs("stash", 3)
ap.SupportsFlag("include-untracked", "u", "Untracked tables are also stashed.") //TODO: Add Constant
ap.SupportsFlag(IncludeUntrackedFlag, "u", "Untracked tables are also stashed.")
ap.SupportsFlag(AllFlag, "a", "All tables are stashed, including untracked and ignored tables.")
return ap
}
go/cmd/dolt/cli/flags.go
+1
View File
@@ -42,6 +42,7 @@ const (
GraphFlag = "graph"
HardResetParam = "hard"
HostFlag = "host"
IncludeUntrackedFlag = "include-untracked"
InteractiveFlag = "interactive"
ListFlag = "list"
MergesFlag = "merges"
go/cmd/dolt/commands/stashcmds/stash.go
+4 -5
View File
@@ -40,8 +40,7 @@ var StashCommands = cli.NewSubCommandHandlerWithUnspecified("stash", "Stash the
})
const (
IncludeUntrackedFlag = "include-untracked"
AllFlag = "all"
AllFlag = "all"
)
var stashDocs = cli.CommandDocumentationContent{
@@ -78,7 +77,7 @@ func (cmd StashCmd) Docs() *cli.CommandDocumentation {
func (cmd StashCmd) ArgParser() *argparser.ArgParser {
ap := argparser.NewArgParserWithMaxArgs(cmd.Name(), 0)
ap.SupportsFlag(IncludeUntrackedFlag, "u", "Untracked tables are also stashed.")
ap.SupportsFlag(cli.IncludeUntrackedFlag, "u", "Untracked tables are also stashed.")
ap.SupportsFlag(AllFlag, "a", "All tables are stashed, including untracked and ignored tables.")
return ap
}
@@ -159,7 +158,7 @@ func hasLocalChanges(ctx context.Context, dEnv *env.DoltEnv, roots doltdb.Roots,
}
// There are unignored, unstaged tables. Is --include-untracked set. If so, nothing else matters. Stash them.
if apr.Contains(IncludeUntrackedFlag) {
if apr.Contains(cli.IncludeUntrackedFlag) {
return true, nil
}
@@ -207,7 +206,7 @@ func stashChanges(ctx context.Context, dEnv *env.DoltEnv, apr *argparser.ArgPars
// stage untracked files to include them in the stash,
// but do not include them in added table set,
// because they should not be staged when popped.
if apr.Contains(IncludeUntrackedFlag) || apr.Contains(AllFlag) {
if apr.Contains(cli.IncludeUntrackedFlag) || apr.Contains(AllFlag) {
allTblsToBeStashed, err = doltdb.UnionTableNames(ctx, roots.Staged, roots.Working)
if err != nil {
return err
go/libraries/doltcore/sqle/dprocedures/dolt_stash.go
+3 -7
View File
@@ -37,10 +37,6 @@ import (
"github.com/dolthub/dolt/go/store/hash"
)
const (
includeUntrackedFlag = "include-untracked"
)
// doltStash is the stored procedure version for the CLI command `dolt stash`
// and its options push, pop, drop, and clear
func doltStash(ctx *sql.Context, args ...string) (sql.RowIter, error) {
@@ -88,7 +84,7 @@ func doDoltStash(ctx *sql.Context, args []string) (int, error) {
switch cmdName {
case "push":
if apr.NArg() > 2 { // Push does not take extra arguments
return cmdFailure, fmt.Errorf("error: invalid arguments. Push takes only subcommand and stash name=")
return cmdFailure, fmt.Errorf("error: invalid arguments. Push takes only subcommand and stash name")
}
err = doStashPush(ctx, dSess, dbData, roots, apr, stashName)
case "pop":
@@ -131,7 +127,7 @@ func doStashPush(ctx *sql.Context, dSess *dsess.DoltSession, dbData env.DbData[*
return err
}
if apr.Contains(includeUntrackedFlag) || apr.Contains(cli.AllFlag) {
if apr.Contains(cli.IncludeUntrackedFlag) || apr.Contains(cli.AllFlag) {
allTblsToBeStashed, err = doltdb.UnionTableNames(ctx, roots.Staged, roots.Working)
if err != nil {
return err
@@ -301,7 +297,7 @@ func hasLocalChanges(ctx *sql.Context, dSess *dsess.DoltSession, roots doltdb.Ro
}
// There are unignored, unstaged tables. Is --include-untracked set? If so, nothing else matters. Stash them.
if apr.Contains(includeUntrackedFlag) {
if apr.Contains(cli.IncludeUntrackedFlag) {
return true, nil
}
go/libraries/doltcore/sqle/dtables/stashes_table.go
+28 -16
View File
@@ -28,8 +28,6 @@ import (
"github.com/dolthub/dolt/go/libraries/doltcore/sqle/index"
)
const stashesDefaultRowCount = 5
var _ sql.Table = (*StashesTable)(nil)
var _ sql.StatisticsTable = (*StashesTable)(nil)
@@ -103,7 +101,7 @@ func (st *StashesTable) Partitions(*sql.Context) (sql.PartitionIter, error) {
}
// PartitionRows is a sql.Table interface function that gets a row iterator for a partition
func (st *StashesTable) PartitionRows(ctx *sql.Context, part sql.Partition) (sql.RowIter, error) {
func (st *StashesTable) PartitionRows(ctx *sql.Context, _ sql.Partition) (sql.RowIter, error) {
return NewStashItr(ctx, st.ddb)
}
@@ -113,7 +111,7 @@ type StashItr struct {
}
// NewStashItr creates a StashItr from the current environment.
func NewStashItr(ctx *sql.Context, ddb *doltdb.DoltDB) (*StashItr, error) {
func NewStashItr(ctx *sql.Context, _ *doltdb.DoltDB) (*StashItr, error) {
dbName := ctx.GetCurrentDatabase()
if len(dbName) == 0 {
@@ -136,7 +134,7 @@ func NewStashItr(ctx *sql.Context, ddb *doltdb.DoltDB) (*StashItr, error) {
// Next retrieves the next row. It will return io.EOF if it's the last row.
// After retrieving the last row, Close will be automatically closed.
func (itr *StashItr) Next(ctx *sql.Context) (sql.Row, error) {
func (itr *StashItr) Next(*sql.Context) (sql.Row, error) {
if itr.idx >= len(itr.stashes) {
return nil, io.EOF
}
@@ -151,9 +149,23 @@ func (itr *StashItr) Next(ctx *sql.Context) (sql.Row, error) {
return nil, err
}
branch := strings.Split(stash.BranchName, "/")[2]
stashRef := strings.Split(stash.StashReference, "/")[2]
// BranchName and StashReference are of the form refs/heads/name
// or refs/stashes/name, so we need to parse them
parsedRef := strings.Split(stash.BranchName, "/")
var branch string
if len(parsedRef) > 2 {
branch = parsedRef[2]
} else {
return nil, fmt.Errorf("Bad reference: %s", stash.BranchName)
}
parsedRef = strings.Split(stash.BranchName, "/")
var stashRef string
if len(parsedRef) > 2 {
stashRef = parsedRef[2]
} else {
return nil, fmt.Errorf("Bad reference: %s", stash.StashReference)
}
return sql.NewRow(stashRef, stash.Name, branch, commitHash.String(), stash.Description), nil
}
@@ -174,32 +186,32 @@ type stashWriter struct {
// Insert inserts the row given, returning an error if it cannot. Insert will be called once for each row to process
// for the insert operation, which may involve many rows. After all rows in an operation have been processed, Close
// is called.
func (bWr stashWriter) Insert(ctx *sql.Context, r sql.Row) error {
return fmt.Errorf("the dolt_stashes table is read-only; use the dolt_stash stored procedure to edit remotes")
func (bWr stashWriter) Insert(_ *sql.Context, _ sql.Row) error {
return fmt.Errorf("the dolt_stashes table is read-only; use the dolt_stash stored procedure to edit stashes")
}
// Update the given row. Provides both the old and new rows.
func (bWr stashWriter) Update(ctx *sql.Context, old sql.Row, new sql.Row) error {
return fmt.Errorf("the dolt_stash table is read-only; use the dolt_stash stored procedure to edit remotes")
func (bWr stashWriter) Update(_ *sql.Context, _ sql.Row, _ sql.Row) error {
return fmt.Errorf("the dolt_stash table is read-only; use the dolt_stash stored procedure to edit stashes")
}
// Delete deletes the given row. Returns ErrDeleteRowNotFound if the row was not found. Delete will be called once for
// each row to process for the delete operation, which may involve many rows. After all rows have been processed,
// Close is called.
func (bWr stashWriter) Delete(ctx *sql.Context, r sql.Row) error {
return fmt.Errorf("the dolt_stash table is read-only; use the dolt_stash stored procedure to edit remotes")
func (bWr stashWriter) Delete(_ *sql.Context, _ sql.Row) error {
return fmt.Errorf("the dolt_stash table is read-only; use the dolt_stash stored procedure to edit stashes")
}
// StatementBegin implements the interface sql.TableEditor. Currently a no-op.
func (bWr stashWriter) StatementBegin(ctx *sql.Context) {}
func (bWr stashWriter) StatementBegin(*sql.Context) {}
// DiscardChanges implements the interface sql.TableEditor. Currently a no-op.
func (bWr stashWriter) DiscardChanges(ctx *sql.Context, errorEncountered error) error {
func (bWr stashWriter) DiscardChanges(_ *sql.Context, _ error) error {
return nil
}
// StatementComplete implements the interface sql.TableEditor. Currently a no-op.
func (bWr stashWriter) StatementComplete(ctx *sql.Context) error {
func (bWr stashWriter) StatementComplete(*sql.Context) error {
return nil
}