Feature: Interactive Rebase

go/cmd/dolt/cli/arg_parser_helpers.go

@@ -96,6 +96,17 @@ func CreateMergeArgParser() *argparser.ArgParser {
 	return ap
 }
 
+func CreateRebaseArgParser() *argparser.ArgParser {
+	ap := argparser.NewArgParserWithMaxArgs("merge", 1)
+	ap.TooManyArgsErrorFunc = func(receivedArgs []string) error {
+		return fmt.Errorf("rebase takes at most one positional argument.")
+	}
+	ap.SupportsFlag(AbortParam, "", "Abort an interactive rebase and return the working set to the pre-rebase state")
+	ap.SupportsFlag(ContinueFlag, "", "Continue an interactive rebase after adjusting the rebase plan")
+	ap.SupportsFlag(InteractiveFlag, "i", "Start an interactive rebase")
+	return ap
+}
+
 func CreatePushArgParser() *argparser.ArgParser {
 	ap := argparser.NewArgParserWithVariableArgs("push")
 	ap.SupportsString(UserFlag, "", "user", "User name to use when authenticating with the remote. Gets password from the environment variable {{.EmphasisLeft}}DOLT_REMOTE_PASSWORD{{.EmphasisRight}}.")

go/cmd/dolt/cli/flags.go

@@ -27,6 +27,7 @@ const (
 	CheckoutCreateBranch = "b"
 	CreateResetBranch    = "B"
 	CommitFlag           = "commit"
+	ContinueFlag         = "continue"
 	CopyFlag             = "copy"
 	DateParam            = "date"
 	DecorateFlag         = "decorate"
@@ -36,6 +37,7 @@ const (
 	ForceFlag            = "force"
 	HardResetParam       = "hard"
 	HostFlag             = "host"
+	InteractiveFlag      = "interactive"
 	ListFlag             = "list"
 	MergesFlag           = "merges"
 	MessageArg           = "message"

go/libraries/doltcore/cherry_pick/cherry_pick.go

@@ -53,7 +53,16 @@ func CherryPick(ctx *sql.Context, commit string, options CherryPickOptions) (str
 
 	mergeResult, commitMsg, err := cherryPick(ctx, doltSession, roots, dbName, commit)
 	if err != nil {
-		return "", nil, err
+		return "", mergeResult, err
+	}
+
+	// If we're amending the previous commit and a new commit message hasn't been provided,
+	// grab the previous commit message and reuse it.
+	if options.Amend && options.CommitMessage == "" {
+		commitMsg, err = previousCommitMessage(ctx)
+		if err != nil {
+			return "", nil, err
+		}
 	}
 
 	newWorkingRoot := mergeResult.Root
@@ -113,6 +122,20 @@ func CherryPick(ctx *sql.Context, commit string, options CherryPickOptions) (str
 	return h.String(), nil, nil
 }
 
+func previousCommitMessage(ctx *sql.Context) (string, error) {
+	doltSession := dsess.DSessFromSess(ctx.Session)
+	headCommit, err := doltSession.GetHeadCommit(ctx, ctx.GetCurrentDatabase())
+	if err != nil {
+		return "", err
+	}
+	headCommitMeta, err := headCommit.GetCommitMeta(ctx)
+	if err != nil {
+		return "", err
+	}
+
+	return headCommitMeta.Description, nil
+}
+
 // AbortCherryPick aborts a cherry-pick merge, if one is in progress. If unable to abort for any reason
 // (e.g. if there is not cherry-pick merge in progress), an error is returned.
 func AbortCherryPick(ctx *sql.Context, dbName string) error {
@@ -222,7 +245,7 @@ func cherryPick(ctx *sql.Context, dSess *dsess.DoltSession, roots doltdb.Roots,
 	}
 	result, err := merge.MergeRoots(ctx, roots.Working, cherryRoot, parentRoot, cherryCommit, parentCommit, dbState.EditOpts(), mo)
 	if err != nil {
-		return nil, "", err
+		return result, "", err
 	}
 
 	workingRootHash, err = result.Root.HashOf()

go/libraries/doltcore/doltdb/doltdb.go

@@ -1302,18 +1302,12 @@ func (ddb *DoltDB) UpdateWorkingSet(
 		return err
 	}
 
-	workingRootRef, stagedRef, mergeState, err := workingSet.writeValues(ctx, ddb)
+	wsSpec, err := workingSet.writeValues(ctx, ddb, meta)
 	if err != nil {
 		return err
 	}
 
-	_, err = ddb.db.withReplicationStatusController(replicationStatus).UpdateWorkingSet(ctx, ds, datas.WorkingSetSpec{
-		Meta:        meta,
-		WorkingRoot: workingRootRef,
-		StagedRoot:  stagedRef,
-		MergeState:  mergeState,
-	}, prevHash)
-
+	_, err = ddb.db.withReplicationStatusController(replicationStatus).UpdateWorkingSet(ctx, ds, *wsSpec, prevHash)
 	return err
 }
 
@@ -1339,19 +1333,13 @@ func (ddb *DoltDB) CommitWithWorkingSet(
 		return nil, err
 	}
 
-	workingRootRef, stagedRef, mergeState, err := workingSet.writeValues(ctx, ddb)
+	wsSpec, err := workingSet.writeValues(ctx, ddb, meta)
 	if err != nil {
 		return nil, err
 	}
 
 	commitDataset, _, err := ddb.db.withReplicationStatusController(replicationStatus).
-		CommitWithWorkingSet(ctx, headDs, wsDs, commit.Roots.Staged.nomsValue(), datas.WorkingSetSpec{
-			Meta:        meta,
-			WorkingRoot: workingRootRef,
-			StagedRoot:  stagedRef,
-			MergeState:  mergeState,
-		}, prevHash, commit.CommitOptions)
-
+		CommitWithWorkingSet(ctx, headDs, wsDs, commit.Roots.Staged.nomsValue(), *wsSpec, prevHash, commit.CommitOptions)
 	if err != nil {
 		return nil, err
 	}

go/libraries/doltcore/doltdb/ignore.go

@@ -232,6 +232,12 @@ func resolveConflictingPatterns(trueMatches, falseMatches []string, tableName st
 }
 
 func (ip *IgnorePatterns) IsTableNameIgnored(tableName string) (IgnoreResult, error) {
+	// The dolt_rebase table is automatically ignored by Dolt – it shouldn't ever
+	// be checked in to a Dolt database.
+	if strings.ToLower(tableName) == strings.ToLower(RebaseTableName) {
+		return Ignore, nil
+	}
+
 	trueMatches := []string{}
 	falseMatches := []string{}
 	for _, patternIgnore := range *ip {

go/libraries/doltcore/doltdb/system_table.go

@@ -161,6 +161,7 @@ var writeableSystemTables = []string{
 	SchemasTableName,
 	ProceduresTableName,
 	IgnoreTableName,
+	RebaseTableName,
 }
 
 var persistedSystemTables = []string{
@@ -311,6 +312,9 @@ const (
 	TagsTableName = "dolt_tags"
 
 	IgnoreTableName = "dolt_ignore"
+
+	// RebaseTableName is the rebase system table name.
+	RebaseTableName = "dolt_rebase"
 )
 
 const (