Apply combination logic to merge CLI and persistent configuration #3618
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
force-pushed
the
charlie/combine-cli
branch
from
c4227b6
to
99fd40c
Compare
charliermarsh
commented
May 15, 2024
| @@ -961,93 +961,123 @@ impl PipSharedSettings { | |||
|
|
|||
| Self { | |||
| index_locations: IndexLocations::new( | |||
There was a problem hiding this comment.
The changes here are exclusively replacing .or with .combine.
charliermarsh
force-pushed
the
charlie/combine-cli
branch
from
99fd40c
to
15dbad4
Compare
zanieb
approved these changes
May 20, 2024
charliermarsh
force-pushed
the
charlie/combine-cli
branch
from
15dbad4
to
21ec223
Compare
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
If you have (e.g.)
extra-index-urlin your configuration file and provide--extra-index-urlon the command-line, we now merge the options rather than ignoring those in the configuration file. As such, merging the CLI and the persistent configuration is now semantically identical to how we merge (project persistent configuration) with (user persistent configuration).Closes #3541.