Skip to content

chore: undo nits #5631

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

Open
Parent: feat: undo wiring
wants to merge 3 commits into
base: jif/undo-wiring
Choose a base branch
from
+65 −17
Open

chore: undo nits #5631

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87fe034
chore: undo nits
jif-oai Oct 24, 2025
c20fa16
More nits
jif-oai Oct 24, 2025
857be84
Handle compaction edge case
jif-oai Oct 24, 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
4 changes: 2 additions & 2 deletions codex-rs/git-tooling/src/ghost_commits.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,13 @@ pub fn restore_ghost_commit(repo_path: &Path, commit: &GhostCommit) -> Result<()
let repo_prefix = repo_subdir(repo_root.as_path(), repo_path);
let current_untracked =
capture_existing_untracked(repo_root.as_path(), repo_prefix.as_deref())?;
restore_to_commit_inner(repo_root.as_path(), repo_prefix.as_deref(), commit.id())?;
remove_new_untracked(
repo_root.as_path(),
commit.preexisting_untracked_files(),
commit.preexisting_untracked_dirs(),
current_untracked,
)?;
restore_to_commit_inner(repo_root.as_path(), repo_prefix.as_deref(), commit.id())
)
}

/// Restore the working tree to match the given commit ID.
Expand Down
5 changes: 3 additions & 2 deletions codex-rs/tui/src/bottom_pane/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,8 +287,9 @@ impl BottomPane {
/// indicator is not active.
pub(crate) fn update_status_header(&mut self, header: String) {
if let Some(status) = self.status.as_mut() {
status.update_header(header);
self.request_redraw();
if status.update_header(header) {
self.request_redraw();
}
}
}

Expand Down
3 changes: 0 additions & 3 deletions codex-rs/tui/src/chatwidget.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,9 +302,6 @@ impl ChatWidget {
}

fn set_status_header(&mut self, header: String) {
if self.current_status_header == header {
return;
}
self.current_status_header = header.clone();
self.bottom_pane.update_status_header(header);
}
Expand Down
8 changes: 5 additions & 3 deletions codex-rs/tui/src/status_indicator_widget.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,12 @@ impl StatusIndicatorWidget {
}

/// Update the animated header label (left of the brackets).
pub(crate) fn update_header(&mut self, header: String) {
if self.header != header {
self.header = header;
pub(crate) fn update_header(&mut self, header: String) -> bool {
if self.header == header {
return false;
}
self.header = header;
true
}

#[cfg(test)]
Expand Down
Loading