mirror of
https://github.com/openai/codex.git
synced 2026-08-26 13:38:49 +00:00
1823c13771
## Why Turn diffs need to render paths from remote environments whose path convention may differ from the Codex host. ## What changed - Preserve `PathUri` values through applied patch deltas, display-root discovery, and turn-diff tracking. - Add host-independent relative-path rendering and normalize Windows drive-letter case in `PathUri`. - Render paths relative to each environment's repository root while keeping Git diff headers slash-separated. ## Testing - Cover POSIX, Windows, UNC, encoded-separator, and opaque URI relative paths. - Verify an applied patch in a remote Windows working directory emits a portable unified diff. GitOrigin-RevId: 526f70ae36a40627de5496d375310d12295b69bb
codex-git-utils
Helpers for interacting with git, including patch application. The crate also
exposes a lightweight baseline API for internal directories that use git only
as a resettable diff mechanism: ensure_git_baseline_repository preserves a
usable root/.git baseline or creates one when it is missing or unusable,
reset_git_repository replaces root/.git with a fresh one-commit baseline,
and diff_since_latest_init returns structured file changes plus a unified
diff from that baseline to the current directory contents.
use std::path::Path;
use codex_git_utils::{apply_git_patch, ApplyGitRequest};
let repo = Path::new("/path/to/repo");
// Apply a patch (omitted here) to the repository.
let request = ApplyGitRequest {
cwd: repo.to_path_buf(),
diff: String::from("...diff contents..."),
revert: false,
preflight: false,
};
let result = apply_git_patch(&request)?;