Add ability to diff two arbitrary buffers#2146
Open
APErebus wants to merge 2 commits intolibgit2:masterfrom
Open
Add ability to diff two arbitrary buffers#2146APErebus wants to merge 2 commits intolibgit2:masterfrom
APErebus wants to merge 2 commits intolibgit2:masterfrom
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
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.
libgit2exposes a method to perform diff's between arbitrary buffers,git_diff_buffers.It would be nice to expose this so that consumers can generate git-compatible diffs from arbitrary buffers.
I have exposed this call as two static methods on the
Diffclass (this felt like the most appropriate place, but I'm not 100% sure).public static ContentChanges Compare(byte[] oldBuffer, byte[] newBuffer)public static ContentChanges Compare(byte[] oldBuffer, byte[] newBuffer, CompareOptions compareOptions)There is a new NativeMethod call and Proxy for
git_diff_buffersand a new constructor forContentChangesthat executes this call when provided with two byte arrays.I have also added a test suite that verifies that it produces the same output as
gitas well as the same tests as the Blob to Blob diff tests