Add HunkHeader
and DiffLineType
to ConsumeHunk::consume_hunk
#2102
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 PR changes
ConsumeHunk::consume_hunk
to accept typed data instead of strings.This PR was initially motivated by gitui-org/gitui#2685.
Initial description (no longer accurate as of 2025-08-24)
This PR is an attempt at extracting a part of
UnifiedDiff
, more specifically a part that exposes an API for dealing with structured data as opposed to string-based data. It introducesConsumeTypedHunk
which is very similar toConsumeHunk
, except that is usesHunkHeader
andDiffLineType
to encode diff-related information in proper types.There are still a few open issues/questions:
ConsumeTypedHunk
is notNewlineSeparator
-aware. Is that a good thing or a bad thing? I’m leaning more towards the former.TODO:
comments.What do you think about the PR’s overall design? If you think this works, I’d start addressing the remaining issues.