Differential D20845

Perform basic block interdiffs when diffing abstract blocks, and interdiff markdown in Jupyter notebooks
ClosedPublic
Actions

Authored by epriestley on Sat, Sep 28, 12:25 AM.

Details

Reviewers: None
Maniphest Tasks: T13425: Support diffs between abstract block lists in the UI
Commits: rPd9515e82a3ec: Perform basic block interdiffs when diffing abstract blocks, and interdiff…

Summary

Depends on D20844. Ref T13425. When we line up two blocks and they can be interdiffed (generally: they both have the same type of content), let the Engine interdiff them.

Then, make the Jupyter engine interdiff markdown.

Test Plan

Diff Detail

Repository

rP Phabricator

Lint

Automatic diff as part of commit; lint not applicable.

Unit

Automatic diff as part of commit; unit tests not applicable.

Event Timeline

epriestley created this revision.Sat, Sep 28, 12:25 AM

Harbormaster completed remote builds in B23516: Diff 49689.Sat, Sep 28, 12:27 AM

epriestley requested review of this revision.Sat, Sep 28, 12:27 AM

epriestley added a child revision: D20848: Force unified abstract block diffs into roughly usable shape.Mon, Sep 30, 5:34 PM

This revision was not accepted when it landed; it landed in state Needs Review.Mon, Sep 30, 5:43 PM

Closed by commit rPd9515e82a3ec: Perform basic block interdiffs when diffing abstract blocks, and interdiff… (authored by epriestley). · Explain Why

This revision was automatically updated to reflect the committed changes.

epriestley added a commit: rPd9515e82a3ec: Perform basic block interdiffs when diffing abstract blocks, and interdiff….

Revision Contents
Changeset List

		Path
M		src/__phutil_library_map__.php (2 lines)
M		src/applications/differential/parser/DifferentialChangesetParser.php (19 lines)
M		src/applications/differential/render/DifferentialChangesetOneUpRenderer.php (2 lines)
M		src/applications/differential/render/DifferentialChangesetRenderer.php (11 lines)
M		src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php (76 lines)
M		src/applications/files/diff/PhabricatorDocumentEngineBlock.php (14 lines)
A	M	src/applications/files/diff/PhabricatorDocumentEngineBlockDiff.php (47 lines)
M		src/applications/files/diff/PhabricatorDocumentEngineBlocks.php (4 lines)
M		src/applications/files/document/PhabricatorDocumentEngine.php (24 lines)
M		src/applications/files/document/PhabricatorImageDocumentEngine.php (18 lines)
M		src/applications/files/document/PhabricatorJupyterDocumentEngine.php (182 lines)

Diff	ID	Base	Description	Created	Lint	Unit
Base			Base
Diff 1	49689	280ab43		Sat, Sep 28, 12:25 AM	★	★
Diff 2	49697	5afdc62	rPd9515e82a3ec77d7ff101c0a5adca7881d65b1f4	Mon, Sep 30, 5:43 PM	★	★

Status	Author	Revision
Closed	epriestley	D20848 Force unified abstract block diffs into roughly usable shape
Closed	epriestley	D20845 Perform basic block interdiffs when diffing abstract blocks, and interdiff markdown in Jupyter notebooks
Closed	epriestley	D20844 Make basic Juypter notebook rendering improvements and roughly support folding unchanged context
Closed	epriestley	D20843 Improve sequencing of various content/header checks in abstract block diffs