HomePhabricator

[WIP] Add highlighting of changes.
2feb6f340584Unpublished

Authored by WMDE-Fisch on Nov 10 2016, 10:29 AM.

Unpublished Commit · Learn More

Not On Permanent Ref: This commit is not an ancestor of any permanent ref.

Description

[WIP] Add highlighting of changes.

This patch introduces a new DiffFormater that builds similar to
the ArrayDiffFormater an array that aligns changes to the lines
from the original text. The formatted array will then be used
to build the highlighted and annotated single column diff view
for conflict solving.

TODO:

  • design refinements

Bug: T149720
Change-Id: Ib0c9911fe9f1e1e633df55183f1dd1c9765fd6c0

Details

Committed
WMDE-FischNov 18 2016, 11:04 AM
Parents
rESCC4be4cdbe513d: Use diff for changes instead of a textarea
Branches
Unknown
Tags
Unknown
References
refs/changes/28/322128/4
ChangeId
Ib0c9911fe9f1e1e633df55183f1dd1c9765fd6c0