public function isError()
{
if (null === $this->_isError) {
$this->_isError = null !== Engine_File_Diff::getErrorCodeKey($this->_status);
}
return $this->_isError;
}
public function execute()
{
reset($this->_leftFiles);
reset($this->_rightFiles);
while (($left = current($this->_leftFiles)) && ($right = current($this->_rightFiles))) {
$diff = Engine_File_Diff::factory($left, $right);
$diff->execute();
$this->_diffs[] = $diff;
next($this->_leftFiles);
next($this->_rightFiles);
}
return $this;
}
public function execute()
{
reset($this->_leftFiles);
reset($this->_rightFiles);
reset($this->_originalFiles);
$break = false;
while (!$break) {
$left = current($this->_leftFiles);
$right = current($this->_rightFiles);
$original = current($this->_originalFiles);
if (!$left && !$right && !$original) {
$break = true;
continue;
} else {
$diff = Engine_File_Diff::factory($left, $right, $original);
$diff->execute();
$this->_diffs[] = $diff;
}
next($this->_leftFiles);
next($this->_rightFiles);
next($this->_originalFiles);
}
return $this;
}
public static function compare($left, $right, $original = null)
{
$left = self::_procResultOrFile($left);
$right = self::_procResultOrFile($right);
try {
$original = self::_procFile($original);
} catch (Exception $e) {
// Silence
}
if (!($left instanceof Engine_File_Diff_File && $right instanceof Engine_File_Diff_File && $original instanceof Engine_File_Diff_File) && !($left instanceof Engine_File_Diff_Result && $right instanceof Engine_File_Diff_Result && null === $original)) {
throw new Engine_File_Diff_Exception(sprintf('%s::%s must be given two instances of Engine_File_Diff_Result or three instances of Engine_File_Diff_File'));
}
if ($left instanceof Engine_File_Diff_File) {
$otl_status = parent::compare($original, $left);
$otr_status = parent::compare($original, $right);
$lFile = $left;
$rFile = $right;
$oFile = $original;
} else {
if ($left instanceof Engine_File_Diff_Result) {
$otl_status = $left->getStatus();
$otr_status = $right->getStatus();
$lFile = $left->getRight();
$rFile = $right->getRight();
$oFile = $left->getLeft();
} else {
throw new Engine_File_Diff_Exception("Oh no");
}
}
// (left_theirs << self::SHIFT) | right_ours
$combined = $otl_status << self::SHIFT | $otr_status;
switch ($combined) {
// Contradicting states
case self::IDENTICAL << self::SHIFT | self::ADDED:
case self::IDENTICAL << self::SHIFT | self::MISSING:
case self::DIFFERENT << self::SHIFT | self::ADDED:
case self::DIFFERENT << self::SHIFT | self::MISSING:
case self::ADDED << self::SHIFT | self::IDENTICAL:
case self::ADDED << self::SHIFT | self::DIFFERENT:
case self::ADDED << self::SHIFT | self::REMOVED:
case self::REMOVED << self::SHIFT | self::ADDED:
case self::REMOVED << self::SHIFT | self::MISSING:
case self::MISSING << self::SHIFT | self::IDENTICAL:
case self::MISSING << self::SHIFT | self::DIFFERENT:
case self::MISSING << self::SHIFT | self::REMOVED:
$status = self::IMPOSSIBLE;
// ERROR_IMPOSSIBLE
break;
// Something went horribly wrong
// Something went horribly wrong
default:
//$status = self::IMPOSSIBLE; // ERROR_IMPOSSIBLE
throw new Engine_File_Diff_Exception(sprintf('Something went horribly wrong: %s %s %s', gettype($otl_status), gettype($otr_status), gettype($combined)));
break;
// Ignore states
// It's all the same damn thing
// Ignore states
// It's all the same damn thing
case self::IDENTICAL << self::SHIFT | self::IDENTICAL:
// Theirs changed, but ours didn't
// Theirs changed, but ours didn't
case self::DIFFERENT << self::SHIFT | self::IDENTICAL:
// They added it, we never had it
// They added it, we never had it
case self::ADDED << self::SHIFT | self::MISSING:
// We both removed it
// We both removed it
case self::REMOVED << self::SHIFT | self::REMOVED:
// WHERE AM I?! THERES NOTHING HERE!
// WHERE AM I?! THERES NOTHING HERE!
case self::MISSING << self::SHIFT | self::MISSING:
$status = self::IGNORE;
break;
// Add states
// They removed it, we put it back
// Add states
// They removed it, we put it back
case self::REMOVED << self::SHIFT | self::IDENTICAL:
// They removed it, we put it back
// They removed it, we put it back
case self::REMOVED << self::SHIFT | self::DIFFERENT:
// They never had it, let's give it to them
// They never had it, let's give it to them
case self::MISSING << self::SHIFT | self::ADDED:
$status = self::ADD;
// ACTION_ADD
break;
// Replace states
// We changed it, update it
// Replace states
// We changed it, update it
case self::IDENTICAL << self::SHIFT | self::DIFFERENT:
$status = self::REPLACE;
// ACTION_REPLACE
break;
// Remove states
// They didn't change it, we removed it
// Remove states
// They didn't change it, we removed it
case self::IDENTICAL << self::SHIFT | self::REMOVED:
$status = self::REMOVE;
// ACTION_REMOVE
break;
// Conflict states
// They changed it, we removed it
// Conflict states
// They changed it, we removed it
case self::DIFFERENT << self::SHIFT | self::REMOVED:
$status = self::DIFFERENT_REMOVED;
// CONFLICT_REMOVE_MODIFIED
break;
// Multi-step states
// We both changed it, compare
// Multi-step states
// We both changed it, compare
case self::DIFFERENT << self::SHIFT | self::DIFFERENT:
if (parent::compare($lFile, $rFile) == self::IDENTICAL) {
$status = self::IGNORE;
} else {
$status = self::DIFFERENT_DIFFERENT;
}
break;
// We both added it, compare
// We both added it, compare
case self::ADDED << self::SHIFT | self::ADDED:
if (parent::compare($lFile, $rFile) == self::IDENTICAL) {
$status = self::IGNORE;
} else {
$status = self::ADDED_ADDED;
}
break;
}
return $status;
}
protected function _buildFileOperations($showAll = false)
{
$rightFiles = $this->getDiffTargetFiles();
$originalFiles = $this->getDiffCurrentFiles();
//$leftFiles = $this->getDiffMasterFiles();
$leftFiles = array_unique(array_merge(array_keys($originalFiles), array_keys($rightFiles)));
sort($leftFiles);
$leftPath = $this->getManager()->getBasePath();
$rightPath = null !== $this->getTargetPackage() ? $this->getTargetPackage()->getBasePath() : null;
$originalPath = null !== $this->getCurrentPackage() ? $this->getCurrentPackage()->getBasePath() : null;
$hasErrors = false;
$fileOperations = array();
foreach ($leftFiles as $file) {
// Format left
$left = $file;
// Format right
$right = null;
if (isset($rightFiles[$file])) {
if (isset($rightFiles[$file]['dir']) && $rightFiles[$file]['dir']) {
continue;
}
$right = $rightFiles[$file];
}
// Format original
$original = null;
if (!empty($originalFiles) && isset($originalFiles[$file])) {
if (isset($originalFiles[$file]['dir']) && $originalFiles[$file]['dir']) {
continue;
}
$original = $originalFiles[$file];
}
$leftFormatted = $this->_formatFileData($left, $leftPath, $file);
$rightFormatted = $this->_formatFileData($right, $rightPath, $file);
$originalFormatted = null;
if (!empty($originalFiles)) {
$originalFormatted = $this->_formatFileData($original, $originalPath, $file);
}
// Diff
if (null === $originalFormatted) {
$diffResult = Engine_File_Diff::compare($leftFormatted, $rightFormatted);
} else {
$diffResult = Engine_File_Diff3::compare($leftFormatted, $rightFormatted, $originalFormatted);
}
// Show all?
if (!$showAll && ($diffResult == Engine_File_Diff::IDENTICAL || $diffResult == Engine_File_Diff::IGNORE)) {
continue;
}
// Err
$hasError = null !== Engine_File_Diff::getErrorCodeKey($diffResult);
$hasErrors = $hasErrors || $hasError;
$diffInfo = array('error' => (bool) $hasError, 'key' => Engine_File_Diff::getCodeKey($diffResult), 'result' => $diffResult, 'relPath' => $left, 'leftPath' => is_array($leftFormatted) ? $leftFormatted['path'] : (is_string($leftFormatted) ? $leftFormatted : null), 'rightPath' => is_array($rightFormatted) ? $rightFormatted['path'] : (is_string($rightFormatted) ? $rightFormatted : null), 'originalPath' => is_array($originalFormatted) ? $originalFormatted['path'] : (is_string($originalFormatted) ? $originalFormatted : null));
$fileOperations[$left] = $diffInfo;
}
return array('key' => $this->getKey(), 'error' => (bool) $hasErrors, 'operations' => $fileOperations);
}
