Optional tree provider for family merges, cross-checked against git - #31
Merged
Merged
Conversation
|
You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Adds an optional tree provider for the family merges:
[merge] tree_commandnames an alternative merge engine, andtree_timeout_seconds(default 120) bounds each call.For every merge step the train already builds (each head folded in order onto the base or the fold so far, both while planning a family for its gate and while preparing each branch for its merge), the command runs in the clone with
SVRF_MERGE_OURS,SVRF_MERGE_THEIRS,SVRF_MERGE_BASESandSVRF_CLONE, and prints a tree id. Git's own merge tree is always computed as before. The step uses the proposed tree only when it is git's tree (tree_source: "provider"); a different tree, a non-zero exit, a timeout (the command's process group is killed), unreadable output or an unavailable command keeps git's tree and records the reason (tree_source: "git",tree_provider: <reason>, plusproposed_treeon a mismatch). The provider can never put a tree on the base that git did not produce, and never holds, fails or stops anything.Only steps git merged into a new commit are offered; conflicts, already-merged heads, the pair read, admission, repairs and re-lands never run it. Receipts carry the per-step source and a
tree_providertotal (consulted,provider,git,reasons); the round summary andlast_tickcarry the round's totals.Unset (the default), no command runs,
train_optionsis unchanged and receipts are byte-for-byte as before (tested).Tests first (
test: ..., failing on the missing module), then the implementation, then docs (docs/TREE_PROVIDER.md, README configuration and safety tables, example config, changelog). 339 tests pass locally.