* fix: preflight graph apply blocking cycles * fix: maintainer review fixes for adopted graph-apply cycle PR Keep dep/link dependency targets read-only: resolveIDForMutation is used only for the mutated source issue, while the depends-on/link target is resolved via read-only resolveIDWithRouting so resolving a routed target never opens a foreign project writable or runs open-time migrations into its history (bd-6dnrw.32, GH#3231). Make the embedded graph-apply blocking-cycle preflight mirror the storage SQL cycle check: its existing-edge walk is restricted to blocking dep types, so a blocking edge whose return path runs only through an existing parent-child or waits-for dep is no longer rejected when bd dep add allows it. The parent->child blocking-path validator keeps the broader AffectsReadyWork traversal. Port the blocking-cycle preflight to the domain/proxied-server graph-apply path and drop the now-redundant per-edge HasCycle probe so embedded and server modes agree. Remove the dead graphApplyPlanCanSkipSQLCycleChecks helpers left by the strategy change. Restore the bulk --no-cycle-check whole-graph rollback test and add routed read-only-target, parent-child parity, and domain external-ID cycle tests. --------- Co-authored-by: Eddie the Engineer <ci@beads.test>
113 lines
2.9 KiB
Go
113 lines
2.9 KiB
Go
package main
|
|
|
|
import (
|
|
"fmt"
|
|
"io"
|
|
"os"
|
|
"strings"
|
|
|
|
"github.com/spf13/cobra"
|
|
"github.com/steveyegge/beads/internal/ui"
|
|
)
|
|
|
|
var commentCmd = &cobra.Command{
|
|
Use: "comment <id> [text...]",
|
|
GroupID: "issues",
|
|
Short: "Add a comment to an issue",
|
|
Long: `Add a comment to an issue.
|
|
|
|
Shorthand for 'bd comments add <id> "text"'.
|
|
|
|
Examples:
|
|
bd comment bd-123 "Working on this now"
|
|
bd comment bd-123 Working on this now
|
|
echo "comment from pipe" | bd comment bd-123 --stdin
|
|
bd comment bd-123 --file notes.txt`,
|
|
Args: cobra.MinimumNArgs(1),
|
|
Run: func(cmd *cobra.Command, args []string) {
|
|
CheckReadonly("comment")
|
|
|
|
id := args[0]
|
|
textArgs := args[1:]
|
|
|
|
// Determine comment text from args, stdin, or file
|
|
stdinFlag, _ := cmd.Flags().GetBool("stdin")
|
|
fileFlag, _ := cmd.Flags().GetString("file")
|
|
|
|
var commentText string
|
|
switch {
|
|
case stdinFlag:
|
|
content, err := io.ReadAll(os.Stdin)
|
|
if err != nil {
|
|
FatalErrorRespectJSON("reading from stdin: %v", err)
|
|
}
|
|
commentText = strings.TrimRight(string(content), "\n")
|
|
case fileFlag != "":
|
|
content, err := readBodyFile(fileFlag)
|
|
if err != nil {
|
|
FatalErrorRespectJSON("reading file: %v", err)
|
|
}
|
|
commentText = content
|
|
case len(textArgs) > 0:
|
|
commentText = strings.Join(textArgs, " ")
|
|
default:
|
|
FatalErrorRespectJSON("no comment text provided (use positional args, --stdin, or --file)")
|
|
}
|
|
|
|
if strings.TrimSpace(commentText) == "" {
|
|
FatalErrorRespectJSON("comment text cannot be empty")
|
|
}
|
|
|
|
author := getActorWithGit()
|
|
|
|
ctx := rootCtx
|
|
|
|
result, err := resolveAndGetIssueForMutation(ctx, store, id)
|
|
if err != nil {
|
|
if result != nil {
|
|
result.Close()
|
|
}
|
|
FatalErrorRespectJSON("resolving %s: %v", id, err)
|
|
}
|
|
if result == nil || result.Issue == nil {
|
|
if result != nil {
|
|
result.Close()
|
|
}
|
|
FatalErrorRespectJSON("issue %s not found", id)
|
|
}
|
|
defer result.Close()
|
|
|
|
issueStore := result.Store
|
|
|
|
if err := validateIssueUpdatable(id, result.Issue); err != nil {
|
|
FatalErrorRespectJSON("%s", err)
|
|
}
|
|
|
|
comment, err := issueStore.AddIssueComment(ctx, result.ResolvedID, author, commentText)
|
|
if err != nil {
|
|
FatalErrorRespectJSON("adding comment: %v", err)
|
|
}
|
|
if err := commitPendingIfEmbedded(ctx, issueStore, actor, doltAutoCommitParams{
|
|
Command: "comment",
|
|
IssueIDs: []string{result.ResolvedID},
|
|
}); err != nil {
|
|
FatalErrorRespectJSON("failed to commit: %v", err)
|
|
}
|
|
|
|
SetLastTouchedID(result.ResolvedID)
|
|
|
|
if jsonOutput {
|
|
outputJSON(comment)
|
|
} else {
|
|
fmt.Printf("%s Comment added to %s\n", ui.RenderPass("✓"), formatFeedbackID(result.ResolvedID, result.Issue.Title))
|
|
}
|
|
},
|
|
}
|
|
|
|
func init() {
|
|
commentCmd.Flags().Bool("stdin", false, "Read comment text from stdin")
|
|
commentCmd.Flags().String("file", "", "Read comment text from file")
|
|
commentCmd.MarkFlagsMutuallyExclusive("stdin", "file")
|
|
commentCmd.ValidArgsFunction = issueIDCompletion
|
|
rootCmd.AddCommand(commentCmd)
|
|
}
|