2011-01-24 20:01:53 +01:00
|
|
|
<?php
|
|
|
|
|
2012-03-13 19:18:11 +01:00
|
|
|
final class DifferentialChangeset extends DifferentialDAO {
|
2011-01-24 20:01:53 +01:00
|
|
|
|
|
|
|
protected $diffID;
|
|
|
|
protected $oldFile;
|
2012-01-17 08:05:44 +01:00
|
|
|
protected $filename;
|
2011-01-24 20:01:53 +01:00
|
|
|
protected $awayPaths;
|
|
|
|
protected $changeType;
|
|
|
|
protected $fileType;
|
|
|
|
protected $metadata;
|
|
|
|
protected $oldProperties;
|
|
|
|
protected $newProperties;
|
|
|
|
protected $addLines;
|
|
|
|
protected $delLines;
|
|
|
|
|
2011-01-24 20:36:53 +01:00
|
|
|
private $unsavedHunks = array();
|
2011-01-25 00:52:35 +01:00
|
|
|
private $hunks;
|
2011-01-24 20:36:53 +01:00
|
|
|
|
2011-07-09 00:26:33 +02:00
|
|
|
const TABLE_CACHE = 'differential_changeset_parse_cache';
|
|
|
|
|
2011-01-24 20:01:53 +01:00
|
|
|
protected function getConfiguration() {
|
|
|
|
return array(
|
|
|
|
self::CONFIG_SERIALIZATION => array(
|
|
|
|
'metadata' => self::SERIALIZATION_JSON,
|
|
|
|
'oldProperties' => self::SERIALIZATION_JSON,
|
|
|
|
'newProperties' => self::SERIALIZATION_JSON,
|
|
|
|
'awayPaths' => self::SERIALIZATION_JSON,
|
|
|
|
)) + parent::getConfiguration();
|
|
|
|
}
|
|
|
|
|
|
|
|
public function getAffectedLineCount() {
|
|
|
|
return $this->getAddLines() + $this->getDelLines();
|
|
|
|
}
|
|
|
|
|
2011-01-25 00:52:35 +01:00
|
|
|
public function attachHunks(array $hunks) {
|
2012-04-04 22:13:08 +02:00
|
|
|
assert_instances_of($hunks, 'DifferentialHunk');
|
2011-01-25 00:52:35 +01:00
|
|
|
$this->hunks = $hunks;
|
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function getHunks() {
|
|
|
|
if ($this->hunks === null) {
|
|
|
|
throw new Exception("Must load and attach hunks first!");
|
|
|
|
}
|
|
|
|
return $this->hunks;
|
|
|
|
}
|
|
|
|
|
2011-01-24 20:01:53 +01:00
|
|
|
public function getDisplayFilename() {
|
|
|
|
$name = $this->getFilename();
|
|
|
|
if ($this->getFileType() == DifferentialChangeType::FILE_DIRECTORY) {
|
|
|
|
$name .= '/';
|
|
|
|
}
|
|
|
|
return $name;
|
|
|
|
}
|
|
|
|
|
2011-01-24 20:36:53 +01:00
|
|
|
public function addUnsavedHunk(DifferentialHunk $hunk) {
|
2011-01-25 00:52:35 +01:00
|
|
|
if ($this->hunks === null) {
|
|
|
|
$this->hunks = array();
|
|
|
|
}
|
|
|
|
$this->hunks[] = $hunk;
|
2011-01-24 20:36:53 +01:00
|
|
|
$this->unsavedHunks[] = $hunk;
|
2011-01-24 20:01:53 +01:00
|
|
|
return $this;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function loadHunks() {
|
|
|
|
if (!$this->getID()) {
|
|
|
|
return array();
|
|
|
|
}
|
|
|
|
return id(new DifferentialHunk())->loadAllWhere(
|
|
|
|
'changesetID = %d',
|
|
|
|
$this->getID());
|
|
|
|
}
|
|
|
|
|
2011-01-24 20:36:53 +01:00
|
|
|
public function save() {
|
2012-06-19 20:52:50 +02:00
|
|
|
$this->openTransaction();
|
2011-01-24 20:36:53 +01:00
|
|
|
$ret = parent::save();
|
|
|
|
foreach ($this->unsavedHunks as $hunk) {
|
|
|
|
$hunk->setChangesetID($this->getID());
|
|
|
|
$hunk->save();
|
|
|
|
}
|
2012-06-19 20:52:50 +02:00
|
|
|
$this->saveTransaction();
|
2011-01-24 20:36:53 +01:00
|
|
|
return $ret;
|
|
|
|
}
|
2011-01-24 20:01:53 +01:00
|
|
|
|
|
|
|
public function delete() {
|
2012-06-19 20:52:50 +02:00
|
|
|
$this->openTransaction();
|
2011-01-24 20:01:53 +01:00
|
|
|
foreach ($this->loadHunks() as $hunk) {
|
|
|
|
$hunk->delete();
|
|
|
|
}
|
|
|
|
$this->_hunks = array();
|
2012-06-23 01:16:44 +02:00
|
|
|
|
|
|
|
queryfx(
|
|
|
|
$this->establishConnection('w'),
|
|
|
|
'DELETE FROM %T WHERE id = %d',
|
|
|
|
self::TABLE_CACHE,
|
|
|
|
$this->getID());
|
|
|
|
|
|
|
|
$ret = parent::delete();
|
2012-06-19 20:52:50 +02:00
|
|
|
$this->saveTransaction();
|
2011-01-24 20:01:53 +01:00
|
|
|
return $ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function getSortKey() {
|
|
|
|
$sort_key = $this->getFilename();
|
|
|
|
// Sort files with ".h" in them first, so headers (.h, .hpp) come before
|
|
|
|
// implementations (.c, .cpp, .cs).
|
|
|
|
$sort_key = str_replace('.h', '.!h', $sort_key);
|
|
|
|
return $sort_key;
|
|
|
|
}
|
|
|
|
|
|
|
|
public function makeNewFile() {
|
2012-06-15 09:53:26 +02:00
|
|
|
$file = mpull($this->getHunks(), 'makeNewFile');
|
|
|
|
return implode('', $file);
|
2011-01-24 20:01:53 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
public function makeOldFile() {
|
2012-06-15 09:53:26 +02:00
|
|
|
$file = mpull($this->getHunks(), 'makeOldFile');
|
|
|
|
return implode('', $file);
|
|
|
|
}
|
|
|
|
|
|
|
|
public function computeOffsets() {
|
|
|
|
$offsets = array();
|
|
|
|
$n = 1;
|
2011-01-24 20:01:53 +01:00
|
|
|
foreach ($this->getHunks() as $hunk) {
|
2012-06-15 09:53:26 +02:00
|
|
|
for ($i = 0; $i < $hunk->getNewLen(); $i++) {
|
|
|
|
$offsets[$n] = $hunk->getNewOffset() + $i;
|
|
|
|
$n++;
|
|
|
|
}
|
2011-01-24 20:01:53 +01:00
|
|
|
}
|
2012-06-15 09:53:26 +02:00
|
|
|
return $offsets;
|
2011-01-24 20:01:53 +01:00
|
|
|
}
|
2011-02-05 02:53:14 +01:00
|
|
|
|
2012-05-23 01:09:49 +02:00
|
|
|
public function makeChangesWithContext($num_lines = 3) {
|
|
|
|
$with_context = array();
|
|
|
|
foreach ($this->getHunks() as $hunk) {
|
|
|
|
$context = array();
|
|
|
|
$changes = explode("\n", $hunk->getChanges());
|
|
|
|
foreach ($changes as $l => $line) {
|
|
|
|
if ($line[0] == '+' || $line[0] == '-') {
|
2012-06-18 21:48:05 +02:00
|
|
|
$context += array_fill($l - $num_lines, 2 * $num_lines + 1, true);
|
2012-05-23 01:09:49 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
$with_context[] = array_intersect_key($changes, $context);
|
|
|
|
}
|
2012-06-15 05:39:48 +02:00
|
|
|
return array_mergev($with_context);
|
2012-05-23 01:09:49 +02:00
|
|
|
}
|
|
|
|
|
2011-02-05 01:18:08 +01:00
|
|
|
public function getAnchorName() {
|
|
|
|
return substr(md5($this->getFilename()), 0, 8);
|
|
|
|
}
|
2011-01-24 20:01:53 +01:00
|
|
|
|
2011-04-06 05:49:31 +02:00
|
|
|
public function getAbsoluteRepositoryPath(
|
2012-05-23 01:09:49 +02:00
|
|
|
PhabricatorRepository $repository = null,
|
2012-04-10 08:42:12 +02:00
|
|
|
DifferentialDiff $diff = null) {
|
2011-04-06 05:49:31 +02:00
|
|
|
|
|
|
|
$base = '/';
|
2012-04-10 08:42:12 +02:00
|
|
|
if ($diff && $diff->getSourceControlPath()) {
|
2011-04-06 05:49:31 +02:00
|
|
|
$base = id(new PhutilURI($diff->getSourceControlPath()))->getPath();
|
|
|
|
}
|
|
|
|
|
2012-01-17 08:05:44 +01:00
|
|
|
$path = $this->getFilename();
|
2011-04-06 05:49:31 +02:00
|
|
|
$path = rtrim($base, '/').'/'.ltrim($path, '/');
|
|
|
|
|
2012-05-23 01:09:49 +02:00
|
|
|
$svn = PhabricatorRepositoryType::REPOSITORY_TYPE_SVN;
|
|
|
|
if ($repository && $repository->getVersionControlSystem() == $svn) {
|
2011-04-06 05:49:31 +02:00
|
|
|
$prefix = $repository->getDetail('remote-uri');
|
|
|
|
$prefix = id(new PhutilURI($prefix))->getPath();
|
|
|
|
if (!strncmp($path, $prefix, strlen($prefix))) {
|
|
|
|
$path = substr($path, strlen($prefix));
|
|
|
|
}
|
|
|
|
$path = '/'.ltrim($path, '/');
|
|
|
|
}
|
|
|
|
|
|
|
|
return $path;
|
|
|
|
}
|
|
|
|
|
2011-06-08 21:39:03 +02:00
|
|
|
/**
|
|
|
|
* Retreive the configured wordwrap width for this changeset.
|
|
|
|
*/
|
|
|
|
public function getWordWrapWidth() {
|
|
|
|
$config = PhabricatorEnv::getEnvConfig('differential.wordwrap');
|
|
|
|
foreach ($config as $regexp => $width) {
|
2012-01-17 08:05:44 +01:00
|
|
|
if (preg_match($regexp, $this->getFilename())) {
|
2011-06-08 21:39:03 +02:00
|
|
|
return $width;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 80;
|
|
|
|
}
|
|
|
|
|
2011-07-22 22:15:11 +02:00
|
|
|
public function getWhitespaceMatters() {
|
|
|
|
$config = PhabricatorEnv::getEnvConfig('differential.whitespace-matters');
|
|
|
|
foreach ($config as $regexp) {
|
2012-01-17 08:05:44 +01:00
|
|
|
if (preg_match($regexp, $this->getFilename())) {
|
2011-07-22 22:15:11 +02:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2012-08-02 15:00:18 +02:00
|
|
|
public function makeContextDiff($inline, $add_context) {
|
|
|
|
$context = array();
|
2012-08-13 21:32:19 +02:00
|
|
|
$debug = false;
|
2012-08-02 15:00:18 +02:00
|
|
|
if ($debug) {
|
|
|
|
$context[] = 'Inline: '.$inline->getIsNewFile().' '.
|
|
|
|
$inline->getLineNumber().' '.$inline->getLineLength();
|
|
|
|
foreach ($this->getHunks() as $hunk) {
|
|
|
|
$context[] = 'hunk: '.$hunk->getOldOffset().'-'.
|
|
|
|
$hunk->getOldLen().'; '.$hunk->getNewOffset().'-'.$hunk->getNewLen();
|
|
|
|
$context[] = $hunk->getChanges();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if ($inline->getIsNewFile()) {
|
|
|
|
$prefix = '+';
|
|
|
|
} else {
|
|
|
|
$prefix = '-';
|
|
|
|
}
|
|
|
|
foreach ($this->getHunks() as $hunk) {
|
|
|
|
if ($inline->getIsNewFile()) {
|
|
|
|
$offset = $hunk->getNewOffset();
|
|
|
|
$length = $hunk->getNewLen();
|
|
|
|
} else {
|
|
|
|
$offset = $hunk->getOldOffset();
|
|
|
|
$length = $hunk->getOldLen();
|
|
|
|
}
|
|
|
|
$start = $inline->getLineNumber() - $offset;
|
|
|
|
$end = $start + $inline->getLineLength();
|
|
|
|
// We need to go in if $start == $length, because the last line
|
|
|
|
// might be a "\No newline at end of file" marker, which we want
|
|
|
|
// to show if the additional context is > 0.
|
|
|
|
if ($start <= $length && $end >= 0) {
|
|
|
|
$start = $start - $add_context;
|
|
|
|
$end = $end + $add_context;
|
|
|
|
$hunk_content = array();
|
|
|
|
$hunk_pos = array( "-" => 0, "+" => 0 );
|
|
|
|
$hunk_offset = array( "-" => NULL, "+" => NULL );
|
|
|
|
$hunk_last = array( "-" => NULL, "+" => NULL );
|
|
|
|
foreach (explode("\n", $hunk->getChanges()) as $line) {
|
2012-08-13 21:32:19 +02:00
|
|
|
$in_common = strncmp($line, " ", 1) === 0;
|
|
|
|
$in_old = strncmp($line, "-", 1) === 0 || $in_common;
|
|
|
|
$in_new = strncmp($line, "+", 1) === 0 || $in_common;
|
|
|
|
$in_selected = strncmp($line, $prefix, 1) === 0;
|
|
|
|
$skip = !$in_selected && !$in_common;
|
2012-08-02 15:00:18 +02:00
|
|
|
if ($hunk_pos[$prefix] <= $end) {
|
|
|
|
if ($start <= $hunk_pos[$prefix]) {
|
|
|
|
if (!$skip || ($hunk_pos[$prefix] != $start &&
|
|
|
|
$hunk_pos[$prefix] != $end)) {
|
2012-08-13 21:32:19 +02:00
|
|
|
if ($in_old) {
|
|
|
|
if ($hunk_offset["-"] === NULL) {
|
2012-08-02 15:00:18 +02:00
|
|
|
$hunk_offset["-"] = $hunk_pos["-"];
|
2012-08-13 21:32:19 +02:00
|
|
|
}
|
2012-08-02 15:00:18 +02:00
|
|
|
$hunk_last["-"] = $hunk_pos["-"];
|
|
|
|
}
|
2012-08-13 21:32:19 +02:00
|
|
|
if ($in_new) {
|
|
|
|
if ($hunk_offset["+"] === NULL) {
|
2012-08-02 15:00:18 +02:00
|
|
|
$hunk_offset["+"] = $hunk_pos["+"];
|
2012-08-13 21:32:19 +02:00
|
|
|
}
|
2012-08-02 15:00:18 +02:00
|
|
|
$hunk_last["+"] = $hunk_pos["+"];
|
|
|
|
}
|
|
|
|
|
|
|
|
$hunk_content[] = $line;
|
|
|
|
}
|
|
|
|
}
|
2012-08-13 21:32:19 +02:00
|
|
|
if ($in_old) { ++$hunk_pos["-"]; }
|
|
|
|
if ($in_new) { ++$hunk_pos["+"]; }
|
2012-08-02 15:00:18 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
if ($hunk_offset["-"] !== NULL || $hunk_offset["+"] !== NULL) {
|
|
|
|
$header = "@@";
|
|
|
|
if ($hunk_offset["-"] !== NULL) {
|
|
|
|
$header .= " -" . ($hunk->getOldOffset() + $hunk_offset["-"]) .
|
|
|
|
"," . ($hunk_last["-"]-$hunk_offset["-"]+1);
|
|
|
|
}
|
|
|
|
if ($hunk_offset["+"] !== NULL) {
|
|
|
|
$header .= " +" . ($hunk->getNewOffset() + $hunk_offset["+"]) .
|
|
|
|
"," . ($hunk_last["+"]-$hunk_offset["+"]+1);
|
|
|
|
}
|
|
|
|
$header .= " @@";
|
|
|
|
$context[] = $header;
|
|
|
|
$context[] = implode("\n", $hunk_content);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return implode("\n", $context);
|
|
|
|
}
|
2011-01-24 20:01:53 +01:00
|
|
|
}
|