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 $wgUseExternalDiffEngine, $wgContLang, $wgMemc, $wgDBname;
323 if ( $this->mOldid
&& $this->mNewid
) {
325 $key = "$wgDBname:diff:oldid:{$this->mOldid}:newid:{$this->mNewid}";
326 $difftext = $wgMemc->get( $key );
328 wfIncrStats( 'diff_cache_hit' );
329 $difftext = $this->localiseLineNumbers( $difftext );
330 $difftext .= "\n<!-- diff cache key $key -->\n";
335 if ( !$this->loadText() ) {
339 $otext = $wgContLang->segmentForDiff($this->mOldtext
);
340 $ntext = $wgContLang->segmentForDiff($this->mNewtext
);
341 if ( $wgUseExternalDiffEngine ) {
342 # For historical reasons, external diff engine expects
343 # input text to be HTML-escaped already
344 $otext = str_replace( "\r\n", "\n", htmlspecialchars ( $otext ) );
345 $ntext = str_replace( "\r\n", "\n", htmlspecialchars ( $ntext ) );
346 if( !function_exists( 'wikidiff_do_diff' ) ) {
347 dl('php_wikidiff.so');
349 $difftext = wikidiff_do_diff( $otext, $ntext, 2 );
351 $ota = explode( "\n", str_replace( "\r\n", "\n", $otext ) );
352 $nta = explode( "\n", str_replace( "\r\n", "\n", $ntext ) );
353 $diffs =& new Diff( $ota, $nta );
354 $formatter =& new TableDiffFormatter();
355 $difftext = $formatter->format( $diffs );
357 $difftext = $wgContLang->unsegmentForDiff($difftext);
359 // Save to cache for 7 days
360 if ( $key !== false ) {
361 wfIncrStats( 'diff_cache_miss' );
362 $wgMemc->set( $key, $difftext, 7*86400 );
364 wfIncrStats( 'diff_uncacheable' );
366 // Replace line numbers with the text in the user's language
367 $difftext = $this->localiseLineNumbers( $difftext );
372 * Replace line numbers with the text in the user's language
374 function localiseLineNumbers( $text ) {
375 return preg_replace_callback( '/<!--LINE (\d+)-->/',
376 array( &$this, 'localiseLineNumbersCb' ), $text );
379 function localiseLineNumbersCb( $matches ) {
381 return wfMsg( 'lineno', $wgLang->formatNum( $matches[1] ) );
385 * Add the header to a diff body
387 function addHeader( $diff, $otitle, $ntitle ) {
389 <table border='0' width='98%' cellpadding='0' cellspacing='4' class='diff'>
391 <td colspan='2' width='50%' align='center' class='diff-otitle'>{$otitle}</td>
392 <td colspan='2' width='50%' align='center' class='diff-ntitle'>{$ntitle}</td>
401 * Use specified text instead of loading from the database
403 function setText( $oldText, $newText ) {
404 $this->mOldtext
= $oldText;
405 $this->mNewtext
= $newText;
406 $this->mTextLoaded
= 2;
410 * Load revision metadata for the specified articles. If newid is 0, then compare
411 * the old article in oldid to the current article; if oldid is 0, then
412 * compare the current article to the immediately previous one (ignoring the
415 * If oldid is false, leave the corresponding revision object set
416 * to false. This is impossible via ordinary user input, and is provided for
419 function loadRevisionData() {
421 if ( $this->mRevisionsLoaded
) {
424 // Whether it succeeds or fails, we don't want to try again
425 $this->mRevisionsLoaded
= true;
428 // Load the new revision object
429 if( $this->mNewid
) {
430 $this->mNewRev
= Revision
::newFromId( $this->mNewid
);
432 $this->mNewRev
= Revision
::newFromTitle( $this->mTitle
);
435 if( is_null( $this->mNewRev
) ) {
439 // Set assorted variables
440 if( $this->mNewRev
->isCurrent() ) {
441 $this->mPagetitle
= htmlspecialchars( wfMsg( 'currentrev' ) );
442 $this->mNewPage
= $this->mTitle
;
443 $newLink = $this->mNewPage
->escapeLocalUrl();
444 $this->mNewtitle
= "<a href='$newLink'>{$this->mPagetitle}</a>";
446 $this->mNewPage
= $this->mNewRev
->getTitle();
447 $newLink = $this->mNewPage
->escapeLocalUrl ('oldid=' . $this->mNewid
);
448 $t = $wgLang->timeanddate( $this->mNewRev
->getTimestamp(), true );
449 $this->mPagetitle
= htmlspecialchars( wfMsg( 'revisionasof', $t ) );
450 $this->mNewtitle
= "<a href='$newLink'>{$this->mPagetitle}</a>";
453 $this->mNewUser
= $this->mNewRev
->getUserText();
454 $this->mNewComment
= $this->mNewRev
->getComment();
456 // Load the old revision object
457 $this->mOldRev
= false;
458 if( $this->mOldid
) {
459 $this->mOldRev
= Revision
::newFromId( $this->mOldid
);
460 } elseif ( $this->mOldid
=== 0 ) {
461 $rev = $this->mNewRev
->getPrevious();
463 $this->mOldid
= $rev->getId();
464 $this->mOldRev
= $rev;
466 // No previous revision; mark to show as first-version only.
467 $this->mOldid
= false;
468 $this->mOldRev
= false;
470 }/* elseif ( $this->mOldid === false ) leave mOldRev false; */
472 if( is_null( $this->mOldRev
) ) {
476 if ( $this->mOldRev
) {
477 $this->mOldPage
= $this->mOldRev
->getTitle();
479 $t = $wgLang->timeanddate( $this->mOldRev
->getTimestamp(), true );
480 $oldLink = $this->mOldPage
->escapeLocalUrl( 'oldid=' . $this->mOldid
);
481 $this->mOldtitle
= "<a href='$oldLink'>" . htmlspecialchars( wfMsg( 'revisionasof', $t ) ) . '</a>';
484 $this->mOldUser
= $this->mOldRev
->getUserText();
485 $this->mOldComment
= $this->mOldRev
->getComment();
492 * Load the text of the revisions, as well as revision data.
494 function loadText() {
495 if ( $this->mTextLoaded
== 2 ) {
498 // Whether it succeeds or fails, we don't want to try again
499 $this->mTextLoaded
= 2;
502 if ( !$this->loadRevisionData() ) {
505 if ( $this->mOldRev
) {
506 $this->mOldtext
= $this->mOldRev
->getText();
507 if ( $this->mOldtext
=== false ) {
511 if ( $this->mNewRev
) {
512 $this->mNewtext
= $this->mNewRev
->getText();
513 if ( $this->mNewtext
=== false ) {
521 * Load the text of the new revision, not the old one
523 function loadNewText() {
524 if ( $this->mTextLoaded
>= 1 ) {
527 $this->mTextLoaded
= 1;
529 if ( !$this->loadRevisionData() ) {
532 $this->mNewtext
= $this->mNewRev
->getText();
539 // A PHP diff engine for phpwiki. (Taken from phpwiki-1.3.3)
541 // Copyright (C) 2000, 2001 Geoffrey T. Dairiki <dairiki@dairiki.org>
542 // You may copy this code freely under the conditions of the GPL.
545 define('USE_ASSERTS', function_exists('assert'));
551 * @subpackage DifferenceEngine
559 trigger_error('pure virtual', E_USER_ERROR
);
563 return $this->orig ?
sizeof($this->orig
) : 0;
566 function nclosing() {
567 return $this->closing ?
sizeof($this->closing
) : 0;
575 * @subpackage DifferenceEngine
577 class _DiffOp_Copy
extends _DiffOp
{
580 function _DiffOp_Copy ($orig, $closing = false) {
581 if (!is_array($closing))
584 $this->closing
= $closing;
588 return new _DiffOp_Copy($this->closing
, $this->orig
);
596 * @subpackage DifferenceEngine
598 class _DiffOp_Delete
extends _DiffOp
{
599 var $type = 'delete';
601 function _DiffOp_Delete ($lines) {
602 $this->orig
= $lines;
603 $this->closing
= false;
607 return new _DiffOp_Add($this->orig
);
615 * @subpackage DifferenceEngine
617 class _DiffOp_Add
extends _DiffOp
{
620 function _DiffOp_Add ($lines) {
621 $this->closing
= $lines;
626 return new _DiffOp_Delete($this->closing
);
634 * @subpackage DifferenceEngine
636 class _DiffOp_Change
extends _DiffOp
{
637 var $type = 'change';
639 function _DiffOp_Change ($orig, $closing) {
641 $this->closing
= $closing;
645 return new _DiffOp_Change($this->closing
, $this->orig
);
651 * Class used internally by Diff to actually compute the diffs.
653 * The algorithm used here is mostly lifted from the perl module
654 * Algorithm::Diff (version 1.06) by Ned Konz, which is available at:
655 * http://www.perl.com/CPAN/authors/id/N/NE/NEDKONZ/Algorithm-Diff-1.06.zip
657 * More ideas are taken from:
658 * http://www.ics.uci.edu/~eppstein/161/960229.html
660 * Some ideas are (and a bit of code) are from from analyze.c, from GNU
661 * diffutils-2.7, which can be found at:
662 * ftp://gnudist.gnu.org/pub/gnu/diffutils/diffutils-2.7.tar.gz
664 * closingly, some ideas (subdivision by NCHUNKS > 2, and some optimizations)
667 * Line length limits for robustness added by Tim Starling, 2005-08-31
669 * @author Geoffrey T. Dairiki, Tim Starling
672 * @subpackage DifferenceEngine
676 function diff ($from_lines, $to_lines) {
677 $fname = '_DiffEngine::diff';
678 wfProfileIn( $fname );
680 $n_from = sizeof($from_lines);
681 $n_to = sizeof($to_lines);
683 $this->xchanged
= $this->ychanged
= array();
684 $this->xv
= $this->yv
= array();
685 $this->xind
= $this->yind
= array();
687 unset($this->in_seq
);
690 // Skip leading common lines.
691 for ($skip = 0; $skip < $n_from && $skip < $n_to; $skip++
) {
692 if ($from_lines[$skip] !== $to_lines[$skip])
694 $this->xchanged
[$skip] = $this->ychanged
[$skip] = false;
696 // Skip trailing common lines.
697 $xi = $n_from; $yi = $n_to;
698 for ($endskip = 0; --$xi > $skip && --$yi > $skip; $endskip++
) {
699 if ($from_lines[$xi] !== $to_lines[$yi])
701 $this->xchanged
[$xi] = $this->ychanged
[$yi] = false;
704 // Ignore lines which do not exist in both files.
705 for ($xi = $skip; $xi < $n_from - $endskip; $xi++
) {
706 $xhash[$this->_line_hash($from_lines[$xi])] = 1;
709 for ($yi = $skip; $yi < $n_to - $endskip; $yi++
) {
710 $line = $to_lines[$yi];
711 if ( ($this->ychanged
[$yi] = empty($xhash[$this->_line_hash($line)])) )
713 $yhash[$this->_line_hash($line)] = 1;
717 for ($xi = $skip; $xi < $n_from - $endskip; $xi++
) {
718 $line = $from_lines[$xi];
719 if ( ($this->xchanged
[$xi] = empty($yhash[$this->_line_hash($line)])) )
726 $this->_compareseq(0, sizeof($this->xv
), 0, sizeof($this->yv
));
728 // Merge edits when possible
729 $this->_shift_boundaries($from_lines, $this->xchanged
, $this->ychanged
);
730 $this->_shift_boundaries($to_lines, $this->ychanged
, $this->xchanged
);
732 // Compute the edit operations.
735 while ($xi < $n_from ||
$yi < $n_to) {
736 USE_ASSERTS
&& assert($yi < $n_to ||
$this->xchanged
[$xi]);
737 USE_ASSERTS
&& assert($xi < $n_from ||
$this->ychanged
[$yi]);
739 // Skip matching "snake".
741 while ( $xi < $n_from && $yi < $n_to
742 && !$this->xchanged
[$xi] && !$this->ychanged
[$yi]) {
743 $copy[] = $from_lines[$xi++
];
747 $edits[] = new _DiffOp_Copy($copy);
749 // Find deletes & adds.
751 while ($xi < $n_from && $this->xchanged
[$xi])
752 $delete[] = $from_lines[$xi++
];
755 while ($yi < $n_to && $this->ychanged
[$yi])
756 $add[] = $to_lines[$yi++
];
759 $edits[] = new _DiffOp_Change($delete, $add);
761 $edits[] = new _DiffOp_Delete($delete);
763 $edits[] = new _DiffOp_Add($add);
765 wfProfileOut( $fname );
770 * Returns the whole line if it's small enough, or the MD5 hash otherwise
772 function _line_hash( $line ) {
773 if ( strlen( $line ) > MAX_DIFF_XREF_LENGTH
) {
781 /* Divide the Largest Common Subsequence (LCS) of the sequences
782 * [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally
785 * Returns (LCS, PTS). LCS is the length of the LCS. PTS is an
786 * array of NCHUNKS+1 (X, Y) indexes giving the diving points between
787 * sub sequences. The first sub-sequence is contained in [X0, X1),
788 * [Y0, Y1), the second in [X1, X2), [Y1, Y2) and so on. Note
789 * that (X0, Y0) == (XOFF, YOFF) and
790 * (X[NCHUNKS], Y[NCHUNKS]) == (XLIM, YLIM).
792 * This function assumes that the first lines of the specified portions
793 * of the two files do not match, and likewise that the last lines do not
794 * match. The caller must trim matching lines from the beginning and end
795 * of the portions it is going to specify.
797 function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks) {
798 $fname = '_DiffEngine::_diag';
799 wfProfileIn( $fname );
802 if ($xlim - $xoff > $ylim - $yoff) {
803 // Things seems faster (I'm not sure I understand why)
804 // when the shortest sequence in X.
806 list ($xoff, $xlim, $yoff, $ylim)
807 = array( $yoff, $ylim, $xoff, $xlim);
811 for ($i = $ylim - 1; $i >= $yoff; $i--)
812 $ymatches[$this->xv
[$i]][] = $i;
814 for ($i = $ylim - 1; $i >= $yoff; $i--)
815 $ymatches[$this->yv
[$i]][] = $i;
818 $this->seq
[0]= $yoff - 1;
819 $this->in_seq
= array();
822 $numer = $xlim - $xoff +
$nchunks - 1;
824 for ($chunk = 0; $chunk < $nchunks; $chunk++
) {
825 wfProfileIn( "$fname-chunk" );
827 for ($i = 0; $i <= $this->lcs
; $i++
)
828 $ymids[$i][$chunk-1] = $this->seq
[$i];
830 $x1 = $xoff +
(int)(($numer +
($xlim-$xoff)*$chunk) / $nchunks);
831 for ( ; $x < $x1; $x++
) {
832 $line = $flip ?
$this->yv
[$x] : $this->xv
[$x];
833 if (empty($ymatches[$line]))
835 $matches = $ymatches[$line];
837 while (list ($junk, $y) = each($matches))
838 if (empty($this->in_seq
[$y])) {
839 $k = $this->_lcs_pos($y);
840 USE_ASSERTS
&& assert($k > 0);
841 $ymids[$k] = $ymids[$k-1];
844 while (list ($junk, $y) = each($matches)) {
845 if ($y > $this->seq
[$k-1]) {
846 USE_ASSERTS
&& assert($y < $this->seq
[$k]);
847 // Optimization: this is a common case:
848 // next match is just replacing previous match.
849 $this->in_seq
[$this->seq
[$k]] = false;
851 $this->in_seq
[$y] = 1;
852 } else if (empty($this->in_seq
[$y])) {
853 $k = $this->_lcs_pos($y);
854 USE_ASSERTS
&& assert($k > 0);
855 $ymids[$k] = $ymids[$k-1];
859 wfProfileOut( "$fname-chunk" );
862 $seps[] = $flip ?
array($yoff, $xoff) : array($xoff, $yoff);
863 $ymid = $ymids[$this->lcs
];
864 for ($n = 0; $n < $nchunks - 1; $n++
) {
865 $x1 = $xoff +
(int)(($numer +
($xlim - $xoff) * $n) / $nchunks);
867 $seps[] = $flip ?
array($y1, $x1) : array($x1, $y1);
869 $seps[] = $flip ?
array($ylim, $xlim) : array($xlim, $ylim);
871 wfProfileOut( $fname );
872 return array($this->lcs
, $seps);
875 function _lcs_pos ($ypos) {
876 $fname = '_DiffEngine::_lcs_pos';
877 wfProfileIn( $fname );
880 if ($end == 0 ||
$ypos > $this->seq
[$end]) {
881 $this->seq
[++
$this->lcs
] = $ypos;
882 $this->in_seq
[$ypos] = 1;
883 wfProfileOut( $fname );
888 while ($beg < $end) {
889 $mid = (int)(($beg +
$end) / 2);
890 if ( $ypos > $this->seq
[$mid] )
896 USE_ASSERTS
&& assert($ypos != $this->seq
[$end]);
898 $this->in_seq
[$this->seq
[$end]] = false;
899 $this->seq
[$end] = $ypos;
900 $this->in_seq
[$ypos] = 1;
901 wfProfileOut( $fname );
905 /* Find LCS of two sequences.
907 * The results are recorded in the vectors $this->{x,y}changed[], by
908 * storing a 1 in the element for each line that is an insertion
909 * or deletion (ie. is not in the LCS).
911 * The subsequence of file 0 is [XOFF, XLIM) and likewise for file 1.
913 * Note that XLIM, YLIM are exclusive bounds.
914 * All line numbers are origin-0 and discarded lines are not counted.
916 function _compareseq ($xoff, $xlim, $yoff, $ylim) {
917 $fname = '_DiffEngine::_compareseq';
918 wfProfileIn( $fname );
920 // Slide down the bottom initial diagonal.
921 while ($xoff < $xlim && $yoff < $ylim
922 && $this->xv
[$xoff] == $this->yv
[$yoff]) {
927 // Slide up the top initial diagonal.
928 while ($xlim > $xoff && $ylim > $yoff
929 && $this->xv
[$xlim - 1] == $this->yv
[$ylim - 1]) {
934 if ($xoff == $xlim ||
$yoff == $ylim)
937 // This is ad hoc but seems to work well.
938 //$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5);
939 //$nchunks = max(2,min(8,(int)$nchunks));
940 $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) +
1;
942 = $this->_diag($xoff,$xlim,$yoff, $ylim,$nchunks);
946 // X and Y sequences have no common subsequence:
948 while ($yoff < $ylim)
949 $this->ychanged
[$this->yind
[$yoff++
]] = 1;
950 while ($xoff < $xlim)
951 $this->xchanged
[$this->xind
[$xoff++
]] = 1;
953 // Use the partitions to split this problem into subproblems.
956 while ($pt2 = next($seps)) {
957 $this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
961 wfProfileOut( $fname );
964 /* Adjust inserts/deletes of identical lines to join changes
965 * as much as possible.
967 * We do something when a run of changed lines include a
968 * line at one end and has an excluded, identical line at the other.
969 * We are free to choose which identical line is included.
970 * `compareseq' usually chooses the one at the beginning,
971 * but usually it is cleaner to consider the following identical line
972 * to be the "change".
974 * This is extracted verbatim from analyze.c (GNU diffutils-2.7).
976 function _shift_boundaries ($lines, &$changed, $other_changed) {
977 $fname = '_DiffEngine::_shift_boundaries';
978 wfProfileIn( $fname );
982 USE_ASSERTS
&& assert('sizeof($lines) == sizeof($changed)');
983 $len = sizeof($lines);
984 $other_len = sizeof($other_changed);
988 * Scan forwards to find beginning of another run of changes.
989 * Also keep track of the corresponding point in the other file.
991 * Throughout this code, $i and $j are adjusted together so that
992 * the first $i elements of $changed and the first $j elements
993 * of $other_changed both contain the same number of zeros
995 * Furthermore, $j is always kept so that $j == $other_len or
996 * $other_changed[$j] == false.
998 while ($j < $other_len && $other_changed[$j])
1001 while ($i < $len && ! $changed[$i]) {
1002 USE_ASSERTS
&& assert('$j < $other_len && ! $other_changed[$j]');
1004 while ($j < $other_len && $other_changed[$j])
1013 // Find the end of this run of changes.
1014 while (++
$i < $len && $changed[$i])
1019 * Record the length of this run of changes, so that
1020 * we can later determine whether the run has grown.
1022 $runlength = $i - $start;
1025 * Move the changed region back, so long as the
1026 * previous unchanged line matches the last changed one.
1027 * This merges with previous changed regions.
1029 while ($start > 0 && $lines[$start - 1] == $lines[$i - 1]) {
1030 $changed[--$start] = 1;
1031 $changed[--$i] = false;
1032 while ($start > 0 && $changed[$start - 1])
1034 USE_ASSERTS
&& assert('$j > 0');
1035 while ($other_changed[--$j])
1037 USE_ASSERTS
&& assert('$j >= 0 && !$other_changed[$j]');
1041 * Set CORRESPONDING to the end of the changed run, at the last
1042 * point where it corresponds to a changed run in the other file.
1043 * CORRESPONDING == LEN means no such point has been found.
1045 $corresponding = $j < $other_len ?
$i : $len;
1048 * Move the changed region forward, so long as the
1049 * first changed line matches the following unchanged one.
1050 * This merges with following changed regions.
1051 * Do this second, so that if there are no merges,
1052 * the changed region is moved forward as far as possible.
1054 while ($i < $len && $lines[$start] == $lines[$i]) {
1055 $changed[$start++
] = false;
1057 while ($i < $len && $changed[$i])
1060 USE_ASSERTS
&& assert('$j < $other_len && ! $other_changed[$j]');
1062 if ($j < $other_len && $other_changed[$j]) {
1063 $corresponding = $i;
1064 while ($j < $other_len && $other_changed[$j])
1068 } while ($runlength != $i - $start);
1071 * If possible, move the fully-merged run of changes
1072 * back to a corresponding run in the other file.
1074 while ($corresponding < $i) {
1075 $changed[--$start] = 1;
1077 USE_ASSERTS
&& assert('$j > 0');
1078 while ($other_changed[--$j])
1080 USE_ASSERTS
&& assert('$j >= 0 && !$other_changed[$j]');
1083 wfProfileOut( $fname );
1088 * Class representing a 'diff' between two sequences of strings.
1091 * @package MediaWiki
1092 * @subpackage DifferenceEngine
1100 * Computes diff between sequences of strings.
1102 * @param $from_lines array An array of strings.
1103 * (Typically these are lines from a file.)
1104 * @param $to_lines array An array of strings.
1106 function Diff($from_lines, $to_lines) {
1107 $eng = new _DiffEngine
;
1108 $this->edits
= $eng->diff($from_lines, $to_lines);
1109 //$this->_check($from_lines, $to_lines);
1113 * Compute reversed Diff.
1117 * $diff = new Diff($lines1, $lines2);
1118 * $rev = $diff->reverse();
1119 * @return object A Diff object representing the inverse of the
1122 function reverse () {
1124 $rev->edits
= array();
1125 foreach ($this->edits
as $edit) {
1126 $rev->edits
[] = $edit->reverse();
1132 * Check for empty diff.
1134 * @return bool True iff two sequences were identical.
1136 function isEmpty () {
1137 foreach ($this->edits
as $edit) {
1138 if ($edit->type
!= 'copy')
1145 * Compute the length of the Longest Common Subsequence (LCS).
1147 * This is mostly for diagnostic purposed.
1149 * @return int The length of the LCS.
1153 foreach ($this->edits
as $edit) {
1154 if ($edit->type
== 'copy')
1155 $lcs +
= sizeof($edit->orig
);
1161 * Get the original set of lines.
1163 * This reconstructs the $from_lines parameter passed to the
1166 * @return array The original sequence of strings.
1171 foreach ($this->edits
as $edit) {
1173 array_splice($lines, sizeof($lines), 0, $edit->orig
);
1179 * Get the closing set of lines.
1181 * This reconstructs the $to_lines parameter passed to the
1184 * @return array The sequence of strings.
1186 function closing() {
1189 foreach ($this->edits
as $edit) {
1191 array_splice($lines, sizeof($lines), 0, $edit->closing
);
1197 * Check a Diff for validity.
1199 * This is here only for debugging purposes.
1201 function _check ($from_lines, $to_lines) {
1202 $fname = 'Diff::_check';
1203 wfProfileIn( $fname );
1204 if (serialize($from_lines) != serialize($this->orig()))
1205 trigger_error("Reconstructed original doesn't match", E_USER_ERROR
);
1206 if (serialize($to_lines) != serialize($this->closing()))
1207 trigger_error("Reconstructed closing doesn't match", E_USER_ERROR
);
1209 $rev = $this->reverse();
1210 if (serialize($to_lines) != serialize($rev->orig()))
1211 trigger_error("Reversed original doesn't match", E_USER_ERROR
);
1212 if (serialize($from_lines) != serialize($rev->closing()))
1213 trigger_error("Reversed closing doesn't match", E_USER_ERROR
);
1217 foreach ($this->edits
as $edit) {
1218 if ( $prevtype == $edit->type
)
1219 trigger_error("Edit sequence is non-optimal", E_USER_ERROR
);
1220 $prevtype = $edit->type
;
1223 $lcs = $this->lcs();
1224 trigger_error('Diff okay: LCS = '.$lcs, E_USER_NOTICE
);
1225 wfProfileOut( $fname );
1233 * @package MediaWiki
1234 * @subpackage DifferenceEngine
1236 class MappedDiff
extends Diff
1241 * Computes diff between sequences of strings.
1243 * This can be used to compute things like
1244 * case-insensitve diffs, or diffs which ignore
1245 * changes in white-space.
1247 * @param $from_lines array An array of strings.
1248 * (Typically these are lines from a file.)
1250 * @param $to_lines array An array of strings.
1252 * @param $mapped_from_lines array This array should
1253 * have the same size number of elements as $from_lines.
1254 * The elements in $mapped_from_lines and
1255 * $mapped_to_lines are what is actually compared
1256 * when computing the diff.
1258 * @param $mapped_to_lines array This array should
1259 * have the same number of elements as $to_lines.
1261 function MappedDiff($from_lines, $to_lines,
1262 $mapped_from_lines, $mapped_to_lines) {
1263 $fname = 'MappedDiff::MappedDiff';
1264 wfProfileIn( $fname );
1266 assert(sizeof($from_lines) == sizeof($mapped_from_lines));
1267 assert(sizeof($to_lines) == sizeof($mapped_to_lines));
1269 $this->Diff($mapped_from_lines, $mapped_to_lines);
1272 for ($i = 0; $i < sizeof($this->edits
); $i++
) {
1273 $orig = &$this->edits
[$i]->orig
;
1274 if (is_array($orig)) {
1275 $orig = array_slice($from_lines, $xi, sizeof($orig));
1276 $xi +
= sizeof($orig);
1279 $closing = &$this->edits
[$i]->closing
;
1280 if (is_array($closing)) {
1281 $closing = array_slice($to_lines, $yi, sizeof($closing));
1282 $yi +
= sizeof($closing);
1285 wfProfileOut( $fname );
1290 * A class to format Diffs
1292 * This class formats the diff in classic diff format.
1293 * It is intended that this class be customized via inheritance,
1294 * to obtain fancier outputs.
1297 * @package MediaWiki
1298 * @subpackage DifferenceEngine
1303 * Number of leading context "lines" to preserve.
1305 * This should be left at zero for this class, but subclasses
1306 * may want to set this to other values.
1308 var $leading_context_lines = 0;
1311 * Number of trailing context "lines" to preserve.
1313 * This should be left at zero for this class, but subclasses
1314 * may want to set this to other values.
1316 var $trailing_context_lines = 0;
1321 * @param $diff object A Diff object.
1322 * @return string The formatted output.
1324 function format($diff) {
1325 $fname = 'DiffFormatter::format';
1326 wfProfileIn( $fname );
1332 $nlead = $this->leading_context_lines
;
1333 $ntrail = $this->trailing_context_lines
;
1335 $this->_start_diff();
1337 foreach ($diff->edits
as $edit) {
1338 if ($edit->type
== 'copy') {
1339 if (is_array($block)) {
1340 if (sizeof($edit->orig
) <= $nlead +
$ntrail) {
1345 $context = array_slice($edit->orig
, 0, $ntrail);
1346 $block[] = new _DiffOp_Copy($context);
1348 $this->_block($x0, $ntrail +
$xi - $x0,
1349 $y0, $ntrail +
$yi - $y0,
1354 $context = $edit->orig
;
1357 if (! is_array($block)) {
1358 $context = array_slice($context, sizeof($context) - $nlead);
1359 $x0 = $xi - sizeof($context);
1360 $y0 = $yi - sizeof($context);
1363 $block[] = new _DiffOp_Copy($context);
1369 $xi +
= sizeof($edit->orig
);
1371 $yi +
= sizeof($edit->closing
);
1374 if (is_array($block))
1375 $this->_block($x0, $xi - $x0,
1379 $end = $this->_end_diff();
1380 wfProfileOut( $fname );
1384 function _block($xbeg, $xlen, $ybeg, $ylen, &$edits) {
1385 $fname = 'DiffFormatter::_block';
1386 wfProfileIn( $fname );
1387 $this->_start_block($this->_block_header($xbeg, $xlen, $ybeg, $ylen));
1388 foreach ($edits as $edit) {
1389 if ($edit->type
== 'copy')
1390 $this->_context($edit->orig
);
1391 elseif ($edit->type
== 'add')
1392 $this->_added($edit->closing
);
1393 elseif ($edit->type
== 'delete')
1394 $this->_deleted($edit->orig
);
1395 elseif ($edit->type
== 'change')
1396 $this->_changed($edit->orig
, $edit->closing
);
1398 trigger_error('Unknown edit type', E_USER_ERROR
);
1400 $this->_end_block();
1401 wfProfileOut( $fname );
1404 function _start_diff() {
1408 function _end_diff() {
1409 $val = ob_get_contents();
1414 function _block_header($xbeg, $xlen, $ybeg, $ylen) {
1416 $xbeg .= "," . ($xbeg +
$xlen - 1);
1418 $ybeg .= "," . ($ybeg +
$ylen - 1);
1420 return $xbeg . ($xlen ?
($ylen ?
'c' : 'd') : 'a') . $ybeg;
1423 function _start_block($header) {
1427 function _end_block() {
1430 function _lines($lines, $prefix = ' ') {
1431 foreach ($lines as $line)
1432 echo "$prefix $line\n";
1435 function _context($lines) {
1436 $this->_lines($lines);
1439 function _added($lines) {
1440 $this->_lines($lines, '>');
1442 function _deleted($lines) {
1443 $this->_lines($lines, '<');
1446 function _changed($orig, $closing) {
1447 $this->_deleted($orig);
1449 $this->_added($closing);
1455 * Additions by Axel Boldt follow, partly taken from diff.php, phpwiki-1.3.3
1459 define('NBSP', ' '); // iso-8859-x non-breaking space.
1464 * @package MediaWiki
1465 * @subpackage DifferenceEngine
1467 class _HWLDF_WordAccumulator
{
1468 function _HWLDF_WordAccumulator () {
1469 $this->_lines
= array();
1475 function _flushGroup ($new_tag) {
1476 if ($this->_group
!== '') {
1477 if ($this->_tag
== 'mark')
1478 $this->_line
.= '<span class="diffchange">' .
1479 htmlspecialchars ( $this->_group
) . '</span>';
1481 $this->_line
.= htmlspecialchars ( $this->_group
);
1484 $this->_tag
= $new_tag;
1487 function _flushLine ($new_tag) {
1488 $this->_flushGroup($new_tag);
1489 if ($this->_line
!= '')
1490 array_push ( $this->_lines
, $this->_line
);
1492 # make empty lines visible by inserting an NBSP
1493 array_push ( $this->_lines
, NBSP
);
1497 function addWords ($words, $tag = '') {
1498 if ($tag != $this->_tag
)
1499 $this->_flushGroup($tag);
1501 foreach ($words as $word) {
1502 // new-line should only come as first char of word.
1505 if ($word[0] == "\n") {
1506 $this->_flushLine($tag);
1507 $word = substr($word, 1);
1509 assert(!strstr($word, "\n"));
1510 $this->_group
.= $word;
1514 function getLines() {
1515 $this->_flushLine('~done');
1516 return $this->_lines
;
1523 * @package MediaWiki
1524 * @subpackage DifferenceEngine
1526 class WordLevelDiff
extends MappedDiff
1528 function WordLevelDiff ($orig_lines, $closing_lines) {
1529 $fname = 'WordLevelDiff::WordLevelDiff';
1530 wfProfileIn( $fname );
1532 list ($orig_words, $orig_stripped) = $this->_split($orig_lines);
1533 list ($closing_words, $closing_stripped) = $this->_split($closing_lines);
1535 $this->MappedDiff($orig_words, $closing_words,
1536 $orig_stripped, $closing_stripped);
1537 wfProfileOut( $fname );
1540 function _split($lines) {
1541 $fname = 'WordLevelDiff::_split';
1542 wfProfileIn( $fname );
1545 $stripped = array();
1547 foreach ( $lines as $line ) {
1548 # If the line is too long, just pretend the entire line is one big word
1549 # This prevents resource exhaustion problems
1556 if ( strlen( $line ) > MAX_DIFF_LINE
) {
1558 $stripped[] = $line;
1560 if (preg_match_all('/ ( [^\S\n]+ | [0-9_A-Za-z\x80-\xff]+ | . ) (?: (?!< \n) [^\S\n])? /xs',
1563 $words = array_merge( $words, $m[0] );
1564 $stripped = array_merge( $stripped, $m[1] );
1568 wfProfileOut( $fname );
1569 return array($words, $stripped);
1573 $fname = 'WordLevelDiff::orig';
1574 wfProfileIn( $fname );
1575 $orig = new _HWLDF_WordAccumulator
;
1577 foreach ($this->edits
as $edit) {
1578 if ($edit->type
== 'copy')
1579 $orig->addWords($edit->orig
);
1580 elseif ($edit->orig
)
1581 $orig->addWords($edit->orig
, 'mark');
1583 $lines = $orig->getLines();
1584 wfProfileOut( $fname );
1588 function closing () {
1589 $fname = 'WordLevelDiff::closing';
1590 wfProfileIn( $fname );
1591 $closing = new _HWLDF_WordAccumulator
;
1593 foreach ($this->edits
as $edit) {
1594 if ($edit->type
== 'copy')
1595 $closing->addWords($edit->closing
);
1596 elseif ($edit->closing
)
1597 $closing->addWords($edit->closing
, 'mark');
1599 $lines = $closing->getLines();
1600 wfProfileOut( $fname );
1606 * Wikipedia Table style diff formatter.
1609 * @package MediaWiki
1610 * @subpackage DifferenceEngine
1612 class TableDiffFormatter
extends DiffFormatter
1614 function TableDiffFormatter() {
1615 $this->leading_context_lines
= 2;
1616 $this->trailing_context_lines
= 2;
1619 function _block_header( $xbeg, $xlen, $ybeg, $ylen ) {
1620 $r = '<tr><td colspan="2" align="left"><strong><!--LINE '.$xbeg."--></strong></td>\n" .
1621 '<td colspan="2" align="left"><strong><!--LINE '.$ybeg."--></strong></td></tr>\n";
1625 function _start_block( $header ) {
1630 function _end_block() {
1633 function _lines( $lines, $prefix=' ', $color='white' ) {
1636 # HTML-escape parameter before calling this
1637 function addedLine( $line ) {
1638 return "<td>+</td><td class='diff-addedline'>{$line}</td>";
1641 # HTML-escape parameter before calling this
1642 function deletedLine( $line ) {
1643 return "<td>-</td><td class='diff-deletedline'>{$line}</td>";
1646 # HTML-escape parameter before calling this
1647 function contextLine( $line ) {
1648 return "<td> </td><td class='diff-context'>{$line}</td>";
1651 function emptyLine() {
1652 return '<td colspan="2"> </td>';
1655 function _added( $lines ) {
1656 foreach ($lines as $line) {
1657 echo '<tr>' . $this->emptyLine() .
1658 $this->addedLine( htmlspecialchars ( $line ) ) . "</tr>\n";
1662 function _deleted($lines) {
1663 foreach ($lines as $line) {
1664 echo '<tr>' . $this->deletedLine( htmlspecialchars ( $line ) ) .
1665 $this->emptyLine() . "</tr>\n";
1669 function _context( $lines ) {
1670 foreach ($lines as $line) {
1672 $this->contextLine( htmlspecialchars ( $line ) ) .
1673 $this->contextLine( htmlspecialchars ( $line ) ) . "</tr>\n";
1677 function _changed( $orig, $closing ) {
1678 $fname = 'TableDiffFormatter::_changed';
1679 wfProfileIn( $fname );
1681 $diff = new WordLevelDiff( $orig, $closing );
1682 $del = $diff->orig();
1683 $add = $diff->closing();
1685 # Notice that WordLevelDiff returns HTML-escaped output.
1686 # Hence, we will be calling addedLine/deletedLine without HTML-escaping.
1688 while ( $line = array_shift( $del ) ) {
1689 $aline = array_shift( $add );
1690 echo '<tr>' . $this->deletedLine( $line ) .
1691 $this->addedLine( $aline ) . "</tr>\n";
1693 foreach ($add as $line) { # If any leftovers
1694 echo '<tr>' . $this->emptyLine() .
1695 $this->addedLine( $line ) . "</tr>\n";
1697 wfProfileOut( $fname );