Skip to content
go-libfossil Check-in [c4b191ed05]
Login

Check-in [c4b191ed05]

Overview
Comment:Merge branch 'wip/hz-close-sync' into feat/horizon-cones

An origin answering a horizon request never sends a cluster, even one a gimme names; an origin may name a history URL in horizon-served (horizon-history-url), which the client reports; and a merge with no peer to ask refuses whenever either side's ancestry crosses the horizon. Conflicts in the changelog and the CLI horizon tests kept both sides.

Timelines: family | ancestors | trunk | feat/horizon-cones
Files: files | file ages | folders
SHA3-256: c4b191ed05c0e8ef78a7f690bf4df47747700947131de557a0d2fdaf95950089
User & Date: [email protected] on 2026-10-23 03:28:00.000
Other Links: branch diff | manifest | tags
Context
2026-10-23
03:28
Merge branch 'wip/hz-close-sync' into feat/horizon-cones

An origin answering a horizon request never sends a cluster, even one a gimme names; an origin may name a history URL in horizon-served (horizon-history-url), which the client reports; and a merge with no peer to ask refuses whenever either side's ancestry crosses the horizon. Conflicts in the changelog and the CLI horizon tests kept both sides. leaf check-in: c4b191ed05 user: [email protected] tags: feat/horizon-cones, trunk

03:03
fix(merge): refuse a merge whose ancestry crosses the horizon without a peer

draft-fossil-horizon-00 §5.5 has a structural clone ask the origin for the base whenever either side's ancestry crosses the horizon, even when its own walk finds a common ancestor: over part of the graph that ancestor need not be the nearest. Without a peer Checkout.Merge and Repo.Merge refused only when the walk itself crossed, and merged over a held base whose sides' ancestry crossed below it.

Both now refuse such a merge with an error matching ErrBelowHorizon that names the horizon and points to Checkout.MergeContext with a Peer; MergeContext refuses the same way when the origin does not answer. A merge whose ancestry stays above the horizon, or one given its base, still merges locally. The CLI's merge already falls back to asking the remote on ErrBelowHorizon, so it now asks in these cases too. check-in: 263de5a736 user: [email protected] tags: feat/horizon-cones, trunk

03:02
Merge branch 'wip/repin-5d61' into feat/horizon-cones

The horizon draft pinned at zit horizon-rfc 5d618aaeb1: an origin with no tag in force mints no seed and serves the content level, and choosing C is shown with each rule's cost (repo cone cost, Repo.HorizonCost). check-in: 77e74bd011 user: [email protected] tags: feat/horizon-cones, trunk

Changes
Unified Diff Side-by-Side Diff Patch
Modified CHANGELOG.md from [f30a634303] to [25f53baa3b]. [diff]
Modified checkout.go from [b26f2ee9d0] to [3b467d452b]. [diff]
Modified cli/repo_clone.go from [ebfbdc872c] to [c58b2188c9]. [diff]
Modified cli/repo_cone.go from [ba8eebb201] to [ba1fd3cc6b]. [diff]
Modified cli/repo_cone_horizon_test.go from [237adae379] to [a5320d5ced]. [diff]
Added conformance/horizon_cluster_zit_test.go version [bcca6fbb83].
Modified conformance/horizon_deepen_test.go from [ca13b00617] to [0e1c0dd272]. [diff]
Added conformance/horizon_history_zit_test.go version [4892652166].
Modified conformance/horizon_serve_test.go from [fa03dbd121] to [778f79d7e1]. [diff]
Modified conformance/requirements/horizon.tsv from [45030045f8] to [cd9c08c83b]. [diff]
Modified docs/site/content/docs/sparse-and-horizons.md from [1d6603f41c] to [9469b91aa3]. [diff]
Modified fossil.go from [1a79e7a88f] to [8a8c6ba675]. [diff]
Modified horizon_test.go from [7ed4b2b23f] to [0465f31580]. [diff]
Modified internal/checkout/merge.go from [c88ba626ce] to [e97d21a2c1]. [diff]
Modified internal/content/horizon_crossing.go from [64ed78e5fc] to [b12a960721]. [diff]
Added internal/repo/history_url_test.go version [790213debe].
Modified internal/repo/repo.go from [99a187563e] to [f6d4824a69]. [diff]
Modified internal/repo/setting.go from [3858ed8a65] to [62e386f766]. [diff]
Modified internal/sync/client.go from [d0944c0068] to [6811272700]. [diff]
Modified internal/sync/clone.go from [9c5220fc81] to [9fce064f75]. [diff]
Modified internal/sync/handler.go from [718fc45da9] to [72d5b36654]. [diff]
Added internal/sync/horizon_history_test.go version [860deb1e76].
Modified internal/sync/horizon_structural.go from [6c4264ccdd] to [6dac458b14]. [diff]
Modified internal/sync/session.go from [3108b1f96f] to [75d8412489]. [diff]
Modified internal/sync/sparse.go from [685695a7ab] to [18da8e1276]. [diff]
Modified internal/sync/stubs.go from [9fe4cc385e] to [f42137460a]. [diff]
Modified repo_merge.go from [1c63d03ced] to [a70e5b6b62]. [diff]
Modified repo_sparse.go from [f33a72e988] to [f791415901]. [diff]
Modified repo_sync.go from [f8a010e0ba] to [d499b5e487]. [diff]
Modified required_content_merge.go from [d06a184e0f] to [8171b757e8]. [diff]