fix(git): respect scp-like URL for nested submodules #12359
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
|
r? @ehuss (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
A-git
weihanglo
commented
Jul 14, 2023
| @@ -3673,14 +3673,14 @@ fn different_user_relative_submodules() { | |||
| "\ | |||
| [UPDATING] git repository `{}` | |||
| [UPDATING] git submodule `{}` | |||
| [UPDATING] git submodule `{}` | |||
| [UPDATING] git submodule `{}/../dep2` | |||
There was a problem hiding this comment.
The regression of URL display is one downside of it. However, since we drop Url::parse here so now we can have relative submodule inside a scp-like submodule. For example, this was not possible before this PR:
direct git dependency
submodule url `git@github.com/user/repo`
submodule url `../`
`parent_remote_url` used to be `&str` before rust-lang#12244. However, we changed the type to `Url` and it started failing to parse scp-like URLs since they are not compliant with WHATWG URL spec. In this commit, we change it back to `&str` and construct the URL manually. This should be safe since Cargo already checks if it is a relative URL for that if branch.
|
Looks good to me. Yea, there isn't a particularly good way to test scp-style URLs since they don't support port numbers. My only idea would be to put cargo itself inside a docker container, and orchestrate the test around using port 22. But that sounds sufficiently annoying that I wouldn't want to bother with it yet. A beta backport sounds good to me, too. @bors r+ |
bors
added
S-waiting-on-bors
|
☀️ Test successful - checks-actions |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 18, 2023
Update cargo 11 commits in 694a579566a9a1482b20aff8a68f0e4edd99bd28..1b15556767f4b78a64e868eedf4073c423f02b93 2023-07-11 22:28:29 +0000 to 2023-07-18 14:44:47 +0000 - Fix "cargo doc --open" crash on WSL2 (rust-lang/cargo#12373) - fix(git): respect scp-like URL for nested submodules (rust-lang/cargo#12359) - Upgrade to indexmap v2 (rust-lang/cargo#12368) - refactor: Clean up package metadata (rust-lang/cargo#12352) - Correct unspecifiead to unspecified (rust-lang/cargo#12363) - Replace invalid `panic_unwind` std feature with `panic-unwind` (rust-lang/cargo#12364) - Bump to 0.74.0; update changelog (rust-lang/cargo#12361) - Bump version of crates-io due to unintentional semver-breaking change (rust-lang/cargo#12357) - chore: Automatically update dependencies monthly (rust-lang/cargo#12341) - docs: Use heading attributes to control the fragment. (rust-lang/cargo#12339) - Rustfmt with latest nightly. (rust-lang/cargo#12351) r? ghost
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 19, 2023
…nglo [beta-1.72] Update cargo 2 commits in 45782b6b8afd1da042d45c2daeec9c0744f72cc7..dd6536b8ed28f73c0e82089c72ef39a03bc634be 2023-07-05 16:54:51 +0000 to 2023-07-18 14:02:13 +0000 - [beta-1.72] backport rust-lang/cargo#12359 (rust-lang/cargo#12371) - [beta-1.72] Bump version of crates-io due to unintentional semver-breaking change (rust-lang/cargo#12356) r? ghost
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.
What does this PR try to resolve?
parent_remote_urlused to be&strbefore #12244. However, we changedthe type to
Urland it started failing to parse scp-like URLs sincethey are not compliant with WHATWG URL spec.
In this commit, we change it back to
&strand construct the URLmanually. This should be safe since Cargo already checks if it is a
relative URL for that if branch.
How should we test and review this PR?
This is current a draft because I had a hard time adding a test around it.
git@github.com:rust-lang/cargo.git) doesn't accept custom port. In ourcontainer_testwe need to specify a custom port number.To test it, I ended up manually creating a repo with a submodule with scp-like URL.
Additional information
I feel like this worth a beta backport (we missed the nightly window).
I also feel like it is pretty safe to merge without adding a test if we cannot figure out how to.
Fixes #12295