Skip to content

[apply-patch] Support applypatch command string #2186

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
dylan-hurd-oai merged 2 commits into from
Aug 11, 2025
Merged

[apply-patch] Support applypatch command string #2186

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd5f6bd
[apply-patch] Support applypatch command string
dylan-hurd-oai Aug 11, 2025
cacd333
mv const inside fn
dylan-hurd-oai Aug 11, 2025
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
28 changes: 27 additions & 1 deletion codex-rs/apply-patch/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,9 @@ pub struct ApplyPatchArgs {
}

pub fn maybe_parse_apply_patch(argv: &[String]) -> MaybeApplyPatch {
const APPLY_PATCH_COMMANDS: [&str; 2] = ["apply_patch", "applypatch"];

@bolinfest bolinfest Aug 11, 2025

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should have a comment (and ideally to link to a GitHub issue or something with more information) that explains why we are accepting applypatch. Ideally, it would also provide guidance about criteria for when we should stop recognizing applypatch.

match argv {
[cmd, body] if cmd == "apply_patch" => match parse_patch(body) {
[cmd, body] if APPLY_PATCH_COMMANDS.contains(&cmd.as_str()) => match parse_patch(body) {
Ok(source) => MaybeApplyPatch::Body(source),
Err(e) => MaybeApplyPatch::PatchParseError(e),
},
Expand Down Expand Up @@ -722,6 +723,31 @@ mod tests {
}
}

#[test]
fn test_literal_applypatch() {
let args = strs_to_strings(&[
"applypatch",
r#"*** Begin Patch
*** Add File: foo
+hi
*** End Patch
"#,
]);

match maybe_parse_apply_patch(&args) {
MaybeApplyPatch::Body(ApplyPatchArgs { hunks, patch: _ }) => {
assert_eq!(
hunks,
vec![Hunk::AddFile {
path: PathBuf::from("foo"),
contents: "hi\n".to_string()
}]
);
}
result => panic!("expected MaybeApplyPatch::Body got {result:?}"),
}
}

#[test]
fn test_heredoc() {
let args = strs_to_strings(&[
Expand Down
Loading