From 9a3a6bd3bab72ad212344d5ebda916ef555c8845 Mon Sep 17 00:00:00 2001 From: jochen Date: Sat, 14 Nov 2026 21:22:07 +0100 Subject: [PATCH] Forge bridge: say each member of a delivery group once: the seat named novox/mesh-sdk#189 twice in feat/47-G-join11, and every repository with a branch of that name was refused its take-in whole --- .../internal/groups/groups.go | 14 ++++++++++++-- .../internal/groups/read_test.go | 6 ++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/modules/mesh-delivery-forge-bridge/internal/groups/groups.go b/modules/mesh-delivery-forge-bridge/internal/groups/groups.go index b28bd5d8..f3f76197 100644 --- a/modules/mesh-delivery-forge-bridge/internal/groups/groups.go +++ b/modules/mesh-delivery-forge-bridge/internal/groups/groups.go @@ -230,11 +230,21 @@ func Rows(of []seat.Group, published, ended map[string]string, asks map[string][ func sortRows(rows []Row) { sort.Slice(rows, func(i, j int) bool { return rows[i].Key < rows[j].Key }) } -// MembersOf are a group's members with their heads, in the group's order. +// MembersOf are a group's members with their heads, in the group's order, each pull request once: a group the seat +// answers with a member twice (feat/47-G-join11 named novox/mesh-sdk#189 twice, 2026-11-14) keeps the later head at the +// first place, since a merged message naming a member twice is refused whole and no merge of that branch is taken in. func MembersOf(g seat.Group) []meshdeliveryclient.Head { out := make([]meshdeliveryclient.Head, 0, len(g.Members)) + at := map[string]int{} for _, m := range g.Members { - out = append(out, meshdeliveryclient.Head{Repository: m.Repository, Number: int(m.Number), Head: m.Head}) + h := meshdeliveryclient.Head{Repository: m.Repository, Number: int(m.Number), Head: m.Head} + k := fmt.Sprintf("%s#%d", m.Repository, m.Number) + if i, twice := at[k]; twice { + out[i] = h + continue + } + at[k] = len(out) + out = append(out, h) } return out } diff --git a/modules/mesh-delivery-forge-bridge/internal/groups/read_test.go b/modules/mesh-delivery-forge-bridge/internal/groups/read_test.go index df7b5d5f..672f4aee 100644 --- a/modules/mesh-delivery-forge-bridge/internal/groups/read_test.go +++ b/modules/mesh-delivery-forge-bridge/internal/groups/read_test.go @@ -40,4 +40,10 @@ func TestReadsNeverAskTheEndedGroupsWhole(t *testing.T) { if _, err := ReadAll(context.Background(), seatOf); err == nil { t.Errorf("ReadAll: want the seat's refusal to be an error, never read as no group") } + // A member the seat names twice is said once, at its later head (2026-11-14: the take-in of every repository with a + // branch of that group was refused whole). + twice := seat.Group{ID: "feat/twice", Members: []seat.Member{{Repository: "o/a", Number: 1, Head: "old"}, {Repository: "o/b", Number: 2, Head: "b"}, {Repository: "o/a", Number: 1, Head: "new"}}} + if got := MembersOf(twice); len(got) != 2 || got[0].Repository != "o/a" || got[0].Head != "new" || got[1].Repository != "o/b" { + t.Errorf("MembersOf a group naming o/a#1 twice = %+v, want o/a#1 at new, then o/b#2", got) + } }