5 * @subpackage DifferenceEngine
9 require_once( 'Revision.php' );
11 define( 'MAX_DIFF_LINE', 10000 );
12 define( 'MAX_DIFF_XREF_LENGTH', 10000 );
18 * @subpackage DifferenceEngine
20 class DifferenceEngine
{
24 var $mOldid, $mNewid, $mTitle;
25 var $mOldtitle, $mNewtitle, $mPagetitle;
26 var $mOldtext, $mNewtext;
27 var $mOldPage, $mNewPage;
28 var $mRcidMarkPatrolled;
29 var $mOldRev, $mNewRev;
30 var $mRevisionsLoaded = false; // Have the revisions been loaded
31 var $mTextLoaded = 0; // How many text blobs have been loaded, 0, 1 or 2?
36 * @param $titleObj Title object that the diff is associated with
37 * @param $old Integer: old ID we want to show and diff with.
38 * @param $new String: either 'prev' or 'next'.
39 * @param $rcid Integer: ??? FIXME (default 0)
41 function DifferenceEngine( $titleObj = null, $old = 0, $new = 0, $rcid = 0 ) {
42 $this->mTitle
= $titleObj;
43 wfDebug("DifferenceEngine old '$old' new '$new' rcid '$rcid'\n");
45 if ( 'prev' === $new ) {
46 # Show diff between revision $old and the previous one.
47 # Get previous one from DB.
49 $this->mNewid
= intval($old);
51 $this->mOldid
= $this->mTitle
->getPreviousRevisionID( $this->mNewid
);
53 } elseif ( 'next' === $new ) {
54 # Show diff between revision $old and the previous one.
55 # Get previous one from DB.
57 $this->mOldid
= intval($old);
58 $this->mNewid
= $this->mTitle
->getNextRevisionID( $this->mOldid
);
59 if ( false === $this->mNewid
) {
60 # if no result, NewId points to the newest old revision. The only newer
61 # revision is cur, which is "0".
66 $this->mOldid
= intval($old);
67 $this->mNewid
= intval($new);
69 $this->mRcidMarkPatrolled
= intval($rcid); # force it to be an integer
72 function showDiffPage() {
73 global $wgUser, $wgOut, $wgContLang, $wgUseExternalEditor, $wgUseRCPatrol;
74 $fname = 'DifferenceEngine::showDiffPage';
75 wfProfileIn( $fname );
77 # If external diffs are enabled both globally and for the user,
78 # we'll use the application/x-external-editor interface to call
79 # an external diff tool like kompare, kdiff3, etc.
80 if($wgUseExternalEditor && $wgUser->getOption('externaldiff')) {
81 global $wgInputEncoding,$wgServer,$wgScript,$wgLang;
83 header ( "Content-type: application/x-external-editor; charset=".$wgInputEncoding );
84 $url1=$this->mTitle
->getFullURL("action=raw&oldid=".$this->mOldid
);
85 $url2=$this->mTitle
->getFullURL("action=raw&oldid=".$this->mNewid
);
86 $special=$wgLang->getNsText(NS_SPECIAL
);
91 Script={$wgServer}{$wgScript}
92 Special namespace={$special}
106 $t = $this->mTitle
->getPrefixedText() . " (Diff: {$this->mOldid}, " .
108 $mtext = wfMsg( 'missingarticle', "<nowiki>$t</nowiki>" );
110 $wgOut->setArticleFlag( false );
111 if ( ! $this->loadRevisionData() ) {
112 $wgOut->setPagetitle( wfMsg( 'errorpagetitle' ) );
113 $wgOut->addWikitext( $mtext );
114 wfProfileOut( $fname );
118 wfRunHooks( 'DiffViewHeader', array( $this, $this->mOldRev
, $this->mNewRev
) );
120 if ( $this->mNewRev
->isCurrent() ) {
121 $wgOut->setArticleFlag( true );
124 # mOldid is false if the difference engine is called with a "vague" query for
125 # a diff between a version V and its previous version V' AND the version V
126 # is the first version of that article. In that case, V' does not exist.
127 if ( $this->mOldid
=== false ) {
128 $this->showFirstRevision();
129 wfProfileOut( $fname );
133 $wgOut->suppressQuickbar();
135 $oldTitle = $this->mOldPage
->getPrefixedText();
136 $newTitle = $this->mNewPage
->getPrefixedText();
137 if( $oldTitle == $newTitle ) {
138 $wgOut->setPageTitle( $newTitle );
140 $wgOut->setPageTitle( $oldTitle . ', ' . $newTitle );
142 $wgOut->setSubtitle( wfMsg( 'difference' ) );
143 $wgOut->setRobotpolicy( 'noindex,follow' );
145 if ( !( $this->mOldPage
->userCanRead() && $this->mNewPage
->userCanRead() ) ) {
146 $wgOut->loginToUse();
148 wfProfileOut( $fname );
152 $sk = $wgUser->getSkin();
153 $talk = $wgContLang->getNsText( NS_TALK
);
154 $contribs = wfMsg( 'contribslink' );
156 if ( $this->mNewRev
->isCurrent() && $wgUser->isAllowed('rollback') ) {
157 $username = $this->mNewRev
->getUserText();
158 $rollback = ' <strong>[' . $sk->makeKnownLinkObj( $this->mTitle
, wfMsg( 'rollbacklink' ),
159 'action=rollback&from=' . urlencode( $username ) .
160 '&token=' . urlencode( $wgUser->editToken( array( $this->mTitle
->getPrefixedText(), $username ) ) ) ) .
165 if( $wgUseRCPatrol && $this->mRcidMarkPatrolled
!= 0 && $wgUser->isAllowed( 'patrol' ) ) {
166 $patrol = ' [' . $sk->makeKnownLinkObj( $this->mTitle
, wfMsg( 'markaspatrolleddiff' ), "action=markpatrolled&rcid={$this->mRcidMarkPatrolled}" ) . ']';
171 $prevlink = $sk->makeKnownLinkObj( $this->mTitle
, wfMsgHtml( 'previousdiff' ),
172 'diff=prev&oldid='.$this->mOldid
, '', '', 'id="differences-prevlink"' );
173 if ( $this->mNewRev
->isCurrent() ) {
176 $nextlink = $sk->makeKnownLinkObj( $this->mTitle
, wfMsgHtml( 'nextdiff' ),
177 'diff=next&oldid='.$this->mNewid
, '', '', 'id="differences-nextlink"' );
180 $oldHeader = "<strong>{$this->mOldtitle}</strong><br />" .
181 $sk->revUserTools( $this->mOldRev
) . "<br />" .
182 $sk->revComment( $this->mOldRev
) . "<br />" .
184 $newHeader = "<strong>{$this->mNewtitle}</strong><br />" .
185 $sk->revUserTools( $this->mNewRev
) . " $rollback<br />" .
186 $sk->revComment( $this->mNewRev
) . "<br />" .
189 $this->showDiff( $oldHeader, $newHeader );
190 $wgOut->addHTML( "<hr /><h2>{$this->mPagetitle}</h2>\n" );
192 if( !$this->mNewRev
->isCurrent() ) {
193 $oldEditSectionSetting = $wgOut->mParserOptions
->setEditSection( false );
196 $this->loadNewText();
197 if( is_object( $this->mNewRev
) ) {
198 $wgOut->setRevisionId( $this->mNewRev
->getId() );
200 $wgOut->addSecondaryWikiText( $this->mNewtext
);
202 if( !$this->mNewRev
->isCurrent() ) {
203 $wgOut->mParserOptions
->setEditSection( $oldEditSectionSetting );
206 wfProfileOut( $fname );
210 * Show the first revision of an article. Uses normal diff headers in
211 * contrast to normal "old revision" display style.
213 function showFirstRevision() {
214 global $wgOut, $wgUser;
216 $fname = 'DifferenceEngine::showFirstRevision';
217 wfProfileIn( $fname );
219 # Get article text from the DB
221 if ( ! $this->loadNewText() ) {
222 $t = $this->mTitle
->getPrefixedText() . " (Diff: {$this->mOldid}, " .
224 $mtext = wfMsg( 'missingarticle', "<nowiki>$t</nowiki>" );
225 $wgOut->setPagetitle( wfMsg( 'errorpagetitle' ) );
226 $wgOut->addWikitext( $mtext );
227 wfProfileOut( $fname );
230 if ( $this->mNewRev
->isCurrent() ) {
231 $wgOut->setArticleFlag( true );
234 # Check if user is allowed to look at this page. If not, bail out.
236 if ( !( $this->mTitle
->userCanRead() ) ) {
237 $wgOut->loginToUse();
239 wfProfileOut( $fname );
243 # Prepare the header box
245 $sk = $wgUser->getSkin();
247 $nextlink = $sk->makeKnownLinkObj( $this->mTitle
, wfMsgHtml( 'nextdiff' ), 'diff=next&oldid='.$this->mNewid
, '', '', 'id="differences-nextlink"' );
248 $header = "<div class=\"firstrevisionheader\" style=\"text-align: center\"><strong>{$this->mOldtitle}</strong><br />" .
249 $sk->revUserTools( $this->mNewRev
) . "<br />" .
250 $sk->revComment( $this->mNewRev
) . "<br />" .
251 $nextlink . "</div>\n";
253 $wgOut->addHTML( $header );
255 $wgOut->setSubtitle( wfMsg( 'difference' ) );
256 $wgOut->setRobotpolicy( 'noindex,nofollow' );
259 # Show current revision
261 $wgOut->addHTML( "<hr /><h2>{$this->mPagetitle}</h2>\n" );
262 if( is_object( $this->mNewRev
) ) {
263 $wgOut->setRevisionId( $this->mNewRev
->getId() );
265 $wgOut->addSecondaryWikiText( $this->mNewtext
);
267 wfProfileOut( $fname );
271 * Get the diff text, send it to $wgOut
272 * Returns false if the diff could not be generated, otherwise returns true
274 function showDiff( $otitle, $ntitle ) {
276 $diff = $this->getDiff( $otitle, $ntitle );
277 if ( $diff === false ) {
278 $wgOut->addWikitext( wfMsg( 'missingarticle', "<nowiki>(fixme, bug)</nowiki>" ) );
281 $wgOut->addHTML( $diff );
287 * Get diff table, including header
288 * Note that the interface has changed, it's no longer static.
289 * Returns false on error
291 function getDiff( $otitle, $ntitle ) {
292 $body = $this->getDiffBody();
293 if ( $body === false ) {
296 return $this->addHeader( $body, $otitle, $ntitle );
301 * Get the diff table body, without header
303 * Returns false on error
305 function getDiffBody() {
306 global $wgMemc, $wgDBname;
307 $fname = 'DifferenceEngine::getDiffBody';
308 wfProfileIn( $fname );
312 if ( $this->mOldid
&& $this->mNewid
) {
314 $key = "$wgDBname:diff:oldid:{$this->mOldid}:newid:{$this->mNewid}";
315 $difftext = $wgMemc->get( $key );
317 wfIncrStats( 'diff_cache_hit' );
318 $difftext = $this->localiseLineNumbers( $difftext );
319 $difftext .= "\n<!-- diff cache key $key -->\n";
320 wfProfileOut( $fname );
325 if ( !$this->loadText() ) {
326 wfProfileOut( $fname );
330 $difftext = $this->generateDiffBody( $this->mOldtext
, $this->mNewtext
);
332 // Save to cache for 7 days
333 if ( $key !== false && $difftext !== false ) {
334 wfIncrStats( 'diff_cache_miss' );
335 $wgMemc->set( $key, $difftext, 7*86400 );
337 wfIncrStats( 'diff_uncacheable' );
339 // Replace line numbers with the text in the user's language
340 if ( $difftext !== false ) {
341 $difftext = $this->localiseLineNumbers( $difftext );
343 wfProfileOut( $fname );
348 * Generate a diff, no caching
349 * $otext and $ntext must be already segmented
351 function generateDiffBody( $otext, $ntext ) {
352 global $wgExternalDiffEngine, $wgContLang;
353 $fname = 'DifferenceEngine::generateDiffBody';
355 $otext = str_replace( "\r\n", "\n", $otext );
356 $ntext = str_replace( "\r\n", "\n", $ntext );
358 if ( $wgExternalDiffEngine == 'wikidiff' ) {
359 # For historical reasons, external diff engine expects
360 # input text to be HTML-escaped already
361 $otext = htmlspecialchars ( $wgContLang->segmentForDiff( $otext ) );
362 $ntext = htmlspecialchars ( $wgContLang->segmentForDiff( $ntext ) );
363 if( !function_exists( 'wikidiff_do_diff' ) ) {
364 dl('php_wikidiff.so');
366 return $wgContLang->unsegementForDiff( wikidiff_do_diff( $otext, $ntext, 2 ) );
369 if ( $wgExternalDiffEngine == 'wikidiff2' ) {
370 # Better external diff engine, the 2 may some day be dropped
371 # This one does the escaping and segmenting itself
372 if ( !function_exists( 'wikidiff2_do_diff' ) ) {
373 wfProfileIn( "$fname-dl" );
374 @dl
('php_wikidiff2.so');
375 wfProfileOut( "$fname-dl" );
377 if ( function_exists( 'wikidiff2_do_diff' ) ) {
378 wfProfileIn( 'wikidiff2_do_diff' );
379 $text = wikidiff2_do_diff( $otext, $ntext, 2 );
380 wfProfileOut( 'wikidiff2_do_diff' );
384 if ( $wgExternalDiffEngine !== false ) {
386 global $wgTmpDirectory;
387 $tempName1 = tempnam( $wgTmpDirectory, 'diff_' );
388 $tempName2 = tempnam( $wgTmpDirectory, 'diff_' );
390 $tempFile1 = fopen( $tempName1, "w" );
392 wfProfileOut( $fname );
395 $tempFile2 = fopen( $tempName2, "w" );
397 wfProfileOut( $fname );
400 fwrite( $tempFile1, $otext );
401 fwrite( $tempFile2, $ntext );
402 fclose( $tempFile1 );
403 fclose( $tempFile2 );
404 $cmd = wfEscapeShellArg( $wgExternalDiffEngine, $tempName1, $tempName2 );
405 wfProfileIn( "$fname-shellexec" );
406 $difftext = wfShellExec( $cmd );
407 wfProfileOut( "$fname-shellexec" );
408 unlink( $tempName1 );
409 unlink( $tempName2 );
414 $ota = explode( "\n", $wgContLang->segmentForDiff( $otext ) );
415 $nta = explode( "\n", $wgContLang->segmentForDiff( $ntext ) );
416 $diffs =& new Diff( $ota, $nta );
417 $formatter =& new TableDiffFormatter();
418 return $wgContLang->unsegmentForDiff( $formatter->format( $diffs ) );
423 * Replace line numbers with the text in the user's language
425 function localiseLineNumbers( $text ) {
426 return preg_replace_callback( '/<!--LINE (\d+)-->/',
427 array( &$this, 'localiseLineNumbersCb' ), $text );
430 function localiseLineNumbersCb( $matches ) {
432 return wfMsgExt( 'lineno', array('parseinline'), $wgLang->formatNum( $matches[1] ) );
436 * Add the header to a diff body
438 function addHeader( $diff, $otitle, $ntitle ) {
440 <table border='0' width='98%' cellpadding='0' cellspacing='4' class='diff'>
442 <td colspan='2' width='50%' align='center' class='diff-otitle'>{$otitle}</td>
443 <td colspan='2' width='50%' align='center' class='diff-ntitle'>{$ntitle}</td>
452 * Use specified text instead of loading from the database
454 function setText( $oldText, $newText ) {
455 $this->mOldtext
= $oldText;
456 $this->mNewtext
= $newText;
457 $this->mTextLoaded
= 2;
461 * Load revision metadata for the specified articles. If newid is 0, then compare
462 * the old article in oldid to the current article; if oldid is 0, then
463 * compare the current article to the immediately previous one (ignoring the
466 * If oldid is false, leave the corresponding revision object set
467 * to false. This is impossible via ordinary user input, and is provided for
470 function loadRevisionData() {
472 if ( $this->mRevisionsLoaded
) {
475 // Whether it succeeds or fails, we don't want to try again
476 $this->mRevisionsLoaded
= true;
479 // Load the new revision object
480 if( $this->mNewid
) {
481 $this->mNewRev
= Revision
::newFromId( $this->mNewid
);
483 $this->mNewRev
= Revision
::newFromTitle( $this->mTitle
);
486 if( is_null( $this->mNewRev
) ) {
490 // Set assorted variables
491 if( $this->mNewRev
->isCurrent() ) {
492 $this->mNewPage
= $this->mTitle
;
493 $newLink = $this->mNewPage
->escapeLocalUrl();
494 $this->mPagetitle
= htmlspecialchars( wfMsg( 'currentrev' ) );
495 $newEdit = $this->mNewPage
->escapeLocalUrl( 'action=edit' );
497 $this->mNewPage
= $this->mNewRev
->getTitle();
498 $newLink = $this->mNewPage
->escapeLocalUrl( 'oldid=' . $this->mNewid
);
499 $newEdit = $this->mNewPage
->escapeLocalUrl( 'action=edit&oldid=' . $this->mNewid
);
500 $t = $wgLang->timeanddate( $this->mNewRev
->getTimestamp(), true );
501 $this->mPagetitle
= htmlspecialchars( wfMsg( 'revisionasof', $t ) );
503 $this->mNewtitle
= "<strong><a href='$newLink'>{$this->mPagetitle}</a></strong>"
504 . " (<a href='$newEdit'>" . htmlspecialchars( wfMsg( 'editold' ) ) . "</a>)";
506 // Load the old revision object
507 $this->mOldRev
= false;
508 if( $this->mOldid
) {
509 $this->mOldRev
= Revision
::newFromId( $this->mOldid
);
510 } elseif ( $this->mOldid
=== 0 ) {
511 $rev = $this->mNewRev
->getPrevious();
513 $this->mOldid
= $rev->getId();
514 $this->mOldRev
= $rev;
516 // No previous revision; mark to show as first-version only.
517 $this->mOldid
= false;
518 $this->mOldRev
= false;
520 }/* elseif ( $this->mOldid === false ) leave mOldRev false; */
522 if( is_null( $this->mOldRev
) ) {
526 if ( $this->mOldRev
) {
527 $this->mOldPage
= $this->mOldRev
->getTitle();
529 $t = $wgLang->timeanddate( $this->mOldRev
->getTimestamp(), true );
530 $oldLink = $this->mOldPage
->escapeLocalUrl( 'oldid=' . $this->mOldid
);
531 $oldEdit = $this->mOldPage
->escapeLocalUrl( 'action=edit&oldid=' . $this->mOldid
);
532 $this->mOldtitle
= "<strong><a href='$oldLink'>" . htmlspecialchars( wfMsg( 'revisionasof', $t ) )
533 . "</a></strong> (<a href='$oldEdit'>" . htmlspecialchars( wfMsg( 'editold' ) ) . "</a>)";
540 * Load the text of the revisions, as well as revision data.
542 function loadText() {
543 if ( $this->mTextLoaded
== 2 ) {
546 // Whether it succeeds or fails, we don't want to try again
547 $this->mTextLoaded
= 2;
550 if ( !$this->loadRevisionData() ) {
553 if ( $this->mOldRev
) {
554 // FIXME: permission tests
555 $this->mOldtext
= $this->mOldRev
->getText();
556 if ( $this->mOldtext
=== false ) {
560 if ( $this->mNewRev
) {
561 $this->mNewtext
= $this->mNewRev
->getText();
562 if ( $this->mNewtext
=== false ) {
570 * Load the text of the new revision, not the old one
572 function loadNewText() {
573 if ( $this->mTextLoaded
>= 1 ) {
576 $this->mTextLoaded
= 1;
578 if ( !$this->loadRevisionData() ) {
581 $this->mNewtext
= $this->mNewRev
->getText();
588 // A PHP diff engine for phpwiki. (Taken from phpwiki-1.3.3)
590 // Copyright (C) 2000, 2001 Geoffrey T. Dairiki <dairiki@dairiki.org>
591 // You may copy this code freely under the conditions of the GPL.
594 define('USE_ASSERTS', function_exists('assert'));
600 * @subpackage DifferenceEngine
608 trigger_error('pure virtual', E_USER_ERROR
);
612 return $this->orig ?
sizeof($this->orig
) : 0;
615 function nclosing() {
616 return $this->closing ?
sizeof($this->closing
) : 0;
624 * @subpackage DifferenceEngine
626 class _DiffOp_Copy
extends _DiffOp
{
629 function _DiffOp_Copy ($orig, $closing = false) {
630 if (!is_array($closing))
633 $this->closing
= $closing;
637 return new _DiffOp_Copy($this->closing
, $this->orig
);
645 * @subpackage DifferenceEngine
647 class _DiffOp_Delete
extends _DiffOp
{
648 var $type = 'delete';
650 function _DiffOp_Delete ($lines) {
651 $this->orig
= $lines;
652 $this->closing
= false;
656 return new _DiffOp_Add($this->orig
);
664 * @subpackage DifferenceEngine
666 class _DiffOp_Add
extends _DiffOp
{
669 function _DiffOp_Add ($lines) {
670 $this->closing
= $lines;
675 return new _DiffOp_Delete($this->closing
);
683 * @subpackage DifferenceEngine
685 class _DiffOp_Change
extends _DiffOp
{
686 var $type = 'change';
688 function _DiffOp_Change ($orig, $closing) {
690 $this->closing
= $closing;
694 return new _DiffOp_Change($this->closing
, $this->orig
);
700 * Class used internally by Diff to actually compute the diffs.
702 * The algorithm used here is mostly lifted from the perl module
703 * Algorithm::Diff (version 1.06) by Ned Konz, which is available at:
704 * http://www.perl.com/CPAN/authors/id/N/NE/NEDKONZ/Algorithm-Diff-1.06.zip
706 * More ideas are taken from:
707 * http://www.ics.uci.edu/~eppstein/161/960229.html
709 * Some ideas are (and a bit of code) are from from analyze.c, from GNU
710 * diffutils-2.7, which can be found at:
711 * ftp://gnudist.gnu.org/pub/gnu/diffutils/diffutils-2.7.tar.gz
713 * closingly, some ideas (subdivision by NCHUNKS > 2, and some optimizations)
716 * Line length limits for robustness added by Tim Starling, 2005-08-31
718 * @author Geoffrey T. Dairiki, Tim Starling
721 * @subpackage DifferenceEngine
725 function diff ($from_lines, $to_lines) {
726 $fname = '_DiffEngine::diff';
727 wfProfileIn( $fname );
729 $n_from = sizeof($from_lines);
730 $n_to = sizeof($to_lines);
732 $this->xchanged
= $this->ychanged
= array();
733 $this->xv
= $this->yv
= array();
734 $this->xind
= $this->yind
= array();
736 unset($this->in_seq
);
739 // Skip leading common lines.
740 for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++
) {
741 if ($from_lines[$skip] !== $to_lines[$skip])
743 $this->xchanged
[$skip] = $this->ychanged
[$skip] = false;
745 // Skip trailing common lines.
746 $xi = $n_from; $yi = $n_to;
747 for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++
) {
748 if ($from_lines[$xi] !== $to_lines[$yi])
750 $this->xchanged
[$xi] = $this->ychanged
[$yi] = false;
753 // Ignore lines which do not exist in both files.
754 for ($xi = $skip; $xi < $n_from - $endskip; $xi++
) {
755 $xhash[$this->_line_hash($from_lines[$xi])] = 1;
758 for ($yi = $skip; $yi < $n_to - $endskip; $yi++
) {
759 $line = $to_lines[$yi];
760 if ( ($this->ychanged
[$yi] = empty($xhash[$this->_line_hash($line)])) )
762 $yhash[$this->_line_hash($line)] = 1;
766 for ($xi = $skip; $xi < $n_from - $endskip; $xi++
) {
767 $line = $from_lines[$xi];
768 if ( ($this->xchanged
[$xi] = empty($yhash[$this->_line_hash($line)])) )
775 $this->_compareseq(0, sizeof($this->xv
), 0, sizeof($this->yv
));
777 // Merge edits when possible
778 $this->_shift_boundaries($from_lines, $this->xchanged
, $this->ychanged
);
779 $this->_shift_boundaries($to_lines, $this->ychanged
, $this->xchanged
);
781 // Compute the edit operations.
784 while ($xi < $n_from ||
$yi < $n_to) {
785 USE_ASSERTS
&& assert($yi < $n_to ||
$this->xchanged
[$xi]);
786 USE_ASSERTS
&& assert($xi < $n_from ||
$this->ychanged
[$yi]);
788 // Skip matching "snake".
790 while ( $xi < $n_from && $yi < $n_to
791 && !$this->xchanged
[$xi] && !$this->ychanged
[$yi]) {
792 $copy[] = $from_lines[$xi++
];
796 $edits[] = new _DiffOp_Copy($copy);
798 // Find deletes & adds.
800 while ($xi < $n_from && $this->xchanged
[$xi])
801 $delete[] = $from_lines[$xi++
];
804 while ($yi < $n_to && $this->ychanged
[$yi])
805 $add[] = $to_lines[$yi++
];
808 $edits[] = new _DiffOp_Change($delete, $add);
810 $edits[] = new _DiffOp_Delete($delete);
812 $edits[] = new _DiffOp_Add($add);
814 wfProfileOut( $fname );
819 * Returns the whole line if it's small enough, or the MD5 hash otherwise
821 function _line_hash( $line ) {
822 if ( strlen( $line ) > MAX_DIFF_XREF_LENGTH
) {
830 /* Divide the Largest Common Subsequence (LCS) of the sequences
831 * [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally
834 * Returns (LCS, PTS). LCS is the length of the LCS. PTS is an
835 * array of NCHUNKS+1 (X, Y) indexes giving the diving points between
836 * sub sequences. The first sub-sequence is contained in [X0, X1),
837 * [Y0, Y1), the second in [X1, X2), [Y1, Y2) and so on. Note
838 * that (X0, Y0) == (XOFF, YOFF) and
839 * (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM).
841 * This function assumes that the first lines of the specified portions
842 * of the two files do not match, and likewise that the last lines do not
843 * match. The caller must trim matching lines from the beginning and end
844 * of the portions it is going to specify.
846 function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks) {
847 $fname = '_DiffEngine::_diag';
848 wfProfileIn( $fname );
851 if ($xlim - $xoff > $ylim - $yoff) {
852 // Things seems faster (I'm not sure I understand why)
853 // when the shortest sequence in X.
855 list ($xoff, $xlim, $yoff, $ylim)
856 = array( $yoff, $ylim, $xoff, $xlim);
860 for ($i = $ylim - 1; $i >= $yoff; $i--)
861 $ymatches[$this->xv
[$i]][] = $i;
863 for ($i = $ylim - 1; $i >= $yoff; $i--)
864 $ymatches[$this->yv
[$i]][] = $i;
867 $this->seq
[0]= $yoff - 1;
868 $this->in_seq
= array();
871 $numer = $xlim - $xoff +
$nchunks - 1;
873 for ($chunk = 0; $chunk < $nchunks; $chunk++
) {
874 wfProfileIn( "$fname-chunk" );
876 for ($i = 0; $i <= $this->lcs
; $i++
)
877 $ymids[$i][$chunk-1] = $this->seq
[$i];
879 $x1 = $xoff +
(int)(($numer +
($xlim-$xoff)*$chunk) / $nchunks);
880 for ( ; $x < $x1; $x++
) {
881 $line = $flip ?
$this->yv
[$x] : $this->xv
[$x];
882 if (empty($ymatches[$line]))
884 $matches = $ymatches[$line];
886 while (list ($junk, $y) = each($matches))
887 if (empty($this->in_seq
[$y])) {
888 $k = $this->_lcs_pos($y);
889 USE_ASSERTS
&& assert($k > 0);
890 $ymids[$k] = $ymids[$k-1];
893 while (list ($junk, $y) = each($matches)) {
894 if ($y > $this->seq
[$k-1]) {
895 USE_ASSERTS
&& assert($y < $this->seq
[$k]);
896 // Optimization: this is a common case:
897 // next match is just replacing previous match.
898 $this->in_seq
[$this->seq
[$k]] = false;
900 $this->in_seq
[$y] = 1;
901 } else if (empty($this->in_seq
[$y])) {
902 $k = $this->_lcs_pos($y);
903 USE_ASSERTS
&& assert($k > 0);
904 $ymids[$k] = $ymids[$k-1];
908 wfProfileOut( "$fname-chunk" );
911 $seps[] = $flip ?
array($yoff, $xoff) : array($xoff, $yoff);
912 $ymid = $ymids[$this->lcs
];
913 for ($n = 0; $n < $nchunks - 1; $n++
) {
914 $x1 = $xoff +
(int)(($numer +
($xlim - $xoff) * $n) / $nchunks);
916 $seps[] = $flip ?
array($y1, $x1) : array($x1, $y1);
918 $seps[] = $flip ?
array($ylim, $xlim) : array($xlim, $ylim);
920 wfProfileOut( $fname );
921 return array($this->lcs
, $seps);
924 function _lcs_pos ($ypos) {
925 $fname = '_DiffEngine::_lcs_pos';
926 wfProfileIn( $fname );
929 if ($end == 0 ||
$ypos > $this->seq
[$end]) {
930 $this->seq
[++
$this->lcs
] = $ypos;
931 $this->in_seq
[$ypos] = 1;
932 wfProfileOut( $fname );
937 while ($beg < $end) {
938 $mid = (int)(($beg +
$end) / 2);
939 if ( $ypos > $this->seq
[$mid] )
945 USE_ASSERTS
&& assert($ypos != $this->seq
[$end]);
947 $this->in_seq
[$this->seq
[$end]] = false;
948 $this->seq
[$end] = $ypos;
949 $this->in_seq
[$ypos] = 1;
950 wfProfileOut( $fname );
954 /* Find LCS of two sequences.
956 * The results are recorded in the vectors $this->{x,y}changed[], by
957 * storing a 1 in the element for each line that is an insertion
958 * or deletion (ie. is not in the LCS).
960 * The subsequence of file 0 is [XOFF, XLIM) and likewise for file 1.
962 * Note that XLIM, YLIM are exclusive bounds.
963 * All line numbers are origin-0 and discarded lines are not counted.
965 function _compareseq ($xoff, $xlim, $yoff, $ylim) {
966 $fname = '_DiffEngine::_compareseq';
967 wfProfileIn( $fname );
969 // Slide down the bottom initial diagonal.
970 while ($xoff < $xlim && $yoff < $ylim
971 && $this->xv
[$xoff] == $this->yv
[$yoff]) {
976 // Slide up the top initial diagonal.
977 while ($xlim > $xoff && $ylim > $yoff
978 && $this->xv
[$xlim - 1] == $this->yv
[$ylim - 1]) {
983 if ($xoff == $xlim ||
$yoff == $ylim)
986 // This is ad hoc but seems to work well.
987 //$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5);
988 //$nchunks = max(2,min(8,(int)$nchunks));
989 $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) +
1;
991 = $this->_diag($xoff,$xlim,$yoff, $ylim,$nchunks);
995 // X and Y sequences have no common subsequence:
997 while ($yoff < $ylim)
998 $this->ychanged
[$this->yind
[$yoff++
]] = 1;
999 while ($xoff < $xlim)
1000 $this->xchanged
[$this->xind
[$xoff++
]] = 1;
1002 // Use the partitions to split this problem into subproblems.
1005 while ($pt2 = next($seps)) {
1006 $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
1010 wfProfileOut( $fname );
1013 /* Adjust inserts/deletes of identical lines to join changes
1014 * as much as possible.
1016 * We do something when a run of changed lines include a
1017 * line at one end and has an excluded, identical line at the other.
1018 * We are free to choose which identical line is included.
1019 * `compareseq' usually chooses the one at the beginning,
1020 * but usually it is cleaner to consider the following identical line
1021 * to be the "change".
1023 * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
1025 function _shift_boundaries ($lines, &$changed, $other_changed) {
1026 $fname = '_DiffEngine::_shift_boundaries';
1027 wfProfileIn( $fname );
1031 USE_ASSERTS
&& assert('sizeof($lines) == sizeof($changed)');
1032 $len = sizeof($lines);
1033 $other_len = sizeof($other_changed);
1037 * Scan forwards to find beginning of another run of changes.
1038 * Also keep track of the corresponding point in the other file.
1040 * Throughout this code, $i and $j are adjusted together so that
1041 * the first $i elements of $changed and the first $j elements
1042 * of $other_changed both contain the same number of zeros
1043 * (unchanged lines).
1044 * Furthermore, $j is always kept so that $j == $other_len or
1045 * $other_changed[$j] == false.
1047 while ($j < $other_len && $other_changed[$j])
1050 while ($i < $len && ! $changed[$i]) {
1051 USE_ASSERTS
&& assert('$j < $other_len && ! $other_changed[$j]');
1053 while ($j < $other_len && $other_changed[$j])
1062 // Find the end of this run of changes.
1063 while (++
$i < $len && $changed[$i])
1068 * Record the length of this run of changes, so that
1069 * we can later determine whether the run has grown.
1071 $runlength = $i - $start;
1074 * Move the changed region back, so long as the
1075 * previous unchanged line matches the last changed one.
1076 * This merges with previous changed regions.
1078 while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) {
1079 $changed[--$start] = 1;
1080 $changed[--$i] = false;
1081 while ($start > 0 && $changed[$start - 1])
1083 USE_ASSERTS
&& assert('$j > 0');
1084 while ($other_changed[--$j])
1086 USE_ASSERTS
&& assert('$j >= 0 && !$other_changed[$j]');
1090 * Set CORRESPONDING to the end of the changed run, at the last
1091 * point where it corresponds to a changed run in the other file.
1092 * CORRESPONDING == LEN means no such point has been found.
1094 $corresponding = $j < $other_len ?
$i : $len;
1097 * Move the changed region forward, so long as the
1098 * first changed line matches the following unchanged one.
1099 * This merges with following changed regions.
1100 * Do this second, so that if there are no merges,
1101 * the changed region is moved forward as far as possible.
1103 while ($i < $len && $lines[$start] == $lines[$i]) {
1104 $changed[$start++
] = false;
1106 while ($i < $len && $changed[$i])
1109 USE_ASSERTS
&& assert('$j < $other_len && ! $other_changed[$j]');
1111 if ($j < $other_len && $other_changed[$j]) {
1112 $corresponding = $i;
1113 while ($j < $other_len && $other_changed[$j])
1117 } while ($runlength != $i - $start);
1120 * If possible, move the fully-merged run of changes
1121 * back to a corresponding run in the other file.
1123 while ($corresponding < $i) {
1124 $changed[--$start] = 1;
1126 USE_ASSERTS
&& assert('$j > 0');
1127 while ($other_changed[--$j])
1129 USE_ASSERTS
&& assert('$j >= 0 && !$other_changed[$j]');
1132 wfProfileOut( $fname );
1137 * Class representing a 'diff' between two sequences of strings.
1140 * @package MediaWiki
1141 * @subpackage DifferenceEngine
1149 * Computes diff between sequences of strings.
1151 * @param $from_lines array An array of strings.
1152 * (Typically these are lines from a file.)
1153 * @param $to_lines array An array of strings.
1155 function Diff($from_lines, $to_lines) {
1156 $eng = new _DiffEngine
;
1157 $this->edits
= $eng->diff($from_lines, $to_lines);
1158 //$this->_check($from_lines, $to_lines);
1162 * Compute reversed Diff.
1166 * $diff = new Diff($lines1, $lines2);
1167 * $rev = $diff->reverse();
1168 * @return object A Diff object representing the inverse of the
1171 function reverse () {
1173 $rev->edits
= array();
1174 foreach ($this->edits
as $edit) {
1175 $rev->edits
[] = $edit->reverse();
1181 * Check for empty diff.
1183 * @return bool True iff two sequences were identical.
1185 function isEmpty () {
1186 foreach ($this->edits
as $edit) {
1187 if ($edit->type
!= 'copy')
1194 * Compute the length of the Longest Common Subsequence (LCS).
1196 * This is mostly for diagnostic purposed.
1198 * @return int The length of the LCS.
1202 foreach ($this->edits
as $edit) {
1203 if ($edit->type
== 'copy')
1204 $lcs +
= sizeof($edit->orig
);
1210 * Get the original set of lines.
1212 * This reconstructs the $from_lines parameter passed to the
1215 * @return array The original sequence of strings.
1220 foreach ($this->edits
as $edit) {
1222 array_splice($lines, sizeof($lines), 0, $edit->orig
);
1228 * Get the closing set of lines.
1230 * This reconstructs the $to_lines parameter passed to the
1233 * @return array The sequence of strings.
1235 function closing() {
1238 foreach ($this->edits
as $edit) {
1240 array_splice($lines, sizeof($lines), 0, $edit->closing
);
1246 * Check a Diff for validity.
1248 * This is here only for debugging purposes.
1250 function _check ($from_lines, $to_lines) {
1251 $fname = 'Diff::_check';
1252 wfProfileIn( $fname );
1253 if (serialize($from_lines) != serialize($this->orig()))
1254 trigger_error("Reconstructed original doesn't match", E_USER_ERROR
);
1255 if (serialize($to_lines) != serialize($this->closing()))
1256 trigger_error("Reconstructed closing doesn't match", E_USER_ERROR
);
1258 $rev = $this->reverse();
1259 if (serialize($to_lines) != serialize($rev->orig()))
1260 trigger_error("Reversed original doesn't match", E_USER_ERROR
);
1261 if (serialize($from_lines) != serialize($rev->closing()))
1262 trigger_error("Reversed closing doesn't match", E_USER_ERROR
);
1266 foreach ($this->edits
as $edit) {
1267 if ( $prevtype == $edit->type
)
1268 trigger_error("Edit sequence is non-optimal", E_USER_ERROR
);
1269 $prevtype = $edit->type
;
1272 $lcs = $this->lcs();
1273 trigger_error('Diff okay: LCS = '.$lcs, E_USER_NOTICE
);
1274 wfProfileOut( $fname );
1282 * @package MediaWiki
1283 * @subpackage DifferenceEngine
1285 class MappedDiff
extends Diff
1290 * Computes diff between sequences of strings.
1292 * This can be used to compute things like
1293 * case-insensitve diffs, or diffs which ignore
1294 * changes in white-space.
1296 * @param $from_lines array An array of strings.
1297 * (Typically these are lines from a file.)
1299 * @param $to_lines array An array of strings.
1301 * @param $mapped_from_lines array This array should
1302 * have the same size number of elements as $from_lines.
1303 * The elements in $mapped_from_lines and
1304 * $mapped_to_lines are what is actually compared
1305 * when computing the diff.
1307 * @param $mapped_to_lines array This array should
1308 * have the same number of elements as $to_lines.
1310 function MappedDiff($from_lines, $to_lines,
1311 $mapped_from_lines, $mapped_to_lines) {
1312 $fname = 'MappedDiff::MappedDiff';
1313 wfProfileIn( $fname );
1315 assert(sizeof($from_lines) == sizeof($mapped_from_lines));
1316 assert(sizeof($to_lines) == sizeof($mapped_to_lines));
1318 $this->Diff($mapped_from_lines, $mapped_to_lines);
1321 for ($i = 0; $i < sizeof($this->edits
); $i++
) {
1322 $orig = &$this->edits
[$i]->orig
;
1323 if (is_array($orig)) {
1324 $orig = array_slice($from_lines, $xi, sizeof($orig));
1325 $xi +
= sizeof($orig);
1328 $closing = &$this->edits
[$i]->closing
;
1329 if (is_array($closing)) {
1330 $closing = array_slice($to_lines, $yi, sizeof($closing));
1331 $yi +
= sizeof($closing);
1334 wfProfileOut( $fname );
1339 * A class to format Diffs
1341 * This class formats the diff in classic diff format.
1342 * It is intended that this class be customized via inheritance,
1343 * to obtain fancier outputs.
1346 * @package MediaWiki
1347 * @subpackage DifferenceEngine
1352 * Number of leading context "lines" to preserve.
1354 * This should be left at zero for this class, but subclasses
1355 * may want to set this to other values.
1357 var $leading_context_lines = 0;
1360 * Number of trailing context "lines" to preserve.
1362 * This should be left at zero for this class, but subclasses
1363 * may want to set this to other values.
1365 var $trailing_context_lines = 0;
1370 * @param $diff object A Diff object.
1371 * @return string The formatted output.
1373 function format($diff) {
1374 $fname = 'DiffFormatter::format';
1375 wfProfileIn( $fname );
1381 $nlead = $this->leading_context_lines
;
1382 $ntrail = $this->trailing_context_lines
;
1384 $this->_start_diff();
1386 foreach ($diff->edits
as $edit) {
1387 if ($edit->type
== 'copy') {
1388 if (is_array($block)) {
1389 if (sizeof($edit->orig
) <= $nlead +
$ntrail) {
1394 $context = array_slice($edit->orig
, 0, $ntrail);
1395 $block[] = new _DiffOp_Copy($context);
1397 $this->_block($x0, $ntrail +
$xi - $x0,
1398 $y0, $ntrail +
$yi - $y0,
1403 $context = $edit->orig
;
1406 if (! is_array($block)) {
1407 $context = array_slice($context, sizeof($context) - $nlead);
1408 $x0 = $xi - sizeof($context);
1409 $y0 = $yi - sizeof($context);
1412 $block[] = new _DiffOp_Copy($context);
1418 $xi +
= sizeof($edit->orig
);
1420 $yi +
= sizeof($edit->closing
);
1423 if (is_array($block))
1424 $this->_block($x0, $xi - $x0,
1428 $end = $this->_end_diff();
1429 wfProfileOut( $fname );
1433 function _block($xbeg, $xlen, $ybeg, $ylen, &$edits) {
1434 $fname = 'DiffFormatter::_block';
1435 wfProfileIn( $fname );
1436 $this->_start_block($this->_block_header($xbeg, $xlen, $ybeg, $ylen));
1437 foreach ($edits as $edit) {
1438 if ($edit->type
== 'copy')
1439 $this->_context($edit->orig
);
1440 elseif ($edit->type
== 'add')
1441 $this->_added($edit->closing
);
1442 elseif ($edit->type
== 'delete')
1443 $this->_deleted($edit->orig
);
1444 elseif ($edit->type
== 'change')
1445 $this->_changed($edit->orig
, $edit->closing
);
1447 trigger_error('Unknown edit type', E_USER_ERROR
);
1449 $this->_end_block();
1450 wfProfileOut( $fname );
1453 function _start_diff() {
1457 function _end_diff() {
1458 $val = ob_get_contents();
1463 function _block_header($xbeg, $xlen, $ybeg, $ylen) {
1465 $xbeg .= "," . ($xbeg +
$xlen - 1);
1467 $ybeg .= "," . ($ybeg +
$ylen - 1);
1469 return $xbeg . ($xlen ?
($ylen ?
'c' : 'd') : 'a') . $ybeg;
1472 function _start_block($header) {
1476 function _end_block() {
1479 function _lines($lines, $prefix = ' ') {
1480 foreach ($lines as $line)
1481 echo "$prefix $line\n";
1484 function _context($lines) {
1485 $this->_lines($lines);
1488 function _added($lines) {
1489 $this->_lines($lines, '>');
1491 function _deleted($lines) {
1492 $this->_lines($lines, '<');
1495 function _changed($orig, $closing) {
1496 $this->_deleted($orig);
1498 $this->_added($closing);
1504 * Additions by Axel Boldt follow, partly taken from diff.php, phpwiki-1.3.3
1508 define('NBSP', ' '); // iso-8859-x non-breaking space.
1513 * @package MediaWiki
1514 * @subpackage DifferenceEngine
1516 class _HWLDF_WordAccumulator
{
1517 function _HWLDF_WordAccumulator () {
1518 $this->_lines
= array();
1524 function _flushGroup ($new_tag) {
1525 if ($this->_group
!== '') {
1526 if ($this->_tag
== 'mark')
1527 $this->_line
.= '<span class="diffchange">' .
1528 htmlspecialchars ( $this->_group
) . '</span>';
1530 $this->_line
.= htmlspecialchars ( $this->_group
);
1533 $this->_tag
= $new_tag;
1536 function _flushLine ($new_tag) {
1537 $this->_flushGroup($new_tag);
1538 if ($this->_line
!= '')
1539 array_push ( $this->_lines
, $this->_line
);
1541 # make empty lines visible by inserting an NBSP
1542 array_push ( $this->_lines
, NBSP
);
1546 function addWords ($words, $tag = '') {
1547 if ($tag != $this->_tag
)
1548 $this->_flushGroup($tag);
1550 foreach ($words as $word) {
1551 // new-line should only come as first char of word.
1554 if ($word[0] == "\n") {
1555 $this->_flushLine($tag);
1556 $word = substr($word, 1);
1558 assert(!strstr($word, "\n"));
1559 $this->_group
.= $word;
1563 function getLines() {
1564 $this->_flushLine('~done');
1565 return $this->_lines
;
1572 * @package MediaWiki
1573 * @subpackage DifferenceEngine
1575 class WordLevelDiff
extends MappedDiff
1577 function WordLevelDiff ($orig_lines, $closing_lines) {
1578 $fname = 'WordLevelDiff::WordLevelDiff';
1579 wfProfileIn( $fname );
1581 list ($orig_words, $orig_stripped) = $this->_split($orig_lines);
1582 list ($closing_words, $closing_stripped) = $this->_split($closing_lines);
1584 $this->MappedDiff($orig_words, $closing_words,
1585 $orig_stripped, $closing_stripped);
1586 wfProfileOut( $fname );
1589 function _split($lines) {
1590 $fname = 'WordLevelDiff::_split';
1591 wfProfileIn( $fname );
1594 $stripped = array();
1596 foreach ( $lines as $line ) {
1597 # If the line is too long, just pretend the entire line is one big word
1598 # This prevents resource exhaustion problems
1605 if ( strlen( $line ) > MAX_DIFF_LINE
) {
1607 $stripped[] = $line;
1609 if (preg_match_all('/ ( [^\S\n]+ | [0-9_A-Za-z\x80-\xff]+ | . ) (?: (?!< \n) [^\S\n])? /xs',
1612 $words = array_merge( $words, $m[0] );
1613 $stripped = array_merge( $stripped, $m[1] );
1617 wfProfileOut( $fname );
1618 return array($words, $stripped);
1622 $fname = 'WordLevelDiff::orig';
1623 wfProfileIn( $fname );
1624 $orig = new _HWLDF_WordAccumulator
;
1626 foreach ($this->edits
as $edit) {
1627 if ($edit->type
== 'copy')
1628 $orig->addWords($edit->orig
);
1629 elseif ($edit->orig
)
1630 $orig->addWords($edit->orig
, 'mark');
1632 $lines = $orig->getLines();
1633 wfProfileOut( $fname );
1637 function closing () {
1638 $fname = 'WordLevelDiff::closing';
1639 wfProfileIn( $fname );
1640 $closing = new _HWLDF_WordAccumulator
;
1642 foreach ($this->edits
as $edit) {
1643 if ($edit->type
== 'copy')
1644 $closing->addWords($edit->closing
);
1645 elseif ($edit->closing
)
1646 $closing->addWords($edit->closing
, 'mark');
1648 $lines = $closing->getLines();
1649 wfProfileOut( $fname );
1655 * Wikipedia Table style diff formatter.
1658 * @package MediaWiki
1659 * @subpackage DifferenceEngine
1661 class TableDiffFormatter
extends DiffFormatter
1663 function TableDiffFormatter() {
1664 $this->leading_context_lines
= 2;
1665 $this->trailing_context_lines
= 2;
1668 function _block_header( $xbeg, $xlen, $ybeg, $ylen ) {
1669 $r = '<tr><td colspan="2" align="left"><strong><!--LINE '.$xbeg."--></strong></td>\n" .
1670 '<td colspan="2" align="left"><strong><!--LINE '.$ybeg."--></strong></td></tr>\n";
1674 function _start_block( $header ) {
1678 function _end_block() {
1681 function _lines( $lines, $prefix=' ', $color='white' ) {
1684 # HTML-escape parameter before calling this
1685 function addedLine( $line ) {
1686 return "<td>+</td><td class='diff-addedline'>{$line}</td>";
1689 # HTML-escape parameter before calling this
1690 function deletedLine( $line ) {
1691 return "<td>-</td><td class='diff-deletedline'>{$line}</td>";
1694 # HTML-escape parameter before calling this
1695 function contextLine( $line ) {
1696 return "<td> </td><td class='diff-context'>{$line}</td>";
1699 function emptyLine() {
1700 return '<td colspan="2"> </td>';
1703 function _added( $lines ) {
1704 foreach ($lines as $line) {
1705 echo '<tr>' . $this->emptyLine() .
1706 $this->addedLine( htmlspecialchars ( $line ) ) . "</tr>\n";
1710 function _deleted($lines) {
1711 foreach ($lines as $line) {
1712 echo '<tr>' . $this->deletedLine( htmlspecialchars ( $line ) ) .
1713 $this->emptyLine() . "</tr>\n";
1717 function _context( $lines ) {
1718 foreach ($lines as $line) {
1720 $this->contextLine( htmlspecialchars ( $line ) ) .
1721 $this->contextLine( htmlspecialchars ( $line ) ) . "</tr>\n";
1725 function _changed( $orig, $closing ) {
1726 $fname = 'TableDiffFormatter::_changed';
1727 wfProfileIn( $fname );
1729 $diff = new WordLevelDiff( $orig, $closing );
1730 $del = $diff->orig();
1731 $add = $diff->closing();
1733 # Notice that WordLevelDiff returns HTML-escaped output.
1734 # Hence, we will be calling addedLine/deletedLine without HTML-escaping.
1736 while ( $line = array_shift( $del ) ) {
1737 $aline = array_shift( $add );
1738 echo '<tr>' . $this->deletedLine( $line ) .
1739 $this->addedLine( $aline ) . "</tr>\n";
1741 foreach ($add as $line) { # If any leftovers
1742 echo '<tr>' . $this->emptyLine() .
1743 $this->addedLine( $line ) . "</tr>\n";
1745 wfProfileOut( $fname );