Conversation
interactive rebases. Add support for detecting and resuming interactive rebases that are paused on disk due to conflicts, edit, or reword actions. Introduces two rebase phases: Planning (user configures actions) and InProgress (rebase running). Changes: - parse_rebase_progress() reads .git/rebase-merge or .git/rebase-apply state and returns entry lists (done/pending) with commit metadata - hydrate_todo_entries() enriches entries with author/timestamp from git log - Separate keybindings and UI for Planning vs InProgress phases - InProgress shows progress banner with remaining entry count, entry status indicators (✓/▶ for done/current), and muted styling for completed entries - Auto-detects rebase completion on refresh() and shows success popup - continue/skip/abort operations work during in-progress rebases
history. - Prioritize HEAD branch first in branch listings - Add 'c' shortcut for checkout by name - Add '-' shortcut to checkout previous branch - Enhance branch deletion with menu (local/remote/both options) - Add commit message history with Up/Down navigation - Add exclude_file() for .git/info/exclude support - Add menu for flexible file ignore options (.gitignore vs exclude) - Add root node to file tree and support directory-level diffs
checkout and improve file tree rendering. - Show error popup when branch checkout fails instead of silently failing - Refactor checkout operations to use shared error handling function - Render file tree root directory with just the expand/collapse icon
of text input for branch/tag/commit selection.
state between sessions.
![chatgpt-codex-connector[bot]](https://avatars.githubusercontent.com/in/1144995?s=60&v=4){kind=small}
There was a problem hiding this comment.
💡 Codex Review
Here are some automated review suggestions for this pull request.
Reviewed commit: 1d12fab7fe
ℹ️ About Codex in GitHub
Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you
- Open a pull request for review
- Mark a draft as ready
- Comment "@codex review".
If Codex has suggestions, it will comment; otherwise it will react with 👍.
Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".
| pub fn rebase_commit_range(&self, base_hash: &str) -> Result<Vec<String>> { | ||
| let result = self | ||
| .git() | ||
| .args(&["rev-list", "--reverse", &format!("{}..HEAD", base_hash)]) |
There was a problem hiding this comment.
rebase_commit_range currently uses rev-list --reverse <base>..HEAD, which includes merge commits, but rebase_interactive_batch runs plain git rebase -i (without --rebase-merges) and writes those hashes back into the todo. On branches that contain merges, this produces a runtime failure (commit ... is a merge but no -m option was given) and leaves users in a paused/broken rebase flow instead of starting the planned operation.
Useful? React with 👍 / 👎.
| let commits_to_rebase: Vec<_> = rebase_hashes | ||
| .iter() | ||
| .filter_map(|hash| model.commits.iter().find(|c| c.hash == *hash)) | ||
| .cloned() |
There was a problem hiding this comment.
This conversion silently drops any hash that is not present in model.commits; because the commits panel can be filtered/limited (for example branch-filter refresh loads a capped list), the generated interactive-rebase plan can become incomplete. The subsequent batch todo is then missing commits that Git intended to replay, which effectively drops history unexpectedly. The mapping should fail fast if any hash is missing, or hydrate entries directly from Git instead of the current view model.
Useful? React with 👍 / 👎.
| // Prevent git from opening an interactive editor for reword/edit | ||
| // actions. `true` exits 0 without modifying COMMIT_EDITMSG, so | ||
| // reword keeps the original message (reword message editing is | ||
| // handled in the TUI before execution). | ||
| .env("GIT_EDITOR", "true") |
There was a problem hiding this comment.
Batch interactive rebase always forces GIT_EDITOR=true, which causes reword steps to continue with the existing message unchanged. In this feature path there is no pre-execution message capture per entry, so selecting reword in the planner is effectively a no-op for commit text and does not deliver the advertised behavior.
Useful? React with 👍 / 👎.
container block Move header, progress banner, and list inside a bordered Block container to improve visual hierarchy. Extract branch/base info into separate render_info_line function and simplify selection styling by applying it at the ListItem level instead of individual spans. Use theme colors consistently throughout.
1 participant
No description provided.