add support for package level conflicts with groups #9130
+397
−117
Conversation
This file contains 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
BurntSushi
force-pushed
the
ag/package-level-conflict
branch
from
112eb32
to
5bc4ca5
Compare
BurntSushi
force-pushed
the
ag/package-level-conflict
branch
from
5bc4ca5
to
15202ea
Compare
konstin
approved these changes
Nov 15, 2024
This makes a lot more sense as a name IMO. And I think also works better for the immediate future, where I plan to add a `Project` kind.
Basically, this new conflict kind means that the entire project conflicts with a dependency group or an extra. This just adds the variant. In the next commit, we'll actually make it work.
Supporting project level conflicts ends up being pretty tricky, mostly because depenedency groups are represented as dependencies of the project you're trying to declare a conflict for. So by filtering out the project in the fork for the conflicting group, you end up filtering out the group itself too. To work-around this, we add a `parent` field to `PubGrubDependency`, and use this to filter based on project conflicts. This lets us do "delayed" filtering by one level. The rest of the changes in this commit are for reporting errors when you try to activate the group without disabling the project.
BurntSushi
force-pushed
the
ag/package-level-conflict
branch
from
15202ea
to
7fba6b5
Compare
|
(I think the experience makes sense, not feeling confident about reviewing the implementation) |
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.
This PR adds support for declaring a conflict between a group
and a project's "production" dependencies. For example:
Before this PR, syntax like
{ package = "example" }wasn't allowed.This PR enables that syntax, and also tweaks the forking logic a bit
to support this.
I don't have 100% confidence in this PR. In particular, I'm not sure
if my trick adding a parent package to
PubGrubDependencyis fullycorrect. But I think it works.