generate: diff each module and merge changesets - #9
Open
vito wants to merge 1 commit into
Open
Conversation
Signed-off-by: Alex Suraci <suraci.alex@gmail.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
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.
generateAllused to fold every module's workspace fork into an accumulator and diff once at the end:A fork holds a directory in both its
beforeand itsafter, andmergeis twowithDirectorycalls, so a workspace with N modules folded 2N directory merges through a single chain. The fold is also a sequential dependency chain: each merge waits on the previous one, so nothing overlaps.Now each module is diffed on its own and the diffs are merged with
Changeset.withChangesets, which the engine already exposes for exactly this (git octopus merge):The
mapis independent per module, so generation across modules can overlap instead of chaining through an accumulator, and empty changesets are dropped before merging rather than merged as no-ops.Behavior change
Two modules generating the same path is now a conflict and fails, rather than silently keeping whichever module happened to be generated last. Octopus merge only supports the
FAILandFAIL_EARLYstrategies; this uses the defaultFAIL.Blocked on
PolyfillModuleSource.generatereturns aChangeset!there instead of a fork, which is what lets this callwithChangesetsdirectly.dagger.jsoncurrently pinspolyfill@fix-generate. That has to go back topolyfill@mainwith a real pin once dagger/polyfill#6 merges — this should not land with the branch pin in place.🤖 Generated with Claude Code