mirror of
https://we.phorge.it/source/phorge.git
synced 2025-02-10 05:48:30 +01:00
c1d771d86c
Summary: title does not say it all; also added conduit wrappers for rawdiffquery and lastmodifiedquery. These get the wrapper treatment since they are used in daemons. Ref T2784. Test Plan: for each of the 3 VCS, did the following: 1) loaded up CALLSIGN and verified 'Modified' column data showed up correctly in Browse Repository box. 2) loaded up the "change" view for a specific file and verified content showed up correctly. 3) loaded up a specific commit and noted the changes ajax loaded A-OK Reviewers: epriestley Reviewed By: epriestley CC: chad, aran, Korvin Maniphest Tasks: T2784 Differential Revision: https://secure.phabricator.com/D5896
115 lines
3.2 KiB
PHP
115 lines
3.2 KiB
PHP
<?php
|
|
|
|
final class DiffusionDiffController extends DiffusionController {
|
|
|
|
public function willProcessRequest(array $data) {
|
|
$data = $data + array(
|
|
'dblob' => $this->getRequest()->getStr('ref'),
|
|
);
|
|
$drequest = DiffusionRequest::newFromAphrontRequestDictionary(
|
|
$data,
|
|
$this->getRequest());
|
|
|
|
$this->diffusionRequest = $drequest;
|
|
}
|
|
|
|
public function processRequest() {
|
|
$drequest = $this->getDiffusionRequest();
|
|
$request = $this->getRequest();
|
|
$user = $request->getUser();
|
|
|
|
if (!$request->isAjax()) {
|
|
|
|
// This request came out of the dropdown menu, either "View Standalone"
|
|
// or "View Raw File".
|
|
|
|
$view = $request->getStr('view');
|
|
if ($view == 'r') {
|
|
$uri = $drequest->generateURI(
|
|
array(
|
|
'action' => 'browse',
|
|
'params' => array(
|
|
'view' => 'raw',
|
|
),
|
|
));
|
|
} else {
|
|
$uri = $drequest->generateURI(
|
|
array(
|
|
'action' => 'change',
|
|
));
|
|
}
|
|
|
|
return id(new AphrontRedirectResponse())->setURI($uri);
|
|
}
|
|
|
|
$data = $this->callConduitWithDiffusionRequest(
|
|
'diffusion.diffquery',
|
|
array(
|
|
'commit' => $drequest->getCommit(),
|
|
'path' => $drequest->getPath()));
|
|
$drequest->setCommit($data['effectiveCommit']);
|
|
$raw_changes = ArcanistDiffChange::newFromConduit($data['changes']);
|
|
$diff = DifferentialDiff::newFromRawChanges($raw_changes);
|
|
$changesets = $diff->getChangesets();
|
|
$changeset = reset($changesets);
|
|
|
|
if (!$changeset) {
|
|
return new Aphront404Response();
|
|
}
|
|
|
|
$parser = new DifferentialChangesetParser();
|
|
$parser->setUser($user);
|
|
$parser->setChangeset($changeset);
|
|
$parser->setRenderingReference($drequest->generateURI(
|
|
array(
|
|
'action' => 'rendering-ref')));
|
|
|
|
$pquery = new DiffusionPathIDQuery(array($changeset->getFilename()));
|
|
$ids = $pquery->loadPathIDs();
|
|
$path_id = $ids[$changeset->getFilename()];
|
|
|
|
$parser->setLeftSideCommentMapping($path_id, false);
|
|
$parser->setRightSideCommentMapping($path_id, true);
|
|
|
|
$parser->setWhitespaceMode(
|
|
DifferentialChangesetParser::WHITESPACE_SHOW_ALL);
|
|
|
|
$inlines = id(new PhabricatorAuditInlineComment())->loadAllWhere(
|
|
'commitPHID = %s AND pathID = %d AND
|
|
(authorPHID = %s OR auditCommentID IS NOT NULL)',
|
|
$drequest->loadCommit()->getPHID(),
|
|
$path_id,
|
|
$user->getPHID());
|
|
|
|
if ($inlines) {
|
|
foreach ($inlines as $inline) {
|
|
$parser->parseInlineComment($inline);
|
|
}
|
|
|
|
$phids = mpull($inlines, 'getAuthorPHID');
|
|
$handles = $this->loadViewerHandles($phids);
|
|
$parser->setHandles($handles);
|
|
}
|
|
|
|
$engine = new PhabricatorMarkupEngine();
|
|
$engine->setViewer($user);
|
|
|
|
foreach ($inlines as $inline) {
|
|
$engine->addObject(
|
|
$inline,
|
|
PhabricatorInlineCommentInterface::MARKUP_FIELD_BODY);
|
|
}
|
|
|
|
$engine->process();
|
|
|
|
$parser->setMarkupEngine($engine);
|
|
|
|
$spec = $request->getStr('range');
|
|
list($range_s, $range_e, $mask) =
|
|
DifferentialChangesetParser::parseRangeSpecification($spec);
|
|
$output = $parser->render($range_s, $range_e, $mask);
|
|
|
|
return id(new PhabricatorChangesetResponse())
|
|
->setRenderedChangeset($output);
|
|
}
|
|
}
|