mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-13 18:32:41 +01:00
54154e4f48
Summary: Separates changeset IDs from rendering. Now each changeset has a "rendering reference" which is basically a description of what the ajax endpoint should render. For Differential, it's in the form "id/vs". For Diffusion, "branch/path;commit". I believe this fixes pretty much all of the bugs related to "show more" breaking in various obscure ways, although I never got a great repro for T153. Test Plan: Clicked "show more" in diffusion change and commit views and differential diff, diff-of-diff, standalone-diff, standalone-diff-of-diff views. Verified refs and 'whitespace' were always sent correctly. Made inline comments on diffs and diffs-of-diffs. Used "Reply". Reviewed By: tuomaspelkonen Reviewers: tuomaspelkonen, jungejason, aran CC: aran, tuomaspelkonen, epriestley Differential Revision: 274
172 lines
4.4 KiB
PHP
172 lines
4.4 KiB
PHP
<?php
|
|
|
|
/*
|
|
* Copyright 2011 Facebook, Inc.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
class DifferentialChangeset extends DifferentialDAO {
|
|
|
|
protected $diffID;
|
|
protected $oldFile;
|
|
protected $fileName;
|
|
protected $awayPaths;
|
|
protected $changeType;
|
|
protected $fileType;
|
|
protected $metadata;
|
|
protected $oldProperties;
|
|
protected $newProperties;
|
|
protected $addLines;
|
|
protected $delLines;
|
|
|
|
private $unsavedHunks = array();
|
|
private $hunks;
|
|
|
|
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();
|
|
}
|
|
|
|
public function getFileType() {
|
|
return $this->fileType;
|
|
}
|
|
|
|
public function getChangeType() {
|
|
return $this->changeType;
|
|
}
|
|
|
|
public function attachHunks(array $hunks) {
|
|
$this->hunks = $hunks;
|
|
return $this;
|
|
}
|
|
|
|
public function getHunks() {
|
|
if ($this->hunks === null) {
|
|
throw new Exception("Must load and attach hunks first!");
|
|
}
|
|
return $this->hunks;
|
|
}
|
|
|
|
public function getDisplayFilename() {
|
|
$name = $this->getFilename();
|
|
if ($this->getFileType() == DifferentialChangeType::FILE_DIRECTORY) {
|
|
$name .= '/';
|
|
}
|
|
return $name;
|
|
}
|
|
|
|
public function addUnsavedHunk(DifferentialHunk $hunk) {
|
|
if ($this->hunks === null) {
|
|
$this->hunks = array();
|
|
}
|
|
$this->hunks[] = $hunk;
|
|
$this->unsavedHunks[] = $hunk;
|
|
return $this;
|
|
}
|
|
|
|
public function loadHunks() {
|
|
if (!$this->getID()) {
|
|
return array();
|
|
}
|
|
return id(new DifferentialHunk())->loadAllWhere(
|
|
'changesetID = %d',
|
|
$this->getID());
|
|
}
|
|
|
|
public function save() {
|
|
// TODO: Sort out transactions
|
|
// $this->openTransaction();
|
|
$ret = parent::save();
|
|
foreach ($this->unsavedHunks as $hunk) {
|
|
$hunk->setChangesetID($this->getID());
|
|
$hunk->save();
|
|
}
|
|
// $this->saveTransaction();
|
|
return $ret;
|
|
}
|
|
|
|
public function delete() {
|
|
// $this->openTransaction();
|
|
foreach ($this->loadHunks() as $hunk) {
|
|
$hunk->delete();
|
|
}
|
|
$this->_hunks = array();
|
|
$ret = parent::delete();
|
|
// $this->saveTransaction();
|
|
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() {
|
|
$file = array();
|
|
foreach ($this->getHunks() as $hunk) {
|
|
$file[] = $hunk->makeNewFile();
|
|
}
|
|
return implode("\n", $file);
|
|
}
|
|
|
|
public function makeOldFile() {
|
|
$file = array();
|
|
foreach ($this->getHunks() as $hunk) {
|
|
$file[] = $hunk->makeOldFile();
|
|
}
|
|
return implode("\n", $file);
|
|
}
|
|
|
|
public function getAnchorName() {
|
|
return substr(md5($this->getFilename()), 0, 8);
|
|
}
|
|
|
|
public function getAbsoluteRepositoryPath(
|
|
DifferentialDiff $diff,
|
|
PhabricatorRepository $repository) {
|
|
|
|
$base = '/';
|
|
if ($diff->getSourceControlPath()) {
|
|
$base = id(new PhutilURI($diff->getSourceControlPath()))->getPath();
|
|
}
|
|
|
|
$path = $this->getFileName();
|
|
$path = rtrim($base, '/').'/'.ltrim($path, '/');
|
|
|
|
$vcs = $repository->getVersionControlSystem();
|
|
if ($vcs == PhabricatorRepositoryType::REPOSITORY_TYPE_SVN) {
|
|
$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;
|
|
}
|
|
|
|
}
|