diff files line-by-line instead of character-by-character #10344
+252
−47
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
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.
this pulls out our usage of google's dmp library which was good at calculating diffs but took much too long diffing large xml files (which, in fairness, it never claimed to be good at).
now i'm using the diff code that @pelikhan wrote for the github support which i generalized a tiny bit and added code for converting the diffs into patches. the patch format i produce is a subset of the google's dmp format, but i've maintained backwards compatibility with the applying of patches so no old projects should need any upgrading. the reason my format is a little different is because the patches from dmp are two-way, but mine are only one-way.