2011-01-24 20:01:53 +01:00
|
|
|
<?php
|
|
|
|
|
2012-03-13 19:18:11 +01:00
|
|
|
final class DifferentialHunk extends DifferentialDAO {
|
2011-01-24 20:01:53 +01:00
|
|
|
|
|
|
|
protected $changesetID;
|
|
|
|
protected $changes;
|
|
|
|
protected $oldOffset;
|
|
|
|
protected $oldLen;
|
|
|
|
protected $newOffset;
|
|
|
|
protected $newLen;
|
|
|
|
|
2012-04-28 08:00:30 +02:00
|
|
|
public function getAddedLines() {
|
2012-06-27 19:44:29 +02:00
|
|
|
return $this->makeContent($include = '+');
|
2012-04-28 08:00:30 +02:00
|
|
|
}
|
|
|
|
|
2011-01-24 20:01:53 +01:00
|
|
|
public function makeNewFile() {
|
2012-06-27 19:44:29 +02:00
|
|
|
return implode('', $this->makeContent($include = ' +'));
|
2011-01-24 20:01:53 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
public function makeOldFile() {
|
2012-06-27 19:44:29 +02:00
|
|
|
return implode('', $this->makeContent($include = ' -'));
|
2011-01-24 20:01:53 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
public function makeChanges() {
|
2012-06-27 19:44:29 +02:00
|
|
|
return implode('', $this->makeContent($include = '-+'));
|
2011-01-24 20:01:53 +01:00
|
|
|
}
|
|
|
|
|
2012-06-27 19:44:29 +02:00
|
|
|
final private function makeContent($include) {
|
2011-01-24 20:01:53 +01:00
|
|
|
$results = array();
|
|
|
|
$lines = explode("\n", $this->changes);
|
2012-03-22 22:13:48 +01:00
|
|
|
|
|
|
|
// NOTE: To determine whether the recomposed file should have a trailing
|
|
|
|
// newline, we look for a "\ No newline at end of file" line which appears
|
|
|
|
// after a line which we don't exclude. For example, if we're constructing
|
|
|
|
// the "new" side of a diff (excluding "-"), we want to ignore this one:
|
|
|
|
//
|
|
|
|
// - x
|
|
|
|
// \ No newline at end of file
|
|
|
|
// + x
|
|
|
|
//
|
|
|
|
// ...since it's talking about the "old" side of the diff, but interpret
|
|
|
|
// this as meaning we should omit the newline:
|
|
|
|
//
|
|
|
|
// - x
|
|
|
|
// + x
|
|
|
|
// \ No newline at end of file
|
|
|
|
|
2012-06-27 19:44:29 +02:00
|
|
|
$n = (strpos($include, '+') !== false ?
|
|
|
|
$this->newOffset :
|
|
|
|
$this->oldOffset);
|
2012-03-22 22:13:48 +01:00
|
|
|
$use_next_newline = false;
|
2011-01-24 20:01:53 +01:00
|
|
|
foreach ($lines as $line) {
|
2012-06-27 19:44:29 +02:00
|
|
|
if (!isset($line[0])) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($line[0] == '\\') {
|
|
|
|
if ($use_next_newline) {
|
|
|
|
$results[last_key($results)] = rtrim(end($results), "\n");
|
2012-03-22 22:13:48 +01:00
|
|
|
}
|
2012-06-27 19:44:29 +02:00
|
|
|
} else if (strpos($include, $line[0]) === false) {
|
|
|
|
$use_next_newline = false;
|
|
|
|
} else {
|
|
|
|
$use_next_newline = true;
|
|
|
|
$results[$n] = substr($line, 1)."\n";
|
2011-01-24 20:01:53 +01:00
|
|
|
}
|
2012-03-22 22:13:48 +01:00
|
|
|
|
2012-06-27 19:44:29 +02:00
|
|
|
if ($line[0] == ' ' || strpos($include, $line[0]) !== false) {
|
|
|
|
$n++;
|
|
|
|
}
|
2012-03-22 22:13:48 +01:00
|
|
|
}
|
|
|
|
|
2012-06-27 19:44:29 +02:00
|
|
|
return $results;
|
2011-01-24 20:01:53 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|