5 * @subpackage DifferenceEngine
12 * @subpackage DifferenceEngine
14 class DifferenceEngine
{
18 var $mOldid, $mNewid, $mTitle;
19 var $mOldtitle, $mNewtitle, $mPagetitle;
20 var $mOldtext, $mNewtext;
21 var $mOldPage, $mNewPage;
22 var $mRcidMarkPatrolled;
23 var $mOldRev, $mNewRev;
24 var $mRevisionsLoaded = false; // Have the revisions been loaded
25 var $mTextLoaded = 0; // How many text blobs have been loaded, 0, 1 or 2?
30 * @param $titleObj Title object that the diff is associated with
31 * @param $old Integer: old ID we want to show and diff with.
32 * @param $new String: either 'prev' or 'next'.
33 * @param $rcid Integer: ??? FIXME (default 0)
35 function DifferenceEngine( $titleObj = null, $old = 0, $new = 0, $rcid = 0 ) {
36 $this->mTitle
= $titleObj;
37 wfDebug("DifferenceEngine old '$old' new '$new' rcid '$rcid'\n");
39 if ( 'prev' === $new ) {
40 # Show diff between revision $old and the previous one.
41 # Get previous one from DB.
43 $this->mNewid
= intval($old);
45 $this->mOldid
= $this->mTitle
->getPreviousRevisionID( $this->mNewid
);
47 } elseif ( 'next' === $new ) {
48 # Show diff between revision $old and the previous one.
49 # Get previous one from DB.
51 $this->mOldid
= intval($old);
52 $this->mNewid
= $this->mTitle
->getNextRevisionID( $this->mOldid
);
53 if ( false === $this->mNewid
) {
54 # if no result, NewId points to the newest old revision. The only newer
55 # revision is cur, which is "0".
60 $this->mOldid
= intval($old);
61 $this->mNewid
= intval($new);
63 $this->mRcidMarkPatrolled
= intval($rcid); # force it to be an integer
66 function showDiffPage() {
67 global $wgUser, $wgOut, $wgContLang, $wgUseExternalEditor, $wgUseRCPatrol;
68 $fname = 'DifferenceEngine::showDiffPage';
69 wfProfileIn( $fname );
71 # If external diffs are enabled both globally and for the user,
72 # we'll use the application/x-external-editor interface to call
73 # an external diff tool like kompare, kdiff3, etc.
74 if($wgUseExternalEditor && $wgUser->getOption('externaldiff')) {
75 global $wgInputEncoding,$wgServer,$wgScript,$wgLang;
77 header ( "Content-type: application/x-external-editor; charset=".$wgInputEncoding );
78 $url1=$this->mTitle
->getFullURL("action=raw&oldid=".$this->mOldid
);
79 $url2=$this->mTitle
->getFullURL("action=raw&oldid=".$this->mNewid
);
80 $special=$wgLang->getNsText(NS_SPECIAL
);
85 Script={$wgServer}{$wgScript}
86 Special namespace={$special}
100 $wgOut->setArticleFlag( false );
101 if ( ! $this->loadRevisionData() ) {
102 $t = $this->mTitle
->getPrefixedText() . " (Diff: {$this->mOldid}, {$this->mNewid})";
103 $mtext = wfMsg( 'missingarticle', "<nowiki>$t</nowiki>" );
104 $wgOut->setPagetitle( wfMsg( 'errorpagetitle' ) );
105 $wgOut->addWikitext( $mtext );
106 wfProfileOut( $fname );
110 wfRunHooks( 'DiffViewHeader', array( $this, $this->mOldRev
, $this->mNewRev
) );
112 if ( $this->mNewRev
->isCurrent() ) {
113 $wgOut->setArticleFlag( true );
116 # mOldid is false if the difference engine is called with a "vague" query for
117 # a diff between a version V and its previous version V' AND the version V
118 # is the first version of that article. In that case, V' does not exist.
119 if ( $this->mOldid
=== false ) {
120 $this->showFirstRevision();
121 wfProfileOut( $fname );
125 $wgOut->suppressQuickbar();
127 $oldTitle = $this->mOldPage
->getPrefixedText();
128 $newTitle = $this->mNewPage
->getPrefixedText();
129 if( $oldTitle == $newTitle ) {
130 $wgOut->setPageTitle( $newTitle );
132 $wgOut->setPageTitle( $oldTitle . ', ' . $newTitle );
134 $wgOut->setSubtitle( wfMsg( 'difference' ) );
135 $wgOut->setRobotpolicy( 'noindex,nofollow' );
137 if ( !( $this->mOldPage
->userCanRead() && $this->mNewPage
->userCanRead() ) ) {
138 $wgOut->loginToUse();
140 wfProfileOut( $fname );
144 $sk = $wgUser->getSkin();
146 if ( $this->mNewRev
->isCurrent() && $wgUser->isAllowed('rollback') ) {
147 $rollback = ' ' . $sk->generateRollback( $this->mNewRev
);
151 if( $wgUseRCPatrol && $this->mRcidMarkPatrolled
!= 0 && $wgUser->isAllowed( 'patrol' ) ) {
152 $patrol = ' [' . $sk->makeKnownLinkObj( $this->mTitle
, wfMsg( 'markaspatrolleddiff' ), "action=markpatrolled&rcid={$this->mRcidMarkPatrolled}" ) . ']';
157 $prevlink = $sk->makeKnownLinkObj( $this->mTitle
, wfMsgHtml( 'previousdiff' ),
158 'diff=prev&oldid='.$this->mOldid
, '', '', 'id="differences-prevlink"' );
159 if ( $this->mNewRev
->isCurrent() ) {
160 $nextlink = ' ';
162 $nextlink = $sk->makeKnownLinkObj( $this->mTitle
, wfMsgHtml( 'nextdiff' ),
163 'diff=next&oldid='.$this->mNewid
, '', '', 'id="differences-nextlink"' );
169 if ($this->mOldRev
->mMinorEdit
== 1) {
170 $oldminor = wfElement( 'span', array( 'class' => 'minor' ),
171 wfMsg( 'minoreditletter') ) . ' ';
174 if ($this->mNewRev
->mMinorEdit
== 1) {
175 $newminor = wfElement( 'span', array( 'class' => 'minor' ),
176 wfMsg( 'minoreditletter') ) . ' ';
179 $oldHeader = "<strong>{$this->mOldtitle}</strong><br />" .
180 $sk->revUserTools( $this->mOldRev
) . "<br />" .
181 $oldminor . $sk->revComment( $this->mOldRev
, true ) . "<br />" .
183 $newHeader = "<strong>{$this->mNewtitle}</strong><br />" .
184 $sk->revUserTools( $this->mNewRev
) . " $rollback<br />" .
185 $newminor . $sk->revComment( $this->mNewRev
, true ) . "<br />" .
188 $this->showDiff( $oldHeader, $newHeader );
189 $wgOut->addHTML( "<hr /><h2>{$this->mPagetitle}</h2>\n" );
191 if( !$this->mNewRev
->isCurrent() ) {
192 $oldEditSectionSetting = $wgOut->parserOptions()->setEditSection( false );
195 $this->loadNewText();
196 if( is_object( $this->mNewRev
) ) {
197 $wgOut->setRevisionId( $this->mNewRev
->getId() );
199 $wgOut->addSecondaryWikiText( $this->mNewtext
);
201 if( !$this->mNewRev
->isCurrent() ) {
202 $wgOut->parserOptions()->setEditSection( $oldEditSectionSetting );
205 wfProfileOut( $fname );
209 * Show the first revision of an article. Uses normal diff headers in
210 * contrast to normal "old revision" display style.
212 function showFirstRevision() {
213 global $wgOut, $wgUser;
215 $fname = 'DifferenceEngine::showFirstRevision';
216 wfProfileIn( $fname );
218 # Get article text from the DB
220 if ( ! $this->loadNewText() ) {
221 $t = $this->mTitle
->getPrefixedText() . " (Diff: {$this->mOldid}, " .
223 $mtext = wfMsg( 'missingarticle', "<nowiki>$t</nowiki>" );
224 $wgOut->setPagetitle( wfMsg( 'errorpagetitle' ) );
225 $wgOut->addWikitext( $mtext );
226 wfProfileOut( $fname );
229 if ( $this->mNewRev
->isCurrent() ) {
230 $wgOut->setArticleFlag( true );
233 # Check if user is allowed to look at this page. If not, bail out.
235 if ( !( $this->mTitle
->userCanRead() ) ) {
236 $wgOut->loginToUse();
238 wfProfileOut( $fname );
242 # Prepare the header box
244 $sk = $wgUser->getSkin();
246 $nextlink = $sk->makeKnownLinkObj( $this->mTitle
, wfMsgHtml( 'nextdiff' ), 'diff=next&oldid='.$this->mNewid
, '', '', 'id="differences-nextlink"' );
247 $header = "<div class=\"firstrevisionheader\" style=\"text-align: center\"><strong>{$this->mOldtitle}</strong><br />" .
248 $sk->revUserTools( $this->mNewRev
) . "<br />" .
249 $sk->revComment( $this->mNewRev
) . "<br />" .
250 $nextlink . "</div>\n";
252 $wgOut->addHTML( $header );
254 $wgOut->setSubtitle( wfMsg( 'difference' ) );
255 $wgOut->setRobotpolicy( 'noindex,nofollow' );
258 # Show current revision
260 $wgOut->addHTML( "<hr /><h2>{$this->mPagetitle}</h2>\n" );
261 if( is_object( $this->mNewRev
) ) {
262 $wgOut->setRevisionId( $this->mNewRev
->getId() );
264 $wgOut->addSecondaryWikiText( $this->mNewtext
);
266 wfProfileOut( $fname );
270 * Get the diff text, send it to $wgOut
271 * Returns false if the diff could not be generated, otherwise returns true
273 function showDiff( $otitle, $ntitle ) {
275 $diff = $this->getDiff( $otitle, $ntitle );
276 if ( $diff === false ) {
277 $wgOut->addWikitext( wfMsg( 'missingarticle', "<nowiki>(fixme, bug)</nowiki>" ) );
280 $wgOut->addHTML( $diff );
286 * Get diff table, including header
287 * Note that the interface has changed, it's no longer static.
288 * Returns false on error
290 function getDiff( $otitle, $ntitle ) {
291 $body = $this->getDiffBody();
292 if ( $body === false ) {
295 $multi = $this->getMultiNotice();
296 return $this->addHeader( $body, $otitle, $ntitle, $multi );
301 * Get the diff table body, without header
303 * Returns false on error
305 function getDiffBody() {
307 $fname = 'DifferenceEngine::getDiffBody';
308 wfProfileIn( $fname );
312 if ( $this->mOldid
&& $this->mNewid
) {
314 $key = wfMemcKey( '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] ) );
437 * If there are revisions between the ones being compared, return a note saying so.
439 function getMultiNotice() {
440 if ( !is_object($this->mOldRev
) ||
!is_object($this->mNewRev
) )
443 if( !$this->mOldPage
->equals( $this->mNewPage
) ) {
444 // Comparing two different pages? Count would be meaningless.
448 $oldid = $this->mOldRev
->getId();
449 $newid = $this->mNewRev
->getId();
450 if ( $oldid > $newid ) {
451 $tmp = $oldid; $oldid = $newid; $newid = $tmp;
454 $n = $this->mTitle
->countRevisionsBetween( $oldid, $newid );
458 return wfMsgExt( 'diff-multi', array( 'parseinline' ), $n );
463 * Add the header to a diff body
465 function addHeader( $diff, $otitle, $ntitle, $multi = '' ) {
467 <table border='0' width='98%' cellpadding='0' cellspacing='4' class='diff'>
469 <td colspan='2' width='50%' align='center' class='diff-otitle'>{$otitle}</td>
470 <td colspan='2' width='50%' align='center' class='diff-ntitle'>{$ntitle}</td>
475 $header .= "<tr><td colspan='4' align='center' class='diff-multi'>{$multi}</td></tr>";
477 return $header . $diff . "</table>";
481 * Use specified text instead of loading from the database
483 function setText( $oldText, $newText ) {
484 $this->mOldtext
= $oldText;
485 $this->mNewtext
= $newText;
486 $this->mTextLoaded
= 2;
490 * Load revision metadata for the specified articles. If newid is 0, then compare
491 * the old article in oldid to the current article; if oldid is 0, then
492 * compare the current article to the immediately previous one (ignoring the
495 * If oldid is false, leave the corresponding revision object set
496 * to false. This is impossible via ordinary user input, and is provided for
499 function loadRevisionData() {
501 if ( $this->mRevisionsLoaded
) {
504 // Whether it succeeds or fails, we don't want to try again
505 $this->mRevisionsLoaded
= true;
508 // Load the new revision object
509 if( $this->mNewid
) {
510 $this->mNewRev
= Revision
::newFromId( $this->mNewid
);
512 $this->mNewRev
= Revision
::newFromTitle( $this->mTitle
);
515 if( is_null( $this->mNewRev
) ) {
519 // Set assorted variables
520 $timestamp = $wgLang->timeanddate( $this->mNewRev
->getTimestamp(), true );
521 $this->mNewPage
= $this->mNewRev
->getTitle();
522 if( $this->mNewRev
->isCurrent() ) {
523 $newLink = $this->mNewPage
->escapeLocalUrl();
524 $this->mPagetitle
= htmlspecialchars( wfMsg( 'currentrev' ) );
525 $newEdit = $this->mNewPage
->escapeLocalUrl( 'action=edit' );
526 $newUndo = $this->mNewPage
->escapeLocalUrl( 'action=edit&undo=' . $this->mNewid
);
528 $this->mNewtitle
= "<a href='$newLink'>{$this->mPagetitle}</a> ($timestamp)"
529 . " (<a href='$newEdit'>" . htmlspecialchars( wfMsg( 'editold' ) ) . "</a>)"
530 . " (<a href='$newUndo'>" . htmlspecialchars( wfMsg( 'editundo' ) ) . "</a>)";
533 $newLink = $this->mNewPage
->escapeLocalUrl( 'oldid=' . $this->mNewid
);
534 $newEdit = $this->mNewPage
->escapeLocalUrl( 'action=edit&oldid=' . $this->mNewid
);
535 $newUndo = $this->mNewPage
->escapeLocalUrl( 'action=edit&undo=' . $this->mNewid
);
536 $this->mPagetitle
= htmlspecialchars( wfMsg( 'revisionasof', $timestamp ) );
538 $this->mNewtitle
= "<a href='$newLink'>{$this->mPagetitle}</a>"
539 . " (<a href='$newEdit'>" . htmlspecialchars( wfMsg( 'editold' ) ) . "</a>)"
540 . " (<a href='$newUndo'>" . htmlspecialchars( wfMsg( 'editundo' ) ) . "</a>)";
543 // Load the old revision object
544 $this->mOldRev
= false;
545 if( $this->mOldid
) {
546 $this->mOldRev
= Revision
::newFromId( $this->mOldid
);
547 } elseif ( $this->mOldid
=== 0 ) {
548 $rev = $this->mNewRev
->getPrevious();
550 $this->mOldid
= $rev->getId();
551 $this->mOldRev
= $rev;
553 // No previous revision; mark to show as first-version only.
554 $this->mOldid
= false;
555 $this->mOldRev
= false;
557 }/* elseif ( $this->mOldid === false ) leave mOldRev false; */
559 if( is_null( $this->mOldRev
) ) {
563 if ( $this->mOldRev
) {
564 $this->mOldPage
= $this->mOldRev
->getTitle();
566 $t = $wgLang->timeanddate( $this->mOldRev
->getTimestamp(), true );
567 $oldLink = $this->mOldPage
->escapeLocalUrl( 'oldid=' . $this->mOldid
);
568 $oldEdit = $this->mOldPage
->escapeLocalUrl( 'action=edit&oldid=' . $this->mOldid
);
569 $this->mOldtitle
= "<a href='$oldLink'>" . htmlspecialchars( wfMsg( 'revisionasof', $t ) )
570 . "</a> (<a href='$oldEdit'>" . htmlspecialchars( wfMsg( 'editold' ) ) . "</a>)";
577 * Load the text of the revisions, as well as revision data.
579 function loadText() {
580 if ( $this->mTextLoaded
== 2 ) {
583 // Whether it succeeds or fails, we don't want to try again
584 $this->mTextLoaded
= 2;
587 if ( !$this->loadRevisionData() ) {
590 if ( $this->mOldRev
) {
591 // FIXME: permission tests
592 $this->mOldtext
= $this->mOldRev
->getText();
593 if ( $this->mOldtext
=== false ) {
597 if ( $this->mNewRev
) {
598 $this->mNewtext
= $this->mNewRev
->getText();
599 if ( $this->mNewtext
=== false ) {
607 * Load the text of the new revision, not the old one
609 function loadNewText() {
610 if ( $this->mTextLoaded
>= 1 ) {
613 $this->mTextLoaded
= 1;
615 if ( !$this->loadRevisionData() ) {
618 $this->mNewtext
= $this->mNewRev
->getText();
625 // A PHP diff engine for phpwiki. (Taken from phpwiki-1.3.3)
627 // Copyright (C) 2000, 2001 Geoffrey T. Dairiki <dairiki@dairiki.org>
628 // You may copy this code freely under the conditions of the GPL.
631 define('USE_ASSERTS', function_exists('assert'));
637 * @subpackage DifferenceEngine
645 trigger_error('pure virtual', E_USER_ERROR
);
649 return $this->orig ?
sizeof($this->orig
) : 0;
652 function nclosing() {
653 return $this->closing ?
sizeof($this->closing
) : 0;
661 * @subpackage DifferenceEngine
663 class _DiffOp_Copy
extends _DiffOp
{
666 function _DiffOp_Copy ($orig, $closing = false) {
667 if (!is_array($closing))
670 $this->closing
= $closing;
674 return new _DiffOp_Copy($this->closing
, $this->orig
);
682 * @subpackage DifferenceEngine
684 class _DiffOp_Delete
extends _DiffOp
{
685 var $type = 'delete';
687 function _DiffOp_Delete ($lines) {
688 $this->orig
= $lines;
689 $this->closing
= false;
693 return new _DiffOp_Add($this->orig
);
701 * @subpackage DifferenceEngine
703 class _DiffOp_Add
extends _DiffOp
{
706 function _DiffOp_Add ($lines) {
707 $this->closing
= $lines;
712 return new _DiffOp_Delete($this->closing
);
720 * @subpackage DifferenceEngine
722 class _DiffOp_Change
extends _DiffOp
{
723 var $type = 'change';
725 function _DiffOp_Change ($orig, $closing) {
727 $this->closing
= $closing;
731 return new _DiffOp_Change($this->closing
, $this->orig
);
737 * Class used internally by Diff to actually compute the diffs.
739 * The algorithm used here is mostly lifted from the perl module
740 * Algorithm::Diff (version 1.06) by Ned Konz, which is available at:
741 * http://www.perl.com/CPAN/authors/id/N/NE/NEDKONZ/Algorithm-Diff-1.06.zip
743 * More ideas are taken from:
744 * http://www.ics.uci.edu/~eppstein/161/960229.html
746 * Some ideas are (and a bit of code) are from from analyze.c, from GNU
747 * diffutils-2.7, which can be found at:
748 * ftp://gnudist.gnu.org/pub/gnu/diffutils/diffutils-2.7.tar.gz
750 * closingly, some ideas (subdivision by NCHUNKS > 2, and some optimizations)
753 * Line length limits for robustness added by Tim Starling, 2005-08-31
755 * @author Geoffrey T. Dairiki, Tim Starling
758 * @subpackage DifferenceEngine
762 const MAX_XREF_LENGTH
= 10000;
764 function diff ($from_lines, $to_lines) {
765 $fname = '_DiffEngine::diff';
766 wfProfileIn( $fname );
768 $n_from = sizeof($from_lines);
769 $n_to = sizeof($to_lines);
771 $this->xchanged
= $this->ychanged
= array();
772 $this->xv
= $this->yv
= array();
773 $this->xind
= $this->yind
= array();
775 unset($this->in_seq
);
778 // Skip leading common lines.
779 for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++
) {
780 if ($from_lines[$skip] !== $to_lines[$skip])
782 $this->xchanged
[$skip] = $this->ychanged
[$skip] = false;
784 // Skip trailing common lines.
785 $xi = $n_from; $yi = $n_to;
786 for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++
) {
787 if ($from_lines[$xi] !== $to_lines[$yi])
789 $this->xchanged
[$xi] = $this->ychanged
[$yi] = false;
792 // Ignore lines which do not exist in both files.
793 for ($xi = $skip; $xi < $n_from - $endskip; $xi++
) {
794 $xhash[$this->_line_hash($from_lines[$xi])] = 1;
797 for ($yi = $skip; $yi < $n_to - $endskip; $yi++
) {
798 $line = $to_lines[$yi];
799 if ( ($this->ychanged
[$yi] = empty($xhash[$this->_line_hash($line)])) )
801 $yhash[$this->_line_hash($line)] = 1;
805 for ($xi = $skip; $xi < $n_from - $endskip; $xi++
) {
806 $line = $from_lines[$xi];
807 if ( ($this->xchanged
[$xi] = empty($yhash[$this->_line_hash($line)])) )
814 $this->_compareseq(0, sizeof($this->xv
), 0, sizeof($this->yv
));
816 // Merge edits when possible
817 $this->_shift_boundaries($from_lines, $this->xchanged
, $this->ychanged
);
818 $this->_shift_boundaries($to_lines, $this->ychanged
, $this->xchanged
);
820 // Compute the edit operations.
823 while ($xi < $n_from ||
$yi < $n_to) {
824 USE_ASSERTS
&& assert($yi < $n_to ||
$this->xchanged
[$xi]);
825 USE_ASSERTS
&& assert($xi < $n_from ||
$this->ychanged
[$yi]);
827 // Skip matching "snake".
829 while ( $xi < $n_from && $yi < $n_to
830 && !$this->xchanged
[$xi] && !$this->ychanged
[$yi]) {
831 $copy[] = $from_lines[$xi++
];
835 $edits[] = new _DiffOp_Copy($copy);
837 // Find deletes & adds.
839 while ($xi < $n_from && $this->xchanged
[$xi])
840 $delete[] = $from_lines[$xi++
];
843 while ($yi < $n_to && $this->ychanged
[$yi])
844 $add[] = $to_lines[$yi++
];
847 $edits[] = new _DiffOp_Change($delete, $add);
849 $edits[] = new _DiffOp_Delete($delete);
851 $edits[] = new _DiffOp_Add($add);
853 wfProfileOut( $fname );
858 * Returns the whole line if it's small enough, or the MD5 hash otherwise
860 function _line_hash( $line ) {
861 if ( strlen( $line ) > self
::MAX_XREF_LENGTH
) {
869 /* Divide the Largest Common Subsequence (LCS) of the sequences
870 * [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally
873 * Returns (LCS, PTS). LCS is the length of the LCS. PTS is an
874 * array of NCHUNKS+1 (X, Y) indexes giving the diving points between
875 * sub sequences. The first sub-sequence is contained in [X0, X1),
876 * [Y0, Y1), the second in [X1, X2), [Y1, Y2) and so on. Note
877 * that (X0, Y0) == (XOFF, YOFF) and
878 * (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM).
880 * This function assumes that the first lines of the specified portions
881 * of the two files do not match, and likewise that the last lines do not
882 * match. The caller must trim matching lines from the beginning and end
883 * of the portions it is going to specify.
885 function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks) {
886 $fname = '_DiffEngine::_diag';
887 wfProfileIn( $fname );
890 if ($xlim - $xoff > $ylim - $yoff) {
891 // Things seems faster (I'm not sure I understand why)
892 // when the shortest sequence in X.
894 list ($xoff, $xlim, $yoff, $ylim)
895 = array( $yoff, $ylim, $xoff, $xlim);
899 for ($i = $ylim - 1; $i >= $yoff; $i--)
900 $ymatches[$this->xv
[$i]][] = $i;
902 for ($i = $ylim - 1; $i >= $yoff; $i--)
903 $ymatches[$this->yv
[$i]][] = $i;
906 $this->seq
[0]= $yoff - 1;
907 $this->in_seq
= array();
910 $numer = $xlim - $xoff +
$nchunks - 1;
912 for ($chunk = 0; $chunk < $nchunks; $chunk++
) {
913 wfProfileIn( "$fname-chunk" );
915 for ($i = 0; $i <= $this->lcs
; $i++
)
916 $ymids[$i][$chunk-1] = $this->seq
[$i];
918 $x1 = $xoff +
(int)(($numer +
($xlim-$xoff)*$chunk) / $nchunks);
919 for ( ; $x < $x1; $x++
) {
920 $line = $flip ?
$this->yv
[$x] : $this->xv
[$x];
921 if (empty($ymatches[$line]))
923 $matches = $ymatches[$line];
925 while (list ($junk, $y) = each($matches))
926 if (empty($this->in_seq
[$y])) {
927 $k = $this->_lcs_pos($y);
928 USE_ASSERTS
&& assert($k > 0);
929 $ymids[$k] = $ymids[$k-1];
932 while (list ( /* $junk */, $y) = each($matches)) {
933 if ($y > $this->seq
[$k-1]) {
934 USE_ASSERTS
&& assert($y < $this->seq
[$k]);
935 // Optimization: this is a common case:
936 // next match is just replacing previous match.
937 $this->in_seq
[$this->seq
[$k]] = false;
939 $this->in_seq
[$y] = 1;
940 } else if (empty($this->in_seq
[$y])) {
941 $k = $this->_lcs_pos($y);
942 USE_ASSERTS
&& assert($k > 0);
943 $ymids[$k] = $ymids[$k-1];
947 wfProfileOut( "$fname-chunk" );
950 $seps[] = $flip ?
array($yoff, $xoff) : array($xoff, $yoff);
951 $ymid = $ymids[$this->lcs
];
952 for ($n = 0; $n < $nchunks - 1; $n++
) {
953 $x1 = $xoff +
(int)(($numer +
($xlim - $xoff) * $n) / $nchunks);
955 $seps[] = $flip ?
array($y1, $x1) : array($x1, $y1);
957 $seps[] = $flip ?
array($ylim, $xlim) : array($xlim, $ylim);
959 wfProfileOut( $fname );
960 return array($this->lcs
, $seps);
963 function _lcs_pos ($ypos) {
964 $fname = '_DiffEngine::_lcs_pos';
965 wfProfileIn( $fname );
968 if ($end == 0 ||
$ypos > $this->seq
[$end]) {
969 $this->seq
[++
$this->lcs
] = $ypos;
970 $this->in_seq
[$ypos] = 1;
971 wfProfileOut( $fname );
976 while ($beg < $end) {
977 $mid = (int)(($beg +
$end) / 2);
978 if ( $ypos > $this->seq
[$mid] )
984 USE_ASSERTS
&& assert($ypos != $this->seq
[$end]);
986 $this->in_seq
[$this->seq
[$end]] = false;
987 $this->seq
[$end] = $ypos;
988 $this->in_seq
[$ypos] = 1;
989 wfProfileOut( $fname );
993 /* Find LCS of two sequences.
995 * The results are recorded in the vectors $this->{x,y}changed[], by
996 * storing a 1 in the element for each line that is an insertion
997 * or deletion (ie. is not in the LCS).
999 * The subsequence of file 0 is [XOFF, XLIM) and likewise for file 1.
1001 * Note that XLIM, YLIM are exclusive bounds.
1002 * All line numbers are origin-0 and discarded lines are not counted.
1004 function _compareseq ($xoff, $xlim, $yoff, $ylim) {
1005 $fname = '_DiffEngine::_compareseq';
1006 wfProfileIn( $fname );
1008 // Slide down the bottom initial diagonal.
1009 while ($xoff < $xlim && $yoff < $ylim
1010 && $this->xv
[$xoff] == $this->yv
[$yoff]) {
1015 // Slide up the top initial diagonal.
1016 while ($xlim > $xoff && $ylim > $yoff
1017 && $this->xv
[$xlim - 1] == $this->yv
[$ylim - 1]) {
1022 if ($xoff == $xlim ||
$yoff == $ylim)
1025 // This is ad hoc but seems to work well.
1026 //$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5);
1027 //$nchunks = max(2,min(8,(int)$nchunks));
1028 $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) +
1;
1030 = $this->_diag($xoff,$xlim,$yoff, $ylim,$nchunks);
1034 // X and Y sequences have no common subsequence:
1035 // mark all changed.
1036 while ($yoff < $ylim)
1037 $this->ychanged
[$this->yind
[$yoff++
]] = 1;
1038 while ($xoff < $xlim)
1039 $this->xchanged
[$this->xind
[$xoff++
]] = 1;
1041 // Use the partitions to split this problem into subproblems.
1044 while ($pt2 = next($seps)) {
1045 $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
1049 wfProfileOut( $fname );
1052 /* Adjust inserts/deletes of identical lines to join changes
1053 * as much as possible.
1055 * We do something when a run of changed lines include a
1056 * line at one end and has an excluded, identical line at the other.
1057 * We are free to choose which identical line is included.
1058 * `compareseq' usually chooses the one at the beginning,
1059 * but usually it is cleaner to consider the following identical line
1060 * to be the "change".
1062 * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
1064 function _shift_boundaries ($lines, &$changed, $other_changed) {
1065 $fname = '_DiffEngine::_shift_boundaries';
1066 wfProfileIn( $fname );
1070 USE_ASSERTS
&& assert('sizeof($lines) == sizeof($changed)');
1071 $len = sizeof($lines);
1072 $other_len = sizeof($other_changed);
1076 * Scan forwards to find beginning of another run of changes.
1077 * Also keep track of the corresponding point in the other file.
1079 * Throughout this code, $i and $j are adjusted together so that
1080 * the first $i elements of $changed and the first $j elements
1081 * of $other_changed both contain the same number of zeros
1082 * (unchanged lines).
1083 * Furthermore, $j is always kept so that $j == $other_len or
1084 * $other_changed[$j] == false.
1086 while ($j < $other_len && $other_changed[$j])
1089 while ($i < $len && ! $changed[$i]) {
1090 USE_ASSERTS
&& assert('$j < $other_len && ! $other_changed[$j]');
1092 while ($j < $other_len && $other_changed[$j])
1101 // Find the end of this run of changes.
1102 while (++
$i < $len && $changed[$i])
1107 * Record the length of this run of changes, so that
1108 * we can later determine whether the run has grown.
1110 $runlength = $i - $start;
1113 * Move the changed region back, so long as the
1114 * previous unchanged line matches the last changed one.
1115 * This merges with previous changed regions.
1117 while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) {
1118 $changed[--$start] = 1;
1119 $changed[--$i] = false;
1120 while ($start > 0 && $changed[$start - 1])
1122 USE_ASSERTS
&& assert('$j > 0');
1123 while ($other_changed[--$j])
1125 USE_ASSERTS
&& assert('$j >= 0 && !$other_changed[$j]');
1129 * Set CORRESPONDING to the end of the changed run, at the last
1130 * point where it corresponds to a changed run in the other file.
1131 * CORRESPONDING == LEN means no such point has been found.
1133 $corresponding = $j < $other_len ?
$i : $len;
1136 * Move the changed region forward, so long as the
1137 * first changed line matches the following unchanged one.
1138 * This merges with following changed regions.
1139 * Do this second, so that if there are no merges,
1140 * the changed region is moved forward as far as possible.
1142 while ($i < $len && $lines[$start] == $lines[$i]) {
1143 $changed[$start++
] = false;
1145 while ($i < $len && $changed[$i])
1148 USE_ASSERTS
&& assert('$j < $other_len && ! $other_changed[$j]');
1150 if ($j < $other_len && $other_changed[$j]) {
1151 $corresponding = $i;
1152 while ($j < $other_len && $other_changed[$j])
1156 } while ($runlength != $i - $start);
1159 * If possible, move the fully-merged run of changes
1160 * back to a corresponding run in the other file.
1162 while ($corresponding < $i) {
1163 $changed[--$start] = 1;
1165 USE_ASSERTS
&& assert('$j > 0');
1166 while ($other_changed[--$j])
1168 USE_ASSERTS
&& assert('$j >= 0 && !$other_changed[$j]');
1171 wfProfileOut( $fname );
1176 * Class representing a 'diff' between two sequences of strings.
1179 * @package MediaWiki
1180 * @subpackage DifferenceEngine
1188 * Computes diff between sequences of strings.
1190 * @param $from_lines array An array of strings.
1191 * (Typically these are lines from a file.)
1192 * @param $to_lines array An array of strings.
1194 function Diff($from_lines, $to_lines) {
1195 $eng = new _DiffEngine
;
1196 $this->edits
= $eng->diff($from_lines, $to_lines);
1197 //$this->_check($from_lines, $to_lines);
1201 * Compute reversed Diff.
1205 * $diff = new Diff($lines1, $lines2);
1206 * $rev = $diff->reverse();
1207 * @return object A Diff object representing the inverse of the
1210 function reverse () {
1212 $rev->edits
= array();
1213 foreach ($this->edits
as $edit) {
1214 $rev->edits
[] = $edit->reverse();
1220 * Check for empty diff.
1222 * @return bool True iff two sequences were identical.
1224 function isEmpty () {
1225 foreach ($this->edits
as $edit) {
1226 if ($edit->type
!= 'copy')
1233 * Compute the length of the Longest Common Subsequence (LCS).
1235 * This is mostly for diagnostic purposed.
1237 * @return int The length of the LCS.
1241 foreach ($this->edits
as $edit) {
1242 if ($edit->type
== 'copy')
1243 $lcs +
= sizeof($edit->orig
);
1249 * Get the original set of lines.
1251 * This reconstructs the $from_lines parameter passed to the
1254 * @return array The original sequence of strings.
1259 foreach ($this->edits
as $edit) {
1261 array_splice($lines, sizeof($lines), 0, $edit->orig
);
1267 * Get the closing set of lines.
1269 * This reconstructs the $to_lines parameter passed to the
1272 * @return array The sequence of strings.
1274 function closing() {
1277 foreach ($this->edits
as $edit) {
1279 array_splice($lines, sizeof($lines), 0, $edit->closing
);
1285 * Check a Diff for validity.
1287 * This is here only for debugging purposes.
1289 function _check ($from_lines, $to_lines) {
1290 $fname = 'Diff::_check';
1291 wfProfileIn( $fname );
1292 if (serialize($from_lines) != serialize($this->orig()))
1293 trigger_error("Reconstructed original doesn't match", E_USER_ERROR
);
1294 if (serialize($to_lines) != serialize($this->closing()))
1295 trigger_error("Reconstructed closing doesn't match", E_USER_ERROR
);
1297 $rev = $this->reverse();
1298 if (serialize($to_lines) != serialize($rev->orig()))
1299 trigger_error("Reversed original doesn't match", E_USER_ERROR
);
1300 if (serialize($from_lines) != serialize($rev->closing()))
1301 trigger_error("Reversed closing doesn't match", E_USER_ERROR
);
1305 foreach ($this->edits
as $edit) {
1306 if ( $prevtype == $edit->type
)
1307 trigger_error("Edit sequence is non-optimal", E_USER_ERROR
);
1308 $prevtype = $edit->type
;
1311 $lcs = $this->lcs();
1312 trigger_error('Diff okay: LCS = '.$lcs, E_USER_NOTICE
);
1313 wfProfileOut( $fname );
1321 * @package MediaWiki
1322 * @subpackage DifferenceEngine
1324 class MappedDiff
extends Diff
1329 * Computes diff between sequences of strings.
1331 * This can be used to compute things like
1332 * case-insensitve diffs, or diffs which ignore
1333 * changes in white-space.
1335 * @param $from_lines array An array of strings.
1336 * (Typically these are lines from a file.)
1338 * @param $to_lines array An array of strings.
1340 * @param $mapped_from_lines array This array should
1341 * have the same size number of elements as $from_lines.
1342 * The elements in $mapped_from_lines and
1343 * $mapped_to_lines are what is actually compared
1344 * when computing the diff.
1346 * @param $mapped_to_lines array This array should
1347 * have the same number of elements as $to_lines.
1349 function MappedDiff($from_lines, $to_lines,
1350 $mapped_from_lines, $mapped_to_lines) {
1351 $fname = 'MappedDiff::MappedDiff';
1352 wfProfileIn( $fname );
1354 assert(sizeof($from_lines) == sizeof($mapped_from_lines));
1355 assert(sizeof($to_lines) == sizeof($mapped_to_lines));
1357 $this->Diff($mapped_from_lines, $mapped_to_lines);
1360 for ($i = 0; $i < sizeof($this->edits
); $i++
) {
1361 $orig = &$this->edits
[$i]->orig
;
1362 if (is_array($orig)) {
1363 $orig = array_slice($from_lines, $xi, sizeof($orig));
1364 $xi +
= sizeof($orig);
1367 $closing = &$this->edits
[$i]->closing
;
1368 if (is_array($closing)) {
1369 $closing = array_slice($to_lines, $yi, sizeof($closing));
1370 $yi +
= sizeof($closing);
1373 wfProfileOut( $fname );
1378 * A class to format Diffs
1380 * This class formats the diff in classic diff format.
1381 * It is intended that this class be customized via inheritance,
1382 * to obtain fancier outputs.
1385 * @package MediaWiki
1386 * @subpackage DifferenceEngine
1391 * Number of leading context "lines" to preserve.
1393 * This should be left at zero for this class, but subclasses
1394 * may want to set this to other values.
1396 var $leading_context_lines = 0;
1399 * Number of trailing context "lines" to preserve.
1401 * This should be left at zero for this class, but subclasses
1402 * may want to set this to other values.
1404 var $trailing_context_lines = 0;
1409 * @param $diff object A Diff object.
1410 * @return string The formatted output.
1412 function format($diff) {
1413 $fname = 'DiffFormatter::format';
1414 wfProfileIn( $fname );
1420 $nlead = $this->leading_context_lines
;
1421 $ntrail = $this->trailing_context_lines
;
1423 $this->_start_diff();
1425 foreach ($diff->edits
as $edit) {
1426 if ($edit->type
== 'copy') {
1427 if (is_array($block)) {
1428 if (sizeof($edit->orig
) <= $nlead +
$ntrail) {
1433 $context = array_slice($edit->orig
, 0, $ntrail);
1434 $block[] = new _DiffOp_Copy($context);
1436 $this->_block($x0, $ntrail +
$xi - $x0,
1437 $y0, $ntrail +
$yi - $y0,
1442 $context = $edit->orig
;
1445 if (! is_array($block)) {
1446 $context = array_slice($context, sizeof($context) - $nlead);
1447 $x0 = $xi - sizeof($context);
1448 $y0 = $yi - sizeof($context);
1451 $block[] = new _DiffOp_Copy($context);
1457 $xi +
= sizeof($edit->orig
);
1459 $yi +
= sizeof($edit->closing
);
1462 if (is_array($block))
1463 $this->_block($x0, $xi - $x0,
1467 $end = $this->_end_diff();
1468 wfProfileOut( $fname );
1472 function _block($xbeg, $xlen, $ybeg, $ylen, &$edits) {
1473 $fname = 'DiffFormatter::_block';
1474 wfProfileIn( $fname );
1475 $this->_start_block($this->_block_header($xbeg, $xlen, $ybeg, $ylen));
1476 foreach ($edits as $edit) {
1477 if ($edit->type
== 'copy')
1478 $this->_context($edit->orig
);
1479 elseif ($edit->type
== 'add')
1480 $this->_added($edit->closing
);
1481 elseif ($edit->type
== 'delete')
1482 $this->_deleted($edit->orig
);
1483 elseif ($edit->type
== 'change')
1484 $this->_changed($edit->orig
, $edit->closing
);
1486 trigger_error('Unknown edit type', E_USER_ERROR
);
1488 $this->_end_block();
1489 wfProfileOut( $fname );
1492 function _start_diff() {
1496 function _end_diff() {
1497 $val = ob_get_contents();
1502 function _block_header($xbeg, $xlen, $ybeg, $ylen) {
1504 $xbeg .= "," . ($xbeg +
$xlen - 1);
1506 $ybeg .= "," . ($ybeg +
$ylen - 1);
1508 return $xbeg . ($xlen ?
($ylen ?
'c' : 'd') : 'a') . $ybeg;
1511 function _start_block($header) {
1515 function _end_block() {
1518 function _lines($lines, $prefix = ' ') {
1519 foreach ($lines as $line)
1520 echo "$prefix $line\n";
1523 function _context($lines) {
1524 $this->_lines($lines);
1527 function _added($lines) {
1528 $this->_lines($lines, '>');
1530 function _deleted($lines) {
1531 $this->_lines($lines, '<');
1534 function _changed($orig, $closing) {
1535 $this->_deleted($orig);
1537 $this->_added($closing);
1543 * Additions by Axel Boldt follow, partly taken from diff.php, phpwiki-1.3.3
1547 define('NBSP', ' '); // iso-8859-x non-breaking space.
1552 * @package MediaWiki
1553 * @subpackage DifferenceEngine
1555 class _HWLDF_WordAccumulator
{
1556 function _HWLDF_WordAccumulator () {
1557 $this->_lines
= array();
1563 function _flushGroup ($new_tag) {
1564 if ($this->_group
!== '') {
1565 if ($this->_tag
== 'mark')
1566 $this->_line
.= '<span class="diffchange">' .
1567 htmlspecialchars ( $this->_group
) . '</span>';
1569 $this->_line
.= htmlspecialchars ( $this->_group
);
1572 $this->_tag
= $new_tag;
1575 function _flushLine ($new_tag) {
1576 $this->_flushGroup($new_tag);
1577 if ($this->_line
!= '')
1578 array_push ( $this->_lines
, $this->_line
);
1580 # make empty lines visible by inserting an NBSP
1581 array_push ( $this->_lines
, NBSP
);
1585 function addWords ($words, $tag = '') {
1586 if ($tag != $this->_tag
)
1587 $this->_flushGroup($tag);
1589 foreach ($words as $word) {
1590 // new-line should only come as first char of word.
1593 if ($word[0] == "\n") {
1594 $this->_flushLine($tag);
1595 $word = substr($word, 1);
1597 assert(!strstr($word, "\n"));
1598 $this->_group
.= $word;
1602 function getLines() {
1603 $this->_flushLine('~done');
1604 return $this->_lines
;
1611 * @package MediaWiki
1612 * @subpackage DifferenceEngine
1614 class WordLevelDiff
extends MappedDiff
1616 const MAX_LINE_LENGTH
= 10000;
1618 function WordLevelDiff ($orig_lines, $closing_lines) {
1619 $fname = 'WordLevelDiff::WordLevelDiff';
1620 wfProfileIn( $fname );
1622 list ($orig_words, $orig_stripped) = $this->_split($orig_lines);
1623 list ($closing_words, $closing_stripped) = $this->_split($closing_lines);
1625 $this->MappedDiff($orig_words, $closing_words,
1626 $orig_stripped, $closing_stripped);
1627 wfProfileOut( $fname );
1630 function _split($lines) {
1631 $fname = 'WordLevelDiff::_split';
1632 wfProfileIn( $fname );
1635 $stripped = array();
1637 foreach ( $lines as $line ) {
1638 # If the line is too long, just pretend the entire line is one big word
1639 # This prevents resource exhaustion problems
1646 if ( strlen( $line ) > self
::MAX_LINE_LENGTH
) {
1648 $stripped[] = $line;
1651 if (preg_match_all('/ ( [^\S\n]+ | [0-9_A-Za-z\x80-\xff]+ | . ) (?: (?!< \n) [^\S\n])? /xs',
1654 $words = array_merge( $words, $m[0] );
1655 $stripped = array_merge( $stripped, $m[1] );
1659 wfProfileOut( $fname );
1660 return array($words, $stripped);
1664 $fname = 'WordLevelDiff::orig';
1665 wfProfileIn( $fname );
1666 $orig = new _HWLDF_WordAccumulator
;
1668 foreach ($this->edits
as $edit) {
1669 if ($edit->type
== 'copy')
1670 $orig->addWords($edit->orig
);
1671 elseif ($edit->orig
)
1672 $orig->addWords($edit->orig
, 'mark');
1674 $lines = $orig->getLines();
1675 wfProfileOut( $fname );
1679 function closing () {
1680 $fname = 'WordLevelDiff::closing';
1681 wfProfileIn( $fname );
1682 $closing = new _HWLDF_WordAccumulator
;
1684 foreach ($this->edits
as $edit) {
1685 if ($edit->type
== 'copy')
1686 $closing->addWords($edit->closing
);
1687 elseif ($edit->closing
)
1688 $closing->addWords($edit->closing
, 'mark');
1690 $lines = $closing->getLines();
1691 wfProfileOut( $fname );
1697 * Wikipedia Table style diff formatter.
1700 * @package MediaWiki
1701 * @subpackage DifferenceEngine
1703 class TableDiffFormatter
extends DiffFormatter
1705 function TableDiffFormatter() {
1706 $this->leading_context_lines
= 2;
1707 $this->trailing_context_lines
= 2;
1710 function _block_header( $xbeg, $xlen, $ybeg, $ylen ) {
1711 $r = '<tr><td colspan="2" align="left"><strong><!--LINE '.$xbeg."--></strong></td>\n" .
1712 '<td colspan="2" align="left"><strong><!--LINE '.$ybeg."--></strong></td></tr>\n";
1716 function _start_block( $header ) {
1720 function _end_block() {
1723 function _lines( $lines, $prefix=' ', $color='white' ) {
1726 # HTML-escape parameter before calling this
1727 function addedLine( $line ) {
1728 return "<td>+</td><td class='diff-addedline'>{$line}</td>";
1731 # HTML-escape parameter before calling this
1732 function deletedLine( $line ) {
1733 return "<td>-</td><td class='diff-deletedline'>{$line}</td>";
1736 # HTML-escape parameter before calling this
1737 function contextLine( $line ) {
1738 return "<td> </td><td class='diff-context'>{$line}</td>";
1741 function emptyLine() {
1742 return '<td colspan="2"> </td>';
1745 function _added( $lines ) {
1746 foreach ($lines as $line) {
1747 echo '<tr>' . $this->emptyLine() .
1748 $this->addedLine( htmlspecialchars ( $line ) ) . "</tr>\n";
1752 function _deleted($lines) {
1753 foreach ($lines as $line) {
1754 echo '<tr>' . $this->deletedLine( htmlspecialchars ( $line ) ) .
1755 $this->emptyLine() . "</tr>\n";
1759 function _context( $lines ) {
1760 foreach ($lines as $line) {
1762 $this->contextLine( htmlspecialchars ( $line ) ) .
1763 $this->contextLine( htmlspecialchars ( $line ) ) . "</tr>\n";
1767 function _changed( $orig, $closing ) {
1768 $fname = 'TableDiffFormatter::_changed';
1769 wfProfileIn( $fname );
1771 $diff = new WordLevelDiff( $orig, $closing );
1772 $del = $diff->orig();
1773 $add = $diff->closing();
1775 # Notice that WordLevelDiff returns HTML-escaped output.
1776 # Hence, we will be calling addedLine/deletedLine without HTML-escaping.
1778 while ( $line = array_shift( $del ) ) {
1779 $aline = array_shift( $add );
1780 echo '<tr>' . $this->deletedLine( $line ) .
1781 $this->addedLine( $aline ) . "</tr>\n";
1783 foreach ($add as $line) { # If any leftovers
1784 echo '<tr>' . $this->emptyLine() .
1785 $this->addedLine( $line ) . "</tr>\n";
1787 wfProfileOut( $fname );