valknar/llmx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: merge git crates (#5909)

Browse Source 
Merge `git-apply` and `git-tooling` into `utils/`
This commit is contained in:
jif-oai
2025-10-29 12:11:44 +00:00
committed by GitHub
parent 89591e4246
commit fa92cd92fa
23 changed files with 90 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
codex-rs/core/src/conversation_history.rs
View File

@@ -530,7 +530,7 @@ fn is_api_message(message: &ResponseItem) -> bool {
#[cfg(test)]
mod tests {
use super::*;
use codex_git_tooling::GhostCommit;
use codex_git::GhostCommit;
use codex_protocol::models::ContentItem;
use codex_protocol::models::FunctionCallOutputPayload;
use codex_protocol::models::LocalShellAction;

6
codex-rs/core/src/tasks/ghost_snapshot.rs
View File

@@ -3,9 +3,9 @@ use crate::state::TaskKind;
use crate::tasks::SessionTask;
use crate::tasks::SessionTaskContext;
use async_trait::async_trait;
use codex_git_tooling::CreateGhostCommitOptions;
use codex_git_tooling::GitToolingError;
use codex_git_tooling::create_ghost_commit;
use codex_git::CreateGhostCommitOptions;
use codex_git::GitToolingError;
use codex_git::create_ghost_commit;
use codex_protocol::models::ResponseItem;
use codex_protocol::user_input::UserInput;
use codex_utils_readiness::Readiness;

2
codex-rs/core/src/tasks/undo.rs
View File

@@ -8,7 +8,7 @@ use crate::state::TaskKind;
use crate::tasks::SessionTask;
use crate::tasks::SessionTaskContext;
use async_trait::async_trait;
use codex_git_tooling::restore_ghost_commit;
use codex_git::restore_ghost_commit;
use codex_protocol::models::ResponseItem;
use codex_protocol::user_input::UserInput;
use tokio_util::sync::CancellationToken;