wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-12 09:26:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Use internal diff engine"

Browse source
This commit is contained in:
jenkins-bot 2017-02-10 11:24:28 +00:00 committed by Gerrit Code Review
parent 801759d926 a1cb603bb3
commit d3fb6d38ea
1 changed files with 9 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
includes/DiffParser.php
View file

@ -77,9 +77,12 @@ class EchoDiffParser {
* 'left_pos' and 'right_pos' (in 1-indexed lines) of the change.
*/
public function getChangeSet( $leftText, $rightText ) {
$left = trim( $leftText ) . "\n";
$right = trim( $rightText ) . "\n";
$diff = wfDiff( $left, $right, '-u -w' );
$left = trim( $leftText );
$right = trim( $rightText );
$diffs = new Diff( explode( "\n", $left ), explode( "\n", $right ) );
$format = new UnifiedDiffFormatter();
$diff = $format->format( $diffs );
return $this->parse( $diff, $left, $right );
}
@ -87,15 +90,11 @@ class EchoDiffParser {
/**
* Duplicates the check from the global wfDiff function to determine
* if we are using internal or external diff utilities
*
* @deprecated since 1.29, the internal diff parser is always used
*/
protected static function usingInternalDiff() {
global $wgDiff;
wfSuppressWarnings();
$haveDiff = $wgDiff && file_exists( $wgDiff );
wfRestoreWarnings();
return !$haveDiff;
return true;
}
/**