Differential D20959

Fix an issue where the last line of block-based diffs could be incorrectly hidden
ClosedPublic
Actions

Authored by epriestley on Jan 30 2020, 4:17 PM.

Tags

None

Referenced Files

	F19034790: D20959.diff
	Tue, Nov 25, 3:02 PM

	F18985319: D20959.id49934.diff
	Mon, Nov 17, 12:58 PM

	F18906674: D20959.diff
	Sat, Nov 8, 7:35 PM

	F18904957: D20959.id49934.diff
	Sat, Nov 8, 12:06 PM

	F18877589: D20959.id49935.diff
	Thu, Nov 6, 10:38 AM

	F18870738: D20959.id49935.diff
	Tue, Nov 4, 6:44 PM

	F18856352: D20959.id49935.diff
	Sat, Nov 1, 9:22 AM

	F18836473: D20959.diff
	Mon, Oct 27, 1:11 AM

Subscribers

None

Details

Reviewers: None
Maniphest Tasks: T13425: Support diffs between abstract block lists in the UI
T13468: Last block of blocked Jupyter notebook diffs is not displayed in side-by-side view
Commits: rPccf28a81121e: Fix an issue where the last line of block-based diffs could be incorrectly…

Summary

Fixes T13468. See that task for discussion. The older source-rendering code mixes "line number" / "1-based" lists with "block number" / "0-based" lists and then has other bugs which cancel this out.

For block-based diffs, build an explicit block-based mask with only block numbers. This sort of sidesteps the whole issue.

Test Plan

Viewed the diff with the original reproduction case, plus various other block-based diffs, including one-block image diffs, in unified and side-by-side mode. Didn't spot any oddities.

Diff Detail

Repository

Branch

jupyter1

Lint

Lint Passed

Unit

Tests Passed

Build Status

Buildable 23760
Build 32676: Run Core Tests
Build 32675: arc lint + arc unit

Event Timeline

epriestley created this revision.Jan 30 2020, 4:17 PM

Harbormaster completed remote builds in B23760: Diff 49934.Jan 30 2020, 4:19 PM

This revision was not accepted when it landed; it landed in state Needs Review.Jan 30 2020, 4:19 PM

epriestley requested review of this revision.

Closed by commit rPccf28a81121e: Fix an issue where the last line of block-based diffs could be incorrectly… (authored by epriestley). · Explain Why

This revision was automatically updated to reflect the committed changes.

epriestley added a commit: rPccf28a81121e: Fix an issue where the last line of block-based diffs could be incorrectly….

epriestley added a task: T13425: Support diffs between abstract block lists in the UI.Jan 30 2020, 6:45 PM

Revision Contents
Changeset List

Path

Size

src/

applications/

differential/

parser/

DifferentialHunkParser.php

64 lines

files/

diff/

PhabricatorDocumentEngineBlocks.php

11 lines

Diff 49934

src/applications/differential/parser/DifferentialHunkParser.php

Loading...

src/applications/files/diff/PhabricatorDocumentEngineBlocks.php

Loading...