mirror of
https://we.phorge.it/source/phorge.git
synced 2024-11-29 02:02:41 +01:00
a4a65bd5f1
Summary: Ref T7447. Ref T7870. When a diff affects more than 100 files, we collapse files by default, then expand files with inlines. Ghostly inlines currently don't cause files to expand, but reasonably should. Test Plan: Before: {F378065} After: {F378066} Reviewers: btrahan Reviewed By: btrahan Subscribers: yelirekim, epriestley Maniphest Tasks: T7447, T7870 Differential Revision: https://secure.phabricator.com/D12495
382 lines
9.7 KiB
PHP
382 lines
9.7 KiB
PHP
<?php
|
|
|
|
final class DifferentialChangesetViewController extends DifferentialController {
|
|
|
|
public function shouldAllowPublic() {
|
|
return true;
|
|
}
|
|
|
|
public function handleRequest(AphrontRequest $request) {
|
|
$viewer = $this->getViewer();
|
|
|
|
$rendering_reference = $request->getStr('ref');
|
|
$parts = explode('/', $rendering_reference);
|
|
if (count($parts) == 2) {
|
|
list($id, $vs) = $parts;
|
|
} else {
|
|
$id = $parts[0];
|
|
$vs = 0;
|
|
}
|
|
|
|
$id = (int)$id;
|
|
$vs = (int)$vs;
|
|
|
|
$load_ids = array($id);
|
|
if ($vs && ($vs != -1)) {
|
|
$load_ids[] = $vs;
|
|
}
|
|
|
|
$changesets = id(new DifferentialChangesetQuery())
|
|
->setViewer($viewer)
|
|
->withIDs($load_ids)
|
|
->needHunks(true)
|
|
->execute();
|
|
$changesets = mpull($changesets, null, 'getID');
|
|
|
|
$changeset = idx($changesets, $id);
|
|
if (!$changeset) {
|
|
return new Aphront404Response();
|
|
}
|
|
|
|
$vs_changeset = null;
|
|
if ($vs && ($vs != -1)) {
|
|
$vs_changeset = idx($changesets, $vs);
|
|
if (!$vs_changeset) {
|
|
return new Aphront404Response();
|
|
}
|
|
}
|
|
|
|
$view = $request->getStr('view');
|
|
if ($view) {
|
|
$phid = idx($changeset->getMetadata(), "$view:binary-phid");
|
|
if ($phid) {
|
|
return id(new AphrontRedirectResponse())->setURI("/file/info/$phid/");
|
|
}
|
|
switch ($view) {
|
|
case 'new':
|
|
return $this->buildRawFileResponse($changeset, $is_new = true);
|
|
case 'old':
|
|
if ($vs_changeset) {
|
|
return $this->buildRawFileResponse($vs_changeset, $is_new = true);
|
|
}
|
|
return $this->buildRawFileResponse($changeset, $is_new = false);
|
|
default:
|
|
return new Aphront400Response();
|
|
}
|
|
}
|
|
|
|
$old = array();
|
|
$new = array();
|
|
if (!$vs) {
|
|
$right = $changeset;
|
|
$left = null;
|
|
|
|
$right_source = $right->getID();
|
|
$right_new = true;
|
|
$left_source = $right->getID();
|
|
$left_new = false;
|
|
|
|
$render_cache_key = $right->getID();
|
|
|
|
$old[] = $changeset;
|
|
$new[] = $changeset;
|
|
} else if ($vs == -1) {
|
|
$right = null;
|
|
$left = $changeset;
|
|
|
|
$right_source = $left->getID();
|
|
$right_new = false;
|
|
$left_source = $left->getID();
|
|
$left_new = true;
|
|
|
|
$render_cache_key = null;
|
|
|
|
$old[] = $changeset;
|
|
$new[] = $changeset;
|
|
} else {
|
|
$right = $changeset;
|
|
$left = $vs_changeset;
|
|
|
|
$right_source = $right->getID();
|
|
$right_new = true;
|
|
$left_source = $left->getID();
|
|
$left_new = true;
|
|
|
|
$render_cache_key = null;
|
|
|
|
$new[] = $left;
|
|
$new[] = $right;
|
|
}
|
|
|
|
if ($left) {
|
|
$left_data = $left->makeNewFile();
|
|
if ($right) {
|
|
$right_data = $right->makeNewFile();
|
|
} else {
|
|
$right_data = $left->makeOldFile();
|
|
}
|
|
|
|
$engine = new PhabricatorDifferenceEngine();
|
|
$synthetic = $engine->generateChangesetFromFileContent(
|
|
$left_data,
|
|
$right_data);
|
|
|
|
$choice = clone nonempty($left, $right);
|
|
$choice->attachHunks($synthetic->getHunks());
|
|
|
|
$changeset = $choice;
|
|
}
|
|
|
|
$coverage = null;
|
|
if ($right && $right->getDiffID()) {
|
|
$unit = id(new DifferentialDiffProperty())->loadOneWhere(
|
|
'diffID = %d AND name = %s',
|
|
$right->getDiffID(),
|
|
'arc:unit');
|
|
|
|
if ($unit) {
|
|
$coverage = array();
|
|
foreach ($unit->getData() as $result) {
|
|
$result_coverage = idx($result, 'coverage');
|
|
if (!$result_coverage) {
|
|
continue;
|
|
}
|
|
$file_coverage = idx($result_coverage, $right->getFileName());
|
|
if (!$file_coverage) {
|
|
continue;
|
|
}
|
|
$coverage[] = $file_coverage;
|
|
}
|
|
|
|
$coverage = ArcanistUnitTestResult::mergeCoverage($coverage);
|
|
}
|
|
}
|
|
|
|
$spec = $request->getStr('range');
|
|
list($range_s, $range_e, $mask) =
|
|
DifferentialChangesetParser::parseRangeSpecification($spec);
|
|
|
|
$parser = id(new DifferentialChangesetParser())
|
|
->setCoverage($coverage)
|
|
->setChangeset($changeset)
|
|
->setRenderingReference($rendering_reference)
|
|
->setRenderCacheKey($render_cache_key)
|
|
->setRightSideCommentMapping($right_source, $right_new)
|
|
->setLeftSideCommentMapping($left_source, $left_new);
|
|
|
|
$parser->readParametersFromRequest($request);
|
|
|
|
if ($left && $right) {
|
|
$parser->setOriginals($left, $right);
|
|
}
|
|
|
|
$diff = $changeset->getDiff();
|
|
$revision_id = $diff->getRevisionID();
|
|
|
|
$can_mark = false;
|
|
$object_owner_phid = null;
|
|
if ($revision_id) {
|
|
$revision = id(new DifferentialRevisionQuery())
|
|
->setViewer($viewer)
|
|
->withIDs(array($revision_id))
|
|
->executeOne();
|
|
if ($revision) {
|
|
$can_mark = ($revision->getAuthorPHID() == $viewer->getPHID());
|
|
$object_owner_phid = $revision->getAuthorPHID();
|
|
}
|
|
}
|
|
|
|
// Load both left-side and right-side inline comments.
|
|
if ($revision) {
|
|
$query = id(new DifferentialInlineCommentQuery())
|
|
->setViewer($viewer)
|
|
->withRevisionPHIDs(array($revision->getPHID()));
|
|
$inlines = $query->execute();
|
|
$inlines = $query->adjustInlinesForChangesets($inlines, $old, $new);
|
|
} else {
|
|
$inlines = array();
|
|
}
|
|
|
|
if ($left_new) {
|
|
$inlines = array_merge(
|
|
$inlines,
|
|
$this->buildLintInlineComments($left));
|
|
}
|
|
|
|
if ($right_new) {
|
|
$inlines = array_merge(
|
|
$inlines,
|
|
$this->buildLintInlineComments($right));
|
|
}
|
|
|
|
$phids = array();
|
|
foreach ($inlines as $inline) {
|
|
$parser->parseInlineComment($inline);
|
|
if ($inline->getAuthorPHID()) {
|
|
$phids[$inline->getAuthorPHID()] = true;
|
|
}
|
|
}
|
|
$phids = array_keys($phids);
|
|
|
|
$handles = $this->loadViewerHandles($phids);
|
|
$parser->setHandles($handles);
|
|
|
|
$engine = new PhabricatorMarkupEngine();
|
|
$engine->setViewer($viewer);
|
|
|
|
foreach ($inlines as $inline) {
|
|
$engine->addObject(
|
|
$inline,
|
|
PhabricatorInlineCommentInterface::MARKUP_FIELD_BODY);
|
|
}
|
|
|
|
$engine->process();
|
|
|
|
$parser
|
|
->setUser($viewer)
|
|
->setMarkupEngine($engine)
|
|
->setShowEditAndReplyLinks(true)
|
|
->setCanMarkDone($can_mark)
|
|
->setObjectOwnerPHID($object_owner_phid)
|
|
->setRange($range_s, $range_e)
|
|
->setMask($mask);
|
|
|
|
if ($request->isAjax()) {
|
|
$mcov = $parser->renderModifiedCoverage();
|
|
|
|
$coverage = array(
|
|
'differential-mcoverage-'.md5($changeset->getFilename()) => $mcov,
|
|
);
|
|
|
|
return id(new PhabricatorChangesetResponse())
|
|
->setRenderedChangeset($parser->renderChangeset())
|
|
->setCoverage($coverage)
|
|
->setUndoTemplates($parser->getRenderer()->renderUndoTemplates());
|
|
}
|
|
|
|
$detail = id(new DifferentialChangesetListView())
|
|
->setUser($this->getViewer())
|
|
->setChangesets(array($changeset))
|
|
->setVisibleChangesets(array($changeset))
|
|
->setRenderingReferences(array($rendering_reference))
|
|
->setRenderURI('/differential/changeset/')
|
|
->setDiff($diff)
|
|
->setTitle(pht('Standalone View'))
|
|
->setParser($parser);
|
|
|
|
if ($revision_id) {
|
|
$detail->setInlineCommentControllerURI(
|
|
'/differential/comment/inline/edit/'.$revision_id.'/');
|
|
}
|
|
|
|
$crumbs = $this->buildApplicationCrumbs();
|
|
|
|
if ($revision_id) {
|
|
$crumbs->addTextCrumb('D'.$revision_id, '/D'.$revision_id);
|
|
}
|
|
|
|
$diff_id = $diff->getID();
|
|
if ($diff_id) {
|
|
$crumbs->addTextCrumb(
|
|
pht('Diff %d', $diff_id),
|
|
$this->getApplicationURI('diff/'.$diff_id));
|
|
}
|
|
|
|
$crumbs->addTextCrumb($changeset->getDisplayFilename());
|
|
|
|
return $this->buildApplicationPage(
|
|
array(
|
|
$crumbs,
|
|
$detail,
|
|
),
|
|
array(
|
|
'title' => pht('Changeset View'),
|
|
'device' => false,
|
|
));
|
|
}
|
|
|
|
private function buildRawFileResponse(
|
|
DifferentialChangeset $changeset,
|
|
$is_new) {
|
|
|
|
$viewer = $this->getViewer();
|
|
|
|
if ($is_new) {
|
|
$key = 'raw:new:phid';
|
|
} else {
|
|
$key = 'raw:old:phid';
|
|
}
|
|
|
|
$metadata = $changeset->getMetadata();
|
|
|
|
$file = null;
|
|
$phid = idx($metadata, $key);
|
|
if ($phid) {
|
|
$file = id(new PhabricatorFileQuery())
|
|
->setViewer($viewer)
|
|
->withPHIDs(array($phid))
|
|
->execute();
|
|
if ($file) {
|
|
$file = head($file);
|
|
}
|
|
}
|
|
|
|
if (!$file) {
|
|
// This is just building a cache of the changeset content in the file
|
|
// tool, and is safe to run on a read pathway.
|
|
$unguard = AphrontWriteGuard::beginScopedUnguardedWrites();
|
|
|
|
if ($is_new) {
|
|
$data = $changeset->makeNewFile();
|
|
} else {
|
|
$data = $changeset->makeOldFile();
|
|
}
|
|
|
|
$file = PhabricatorFile::newFromFileData(
|
|
$data,
|
|
array(
|
|
'name' => $changeset->getFilename(),
|
|
'mime-type' => 'text/plain',
|
|
));
|
|
|
|
$metadata[$key] = $file->getPHID();
|
|
$changeset->setMetadata($metadata);
|
|
$changeset->save();
|
|
|
|
unset($unguard);
|
|
}
|
|
|
|
return $file->getRedirectResponse();
|
|
}
|
|
|
|
private function buildLintInlineComments($changeset) {
|
|
$lint = id(new DifferentialDiffProperty())->loadOneWhere(
|
|
'diffID = %d AND name = %s',
|
|
$changeset->getDiffID(),
|
|
'arc:lint');
|
|
if (!$lint) {
|
|
return array();
|
|
}
|
|
$lint = $lint->getData();
|
|
|
|
$inlines = array();
|
|
foreach ($lint as $msg) {
|
|
if ($msg['path'] != $changeset->getFilename()) {
|
|
continue;
|
|
}
|
|
$inline = new DifferentialInlineComment();
|
|
$inline->setChangesetID($changeset->getID());
|
|
$inline->setIsNewFile(1);
|
|
$inline->setSyntheticAuthor('Lint: '.$msg['name']);
|
|
$inline->setLineNumber($msg['line']);
|
|
$inline->setLineLength(0);
|
|
|
|
$inline->setContent('%%%'.$msg['description'].'%%%');
|
|
|
|
$inlines[] = $inline;
|
|
}
|
|
|
|
return $inlines;
|
|
}
|
|
|
|
}
|