diff: fallback to longest common substring algorithm - #9947
Open
yuja wants to merge 3 commits into
Open
Conversation
This should be more correct since a word with max_occurrences + k (k > 1) may exist in both left and right sides, and such word shouldn't be chosen when any less common words don't share their occurrences. This patch also removes the fast path because it's unusual that the least common word exceeds the limit.
The git CLI falls back to Myers if no uncommon shared words can be found, whereas jj doesn't. This patch adds the Python difflib-like algorithm as a fallback. This is much simpler than Myers, and can naturally be plugged into the existing recursive diffing machinery. test_diff_color_words_omit_blank_right_line() is removed because it's impractical to reproduce the problem without disabling the longest match fallback. Tokens are split by line as long as matching "\n" characters are present. The original issue is still covered by the unit tests added at 79fb219 "files: make DiffLineIterator omit blank right line following matching+left". Closes #9914
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.
Closes #9914
Checklist
If applicable:
CHANGELOG.mdREADME.md,docs/,demos/)cli/src/config-schema.json)how it works, how it's organized), including any code drafted by an LLM.
an eye towards deleting anything that is irrelevant, clarifying anything
that is confusing, and adding details that are relevant. This includes,
for example, commit descriptions, PR descriptions, and code comments.
I don't find samples that look significantly worse, but one potential drawback is that minor whitespace additions/removals in indentation changes match up.
(without fallback)
(with fallback)
