novox/mesh-controller
13
0
Fork 0
Code Issues Pull Requests 3 Releases Wiki Activity

Read an empty source ref as the trunk and say a merge into another branch starts no delivery (issue 977, part A, issue 889)

Browse Source
This commit is contained in:
jschoubben
2026-10-17 20:37:58 +02:00
parent d5d5449835
commit d977f64ec9
3 changed files with 81 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmd/mesh-controller/upgrades.go
+27 -7
View File
@@ -326,8 +326,7 @@ func movesOfMerge(ctx context.Context, inv *inventory.Inventory, m link.SourceMo
"from it\n", m.Owner, m.Repo, m.Base, m.Commit, already)
return nil, nil
}
fmt.Printf("%s/%s merged into %s (%.8s); nothing the mesh holds reads it\n",
m.Owner, m.Repo, m.Base, m.Commit)
fmt.Print(nothingReadsIt(m.Owner+"/"+m.Repo, m))
return nil, nil
}
// Said, never silent (novox/hq 04-ISSUES/215): a module built from this repository that follows
@@ -531,7 +530,7 @@ func whyMoved(e inventory.Entry, read []inventory.ReadRepository, m link.SourceM
return "read whole: " + whole
}
for _, r := range read {
if r.Own || !sameRepository(r.Repository, m) || (r.Ref != "" && r.Ref != m.Base) {
if r.Own || !sameRepository(r.Repository, m) || !followsBase(r.Ref, m.Base) {
continue
}
if len(r.Paths) > 0 {
@@ -615,6 +614,17 @@ func retireDeleted(ctx context.Context, inv *inventory.Inventory, e inventory.En
}
}
// nothingReadsIt is what is said of a merge no module the mesh holds reads. **A merge into a branch other than the
// trunk is said to start no delivery** (novox/hq ADR 0401 clause 3, issue 889): every delivery is cut from a
// repository's trunk, and whoever merged into a feature branch should not look for a broken trigger.
func nothingReadsIt(repository string, m link.SourceMoved) string {
if m.Base != "" && m.Base != "main" {
return fmt.Sprintf("%s merged into %s (%.8s), not the trunk of %s; a merge into any other branch starts no "+
"delivery\n", repository, m.Base, m.Commit, repository)
}
return fmt.Sprintf("%s merged into %s (%.8s); nothing the mesh holds reads it\n", repository, m.Base, m.Commit)
}
// sourceIs is whether a recorded source is the repository and branch a merge announced. A source on
// the git seat is recorded as its path on the forge; one elsewhere as the URL it was cloned from.
// An empty recorded ref is the repository's default branch, which is what a merge into the base
@@ -623,8 +633,18 @@ func sourceIs(s inventory.Source, m link.SourceMoved) bool {
if !sameRepository(s.Repository, m) {
return false
}
ref := followedBranch(s.Ref)
return ref == "" || ref == m.Base
return followsBase(s.Ref, m.Base)
}
// followsBase is whether a recorded ref follows the branch a merge went into. **An empty ref is the
// trunk, main, and nothing else** (novox/hq ADR 0401 clause 3, issue 889): it used to match a merge
// into any branch, so a merge into a feature branch started a delivery. A ref recorded as a branch
// keeps following that branch.
func followsBase(ref, base string) bool {
if ref = strings.TrimSpace(followedBranch(ref)); ref == "" {
ref = "main"
}
return ref == base
}
// commitRef is a ref that names a commit rather than a branch: what `build --ref <commit>` asks for.
@@ -663,7 +683,7 @@ func sameRepository(repository string, m link.SourceMoved) bool {
// read, as before.
func readsFrom(read []inventory.ReadRepository, m link.SourceMoved) bool {
for _, r := range read {
if r.Own || !sameRepository(r.Repository, m) || (r.Ref != "" && r.Ref != m.Base) {
if r.Own || !sameRepository(r.Repository, m) || !followsBase(r.Ref, m.Base) {
continue
}
if len(r.Paths) == 0 || len(m.Paths) == 0 || m.PathsTruncated {
@@ -757,7 +777,7 @@ func unchangedOfMerge(m link.SourceMoved, entries []inventory.Entry,
// branch, as a context beside its own.
func packagesSaid(read []inventory.ReadRepository, m link.SourceMoved) bool {
for _, r := range read {
if !r.Own && sameRepository(r.Repository, m) && (r.Ref == "" || r.Ref == m.Base) && len(r.Paths) > 0 {
if !r.Own && sameRepository(r.Repository, m) && followsBase(r.Ref, m.Base) && len(r.Paths) > 0 {
return true
}
}