hanzoai/dev
2
0
Fork 0
mirror of https://github.com/hanzoai/dev.git synced 2026-10-25 03:32:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(merge): resolve compile issues from upstream sync (remove let-chains in git_info; map responses_originator_header; handle GitDiffToRemote in MCP; dedupe once_cell)

Browse Source
This commit is contained in:
James Peter
2025-08-20 18:34:56 +10:00
parent b6fbf6c1fd
commit d79b51c601
4 changed files with 63 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
codex-rs/core/src/config.rs
+1 -1
View File
@@ -750,7 +750,7 @@ impl Config {
experimental_resume,
include_plan_tool: include_plan_tool.unwrap_or(false),
internal_originator: cfg.internal_originator,
responses_originator_header,
debug: debug.unwrap_or(false),
// Already computed before moving codex_home
using_chatgpt_auth,
codex-rs/core/src/git_info.rs
+57 -51
View File
@@ -162,27 +162,31 @@ async fn get_default_branch(cwd: &Path) -> Option<String> {
cwd,
)
.await
&& symref_output.status.success()
&& let Ok(sym) = String::from_utf8(symref_output.stdout)
{
let trimmed = sym.trim();
if let Some((_, name)) = trimmed.rsplit_once('/') {
return Some(name.to_string());
if symref_output.status.success() {
if let Ok(sym) = String::from_utf8(symref_output.stdout) {
let trimmed = sym.trim();
if let Some((_, name)) = trimmed.rsplit_once('/') {
return Some(name.to_string());
}
}
}
}
// Fall back to parsing `git remote show <remote>` output
if let Some(show_output) =
run_git_command_with_timeout(&["remote", "show", &remote], cwd).await
&& show_output.status.success()
&& let Ok(text) = String::from_utf8(show_output.stdout)
{
for line in text.lines() {
let line = line.trim();
if let Some(rest) = line.strip_prefix("HEAD branch:") {
let name = rest.trim();
if !name.is_empty() {
return Some(name.to_string());
if show_output.status.success() {
if let Ok(text) = String::from_utf8(show_output.stdout) {
for line in text.lines() {
let line = line.trim();
if let Some(rest) = line.strip_prefix("HEAD branch:") {
let name = rest.trim();
if !name.is_empty() {
return Some(name.to_string());
}
}
}
}
}
@@ -201,9 +205,10 @@ async fn get_default_branch(cwd: &Path) -> Option<String> {
cwd,
)
.await
&& verify.status.success()
{
return Some(candidate.to_string());
if verify.status.success() {
return Some(candidate.to_string());
}
}
}
@@ -235,11 +240,11 @@ async fn branch_ancestry(cwd: &Path) -> Option<Vec<String>> {
seen.insert(cb.clone());
ancestry.push(cb);
}
if let Some(db) = default_branch
&& !seen.contains(&db)
{
seen.insert(db.clone());
ancestry.push(db);
if let Some(db) = default_branch.clone() {
if !seen.contains(&db) {
seen.insert(db.clone());
ancestry.push(db);
}
}
// Expand candidates: include any remote branches that already contain HEAD.
@@ -258,18 +263,18 @@ async fn branch_ancestry(cwd: &Path) -> Option<Vec<String>> {
cwd,
)
.await
&& output.status.success()
&& let Ok(text) = String::from_utf8(output.stdout)
{
for line in text.lines() {
let short = line.trim();
// Expect format like: "origin/feature"; extract the branch path after "remote/"
if let Some(stripped) = short.strip_prefix(&format!("{remote}/"))
&& !stripped.is_empty()
&& !seen.contains(stripped)
{
seen.insert(stripped.to_string());
ancestry.push(stripped.to_string());
if output.status.success() {
if let Ok(text) = String::from_utf8(output.stdout) {
for line in text.lines() {
let short = line.trim();
if let Some(stripped) = short.strip_prefix(&format!("{remote}/")) {
if !stripped.is_empty() && !seen.contains(stripped) {
seen.insert(stripped.to_string());
ancestry.push(stripped.to_string());
}
}
}
}
}
}
@@ -398,28 +403,29 @@ async fn diff_against_sha(cwd: &Path, sha: &GitSha) -> Option<String> {
if let Some(untracked_output) =
run_git_command_with_timeout(&["ls-files", "--others", "--exclude-standard"], cwd).await
&& untracked_output.status.success()
{
let untracked: Vec<String> = String::from_utf8(untracked_output.stdout)
.ok()?
.lines()
.map(|s| s.to_string())
.filter(|s| !s.is_empty())
.collect();
if untracked_output.status.success() {
let untracked: Vec<String> = String::from_utf8(untracked_output.stdout)
.ok()?
.lines()
.map(|s| s.to_string())
.filter(|s| !s.is_empty())
.collect();
if !untracked.is_empty() {
let futures_iter = untracked.into_iter().map(|file| async move {
let file_owned = file;
let args_vec: Vec<&str> =
vec!["diff", "--binary", "--no-index", "/dev/null", &file_owned];
run_git_command_with_timeout(&args_vec, cwd).await
});
let results = join_all(futures_iter).await;
for extra in results.into_iter().flatten() {
if extra.status.code().is_some_and(|c| c == 0 || c == 1)
&& let Ok(s) = String::from_utf8(extra.stdout)
{
diff.push_str(&s);
if !untracked.is_empty() {
let futures_iter = untracked.into_iter().map(|file| async move {
let file_owned = file;
let args_vec: Vec<&str> =
vec!["diff", "--binary", "--no-index", "/dev/null", &file_owned];
run_git_command_with_timeout(&args_vec, cwd).await
});
let results = join_all(futures_iter).await;
for extra in results.into_iter().flatten() {
if extra.status.code().is_some_and(|c| c == 0 || c == 1) {
if let Ok(s) = String::from_utf8(extra.stdout) {
diff.push_str(&s);
}
}
}
}
}
codex-rs/mcp-server/src/codex_message_processor.rs
+5
View File
@@ -50,6 +50,8 @@ use codex_protocol::mcp_protocol::InterruptConversationResponse;
use codex_protocol::mcp_protocol::LOGIN_CHATGPT_COMPLETE_EVENT;
use codex_protocol::mcp_protocol::LoginChatGptCompleteNotification;
use codex_protocol::mcp_protocol::LoginChatGptResponse;
use codex_protocol::mcp_protocol::GitDiffToRemoteParams;
use codex_protocol::mcp_protocol::GitDiffToRemoteResponse;
use codex_protocol::mcp_protocol::NewConversationParams;
use codex_protocol::mcp_protocol::NewConversationResponse;
use codex_protocol::mcp_protocol::RemoveConversationListenerParams;
@@ -139,6 +141,9 @@ impl CodexMessageProcessor {
};
self.outgoing.send_error(request_id, error).await;
}
ClientRequest::GitDiffToRemote { request_id, params } => {
self.git_diff_to_origin(request_id, params.cwd).await;
}
}
}
codex-rs/tui/Cargo.toml
-1
View File
@@ -44,7 +44,6 @@ diffy = "0.4.2"
image = { version = "^0.25.6", default-features = false, features = ["jpeg"] }
lazy_static = "1"
libc = "0.2"
once_cell = "1"
mcp-types = { path = "../mcp-types" }
once_cell = "1"
path-clean = "1.0.1"