WIP - Add MergeResponseInspector functionality to Java API
#7196
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
snazy
force-pushed
the
merge-response-inspector
branch
from
dab6be1 to
3a1a309
Compare
Provides a simple API to collect information that is necessary for content-aware merges.
The base for that information is already available via the `Conflict`s returned in a `MergeResponse`. The approach is based on information from the merge-request and merge-response. It collects the conflicting contents from the _merge-base_ using a Nessie-API "get-contents" call and then uses Nessie's diff-operations to identify and filter the conflicting contents from the diffs of _merge-base_-to-_merge-source_ and _merge-base_-to-_merge-target_. The content information is aggregated ("grouped" by content-ID) and returned as a Java `Stream` via the introduced API.
This change does not implement any content-aware merge operation.
This is a pure Nessie-Java-API/client change, no REST API change.
snazy
force-pushed
the
merge-response-inspector
branch
from
3a1a309 to
45c109c
Compare
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.
Provides a simple API to collect information that is necessary for content-aware merges.
The base for that information is already available via the
Conflicts returned in aMergeResponse. The approach is based on information from the merge-request and merge-response. It collects the conflicting contents from the merge-base using a Nessie-API "get-contents" call and then uses Nessie's diff-operations to identify and filter the conflicting contents from the diffs of merge-base-to-merge-source and merge-base-to-merge-target. The content information is aggregated ("grouped" by content-ID) and returned as a JavaStreamvia the introduced API.This change does not implement any content-aware merge operation.
This is a pure Nessie-Java-API/client change, no REST API change.