diff: add "diff" label globally by outer show_diff/patch() functions #4191
Conversation
This file contains 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
This will help eliminate push/pop_label() calls from show_diff_*().
The added test shows the "diff" label is repeated because of auto-labeling of templater. The original "--color=always" test is also kept to ensure that color sequences are unchanged even if we remove one of the "diff" labels.
It's not so important, but this removes duplicated "diff" labels from template output. Perhaps, this also fixes "diff access-denied" label in file-by-file external diffs. The inner show_*() functions no longer add "diff" labels, but that's okay because all CLI callers (except for the templater) use DiffRenderer.
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.
Checklist
If applicable:
CHANGELOG.md