Reference revision diff highlights - #235
Merged
Merged
Conversation
dgutov
marked this pull request as draft
April 5, 2025 01:58
dgutov
changed the title
Highlight staged changes as "reference" changes in this case.
New faces and a new hl function (diff-hl-highlight-on-margin-flat). It also required more economical reuse of overlays because otherwise the margin combines elements from all overlays it find on the line (or however elements fit into width).
(Needs more testing.)
Called `diff-hl-diff-reference-goto-hunk`. No default binding, but `diff-hl-diff-goto-hunk` delegated to it when called with `C-u C-u`.
dgutov
force-pushed
the
reference-revision-highlights
branch
from
April 28, 2025 15:13
41df159 to
eb8933f
Compare
Behavior similar to vc-root-diff (C-x v D), but uses the reference revision as the comparison.
dgutov
marked this pull request as ready for review
September 9, 2025 02:14
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.
This splits highlighting into two groups: diff between the buffer contents and HEAD (or staging area (*)), and diff between the latter and
diff-hl-reference-revision(if set). Looks like this:The new indicators use a specific bitmap and new faces, both of which can be customized. The default bitmap is an empty one, so on the screenshot it's the lines without the "border".
A new fn option is added as well:
diff-hl-highlight-reference-function. For more advanced customization.(*) This change also uses the new indicators for the staged changes (Git only, naturally) when
diff-hl-show-staged-changesis customized to nil. In a way that conflates those pieces of data, but I expect that most users will either use one or the other, and the behavior still makes sense when combined.