No OneTemporary
Actions

Size

97 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
	index 3b5a157d29..5b5c824969 100644
	--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
	+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
	@@ -1,990 +1,977 @@
	<?php

	/*
	* Copyright 2012 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.
	*/

	final class DifferentialRevisionViewController extends DifferentialController {

	private $revisionID;

	public function shouldRequireLogin() {
	return !$this->allowsAnonymousAccess();
	}

	public function willProcessRequest(array $data) {
	$this->revisionID = $data['id'];
	}

	public function processRequest() {

	$request = $this->getRequest();
	$user = $request->getUser();
	$viewer_is_anonymous = !$user->isLoggedIn();

	$revision = id(new DifferentialRevision())->load($this->revisionID);
	if (!$revision) {
	return new Aphront404Response();
	}

	$revision->loadRelationships();

	$diffs = $revision->loadDiffs();

	if (!$diffs) {
	throw new Exception(
	"This revision has no diffs. Something has gone quite wrong.");
	}

	$diff_vs = $request->getInt('vs');

	$target_id = $request->getInt('id');
	$target = idx($diffs, $target_id, end($diffs));

	$target_manual = $target;
	if (!$target_id) {
	foreach ($diffs as $diff) {
	if ($diff->getCreationMethod() != 'commit') {
	$target_manual = $diff;
	}
	}
	}

	if (empty($diffs[$diff_vs])) {
	$diff_vs = null;
	}

	$arc_project = $target->loadArcanistProject();
	$repository = ($arc_project ? $arc_project->loadRepository() : null);

	list($changesets, $vs_map, $vs_changesets, $rendering_references) =
	$this->loadChangesetsAndVsMap(
	$target,
	idx($diffs, $diff_vs),
	$repository);

	if ($request->getExists('download')) {
	return $this->buildRawDiffResponse($changesets,
	$vs_changesets,
	$vs_map,
	$repository);
	}

	list($aux_fields, $props) = $this->loadAuxiliaryFieldsAndProperties(
	$revision,
	$target_manual,
	array(
	'local:commits',
	'arc:lint',
	'arc:unit',
	));


	$comments = $revision->loadComments();
	$comments = array_merge(
	$this->getImplicitComments($revision, reset($diffs)),
	$comments);

	$all_changesets = $changesets;
	$inlines = $this->loadInlineComments($comments, $all_changesets);

	$object_phids = array_merge(
	$revision->getReviewers(),
	$revision->getCCPHIDs(),
	$revision->loadCommitPHIDs(),
	array(
	$revision->getAuthorPHID(),
	$user->getPHID(),
	),
	mpull($comments, 'getAuthorPHID'));

	foreach ($comments as $comment) {
	$metadata = $comment->getMetadata();
	$added_reviewers = idx(
	$metadata,
	DifferentialComment::METADATA_ADDED_REVIEWERS);
	if ($added_reviewers) {
	foreach ($added_reviewers as $phid) {
	$object_phids[] = $phid;
	}
	}
	$added_ccs = idx(
	$metadata,
	DifferentialComment::METADATA_ADDED_CCS);
	if ($added_ccs) {
	foreach ($added_ccs as $phid) {
	$object_phids[] = $phid;
	}
	}
	}

	foreach ($revision->getAttached() as $type => $phids) {
	foreach ($phids as $phid => $info) {
	$object_phids[] = $phid;
	}
	}

	$aux_phids = array();
	foreach ($aux_fields as $key => $aux_field) {
	$aux_phids[$key] = $aux_field->getRequiredHandlePHIDsForRevisionView();
	}
	$object_phids = array_merge($object_phids, array_mergev($aux_phids));
	$object_phids = array_unique($object_phids);

	$handles = id(new PhabricatorObjectHandleData($object_phids))
	->loadHandles();

	foreach ($aux_fields as $key => $aux_field) {
	// Make sure each field only has access to handles it specifically
	// requested, not all handles. Otherwise you can get a field which works
	// only in the presence of other fields.
	$aux_field->setHandles(array_select_keys($handles, $aux_phids[$key]));
	}

	$reviewer_warning = null;
	$has_live_reviewer = false;
	foreach ($revision->getReviewers() as $reviewer) {
	if (!$handles[$reviewer]->isDisabled()) {
	$has_live_reviewer = true;
	}
	}
	if (!$has_live_reviewer) {
	$reviewer_warning = new AphrontErrorView();
	$reviewer_warning->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	$reviewer_warning->setTitle('No Active Reviewers');
	if ($revision->getReviewers()) {
	$reviewer_warning->appendChild(
	'<p>All specified reviewers are disabled. You may want to add '.
	'some new reviewers.</p>');
	} else {
	$reviewer_warning->appendChild(
	'<p>This revision has no specified reviewers. You may want to '.
	'add some.</p>');
	}
	}

	$request_uri = $request->getRequestURI();

	$limit = 100;
	$large = $request->getStr('large');
	if (count($changesets) > $limit && !$large) {
	$count = number_format(count($changesets));
	$warning = new AphrontErrorView();
	$warning->setTitle('Very Large Diff');
	$warning->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	$warning->setWidth(AphrontErrorView::WIDTH_WIDE);
	$warning->appendChild(
	"<p>This diff is very large and affects {$count} files. Load ".
	"each file individually. ".
	"<strong>".
	phutil_render_tag(
	'a',
	array(
	'href' => $request_uri
	->alter('large', 'true')
	->setFragment('differential-review-toc'),
	),
	'Show All Files Inline').
	"</strong>");
	$warning = $warning->render();

	$visible_changesets = array();
	foreach ($inlines as $inline) {
	$changeset_id = $inline->getChangesetID();
	if (isset($changesets[$changeset_id])) {
	$visible_changesets[$changeset_id] = $changesets[$changeset_id];
	}
	}

	if (!empty($props['arc:lint'])) {
	$changeset_paths = mpull($changesets, null, 'getFilename');
	foreach ($props['arc:lint'] as $lint) {
	$changeset = idx($changeset_paths, $lint['path']);
	if ($changeset) {
	$visible_changesets[$changeset->getID()] = $changeset;
	}
	}
	}

	} else {
	$warning = null;
	$visible_changesets = $changesets;
	}

	$revision_detail = new DifferentialRevisionDetailView();
	$revision_detail->setRevision($revision);
	$revision_detail->setAuxiliaryFields($aux_fields);

	$actions = $this->getRevisionActions($revision);

	$custom_renderer_class = PhabricatorEnv::getEnvConfig(
	'differential.revision-custom-detail-renderer');
	if ($custom_renderer_class) {

	// TODO: build a better version of the action links and deprecate the
	// whole DifferentialRevisionDetailRenderer class.
	$custom_renderer = newv($custom_renderer_class, array());
	if ($diff_vs) {
	$custom_renderer->setVSDiff($diffs[$diff_vs]);
	}
	$actions = array_merge(
	$actions,
	$custom_renderer->generateActionLinks($revision, $target_manual));
	}

	$whitespace = $request->getStr(
	'whitespace',
	DifferentialChangesetParser::WHITESPACE_IGNORE_ALL);

	if ($arc_project) {
	$symbol_indexes = $this->buildSymbolIndexes(
	$arc_project,
	$visible_changesets);
	} else {
	$symbol_indexes = array();
	}

	$revision_detail->setActions($actions);
	$revision_detail->setUser($user);

	$comment_view = new DifferentialRevisionCommentListView();
	$comment_view->setComments($comments);
	$comment_view->setHandles($handles);
	$comment_view->setInlineComments($inlines);
	$comment_view->setChangesets($all_changesets);
	$comment_view->setUser($user);
	$comment_view->setTargetDiff($target);
	$comment_view->setVersusDiffID($diff_vs);

	$changeset_view = new DifferentialChangesetListView();
	$changeset_view->setChangesets($changesets);
	$changeset_view->setVisibleChangesets($visible_changesets);

	if (!$viewer_is_anonymous) {
	$changeset_view->setInlineCommentControllerURI(
	'/differential/comment/inline/edit/'.$revision->getID().'/');
	}

	$changeset_view->setStandaloneURI('/differential/changeset/');
	$changeset_view->setRawFileURIs(
	'/differential/changeset/?view=old',
	'/differential/changeset/?view=new');

	$changeset_view->setUser($user);
	$changeset_view->setDiff($target);
	$changeset_view->setRenderingReferences($rendering_references);
	$changeset_view->setVsMap($vs_map);
	$changeset_view->setWhitespace($whitespace);
	if ($repository) {
	$changeset_view->setRepository($repository);
	}
	$changeset_view->setSymbolIndexes($symbol_indexes);

	$diff_history = new DifferentialRevisionUpdateHistoryView();
	$diff_history->setDiffs($diffs);
	$diff_history->setSelectedVersusDiffID($diff_vs);
	$diff_history->setSelectedDiffID($target->getID());
	$diff_history->setSelectedWhitespace($whitespace);
	$diff_history->setUser($user);

	$local_view = new DifferentialLocalCommitsView();
	$local_view->setUser($user);
	$local_view->setLocalCommits(idx($props, 'local:commits'));

	if ($repository) {
	$other_revisions = $this->loadOtherRevisions(
	$changesets,
	$target,
	$repository);
	} else {
	$other_revisions = array();
	}

	$other_view = null;
	if ($other_revisions) {
	$other_view = $this->renderOtherRevisions($other_revisions);
	}

	$toc_view = new DifferentialDiffTableOfContentsView();
	$toc_view->setChangesets($changesets);
	$toc_view->setVisibleChangesets($visible_changesets);
	$toc_view->setRenderingReferences($rendering_references);
	$toc_view->setUnitTestData(idx($props, 'arc:unit', array()));
	if ($repository) {
	$toc_view->setRepository($repository);
	}
	$toc_view->setDiff($target);
	$toc_view->setUser($user);
	$toc_view->setRevisionID($revision->getID());
	$toc_view->setWhitespace($whitespace);

	$comment_form = null;
	if (!$viewer_is_anonymous) {
	$draft = id(new PhabricatorDraft())->loadOneWhere(
	'authorPHID = %s AND draftKey = %s',
	$user->getPHID(),
	'differential-comment-'.$revision->getID());
	if ($draft) {
	$draft = $draft->getDraft();
	} else {
	$draft = null;
	}

	$comment_form = new DifferentialAddCommentView();
	$comment_form->setRevision($revision);
	$comment_form->setAuxFields($aux_fields);
	$comment_form->setActions($this->getRevisionCommentActions($revision));
	$comment_form->setActionURI('/differential/comment/save/');
	$comment_form->setUser($user);
	$comment_form->setDraft($draft);
	}

	$pane_id = celerity_generate_unique_node_id();
	Javelin::initBehavior(
	'differential-keyboard-navigation',
	array(
	'haunt' => $pane_id,
	));
	Javelin::initBehavior('differential-user-select');

	$page_pane = id(new DifferentialPrimaryPaneView())
	->setLineWidthFromChangesets($changesets)
	->setID($pane_id)
	->appendChild(
	$comment_view->render().
	$diff_history->render().
	$warning.
	$local_view->render().
	$toc_view->render().
	$other_view.
	$changeset_view->render());
	if ($comment_form) {
	$page_pane->appendChild($comment_form->render());
	}

	PhabricatorFeedStoryNotification::updateObjectNotificationViews(
	$user, $revision->getPHID());

	return $this->buildStandardPageResponse(
	array(
	$reviewer_warning,
	$revision_detail,
	$page_pane,
	),
	array(
	'title' => 'D'.$revision->getID().' '.$revision->getTitle(),
	));
	}

	private function getImplicitComments(
	DifferentialRevision $revision,
	DifferentialDiff $diff) {

	$author_phid = nonempty(
	$diff->getAuthorPHID(),
	$revision->getAuthorPHID());

	$template = new DifferentialComment();
	$template->setAuthorPHID($author_phid);
	$template->setRevisionID($revision->getID());
	$template->setDateCreated($revision->getDateCreated());

	$comments = array();

	if (strlen($revision->getSummary())) {
	$summary_comment = clone $template;
	$summary_comment->setContent($revision->getSummary());
	$summary_comment->setAction(DifferentialAction::ACTION_SUMMARIZE);
	$comments[] = $summary_comment;
	}

	if (strlen($revision->getTestPlan())) {
	$testplan_comment = clone $template;
	$testplan_comment->setContent($revision->getTestPlan());
	$testplan_comment->setAction(DifferentialAction::ACTION_TESTPLAN);
	$comments[] = $testplan_comment;
	}

	return $comments;
	}

	private function getRevisionActions(DifferentialRevision $revision) {
	$user = $this->getRequest()->getUser();
	$viewer_phid = $user->getPHID();
	$viewer_is_owner = ($revision->getAuthorPHID() == $viewer_phid);
	$viewer_is_reviewer = in_array($viewer_phid, $revision->getReviewers());
	$viewer_is_cc = in_array($viewer_phid, $revision->getCCPHIDs());
	$viewer_is_anonymous = !$this->getRequest()->getUser()->isLoggedIn();
	$status = $revision->getStatus();
	$revision_id = $revision->getID();
	$revision_phid = $revision->getPHID();

	$links = array();

	if ($viewer_is_owner) {
	$links[] = array(
	'class' => 'revision-edit',
	'href' => "/differential/revision/edit/{$revision_id}/",
	'name' => 'Edit Revision',
	);
	}

	if (!$viewer_is_anonymous) {

	require_celerity_resource('phabricator-flag-css');

	$flag = PhabricatorFlagQuery::loadUserFlag($user, $revision_phid);
	if ($flag) {
	$class = PhabricatorFlagColor::getCSSClass($flag->getColor());
	$color = PhabricatorFlagColor::getColorName($flag->getColor());
	$links[] = array(
	'class' => 'flag-clear '.$class,
	'href' => '/flag/delete/'.$flag->getID().'/',
	'name' => phutil_escape_html('Remove '.$color.' Flag'),
	'sigil' => 'workflow',
	);
	} else {
	$links[] = array(
	'class' => 'flag-add phabricator-flag-ghost',
	'href' => '/flag/edit/'.$revision_phid.'/',
	'name' => 'Flag Revision',
	'sigil' => 'workflow',
	);
	}

	if (!$viewer_is_owner && !$viewer_is_reviewer) {
	$action = $viewer_is_cc ? 'rem' : 'add';
	$links[] = array(
	'class' => $viewer_is_cc ? 'subscribe-rem' : 'subscribe-add',
	'href' => "/differential/subscribe/{$action}/{$revision_id}/",
	'name' => $viewer_is_cc ? 'Unsubscribe' : 'Subscribe',
	'instant' => true,
	);
	} else {
	$links[] = array(
	'class' => 'subscribe-rem unavailable',
	'name' => 'Automatically Subscribed',
	);
	}

	require_celerity_resource('phabricator-object-selector-css');
	require_celerity_resource('javelin-behavior-phabricator-object-selector');

	$links[] = array(
	'class' => 'action-dependencies',
	'name' => 'Edit Dependencies',
	'href' => "/search/attach/{$revision_phid}/DREV/dependencies/",
	'sigil' => 'workflow',
	);

	if (PhabricatorEnv::getEnvConfig('maniphest.enabled')) {
	$links[] = array(
	'class' => 'attach-maniphest',
	'name' => 'Edit Maniphest Tasks',
	'href' => "/search/attach/{$revision_phid}/TASK/",
	'sigil' => 'workflow',
	);
	}

	if ($user->getIsAdmin()) {
	$links[] = array(
	'class' => 'transcripts-metamta',
	'name' => 'MetaMTA Transcripts',
	'href' => "/mail/?phid={$revision_phid}",
	);
	}

	$links[] = array(
	'class' => 'transcripts-herald',
	'name' => 'Herald Transcripts',
	'href' => "/herald/transcript/?phid={$revision_phid}",
	);
	}

	$request_uri = $this->getRequest()->getRequestURI();
	$links[] = array(
	'class' => 'action-download',
	'name' => 'Download Raw Diff',
	'href' => $request_uri->alter('download', 'true')
	);

	return $links;
	}

	private function getRevisionCommentActions(DifferentialRevision $revision) {

	$actions = array(
	DifferentialAction::ACTION_COMMENT => true,
	);

	$viewer = $this->getRequest()->getUser();
	$viewer_phid = $viewer->getPHID();
	$viewer_is_owner = ($viewer_phid == $revision->getAuthorPHID());
	$viewer_is_reviewer = in_array($viewer_phid, $revision->getReviewers());
	$viewer_did_accept = ($viewer_phid === $revision->loadReviewedBy());
	$status = $revision->getStatus();

	$allow_self_accept = PhabricatorEnv::getEnvConfig(
	'differential.allow-self-accept', false);

	if ($viewer_is_owner) {
	switch ($status) {
	case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
	$actions[DifferentialAction::ACTION_ACCEPT] = $allow_self_accept;
	$actions[DifferentialAction::ACTION_ABANDON] = true;
	$actions[DifferentialAction::ACTION_RETHINK] = true;
	break;
	case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
	$actions[DifferentialAction::ACTION_ACCEPT] = $allow_self_accept;
	$actions[DifferentialAction::ACTION_ABANDON] = true;
	$actions[DifferentialAction::ACTION_REQUEST] = true;
	break;
	case ArcanistDifferentialRevisionStatus::ACCEPTED:
	$actions[DifferentialAction::ACTION_ABANDON] = true;
	$actions[DifferentialAction::ACTION_REQUEST] = true;
	$actions[DifferentialAction::ACTION_RETHINK] = true;
	$actions[DifferentialAction::ACTION_CLOSE] = true;
	break;
	case ArcanistDifferentialRevisionStatus::CLOSED:
	break;
	case ArcanistDifferentialRevisionStatus::ABANDONED:
	$actions[DifferentialAction::ACTION_RECLAIM] = true;
	break;
	}
	} else {
	switch ($status) {
	case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
	$actions[DifferentialAction::ACTION_ACCEPT] = true;
	$actions[DifferentialAction::ACTION_REJECT] = true;
	$actions[DifferentialAction::ACTION_RESIGN] = $viewer_is_reviewer;
	break;
	case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
	$actions[DifferentialAction::ACTION_ACCEPT] = true;
	$actions[DifferentialAction::ACTION_RESIGN] = $viewer_is_reviewer;
	break;
	case ArcanistDifferentialRevisionStatus::ACCEPTED:
	$actions[DifferentialAction::ACTION_REJECT] = true;
	$actions[DifferentialAction::ACTION_RESIGN] =
	$viewer_is_reviewer && !$viewer_did_accept;
	break;
	case ArcanistDifferentialRevisionStatus::CLOSED:
	case ArcanistDifferentialRevisionStatus::ABANDONED:
	break;
	}
	if ($status != ArcanistDifferentialRevisionStatus::CLOSED) {
	$actions[DifferentialAction::ACTION_CLAIM] = true;
	}
	}

	$actions[DifferentialAction::ACTION_ADDREVIEWERS] = true;
	$actions[DifferentialAction::ACTION_ADDCCS] = true;

	$actions = array_keys(array_filter($actions));
	$actions_dict = array();
	foreach ($actions as $action) {
	$actions_dict[$action] = DifferentialAction::getActionVerb($action);
	}

	return $actions_dict;
	}

	private function loadInlineComments(array $comments, array &$changesets) {
	assert_instances_of($comments, 'DifferentialComment');
	assert_instances_of($changesets, 'DifferentialChangeset');

	$inline_comments = array();

	$comment_ids = array_filter(mpull($comments, 'getID'));
	if (!$comment_ids) {
	return $inline_comments;
	}

	$inline_comments = id(new DifferentialInlineComment())
	->loadAllWhere(
	'commentID in (%Ld)',
	$comment_ids);

	$load_changesets = array();
	foreach ($inline_comments as $inline) {
	$changeset_id = $inline->getChangesetID();
	if (isset($changesets[$changeset_id])) {
	continue;
	}
	$load_changesets[$changeset_id] = true;
	}

	$more_changesets = array();
	if ($load_changesets) {
	$changeset_ids = array_keys($load_changesets);
	$more_changesets += id(new DifferentialChangeset())
	->loadAllWhere(
	'id IN (%Ld)',
	$changeset_ids);
	}

	if ($more_changesets) {
	$changesets += $more_changesets;
	$changesets = msort($changesets, 'getSortKey');
	}

	return $inline_comments;
	}

	private function loadChangesetsAndVsMap(
	DifferentialDiff $target,
	DifferentialDiff $diff_vs = null,
	PhabricatorRepository $repository = null) {

	$load_ids = array();
	if ($diff_vs) {
	$load_ids[] = $diff_vs->getID();
	}
	$load_ids[] = $target->getID();

	$raw_changesets = id(new DifferentialChangeset())
	->loadAllWhere(
	'diffID IN (%Ld)',
	$load_ids);
	$changeset_groups = mgroup($raw_changesets, 'getDiffID');

	$changesets = idx($changeset_groups, $target->getID(), array());
	$changesets = mpull($changesets, null, 'getID');

	$refs = array();
	$vs_map = array();
	$vs_changesets = array();
	if ($diff_vs) {
	$vs_id = $diff_vs->getID();
	$vs_changesets_path_map = array();
	foreach (idx($changeset_groups, $vs_id, array()) as $changeset) {
	$path = $changeset->getAbsoluteRepositoryPath($repository, $diff_vs);
	$vs_changesets_path_map[$path] = $changeset;
	$vs_changesets[$changeset->getID()] = $changeset;
	}
	foreach ($changesets as $key => $changeset) {
	$path = $changeset->getAbsoluteRepositoryPath($repository, $target);
	if (isset($vs_changesets_path_map[$path])) {
	$vs_map[$changeset->getID()] =
	$vs_changesets_path_map[$path]->getID();
	$refs[$changeset->getID()] =
	$changeset->getID().'/'.$vs_changesets_path_map[$path]->getID();
	unset($vs_changesets_path_map[$path]);
	} else {
	$refs[$changeset->getID()] = $changeset->getID();
	}
	}
	foreach ($vs_changesets_path_map as $path => $changeset) {
	$changesets[$changeset->getID()] = $changeset;
	$vs_map[$changeset->getID()] = -1;
	$refs[$changeset->getID()] = $changeset->getID().'/-1';
	}
	} else {
	foreach ($changesets as $changeset) {
	$refs[$changeset->getID()] = $changeset->getID();
	}
	}

	$changesets = msort($changesets, 'getSortKey');

	return array($changesets, $vs_map, $vs_changesets, $refs);
	}

	private function loadAuxiliaryFieldsAndProperties(
	DifferentialRevision $revision,
	DifferentialDiff $diff,
	array $special_properties) {

	$aux_fields = DifferentialFieldSelector::newSelector()
	->getFieldSpecifications();
	foreach ($aux_fields as $key => $aux_field) {
	if (!$aux_field->shouldAppearOnRevisionView()) {
	unset($aux_fields[$key]);
	} else {
	$aux_field->setUser($this->getRequest()->getUser());
	}
	}

	$aux_fields = DifferentialAuxiliaryField::loadFromStorage(
	$revision,
	$aux_fields);

	$aux_props = array();
	foreach ($aux_fields as $key => $aux_field) {
	$aux_field->setDiff($diff);
	$aux_props[$key] = $aux_field->getRequiredDiffProperties();
	}

	$required_properties = array_mergev($aux_props);
	$required_properties = array_merge(
	$required_properties,
	$special_properties);

	$property_map = array();
	if ($required_properties) {
	$properties = id(new DifferentialDiffProperty())->loadAllWhere(
	'diffID = %d AND name IN (%Ls)',
	$diff->getID(),
	$required_properties);
	$property_map = mpull($properties, 'getData', 'getName');
	}

	foreach ($aux_fields as $key => $aux_field) {
	// Give each field only the properties it specifically required, and
	// set 'null' for each requested key which we didn't actually load a
	// value for (otherwise, getDiffProperty() will throw).
	if ($aux_props[$key]) {
	$props = array_select_keys($property_map, $aux_props[$key]) +
	array_fill_keys($aux_props[$key], null);
	} else {
	$props = array();
	}

	$aux_field->setDiffProperties($props);
	}

	return array(
	$aux_fields,
	array_select_keys(
	$property_map,
	$special_properties));
	}

	private function buildSymbolIndexes(
	PhabricatorRepositoryArcanistProject $arc_project,
	array $visible_changesets) {
	assert_instances_of($visible_changesets, 'DifferentialChangeset');

	$engine = PhabricatorSyntaxHighlighter::newEngine();

	$langs = $arc_project->getSymbolIndexLanguages();
	if (!$langs) {
	return array();
	}

	$symbol_indexes = array();

	$project_phids = array_merge(
	array($arc_project->getPHID()),
	nonempty($arc_project->getSymbolIndexProjects(), array()));

	$indexed_langs = array_fill_keys($langs, true);
	foreach ($visible_changesets as $key => $changeset) {
	$lang = $engine->getLanguageFromFilename($changeset->getFilename());
	if (isset($indexed_langs[$lang])) {
	$symbol_indexes[$key] = array(
	'lang' => $lang,
	'projects' => $project_phids,
	);
	}
	}

	return $symbol_indexes;
	}

	private function loadOtherRevisions(
	array $changesets,
	DifferentialDiff $target,
	PhabricatorRepository $repository) {
	assert_instances_of($changesets, 'DifferentialChangeset');

	$paths = array();
	foreach ($changesets as $changeset) {
	$paths[] = $changeset->getAbsoluteRepositoryPath(
	$repository,
	$target);
	}

	if (!$paths) {
	return array();
	}

	$path_map = id(new DiffusionPathIDQuery($paths))->loadPathIDs();

	if (!$path_map) {
	return array();
	}

	$query = id(new DifferentialRevisionQuery())
	->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
	->setOrder(DifferentialRevisionQuery::ORDER_PATH_MODIFIED)
	->setLimit(10)
	->needRelationships(true);

	foreach ($path_map as $path => $path_id) {
	$query->withPath($repository->getID(), $path_id);
	}

	$results = $query->execute();

	// Strip out this revision.
	foreach ($results as $key => $result) {
	if ($result->getID() == $this->revisionID) {
	unset($results[$key]);
	}
	}

	return $results;
	}

	private function renderOtherRevisions(array $revisions) {
	assert_instances_of($revisions, 'DifferentialRevision');

	$view = id(new DifferentialRevisionListView())
	->setRevisions($revisions)
	->setFields(DifferentialRevisionListView::getDefaultFields())
	->setUser($this->getRequest()->getUser());

	$phids = $view->getRequiredHandlePHIDs();
	$handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
	$view->setHandles($handles);

	return
	'<div class="differential-panel">'.
	'<h1>Open Revisions Affecting These Files</h1>'.
	$view->render().
	'</div>';
	}

	/**
	* Straight copy of the loadFileByPhid method in
	* @{class:DifferentialReviewRequestMail}.
	*
	* This is because of the code similarity between the buildPatch method in
	* @{class:DifferentialReviewRequestMail} and @{method:buildRawDiffResponse}
	* in this class. Both of these methods end up using call_user_func and this
	* piece of code is the lucky function.
	*
	* @return mixed (@{class:PhabricatorFile} if found, null if not)
	*/
	public function loadFileByPHID($phid) {
	$file = id(new PhabricatorFile())->loadOneWhere(
	'phid = %s',
	$phid);
	if (!$file) {
	return null;
	}
	return $file->loadFileData();
	}

	/**
	* Note this code is somewhat similar to the buildPatch method in
	* @{class:DifferentialReviewRequestMail}.
	*
	* @return @{class:AphrontRedirectResponse}
	*/
	private function buildRawDiffResponse(
	array $changesets,
	array $vs_changesets,
	array $vs_map,
	PhabricatorRepository $repository = null) {

	assert_instances_of($changesets, 'DifferentialChangeset');
	assert_instances_of($vs_changesets, 'DifferentialChangeset');

	$engine = new PhabricatorDifferenceEngine();
	$generated_changesets = array();
	foreach ($changesets as $changeset) {
	$changeset->attachHunks($changeset->loadHunks());
	$vs = idx($vs_map, $changeset->getID());
	if ($vs) {
	$choice = $vs_changeset = $vs_changesets[$vs];
	$vs_changeset->attachHunks($vs_changeset->loadHunks());
	$right = $vs_changeset->makeNewFile();
	} else {
	$choice = $changeset;
	$right = $changeset->makeOldFile();
	}
	$left = $changeset->makeNewFile();

	$synthetic = $engine->generateChangesetFromFileContent(
	$left,
	$right);

	if (!$synthetic->getAffectedLineCount()) {
	$filetype = $choice->getFileType();
	if ($filetype == DifferentialChangeType::FILE_TEXT \|\|
	$filetype == DifferentialChangeType::FILE_SYMLINK) {
	continue;
	}
	}

	$choice->attachHunks($synthetic->getHunks());

	$generated_changesets[] = $choice;
	}

	$diff = new DifferentialDiff();
	$diff->attachChangesets($generated_changesets);
	$diff_dict = $diff->getDiffDict();

	$changes = array();
	foreach ($diff_dict['changes'] as $changedict) {
	$changes[] = ArcanistDiffChange::newFromDictionary($changedict);
	}
	$bundle = ArcanistBundle::newFromChanges($changes);

	$bundle->setLoadFileDataCallback(array($this, 'loadFileByPHID'));

	$vcs = $repository ? $repository->getVersionControlSystem() : null;
	switch ($vcs) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	+ case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$raw_diff = $bundle->toGitPatch();
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	- case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	default:
	$raw_diff = $bundle->toUnifiedDiff();
	break;
	}

	- $hash = PhabricatorHash::digest($raw_diff);
	-
	- $file = id(new PhabricatorFile())->loadOneWhere(
	- 'contentHash = %s LIMIT 1',
	- $hash);
	+ $request_uri = $this->getRequest()->getRequestURI();

	- if (!$file) {
	- $request_uri = $this->getRequest()->getRequestURI();
	-
	- // this ends up being something like
	- // D123.diff
	- // or the verbose
	- // D123.vs123.id123.whitespaceignore-all.diff
	- // lame but nice to include these options
	- $file_name = ltrim($request_uri->getPath(), '/') . '.';
	- foreach ($request_uri->getQueryParams() as $key => $value) {
	- if ($key == 'download') {
	- continue;
	- }
	- $file_name .= $key . $value . '.';
	+ // this ends up being something like
	+ // D123.diff
	+ // or the verbose
	+ // D123.vs123.id123.whitespaceignore-all.diff
	+ // lame but nice to include these options
	+ $file_name = ltrim($request_uri->getPath(), '/').'.';
	+ foreach ($request_uri->getQueryParams() as $key => $value) {
	+ if ($key == 'download') {
	+ continue;
	}
	- $file_name .= 'diff';
	-
	- // We're just caching the data; this is always safe.
	- $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	-
	- $file = PhabricatorFile::newFromFileData(
	- $raw_diff,
	- array(
	- 'name' => $file_name,
	- ));
	-
	- unset($unguarded);
	+ $file_name .= $key.$value.'.';
	}
	+ $file_name .= 'diff';
	+
	+ $file = PhabricatorFile::buildFromFileDataOrHash(
	+ $raw_diff,
	+ array(
	+ 'name' => $file_name,
	+ ));

	return id(new AphrontRedirectResponse())->setURI($file->getBestURI());

	}
	}
	diff --git a/src/applications/diffusion/controller/DiffusionBrowseFileController.php b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
	index e6822d8667..cb04b5eb06 100644
	--- a/src/applications/diffusion/controller/DiffusionBrowseFileController.php
	+++ b/src/applications/diffusion/controller/DiffusionBrowseFileController.php
	@@ -1,783 +1,769 @@
	<?php

	/*
	* Copyright 2012 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.
	*/

	final class DiffusionBrowseFileController extends DiffusionController {

	private $corpusType = 'text';

	public function processRequest() {

	$request = $this->getRequest();
	$drequest = $this->getDiffusionRequest();

	$before = $request->getStr('before');
	if ($before) {
	return $this->buildBeforeResponse($before);
	}

	$path = $drequest->getPath();
	$selected = $request->getStr('view');
	// If requested without a view, assume that blame is required (see T1278).
	if (!$selected) {
	$selected = 'blame';
	}
	$needs_blame = ($selected == 'blame' \|\| $selected == 'plainblame');

	$file_query = DiffusionFileContentQuery::newFromDiffusionRequest(
	$this->diffusionRequest);
	$file_query->setNeedsBlame($needs_blame);
	$file_query->loadFileContent();
	$data = $file_query->getRawData();

	if ($selected === 'raw') {
	return $this->buildRawResponse($path, $data);
	}

	// Build the content of the file.
	$corpus = $this->buildCorpus(
	$selected,
	$file_query,
	$needs_blame,
	$drequest,
	$path,
	$data);

	require_celerity_resource('diffusion-source-css');

	if ($this->corpusType == 'text') {
	$view_select_panel = $this->renderViewSelectPanel();
	} else {
	$view_select_panel = null;
	}

	// Render the page.
	$content = array();
	$content[] = $this->buildCrumbs(
	array(
	'branch' => true,
	'path' => true,
	'view' => 'browse',
	));

	$follow = $request->getStr('follow');
	if ($follow) {
	$notice = new AphrontErrorView();
	$notice->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	$notice->setTitle('Unable to Continue');
	switch ($follow) {
	case 'first':
	$notice->appendChild(
	"Unable to continue tracing the history of this file because ".
	"this commit is the first commit in the repository.");
	break;
	case 'created':
	$notice->appendChild(
	"Unable to continue tracing the history of this file because ".
	"this commit created the file.");
	break;
	}
	$content[] = $notice;
	}

	$renamed = $request->getStr('renamed');
	if ($renamed) {
	$notice = new AphrontErrorView();
	$notice->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
	$notice->setTitle('File Renamed');
	$notice->appendChild(
	"File history passes through a rename from '".
	phutil_escape_html($drequest->getPath())."' to '".
	phutil_escape_html($renamed)."'.");
	$content[] = $notice;
	}

	$content[] = $view_select_panel;
	$content[] = $corpus;
	$content[] = $this->buildOpenRevisions();

	$nav = $this->buildSideNav('browse', true);
	$nav->appendChild($content);

	$basename = basename($this->getDiffusionRequest()->getPath());

	return $this->buildStandardPageResponse(
	$nav,
	array(
	'title' => $basename,
	));
	}

	private function buildCorpus($selected,
	DiffusionFileContentQuery $file_query,
	$needs_blame,
	DiffusionRequest $drequest,
	$path,
	$data) {

	if (ArcanistDiffUtils::isHeuristicBinaryFile($data)) {
	$file = $this->loadFileForData($path, $data);
	$file_uri = $file->getBestURI();

	if ($file->isViewableImage()) {
	$this->corpusType = 'image';
	return $this->buildImageCorpus($file_uri);
	} else {
	$this->corpusType = 'binary';
	return $this->buildBinaryCorpus($file_uri, $data);
	}
	}

	switch ($selected) {
	case 'plain':
	$style =
	"margin: 1em 2em; width: 90%; height: 80em; font-family: monospace";
	$corpus = phutil_render_tag(
	'textarea',
	array(
	'style' => $style,
	),
	phutil_escape_html($file_query->getRawData()));

	break;

	case 'plainblame':
	$style =
	"margin: 1em 2em; width: 90%; height: 80em; font-family: monospace";
	list($text_list, $rev_list, $blame_dict) =
	$file_query->getBlameData();

	$rows = array();
	foreach ($text_list as $k => $line) {
	$rev = $rev_list[$k];
	if (isset($blame_dict[$rev]['handle'])) {
	$author = $blame_dict[$rev]['handle']->getName();
	} else {
	$author = $blame_dict[$rev]['author'];
	}
	$rows[] =
	sprintf("%-10s %-20s %s", substr($rev, 0, 7), $author, $line);
	}

	$corpus = phutil_render_tag(
	'textarea',
	array(
	'style' => $style,
	),
	phutil_escape_html(implode("\n", $rows)));

	break;

	case 'highlighted':
	case 'blame':
	default:
	require_celerity_resource('syntax-highlighting-css');

	list($text_list, $rev_list, $blame_dict) = $file_query->getBlameData();

	$text_list = implode("\n", $text_list);
	$text_list = PhabricatorSyntaxHighlighter::highlightWithFilename(
	$path,
	$text_list);
	$text_list = explode("\n", $text_list);

	$rows = $this->buildDisplayRows($text_list, $rev_list, $blame_dict,
	$needs_blame, $drequest, $file_query, $selected);

	$corpus_table = phutil_render_tag(
	'table',
	array(
	'class' => "diffusion-source remarkup-code PhabricatorMonospaced",
	),
	implode("\n", $rows));
	$corpus = phutil_render_tag(
	'div',
	array(
	'style' => 'padding: 0 2em;',
	),
	$corpus_table);

	break;
	}

	return $corpus;
	}

	private function renderViewSelectPanel() {

	$request = $this->getRequest();

	$select = AphrontFormSelectControl::renderSelectTag(
	$request->getStr('view'),
	array(
	'blame' => 'View as Highlighted Text with Blame',
	'highlighted' => 'View as Highlighted Text',
	'plainblame' => 'View as Plain Text with Blame',
	'plain' => 'View as Plain Text',
	'raw' => 'View as raw document',
	),
	array(
	'name' => 'view',
	));

	$view_select_panel = new AphrontPanelView();
	$view_select_form = phutil_render_tag(
	'form',
	array(
	'action' => $request->getRequestURI(),
	'method' => 'get',
	'class' => 'diffusion-browse-type-form',
	),
	$select.
	' <button>View</button> '.
	$this->renderEditButton());

	$view_select_panel->appendChild($view_select_form);
	$view_select_panel->appendChild('<div style="clear: both;"></div>');

	return $view_select_panel;
	}

	private function renderEditButton() {
	$request = $this->getRequest();
	$user = $request->getUser();

	$drequest = $this->getDiffusionRequest();

	$repository = $drequest->getRepository();
	$path = $drequest->getPath();
	$line = 1;

	$callsign = $repository->getCallsign();
	$editor_link = $user->loadEditorLink($path, $line, $callsign);
	if (!$editor_link) {
	return null;
	}

	return phutil_render_tag(
	'a',
	array(
	'href' => $editor_link,
	'class' => 'button',
	),
	'Edit');
	}

	private function buildDisplayRows(
	array $text_list,
	array $rev_list,
	array $blame_dict,
	$needs_blame,
	DiffusionRequest $drequest,
	DiffusionFileContentQuery $file_query,
	$selected) {

	if ($blame_dict) {
	$epoch_list = ipull(ifilter($blame_dict, 'epoch'), 'epoch');
	$epoch_min = min($epoch_list);
	$epoch_max = max($epoch_list);
	$epoch_range = ($epoch_max - $epoch_min) + 1;
	}

	$line_arr = array();
	$line_str = $drequest->getLine();
	$ranges = explode(',', $line_str);
	foreach ($ranges as $range) {
	if (strpos($range, '-') !== false) {
	list($min, $max) = explode('-', $range, 2);
	$line_arr[] = array(
	'min' => min($min, $max),
	'max' => max($min, $max),
	);
	} else if (strlen($range)) {
	$line_arr[] = array(
	'min' => $range,
	'max' => $range,
	);
	}
	}

	$display = array();

	$line_number = 1;
	$last_rev = null;
	$color = null;
	foreach ($text_list as $k => $line) {
	$display_line = array(
	'color' => null,
	'epoch' => null,
	'commit' => null,
	'author' => null,
	'target' => null,
	'highlighted' => null,
	'line' => $line_number,
	'data' => $line,
	);

	if ($needs_blame) {
	// If the line's rev is same as the line above, show empty content
	// with same color; otherwise generate blame info. The newer a change
	// is, the more saturated the color.

	// TODO: SVN doesn't always give us blame for the last line, if empty?
	// Bug with our stuff or with SVN?
	$rev = idx($rev_list, $k, $last_rev);

	if ($last_rev == $rev) {
	$display_line['color'] = $color;
	} else {
	$blame = $blame_dict[$rev];

	if (!isset($blame['epoch'])) {
	$color = '#ffd'; // Render as warning.
	} else {
	$color_ratio = ($blame['epoch'] - $epoch_min) / $epoch_range;
	$color_value = 0xF6 * (1.0 - $color_ratio);
	$color = sprintf(
	'#%02x%02x%02x',
	$color_value,
	0xF6,
	$color_value);
	}

	$display_line['epoch'] = idx($blame, 'epoch');
	$display_line['color'] = $color;
	$display_line['commit'] = $rev;

	if (isset($blame['handle'])) {
	$author_link = $blame['handle']->renderLink();
	} else {
	$author_link = phutil_render_tag(
	'span',
	array(
	),
	phutil_escape_html($blame['author']));
	}
	$display_line['author'] = $author_link;

	$last_rev = $rev;
	}
	}

	if ($line_arr) {
	if ($line_number == $line_arr[0]['min']) {
	$display_line['target'] = true;
	}
	foreach ($line_arr as $range) {
	if ($line_number >= $range['min'] &&
	$line_number <= $range['max']) {
	$display_line['highlighted'] = true;
	}
	}
	}

	$display[] = $display_line;
	++$line_number;
	}

	$commits = array_filter(ipull($display, 'commit'));
	if ($commits) {
	$commits = id(new PhabricatorAuditCommitQuery())
	->withIdentifiers($drequest->getRepository()->getID(), $commits)
	->needCommitData(true)
	->execute();
	$commits = mpull($commits, null, 'getCommitIdentifier');
	}

	$revision_ids = id(new DifferentialRevision())
	->loadIDsByCommitPHIDs(mpull($commits, 'getPHID'));
	$revisions = array();
	if ($revision_ids) {
	$revisions = id(new DifferentialRevision())->loadAllWhere(
	'id IN (%Ld)',
	$revision_ids);
	}

	$request = $this->getRequest();
	$user = $request->getUser();

	Javelin::initBehavior('phabricator-oncopy', array());

	$rows = array();
	foreach ($display as $line) {

	$line_href = $drequest->generateURI(
	array(
	'action' => 'browse',
	'line' => $line['line'],
	'stable' => true,
	));

	$line_href->setQueryParams($request->getRequestURI()->getQueryParams());

	$blame = array();
	if ($line['color']) {
	$color = $line['color'];

	$before_link = null;
	$commit_link = null;
	$revision_link = null;
	if (idx($line, 'commit')) {
	$commit = $line['commit'];

	$summary = 'Unknown';
	if (idx($commits, $commit)) {
	$summary = $commits[$commit]->getCommitData()->getSummary();
	}

	$tooltip = phabricator_date(
	$line['epoch'],
	$user)." \xC2\xB7 ".$summary;

	Javelin::initBehavior('phabricator-tooltips', array());
	require_celerity_resource('aphront-tooltip-css');

	$commit_link = javelin_render_tag(
	'a',
	array(
	'href' => $drequest->generateURI(
	array(
	'action' => 'commit',
	'commit' => $line['commit'],
	)),
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => $tooltip,
	'align' => 'E',
	'size' => 600,
	),
	),
	phutil_escape_html(phutil_utf8_shorten($line['commit'], 9, '')));

	$revision_id = idx($revision_ids, $commits[$commit]->getPHID());
	if ($revision_id) {
	$revision = idx($revisions, $revision_id);
	if (!$revision) {
	$tooltip = '(Invalid revision)';
	} else {
	$tooltip =
	phabricator_date($revision->getDateModified(), $user).
	" \xC2\xB7 ".
	$revision->getTitle();
	}
	$revision_link = javelin_render_tag(
	'a',
	array(
	'href' => '/D'.$revision_id,
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => $tooltip,
	'align' => 'E',
	'size' => 600,
	),
	),
	'D'.$revision_id);
	}

	$before_link = javelin_render_tag(
	'a',
	array(
	'href' => $line_href->alter('before', $commit),
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => 'Skip Past This Commit',
	'align' => 'E',
	'size' => 300,
	),
	),
	"\xC2\xAB");
	}

	$blame[] = phutil_render_tag(
	'th',
	array(
	'class' => 'diffusion-blame-link',
	'style' => 'background: '.$color,
	),
	$before_link);

	$blame[] = phutil_render_tag(
	'th',
	array(
	'class' => 'diffusion-rev-link',
	'style' => 'background: '.$color,
	),
	$commit_link);

	$blame[] = phutil_render_tag(
	'th',
	array(
	'class' => 'diffusion-rev-link',
	'style' => 'background: '.$color,
	),
	$revision_link);

	$blame[] = phutil_render_tag(
	'th',
	array(
	'class' => 'diffusion-author-link',
	'style' => 'background: '.$color,
	),
	idx($line, 'author'));
	}

	$line_link = phutil_render_tag(
	'a',
	array(
	'href' => $line_href,
	),
	phutil_escape_html($line['line']));

	$blame[] = phutil_render_tag(
	'th',
	array(
	'class' => 'diffusion-line-link',
	'style' => isset($color) ? 'background: '.$color : null,
	),
	$line_link);

	$blame = implode('', $blame);

	if ($line['target']) {
	Javelin::initBehavior(
	'diffusion-jump-to',
	array(
	'target' => 'scroll_target',
	));
	$anchor_text = '<a id="scroll_target"></a>';
	} else {
	$anchor_text = null;
	}

	$line_text = phutil_render_tag(
	'td',
	array(
	),
	$anchor_text.
	"\xE2\x80\x8B". // NOTE: See phabricator-oncopy behavior.
	$line['data']);

	$rows[] = phutil_render_tag(
	'tr',
	array(
	'style' => ($line['highlighted'] ? 'background: #ffff00;' : null),
	),
	$blame.
	$line_text);
	}

	return $rows;
	}


	private static function renderRevision(DiffusionRequest $drequest,
	$revision) {

	$callsign = $drequest->getCallsign();

	$name = 'r'.$callsign.$revision;
	return phutil_render_tag(
	'a',
	array(
	'href' => '/'.$name,
	),
	$name
	);
	}


	private static function renderBrowse(
	DiffusionRequest $drequest,
	$path,
	$name = null,
	$rev = null,
	$line = null,
	$view = null,
	$title = null) {

	$callsign = $drequest->getCallsign();

	if ($name === null) {
	$name = $path;
	}

	$at = null;
	if ($rev) {
	$at = ';'.$rev;
	}

	if ($view) {
	$view = '?view='.$view;
	}

	if ($line) {
	$line = '$'.$line;
	}

	return phutil_render_tag(
	'a',
	array(
	'href' => "/diffusion/{$callsign}/browse/{$path}{$at}{$line}{$view}",
	'title' => $title,
	),
	$name
	);
	}

	private function loadFileForData($path, $data) {
	- $hash = PhabricatorHash::digest($data);
	-
	- $file = id(new PhabricatorFile())->loadOneWhere(
	- 'contentHash = %s LIMIT 1',
	- $hash);
	- if (!$file) {
	- // We're just caching the data; this is always safe.
	- $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	-
	- $file = PhabricatorFile::newFromFileData(
	- $data,
	- array(
	- 'name' => basename($path),
	- ));
	-
	- unset($unguarded);
	- }
	-
	- return $file;
	+ return PhabricatorFile::buildFromFileDataOrHash(
	+ $data,
	+ array(
	+ 'name' => basename($path),
	+ ));
	}

	private function buildRawResponse($path, $data) {
	$file = $this->loadFileForData($path, $data);
	return id(new AphrontRedirectResponse())->setURI($file->getBestURI());
	}

	private function buildImageCorpus($file_uri) {
	$panel = new AphrontPanelView();
	$panel->setHeader('Image');
	$panel->addButton($this->renderEditButton());
	$panel->appendChild(
	phutil_render_tag(
	'img',
	array(
	'src' => $file_uri,
	)));
	return $panel;
	}

	private function buildBinaryCorpus($file_uri, $data) {
	$panel = new AphrontPanelView();
	$panel->setHeader('Binary File');
	$panel->addButton($this->renderEditButton());
	$panel->appendChild(
	'<p>'.
	'This is a binary file. '.
	'It is '.number_format(strlen($data)).' bytes in length.'.
	'</p>');
	$panel->addButton(
	phutil_render_tag(
	'a',
	array(
	'href' => $file_uri,
	'class' => 'button green',
	),
	'Download Binary File...'));
	return $panel;
	}

	private function buildBeforeResponse($before) {
	$request = $this->getRequest();
	$drequest = $this->getDiffusionRequest();

	// NOTE: We need to get the grandparent so we can capture filename changes
	// in the parent.

	$parent = $this->loadParentRevisionOf($before);
	$old_filename = null;
	$was_created = false;
	if ($parent) {
	$grandparent = $this->loadParentRevisionOf(
	$parent->getCommitIdentifier());

	if ($grandparent) {
	$rename_query = DiffusionRenameHistoryQuery::newFromDiffusionRequest(
	$drequest);
	$rename_query->setOldCommit($grandparent->getCommitIdentifier());
	$old_filename = $rename_query->loadOldFilename();
	$was_created = $rename_query->getWasCreated();
	}
	}

	$follow = null;
	if ($was_created) {
	// If the file was created in history, that means older commits won't
	// have it. Since we know it existed at 'before', it must have been
	// created then; jump there.
	$target_commit = $before;
	$follow = 'created';
	} else if ($parent) {
	// If we found a parent, jump to it. This is the normal case.
	$target_commit = $parent->getCommitIdentifier();
	} else {
	// If there's no parent, this was probably created in the initial commit?
	// And the "was_created" check will fail because we can't identify the
	// grandparent. Keep the user at 'before'.
	$target_commit = $before;
	$follow = 'first';
	}

	$path = $drequest->getPath();
	$renamed = null;
	if ($old_filename !== null &&
	$old_filename !== $path) {
	$renamed = $path;
	$path = $old_filename;
	}

	$before_uri = $drequest->generateURI(
	array(
	'action' => 'browse',
	'commit' => $target_commit,
	// If there's a follow error, drop the line so the user sees the
	// message.
	'line' => $follow ? null : $drequest->getLine(),
	'path' => $path,
	));

	$before_uri->setQueryParams($request->getRequestURI()->getQueryParams());
	$before_uri = $before_uri->alter('before', null);
	$before_uri = $before_uri->alter('renamed', $renamed);
	$before_uri = $before_uri->alter('follow', $follow);

	return id(new AphrontRedirectResponse())->setURI($before_uri);
	}

	private function loadParentRevisionOf($commit) {
	$drequest = $this->getDiffusionRequest();

	$before_req = DiffusionRequest::newFromDictionary(
	array(
	'repository' => $drequest->getRepository(),
	'commit' => $commit,
	));

	$query = DiffusionCommitParentsQuery::newFromDiffusionRequest($before_req);
	$parents = $query->loadParents();

	return head($parents);
	}

	}
	diff --git a/src/applications/diffusion/controller/DiffusionCommitController.php b/src/applications/diffusion/controller/DiffusionCommitController.php
	index 893f0c308b..62d8b7023e 100644
	--- a/src/applications/diffusion/controller/DiffusionCommitController.php
	+++ b/src/applications/diffusion/controller/DiffusionCommitController.php
	@@ -1,896 +1,884 @@
	<?php

	/*
	* Copyright 2012 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.
	*/

	final class DiffusionCommitController extends DiffusionController {

	const CHANGES_LIMIT = 100;

	private $auditAuthorityPHIDs;

	public function willProcessRequest(array $data) {
	// This controller doesn't use blob/path stuff, just pass the dictionary
	// in directly instead of using the AphrontRequest parsing mechanism.
	$drequest = DiffusionRequest::newFromDictionary($data);
	$this->diffusionRequest = $drequest;
	}

	public function processRequest() {
	$drequest = $this->getDiffusionRequest();
	$request = $this->getRequest();
	$user = $request->getUser();

	if ($request->getStr('diff')) {
	return $this->buildRawDiffResponse($drequest);
	}

	$callsign = $drequest->getRepository()->getCallsign();

	$content = array();
	$content[] = $this->buildCrumbs(array(
	'commit' => true,
	));

	$repository = $drequest->getRepository();
	$commit = $drequest->loadCommit();

	if (!$commit) {
	// TODO: Make more user-friendly.
	throw new Exception('This commit has not parsed yet.');
	}

	$commit_data = $drequest->loadCommitData();
	$commit->attachCommitData($commit_data);

	$is_foreign = $commit_data->getCommitDetail('foreign-svn-stub');
	if ($is_foreign) {
	$subpath = $commit_data->getCommitDetail('svn-subpath');

	$error_panel = new AphrontErrorView();
	$error_panel->setWidth(AphrontErrorView::WIDTH_WIDE);
	$error_panel->setTitle('Commit Not Tracked');
	$error_panel->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	$error_panel->appendChild(
	"This Diffusion repository is configured to track only one ".
	"subdirectory of the entire Subversion repository, and this commit ".
	"didn't affect the tracked subdirectory ('".
	phutil_escape_html($subpath)."'), so no information is available.");
	$content[] = $error_panel;
	} else {
	$engine = PhabricatorMarkupEngine::newDifferentialMarkupEngine();

	require_celerity_resource('diffusion-commit-view-css');
	require_celerity_resource('phabricator-remarkup-css');

	$parent_query = DiffusionCommitParentsQuery::newFromDiffusionRequest(
	$drequest);

	$headsup_panel = new AphrontHeadsupView();
	$headsup_panel->setHeader('Commit Detail');
	$headsup_panel->setActionList(
	$this->renderHeadsupActionList($commit));
	$headsup_panel->setProperties(
	$this->getCommitProperties(
	$commit,
	$commit_data,
	$parent_query->loadParents()));

	$headsup_panel->appendChild(
	'<div class="diffusion-commit-message phabricator-remarkup">'.
	$engine->markupText($commit_data->getCommitMessage()).
	'</div>');

	$content[] = $headsup_panel;
	}

	$query = new PhabricatorAuditQuery();
	$query->withCommitPHIDs(array($commit->getPHID()));
	$audit_requests = $query->execute();

	$this->auditAuthorityPHIDs =
	PhabricatorAuditCommentEditor::loadAuditPHIDsForUser($user);

	$content[] = $this->buildAuditTable($commit, $audit_requests);
	$content[] = $this->buildComments($commit);

	$change_query = DiffusionPathChangeQuery::newFromDiffusionRequest(
	$drequest);
	$changes = $change_query->loadChanges();

	$content[] = $this->buildMergesTable($commit);

	$original_changes_count = count($changes);
	if ($request->getStr('show_all') !== 'true' &&
	$original_changes_count > self::CHANGES_LIMIT) {
	$changes = array_slice($changes, 0, self::CHANGES_LIMIT);
	}

	$change_table = new DiffusionCommitChangeTableView();
	$change_table->setDiffusionRequest($drequest);
	$change_table->setPathChanges($changes);

	$count = count($changes);

	$bad_commit = null;
	if ($count == 0) {
	$bad_commit = queryfx_one(
	id(new PhabricatorRepository())->establishConnection('r'),
	'SELECT * FROM %T WHERE fullCommitName = %s',
	PhabricatorRepository::TABLE_BADCOMMIT,
	'r'.$callsign.$commit->getCommitIdentifier());
	}

	if ($bad_commit) {
	$error_panel = new AphrontErrorView();
	$error_panel->setWidth(AphrontErrorView::WIDTH_WIDE);
	$error_panel->setTitle('Bad Commit');
	$error_panel->appendChild(
	phutil_escape_html($bad_commit['description']));

	$content[] = $error_panel;
	} else if ($is_foreign) {
	// Don't render anything else.
	} else if (!count($changes)) {
	$no_changes = new AphrontErrorView();
	$no_changes->setWidth(AphrontErrorView::WIDTH_WIDE);
	$no_changes->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	$no_changes->setTitle('Not Yet Parsed');
	// TODO: This can also happen with weird SVN changes that don't do
	// anything (or only alter properties?), although the real no-changes case
	// is extremely rare and might be impossible to produce organically. We
	// should probably write some kind of "Nothing Happened!" change into the
	// DB once we parse these changes so we can distinguish between
	// "not parsed yet" and "no changes".
	$no_changes->appendChild(
	"This commit hasn't been fully parsed yet (or doesn't affect any ".
	"paths).");
	$content[] = $no_changes;
	} else {
	$change_panel = new AphrontPanelView();
	$change_panel->setHeader("Changes (".number_format($count).")");
	$change_panel->setID('differential-review-toc');

	if ($count !== $original_changes_count) {
	$show_all_button = phutil_render_tag(
	'a',
	array(
	'class' => 'button green',
	'href' => '?show_all=true',
	),
	phutil_escape_html('Show All Changes'));
	$warning_view = id(new AphrontErrorView())
	->setSeverity(AphrontErrorView::SEVERITY_WARNING)
	->setTitle(sprintf(
	"Showing only the first %d changes out of %s!",
	self::CHANGES_LIMIT,
	number_format($original_changes_count)));

	$change_panel->appendChild($warning_view);
	$change_panel->addButton($show_all_button);
	}

	$change_panel->appendChild($change_table);

	$content[] = $change_panel;

	$changesets = DiffusionPathChange::convertToDifferentialChangesets(
	$changes);

	$vcs = $repository->getVersionControlSystem();
	switch ($vcs) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$vcs_supports_directory_changes = true;
	break;
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$vcs_supports_directory_changes = false;
	break;
	default:
	throw new Exception("Unknown VCS.");
	}

	$references = array();
	foreach ($changesets as $key => $changeset) {
	$file_type = $changeset->getFileType();
	if ($file_type == DifferentialChangeType::FILE_DIRECTORY) {
	if (!$vcs_supports_directory_changes) {
	unset($changesets[$key]);
	continue;
	}
	}

	$references[$key] = $drequest->generateURI(
	array(
	'action' => 'rendering-ref',
	'path' => $changeset->getFilename(),
	));
	}

	// TODO: Some parts of the views still rely on properties of the
	// DifferentialChangeset. Make the objects ephemeral to make sure we don't
	// accidentally save them, and then set their ID to the appropriate ID for
	// this application (the path IDs).
	$pquery = new DiffusionPathIDQuery(mpull($changesets, 'getFilename'));
	$path_ids = $pquery->loadPathIDs();
	foreach ($changesets as $changeset) {
	$changeset->makeEphemeral();
	$changeset->setID($path_ids[$changeset->getFilename()]);
	}

	$change_list = new DifferentialChangesetListView();
	$change_list->setChangesets($changesets);
	$change_list->setVisibleChangesets($changesets);
	$change_list->setRenderingReferences($references);
	$change_list->setRenderURI('/diffusion/'.$callsign.'/diff/');
	$change_list->setRepository($repository);
	$change_list->setUser($user);

	$change_list->setStandaloneURI(
	'/diffusion/'.$callsign.'/diff/');
	$change_list->setRawFileURIs(
	// TODO: Implement this, somewhat tricky if there's an octopus merge
	// or whatever?
	null,
	'/diffusion/'.$callsign.'/diff/?view=r');

	$change_list->setInlineCommentControllerURI(
	'/diffusion/inline/'.phutil_escape_uri($commit->getPHID()).'/');

	// TODO: This is pretty awkward, unify the CSS between Diffusion and
	// Differential better.
	require_celerity_resource('differential-core-view-css');
	$change_list =
	'<div class="differential-primary-pane">'.
	$change_list->render().
	'</div>';

	$content[] = $change_list;
	}

	$content[] = $this->buildAddCommentView($commit, $audit_requests);

	return $this->buildStandardPageResponse(
	$content,
	array(
	'title' => 'r'.$callsign.$commit->getCommitIdentifier(),
	));
	}

	private function getCommitProperties(
	PhabricatorRepositoryCommit $commit,
	PhabricatorRepositoryCommitData $data,
	array $parents) {
	assert_instances_of($parents, 'PhabricatorRepositoryCommit');
	$user = $this->getRequest()->getUser();

	$task_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$commit->getPHID(),
	PhabricatorEdgeConfig::TYPE_COMMIT_HAS_TASK);

	$phids = $task_phids;
	if ($data->getCommitDetail('authorPHID')) {
	$phids[] = $data->getCommitDetail('authorPHID');
	}
	if ($data->getCommitDetail('reviewerPHID')) {
	$phids[] = $data->getCommitDetail('reviewerPHID');
	}
	if ($data->getCommitDetail('committerPHID')) {
	$phids[] = $data->getCommitDetail('committerPHID');
	}
	if ($data->getCommitDetail('differential.revisionPHID')) {
	$phids[] = $data->getCommitDetail('differential.revisionPHID');
	}
	if ($parents) {
	foreach ($parents as $parent) {
	$phids[] = $parent->getPHID();
	}
	}

	$handles = array();
	if ($phids) {
	$handles = id(new PhabricatorObjectHandleData($phids))
	->loadHandles();
	}

	$props = array();

	if ($commit->getAuditStatus()) {
	$status = PhabricatorAuditCommitStatusConstants::getStatusName(
	$commit->getAuditStatus());
	$props['Status'] = phutil_render_tag(
	'strong',
	array(),
	phutil_escape_html($status));
	}

	$props['Committed'] = phabricator_datetime($commit->getEpoch(), $user);

	$author_phid = $data->getCommitDetail('authorPHID');
	if ($data->getCommitDetail('authorPHID')) {
	$props['Author'] = $handles[$author_phid]->renderLink();
	} else {
	$props['Author'] = phutil_escape_html($data->getAuthorName());
	}

	$reviewer_phid = $data->getCommitDetail('reviewerPHID');
	$reviewer_name = $data->getCommitDetail('reviewerName');
	if ($reviewer_phid) {
	$props['Reviewer'] = $handles[$reviewer_phid]->renderLink();
	} else if ($reviewer_name) {
	$props['Reviewer'] = phutil_escape_html($reviewer_name);
	}

	$committer = $data->getCommitDetail('committer');
	if ($committer) {
	$committer_phid = $data->getCommitDetail('committerPHID');
	if ($data->getCommitDetail('committerPHID')) {
	$props['Committer'] = $handles[$committer_phid]->renderLink();
	} else {
	$props['Committer'] = phutil_escape_html($committer);
	}
	}


	$revision_phid = $data->getCommitDetail('differential.revisionPHID');
	if ($revision_phid) {
	$props['Differential Revision'] = $handles[$revision_phid]->renderLink();
	}

	if ($parents) {
	$parent_links = array();
	foreach ($parents as $parent) {
	$parent_links[] = $handles[$parent->getPHID()]->renderLink();
	}
	$props['Parents'] = implode(' · ', $parent_links);
	}


	$request = $this->getDiffusionRequest();

	$branches = $this->buildBranches($request);
	if ($branches) {
	$props['Branches'] = $branches;
	}

	$tags = $this->buildTags($request);
	if ($tags) {
	$props['Tags'] = $tags;
	}

	$refs = $this->buildRefs($request);
	if ($refs) {
	$props['References'] = $refs;
	}

	if ($task_phids) {
	$task_list = array();
	foreach ($task_phids as $phid) {
	$task_list[] = $handles[$phid]->renderLink();
	}
	$task_list = implode('<br />', $task_list);
	$props['Tasks'] = $task_list;
	}

	return $props;
	}

	private function buildAuditTable(
	PhabricatorRepositoryCommit $commit,
	array $audits) {
	assert_instances_of($audits, 'PhabricatorRepositoryAuditRequest');
	$user = $this->getRequest()->getUser();

	$view = new PhabricatorAuditListView();
	$view->setAudits($audits);
	$view->setCommits(array($commit));
	$view->setUser($user);
	$view->setShowDescriptions(false);

	$phids = $view->getRequiredHandlePHIDs();
	$handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
	$view->setHandles($handles);
	$view->setAuthorityPHIDs($this->auditAuthorityPHIDs);

	$panel = new AphrontPanelView();
	$panel->setHeader('Audits');
	$panel->setCaption('Audits you are responsible for are highlighted.');
	$panel->appendChild($view);

	return $panel;
	}

	private function buildComments(PhabricatorRepositoryCommit $commit) {
	$user = $this->getRequest()->getUser();
	$comments = id(new PhabricatorAuditComment())->loadAllWhere(
	'targetPHID = %s ORDER BY dateCreated ASC',
	$commit->getPHID());

	$inlines = id(new PhabricatorAuditInlineComment())->loadAllWhere(
	'commitPHID = %s AND auditCommentID IS NOT NULL',
	$commit->getPHID());

	$path_ids = mpull($inlines, 'getPathID');

	$path_map = array();
	if ($path_ids) {
	$path_map = id(new DiffusionPathQuery())
	->withPathIDs($path_ids)
	->execute();
	$path_map = ipull($path_map, 'path', 'id');
	}

	$view = new DiffusionCommentListView();
	$view->setUser($user);
	$view->setComments($comments);
	$view->setInlineComments($inlines);
	$view->setPathMap($path_map);

	$phids = $view->getRequiredHandlePHIDs();
	$handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
	$view->setHandles($handles);

	return $view;
	}

	private function buildAddCommentView(
	PhabricatorRepositoryCommit $commit,
	array $audit_requests) {
	assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest');
	$user = $this->getRequest()->getUser();

	$is_serious = PhabricatorEnv::getEnvConfig('phabricator.serious-business');

	Javelin::initBehavior(
	'differential-keyboard-navigation',
	array(
	// TODO: Make this comment panel hauntable
	'haunt' => null,
	));

	$draft = id(new PhabricatorDraft())->loadOneWhere(
	'authorPHID = %s AND draftKey = %s',
	$user->getPHID(),
	'diffusion-audit-'.$commit->getID());
	if ($draft) {
	$draft = $draft->getDraft();
	} else {
	$draft = null;
	}

	$actions = $this->getAuditActions($commit, $audit_requests);

	$form = id(new AphrontFormView())
	->setUser($user)
	->setAction('/audit/addcomment/')
	->addHiddenInput('commit', $commit->getPHID())
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel('Action')
	->setName('action')
	->setID('audit-action')
	->setOptions($actions))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setLabel('Add Auditors')
	->setName('auditors')
	->setControlID('add-auditors')
	->setControlStyle('display: none')
	->setID('add-auditors-tokenizer')
	->setDisableBehavior(true))
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setLabel('Add CCs')
	->setName('ccs')
	->setControlID('add-ccs')
	->setControlStyle('display: none')
	->setID('add-ccs-tokenizer')
	->setDisableBehavior(true))
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel('Comments')
	->setName('content')
	->setValue($draft)
	->setID('audit-content')
	->setCaption(phutil_render_tag(
	'a',
	array(
	'href' => PhabricatorEnv::getDoclink(
	'article/Remarkup_Reference.html'),
	'tabindex' => '-1',
	'target' => '_blank',
	),
	'Formatting Reference')))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue($is_serious ? 'Submit' : 'Cook the Books'));

	$panel = new AphrontPanelView();
	$panel->setHeader($is_serious ? 'Audit Commit' : 'Creative Accounting');
	$panel->appendChild($form);

	require_celerity_resource('phabricator-transaction-view-css');

	Javelin::initBehavior(
	'differential-add-reviewers-and-ccs',
	array(
	'dynamic' => array(
	'add-auditors-tokenizer' => array(
	'actions' => array('add_auditors' => 1),
	'src' => '/typeahead/common/users/',
	'row' => 'add-auditors',
	'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),
	'placeholder' => 'Type a user name...',
	),
	'add-ccs-tokenizer' => array(
	'actions' => array('add_ccs' => 1),
	'src' => '/typeahead/common/mailable/',
	'row' => 'add-ccs',
	'ondemand' => PhabricatorEnv::getEnvConfig('tokenizer.ondemand'),
	'placeholder' => 'Type a user or mailing list...',
	),
	),
	'select' => 'audit-action',
	));

	Javelin::initBehavior('differential-feedback-preview', array(
	'uri' => '/audit/preview/'.$commit->getID().'/',
	'preview' => 'audit-preview',
	'content' => 'audit-content',
	'action' => 'audit-action',
	'previewTokenizers' => array(
	'auditors' => 'add-auditors-tokenizer',
	'ccs' => 'add-ccs-tokenizer',
	),
	));

	$preview_panel =
	'<div class="aphront-panel-preview">
	<div id="audit-preview">
	<div class="aphront-panel-preview-loading-text">
	Loading preview...
	</div>
	</div>
	</div>';

	$view = new AphrontNullView();
	$view->appendChild($panel);
	$view->appendChild($preview_panel);
	return $view;
	}


	/**
	* Return a map of available audit actions for rendering into a <select />.
	* This shows the user valid actions, and does not show nonsense/invalid
	* actions (like closing an already-closed commit, or resigning from a commit
	* you have no association with).
	*/
	private function getAuditActions(
	PhabricatorRepositoryCommit $commit,
	array $audit_requests) {
	assert_instances_of($audit_requests, 'PhabricatorRepositoryAuditRequest');
	$user = $this->getRequest()->getUser();

	$user_is_author = ($commit->getAuthorPHID() == $user->getPHID());

	$user_request = null;
	foreach ($audit_requests as $audit_request) {
	if ($audit_request->getAuditorPHID() == $user->getPHID()) {
	$user_request = $audit_request;
	break;
	}
	}

	$actions = array();
	$actions[PhabricatorAuditActionConstants::COMMENT] = true;
	$actions[PhabricatorAuditActionConstants::ADD_CCS] = true;
	$actions[PhabricatorAuditActionConstants::ADD_AUDITORS] = true;

	// We allow you to accept your own commits. A use case here is that you
	// notice an issue with your own commit and "Raise Concern" as an indicator
	// to other auditors that you're on top of the issue, then later resolve it
	// and "Accept". You can not accept on behalf of projects or packages,
	// however.
	$actions[PhabricatorAuditActionConstants::ACCEPT] = true;
	$actions[PhabricatorAuditActionConstants::CONCERN] = true;


	// To resign, a user must have authority on some request and not be the
	// commit's author.
	if (!$user_is_author) {
	$may_resign = false;

	$authority_map = array_fill_keys($this->auditAuthorityPHIDs, true);
	foreach ($audit_requests as $request) {
	if (empty($authority_map[$request->getAuditorPHID()])) {
	continue;
	}
	$may_resign = true;
	break;
	}

	// If the user has already resigned, don't show "Resign...".
	$status_resigned = PhabricatorAuditStatusConstants::RESIGNED;
	if ($user_request) {
	if ($user_request->getAuditStatus() == $status_resigned) {
	$may_resign = false;
	}
	}

	if ($may_resign) {
	$actions[PhabricatorAuditActionConstants::RESIGN] = true;
	}
	}

	$status_concern = PhabricatorAuditCommitStatusConstants::CONCERN_RAISED;
	$concern_raised = ($commit->getAuditStatus() == $status_concern);

	if ($user_is_author && $concern_raised) {
	$actions[PhabricatorAuditActionConstants::CLOSE] = true;
	}

	foreach ($actions as $constant => $ignored) {
	$actions[$constant] =
	PhabricatorAuditActionConstants::getActionName($constant);
	}

	return $actions;
	}

	private function buildMergesTable(PhabricatorRepositoryCommit $commit) {
	$drequest = $this->getDiffusionRequest();

	$limit = 50;

	$merge_query = DiffusionMergedCommitsQuery::newFromDiffusionRequest(
	$drequest);
	$merge_query->setLimit($limit + 1);
	$merges = $merge_query->loadMergedCommits();

	if (!$merges) {
	return null;
	}

	$caption = null;
	if (count($merges) > $limit) {
	$merges = array_slice($merges, 0, $limit);
	$caption =
	"This commit merges more than {$limit} changes. Only the first ".
	"{$limit} are shown.";
	}

	$history_table = new DiffusionHistoryTableView();
	$history_table->setDiffusionRequest($drequest);
	$history_table->setHistory($merges);
	$history_table->loadRevisions();

	$phids = $history_table->getRequiredHandlePHIDs();
	$handles = id(new PhabricatorObjectHandleData($phids))->loadHandles();
	$history_table->setHandles($handles);

	$panel = new AphrontPanelView();
	$panel->setHeader('Merged Changes');
	$panel->setCaption($caption);
	$panel->appendChild($history_table);

	return $panel;
	}

	private function renderHeadsupActionList(
	PhabricatorRepositoryCommit $commit) {

	$request = $this->getRequest();
	$user = $request->getUser();

	$actions = array();

	require_celerity_resource('phabricator-flag-css');
	$flag = PhabricatorFlagQuery::loadUserFlag($user, $commit->getPHID());
	if ($flag) {
	$class = PhabricatorFlagColor::getCSSClass($flag->getColor());
	$color = PhabricatorFlagColor::getColorName($flag->getColor());

	$action = new AphrontHeadsupActionView();
	$action->setClass('flag-clear '.$class);
	$action->setURI('/flag/delete/'.$flag->getID().'/');
	$action->setName('Remove '.$color.' Flag');
	$action->setWorkflow(true);
	$actions[] = $action;
	} else {
	$action = new AphrontHeadsupActionView();
	$action->setClass('phabricator-flag-ghost');
	$action->setURI('/flag/edit/'.$commit->getPHID().'/');
	$action->setName('Flag Commit');
	$action->setWorkflow(true);
	$actions[] = $action;
	}

	require_celerity_resource('phabricator-object-selector-css');
	require_celerity_resource('javelin-behavior-phabricator-object-selector');

	$action = new AphrontHeadsupActionView();
	$action->setName('Edit Maniphest Tasks');
	$action->setURI('/search/attach/'.$commit->getPHID().'/TASK/edge/');
	$action->setWorkflow(true);
	$action->setClass('attach-maniphest');
	$actions[] = $action;

	if ($user->getIsAdmin()) {
	$action = new AphrontHeadsupActionView();
	$action->setName('MetaMTA Transcripts');
	$action->setURI('/mail/?phid='.$commit->getPHID());
	$action->setClass('transcripts-metamta');
	$actions[] = $action;
	}

	$action = new AphrontHeadsupActionView();
	$action->setName('Herald Transcripts');
	$action->setURI('/herald/transcript/?phid='.$commit->getPHID());
	$action->setClass('transcripts-herald');
	$actions[] = $action;

	$action = new AphrontHeadsupActionView();
	$action->setName('Download Raw Diff');
	$action->setURI($request->getRequestURI()->alter('diff', true));
	$action->setClass('action-download');
	$actions[] = $action;

	$action_list = new AphrontHeadsupActionListView();
	$action_list->setActions($actions);

	return $action_list;
	}

	private function buildBranches(DiffusionRequest $request) {

	$branch_query = DiffusionContainsQuery::newFromDiffusionRequest($request);
	$branches = $branch_query->loadContainingBranches();

	if (!$branches) {
	return null;
	}

	$branch_links = array();
	foreach ($branches as $branch => $commit) {
	$branch_links[] = phutil_render_tag(
	'a',
	array(
	'href' => $request->generateURI(
	array(
	'action' => 'browse',
	'branch' => $branch,
	)),
	),
	phutil_escape_html($branch));
	}
	$branch_links = implode(', ', $branch_links);
	return $branch_links;
	}

	private function buildTags(DiffusionRequest $request) {
	$tag_limit = 10;

	$tag_query = DiffusionCommitTagsQuery::newFromDiffusionRequest($request);
	$tag_query->setLimit($tag_limit + 1);
	$tags = $tag_query->loadTags();

	if (!$tags) {
	return null;
	}

	$has_more_tags = (count($tags) > $tag_limit);
	$tags = array_slice($tags, 0, $tag_limit);

	$tag_links = array();
	foreach ($tags as $tag) {
	$tag_links[] = phutil_render_tag(
	'a',
	array(
	'href' => $request->generateURI(
	array(
	'action' => 'browse',
	'commit' => $tag->getName(),
	)),
	),
	phutil_escape_html($tag->getName()));
	}

	if ($has_more_tags) {
	$tag_links[] = phutil_render_tag(
	'a',
	array(
	'href' => $request->generateURI(
	array(
	'action' => 'tags',
	)),
	),
	"More tags\xE2\x80\xA6");
	}

	$tag_links = implode(', ', $tag_links);

	return $tag_links;
	}

	private function buildRefs(DiffusionRequest $request) {
	// Not turning this into a proper Query class since it's pretty simple,
	// one-off, and Git-specific.

	$type_git = PhabricatorRepositoryType::REPOSITORY_TYPE_GIT;

	$repository = $request->getRepository();
	if ($repository->getVersionControlSystem() != $type_git) {
	return null;
	}

	list($stdout) = $repository->execxLocalCommand(
	'log --format=%s -n 1 %s --',
	'%d',
	$request->getCommit());

	// %d, gives a weird output format
	// similar to (remote/one, remote/two, remote/three)
	$refs = trim($stdout, "() \n");
	if (!$refs) {
	return null;
	}
	$refs = explode(',', $refs);
	$refs = array_map('trim', $refs);

	$ref_links = array();
	foreach ($refs as $ref) {
	$ref_links[] = phutil_render_tag(
	'a',
	array(
	'href' => $request->generateURI(
	array(
	'action' => 'browse',
	'branch' => $ref,
	)),
	),
	phutil_escape_html($ref));
	}
	$ref_links = implode(', ', $ref_links);
	return $ref_links;
	}

	private function buildRawDiffResponse(DiffusionRequest $drequest) {
	$raw_query = DiffusionRawDiffQuery::newFromDiffusionRequest($drequest);
	$raw_diff = $raw_query->loadRawDiff();

	- $hash = PhabricatorHash::digest($raw_diff);
	-
	- $file = id(new PhabricatorFile())->loadOneWhere(
	- 'contentHash = %s LIMIT 1',
	- $hash);
	- if (!$file) {
	- // We're just caching the data; this is always safe.
	- $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	-
	- $file = PhabricatorFile::newFromFileData(
	- $raw_diff,
	- array(
	- 'name' => $drequest->getCommit().'.diff',
	- ));
	-
	- unset($unguarded);
	- }
	+ $file = PhabricatorFile::buildFromFileDataOrHash(
	+ $raw_diff,
	+ array(
	+ 'name' => $drequest->getCommit().'.diff',
	+ ));

	return id(new AphrontRedirectResponse())->setURI($file->getBestURI());
	}

	}
	diff --git a/src/applications/files/storage/PhabricatorFile.php b/src/applications/files/storage/PhabricatorFile.php
	index c0be163cbd..b55d402fbc 100644
	--- a/src/applications/files/storage/PhabricatorFile.php
	+++ b/src/applications/files/storage/PhabricatorFile.php
	@@ -1,383 +1,422 @@
	<?php

	/*
	* Copyright 2012 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.
	*/

	final class PhabricatorFile extends PhabricatorFileDAO {

	const STORAGE_FORMAT_RAW = 'raw';

	protected $phid;
	protected $name;
	protected $mimeType;
	protected $byteSize;
	protected $authorPHID;
	protected $secretKey;
	protected $contentHash;

	protected $storageEngine;
	protected $storageFormat;
	protected $storageHandle;

	public function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	) + parent::getConfiguration();
	}

	public function generatePHID() {
	return PhabricatorPHID::generateNewPHID(
	PhabricatorPHIDConstants::PHID_TYPE_FILE);
	}

	public static function readUploadedFileData($spec) {
	if (!$spec) {
	throw new Exception("No file was uploaded!");
	}

	$err = idx($spec, 'error');
	if ($err) {
	throw new PhabricatorFileUploadException($err);
	}

	$tmp_name = idx($spec, 'tmp_name');
	$is_valid = @is_uploaded_file($tmp_name);
	if (!$is_valid) {
	throw new Exception("File is not an uploaded file.");
	}

	$file_data = Filesystem::readFile($tmp_name);
	$file_size = idx($spec, 'size');

	if (strlen($file_data) != $file_size) {
	throw new Exception("File size disagrees with uploaded size.");
	}

	self::validateFileSize(strlen($file_data));

	return $file_data;
	}

	public static function newFromPHPUpload($spec, array $params = array()) {
	$file_data = self::readUploadedFileData($spec);

	$file_name = nonempty(
	idx($params, 'name'),
	idx($spec, 'name'));
	$params = array(
	'name' => $file_name,
	) + $params;

	return self::newFromFileData($file_data, $params);
	}

	public static function newFromXHRUpload($data, array $params = array()) {
	self::validateFileSize(strlen($data));
	return self::newFromFileData($data, $params);
	}

	private static function validateFileSize($size) {
	$limit = PhabricatorEnv::getEnvConfig('storage.upload-size-limit');
	if (!$limit) {
	return;
	}

	$limit = phabricator_parse_bytes($limit);
	if ($size > $limit) {
	throw new PhabricatorFileUploadException(-1000);
	}
	}

	+
	+ /**
	+ * Given a block of data, try to load an existing file with the same content
	+ * if one exists. If it does not, build a new file.
	+ *
	+ * This method is generally used when we have some piece of semi-trusted data
	+ * like a diff or a file from a repository that we want to show to the user.
	+ * We can't just dump it out because it may be dangerous for any number of
	+ * reasons; instead, we need to serve it through the File abstraction so it
	+ * ends up on the CDN domain if one is configured and so on. However, if we
	+ * simply wrote a new file every time we'd potentially end up with a lot
	+ * of redundant data in file storage.
	+ *
	+ * To solve these problems, we use file storage as a cache and reuse the
	+ * same file again if we've previously written it.
	+ *
	+ * NOTE: This method unguards writes.
	+ *
	+ * @param string Raw file data.
	+ * @param dict Dictionary of file information.
	+ */
	+ public static function buildFromFileDataOrHash(
	+ $data,
	+ array $params = array()) {
	+
	+ $file = id(new PhabricatorFile())->loadOneWhere(
	+ 'contentHash = %s LIMIT 1',
	+ PhabricatorHash::digest($data));
	+
	+ if (!$file) {
	+ $unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	+ $file = PhabricatorFile::newFromFileData($data, $params);
	+ unset($unguarded);
	+ }
	+
	+ return $file;
	+ }
	+
	+
	public static function newFromFileData($data, array $params = array()) {
	$selector = PhabricatorEnv::newObjectFromConfig('storage.engine-selector');

	$engines = $selector->selectStorageEngines($data, $params);
	if (!$engines) {
	throw new Exception("No valid storage engines are available!");
	}

	$data_handle = null;
	$engine_identifier = null;
	$exceptions = array();
	foreach ($engines as $engine) {
	$engine_class = get_class($engine);
	try {
	// Perform the actual write.
	$data_handle = $engine->writeFile($data, $params);
	if (!$data_handle \|\| strlen($data_handle) > 255) {
	// This indicates an improperly implemented storage engine.
	throw new PhabricatorFileStorageConfigurationException(
	"Storage engine '{$engine_class}' executed writeFile() but did ".
	"not return a valid handle ('{$data_handle}') to the data: it ".
	"must be nonempty and no longer than 255 characters.");
	}

	$engine_identifier = $engine->getEngineIdentifier();
	if (!$engine_identifier \|\| strlen($engine_identifier) > 32) {
	throw new PhabricatorFileStorageConfigurationException(
	"Storage engine '{$engine_class}' returned an improper engine ".
	"identifier '{$engine_identifier}': it must be nonempty ".
	"and no longer than 32 characters.");
	}

	// We stored the file somewhere so stop trying to write it to other
	// places.
	break;
	} catch (Exception $ex) {
	if ($ex instanceof PhabricatorFileStorageConfigurationException) {
	// If an engine is outright misconfigured (or misimplemented), raise
	// that immediately since it probably needs attention.
	throw $ex;
	}

	// If an engine doesn't work, keep trying all the other valid engines
	// in case something else works.
	phlog($ex);

	$exceptions[] = $ex;
	}
	}

	if (!$data_handle) {
	throw new PhutilAggregateException(
	"All storage engines failed to write file:",
	$exceptions);
	}

	$file_name = idx($params, 'name');
	$file_name = self::normalizeFileName($file_name);

	// If for whatever reason, authorPHID isn't passed as a param
	// (always the case with newFromFileDownload()), store a ''
	$authorPHID = idx($params, 'authorPHID');

	$file = new PhabricatorFile();
	$file->setName($file_name);
	$file->setByteSize(strlen($data));
	$file->setAuthorPHID($authorPHID);
	$file->setContentHash(PhabricatorHash::digest($data));

	$file->setStorageEngine($engine_identifier);
	$file->setStorageHandle($data_handle);

	// TODO: This is probably YAGNI, but allows for us to do encryption or
	// compression later if we want.
	$file->setStorageFormat(self::STORAGE_FORMAT_RAW);

	if (isset($params['mime-type'])) {
	$file->setMimeType($params['mime-type']);
	} else {
	$tmp = new TempFile();
	Filesystem::writeFile($tmp, $data);
	$file->setMimeType(Filesystem::getMimeType($tmp));
	}

	$file->save();

	return $file;
	}

	public static function newFromFileDownload($uri, $name) {
	$uri = new PhutilURI($uri);

	$protocol = $uri->getProtocol();
	switch ($protocol) {
	case 'http':
	case 'https':
	break;
	default:
	// Make sure we are not accessing any file:// URIs or similar.
	return null;
	}

	$timeout = 5;

	$file_data = HTTPSFuture::loadContent($uri, $timeout);
	if ($file_data === false) {
	return null;
	}

	return self::newFromFileData($file_data, array('name' => $name));
	}

	public static function normalizeFileName($file_name) {
	return preg_replace('/[^a-zA-Z0-9.~_-]/', '_', $file_name);
	}

	public function delete() {
	$engine = $this->instantiateStorageEngine();

	$ret = parent::delete();

	$engine->deleteFile($this->getStorageHandle());

	return $ret;
	}

	public function loadFileData() {

	$engine = $this->instantiateStorageEngine();
	$data = $engine->readFile($this->getStorageHandle());

	switch ($this->getStorageFormat()) {
	case self::STORAGE_FORMAT_RAW:
	$data = $data;
	break;
	default:
	throw new Exception("Unknown storage format.");
	}

	return $data;
	}

	public function getViewURI() {
	if (!$this->getPHID()) {
	throw new Exception(
	"You must save a file before you can generate a view URI.");
	}

	$name = phutil_escape_uri($this->getName());

	$path = '/file/data/'.$this->getSecretKey().'/'.$this->getPHID().'/'.$name;
	return PhabricatorEnv::getCDNURI($path);
	}

	public function getInfoURI() {
	return '/file/info/'.$this->getPHID().'/';
	}

	public function getBestURI() {
	if ($this->isViewableInBrowser()) {
	return $this->getViewURI();
	} else {
	return $this->getInfoURI();
	}
	}

	public function getThumb60x45URI() {
	return '/file/xform/thumb-60x45/'.$this->getPHID().'/';
	}

	public function getThumb160x120URI() {
	return '/file/xform/thumb-160x120/'.$this->getPHID().'/';
	}


	public function isViewableInBrowser() {
	return ($this->getViewableMimeType() !== null);
	}

	public function isViewableImage() {
	if (!$this->isViewableInBrowser()) {
	return false;
	}

	$mime_map = PhabricatorEnv::getEnvConfig('files.image-mime-types');
	$mime_type = $this->getMimeType();
	return idx($mime_map, $mime_type);
	}

	public function isTransformableImage() {

	// NOTE: The way the 'gd' extension works in PHP is that you can install it
	// with support for only some file types, so it might be able to handle
	// PNG but not JPEG. Try to generate thumbnails for whatever we can. Setup
	// warns you if you don't have complete support.

	$matches = null;
	$ok = preg_match(
	'@^image/(gif\|png\|jpe?g)@',
	$this->getViewableMimeType(),
	$matches);
	if (!$ok) {
	return false;
	}

	switch ($matches[1]) {
	case 'jpg';
	case 'jpeg':
	return function_exists('imagejpeg');
	break;
	case 'png':
	return function_exists('imagepng');
	break;
	case 'gif':
	return function_exists('imagegif');
	break;
	default:
	throw new Exception('Unknown type matched as image MIME type.');
	}
	}

	public static function getTransformableImageFormats() {
	$supported = array();

	if (function_exists('imagejpeg')) {
	$supported[] = 'jpg';
	}

	if (function_exists('imagepng')) {
	$supported[] = 'png';
	}

	if (function_exists('imagegif')) {
	$supported[] = 'gif';
	}

	return $supported;
	}

	protected function instantiateStorageEngine() {
	$engines = id(new PhutilSymbolLoader())
	->setType('class')
	->setAncestorClass('PhabricatorFileStorageEngine')
	->selectAndLoadSymbols();

	foreach ($engines as $engine_class) {
	$engine = newv($engine_class['name'], array());
	if ($engine->getEngineIdentifier() == $this->getStorageEngine()) {
	return $engine;
	}
	}

	throw new Exception("File's storage engine could be located!");
	}

	public function getViewableMimeType() {
	$mime_map = PhabricatorEnv::getEnvConfig('files.viewable-mime-types');

	$mime_type = $this->getMimeType();
	$mime_parts = explode(';', $mime_type);
	$mime_type = trim(reset($mime_parts));

	return idx($mime_map, $mime_type);
	}

	public function validateSecretKey($key) {
	return ($key == $this->getSecretKey());
	}

	public function save() {
	if (!$this->getSecretKey()) {
	$this->setSecretKey($this->generateSecretKey());
	}
	return parent::save();
	}

	public function generateSecretKey() {
	return Filesystem::readRandomCharacters(20);
	}
	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 12:47 (3 w, 4 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1124720
Default Alt Text: (97 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions