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');
16 function _Diff3_Block ($orig = false, $final1 = false, $final2 = false) {
17 $this->orig = $orig ? $orig : array();
18 $this->final1 = $final1 ? $final1 : array();
19 $this->final2 = $final2 ? $final2 : array();
23 if (!isset($this->_merged)) {
24 if ($this->final1 === $this->final2)
25 $this->_merged = &$this->final1;
26 elseif ($this->final1 === $this->orig)
27 $this->_merged = &$this->final2;
28 elseif ($this->final2 === $this->orig)
29 $this->_merged = &$this->final1;
31 $this->_merged = false;
33 return $this->_merged;
36 function is_conflict () {
37 return $this->merged() === false;
41 class _Diff3_CopyBlock extends _Diff3_Block {
44 function _Diff3_CopyBlock ($lines = false) {
45 $this->orig = $lines ? $lines : array();
46 $this->final1 = &$this->orig;
47 $this->final2 = &$this->orig;
54 function is_conflict () {
59 class _Diff3_BlockBuilder {
60 function _Diff3_BlockBuilder () {
65 $this->orig = $this->final1 = $this->final2 = array();
68 function _append (&$array, $lines) {
69 array_splice($array, sizeof($array), 0, $lines);
72 function input($lines) {
74 $this->_append($this->orig, $lines);
77 function out1($lines) {
79 $this->_append($this->final1, $lines);
82 function out2($lines) {
84 $this->_append($this->final2, $lines);
88 return !$this->orig && !$this->final1 && !$this->final2;
92 if ($this->is_empty())
95 $block = new _Diff3_Block($this->orig, $this->final1, $this->final2);
103 function Diff3 ($orig, $final1, $final2) {
104 $eng = new _DiffEngine;
105 $this->ConflictingBlocks = 0; //Conflict counter
106 $this->blocks = $this->__diff3($eng->diff($orig, $final1),
107 $eng->diff($orig, $final2));
110 function __diff3($edits1, $edits2) {
112 $bb = new _Diff3_BlockBuilder;
114 $e1 = current($edits1);
115 $e2 = current($edits2);
122 if ($e1 && $e2 && $e1->type == 'copy' && $e2->type == 'copy') {
123 // We have copy blocks from both diffs. This is the (only)
124 // time we want to emit a diff3 copy block.
125 // Flush current diff3 diff block, if any
126 if ($block = $bb->finish())
129 $ncopy = min($e1->norig(), $e2->norig());
131 $blocks[] = new _Diff3_CopyBlock(array_slice($e1->orig, 0, $ncopy));
133 if ($e1->norig() > $ncopy) {
134 array_splice($e1->orig, 0, $ncopy);
135 array_splice($e1->final, 0, $ncopy);
140 if ($e2->norig() > $ncopy) {
141 array_splice($e2->orig, 0, $ncopy);
142 array_splice($e2->final, 0, $ncopy);
149 if ($e1->orig && $e2->orig) {
150 $norig = min($e1->norig(), $e2->norig());
151 $orig = array_splice($e1->orig, 0, $norig);
152 array_splice($e2->orig, 0, $norig);
156 if ($e1->type == 'copy')
157 $bb->out1(array_splice($e1->final, 0, $norig));
159 if ($e2->type == 'copy')
160 $bb->out2(array_splice($e2->final, 0, $norig));
162 if ($e1 && ! $e1->orig) {
163 $bb->out1($e1->final);
166 if ($e2 && ! $e2->orig) {
167 $bb->out2($e2->final);
173 if ($block = $bb->finish())
179 function merged_output($label1 = false, $label2 = false) {
181 foreach ($this->blocks as $block) {
182 if ($block->is_conflict()) {
183 // FIXME: this should probably be moved somewhere else...
184 $lines = array_merge($lines,
185 array("<<<<<<<" . ($label1 ? " $label1" : '')),
189 array(">>>>>>>" . ($label2 ? " $label2" : '')));
190 $this->ConflictingBlocks++;
193 $lines = array_merge($lines, $block->merged());
204 // c-hanging-comment-ender-p: nil
205 // indent-tabs-mode: nil