Charlie Marsh
189d0d41d0
## Summary Rather than storing the `redirects` on the resolver, this PR just re-uses the "convert this URL to precise" logic when we convert to a `Resolution` after-the-fact. I think this is a lot simpler: it removes state from the resolver, and simplifies a lot of the hooks around distribution fetching (e.g., `get_or_build_wheel_metadata` no longer returns `(Metadata23, Option<Url>)`).
86 lines
3.8 KiB
Rust
86 lines
3.8 KiB
Rust
use url::Url;
|
|
|
|
use pep508_rs::VerbatimUrl;
|
|
|
|
/// Given a [`VerbatimUrl`] and a redirect, apply the redirect to the URL while preserving as much
|
|
/// of the verbatim representation as possible.
|
|
pub(crate) fn apply_redirect(url: &VerbatimUrl, redirect: Url) -> VerbatimUrl {
|
|
let redirect = VerbatimUrl::from_url(redirect);
|
|
|
|
// The redirect should be the "same" URL, but with a specific commit hash added after the `@`.
|
|
// We take advantage of this to preserve as much of the verbatim representation as possible.
|
|
if let Some(given) = url.given() {
|
|
if let Some(precise_suffix) = redirect
|
|
.raw()
|
|
.path()
|
|
.rsplit_once('@')
|
|
.map(|(_, suffix)| suffix.to_owned())
|
|
{
|
|
// If there was an `@` in the original representation...
|
|
if let Some((.., parsed_suffix)) = url.raw().path().rsplit_once('@') {
|
|
if let Some((given_prefix, given_suffix)) = given.rsplit_once('@') {
|
|
// And the portion after the `@` is stable between the parsed and given representations...
|
|
if given_suffix == parsed_suffix {
|
|
// Preserve everything that precedes the `@` in the precise representation.
|
|
return redirect.with_given(format!("{given_prefix}@{precise_suffix}"));
|
|
}
|
|
}
|
|
} else {
|
|
// If there was no `@` in the original representation, we can just append the
|
|
// precise suffix to the given representation.
|
|
return redirect.with_given(format!("{given}@{precise_suffix}"));
|
|
}
|
|
}
|
|
}
|
|
|
|
redirect
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
|
|
#[test]
|
|
fn test_apply_redirect() -> Result<(), url::ParseError> {
|
|
// If there's no `@` in the original representation, we can just append the precise suffix
|
|
// to the given representation.
|
|
let verbatim = VerbatimUrl::parse_url("https://github.com/flask.git")?
|
|
.with_given("git+https://github.com/flask.git");
|
|
let redirect =
|
|
Url::parse("https://github.com/flask.git@b90a4f1f4a370e92054b9cc9db0efcb864f87ebe")?;
|
|
|
|
let expected = VerbatimUrl::parse_url(
|
|
"https://github.com/flask.git@b90a4f1f4a370e92054b9cc9db0efcb864f87ebe",
|
|
)?
|
|
.with_given("https://github.com/flask.git@b90a4f1f4a370e92054b9cc9db0efcb864f87ebe");
|
|
assert_eq!(apply_redirect(&verbatim, redirect), expected);
|
|
|
|
// If there's an `@` in the original representation, and it's stable between the parsed and
|
|
// given representations, we preserve everything that precedes the `@` in the precise
|
|
// representation.
|
|
let verbatim = VerbatimUrl::parse_url("https://github.com/flask.git@main")?
|
|
.with_given("git+https://${DOMAIN}.com/flask.git@main");
|
|
let redirect =
|
|
Url::parse("https://github.com/flask.git@b90a4f1f4a370e92054b9cc9db0efcb864f87ebe")?;
|
|
|
|
let expected = VerbatimUrl::parse_url(
|
|
"https://github.com/flask.git@b90a4f1f4a370e92054b9cc9db0efcb864f87ebe",
|
|
)?
|
|
.with_given("https://${DOMAIN}.com/flask.git@b90a4f1f4a370e92054b9cc9db0efcb864f87ebe");
|
|
assert_eq!(apply_redirect(&verbatim, redirect), expected);
|
|
|
|
// If there's a conflict after the `@`, discard the original representation.
|
|
let verbatim = VerbatimUrl::parse_url("https://github.com/flask.git@main")?
|
|
.with_given("git+https://github.com/flask.git@${TAG}".to_string());
|
|
let redirect =
|
|
Url::parse("https://github.com/flask.git@b90a4f1f4a370e92054b9cc9db0efcb864f87ebe")?;
|
|
|
|
let expected = VerbatimUrl::parse_url(
|
|
"https://github.com/flask.git@b90a4f1f4a370e92054b9cc9db0efcb864f87ebe",
|
|
)?;
|
|
assert_eq!(apply_redirect(&verbatim, redirect), expected);
|
|
|
|
Ok(())
|
|
}
|
|
}
|