openai/codex
1
0
Fork 0
mirror of https://github.com/openai/codex.git synced 2026-10-31 19:28:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Migrate ExecutorFileSystem get_metadata to PathUri

Browse Source
This commit is contained in:
Codex
2026-06-10 22:15:28 +00:00
committed by Adam Perry
parent aea014d745
commit c0dda81226
21 changed files with 126 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/git-utils/src/info.rs
+9 -3
View File
@@ -47,7 +47,8 @@ pub async fn get_git_repo_root_with_fs(
fs: &dyn ExecutorFileSystem,
cwd: &AbsolutePathBuf,
) -> Option<AbsolutePathBuf> {
let base = match fs.get_metadata(cwd, /*sandbox*/ None).await {
let cwd_uri = PathUri::from_abs_path(cwd).ok()?;
let base = match fs.get_metadata(&cwd_uri, /*sandbox*/ None).await {
Ok(metadata) if metadata.is_directory => cwd.clone(),
_ => cwd.parent()?,
};
@@ -806,7 +807,7 @@ pub async fn resolve_root_git_project_for_trust(
let dot_git = repo_root.join(".git");
let dot_git_uri = PathUri::from_abs_path(&dot_git).ok()?;
if fs
.get_metadata(&dot_git, /*sandbox*/ None)
.get_metadata(&dot_git_uri, /*sandbox*/ None)
.await
.ok()?
.is_directory
@@ -858,7 +859,12 @@ async fn find_ancestor_git_entry_with_fs(
) -> Option<(AbsolutePathBuf, AbsolutePathBuf)> {
for dir in base_dir.ancestors() {
let dot_git = dir.join(".git");
if fs.get_metadata(&dot_git, /*sandbox*/ None).await.is_ok() {
let dot_git_uri = PathUri::from_abs_path(&dot_git).ok()?;
if fs
.get_metadata(&dot_git_uri, /*sandbox*/ None)
.await
.is_ok()
{
return Some((dir, dot_git));
}
}