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 $mOldUser, $mNewUser;
28 var $mOldComment, $mNewComment;
29 var $mOldPage, $mNewPage;
30 var $mRcidMarkPatrolled;
31 var $mOldRev, $mNewRev;
32 var $mRevisionsLoaded = false; // Have the revisions been loaded
33 var $mTextLoaded = 0; // How many text blobs have been loaded, 0, 1 or 2?
38 * @param Title $titleObj Title object that the diff is associated with
39 * @param integer $old Old ID we want to show and diff with.
40 * @param string $new Either 'prev' or 'next'.
41 * @param integer $rcid ??? (default 0)
43 function DifferenceEngine( $titleObj = null, $old = 0, $new = 0, $rcid = 0 ) {
44 $this->mTitle
= $titleObj;
45 wfDebug("DifferenceEngine old '$old' new '$new' rcid '$rcid'\n");
47 if ( 'prev' === $new ) {
48 # Show diff between revision $old and the previous one.
49 # Get previous one from DB.
51 $this->mNewid
= intval($old);
53 $this->mOldid
= $this->mTitle
->getPreviousRevisionID( $this->mNewid
);
55 } elseif ( 'next' === $new ) {
56 # Show diff between revision $old and the previous one.
57 # Get previous one from DB.
59 $this->mOldid
= intval($old);
60 $this->mNewid
= $this->mTitle
->getNextRevisionID( $this->mOldid
);
61 if ( false === $this->mNewid
) {
62 # if no result, NewId points to the newest old revision. The only newer
63 # revision is cur, which is "0".
68 $this->mOldid
= intval($old);
69 $this->mNewid
= intval($new);
71 $this->mRcidMarkPatrolled
= intval($rcid); # force it to be an integer
74 function showDiffPage() {
75 global $wgUser, $wgOut, $wgContLang, $wgOnlySysopsCanPatrol,
76 $wgUseExternalEditor, $wgUseRCPatrol;
77 $fname = 'DifferenceEngine::showDiffPage';
78 wfProfileIn( $fname );
80 # If external diffs are enabled both globally and for the user,
81 # we'll use the application/x-external-editor interface to call
82 # an external diff tool like kompare, kdiff3, etc.
83 if($wgUseExternalEditor && $wgUser->getOption('externaldiff')) {
84 global $wgInputEncoding,$wgServer,$wgScript,$wgLang;
86 header ( "Content-type: application/x-external-editor; charset=".$wgInputEncoding );
87 $url1=$this->mTitle
->getFullURL("action=raw&oldid=".$this->mOldid
);
88 $url2=$this->mTitle
->getFullURL("action=raw&oldid=".$this->mNewid
);
89 $special=$wgLang->getNsText(NS_SPECIAL
);
94 Script={$wgServer}{$wgScript}
95 Special namespace={$special}
109 $t = $this->mTitle
->getPrefixedText() . " (Diff: {$this->mOldid}, " .
111 $mtext = wfMsg( 'missingarticle', "<nowiki>$t</nowiki>" );
113 $wgOut->setArticleFlag( false );
114 if ( ! $this->loadRevisionData() ) {
115 $wgOut->setPagetitle( wfMsg( 'errorpagetitle' ) );
116 $wgOut->addWikitext( $mtext );
117 wfProfileOut( $fname );
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 $this->mOldComment
= $sk->formatComment($this->mOldComment
);
157 $this->mNewComment
= $sk->formatComment($this->mNewComment
);
159 $oldUserLink = $sk->makeLinkObj( Title
::makeTitleSafe( NS_USER
, $this->mOldUser
), $this->mOldUser
);
160 $newUserLink = $sk->makeLinkObj( Title
::makeTitleSafe( NS_USER
, $this->mNewUser
), $this->mNewUser
);
161 $oldUTLink = $sk->makeLinkObj( Title
::makeTitleSafe( NS_USER_TALK
, $this->mOldUser
), $talk );
162 $newUTLink = $sk->makeLinkObj( Title
::makeTitleSafe( NS_USER_TALK
, $this->mNewUser
), $talk );
163 $oldContribs = $sk->makeKnownLinkObj( Title
::makeTitle( NS_SPECIAL
, 'Contributions' ), $contribs,
164 'target=' . urlencode($this->mOldUser
) );
165 $newContribs = $sk->makeKnownLinkObj( Title
::makeTitle( NS_SPECIAL
, 'Contributions' ), $contribs,
166 'target=' . urlencode($this->mNewUser
) );
167 if ( $this->mNewRev
->isCurrent() && $wgUser->isAllowed('rollback') ) {
168 $rollback = ' <strong>[' . $sk->makeKnownLinkObj( $this->mTitle
, wfMsg( 'rollbacklink' ),
169 'action=rollback&from=' . urlencode($this->mNewUser
) .
170 '&token=' . urlencode( $wgUser->editToken( array( $this->mTitle
->getPrefixedText(), $this->mNewUser
) ) ) ) .
175 if ( $wgUseRCPatrol && $this->mRcidMarkPatrolled
!= 0 && $wgUser->isLoggedIn() &&
176 ( $wgUser->isAllowed('rollback') ||
!$wgOnlySysopsCanPatrol ) )
178 $patrol = ' [' . $sk->makeKnownLinkObj( $this->mTitle
, wfMsg( 'markaspatrolleddiff' ),
179 "action=markpatrolled&rcid={$this->mRcidMarkPatrolled}" ) . ']';
184 $prevlink = $sk->makeKnownLinkObj( $this->mTitle
, wfMsgHtml( 'previousdiff' ),
185 'diff=prev&oldid='.$this->mOldid
, '', '', 'id="differences-prevlink"' );
186 if ( $this->mNewRev
->isCurrent() ) {
189 $nextlink = $sk->makeKnownLinkObj( $this->mTitle
, wfMsgHtml( 'nextdiff' ),
190 'diff=next&oldid='.$this->mNewid
, '', '', 'id="differences-nextlink"' );
193 $oldHeader = "<strong>{$this->mOldtitle}</strong><br />$oldUserLink " .
194 "($oldUTLink | $oldContribs)<br />" . $this->mOldComment
.
195 '<br />' . $prevlink;
196 $newHeader = "<strong>{$this->mNewtitle}</strong><br />$newUserLink " .
197 "($newUTLink | $newContribs) $rollback<br />" . $this->mNewComment
.
198 '<br />' . $nextlink . $patrol;
200 $this->showDiff( $oldHeader, $newHeader );
201 $wgOut->addHTML( "<hr /><h2>{$this->mPagetitle}</h2>\n" );
203 if( !$this->mNewRev
->isCurrent() ) {
204 $oldEditSectionSetting = $wgOut->mParserOptions
->setEditSection( false );
207 $this->loadNewText();
208 if( is_object( $this->mNewRev
) ) {
209 $wgOut->setRevisionId( $this->mNewRev
->getId() );
211 $wgOut->addSecondaryWikiText( $this->mNewtext
);
213 if( !$this->mNewRev
->isCurrent() ) {
214 $wgOut->mParserOptions
->setEditSection( $oldEditSectionSetting );
217 wfProfileOut( $fname );
221 * Show the first revision of an article. Uses normal diff headers in
222 * contrast to normal "old revision" display style.
224 function showFirstRevision() {
225 global $wgOut, $wgUser, $wgLang;
227 $fname = 'DifferenceEngine::showFirstRevision';
228 wfProfileIn( $fname );
230 # Get article text from the DB
232 if ( ! $this->loadNewText() ) {
233 $t = $this->mTitle
->getPrefixedText() . " (Diff: {$this->mOldid}, " .
235 $mtext = wfMsg( 'missingarticle', "<nowiki>$t</nowiki>" );
236 $wgOut->setPagetitle( wfMsg( 'errorpagetitle' ) );
237 $wgOut->addWikitext( $mtext );
238 wfProfileOut( $fname );
241 if ( $this->mNewRev
->isCurrent() ) {
242 $wgOut->setArticleFlag( true );
245 # Check if user is allowed to look at this page. If not, bail out.
247 if ( !( $this->mTitle
->userCanRead() ) ) {
248 $wgOut->loginToUse();
250 wfProfileOut( $fname );
254 # Prepare the header box
256 $sk = $wgUser->getSkin();
258 $uTLink = $sk->makeLinkObj( Title
::makeTitleSafe( NS_USER_TALK
, $this->mOldUser
), $wgLang->getNsText( NS_TALK
) );
259 $userLink = $sk->makeLinkObj( Title
::makeTitleSafe( NS_USER
, $this->mOldUser
), $this->mOldUser
);
260 $contribs = $sk->makeKnownLinkObj( Title
::makeTitle( NS_SPECIAL
, 'Contributions' ), wfMsg( 'contribslink' ),
261 'target=' . urlencode($this->mOldUser
) );
262 $nextlink = $sk->makeKnownLinkObj( $this->mTitle
, wfMsgHtml( 'nextdiff' ), 'diff=next&oldid='.$this->mNewid
, '', '', 'id="differences-nextlink"' );
263 $header = "<div class=\"firstrevisionheader\" style=\"text-align: center\"><strong>{$this->mOldtitle}</strong><br />$userLink " .
264 "($uTLink | $contribs)<br />" . $this->mOldComment
.
265 '<br />' . $nextlink. "</div>\n";
267 $wgOut->addHTML( $header );
269 $wgOut->setSubtitle( wfMsg( 'difference' ) );
270 $wgOut->setRobotpolicy( 'noindex,follow' );
273 # Show current revision
275 $wgOut->addHTML( "<hr /><h2>{$this->mPagetitle}</h2>\n" );
276 if( is_object( $this->mNewRev
) ) {
277 $wgOut->setRevisionId( $this->mNewRev
->getId() );
279 $wgOut->addSecondaryWikiText( $this->mNewtext
);
281 wfProfileOut( $fname );
285 * Get the diff text, send it to $wgOut
286 * Returns false if the diff could not be generated, otherwise returns true
288 function showDiff( $otitle, $ntitle ) {
290 $diff = $this->getDiff( $otitle, $ntitle );
291 if ( $diff === false ) {
292 $wgOut->addWikitext( wfMsg( 'missingarticle', "<nowiki>$t</nowiki>" ) );
295 $wgOut->addHTML( $diff );
301 * Get diff table, including header
302 * Note that the interface has changed, it's no longer static.
303 * Returns false on error
305 function getDiff( $otitle, $ntitle ) {
306 $body = $this->getDiffBody();
307 if ( $body === false ) {
310 return $this->addHeader( $body, $otitle, $ntitle );
315 * Get the diff table body, without header
316 * Returns false on error
318 function getDiffBody() {
319 global $wgExternalDiffEngine, $wgContLang, $wgMemc, $wgDBname;
320 $fname = 'DifferenceEngine::getDiffBody';
321 wfProfileIn( $fname );
325 if ( $this->mOldid
&& $this->mNewid
) {
327 $key = "$wgDBname:diff:oldid:{$this->mOldid}:newid:{$this->mNewid}";
328 $difftext = $wgMemc->get( $key );
330 wfIncrStats( 'diff_cache_hit' );
331 $difftext = $this->localiseLineNumbers( $difftext );
332 $difftext .= "\n<!-- diff cache key $key -->\n";
333 wfProfileOut( $fname );
338 if ( !$this->loadText() ) {
339 wfProfileOut( $fname );
343 $otext = $wgContLang->segmentForDiff($this->mOldtext
);
344 $ntext = $wgContLang->segmentForDiff($this->mNewtext
);
345 if ( $wgExternalDiffEngine == 'wikidiff' ) {
346 # For historical reasons, external diff engine expects
347 # input text to be HTML-escaped already
348 $otext = str_replace( "\r\n", "\n", htmlspecialchars ( $otext ) );
349 $ntext = str_replace( "\r\n", "\n", htmlspecialchars ( $ntext ) );
350 if( !function_exists( 'wikidiff_do_diff' ) ) {
351 dl('php_wikidiff.so');
353 $difftext = wikidiff_do_diff( $otext, $ntext, 2 );
354 } elseif ( $wgExternalDiffEngine == 'wikidiff2' ) {
355 # Better external diff engine, the 2 may some day be dropped
356 # This one does the escaping itself
357 $otext = str_replace( "\r\n", "\n", $otext );
358 $ntext = str_replace( "\r\n", "\n", $ntext );
359 if ( !function_exists( 'wikidiff2_do_diff' ) ) {
360 dl('php_wikidiff2.so');
362 $difftext = wikidiff2_do_diff( $otext, $ntext, 2 );
363 } elseif ( $wgExternalDiffEngine !== false ) {
365 global $wgTmpDirectory;
366 $otext = str_replace( "\r\n", "\n", $otext );
367 $ntext = str_replace( "\r\n", "\n", $ntext );
368 $tempName1 = tempnam( $wgTmpDirectory, 'diff_' );
369 $tempName2 = tempnam( $wgTmpDirectory, 'diff_' );
371 $tempFile1 = fopen( $tempName1, "w" );
373 wfProfileOut( $fname );
376 $tempFile2 = fopen( $tempName2, "w" );
378 wfProfileOut( $fname );
381 fwrite( $tempFile1, $otext );
382 fwrite( $tempFile2, $ntext );
383 fclose( $tempFile1 );
384 fclose( $tempFile2 );
385 $cmd = wfEscapeShellArg( $wgExternalDiffEngine, $tempName1, $tempName2 );
386 wfProfileIn( "$fname-shellexec" );
387 $difftext = wfShellExec( $cmd );
388 wfProfileOut( "$fname-shellexec" );
389 unlink( $tempName1 );
390 unlink( $tempName2 );
392 $ota = explode( "\n", str_replace( "\r\n", "\n", $otext ) );
393 $nta = explode( "\n", str_replace( "\r\n", "\n", $ntext ) );
394 $diffs =& new Diff( $ota, $nta );
395 $formatter =& new TableDiffFormatter();
396 $difftext = $formatter->format( $diffs );
398 $difftext = $wgContLang->unsegmentForDiff($difftext);
400 // Save to cache for 7 days
401 if ( $key !== false ) {
402 wfIncrStats( 'diff_cache_miss' );
403 $wgMemc->set( $key, $difftext, 7*86400 );
405 wfIncrStats( 'diff_uncacheable' );
407 // Replace line numbers with the text in the user's language
408 $difftext = $this->localiseLineNumbers( $difftext );
409 wfProfileOut( $fname );
414 * Replace line numbers with the text in the user's language
416 function localiseLineNumbers( $text ) {
417 return preg_replace_callback( '/<!--LINE (\d+)-->/',
418 array( &$this, 'localiseLineNumbersCb' ), $text );
421 function localiseLineNumbersCb( $matches ) {
423 return wfMsg( 'lineno', $wgLang->formatNum( $matches[1] ) );
427 * Add the header to a diff body
429 function addHeader( $diff, $otitle, $ntitle ) {
431 <table border='0' width='98%' cellpadding='0' cellspacing='4' class='diff'>
433 <td colspan='2' width='50%' align='center' class='diff-otitle'>{$otitle}</td>
434 <td colspan='2' width='50%' align='center' class='diff-ntitle'>{$ntitle}</td>
443 * Use specified text instead of loading from the database
445 function setText( $oldText, $newText ) {
446 $this->mOldtext
= $oldText;
447 $this->mNewtext
= $newText;
448 $this->mTextLoaded
= 2;
452 * Load revision metadata for the specified articles. If newid is 0, then compare
453 * the old article in oldid to the current article; if oldid is 0, then
454 * compare the current article to the immediately previous one (ignoring the
457 * If oldid is false, leave the corresponding revision object set
458 * to false. This is impossible via ordinary user input, and is provided for
461 function loadRevisionData() {
463 if ( $this->mRevisionsLoaded
) {
466 // Whether it succeeds or fails, we don't want to try again
467 $this->mRevisionsLoaded
= true;
470 // Load the new revision object
471 if( $this->mNewid
) {
472 $this->mNewRev
= Revision
::newFromId( $this->mNewid
);
474 $this->mNewRev
= Revision
::newFromTitle( $this->mTitle
);
477 if( is_null( $this->mNewRev
) ) {
481 // Set assorted variables
482 if( $this->mNewRev
->isCurrent() ) {
483 $this->mPagetitle
= htmlspecialchars( wfMsg( 'currentrev' ) );
484 $this->mNewPage
= $this->mTitle
;
485 $newLink = $this->mNewPage
->escapeLocalUrl();
486 $this->mNewtitle
= "<a href='$newLink'>{$this->mPagetitle}</a>";
488 $this->mNewPage
= $this->mNewRev
->getTitle();
489 $newLink = $this->mNewPage
->escapeLocalUrl ('oldid=' . $this->mNewid
);
490 $t = $wgLang->timeanddate( $this->mNewRev
->getTimestamp(), true );
491 $this->mPagetitle
= htmlspecialchars( wfMsg( 'revisionasof', $t ) );
492 $this->mNewtitle
= "<a href='$newLink'>{$this->mPagetitle}</a>";
495 $this->mNewUser
= $this->mNewRev
->getUserText();
496 $this->mNewComment
= $this->mNewRev
->getComment();
498 // Load the old revision object
499 $this->mOldRev
= false;
500 if( $this->mOldid
) {
501 $this->mOldRev
= Revision
::newFromId( $this->mOldid
);
502 } elseif ( $this->mOldid
=== 0 ) {
503 $rev = $this->mNewRev
->getPrevious();
505 $this->mOldid
= $rev->getId();
506 $this->mOldRev
= $rev;
508 // No previous revision; mark to show as first-version only.
509 $this->mOldid
= false;
510 $this->mOldRev
= false;
512 }/* elseif ( $this->mOldid === false ) leave mOldRev false; */
514 if( is_null( $this->mOldRev
) ) {
518 if ( $this->mOldRev
) {
519 $this->mOldPage
= $this->mOldRev
->getTitle();
521 $t = $wgLang->timeanddate( $this->mOldRev
->getTimestamp(), true );
522 $oldLink = $this->mOldPage
->escapeLocalUrl( 'oldid=' . $this->mOldid
);
523 $this->mOldtitle
= "<a href='$oldLink'>" . htmlspecialchars( wfMsg( 'revisionasof', $t ) ) . '</a>';
526 $this->mOldUser
= $this->mOldRev
->getUserText();
527 $this->mOldComment
= $this->mOldRev
->getComment();
534 * Load the text of the revisions, as well as revision data.
536 function loadText() {
537 if ( $this->mTextLoaded
== 2 ) {
540 // Whether it succeeds or fails, we don't want to try again
541 $this->mTextLoaded
= 2;
544 if ( !$this->loadRevisionData() ) {
547 if ( $this->mOldRev
) {
548 $this->mOldtext
= $this->mOldRev
->getText();
549 if ( $this->mOldtext
=== false ) {
553 if ( $this->mNewRev
) {
554 $this->mNewtext
= $this->mNewRev
->getText();
555 if ( $this->mNewtext
=== false ) {
563 * Load the text of the new revision, not the old one
565 function loadNewText() {
566 if ( $this->mTextLoaded
>= 1 ) {
569 $this->mTextLoaded
= 1;
571 if ( !$this->loadRevisionData() ) {
574 $this->mNewtext
= $this->mNewRev
->getText();
581 // A PHP diff engine for phpwiki. (Taken from phpwiki-1.3.3)
583 // Copyright (C) 2000, 2001 Geoffrey T. Dairiki <dairiki@dairiki.org>
584 // You may copy this code freely under the conditions of the GPL.
587 define('USE_ASSERTS', function_exists('assert'));
593 * @subpackage DifferenceEngine
601 trigger_error('pure virtual', E_USER_ERROR
);
605 return $this->orig ?
sizeof($this->orig
) : 0;
608 function nclosing() {
609 return $this->closing ?
sizeof($this->closing
) : 0;
617 * @subpackage DifferenceEngine
619 class _DiffOp_Copy
extends _DiffOp
{
622 function _DiffOp_Copy ($orig, $closing = false) {
623 if (!is_array($closing))
626 $this->closing
= $closing;
630 return new _DiffOp_Copy($this->closing
, $this->orig
);
638 * @subpackage DifferenceEngine
640 class _DiffOp_Delete
extends _DiffOp
{
641 var $type = 'delete';
643 function _DiffOp_Delete ($lines) {
644 $this->orig
= $lines;
645 $this->closing
= false;
649 return new _DiffOp_Add($this->orig
);
657 * @subpackage DifferenceEngine
659 class _DiffOp_Add
extends _DiffOp
{
662 function _DiffOp_Add ($lines) {
663 $this->closing
= $lines;
668 return new _DiffOp_Delete($this->closing
);
676 * @subpackage DifferenceEngine
678 class _DiffOp_Change
extends _DiffOp
{
679 var $type = 'change';
681 function _DiffOp_Change ($orig, $closing) {
683 $this->closing
= $closing;
687 return new _DiffOp_Change($this->closing
, $this->orig
);
693 * Class used internally by Diff to actually compute the diffs.
695 * The algorithm used here is mostly lifted from the perl module
696 * Algorithm::Diff (version 1.06) by Ned Konz, which is available at:
697 * http://www.perl.com/CPAN/authors/id/N/NE/NEDKONZ/Algorithm-Diff-1.06.zip
699 * More ideas are taken from:
700 * http://www.ics.uci.edu/~eppstein/161/960229.html
702 * Some ideas are (and a bit of code) are from from analyze.c, from GNU
703 * diffutils-2.7, which can be found at:
704 * ftp://gnudist.gnu.org/pub/gnu/diffutils/diffutils-2.7.tar.gz
706 * closingly, some ideas (subdivision by NCHUNKS > 2, and some optimizations)
709 * Line length limits for robustness added by Tim Starling, 2005-08-31
711 * @author Geoffrey T. Dairiki, Tim Starling
714 * @subpackage DifferenceEngine
718 function diff ($from_lines, $to_lines) {
719 $fname = '_DiffEngine::diff';
720 wfProfileIn( $fname );
722 $n_from = sizeof($from_lines);
723 $n_to = sizeof($to_lines);
725 $this->xchanged
= $this->ychanged
= array();
726 $this->xv
= $this->yv
= array();
727 $this->xind
= $this->yind
= array();
729 unset($this->in_seq
);
732 // Skip leading common lines.
733 for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++
) {
734 if ($from_lines[$skip] !== $to_lines[$skip])
736 $this->xchanged
[$skip] = $this->ychanged
[$skip] = false;
738 // Skip trailing common lines.
739 $xi = $n_from; $yi = $n_to;
740 for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++
) {
741 if ($from_lines[$xi] !== $to_lines[$yi])
743 $this->xchanged
[$xi] = $this->ychanged
[$yi] = false;
746 // Ignore lines which do not exist in both files.
747 for ($xi = $skip; $xi < $n_from - $endskip; $xi++
) {
748 $xhash[$this->_line_hash($from_lines[$xi])] = 1;
751 for ($yi = $skip; $yi < $n_to - $endskip; $yi++
) {
752 $line = $to_lines[$yi];
753 if ( ($this->ychanged
[$yi] = empty($xhash[$this->_line_hash($line)])) )
755 $yhash[$this->_line_hash($line)] = 1;
759 for ($xi = $skip; $xi < $n_from - $endskip; $xi++
) {
760 $line = $from_lines[$xi];
761 if ( ($this->xchanged
[$xi] = empty($yhash[$this->_line_hash($line)])) )
768 $this->_compareseq(0, sizeof($this->xv
), 0, sizeof($this->yv
));
770 // Merge edits when possible
771 $this->_shift_boundaries($from_lines, $this->xchanged
, $this->ychanged
);
772 $this->_shift_boundaries($to_lines, $this->ychanged
, $this->xchanged
);
774 // Compute the edit operations.
777 while ($xi < $n_from ||
$yi < $n_to) {
778 USE_ASSERTS
&& assert($yi < $n_to ||
$this->xchanged
[$xi]);
779 USE_ASSERTS
&& assert($xi < $n_from ||
$this->ychanged
[$yi]);
781 // Skip matching "snake".
783 while ( $xi < $n_from && $yi < $n_to
784 && !$this->xchanged
[$xi] && !$this->ychanged
[$yi]) {
785 $copy[] = $from_lines[$xi++
];
789 $edits[] = new _DiffOp_Copy($copy);
791 // Find deletes & adds.
793 while ($xi < $n_from && $this->xchanged
[$xi])
794 $delete[] = $from_lines[$xi++
];
797 while ($yi < $n_to && $this->ychanged
[$yi])
798 $add[] = $to_lines[$yi++
];
801 $edits[] = new _DiffOp_Change($delete, $add);
803 $edits[] = new _DiffOp_Delete($delete);
805 $edits[] = new _DiffOp_Add($add);
807 wfProfileOut( $fname );
812 * Returns the whole line if it's small enough, or the MD5 hash otherwise
814 function _line_hash( $line ) {
815 if ( strlen( $line ) > MAX_DIFF_XREF_LENGTH
) {
823 /* Divide the Largest Common Subsequence (LCS) of the sequences
824 * [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally
827 * Returns (LCS, PTS). LCS is the length of the LCS. PTS is an
828 * array of NCHUNKS+1 (X, Y) indexes giving the diving points between
829 * sub sequences. The first sub-sequence is contained in [X0, X1),
830 * [Y0, Y1), the second in [X1, X2), [Y1, Y2) and so on. Note
831 * that (X0, Y0) == (XOFF, YOFF) and
832 * (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM).
834 * This function assumes that the first lines of the specified portions
835 * of the two files do not match, and likewise that the last lines do not
836 * match. The caller must trim matching lines from the beginning and end
837 * of the portions it is going to specify.
839 function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks) {
840 $fname = '_DiffEngine::_diag';
841 wfProfileIn( $fname );
844 if ($xlim - $xoff > $ylim - $yoff) {
845 // Things seems faster (I'm not sure I understand why)
846 // when the shortest sequence in X.
848 list ($xoff, $xlim, $yoff, $ylim)
849 = array( $yoff, $ylim, $xoff, $xlim);
853 for ($i = $ylim - 1; $i >= $yoff; $i--)
854 $ymatches[$this->xv
[$i]][] = $i;
856 for ($i = $ylim - 1; $i >= $yoff; $i--)
857 $ymatches[$this->yv
[$i]][] = $i;
860 $this->seq
[0]= $yoff - 1;
861 $this->in_seq
= array();
864 $numer = $xlim - $xoff +
$nchunks - 1;
866 for ($chunk = 0; $chunk < $nchunks; $chunk++
) {
867 wfProfileIn( "$fname-chunk" );
869 for ($i = 0; $i <= $this->lcs
; $i++
)
870 $ymids[$i][$chunk-1] = $this->seq
[$i];
872 $x1 = $xoff +
(int)(($numer +
($xlim-$xoff)*$chunk) / $nchunks);
873 for ( ; $x < $x1; $x++
) {
874 $line = $flip ?
$this->yv
[$x] : $this->xv
[$x];
875 if (empty($ymatches[$line]))
877 $matches = $ymatches[$line];
879 while (list ($junk, $y) = each($matches))
880 if (empty($this->in_seq
[$y])) {
881 $k = $this->_lcs_pos($y);
882 USE_ASSERTS
&& assert($k > 0);
883 $ymids[$k] = $ymids[$k-1];
886 while (list ($junk, $y) = each($matches)) {
887 if ($y > $this->seq
[$k-1]) {
888 USE_ASSERTS
&& assert($y < $this->seq
[$k]);
889 // Optimization: this is a common case:
890 // next match is just replacing previous match.
891 $this->in_seq
[$this->seq
[$k]] = false;
893 $this->in_seq
[$y] = 1;
894 } else if (empty($this->in_seq
[$y])) {
895 $k = $this->_lcs_pos($y);
896 USE_ASSERTS
&& assert($k > 0);
897 $ymids[$k] = $ymids[$k-1];
901 wfProfileOut( "$fname-chunk" );
904 $seps[] = $flip ?
array($yoff, $xoff) : array($xoff, $yoff);
905 $ymid = $ymids[$this->lcs
];
906 for ($n = 0; $n < $nchunks - 1; $n++
) {
907 $x1 = $xoff +
(int)(($numer +
($xlim - $xoff) * $n) / $nchunks);
909 $seps[] = $flip ?
array($y1, $x1) : array($x1, $y1);
911 $seps[] = $flip ?
array($ylim, $xlim) : array($xlim, $ylim);
913 wfProfileOut( $fname );
914 return array($this->lcs
, $seps);
917 function _lcs_pos ($ypos) {
918 $fname = '_DiffEngine::_lcs_pos';
919 wfProfileIn( $fname );
922 if ($end == 0 ||
$ypos > $this->seq
[$end]) {
923 $this->seq
[++
$this->lcs
] = $ypos;
924 $this->in_seq
[$ypos] = 1;
925 wfProfileOut( $fname );
930 while ($beg < $end) {
931 $mid = (int)(($beg +
$end) / 2);
932 if ( $ypos > $this->seq
[$mid] )
938 USE_ASSERTS
&& assert($ypos != $this->seq
[$end]);
940 $this->in_seq
[$this->seq
[$end]] = false;
941 $this->seq
[$end] = $ypos;
942 $this->in_seq
[$ypos] = 1;
943 wfProfileOut( $fname );
947 /* Find LCS of two sequences.
949 * The results are recorded in the vectors $this->{x,y}changed[], by
950 * storing a 1 in the element for each line that is an insertion
951 * or deletion (ie. is not in the LCS).
953 * The subsequence of file 0 is [XOFF, XLIM) and likewise for file 1.
955 * Note that XLIM, YLIM are exclusive bounds.
956 * All line numbers are origin-0 and discarded lines are not counted.
958 function _compareseq ($xoff, $xlim, $yoff, $ylim) {
959 $fname = '_DiffEngine::_compareseq';
960 wfProfileIn( $fname );
962 // Slide down the bottom initial diagonal.
963 while ($xoff < $xlim && $yoff < $ylim
964 && $this->xv
[$xoff] == $this->yv
[$yoff]) {
969 // Slide up the top initial diagonal.
970 while ($xlim > $xoff && $ylim > $yoff
971 && $this->xv
[$xlim - 1] == $this->yv
[$ylim - 1]) {
976 if ($xoff == $xlim ||
$yoff == $ylim)
979 // This is ad hoc but seems to work well.
980 //$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5);
981 //$nchunks = max(2,min(8,(int)$nchunks));
982 $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) +
1;
984 = $this->_diag($xoff,$xlim,$yoff, $ylim,$nchunks);
988 // X and Y sequences have no common subsequence:
990 while ($yoff < $ylim)
991 $this->ychanged
[$this->yind
[$yoff++
]] = 1;
992 while ($xoff < $xlim)
993 $this->xchanged
[$this->xind
[$xoff++
]] = 1;
995 // Use the partitions to split this problem into subproblems.
998 while ($pt2 = next($seps)) {
999 $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
1003 wfProfileOut( $fname );
1006 /* Adjust inserts/deletes of identical lines to join changes
1007 * as much as possible.
1009 * We do something when a run of changed lines include a
1010 * line at one end and has an excluded, identical line at the other.
1011 * We are free to choose which identical line is included.
1012 * `compareseq' usually chooses the one at the beginning,
1013 * but usually it is cleaner to consider the following identical line
1014 * to be the "change".
1016 * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
1018 function _shift_boundaries ($lines, &$changed, $other_changed) {
1019 $fname = '_DiffEngine::_shift_boundaries';
1020 wfProfileIn( $fname );
1024 USE_ASSERTS
&& assert('sizeof($lines) == sizeof($changed)');
1025 $len = sizeof($lines);
1026 $other_len = sizeof($other_changed);
1030 * Scan forwards to find beginning of another run of changes.
1031 * Also keep track of the corresponding point in the other file.
1033 * Throughout this code, $i and $j are adjusted together so that
1034 * the first $i elements of $changed and the first $j elements
1035 * of $other_changed both contain the same number of zeros
1036 * (unchanged lines).
1037 * Furthermore, $j is always kept so that $j == $other_len or
1038 * $other_changed[$j] == false.
1040 while ($j < $other_len && $other_changed[$j])
1043 while ($i < $len && ! $changed[$i]) {
1044 USE_ASSERTS
&& assert('$j < $other_len && ! $other_changed[$j]');
1046 while ($j < $other_len && $other_changed[$j])
1055 // Find the end of this run of changes.
1056 while (++
$i < $len && $changed[$i])
1061 * Record the length of this run of changes, so that
1062 * we can later determine whether the run has grown.
1064 $runlength = $i - $start;
1067 * Move the changed region back, so long as the
1068 * previous unchanged line matches the last changed one.
1069 * This merges with previous changed regions.
1071 while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) {
1072 $changed[--$start] = 1;
1073 $changed[--$i] = false;
1074 while ($start > 0 && $changed[$start - 1])
1076 USE_ASSERTS
&& assert('$j > 0');
1077 while ($other_changed[--$j])
1079 USE_ASSERTS
&& assert('$j >= 0 && !$other_changed[$j]');
1083 * Set CORRESPONDING to the end of the changed run, at the last
1084 * point where it corresponds to a changed run in the other file.
1085 * CORRESPONDING == LEN means no such point has been found.
1087 $corresponding = $j < $other_len ?
$i : $len;
1090 * Move the changed region forward, so long as the
1091 * first changed line matches the following unchanged one.
1092 * This merges with following changed regions.
1093 * Do this second, so that if there are no merges,
1094 * the changed region is moved forward as far as possible.
1096 while ($i < $len && $lines[$start] == $lines[$i]) {
1097 $changed[$start++
] = false;
1099 while ($i < $len && $changed[$i])
1102 USE_ASSERTS
&& assert('$j < $other_len && ! $other_changed[$j]');
1104 if ($j < $other_len && $other_changed[$j]) {
1105 $corresponding = $i;
1106 while ($j < $other_len && $other_changed[$j])
1110 } while ($runlength != $i - $start);
1113 * If possible, move the fully-merged run of changes
1114 * back to a corresponding run in the other file.
1116 while ($corresponding < $i) {
1117 $changed[--$start] = 1;
1119 USE_ASSERTS
&& assert('$j > 0');
1120 while ($other_changed[--$j])
1122 USE_ASSERTS
&& assert('$j >= 0 && !$other_changed[$j]');
1125 wfProfileOut( $fname );
1130 * Class representing a 'diff' between two sequences of strings.
1133 * @package MediaWiki
1134 * @subpackage DifferenceEngine
1142 * Computes diff between sequences of strings.
1144 * @param $from_lines array An array of strings.
1145 * (Typically these are lines from a file.)
1146 * @param $to_lines array An array of strings.
1148 function Diff($from_lines, $to_lines) {
1149 $eng = new _DiffEngine
;
1150 $this->edits
= $eng->diff($from_lines, $to_lines);
1151 //$this->_check($from_lines, $to_lines);
1155 * Compute reversed Diff.
1159 * $diff = new Diff($lines1, $lines2);
1160 * $rev = $diff->reverse();
1161 * @return object A Diff object representing the inverse of the
1164 function reverse () {
1166 $rev->edits
= array();
1167 foreach ($this->edits
as $edit) {
1168 $rev->edits
[] = $edit->reverse();
1174 * Check for empty diff.
1176 * @return bool True iff two sequences were identical.
1178 function isEmpty () {
1179 foreach ($this->edits
as $edit) {
1180 if ($edit->type
!= 'copy')
1187 * Compute the length of the Longest Common Subsequence (LCS).
1189 * This is mostly for diagnostic purposed.
1191 * @return int The length of the LCS.
1195 foreach ($this->edits
as $edit) {
1196 if ($edit->type
== 'copy')
1197 $lcs +
= sizeof($edit->orig
);
1203 * Get the original set of lines.
1205 * This reconstructs the $from_lines parameter passed to the
1208 * @return array The original sequence of strings.
1213 foreach ($this->edits
as $edit) {
1215 array_splice($lines, sizeof($lines), 0, $edit->orig
);
1221 * Get the closing set of lines.
1223 * This reconstructs the $to_lines parameter passed to the
1226 * @return array The sequence of strings.
1228 function closing() {
1231 foreach ($this->edits
as $edit) {
1233 array_splice($lines, sizeof($lines), 0, $edit->closing
);
1239 * Check a Diff for validity.
1241 * This is here only for debugging purposes.
1243 function _check ($from_lines, $to_lines) {
1244 $fname = 'Diff::_check';
1245 wfProfileIn( $fname );
1246 if (serialize($from_lines) != serialize($this->orig()))
1247 trigger_error("Reconstructed original doesn't match", E_USER_ERROR
);
1248 if (serialize($to_lines) != serialize($this->closing()))
1249 trigger_error("Reconstructed closing doesn't match", E_USER_ERROR
);
1251 $rev = $this->reverse();
1252 if (serialize($to_lines) != serialize($rev->orig()))
1253 trigger_error("Reversed original doesn't match", E_USER_ERROR
);
1254 if (serialize($from_lines) != serialize($rev->closing()))
1255 trigger_error("Reversed closing doesn't match", E_USER_ERROR
);
1259 foreach ($this->edits
as $edit) {
1260 if ( $prevtype == $edit->type
)
1261 trigger_error("Edit sequence is non-optimal", E_USER_ERROR
);
1262 $prevtype = $edit->type
;
1265 $lcs = $this->lcs();
1266 trigger_error('Diff okay: LCS = '.$lcs, E_USER_NOTICE
);
1267 wfProfileOut( $fname );
1275 * @package MediaWiki
1276 * @subpackage DifferenceEngine
1278 class MappedDiff
extends Diff
1283 * Computes diff between sequences of strings.
1285 * This can be used to compute things like
1286 * case-insensitve diffs, or diffs which ignore
1287 * changes in white-space.
1289 * @param $from_lines array An array of strings.
1290 * (Typically these are lines from a file.)
1292 * @param $to_lines array An array of strings.
1294 * @param $mapped_from_lines array This array should
1295 * have the same size number of elements as $from_lines.
1296 * The elements in $mapped_from_lines and
1297 * $mapped_to_lines are what is actually compared
1298 * when computing the diff.
1300 * @param $mapped_to_lines array This array should
1301 * have the same number of elements as $to_lines.
1303 function MappedDiff($from_lines, $to_lines,
1304 $mapped_from_lines, $mapped_to_lines) {
1305 $fname = 'MappedDiff::MappedDiff';
1306 wfProfileIn( $fname );
1308 assert(sizeof($from_lines) == sizeof($mapped_from_lines));
1309 assert(sizeof($to_lines) == sizeof($mapped_to_lines));
1311 $this->Diff($mapped_from_lines, $mapped_to_lines);
1314 for ($i = 0; $i < sizeof($this->edits
); $i++
) {
1315 $orig = &$this->edits
[$i]->orig
;
1316 if (is_array($orig)) {
1317 $orig = array_slice($from_lines, $xi, sizeof($orig));
1318 $xi +
= sizeof($orig);
1321 $closing = &$this->edits
[$i]->closing
;
1322 if (is_array($closing)) {
1323 $closing = array_slice($to_lines, $yi, sizeof($closing));
1324 $yi +
= sizeof($closing);
1327 wfProfileOut( $fname );
1332 * A class to format Diffs
1334 * This class formats the diff in classic diff format.
1335 * It is intended that this class be customized via inheritance,
1336 * to obtain fancier outputs.
1339 * @package MediaWiki
1340 * @subpackage DifferenceEngine
1345 * Number of leading context "lines" to preserve.
1347 * This should be left at zero for this class, but subclasses
1348 * may want to set this to other values.
1350 var $leading_context_lines = 0;
1353 * Number of trailing context "lines" to preserve.
1355 * This should be left at zero for this class, but subclasses
1356 * may want to set this to other values.
1358 var $trailing_context_lines = 0;
1363 * @param $diff object A Diff object.
1364 * @return string The formatted output.
1366 function format($diff) {
1367 $fname = 'DiffFormatter::format';
1368 wfProfileIn( $fname );
1374 $nlead = $this->leading_context_lines
;
1375 $ntrail = $this->trailing_context_lines
;
1377 $this->_start_diff();
1379 foreach ($diff->edits
as $edit) {
1380 if ($edit->type
== 'copy') {
1381 if (is_array($block)) {
1382 if (sizeof($edit->orig
) <= $nlead +
$ntrail) {
1387 $context = array_slice($edit->orig
, 0, $ntrail);
1388 $block[] = new _DiffOp_Copy($context);
1390 $this->_block($x0, $ntrail +
$xi - $x0,
1391 $y0, $ntrail +
$yi - $y0,
1396 $context = $edit->orig
;
1399 if (! is_array($block)) {
1400 $context = array_slice($context, sizeof($context) - $nlead);
1401 $x0 = $xi - sizeof($context);
1402 $y0 = $yi - sizeof($context);
1405 $block[] = new _DiffOp_Copy($context);
1411 $xi +
= sizeof($edit->orig
);
1413 $yi +
= sizeof($edit->closing
);
1416 if (is_array($block))
1417 $this->_block($x0, $xi - $x0,
1421 $end = $this->_end_diff();
1422 wfProfileOut( $fname );
1426 function _block($xbeg, $xlen, $ybeg, $ylen, &$edits) {
1427 $fname = 'DiffFormatter::_block';
1428 wfProfileIn( $fname );
1429 $this->_start_block($this->_block_header($xbeg, $xlen, $ybeg, $ylen));
1430 foreach ($edits as $edit) {
1431 if ($edit->type
== 'copy')
1432 $this->_context($edit->orig
);
1433 elseif ($edit->type
== 'add')
1434 $this->_added($edit->closing
);
1435 elseif ($edit->type
== 'delete')
1436 $this->_deleted($edit->orig
);
1437 elseif ($edit->type
== 'change')
1438 $this->_changed($edit->orig
, $edit->closing
);
1440 trigger_error('Unknown edit type', E_USER_ERROR
);
1442 $this->_end_block();
1443 wfProfileOut( $fname );
1446 function _start_diff() {
1450 function _end_diff() {
1451 $val = ob_get_contents();
1456 function _block_header($xbeg, $xlen, $ybeg, $ylen) {
1458 $xbeg .= "," . ($xbeg +
$xlen - 1);
1460 $ybeg .= "," . ($ybeg +
$ylen - 1);
1462 return $xbeg . ($xlen ?
($ylen ?
'c' : 'd') : 'a') . $ybeg;
1465 function _start_block($header) {
1469 function _end_block() {
1472 function _lines($lines, $prefix = ' ') {
1473 foreach ($lines as $line)
1474 echo "$prefix $line\n";
1477 function _context($lines) {
1478 $this->_lines($lines);
1481 function _added($lines) {
1482 $this->_lines($lines, '>');
1484 function _deleted($lines) {
1485 $this->_lines($lines, '<');
1488 function _changed($orig, $closing) {
1489 $this->_deleted($orig);
1491 $this->_added($closing);
1497 * Additions by Axel Boldt follow, partly taken from diff.php, phpwiki-1.3.3
1501 define('NBSP', ' '); // iso-8859-x non-breaking space.
1506 * @package MediaWiki
1507 * @subpackage DifferenceEngine
1509 class _HWLDF_WordAccumulator
{
1510 function _HWLDF_WordAccumulator () {
1511 $this->_lines
= array();
1517 function _flushGroup ($new_tag) {
1518 if ($this->_group
!== '') {
1519 if ($this->_tag
== 'mark')
1520 $this->_line
.= '<span class="diffchange">' .
1521 htmlspecialchars ( $this->_group
) . '</span>';
1523 $this->_line
.= htmlspecialchars ( $this->_group
);
1526 $this->_tag
= $new_tag;
1529 function _flushLine ($new_tag) {
1530 $this->_flushGroup($new_tag);
1531 if ($this->_line
!= '')
1532 array_push ( $this->_lines
, $this->_line
);
1534 # make empty lines visible by inserting an NBSP
1535 array_push ( $this->_lines
, NBSP
);
1539 function addWords ($words, $tag = '') {
1540 if ($tag != $this->_tag
)
1541 $this->_flushGroup($tag);
1543 foreach ($words as $word) {
1544 // new-line should only come as first char of word.
1547 if ($word[0] == "\n") {
1548 $this->_flushLine($tag);
1549 $word = substr($word, 1);
1551 assert(!strstr($word, "\n"));
1552 $this->_group
.= $word;
1556 function getLines() {
1557 $this->_flushLine('~done');
1558 return $this->_lines
;
1565 * @package MediaWiki
1566 * @subpackage DifferenceEngine
1568 class WordLevelDiff
extends MappedDiff
1570 function WordLevelDiff ($orig_lines, $closing_lines) {
1571 $fname = 'WordLevelDiff::WordLevelDiff';
1572 wfProfileIn( $fname );
1574 list ($orig_words, $orig_stripped) = $this->_split($orig_lines);
1575 list ($closing_words, $closing_stripped) = $this->_split($closing_lines);
1577 $this->MappedDiff($orig_words, $closing_words,
1578 $orig_stripped, $closing_stripped);
1579 wfProfileOut( $fname );
1582 function _split($lines) {
1583 $fname = 'WordLevelDiff::_split';
1584 wfProfileIn( $fname );
1587 $stripped = array();
1589 foreach ( $lines as $line ) {
1590 # If the line is too long, just pretend the entire line is one big word
1591 # This prevents resource exhaustion problems
1598 if ( strlen( $line ) > MAX_DIFF_LINE
) {
1600 $stripped[] = $line;
1602 if (preg_match_all('/ ( [^\S\n]+ | [0-9_A-Za-z\x80-\xff]+ | . ) (?: (?!< \n) [^\S\n])? /xs',
1605 $words = array_merge( $words, $m[0] );
1606 $stripped = array_merge( $stripped, $m[1] );
1610 wfProfileOut( $fname );
1611 return array($words, $stripped);
1615 $fname = 'WordLevelDiff::orig';
1616 wfProfileIn( $fname );
1617 $orig = new _HWLDF_WordAccumulator
;
1619 foreach ($this->edits
as $edit) {
1620 if ($edit->type
== 'copy')
1621 $orig->addWords($edit->orig
);
1622 elseif ($edit->orig
)
1623 $orig->addWords($edit->orig
, 'mark');
1625 $lines = $orig->getLines();
1626 wfProfileOut( $fname );
1630 function closing () {
1631 $fname = 'WordLevelDiff::closing';
1632 wfProfileIn( $fname );
1633 $closing = new _HWLDF_WordAccumulator
;
1635 foreach ($this->edits
as $edit) {
1636 if ($edit->type
== 'copy')
1637 $closing->addWords($edit->closing
);
1638 elseif ($edit->closing
)
1639 $closing->addWords($edit->closing
, 'mark');
1641 $lines = $closing->getLines();
1642 wfProfileOut( $fname );
1648 * Wikipedia Table style diff formatter.
1651 * @package MediaWiki
1652 * @subpackage DifferenceEngine
1654 class TableDiffFormatter
extends DiffFormatter
1656 function TableDiffFormatter() {
1657 $this->leading_context_lines
= 2;
1658 $this->trailing_context_lines
= 2;
1661 function _block_header( $xbeg, $xlen, $ybeg, $ylen ) {
1662 $r = '<tr><td colspan="2" align="left"><strong><!--LINE '.$xbeg."--></strong></td>\n" .
1663 '<td colspan="2" align="left"><strong><!--LINE '.$ybeg."--></strong></td></tr>\n";
1667 function _start_block( $header ) {
1672 function _end_block() {
1675 function _lines( $lines, $prefix=' ', $color='white' ) {
1678 # HTML-escape parameter before calling this
1679 function addedLine( $line ) {
1680 return "<td>+</td><td class='diff-addedline'>{$line}</td>";
1683 # HTML-escape parameter before calling this
1684 function deletedLine( $line ) {
1685 return "<td>-</td><td class='diff-deletedline'>{$line}</td>";
1688 # HTML-escape parameter before calling this
1689 function contextLine( $line ) {
1690 return "<td> </td><td class='diff-context'>{$line}</td>";
1693 function emptyLine() {
1694 return '<td colspan="2"> </td>';
1697 function _added( $lines ) {
1698 foreach ($lines as $line) {
1699 echo '<tr>' . $this->emptyLine() .
1700 $this->addedLine( htmlspecialchars ( $line ) ) . "</tr>\n";
1704 function _deleted($lines) {
1705 foreach ($lines as $line) {
1706 echo '<tr>' . $this->deletedLine( htmlspecialchars ( $line ) ) .
1707 $this->emptyLine() . "</tr>\n";
1711 function _context( $lines ) {
1712 foreach ($lines as $line) {
1714 $this->contextLine( htmlspecialchars ( $line ) ) .
1715 $this->contextLine( htmlspecialchars ( $line ) ) . "</tr>\n";
1719 function _changed( $orig, $closing ) {
1720 $fname = 'TableDiffFormatter::_changed';
1721 wfProfileIn( $fname );
1723 $diff = new WordLevelDiff( $orig, $closing );
1724 $del = $diff->orig();
1725 $add = $diff->closing();
1727 # Notice that WordLevelDiff returns HTML-escaped output.
1728 # Hence, we will be calling addedLine/deletedLine without HTML-escaping.
1730 while ( $line = array_shift( $del ) ) {
1731 $aline = array_shift( $add );
1732 echo '<tr>' . $this->deletedLine( $line ) .
1733 $this->addedLine( $aline ) . "</tr>\n";
1735 foreach ($add as $line) { # If any leftovers
1736 echo '<tr>' . $this->emptyLine() .
1737 $this->addedLine( $line ) . "</tr>\n";
1739 wfProfileOut( $fname );