* fix(dolt): pre-pull commit must include config; auto-resolve convergent kv.memory.* config conflicts
bd remember stores persistent memories as kv.memory.* rows in the synced
config table. Commit() deliberately excludes config (GH#2455, to avoid
sweeping a concurrent writer's stale issue_prefix into an unrelated commit),
so the GH#2474 pre-pull auto-commit at pullFromRemote (store.go) and PullFrom
(federation.go) leaves config permanently dirty once any memory exists. The
"clean the working set before merging" step then leaves config dirty and
DOLT_MERGE refuses to start ("cannot merge with uncommitted changes"). Two
correct PRs colliding over config. Diagnosed from a live server-mode repro
(Wyvern wy-71t); see PROPOSAL-pull-config-wedge.md.
Fix (server mode): add commitBeforePull, which stages config explicitly via
DOLT_ADD rather than relying on CommitWithConfig's DOLT_COMMIT('-Am'). The
proposal author observed -Am not staging config reliably under the server-mode
stored-procedure path, and the new embedded test TestEmbeddedConfigCommitStagesConfig
confirms -Am DOES stage config in the embedded engine — so the unreliability is
server-mode-specific and explicit staging is the robust choice. Commit() and
commitBeforePull now share commitWorkingSet(includeConfig bool).
Hardening (both modes): making config a committed/synced table means two clones
editing the same memory key collide on a config merge conflict. Extend
TryAutoResolveMergeConflicts to auto-resolve config conflicts with --theirs ONLY
when every conflicted row is a kv.memory.* key (machine-convergent, same policy
as metadata); any other config key (issue_prefix above all) is left for the
operator. Without this the primary fix would trade a silent pull wedge for an
operator-visible conflict wedge on the exact bd remember workload.
Embedded pre-pull (CommitPending -> -Am) already stages config and is unchanged;
it gains the resolver hardening.
Tests: server-mode pull_config_wedge_test.go (commit-includes-config + resolver
positive/negative, run under Docker in CI) and embedded pull_config_wedge_test.go
(in-process: -Am-stages-config probe + resolver positive/negative, all green).
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* docs: add pull-config-wedge diagnosis/proposal (PR #4412)
The diagnosis-and-patch write-up behind this PR: how GH#2455 (Commit excludes
config) and GH#2474 (pre-pull auto-commit) collide over the synced config table,
leaving kv.memory.* rows permanently uncommitted so DOLT_MERGE refuses to start.
Includes the live-DB validation (Wyvern wy-71t) and the rejected alternatives.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
* fix(dolt): adopt-pr maintainer fixes for pull/sync config wedge
Maintainer review fixups for PR #4412, squashed into one commit on top of
the contributor's branch.
Pre-merge config wedge (sync): bd federation sync committed with the
config-excluding Commit before its merge while this PR switched the pull
paths to commitBeforePull, so any DB that ran `bd remember` carried dirty
kv.memory.* config rows and hit the "cannot merge with uncommitted changes"
wedge. Sync now uses commitBeforePull too, with a regression test.
Pre-pull auto-commit safety (GH#2455): commitBeforePull no longer stages the
whole config table. It auto-commits only convergent memory rows
(kv.memory.*); if any other config key is dirty (issue_prefix above all) it
refuses with operator guidance instead of sweeping a stale value into the
merge basis, restoring the GH#2455 protection the broad pre-pull staging had
reopened.
Sync --strategy config commit: a config-only conflict resolution committed
through the config-excluding Commit, so it could report success without
creating the merge-resolution commit and re-wedge the next sync. Sync now
commits resolutions through a config-inclusive path (commitMergeResolution).
Embedded sync parity: EmbeddedDoltStore.Sync fetched and merged without the
pre-merge CommitPending guard already used by embedded Pull/PullRemote/PullFrom
and the new server Sync, so the same dirty kv.memory.* working set could still
wedge `bd federation sync` in embedded mode. Sync now commits pending changes
before fetch/merge (embedded Commit is DOLT_COMMIT('-Am'), which stages
config), with an embedded regression test that drives Sync with a dirty
kv.memory.* row.
KV/memory namespace collision: `bd kv set memory.*` stored to kv.memory.*,
indistinguishable from a `bd remember` memory the merge resolver auto-resolves
with --theirs. validateKVKey now reserves the memory. prefix so a generic KV
value can't be silently overridden by the remote on pull.
Shared prefix + tests: centralize the kv.memory. prefix in
internal/storage/kvkeys (used by cmd/bd and the merge resolver) with a
contract test; route the remaining cmd/bd kv. prefix literals (the doctor KV
check, the validateKVKey nested-prefix guard, and the memory listing) through
the kvkeys constants; and strengthen the server-mode non-memory config
conflict test to prove a conflict materialized before the resolver declines it.
Maintainer review fixup for PR #4412.
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
---------
Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Co-authored-by: Eddie the Engineer <ci@beads.test>
236 lines
7 KiB
Go
236 lines
7 KiB
Go
package main
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/spf13/cobra"
|
|
"github.com/steveyegge/beads/internal/ui"
|
|
)
|
|
|
|
var vcCmd = &cobra.Command{
|
|
Use: "vc",
|
|
GroupID: "sync",
|
|
Short: "Version control operations",
|
|
Long: `Version control operations for the beads database.
|
|
|
|
These commands provide git-like version control for your issue data, including branching, merging, and
|
|
viewing history.
|
|
|
|
Note: 'bd history', 'bd diff', and 'bd branch' also work for quick access.
|
|
This subcommand provides additional operations like merge and commit.`,
|
|
}
|
|
|
|
var vcMergeStrategy string
|
|
|
|
var vcMergeCmd = &cobra.Command{
|
|
Use: "merge <branch>",
|
|
Short: "Merge a branch into the current branch",
|
|
Long: `Merge the specified branch into the current branch.
|
|
|
|
If there are merge conflicts, they will be reported. You can resolve
|
|
conflicts with --strategy.
|
|
|
|
Examples:
|
|
bd vc merge feature-xyz # Merge feature-xyz into current branch
|
|
bd vc merge feature-xyz --strategy ours # Merge, preferring our changes on conflict
|
|
bd vc merge feature-xyz --strategy theirs # Merge, preferring their changes on conflict`,
|
|
Args: cobra.ExactArgs(1),
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
ctx := rootCtx
|
|
branchName := args[0]
|
|
|
|
// Pre-merge HEAD scopes the post-resolution is_blocked recompute
|
|
// (bd-578h9.11); empty degrades to a full-graph pass.
|
|
preHead, _ := store.GetCurrentCommit(ctx)
|
|
|
|
// Perform merge
|
|
conflicts, err := store.Merge(ctx, branchName)
|
|
if err != nil {
|
|
FatalErrorRespectJSON("failed to merge branch: %v", err)
|
|
}
|
|
|
|
// Handle conflicts
|
|
if len(conflicts) > 0 {
|
|
if vcMergeStrategy != "" {
|
|
// Auto-resolve conflicts with specified strategy
|
|
for _, conflict := range conflicts {
|
|
table := conflict.Field // Field contains table name from GetConflicts
|
|
if table == "" {
|
|
table = "issues" // Default to issues table
|
|
}
|
|
if err := store.ResolveConflicts(ctx, table, vcMergeStrategy); err != nil {
|
|
FatalErrorRespectJSON("failed to resolve conflicts: %v", err)
|
|
}
|
|
}
|
|
// Conclude the merge: an unresolved-then-resolved working set
|
|
// stays uncommitted otherwise, and the merged-in writes
|
|
// bypassed every is_blocked hook (bd-578h9.11). Use
|
|
// CommitMergeResolution, not Commit: server-mode Commit excludes
|
|
// config (GH#2455), so a resolved config conflict — routine now
|
|
// that kv.* user data syncs through config — would be silently
|
|
// dropped, leaving the merge unconcluded and re-wedging the next
|
|
// pull/sync (GH#2474).
|
|
if err := store.CommitMergeResolution(ctx, fmt.Sprintf("Resolve merge conflicts from %s using %s strategy", branchName, vcMergeStrategy)); err != nil {
|
|
FatalErrorRespectJSON("conflicts resolved but commit failed: %v", err)
|
|
}
|
|
if rs, ok := store.(interface {
|
|
RecomputeBlockedAfterMerge(ctx context.Context, fromCommit string) error
|
|
}); ok {
|
|
if err := rs.RecomputeBlockedAfterMerge(ctx, preHead); err != nil {
|
|
FatalErrorRespectJSON("conflicts resolved but is_blocked recompute failed: %v", err)
|
|
}
|
|
}
|
|
if jsonOutput {
|
|
outputJSON(map[string]interface{}{
|
|
"merged": branchName,
|
|
"conflicts": len(conflicts),
|
|
"resolved_with": vcMergeStrategy,
|
|
})
|
|
return
|
|
}
|
|
fmt.Printf("Merged %s with %d conflicts resolved using '%s' strategy\n",
|
|
ui.RenderAccent(branchName), len(conflicts), vcMergeStrategy)
|
|
return
|
|
}
|
|
|
|
// Report conflicts without auto-resolution
|
|
if jsonOutput {
|
|
outputJSON(map[string]interface{}{
|
|
"merged": branchName,
|
|
"conflicts": conflicts,
|
|
})
|
|
return
|
|
}
|
|
|
|
fmt.Printf("\n%s Merge completed with conflicts:\n\n", ui.RenderAccent("!!"))
|
|
for _, conflict := range conflicts {
|
|
fmt.Printf(" - %s\n", conflict.Field)
|
|
}
|
|
fmt.Printf("\nResolve conflicts with: bd vc merge %s --strategy [ours|theirs]\n\n", branchName)
|
|
return
|
|
}
|
|
|
|
if jsonOutput {
|
|
outputJSON(map[string]interface{}{
|
|
"merged": branchName,
|
|
"conflicts": 0,
|
|
})
|
|
return
|
|
}
|
|
|
|
fmt.Printf("Successfully merged %s\n", ui.RenderAccent(branchName))
|
|
},
|
|
}
|
|
|
|
var vcCommitMessage string
|
|
var vcCommitStdin bool
|
|
|
|
var vcCommitCmd = &cobra.Command{
|
|
Use: "commit",
|
|
Short: "Create a commit with all staged changes",
|
|
Long: `Create a new Dolt commit with all current changes.
|
|
|
|
Examples:
|
|
bd vc commit -m "Added new feature issues"
|
|
bd vc commit --message "Fixed priority on several issues"
|
|
echo "Multi-line message" | bd vc commit --stdin`,
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
ctx := rootCtx
|
|
|
|
if vcCommitStdin {
|
|
if vcCommitMessage != "" {
|
|
FatalErrorRespectJSON("cannot specify both --stdin and -m/--message")
|
|
}
|
|
b, err := io.ReadAll(os.Stdin)
|
|
if err != nil {
|
|
FatalErrorRespectJSON("failed to read commit message from stdin: %v", err)
|
|
}
|
|
vcCommitMessage = strings.TrimRight(string(b), "\n")
|
|
}
|
|
|
|
if vcCommitMessage == "" {
|
|
FatalErrorRespectJSON("commit message is required (use -m, --message, or --stdin)")
|
|
}
|
|
|
|
// We are explicitly creating a Dolt commit; avoid redundant auto-commit in PersistentPostRun.
|
|
commandDidExplicitDoltCommit = true
|
|
if err := store.Commit(ctx, vcCommitMessage); err != nil {
|
|
if isDoltNothingToCommit(err) {
|
|
if jsonOutput {
|
|
outputJSON(map[string]interface{}{"committed": false, "message": "nothing to commit"})
|
|
} else {
|
|
fmt.Println("Nothing to commit")
|
|
}
|
|
return
|
|
}
|
|
FatalErrorRespectJSON("failed to commit: %v", err)
|
|
}
|
|
|
|
// Get the new commit hash
|
|
hash, err := store.GetCurrentCommit(ctx)
|
|
if err != nil {
|
|
hash = "(unknown)"
|
|
}
|
|
|
|
if jsonOutput {
|
|
outputJSON(map[string]interface{}{
|
|
"committed": true,
|
|
"hash": hash,
|
|
"message": vcCommitMessage,
|
|
})
|
|
return
|
|
}
|
|
|
|
fmt.Printf("Created commit %s\n", ui.RenderMuted(hash[:8]))
|
|
},
|
|
}
|
|
|
|
var vcStatusCmd = &cobra.Command{
|
|
Use: "status",
|
|
Short: "Show current branch and uncommitted changes",
|
|
Long: `Show the current branch, commit hash, and any uncommitted changes.
|
|
|
|
Examples:
|
|
bd vc status`,
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
ctx := rootCtx
|
|
|
|
currentBranch, err := store.CurrentBranch(ctx)
|
|
if err != nil {
|
|
FatalErrorRespectJSON("failed to get current branch: %v", err)
|
|
}
|
|
|
|
currentCommit, err := store.GetCurrentCommit(ctx)
|
|
if err != nil {
|
|
currentCommit = "(unknown)"
|
|
}
|
|
|
|
if jsonOutput {
|
|
outputJSON(map[string]interface{}{
|
|
"branch": currentBranch,
|
|
"commit": currentCommit,
|
|
})
|
|
return
|
|
}
|
|
|
|
fmt.Printf("\n%s Version Control Status\n\n", ui.RenderAccent("📊"))
|
|
fmt.Printf(" Branch: %s\n", ui.StatusInProgressStyle.Render(currentBranch))
|
|
fmt.Printf(" Commit: %s\n", ui.RenderMuted(currentCommit[:8]))
|
|
fmt.Println()
|
|
},
|
|
}
|
|
|
|
func init() {
|
|
vcMergeCmd.Flags().StringVar(&vcMergeStrategy, "strategy", "", "Conflict resolution strategy: 'ours' or 'theirs'")
|
|
vcCommitCmd.Flags().StringVarP(&vcCommitMessage, "message", "m", "", "Commit message")
|
|
vcCommitCmd.Flags().BoolVar(&vcCommitStdin, "stdin", false, "Read commit message from stdin")
|
|
|
|
vcCmd.AddCommand(vcMergeCmd)
|
|
vcCmd.AddCommand(vcCommitCmd)
|
|
vcCmd.AddCommand(vcStatusCmd)
|
|
rootCmd.AddCommand(vcCmd)
|
|
}
|