summaryrefslogtreecommitdiff
path: root/includes/diff.php
diff options
context:
space:
mode:
Diffstat (limited to 'includes/diff.php')
-rw-r--r--includes/diff.php801
1 files changed, 400 insertions, 401 deletions
diff --git a/includes/diff.php b/includes/diff.php
index 1e4389c..5463e4d 100644
--- a/includes/diff.php
+++ b/includes/diff.php
@@ -42,57 +42,54 @@ class _WikiDiffEngine
public $edits = array(); // List of editing operation to convert XV to YV.
public $xv = array(), $yv = array();
public $xchanged = array(), $ychanged = array();
- function __construct ($from_lines, $to_lines)
- {
+ function __construct ($from_lines, $to_lines) {
$n_from = sizeof($from_lines);
$n_to = sizeof($to_lines);
$endskip = 0;
- // Ignore differences in line endings
- for ($i = 0; $i < $n_from; $i++)
- {
- $from_lines[$i] = rtrim($from_lines[$i]);
- }
- for ($i = 0; $i < $n_to; $i++)
- {
- $to_lines[$i] = rtrim($to_lines[$i]);
- }
+ // Ignore differences in line endings
+ for ($i = 0; $i < $n_from; $i++) {
+ $from_lines[$i] = rtrim($from_lines[$i]);
+ }
+ for ($i = 0; $i < $n_to; $i++) {
+ $to_lines[$i] = rtrim($to_lines[$i]);
+ }
// Ignore trailing and leading matching lines.
- while ($n_from > 0 && $n_to > 0)
- {
- if ($from_lines[$n_from - 1] != $to_lines[$n_to - 1])
+ while ($n_from > 0 && $n_to > 0) {
+ if ($from_lines[$n_from - 1] != $to_lines[$n_to - 1])
break;
- $n_from--;
- $n_to--;
- $endskip++;
+ $n_from--;
+ $n_to--;
+ $endskip++;
}
- for ( $skip = 0; $skip < min($n_from, $n_to); $skip++)
- if ($from_lines[$skip] != $to_lines[$skip])
- break;
+ for ( $skip = 0; $skip < min($n_from, $n_to); $skip++) {
+ if ($from_lines[$skip] != $to_lines[$skip])
+ break;
+ }
$n_from -= $skip;
$n_to -= $skip;
$xlines = array();
$ylines = array();
// Ignore lines which do not exist in both files.
for ($x = 0; $x < $n_from; $x++)
- $xhash[$from_lines[$x + $skip]] = 1;
+ $xhash[$from_lines[$x + $skip]] = 1;
for ($y = 0; $y < $n_to; $y++)
{
- $line = $to_lines[$y + $skip];
- $ylines[] = $line;
- if ( ($this->ychanged[$y] = empty($xhash[$line])) )
+ $line = $to_lines[$y + $skip];
+ $ylines[] = $line;
+ if ( ($this->ychanged[$y] = empty($xhash[$line])) )
continue;
- $yhash[$line] = 1;
- $this->yv[] = $line;
- $this->yind[] = $y;
+ $yhash[$line] = 1;
+ $this->yv[] = $line;
+ $this->yind[] = $y;
}
for ($x = 0; $x < $n_from; $x++)
{
- $line = $from_lines[$x + $skip];
- $xlines[] = $line;
- if ( ($this->xchanged[$x] = empty($yhash[$line])) )
+ $line = $from_lines[$x + $skip];
+ $xlines[] = $line;
+ if ( ($this->xchanged[$x] = empty($yhash[$line])) )
continue;
- $this->xv[] = $line;
- $this->xind[] = $x;
+ $this->xv[] = $line;
+ $this->xind[] = $x;
}
// Find the LCS.
$this->_compareseq(0, sizeof($this->xv), 0, sizeof($this->yv));
@@ -102,47 +99,47 @@ class _WikiDiffEngine
// Compute the edit operations.
$this->edits = array();
if ($skip)
- $this->edits[] = $skip;
+ $this->edits[] = $skip;
$x = 0;
$y = 0;
while ($x < $n_from || $y < $n_to)
{
- USE_ASSERTS && assert($y < $n_to || $this->xchanged[$x]);
- USE_ASSERTS && assert($x < $n_from || $this->ychanged[$y]);
- // Skip matching "snake".
- $x0 = $x;
- $ncopy = 0;
- while ( $x < $n_from && $y < $n_to
- && !$this->xchanged[$x] && !$this->ychanged[$y])
- {
+ USE_ASSERTS && assert($y < $n_to || $this->xchanged[$x]);
+ USE_ASSERTS && assert($x < $n_from || $this->ychanged[$y]);
+ // Skip matching "snake".
+ $x0 = $x;
+ $ncopy = 0;
+ while ( $x < $n_from && $y < $n_to
+ && !$this->xchanged[$x] && !$this->ychanged[$y])
+ {
++$x;
++$y;
++$ncopy;
- }
- if ($x > $x0)
+ }
+ if ($x > $x0)
$this->edits[] = $x - $x0;
- // Find deletes.
- $x0 = $x;
- $ndelete = 0;
- while ($x < $n_from && $this->xchanged[$x])
- {
+ // Find deletes.
+ $x0 = $x;
+ $ndelete = 0;
+ while ($x < $n_from && $this->xchanged[$x])
+ {
++$x;
++$ndelete;
- }
- if ($x > $x0)
+ }
+ if ($x > $x0)
$this->edits[] = -($x - $x0);
- // Find adds.
- if (isset($this->ychanged[$y]) && $this->ychanged[$y])
- {
+ // Find adds.
+ if (isset($this->ychanged[$y]) && $this->ychanged[$y])
+ {
$adds = array();
while ($y < $n_to && $this->ychanged[$y])
- $adds[] = "" . $ylines[$y++];
+ $adds[] = "" . $ylines[$y++];
$this->edits[] = $adds;
- }
+ }
}
if ($endskip != 0)
- $this->edits[] = $endskip;
- }
+ $this->edits[] = $endskip;
+ }
/* Divide the Largest Common Subsequence (LCS) of the sequences
* [XOFF, XLIM) and [YOFF, YLIM) into NCHUNKS approximately equally
* sized segments.
@@ -160,21 +157,21 @@ class _WikiDiffEngine
* of the portions it is going to specify.
*/
function _diag ($xoff, $xlim, $yoff, $ylim, $nchunks)
- {
+ {
$flip = false;
if ($xlim - $xoff > $ylim - $yoff)
{
- // Things seems faster (I'm not sure I understand why)
- // when the shortest sequence in X.
- $flip = true;
- list ($xoff, $xlim, $yoff, $ylim)
+ // Things seems faster (I'm not sure I understand why)
+ // when the shortest sequence in X.
+ $flip = true;
+ list ($xoff, $xlim, $yoff, $ylim)
= array( $yoff, $ylim, $xoff, $xlim);
}
if ($flip)
- for ($i = $ylim - 1; $i >= $yoff; $i--)
+ for ($i = $ylim - 1; $i >= $yoff; $i--)
$ymatches[$this->xv[$i]][] = $i;
else
- for ($i = $ylim - 1; $i >= $yoff; $i--)
+ for ($i = $ylim - 1; $i >= $yoff; $i--)
$ymatches[$this->yv[$i]][] = $i;
$this->lcs = 0;
$this->seq[0]= $yoff - 1;
@@ -184,74 +181,76 @@ class _WikiDiffEngine
$x = $xoff;
for ($chunk = 0; $chunk < $nchunks; $chunk++)
{
- if ($chunk > 0)
+ if ($chunk > 0)
for ($i = 0; $i <= $this->lcs; $i++)
- $ymids[$i][$chunk-1] = $this->seq[$i];
- $x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks);
- for ( ; $x < $x1; $x++)
- {
+ $ymids[$i][$chunk-1] = $this->seq[$i];
+ $x1 = $xoff + (int)(($numer + ($xlim-$xoff)*$chunk) / $nchunks);
+ for ( ; $x < $x1; $x++)
+ {
$index = ($flip ? $this->yv[$x] : $this->xv[$x]);
if( !empty( $ymatches[$index] ) ) {
$matches = $ymatches[$index];
}
if (empty($matches))
- continue;
+ continue;
reset($matches);
- while (list ($junk, $y) = each($matches))
- if (empty($this->in_seq[$y]))
- {
+ foreach ($matches as $junk => $y)
+ {
+ if (empty($this->in_seq[$y]))
+ {
$k = $this->_lcs_pos($y);
USE_ASSERTS && assert($k > 0);
$ymids[$k] = $ymids[$k-1];
break;
- }
- while (list ($junk, $y) = each($matches))
+ }
+ }
+ foreach ($matches as $junk => $y)
{
- if ($y > $this->seq[$k-1])
- {
+ if ($y > $this->seq[$k-1])
+ {
USE_ASSERTS && assert($y < $this->seq[$k]);
// Optimization: this is a common case:
// next match is just replacing previous match.
$this->in_seq[$this->seq[$k]] = false;
$this->seq[$k] = $y;
$this->in_seq[$y] = 1;
- }
- else if (empty($this->in_seq[$y]))
- {
+ }
+ else if (empty($this->in_seq[$y]))
+ {
$k = $this->_lcs_pos($y);
USE_ASSERTS && assert($k > 0);
$ymids[$k] = $ymids[$k-1];
- }
+ }
+ }
}
- }
}
$seps[] = $flip ? array($yoff, $xoff) : array($xoff, $yoff);
$ymid = $ymids[$this->lcs];
for ($n = 0; $n < $nchunks - 1; $n++)
{
- $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
- $y1 = $ymid[$n] + 1;
- $seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
+ $x1 = $xoff + (int)(($numer + ($xlim - $xoff) * $n) / $nchunks);
+ $y1 = $ymid[$n] + 1;
+ $seps[] = $flip ? array($y1, $x1) : array($x1, $y1);
}
$seps[] = $flip ? array($ylim, $xlim) : array($xlim, $ylim);
return array($this->lcs, $seps);
- }
+ }
function _lcs_pos ($ypos)
- {
+ {
$end = $this->lcs;
if ($end == 0 || $ypos > $this->seq[$end])
{
- $this->seq[++$this->lcs] = $ypos;
- $this->in_seq[$ypos] = 1;
- return $this->lcs;
+ $this->seq[++$this->lcs] = $ypos;
+ $this->in_seq[$ypos] = 1;
+ return $this->lcs;
}
$beg = 1;
while ($beg < $end)
{
- $mid = (int)(($beg + $end) / 2);
- if ( $ypos > $this->seq[$mid] )
+ $mid = (int)(($beg + $end) / 2);
+ if ( $ypos > $this->seq[$mid] )
$beg = $mid + 1;
- else
+ else
$end = $mid;
}
USE_ASSERTS && assert($ypos != $this->seq[$end]);
@@ -259,7 +258,7 @@ class _WikiDiffEngine
$this->seq[$end] = $ypos;
$this->in_seq[$ypos] = 1;
return $end;
- }
+ }
/* Find LCS of two sequences.
*
* The results are recorded in the vectors $this->{x,y}changed[], by
@@ -272,53 +271,53 @@ class _WikiDiffEngine
* All line numbers are origin-0 and discarded lines are not counted.
*/
function _compareseq ($xoff, $xlim, $yoff, $ylim)
- {
+ {
// Slide down the bottom initial diagonal.
while ($xoff < $xlim && $yoff < $ylim
&& $this->xv[$xoff] == $this->yv[$yoff])
{
- ++$xoff;
- ++$yoff;
+ ++$xoff;
+ ++$yoff;
}
// Slide up the top initial diagonal.
while ($xlim > $xoff && $ylim > $yoff
&& $this->xv[$xlim - 1] == $this->yv[$ylim - 1])
{
- --$xlim;
- --$ylim;
+ --$xlim;
+ --$ylim;
}
if ($xoff == $xlim || $yoff == $ylim)
- $lcs = 0;
+ $lcs = 0;
else
{
- // This is ad hoc but seems to work well.
- //$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5);
- //$nchunks = max(2,min(8,(int)$nchunks));
- $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;
- list ($lcs, $seps)
+ // This is ad hoc but seems to work well.
+ //$nchunks = sqrt(min($xlim - $xoff, $ylim - $yoff) / 2.5);
+ //$nchunks = max(2,min(8,(int)$nchunks));
+ $nchunks = min(7, $xlim - $xoff, $ylim - $yoff) + 1;
+ list ($lcs, $seps)
= $this->_diag($xoff,$xlim,$yoff, $ylim,$nchunks);
}
if ($lcs == 0)
{
- // X and Y sequences have no common subsequence:
- // mark all changed.
- while ($yoff < $ylim)
+ // X and Y sequences have no common subsequence:
+ // mark all changed.
+ while ($yoff < $ylim)
$this->ychanged[$this->yind[$yoff++]] = 1;
- while ($xoff < $xlim)
+ while ($xoff < $xlim)
$this->xchanged[$this->xind[$xoff++]] = 1;
}
else
{
- // Use the partitions to split this problem into subproblems.
- reset($seps);
- $pt1 = $seps[0];
- while ($pt2 = next($seps))
- {
+ // Use the partitions to split this problem into subproblems.
+ reset($seps);
+ $pt1 = $seps[0];
+ while ($pt2 = next($seps))
+ {
$this->_compareseq ($pt1[0], $pt2[0], $pt1[1], $pt2[1]);
$pt1 = $pt2;
- }
+ }
+ }
}
- }
/* Adjust inserts/deletes of identical lines to join changes
* as much as possible.
*
@@ -332,7 +331,7 @@ class _WikiDiffEngine
* This is extracted verbatim from analyze.c (GNU diffutils-2.7).
*/
function _shift_boundaries ($lines, &$changed, $other_changed)
- {
+ {
$i = 0;
$j = 0;
USE_ASSERTS && assert('sizeof($lines) == sizeof($changed)');
@@ -340,34 +339,34 @@ class _WikiDiffEngine
$other_len = sizeof($other_changed);
while (1)
{
- /*
- * Scan forwards to find beginning of another run of changes.
- * Also keep track of the corresponding point in the other file.
- *
- * Throughout this code, $i and $j are adjusted together so that
- * the first $i elements of $changed and the first $j elements
- * of $other_changed both contain the same number of zeros
- * (unchanged lines).
- * Furthermore, $j is always kept so that $j == $other_len or
- * $other_changed[$j] == false.
- */
- while ($j < $other_len && $other_changed[$j])
+ /*
+ * Scan forwards to find beginning of another run of changes.
+ * Also keep track of the corresponding point in the other file.
+ *
+ * Throughout this code, $i and $j are adjusted together so that
+ * the first $i elements of $changed and the first $j elements
+ * of $other_changed both contain the same number of zeros
+ * (unchanged lines).
+ * Furthermore, $j is always kept so that $j == $other_len or
+ * $other_changed[$j] == false.
+ */
+ while ($j < $other_len && $other_changed[$j])
$j++;
- while ($i < $len && ! $changed[$i])
- {
+ while ($i < $len && ! $changed[$i])
+ {
USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]');
$i++; $j++;
while ($j < $other_len && $other_changed[$j])
- $j++;
- }
- if ($i == $len)
+ $j++;
+ }
+ if ($i == $len)
break;
- $start = $i;
- // Find the end of this run of changes.
- while (++$i < $len && $changed[$i])
+ $start = $i;
+ // Find the end of this run of changes.
+ while (++$i < $len && $changed[$i])
continue;
- do
- {
+ do
+ {
/*
* Record the length of this run of changes, so that
* we can later determine whether the run has grown.
@@ -380,14 +379,14 @@ class _WikiDiffEngine
*/
while ($start > 0 && $lines[$start - 1] == $lines[$i - 1])
{
- $changed[--$start] = 1;
- $changed[--$i] = false;
- while ($start > 0 && $changed[$start - 1])
+ $changed[--$start] = 1;
+ $changed[--$i] = false;
+ while ($start > 0 && $changed[$start - 1])
$start--;
- USE_ASSERTS && assert('$j > 0');
- while ($other_changed[--$j])
+ USE_ASSERTS && assert('$j > 0');
+ while ($other_changed[--$j])
continue;
- USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]');
+ USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]');
}
/*
* Set CORRESPONDING to the end of the changed run, at the last
@@ -404,36 +403,36 @@ class _WikiDiffEngine
*/
while ($i < $len && $lines[$start] == $lines[$i])
{
- $changed[$start++] = false;
- $changed[$i++] = 1;
- while ($i < $len && $changed[$i])
+ $changed[$start++] = false;
+ $changed[$i++] = 1;
+ while ($i < $len && $changed[$i])
$i++;
- USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]');
- $j++;
- if ($j < $other_len && $other_changed[$j])
- {
+ USE_ASSERTS && assert('$j < $other_len && ! $other_changed[$j]');
+ $j++;
+ if ($j < $other_len && $other_changed[$j])
+ {
$corresponding = $i;
while ($j < $other_len && $other_changed[$j])
- $j++;
- }
+ $j++;
+ }
+ }
}
- }
- while ($runlength != $i - $start);
- /*
- * If possible, move the fully-merged run of changes
- * back to a corresponding run in the other file.
- */
- while ($corresponding < $i)
- {
+ while ($runlength != $i - $start);
+ /*
+ * If possible, move the fully-merged run of changes
+ * back to a corresponding run in the other file.
+ */
+ while ($corresponding < $i)
+ {
$changed[--$start] = 1;
$changed[--$i] = 0;
USE_ASSERTS && assert('$j > 0');
while ($other_changed[--$j])
- continue;
+ continue;
USE_ASSERTS && assert('$j >= 0 && !$other_changed[$j]');
- }
+ }
+ }
}
- }
}
/**
* Class representing a diff between two files.
@@ -448,23 +447,23 @@ class WikiDiff
* Compute diff between files (or deserialize serialized WikiDiff.)
*/
function __construct($from_lines = false, $to_lines = false)
- {
+ {
if ($from_lines && $to_lines)
{
- $compute = new _WikiDiffEngine($from_lines, $to_lines);
- $this->edits = $compute->edits;
+ $compute = new _WikiDiffEngine($from_lines, $to_lines);
+ $this->edits = $compute->edits;
}
else if ($from_lines)
{
- // $from_lines is not really from_lines, but rather
- // a serialized WikiDiff.
- $this->edits = unserialize($from_lines);
+ // $from_lines is not really from_lines, but rather
+ // a serialized WikiDiff.
+ $this->edits = unserialize($from_lines);
}
else
{
- $this->edits = array();
+ $this->edits = array();
+ }
}
- }
/**
* Compute reversed WikiDiff.
*
@@ -477,36 +476,36 @@ class WikiDiff
* $out = $rev->apply($lines2);
*/
function reverse ($from_lines)
- {
+ {
$x = 0;
$rev = new WikiDiff;
for ( reset($this->edits);
- $edit = current($this->edits);
- next($this->edits) )
+ $edit = current($this->edits);
+ next($this->edits) )
{
- if (is_array($edit))
- { // Was an add, turn it into a delete.
+ if (is_array($edit))
+ { // Was an add, turn it into a delete.
$nadd = sizeof($edit);
USE_ASSERTS && assert ($nadd > 0);
$edit = -$nadd;
- }
- else if ($edit > 0)
- {
- // Was a copy --- just pass it through. }
+ }
+ else if ($edit > 0)
+ {
+ // Was a copy --- just pass it through. }
$x += $edit;
- }
- else if ($edit < 0)
- { // Was a delete, turn it into an add.
+ }
+ else if ($edit < 0)
+ { // Was a delete, turn it into an add.
$ndelete = -$edit;
$edit = array();
while ($ndelete-- > 0)
- $edit[] = "" . $from_lines[$x++];
- }
- else die("assertion error");
- $rev->edits[] = $edit;
+ $edit[] = "" . $from_lines[$x++];
+ }
+ else die("assertion error");
+ $rev->edits[] = $edit;
}
return $rev;
- }
+ }
/**
* Compose (concatenate) WikiDiffs.
*
@@ -520,7 +519,7 @@ class WikiDiff
* $out = $comp->apply($lines1);
*/
function compose ($that)
- {
+ {
reset($this->edits);
reset($that->edits);
$comp = new WikiDiff;
@@ -528,120 +527,120 @@ class WikiDiff
$right = current($that->edits);
while ($left || $right)
{
- if (!is_array($left) && $left < 0)
- { // Left op is a delete.
+ if (!is_array($left) && $left < 0)
+ { // Left op is a delete.
$newop = $left;
$left = next($this->edits);
- }
- else if (is_array($right))
- { // Right op is an add.
+ }
+ else if (is_array($right))
+ { // Right op is an add.
$newop = $right;
$right = next($that->edits);
- }
- else if (!$left || !$right)
+ }
+ else if (!$left || !$right)
die ("assertion error");
- else if (!is_array($left) && $left > 0)
- { // Left op is a copy.
+ else if (!is_array($left) && $left > 0)
+ { // Left op is a copy.
if ($left <= abs($right))
{
- $newop = $right > 0 ? $left : -$left;
- $right -= $newop;
- if ($right == 0)
+ $newop = $right > 0 ? $left : -$left;
+ $right -= $newop;
+ if ($right == 0)
$right = next($that->edits);
- $left = next($this->edits);
+ $left = next($this->edits);
}
else
{
- $newop = $right;
- $left -= abs($right);
- $right = next($that->edits);
+ $newop = $right;
+ $left -= abs($right);
+ $right = next($that->edits);
+ }
}
- }
- else
- { // Left op is an add.
+ else
+ { // Left op is an add.
if (!is_array($left)) die('assertion error');
$nleft = sizeof($left);
if ($nleft <= abs($right))
{
- if ($right > 0)
- { // Right op is copy
+ if ($right > 0)
+ { // Right op is copy
$newop = $left;
$right -= $nleft;
- }
- else // Right op is delete
- {
+ }
+ else // Right op is delete
+ {
$newop = false;
$right += $nleft;
- }
- if ($right == 0)
+ }
+ if ($right == 0)
$right = next($that->edits);
- $left = next($this->edits);
+ $left = next($this->edits);
}
else
{
- unset($newop);
- if ($right > 0)
+ unset($newop);
+ if ($right > 0)
for ($i = 0; $i < $right; $i++)
- $newop[] = $left[$i];
- $tmp = array();
- for ($i = abs($right); $i < $nleft; $i++)
+ $newop[] = $left[$i];
+ $tmp = array();
+ for ($i = abs($right); $i < $nleft; $i++)
$tmp[] = $left[$i];
- $left = $tmp;
- $right = next($that->edits);
+ $left = $tmp;
+ $right = next($that->edits);
+ }
}
- }
- if (!$op)
- {
+ if (!$op)
+ {
$op = $newop;
continue;
- }
- if (! $newop)
+ }
+ if (! $newop)
continue;
- if (is_array($op) && is_array($newop))
- {
+ if (is_array($op) && is_array($newop))
+ {
// Both $op and $newop are adds.
for ($i = 0; $i < sizeof($newop); $i++)
- $op[] = $newop[$i];
- }
- else if (($op > 0 && $newop > 0) || ($op < 0 && $newop < 0))
- { // $op and $newop are both either deletes or copies.
+ $op[] = $newop[$i];
+ }
+ else if (($op > 0 && $newop > 0) || ($op < 0 && $newop < 0))
+ { // $op and $newop are both either deletes or copies.
$op += $newop;
- }
- else
- {
+ }
+ else
+ {
$comp->edits[] = $op;
$op = $newop;
- }
+ }
}
if ($op)
- $comp->edits[] = $op;
+ $comp->edits[] = $op;
return $comp;
- }
+ }
/* Debugging only:
function _dump ()
- {
+ {
echo "<ol>";
for (reset($this->edits);
- $edit = current($this->edits);
- next($this->edits))
+ $edit = current($this->edits);
+ next($this->edits))
{
- echo "<li>";
- if ($edit > 0)
+ echo "<li>";
+ if ($edit > 0)
echo "Copy $edit";
- else if ($edit < 0)
+ else if ($edit < 0)
echo "Delete " . -$edit;
- else if (is_array($edit))
- {
+ else if (is_array($edit))
+ {
echo "Add " . sizeof($edit) . "<ul>";
for ($i = 0; $i < sizeof($edit); $i++)
- echo "<li>" . htmlspecialchars($edit[$i]);
+ echo "<li>" . htmlspecialchars($edit[$i]);
echo "</ul>";
- }
- else
+ }
+ else
die("assertion error");
}
echo "</ol>";
- }
+ }
*/
/**
* Apply a WikiDiff to a set of lines.
@@ -654,29 +653,29 @@ class WikiDiff
* $out = $diff->apply($lines1);
*/
function apply ($from_lines)
- {
+ {
$x = 0;
$xlim = sizeof($from_lines);
for ( reset($this->edits);
- $edit = current($this->edits);
- next($this->edits) )
+ $edit = current($this->edits);
+ next($this->edits) )
{
- if (is_array($edit))
- {
+ if (is_array($edit))
+ {
reset($edit);
while (list ($junk, $line) = each($edit))
- $output[] = $line;
- }
- else if ($edit > 0)
+ $output[] = $line;
+ }
+ else if ($edit > 0)
while ($edit--)
- $output[] = $from_lines[$x++];
- else
+ $output[] = $from_lines[$x++];
+ else
$x += -$edit;
}
if ($x != $xlim)
- ExitWiki(sprintf(tra ("WikiDiff::apply: line count mismatch: %s != %s"), $x, $xlim));
+ ExitWiki(sprintf(tra ("WikiDiff::apply: line count mismatch: %s != %s"), $x, $xlim));
return $output;
- }
+ }
/**
* Serialize a WikiDiff.
*
@@ -689,61 +688,61 @@ class WikiDiff
* $diff2 = new WikiDiff($string);
*/
function serialize ()
- {
+ {
return serialize($this->edits);
- }
+ }
/**
* Return true if two files were equal.
*/
function isEmpty ()
- {
+ {
if (sizeof($this->edits) > 1)
- return false;
+ return false;
if (sizeof($this->edits) == 0)
- return true;
+ return true;
// Test for: only edit is a copy.
return !is_array($this->edits[0]) && $this->edits[0] > 0;
- }
+ }
/**
* Compute the length of the Longest Common Subsequence (LCS).
*
* This is mostly for diagnostic purposed.
*/
function lcs ()
- {
+ {
$lcs = 0;
for (reset($this->edits);
- $edit = current($this->edits);
- next($this->edits))
+ $edit = current($this->edits);
+ next($this->edits))
{
- if (!is_array($edit) && $edit > 0)
+ if (!is_array($edit) && $edit > 0)
$lcs += $edit;
}
return $lcs;
- }
+ }
/**
* Check a WikiDiff for validity.
*
* This is here only for debugging purposes.
*/
function _check ($from_lines, $to_lines)
- {
+ {
$test = $this->apply($from_lines);
if (serialize($test) != serialize($to_lines))
- ExitWiki(tra ("WikiDiff::_check: failed"));
+ ExitWiki(tra ("WikiDiff::_check: failed"));
reset($this->edits);
$prev = current($this->edits);
$prevtype = is_array($prev) ? 'a' : ($prev > 0 ? 'c' : 'd');
while ($edit = next($this->edits))
{
- $type = is_array($edit) ? 'a' : ($edit > 0 ? 'c' : 'd');
- if ( $prevtype == $type )
+ $type = is_array($edit) ? 'a' : ($edit > 0 ? 'c' : 'd');
+ if ( $prevtype == $type )
ExitWiki(tra ("WikiDiff::_check: edit sequence is non-optimal"));
- $prevtype = $type;
+ $prevtype = $type;
}
$lcs = $this->lcs();
printf ("<strong>" . tra ("WikiDiff Okay: LCS = %s") . "</strong>\n", $lcs);
- }
+ }
}
/**
* A class to format a WikiDiff as HTML.
@@ -769,152 +768,152 @@ class WikiDiffFormatter
public $do_reverse_diff;
public $context_prefix, $deletes_prefix, $adds_prefix;
function WikiDiffFormatter ($reverse = false)
- {
+ {
$this->do_reverse_diff = $reverse;
$this->context_lines = 0;
$this->context_prefix = '&nbsp;&nbsp;';
$this->deletes_prefix = '&lt;&nbsp;';
$this->adds_prefix = '&gt;&nbsp;';
- }
+ }
function format ($diff, $from_lines)
- {
+ {
$html = '<table style="background-color: black" ' .
'cellspacing="2" cellpadding="2" border="0"><br />';
$html .= $this->_format($diff->edits, $from_lines);
$html .= "</table>\n";
return $html;
- }
+ }
function _format ($edits, $from_lines)
- {
+ {
$html = '';
$x = 0; $y = 0;
$xlim = sizeof($from_lines);
reset($edits);
while ($edit = current($edits))
{
- if (!is_array($edit) && $edit >= 0)
- { // Edit op is a copy.
+ if (!is_array($edit) && $edit >= 0)
+ { // Edit op is a copy.
$ncopy = $edit;
- }
- else
- {
+ }
+ else
+ {
$ncopy = 0;
if (empty($hunk))
{
- // Start of an output hunk.
- $xoff = max(0, $x - $this->context_lines);
- $yoff = $xoff + $y - $x;
- if ($xoff < $x)
- {
+ // Start of an output hunk.
+ $xoff = max(0, $x - $this->context_lines);
+ $yoff = $xoff + $y - $x;
+ if ($xoff < $x)
+ {
// Get leading context.
$context = array();
for ($i = $xoff; $i < $x; $i++)
- $context[] = $from_lines[$i];
+ $context[] = $from_lines[$i];
$hunk['c'] = $context;
- }
+ }
}
if (is_array($edit))
{ // Edit op is an add.
- $y += sizeof($edit);
- $hunk[$this->do_reverse_diff ? 'd' : 'a'] = $edit;
+ $y += sizeof($edit);
+ $hunk[$this->do_reverse_diff ? 'd' : 'a'] = $edit;
}
else
{ // Edit op is a delete
- $deletes = array();
- while ($edit++ < 0)
+ $deletes = array();
+ while ($edit++ < 0)
$deletes[] = $from_lines[$x++];
- $hunk[$this->do_reverse_diff ? 'a' : 'd'] = $deletes;
+ $hunk[$this->do_reverse_diff ? 'a' : 'd'] = $deletes;
}
- }
- $next = next($edits);
- if (!empty($hunk))
- {
+ }
+ $next = next($edits);
+ if (!empty($hunk))
+ {
if ( !$next || $ncopy > 2 * $this->context_lines)
{
- // End of an output hunk.
- $hunks[] = $hunk;
- unset($hunk);
- $xend = min($x + $this->context_lines, $xlim);
- if ($x < $xend)
- {
+ // End of an output hunk.
+ $hunks[] = $hunk;
+ unset($hunk);
+ $xend = min($x + $this->context_lines, $xlim);
+ if ($x < $xend)
+ {
// Get trailing context.
$context = array();
for ($i = $x; $i < $xend; $i++)
- $context[] = $from_lines[$i];
+ $context[] = $from_lines[$i];
$hunks[] = array('c' => $context);
- }
- $xlen = $xend - $xoff;
- $ylen = $xend + $y - $x - $yoff;
- $xbeg = $xlen ? $xoff + 1 : $xoff;
- $ybeg = $ylen ? $yoff + 1 : $yoff;
- if ($this->do_reverse_diff)
+ }
+ $xlen = $xend - $xoff;
+ $ylen = $xend + $y - $x - $yoff;
+ $xbeg = $xlen ? $xoff + 1 : $xoff;
+ $ybeg = $ylen ? $yoff + 1 : $yoff;
+ if ($this->do_reverse_diff)
list ($xbeg, $xlen, $ybeg, $ylen)
- = array($ybeg, $ylen, $xbeg, $xlen);
- $html .= $this->_emit_diff($xbeg,$xlen,$ybeg,$ylen,
- $hunks);
- unset($hunks);
+ = array($ybeg, $ylen, $xbeg, $xlen);
+ $html .= $this->_emit_diff($xbeg,$xlen,$ybeg,$ylen,
+ $hunks);
+ unset($hunks);
}
else if ($ncopy)
{
- $hunks[] = $hunk;
- // Copy context.
- $context = array();
- for ($i = $x; $i < $x + $ncopy; $i++)
+ $hunks[] = $hunk;
+ // Copy context.
+ $context = array();
+ for ($i = $x; $i < $x + $ncopy; $i++)
$context[] = $from_lines[$i];
- $hunk = array('c' => $context);
+ $hunk = array('c' => $context);
}
- }
- $x += $ncopy;
- $y += $ncopy;
+ }
+ $x += $ncopy;
+ $y += $ncopy;
}
return $html;
- }
+ }
function _emit_lines($lines, $prefix, $color)
- {
+ {
$html = '';
reset($lines);
foreach( $lines as $junk => $line ) {
- $html .= "<tr style=\"background-color: $color\"><td><tt>$prefix</tt>";
- $html .= "<tt>" . htmlspecialchars($line) . "</tt></td></tr>\n";
+ $html .= "<tr style=\"background-color: $color\"><td><tt>$prefix</tt>";
+ $html .= "<tt>" . htmlspecialchars($line) . "</tt></td></tr>\n";
}
return $html;
- }
+ }
function _emit_diff ($xbeg,$xlen,$ybeg,$ylen,$hunks)
- {
+ {
$html = '<tr><td><table style="background-color: white"'
- . ' cellspacing="0" border="0" cellpadding="4"><br />'
- . '<tr bgcolor="#cccccc"><td><tt>'
- . $this->_diff_header($xbeg, $xlen, $ybeg, $ylen)
- . "</tt></td></tr>\n<tr><td>\n"
- . '<table cellspacing="0" border="0" cellpadding="2"><br />';
+ . ' cellspacing="0" border="0" cellpadding="4"><br />'
+ . '<tr bgcolor="#cccccc"><td><tt>'
+ . $this->_diff_header($xbeg, $xlen, $ybeg, $ylen)
+ . "</tt></td></tr>\n<tr><td>\n"
+ . '<table cellspacing="0" border="0" cellpadding="2"><br />';
$prefix = array('c' => $this->context_prefix,
'a' => $this->adds_prefix,
'd' => $this->deletes_prefix);
$color = array('c' => '#ffffff',
- 'a' => '#ccffcc',
- 'd' => '#ffcccc');
+ 'a' => '#ccffcc',
+ 'd' => '#ffcccc');
for (reset($hunks); $hunk = current($hunks); next($hunks))
{
- if (!empty($hunk['c']))
+ if (!empty($hunk['c']))
$html .= $this->_emit_lines($hunk['c'],
- $this->context_prefix, '#ffffff');
- if (!empty($hunk['d']))
+ $this->context_prefix, '#ffffff');
+ if (!empty($hunk['d']))
$html .= $this->_emit_lines($hunk['d'],
- $this->deletes_prefix, '#ffcccc');
- if (!empty($hunk['a']))
+ $this->deletes_prefix, '#ffcccc');
+ if (!empty($hunk['a']))
$html .= $this->_emit_lines($hunk['a'],
- $this->adds_prefix, '#ccffcc');
+ $this->adds_prefix, '#ccffcc');
}
$html .= "</table></td></tr></table></td></tr>\n";
return $html;
- }
+ }
function _diff_header ($xbeg,$xlen,$ybeg,$ylen)
- {
+ {
$what = $xlen ? ($ylen ? 'c' : 'd') : 'a';
$xlen = $xlen > 1 ? "," . ($xbeg + $xlen - 1) : '';
$ylen = $ylen > 1 ? "," . ($ybeg + $ylen - 1) : '';
return "$xbeg$xlen$what$ybeg$ylen";
- }
+ }
}
/**
* A class to format a WikiDiff as a pretty HTML unified diff.
@@ -933,26 +932,26 @@ class WikiDiffFormatter
class WikiUnifiedDiffFormatter extends WikiDiffFormatter
{
function WikiUnifiedDiffFormatter ($reverse = false, $context_lines = 3)
- {
+ {
$this->do_reverse_diff = $reverse;
$this->context_lines = $context_lines;
$this->context_prefix = '&nbsp;';
$this->deletes_prefix = '-';
$this->adds_prefix = '+';
- }
+ }
function _diff_header ($xbeg,$xlen,$ybeg,$ylen)
- {
+ {
$xlen = $xlen == 1 ? '' : ",$xlen";
$ylen = $ylen == 1 ? '' : ",$ylen";
return "@@ -$xbeg$xlen +$ybeg$ylen @@";
- }
+ }
}
/////////////////////////////////////////////////////////////////
/*
if ($diff)
{
if (get_magic_quotes_gpc()) {
- $diff = stripslashes($diff);
+ $diff = stripslashes($diff);
}
$pagename = $diff;
$wiki = RetrievePage($dbi, $pagename, $WikiPageStore);
@@ -962,68 +961,68 @@ if ($diff)
$html .= tra ("Current page:");
$html .= '</td>';
if (is_array($wiki)) {
- $html .= "<td>";
- $html .= sprintf(tra ("version %s"), $wiki['version']);
- $html .= "</td><td>";
- $html .= sprintf(tra ("last modified on %s"),
+ $html .= "<td>";
+ $html .= sprintf(tra ("version %s"), $wiki['version']);
+ $html .= "</td><td>";
+ $html .= sprintf(tra ("last modified on %s"),
date($datetimeformat, $wiki['lastmodified']));
- $html .= "</td><td>";
- $html .= sprintf (tra ("by %s"), $wiki['author']);
- $html .= "</td>";
+ $html .= "</td><td>";
+ $html .= sprintf (tra ("by %s"), $wiki['author']);
+ $html .= "</td>";
} else {
- $html .= "<td colspan=3><em>";
- $html .= tra ("None");
- $html .= "</em></td>";
+ $html .= "<td colspan=3><em>";
+ $html .= tra ("None");
+ $html .= "</em></td>";
}
$html .= "</tr>\n";
$html .= '<tr><td align="right">';
$html .= tra ("Archived page:");
$html .= '</td>';
if (is_array($archive)) {
- $html .= "<td>";
- $html .= sprintf(tra ("version %s"), $archive['version']);
- $html .= "</td><td>";
- $html .= sprintf(tra ("last modified on %s"),
+ $html .= "<td>";
+ $html .= sprintf(tra ("version %s"), $archive['version']);
+ $html .= "</td><td>";
+ $html .= sprintf(tra ("last modified on %s"),
date($datetimeformat, $archive['lastmodified']));
- $html .= "</td><td>";
- $html .= sprintf(tra ("by %s"), $archive['author']);
- $html .= "</td>";
+ $html .= "</td><td>";
+ $html .= sprintf(tra ("by %s"), $archive['author']);
+ $html .= "</td>";
} else {
- $html .= "<td colspan=3><em>";
- $html .= tra ("None");
- $html .= "</em></td>";
+ $html .= "<td colspan=3><em>";
+ $html .= tra ("None");
+ $html .= "</em></td>";
}
$html .= "</tr></table><p>\n";
if (is_array($wiki) && is_array($archive))
- {
- $diff = new WikiDiff($archive['content'], $wiki['content']);
- if ($diff->isEmpty()) {
+ {
+ $diff = new WikiDiff($archive['content'], $wiki['content']);
+ if ($diff->isEmpty()) {
$html .= '<hr>[' . tra ("Versions are identical") . ']';
- } else {
+ } else {
//$fmt = new WikiDiffFormatter;
$fmt = new WikiUnifiedDiffFormatter;
$html .= $fmt->format($diff, $archive['content']);
- }
- }
+ }
+ }
GeneratePage('MESSAGE', $html, sprintf(tra ("Diff of %s."),
htmlspecialchars($pagename)), 0);
}
*/
- // \todo remove html hardcoded in diff2
- function diff2($page1, $page2) {
- $page1 = split("\n", $page1);
- $page2 = split("\n", $page2);
- $z = new WikiDiff($page1, $page2);
- if ($z->isEmpty()) {
- $html = '<hr><br />[' . tra("Versions are identical"). ']<br /><br />';
- } else {
- //$fmt = new WikiDiffFormatter;
- $fmt = new WikiUnifiedDiffFormatter;
- $html = $fmt->format($z, $page1);
- }
- return $html;
- }
+ // \todo remove html hardcoded in diff2
+ function diff2($page1, $page2) {
+ $page1 = split("\n", $page1);
+ $page2 = split("\n", $page2);
+ $z = new WikiDiff($page1, $page2);
+ if ($z->isEmpty()) {
+ $html = '<hr><br />[' . tra("Versions are identical"). ']<br /><br />';
+ } else {
+ //$fmt = new WikiDiffFormatter;
+ $fmt = new WikiUnifiedDiffFormatter;
+ $html = $fmt->format($z, $page1);
+ }
+ return $html;
+ }
?>
generated by cgit v1.3 (git 2.53.0) at 2026-06-29 21:21:53 +0000