Store resolution options in lockfile #5264
Merged
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
charliermarsh
added
enhancement
charliermarsh
commented
Jul 21, 2024
| match self { | ||
| Self::Highest => write!(f, "highest"), | ||
| Self::Lowest => write!(f, "lowest"), | ||
| Self::LowestDirect => write!(f, "lowest-direct"), |
There was a problem hiding this comment.
Does anyone know how to get these automatically from the Serde implementation, in to_toml?
charliermarsh
commented
Jul 21, 2024
| // Write the settings that were used to generate the resolution. | ||
| // This enables us to invalidate the lockfile if the user changes | ||
| // their settings. | ||
| if self.resolution_mode != ResolutionMode::default() { |
There was a problem hiding this comment.
I decided to omit these if users use the default. It means we may have the "wrong" behavior if we change the default, but I think that's pretty unlikely, and even still, it's kind of fine -- we'd just regenerate their lock. The upside is that we almost never write these, so the lockfile remains succinct.
charliermarsh
force-pushed
the
charlie/save-settings
branch
from
3c5d62b
to
24c98ed
Compare
konstin
approved these changes
Jul 22, 2024
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.
Summary
This PR modifies the lockfile to include the impactful resolution settings, like the resolution and pre-release mode. If any of those values change, we want to ignore the existing lockfile. Otherwise,
--resolution lowest-directwill typically have no effect, which is really unintuitive.Closes #5226.