Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
wiki.techinc.nl/tests/phpunit/includes/diff/TextDiffer/externalDiffTest.sh

9 lines
64 B
Bash
Raw Normal View History

Factor out TextDiffer hierarchy from TextSlotDiffRenderer * Follow the TODO comment in TextSlotDiffRenderer ::getTextDiffInternal() by moving the code out to three parallel implementations, namely ExternalTextDiffer, PhpTextDiffer and Wikidiff2TextDiffer. * Add a container/factory class ManifoldTextDiffer to glue them together and collate available formats. * Move the inline legend to Wikidiff2TextDiffer. Not the toggle since the ability to toggle depends on the available format, not the current format. * Update the diff cache keys so that ManifoldTextDiffer can store the engine=>format map it used to generate the diff. * Drop support for the second parameter to TextSlotDiffRenderer ::setEngine(), since nothing used it anymore. * Provide a format batch API, since some engines are able to efficiently generate multiple formats. This might be used by DifferenceEngine in future. Needs risky change notification for the cache key change. Bug: T339184 Depends-On: I8a35b9b8ec1622c9a36d2496bdd24f51bc52c85f Change-Id: I5c506e39162855aff53dd420dd8145156739059c
2023-07-03 08:27:47 +00:00
#!/bin/sh
Fix ExternalTextDifferTest on macOS In POSIX sh, `echo` flags are undefined. On macOS, this causes the expected output to include literal `-n`s instead of the expected behavior of not printing trailing newlines. So, use `printf` instead, which should work consistently on both macOS and Linux. Follows-up I5c506e3916285. Change-Id: I54fc42d8fb8156fcf1d623ef4a7515092e634f09
2024-05-04 19:27:32 +00:00
printf '%s' '- '
Factor out TextDiffer hierarchy from TextSlotDiffRenderer * Follow the TODO comment in TextSlotDiffRenderer ::getTextDiffInternal() by moving the code out to three parallel implementations, namely ExternalTextDiffer, PhpTextDiffer and Wikidiff2TextDiffer. * Add a container/factory class ManifoldTextDiffer to glue them together and collate available formats. * Move the inline legend to Wikidiff2TextDiffer. Not the toggle since the ability to toggle depends on the available format, not the current format. * Update the diff cache keys so that ManifoldTextDiffer can store the engine=>format map it used to generate the diff. * Drop support for the second parameter to TextSlotDiffRenderer ::setEngine(), since nothing used it anymore. * Provide a format batch API, since some engines are able to efficiently generate multiple formats. This might be used by DifferenceEngine in future. Needs risky change notification for the cache key change. Bug: T339184 Depends-On: I8a35b9b8ec1622c9a36d2496bdd24f51bc52c85f Change-Id: I5c506e39162855aff53dd420dd8145156739059c
2023-07-03 08:27:47 +00:00
cat $1
echo
Fix ExternalTextDifferTest on macOS In POSIX sh, `echo` flags are undefined. On macOS, this causes the expected output to include literal `-n`s instead of the expected behavior of not printing trailing newlines. So, use `printf` instead, which should work consistently on both macOS and Linux. Follows-up I5c506e3916285. Change-Id: I54fc42d8fb8156fcf1d623ef4a7515092e634f09
2024-05-04 19:27:32 +00:00
printf "+ "
Factor out TextDiffer hierarchy from TextSlotDiffRenderer * Follow the TODO comment in TextSlotDiffRenderer ::getTextDiffInternal() by moving the code out to three parallel implementations, namely ExternalTextDiffer, PhpTextDiffer and Wikidiff2TextDiffer. * Add a container/factory class ManifoldTextDiffer to glue them together and collate available formats. * Move the inline legend to Wikidiff2TextDiffer. Not the toggle since the ability to toggle depends on the available format, not the current format. * Update the diff cache keys so that ManifoldTextDiffer can store the engine=>format map it used to generate the diff. * Drop support for the second parameter to TextSlotDiffRenderer ::setEngine(), since nothing used it anymore. * Provide a format batch API, since some engines are able to efficiently generate multiple formats. This might be used by DifferenceEngine in future. Needs risky change notification for the cache key change. Bug: T339184 Depends-On: I8a35b9b8ec1622c9a36d2496bdd24f51bc52c85f Change-Id: I5c506e39162855aff53dd420dd8145156739059c
2023-07-03 08:27:47 +00:00
cat $2
echo
Reference in a new issue Copy permalink