Feature: Revert block#12
Closed
fcmiranda wants to merge 1 commit into
Closed
Conversation
- Adjusted import order and formatting in `file_tree.rs` for clarity. - Enhanced readability in `cmd.rs` by aligning method chaining and improving context messages. - Cleaned up imports and formatting in `diff_algo.rs` for better organization. - Reformatted function signatures and method chaining in `highlight/mod.rs` for consistency. - Updated `side_by_side.rs` to improve layout handling and added functionality for revert markers. - Introduced new methods in `DiffViewState` for managing revertable hunks and improved gutter highlighting. - Enhanced rendering logic in `render_diff` to support new features and maintain consistent styling.
fcmiranda
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Adds a revert-block feature to the side-by-side diff view: individual hunks can be reverted directly from the diff pane using keyboard navigation. Also ships configurable borders and gutter improvements that were needed as prerequisites.
Changes
feat: add revert block on git diffThe main feature commit. Adds the ability to revert individual diff hunks directly in the diff pane:
selected_revert_hunk: Option<usize>inDiffViewStateto track the focused hunk.hunk_startsduring diff parsing so each hunk's screen row is known.revert_hunkaction inkeybindings.rsand wires it up in the file controller to apply a reverse patch viagit apply --reverse.selected_revert_hunkacross file-selection changes within the same file.#8