Include file path in patch apply exception messages#8
Merged
jkschneider merged 1 commit intomainfrom Jan 27, 2026
Merged
Conversation
When a patch fails to apply, the error message now includes the file path being patched, making it easier to debug which file caused the failure. Previously, only the HunkHeader information (line start/count) was shown, which could be ambiguous when the same pattern exists in multiple files. Fixes moderneinc/customer-requests#1759
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
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.
Summary
PatchApplyExceptionmessages to include the file path being patchedpatchApplyErrorWithHunkmessage template instead ofpatchApplyExceptionProblem
When a patch fails to apply, the error message only included the
HunkHeader(line start/count info), but not which file was being patched. This made debugging difficult since the same hunk pattern could occur in multiple files within a patch.Before:
After:
Solution
Changed four exception throws in
ApplyCommand.applyText()to use thepatchApplyErrorWithHunkmessage template which accepts the file path as its first parameter:Test plan
Code compiles successfully
Existing message templates already existed but were unused
Fixes moderneinc/customer-requests#1759