refactor: remove manual conflicts check for --frozen & --locked#4359
Merged
lucascolley merged 2 commits intoprefix-dev:mainfrom Aug 15, 2025
Merged
Conversation
--frozen & --locked
tdejager
added a commit
to tdejager/pixi
that referenced
this pull request
Aug 15, 2025
tdejager
added a commit
to tdejager/pixi
that referenced
this pull request
Aug 15, 2025
tdejager
added a commit
to tdejager/pixi
that referenced
this pull request
Aug 15, 2025
tdejager
added a commit
to tdejager/pixi
that referenced
this pull request
Aug 15, 2025
tdejager
added a commit
to tdejager/pixi
that referenced
this pull request
Aug 15, 2025
Contributor
|
The custom handling was to address #4031 (comment) |
2 tasks
Contributor
Author
|
Oh I'm sorry I missed that. I didn't mean to remove your contribution! I do feel that, it might be better to either stick to the clap machinery. You can also unset the env variable after all, or make something for all current boolean env variables, and future ones as we would otherwise forget to parse "truthy" values for these. |
Contributor
Author
|
That said I'd be happy to bring back the change for now. |
Contributor
|
I understand that this is a limitation of My preference is that this be rolled back, since it is a breaking change (the command above did not barf in the previous version). Probably best to continue this discussion in #4466 |
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.
There was some very custom machinery to check
--frozenand--lockedconflicts. While just using clap will do, this removes all of that and adds clap conflict. Also removes related tests.Tested
Ran the commands manually with
--lockedetc. and through env variables and conflicts seem to work.