* fix(issueops): enforce the dotted-child dependency rule on every leg The refusal of an explicit edge from a dotted-id child to its own ancestor (bd-abc.1 -> bd-abc; only the parent-child edge to the immediate dotted parent is allowed) lived only in cmd/bd (isDisallowedHierarchicalDependency). HTTP dependencies:add, batch:apply dep_add items and `bd create --graph`'s own edges skipped it. It is now one library rule, issueops.CheckDottedChildDependency, returning *issueops.DottedChildDependencyError (unwraps to ErrValidation, same message the CLI printed): - ValidateAddDependenciesRequest applies it, so DependencyEditor refuses on dolt, embedded, uow and the server behind httpapi (400 invalid_argument); - both BatchApplier bodies (issueops and uow) apply it to each dep_add item on the resolved ids, so a key bound to a minted dotted child is refused too; - the HTTP client checks it before the dial, as it does self-dependency, so the typed error survives the wire. cmd/bd keeps no copy: single-edge dep add / dep --blocks rely on the role; bd link (still on the store verb) and the --file bulk reporter call the library rule. CLI output is byte-identical (checked against origin/main). Conformance: RunDependencyEditorRefusesADottedChildGatedOnItsOwnParent and RunBatchApplyRefusesADottedChildGatedOnItsOwnParent wired on dolt, embedded, uow and http, plus a raw-wire served test past the client check and handler mapping cases. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * fix(batch): refuse a dotted child gated on its own ancestor in bd batch Review fixup for PR #7424 (iterations 1 and 2). Major: a bd batch script line `dep add bd-abc.1 bd-abc` still wrote the edge this PR refuses everywhere else, on both backends. Neither batch dispatch writes through the DependencyEditor role that enforces the dotted-child rule: the classic arm calls storage.Transaction.AddDependency and the proxied arm the unit of work's AddDependencies verb. Both arms now build the edge with one helper, batchDepAddEdge, which keeps the default type and the arity and type errors, and asks publicops.CheckDottedChildDependency the way bd link does. A refused line rolls the whole batch back. Tests: TestBatchDepAddEdge (default and explicit types, arity and type errors, three refusals typed *DottedChildDependencyError matching ErrValidation, and the immediate parent-child edge allowed), and TestProxiedServerBatchDepAddRefusesADottedChildGatedOnItsParent (classic and proxied: the refusal names line 2, rolls back an earlier update line and writes no edge, and `dep add C P parent-child` still lands exactly one), registered in the proxied shard manifest. A mutant that drops the rule from the shared helper fails both; one that bypasses the helper in the proxied arm alone fails the proxied leg. Minors: - For a child whose parent-child edge is already stored (a `bd create --parent` child) the rule answers ahead of the hierarchy and type conflicts, so an HTTP caller now gets 400 invalid_argument where it got 409 dependency_cycle (blocking types) or dependency_exists (any other type). Documented in the DependencyEditor role doc, the CHANGELOG entry and the httpapi batch-apply test comment, and pinned by a stored-hierarchy phase in the DependencyEditor and BatchApplier dotted-child conformance contracts on every leg; a mutant that drops the rule gets the hierarchy conflict instead (409 dependency_cycle on the wire). - The bd create --graph dry-run note now says the live create may also refuse an edge that gates a dotted-id child on its own ancestor. - The DottedChildDependencyError comment says the message is kept verbatim and says "deadlock" whatever the type. Not changed: bd relate (relates-to does not schedule) and the edges a create writes with its issue (bd create --deps/--waits-for, and over HTTP an explicit dotted id with a non-immediate ParentID) still write through paths that skip the rule. The scheduling shapes need an explicit dotted id or a grandparent target. Follow-up bd-25s1wh tracks moving the rule down to the domain/store add verbs, with a structural bypass for reparent and template edges. Iteration 2 (minor): the CheckDottedChildDependency doc no longer implies bd link and bd batch are the only writers outside the roles. It names bd relate and the create edges as not applying the rule yet and cites bd-25s1wh. Complexity (cyclomatic/cognitive): runBatchOp 23/35 -> 21/31, runBatchOpUOW 28/48 -> 26/44, batchDepAddEdge 5/4. Touching them brings both pre-existing dispatch switches into the measured set; splitting them is out of scope here. Agent-Signature: claude-code-claude-opus-5-5-max on behalf of Gas City Adopt-PR Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> * docs(issueops,httpapi): document the dotted-child 400 and widen its gap list Review fixup for PR #7424 (relaunch, iteration 1, minors). - The OpenAPI spec now describes the wire change this PR makes. The dependencies:add and issues:batchApply 400 vocabularies name an edge from a dotted-id child to its own ancestor (anything but the parent-child edge to its immediate parent; param `edges` and `items`). dependencies:add says why that is request-intrinsic, and both 409s say it is never dependency_cycle or dependency_exists, even for a child whose parent-child edge is stored. Response descriptions only: the generated types and the wireshape digest are unchanged (make api-check). - The CheckDottedChildDependency doc no longer reads as a complete list of the writers that skip the rule. Besides bd relate and the create edges it names bd duplicate, bd supersede, bd duplicates --auto-merge (its related link and its reparenting) and the tracker engine's createDependencies, and says the molecule, template and swarm writers are unaudited. bd-25s1wh's notes carry the widened scope, including `bd duplicate bd-a.1 --of bd-a`. Declined (nit): unifying the root issueops import alias across the PR's cmd/bd files. batch.go is the one file that imports both issueops packages, so one of them needs an alias there; it uses publicops, the repo's usual alias for the root package, and aliasing the other side instead would rewrite base-owned lines. Agent-Signature: claude-code-claude-opus-5-5-max on behalf of Gas City Adopt-PR Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
411 lines
16 KiB
Go
411 lines
16 KiB
Go
//go:build cgo
|
|
|
|
package main
|
|
|
|
import (
|
|
"encoding/json"
|
|
"fmt"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/steveyegge/beads/internal/types"
|
|
)
|
|
|
|
// batchParityOutcome is everything a `bd batch` caller can observe, recorded
|
|
// once per backend: exit codes, the summary and per-line report, and the state
|
|
// the batch left in the database. Ids never appear — the two workspaces mint
|
|
// their own — so rows are named by role and edges are counted.
|
|
type batchParityOutcome struct {
|
|
// --dry-run parses and echoes without executing.
|
|
dryCode int
|
|
dryEchoedLines int
|
|
dryTail string
|
|
dryTouchedA bool
|
|
|
|
// Empty input is a no-op success.
|
|
emptyCode int
|
|
emptyTail string
|
|
|
|
// The committed batch.
|
|
commitCode int
|
|
commitSummary string
|
|
commitOps []string
|
|
aStatus types.Status
|
|
aPriority int
|
|
bStatus types.Status
|
|
cDeps int
|
|
createdFound bool
|
|
|
|
// A failing line rolls the WHOLE batch back.
|
|
rollbackCode int
|
|
rollbackNamesLine bool
|
|
rollbackAPriority int
|
|
rollbackCReopened bool
|
|
|
|
// Grammar errors are refused before any write.
|
|
badGrammarCode int
|
|
badGrammarNamesLine bool
|
|
badGrammarBStatus types.Status
|
|
|
|
// dep remove closes the loop on the edge the batch added.
|
|
removeCode int
|
|
cDepsAfter int
|
|
}
|
|
|
|
// TestProxiedServerBatchParity is the cross-mode oracle for `bd batch` ported
|
|
// to proxied-server mode.
|
|
//
|
|
// `bd batch` exists because a shell loop of N `bd` invocations is N
|
|
// transactions and N Dolt commits; the command's whole value is that it is ONE
|
|
// of each, all-or-nothing. So the interesting assertions are not "the ops
|
|
// happened" but the transactional ones: a failing line at the END must undo the
|
|
// successful lines BEFORE it, and a grammar error must be refused before
|
|
// anything is written at all. Both are checked here on both backends, along
|
|
// with the dry-run, empty-input and per-line report contracts that scripts
|
|
// parse.
|
|
//
|
|
// TWO KNOWN DIVERGENCES are deliberately outside this oracle, both named at
|
|
// their site (see the rollback step below and batch_proxied_server.go's dep
|
|
// cases): an out-of-range `priority=` is written by the classic batch and
|
|
// refused by the proxied one, and a batched `dep add`/`dep remove` records a
|
|
// dependency history event here and not there. Neither changes the rows the
|
|
// batch lands, and both are classic-batch inconsistencies with the CLI verbs
|
|
// rather than something the port introduced.
|
|
func TestProxiedServerBatchParity(t *testing.T) {
|
|
requireSharedProxiedServer(t)
|
|
t.Parallel()
|
|
bd := buildEmbeddedBD(t)
|
|
|
|
envs := newCrossModeEnvs(t, bd, "bpc", "bpp")
|
|
outcomes := make(map[string]batchParityOutcome, len(envs))
|
|
|
|
for _, env := range envs {
|
|
var got batchParityOutcome
|
|
|
|
a := env.create(t, "Batch A")
|
|
b := env.create(t, "Batch B")
|
|
c := env.create(t, "Batch C")
|
|
|
|
// Comments and blank lines are ignored; the four real lines cover every
|
|
// verb in the grammar except dep remove (exercised at the end).
|
|
script := fmt.Sprintf(""+
|
|
"# a comment line\n"+
|
|
"\n"+
|
|
"update %s status=in_progress priority=1\n"+
|
|
"close %s done via batch\n"+
|
|
"dep add %s %s blocks\n"+
|
|
"create task 2 \"Batch created issue\"\n", a, b, c, a)
|
|
|
|
// 1. --dry-run: parse and echo, execute nothing.
|
|
stdout, _, code := env.runStdin(t, script, "batch", "--dry-run")
|
|
got.dryCode = code
|
|
got.dryEchoedLines = strings.Count(stdout, "line ")
|
|
got.dryTail = lastNonEmptyLine(stdout)
|
|
got.dryTouchedA = env.show(t, a).Status != types.StatusOpen
|
|
|
|
// 2. Empty input is a no-op success, matching `bd list ... | bd batch`
|
|
// on an empty list.
|
|
stdout, _, code = env.runStdin(t, "", "batch")
|
|
got.emptyCode = code
|
|
got.emptyTail = lastNonEmptyLine(stdout)
|
|
|
|
// 3. The real batch.
|
|
stdout, stderr, code := env.runStdin(t, script, "batch")
|
|
got.commitCode = code
|
|
if code != 0 {
|
|
t.Fatalf("[%s] batch failed with exit %d\nstdout:\n%s\nstderr:\n%s", env.mode, code, stdout, stderr)
|
|
}
|
|
got.commitSummary = firstLineWithPrefix(stdout, "batch: ")
|
|
got.commitOps = batchReportOps(stdout)
|
|
|
|
rowA := env.show(t, a)
|
|
got.aStatus, got.aPriority = rowA.Status, rowA.Priority
|
|
got.bStatus = env.show(t, b).Status
|
|
got.cDeps = len(env.depList(t, c))
|
|
got.createdFound = env.hasIssueTitled(t, "Batch created issue")
|
|
|
|
// 4. A failing line rolls back the successful lines before it. The
|
|
// first line here would otherwise be a visible write (priority 3 on A,
|
|
// which the batch above set to 1) and the second reopens C; both must
|
|
// be gone after the third line fails on a non-existent id.
|
|
//
|
|
// KNOWN PRE-EXISTING DIVERGENCE, deliberately not exercised here: an
|
|
// OUT-OF-RANGE priority (`priority=5`) is written by the classic batch
|
|
// and refused by the proxied one, because the domain update funnel
|
|
// validates the range and issueops' transaction path does not. `bd
|
|
// update --priority 5` rejects it on both paths — only the batch
|
|
// grammar reaches the unvalidated seam — so this is a hole in classic
|
|
// batch rather than something the port introduced. Closing it is its
|
|
// own change; using an in-range value here keeps this case about
|
|
// rollback.
|
|
badID := "zz-nope-999"
|
|
rollback := fmt.Sprintf(""+
|
|
"update %s priority=3\n"+
|
|
"update %s status=in_progress\n"+
|
|
"close %s\n", a, c, badID)
|
|
stdout, stderr, code = env.runStdin(t, rollback, "batch")
|
|
got.rollbackCode = code
|
|
got.rollbackNamesLine = strings.Contains(stdout+stderr, "line 3")
|
|
got.rollbackAPriority = env.show(t, a).Priority
|
|
got.rollbackCReopened = env.show(t, c).Status != types.StatusOpen
|
|
|
|
// 5. A grammar error is refused by the shared parser BEFORE either
|
|
// backend is reached, so nothing is written even though line 1 is valid.
|
|
bad := fmt.Sprintf("close %s\nfrobnicate %s\n", b, b)
|
|
stdout, stderr, code = env.runStdin(t, bad, "batch")
|
|
got.badGrammarCode = code
|
|
got.badGrammarNamesLine = strings.Contains(stdout+stderr, "line 2")
|
|
got.badGrammarBStatus = env.show(t, b).Status
|
|
|
|
// 6. dep remove takes the edge back out.
|
|
stdout, stderr, code = env.runStdin(t, fmt.Sprintf("dep remove %s %s\n", c, a), "batch")
|
|
got.removeCode = code
|
|
if code != 0 {
|
|
t.Fatalf("[%s] batch dep remove failed with exit %d\nstdout:\n%s\nstderr:\n%s", env.mode, code, stdout, stderr)
|
|
}
|
|
got.cDepsAfter = len(env.depList(t, c))
|
|
|
|
outcomes[env.mode] = got
|
|
|
|
// Per-mode absolute expectations: parity with a shared bug is still a bug.
|
|
if got.dryCode != 0 || got.dryEchoedLines != 4 {
|
|
t.Errorf("[%s] dry-run: exit=%d echoed=%d, want 0/4", env.mode, got.dryCode, got.dryEchoedLines)
|
|
}
|
|
if got.dryTouchedA {
|
|
t.Errorf("[%s] dry-run executed the batch", env.mode)
|
|
}
|
|
if got.emptyCode != 0 || !strings.Contains(got.emptyTail, "0 operations") {
|
|
t.Errorf("[%s] empty input: exit=%d tail=%q, want 0 / a 0-operations no-op", env.mode, got.emptyCode, got.emptyTail)
|
|
}
|
|
if !strings.Contains(got.commitSummary, "4 operations committed") {
|
|
t.Errorf("[%s] commit summary = %q, want a 4-operations commit", env.mode, got.commitSummary)
|
|
}
|
|
if want := "update,close,dep.add,create"; strings.Join(got.commitOps, ",") != want {
|
|
t.Errorf("[%s] per-line report ops = %v, want %s", env.mode, got.commitOps, want)
|
|
}
|
|
if got.aStatus != types.StatusInProgress || got.aPriority != 1 {
|
|
t.Errorf("[%s] batch update: status=%q priority=%d, want in_progress/1", env.mode, got.aStatus, got.aPriority)
|
|
}
|
|
if got.bStatus != types.StatusClosed {
|
|
t.Errorf("[%s] batch close: status=%q, want closed", env.mode, got.bStatus)
|
|
}
|
|
if got.cDeps != 1 {
|
|
t.Errorf("[%s] batch dep add: %d edges on C, want 1", env.mode, got.cDeps)
|
|
}
|
|
if !got.createdFound {
|
|
t.Errorf("[%s] batch create: the created issue is missing", env.mode)
|
|
}
|
|
if got.rollbackCode == 0 {
|
|
t.Errorf("[%s] a failing batch line must exit non-zero", env.mode)
|
|
}
|
|
if got.rollbackAPriority != 1 {
|
|
t.Errorf("[%s] rollback did not undo the earlier line: priority=%d, want 1", env.mode, got.rollbackAPriority)
|
|
}
|
|
if got.rollbackCReopened {
|
|
t.Errorf("[%s] rollback did not undo the status line on C", env.mode)
|
|
}
|
|
if got.badGrammarCode == 0 || !got.badGrammarNamesLine {
|
|
t.Errorf("[%s] grammar error: exit=%d namesLine=%v, want non-zero and 'line 2'",
|
|
env.mode, got.badGrammarCode, got.badGrammarNamesLine)
|
|
}
|
|
if got.badGrammarBStatus != types.StatusClosed {
|
|
// B was already closed by the committed batch; a re-close from a
|
|
// script that never ran must not have changed anything either way.
|
|
t.Errorf("[%s] grammar error wrote something: B status=%q", env.mode, got.badGrammarBStatus)
|
|
}
|
|
if got.cDepsAfter != 0 {
|
|
t.Errorf("[%s] batch dep remove: %d edges left on C, want 0", env.mode, got.cDepsAfter)
|
|
}
|
|
}
|
|
|
|
assertBatchParity(t, outcomes["classic"], outcomes["proxied"])
|
|
}
|
|
|
|
func assertBatchParity(t *testing.T, classic, proxied batchParityOutcome) {
|
|
t.Helper()
|
|
type field struct {
|
|
name string
|
|
classic, proxied any
|
|
}
|
|
fields := []field{
|
|
{"dry-run exit code", classic.dryCode, proxied.dryCode},
|
|
{"dry-run echoed lines", classic.dryEchoedLines, proxied.dryEchoedLines},
|
|
{"dry-run tail", classic.dryTail, proxied.dryTail},
|
|
{"dry-run executed anything", classic.dryTouchedA, proxied.dryTouchedA},
|
|
{"empty-input exit code", classic.emptyCode, proxied.emptyCode},
|
|
{"empty-input tail", classic.emptyTail, proxied.emptyTail},
|
|
{"commit exit code", classic.commitCode, proxied.commitCode},
|
|
{"commit summary", classic.commitSummary, proxied.commitSummary},
|
|
{"commit per-line ops", strings.Join(classic.commitOps, ","), strings.Join(proxied.commitOps, ",")},
|
|
{"A status", classic.aStatus, proxied.aStatus},
|
|
{"A priority", classic.aPriority, proxied.aPriority},
|
|
{"B status", classic.bStatus, proxied.bStatus},
|
|
{"C dependency count", classic.cDeps, proxied.cDeps},
|
|
{"created issue present", classic.createdFound, proxied.createdFound},
|
|
{"rollback exit code", classic.rollbackCode, proxied.rollbackCode},
|
|
{"rollback names failing line", classic.rollbackNamesLine, proxied.rollbackNamesLine},
|
|
{"A priority after rollback", classic.rollbackAPriority, proxied.rollbackAPriority},
|
|
{"C reopened after rollback", classic.rollbackCReopened, proxied.rollbackCReopened},
|
|
{"grammar-error exit code", classic.badGrammarCode, proxied.badGrammarCode},
|
|
{"grammar-error names line", classic.badGrammarNamesLine, proxied.badGrammarNamesLine},
|
|
{"B status after grammar error", classic.badGrammarBStatus, proxied.badGrammarBStatus},
|
|
{"dep-remove exit code", classic.removeCode, proxied.removeCode},
|
|
{"C dependency count after remove", classic.cDepsAfter, proxied.cDepsAfter},
|
|
}
|
|
for _, f := range fields {
|
|
if f.classic != f.proxied {
|
|
t.Errorf("cross-mode divergence on %s: classic=%v proxied=%v", f.name, f.classic, f.proxied)
|
|
}
|
|
}
|
|
}
|
|
|
|
// TestProxiedServerBatchDepAddRefusesADottedChildGatedOnItsParent pins the
|
|
// dotted-id hierarchy rule on a batched `dep add`. Neither backend writes that
|
|
// edge through the DependencyEditor role that enforces the rule, so batch asks
|
|
// the rule itself (batchDepAddEdge). Both backends must refuse bd-abc.1 ->
|
|
// bd-abc with the sentence `bd dep add` prints, name the line, and roll the
|
|
// whole batch back, while the one edge the rule allows — parent-child to the
|
|
// immediate parent — still lands.
|
|
func TestProxiedServerBatchDepAddRefusesADottedChildGatedOnItsParent(t *testing.T) {
|
|
requireSharedProxiedServer(t)
|
|
t.Parallel()
|
|
bd := buildEmbeddedBD(t)
|
|
|
|
type outcome struct {
|
|
refusedCode int
|
|
refusalReported bool
|
|
rolledBack bool
|
|
edgesAfterRefusal int
|
|
allowedCode int
|
|
edgesAfterAllowed int
|
|
}
|
|
outcomes := make(map[string]outcome, 2)
|
|
|
|
for _, env := range newCrossModeEnvs(t, bd, "bdc", "bdp") {
|
|
var got outcome
|
|
|
|
parent := env.create(t, "Dotted parent")
|
|
// An explicit dotted id stores no parent-child edge (only --parent
|
|
// does), so every edge counted below is one a batch wrote.
|
|
child := env.create(t, "Dotted child", "--id", parent+".1", "--priority", "2")
|
|
|
|
// Line 1 is a valid write the refusal on line 2 must take back with it.
|
|
script := fmt.Sprintf("update %s priority=1\ndep add %s %s\n", child, child, parent)
|
|
stdout, stderr, code := env.runStdin(t, script, "batch")
|
|
// The failing line is named the way any failing line is, around the
|
|
// sentence `bd dep add` prints for the same edge.
|
|
refusal := fmt.Sprintf("line 2 (dep add %s %s): cannot add dependency: %s is already a child of %s.",
|
|
child, parent, child, parent)
|
|
got.refusedCode = code
|
|
got.refusalReported = strings.Contains(stdout+stderr, refusal)
|
|
got.rolledBack = env.show(t, child).Priority == 2
|
|
got.edgesAfterRefusal = len(env.depList(t, child))
|
|
if got.refusedCode == 0 || !got.refusalReported {
|
|
t.Errorf("[%s] batch exit=%d, want non-zero and %q\nstdout:\n%s\nstderr:\n%s",
|
|
env.mode, code, refusal, stdout, stderr)
|
|
}
|
|
|
|
stdout, stderr, code = env.runStdin(t, fmt.Sprintf("dep add %s %s parent-child\n", child, parent), "batch")
|
|
got.allowedCode = code
|
|
if code != 0 {
|
|
t.Fatalf("[%s] batch parent-child dep add failed with exit %d\nstdout:\n%s\nstderr:\n%s", env.mode, code, stdout, stderr)
|
|
}
|
|
got.edgesAfterAllowed = len(env.depList(t, child))
|
|
|
|
outcomes[env.mode] = got
|
|
|
|
if !got.rolledBack {
|
|
t.Errorf("[%s] the refused line did not roll back line 1's priority write", env.mode)
|
|
}
|
|
if got.edgesAfterRefusal != 0 {
|
|
t.Errorf("[%s] the refused batch left %d edges on the child, want 0", env.mode, got.edgesAfterRefusal)
|
|
}
|
|
if got.edgesAfterAllowed != 1 {
|
|
t.Errorf("[%s] batch parent-child dep add: %d edges on the child, want 1", env.mode, got.edgesAfterAllowed)
|
|
}
|
|
}
|
|
|
|
if outcomes["classic"] != outcomes["proxied"] {
|
|
t.Errorf("cross-mode divergence:\nclassic=%+v\nproxied=%+v", outcomes["classic"], outcomes["proxied"])
|
|
}
|
|
}
|
|
|
|
// depList reads the dependency records of one issue as a flat array, the shape
|
|
// `bd dep list --json` documents.
|
|
func (e crossModeEnv) depList(t *testing.T, id string) []map[string]any {
|
|
t.Helper()
|
|
out := e.mustRun(t, "dep", "list", id, "--json")
|
|
trimmed := strings.TrimSpace(out)
|
|
if trimmed == "" || trimmed == "null" {
|
|
return nil
|
|
}
|
|
start := strings.Index(out, "[")
|
|
if start < 0 {
|
|
t.Fatalf("[%s] no JSON array in dep list output:\n%s", e.mode, out)
|
|
}
|
|
var records []map[string]any
|
|
if err := json.Unmarshal([]byte(out[start:]), &records); err != nil {
|
|
t.Fatalf("[%s] parse dep list JSON: %v\n%s", e.mode, err, out[start:])
|
|
}
|
|
return records
|
|
}
|
|
|
|
// hasIssueTitled reports whether any issue in the workspace carries title.
|
|
func (e crossModeEnv) hasIssueTitled(t *testing.T, title string) bool {
|
|
t.Helper()
|
|
out := e.mustRun(t, "list", "--all", "--json")
|
|
start := strings.Index(out, "[")
|
|
if start < 0 {
|
|
return false
|
|
}
|
|
var rows []struct {
|
|
Title string `json:"title"`
|
|
}
|
|
if err := json.Unmarshal([]byte(out[start:]), &rows); err != nil {
|
|
t.Fatalf("[%s] parse list JSON: %v\n%s", e.mode, err, out[start:])
|
|
}
|
|
for _, row := range rows {
|
|
if row.Title == title {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
// batchReportOps pulls the op names out of the per-line report `bd batch`
|
|
// prints after a successful commit (" line 3: update bd-x").
|
|
func batchReportOps(stdout string) []string {
|
|
var ops []string
|
|
for _, line := range strings.Split(stdout, "\n") {
|
|
trimmed := strings.TrimSpace(line)
|
|
if !strings.HasPrefix(trimmed, "line ") {
|
|
continue
|
|
}
|
|
_, rest, ok := strings.Cut(trimmed, ": ")
|
|
if !ok {
|
|
continue
|
|
}
|
|
op, _, _ := strings.Cut(rest, " ")
|
|
ops = append(ops, op)
|
|
}
|
|
return ops
|
|
}
|
|
|
|
func firstLineWithPrefix(s, prefix string) string {
|
|
for _, line := range strings.Split(s, "\n") {
|
|
if strings.HasPrefix(strings.TrimSpace(line), prefix) {
|
|
return strings.TrimSpace(line)
|
|
}
|
|
}
|
|
return ""
|
|
}
|
|
|
|
func lastNonEmptyLine(s string) string {
|
|
lines := strings.Split(s, "\n")
|
|
for i := len(lines) - 1; i >= 0; i-- {
|
|
if trimmed := strings.TrimSpace(lines[i]); trimmed != "" {
|
|
return trimmed
|
|
}
|
|
}
|
|
return ""
|
|
}
|