annotate: make AnnotationLine template type #5629
Merged
Conversation
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
yuja
reviewed
Feb 10, 2025
bryceberger
force-pushed
the
enhance-annotate-template
branch
from
b3a2132 to
23e1b75
Compare
bryceberger
changed the title
|
@yuja, it looks like this is ready for another review whenever you have time. All the discussions are marked resolved but there were no text responses to any of them, so you might not have noticed. |
yuja
approved these changes
Feb 15, 2025
Allows: * self.commit() * self.line_number() * self.first_line_in_hunk() Certain pagers (like `delta`), when used for `git blame`, only show the commit information for the first line in a hunk. This would be a nice addition to `jj file annotate`. `jj file annotate` already uses a template to control the rendering of commit information --- `templates.annotate_commit_summary`. Instead of a custom CLI flag, the tools necessary to do this should be available in the template language. If `1 % 2` or `1.is_even()` was available in the template language, this would also allow alternating colors (using `raw_escape_sequence`). Example: ```toml [templates] # only show commit info for the first line of each hunk annotate_commit_summary = ''' if(first_line_in_hunk, show_commit_info(commit), pad_end(20, " "), ) ''' ```
bryceberger
force-pushed
the
enhance-annotate-template
branch
from
23e1b75 to
8fd2dcd
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Discord discussion: https://discord.com/channels/968932220549103686/1337969561793990757
Allows:
Certain pagers (like
delta), when used forgit blame, only show thecommit information for the first line in a hunk. This would be a nice
addition to
jj file annotate.jj file annotatealready uses a template to control the rendering ofcommit information ---
templates.annotate_commit_summary. Instead ofa custom CLI flag, the tools necessary to do this should be available in
the template language.
If
1 % 2or1.is_even()was available in the template language, thiswould also allow alternating colors (using
raw_escape_sequence).Example:
Checklist
If applicable:
CHANGELOG.md