Always use Git coloring for word-diff #11674
Merged
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
mstv
reviewed
Apr 8, 2024
mstv
approved these changes
Apr 8, 2024
as well as range-diff and git-grep. Use of Git coloring of command output was added in gitextensions#11590. The patch view (default) is configurable, setting to keep the current GE coloring. This removes the GE coloring for some commands ans the GE coloring is very limited and is adding complexity. * git-word-diff (gitextensions#11590) * git-grep (gitextensions#11359) * git-range-diff (very limited GE coloring).
gerhardol
force-pushed
the
tmp/always-git-coloring
branch
from
0ef0012
to
0452e2c
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.
Proposed changes
as well as range-diff and git-grep.
Use of Git coloring of command output was added in #11590. The patch view (default) is configurable, setting to keep the current GE coloring.
git word-diff requires Git coloring and is not enabled if not Git coloring is enabled.
This removes the GE coloring for some commands ans the GE coloring is very limited and is adding complexity.
It is possible that a user want to keep the GE color engine for patches but use it for these commands.
Related to #11673 (and is a merge conflict), ther is a rebased commit in tmp/git-coloring but I want this reviewed in parallel.
Screenshots
No changes in the default configuration, the first image is for without GE coloring.
git word-diff, only when git coloring is activated
git-grep with regex (guess for length is incorrect)
range-diff
Test methodology
Manual
Merge strategy
I agree that the maintainer squash merge this PR (if the commit message is clear).
✒️ I contribute this code under The Developer Certificate of Origin.