Skip to content

fix(core/build): build test file:// URLs with Url::from_file_path (#3137) #3138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
trunk-io merged 1 commit into from
Aug 13, 2026
+19 −11
Merged

fix(core/build): build test file:// URLs with Url::from_file_path (#3137) #3138

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 19 additions & 11 deletions libraries/core/src/build/git.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -757,6 +757,15 @@ mod tests {
.to_string()
}

// A `file://` URL for a local absolute path. `format!("file://{}", p.display())`
// is not portable: on Windows it yields `file://C:\...`, which puts the drive
// letter in the authority and leaves the backslashes as non-separators, so
// libgit2 refuses to resolve it (#3137). `Url::from_file_path` emits the
// well-formed `file:///C:/...` on every platform.
fn file_url(path: &Path) -> Url {
Url::from_file_path(path).expect("test repo path must be absolute")
}

#[test]
fn clone_dir_path_keeps_a_file_url_drive_letter_out_of_the_on_disk_path() {
// A `file://` URL to a Windows-style absolute path parses with the
Expand Down Expand Up @@ -922,7 +931,8 @@ mod tests {
let repo_dir = tempfile::tempdir().unwrap();
let repo_path = repo_dir.path().join("repo");
let commit = init_repo_with_commit(&repo_path);
let repo_url_str = format!("file://{}", repo_path.display());
let repo_url = file_url(&repo_path);
let repo_url_str = repo_url.to_string();
let target_dir = tempfile::tempdir().unwrap();

let mut manager = GitManager::default();
Expand All @@ -945,8 +955,7 @@ mod tests {
// before it's a valid, HEAD-resolvable repo). Session B must see
// this as owned by an in-flight build, not as a finished clone to
// verify.
let parsed = Url::parse(&repo_url_str).unwrap();
let clone_dir = GitManager::clone_dir_path(target_dir.path(), &parsed, &commit).unwrap();
let clone_dir = GitManager::clone_dir_path(target_dir.path(), &repo_url, &commit).unwrap();
std::fs::create_dir_all(&clone_dir).unwrap();

let session_b = SessionId::generate();
Expand Down Expand Up @@ -981,7 +990,8 @@ mod tests {
let repo_dir = tempfile::tempdir().unwrap();
let repo_path = repo_dir.path().join("repo");
let commit = init_repo_with_commit(&repo_path);
let repo_url_str = format!("file://{}", repo_path.display());
let repo_url = file_url(&repo_path);
let repo_url_str = repo_url.to_string();
let target_dir = tempfile::tempdir().unwrap();

let mut manager = GitManager::default();
Expand Down Expand Up @@ -1012,8 +1022,7 @@ mod tests {
// The dir shows up on disk, then A finishes and drops its claim.
// B is still writing, so a third session must not get a commit to
// verify.
let parsed = Url::parse(&repo_url_str).unwrap();
let clone_dir = GitManager::clone_dir_path(target_dir.path(), &parsed, &commit).unwrap();
let clone_dir = GitManager::clone_dir_path(target_dir.path(), &repo_url, &commit).unwrap();
std::fs::create_dir_all(&clone_dir).unwrap();
drop(folder_a);

Expand Down Expand Up @@ -1077,7 +1086,7 @@ mod tests {
let repo_dir = tempfile::tempdir().unwrap();
let repo_path = repo_dir.path().join("repo");
let old_commit = init_repo_with_commit(&repo_path);
let repo_url = format!("file://{}", repo_path.display());
let repo_url = file_url(&repo_path).to_string();

let target_dir = tempfile::tempdir().unwrap();
let mut manager = GitManager::default();
Expand Down Expand Up @@ -1255,8 +1264,7 @@ mod tests {
// Clone `origin` into `dest` so `dest` carries an `origin` remote that
// `fetch_changes` can pull from — the shape the Copy/Rename arms expect.
fn clone_from_origin(origin: &Path, dest: &Path) {
let url = format!("file://{}", origin.display());
git2::Repository::clone(&url, dest).unwrap();
git2::Repository::clone(file_url(origin).as_str(), dest).unwrap();
}

fn head_commit(dir: &Path) -> String {
Expand Down Expand Up @@ -1335,7 +1343,7 @@ mod tests {
let repo_dir = tempfile::tempdir().unwrap();
let repo_path = repo_dir.path().join("repo");
let commit = init_repo_with_commit(&repo_path);
let repo_url = Url::parse(&format!("file://{}", repo_path.display())).unwrap();
let repo_url = file_url(&repo_path);

let base = tempfile::tempdir().unwrap();
let target = base.path().join("localhost").join(&commit);
Expand Down Expand Up @@ -1367,7 +1375,7 @@ mod tests {
std::fs::create_dir_all(target.parent().unwrap()).unwrap();
// A file:// URL to a path that isn't a git repo -> clone fails.
let missing = base.path().join("does-not-exist");
let repo_url = Url::parse(&format!("file://{}", missing.display())).unwrap();
let repo_url = file_url(&missing);

let folder = GitFolder {
reuse: ReuseOptions::NewClone {
Expand Down