fix(config): Ensure --config net.git-fetch-with-cli=true is respected#13992
Merged
bors merged 2 commits intorust-lang:masterfrom May 31, 2024
Merged
fix(config): Ensure --config net.git-fetch-with-cli=true is respected#13992bors merged 2 commits intorust-lang:masterfrom
--config net.git-fetch-with-cli=true is respected#13992bors merged 2 commits intorust-lang:masterfrom
Conversation
This reverts commit f525e1f. This removes color control from warnings for unstable features. For some reason this removed color support from `cargo -Zhelp` in the tests but I can't reproduce it locally. The most important thing was getting the config fix in. There are two follow ups - Can we have the config working *and* color? - Why did this fail for this field and not the others we already had tests for? I ran out my immediate time box for looking into these. Fixes rust-lang#13991
Collaborator
|
r? @weihanglo rustbot has assigned @weihanglo. Use |
rustbot
added
A-configuration
Contributor
Author
|
I suspect we should do a beta-backport for this (another reason to keep this PR simple). Should we also do a 1.78.1? I suspect that 1.79 is close enough that it won't be worth it. |
weihanglo
approved these changes
May 31, 2024
Member
weihanglo
left a comment
weihanglo
left a comment
There was a problem hiding this comment.
Yes we should do a beta backport
Member
|
@bors r+ |
Contributor
bors
added
S-waiting-on-bors
Contributor
Contributor
|
☀️ Test successful - checks-actions |
This was referenced May 31, 2024
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 1, 2024
Update cargo 9 commits in 431db31d0dbeda320caf8ef8535ea48eb3093407..7a6fad0984d28c8330974636972aa296b67c4513 2024-05-28 18:17:31 +0000 to 2024-05-31 22:26:03 +0000 - fix(config): Ensure `--config net.git-fetch-with-cli=true` is respected (rust-lang/cargo#13992) - Fix libcurl proxy documentation link (rust-lang/cargo#13990) - fix(new): Dont say were adding to a workspace when a regular package is in root (rust-lang/cargo#13987) - fix: adjust custom err from cert-check due to libgit2 1.8 change (rust-lang/cargo#13970) - fix(toml): Ensure targets are in a deterministic order (rust-lang/cargo#13989) - doc(cargo-package): explain no guarantee of vcs provenance (rust-lang/cargo#13984) - chore: fix some comments (rust-lang/cargo#13982) - feat: stabilize `cargo update --precise <yanked>` (rust-lang/cargo#13974) - Update openssl-src to 111.28.2+1.1.1w (rust-lang/cargo#13976) r? ghost
bors
added a commit
that referenced
this pull request
Jun 3, 2024
refactor(source): Split `RecursivePathSource` out of `PathSource` ### What does this PR try to resolve? `PathSource` serves a couple of roles - When a dependency / patch uses `path` (non-recursive) - As the implementation details of a `git` source (recursive) - Dependency overrides (recursive) Instead of using a `PathSource::new` vs `PathSouce::new_recursive`, this does `RecursivePathSource::new`. This makes the intent a lot clearer and makes it easier to customize the behavior to each role that is played. Specifically, there are two ways I expect to leverage this refactor - Improve the interplay between `RecursivePathSource` and `read_packages` to reduce the duplicate package warnings for git sources (#13992) - cargo script will change the semantics of path sources slightly and I'm assuming having a distinct source will make this easier ### How should we test and review this PR? ### Additional information
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
4 participants
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.
What does this PR try to resolve?
#13479 changed the global context initialization order so that command line stuff is processed after we read some config.
This had a side effect of breaking
--config net.git-fetch-with-cli=true.I reverted the change to restore support for
--config.Fixes #13991
How should we test and review this PR?
Additional information
This reverts commit f525e1f.
This removes color control from warnings for unstable features.
For some reason this removed color support from
cargo -Zhelpin thetests but I can't reproduce it locally.
The most important thing was getting the config fix in.
There are two follow ups
tests for?
I ran out my immediate time box for looking into these.