Scoped config merging: parent overrides child#8
Merged
Conversation
Components can now ship default config values in their own tup.config while integrators override them from a parent directory — the same authority model as Tuprules.tup ?= defaults. find_config_for_dir collects all tup.config files from output_root down to the target directory and merges them leaf-first, root-last (parent wins on collision). -D overrides still take highest precedence. A per-file parse cache (parsed_configs) ensures each tup.config is read exactly once regardless of how many directories reference it. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
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
1 participant
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.
Summary
find_config_for_dirto collect alltup.configfiles root-to-leaf and merge with parent-overrides-child semantics (same authority model asTuprules.tup?=defaults)parsed_configs) so eachtup.configis read exactly onceBuildContext::config_vars()returns root-only config via doc commentTest plan
[scoped-config]tests for new merge behavior-Dwinsmake formatcleanclang-tidyclean on changed files🤖 Generated with Claude Code