Repository navigation
fix(patch): emit real hunk line counts - #921
Closed
ANIRUDDHA ADAK (aniruddhaadak80) wants to merge 1 commit into
Closed
ANIRUDDHA ADAK (aniruddhaadak80) wants to merge 1 commit into
ANIRUDDHA ADAK (aniruddhaadak80) wants to merge 1 commit into
Conversation
ANIRUDDHA ADAK (aniruddhaadak80)
requested review from
Aayam Bansal (aayambansal) and
Ishaan Gangwani (ishaan1124)
as code owners
October 3, 2026 05:16
|
ANIRUDDHA ADAK (@aniruddhaadak80) is attempting to deploy a commit to the InkVell Team on Vercel. A member of the Team first needs to authorize it. |
Member
|
Incorporated, reviewed, and validated in #953, now merged into main. Closing this original PR as superseded by the consolidated change. |
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.
What does this PR do, and why?
generateUnifiedDiffhard-coded a one-line hunk header,"@@ -1 +1 @@", regardless of how many lines the hunk actually contains.Linked issue
small fix, no issue
How did you verify it?
cd backend/cli && bun test test/patch/patch.test.ts -t "hunk line counts"Regression proof: reverted ONLY the source fix while keeping both new tests: both failed with the exact header mismatch. Restored, 26/26 pass.
cd backend/cli && bun test test/patch/patch.test.ts -> 26 pass, 0 fail (was 24 before this change)I read #779 (
computeReplacements, the input side) and #826 (the parser) first: neither touchesgenerateUnifiedDiff, so there is no overlap. Trailing-empty-line andhasChanges === false-> "" behaviour is preserved. The,Nform is emitted even when N is 1, which is valid unified diff and matches the form the ACP test fixture already uses.Not verified: no
git applyend-to-end run (no git binary path exercised). The generator's known simplification of dropping empty lines is untouched. The apply_patch suites show flaky 5000 ms timeouts both at base and with this change.Two pre-existing conditions in this checkout, reproduced on the untouched base commit and therefore not caused by this change: �un run typecheck (turbo) fails with sgo: command not found, and �un run format:check reports roughly 30 files. I ran sc --noEmit for �ackend/cli and prettier on the files I touched instead; neither appears in the base warning list.
Checklist
I left the first box unticked rather than claiming it: �un run check cannot pass in this checkout because turbo cannot find sgo, and that failure reproduces on the base commit.