5 // A class for computing three way diffs
7 // Copyright (C) 2001 Geoffrey T. Dairiki <dairiki@dairiki.org>
8 // You may copy this code freely under the conditions of the GPL.
11 require_once 'lib/difflib.php';
15 public $type = 'diff3';
17 function _Diff3_Block($orig = false, $final1 = false, $final2 = false)
19 $this->orig = $orig ? $orig : array();
20 $this->final1 = $final1 ? $final1 : array();
21 $this->final2 = $final2 ? $final2 : array();
26 if (!isset($this->_merged)) {
27 if ($this->final1 === $this->final2)
28 $this->_merged = &$this->final1;
29 elseif ($this->final1 === $this->orig)
30 $this->_merged = &$this->final2; elseif ($this->final2 === $this->orig)
31 $this->_merged = &$this->final1; else
32 $this->_merged = false;
34 return $this->_merged;
37 function is_conflict()
39 return $this->merged() === false;
43 class _Diff3_CopyBlock extends _Diff3_Block
45 public $type = 'copy';
47 function __construct($lines = false)
49 $this->orig = $lines ? $lines : array();
50 $this->final1 = &$this->orig;
51 $this->final2 = &$this->orig;
59 function is_conflict()
65 class _Diff3_BlockBuilder
67 function __construct()
74 $this->orig = $this->final1 = $this->final2 = array();
77 function _append(&$array, $lines)
79 array_splice($array, sizeof($array), 0, $lines);
82 function input($lines)
85 $this->_append($this->orig, $lines);
91 $this->_append($this->final1, $lines);
97 $this->_append($this->final2, $lines);
102 return !$this->orig && !$this->final1 && !$this->final2;
107 if ($this->is_empty())
110 $block = new _Diff3_Block($this->orig, $this->final1, $this->final2);
119 function __construct($orig, $final1, $final2)
121 $eng = new _DiffEngine;
122 $this->ConflictingBlocks = 0; //Conflict counter
123 $this->blocks = $this->__diff3($eng->diff($orig, $final1),
124 $eng->diff($orig, $final2));
127 function __diff3($edits1, $edits2)
130 $bb = new _Diff3_BlockBuilder;
132 $e1 = current($edits1);
133 $e2 = current($edits2);
140 if ($e1 && $e2 && $e1->type == 'copy' && $e2->type == 'copy') {
141 // We have copy blocks from both diffs. This is the (only)
142 // time we want to emit a diff3 copy block.
143 // Flush current diff3 diff block, if any
144 if ($block = $bb->finish())
147 $ncopy = min($e1->norig(), $e2->norig());
149 $blocks[] = new _Diff3_CopyBlock(array_slice($e1->orig, 0, $ncopy));
151 if ($e1->norig() > $ncopy) {
152 array_splice($e1->orig, 0, $ncopy);
153 array_splice($e1->final, 0, $ncopy);
157 if ($e2->norig() > $ncopy) {
158 array_splice($e2->orig, 0, $ncopy);
159 array_splice($e2->final, 0, $ncopy);
164 if ($e1->orig && $e2->orig) {
165 $norig = min($e1->norig(), $e2->norig());
166 $orig = array_splice($e1->orig, 0, $norig);
167 array_splice($e2->orig, 0, $norig);
171 if ($e1->type == 'copy')
172 $bb->out1(array_splice($e1->final, 0, $norig));
174 if ($e2->type == 'copy')
175 $bb->out2(array_splice($e2->final, 0, $norig));
177 if ($e1 && !$e1->orig) {
178 $bb->out1($e1->final);
181 if ($e2 && !$e2->orig) {
182 $bb->out2($e2->final);
188 if ($block = $bb->finish())
194 function merged_output($label1 = false, $label2 = false)
197 foreach ($this->blocks as $block) {
198 if ($block->is_conflict()) {
199 // FIXME: this should probably be moved somewhere else...
200 $lines = array_merge($lines,
201 array("<<<<<<<" . ($label1 ? " $label1" : '')),
205 array(">>>>>>>" . ($label2 ? " $label2" : '')));
206 $this->ConflictingBlocks++;
208 $lines = array_merge($lines, $block->merged());
219 // c-hanging-comment-ender-p: nil
220 // indent-tabs-mode: nil