No OneTemporary
Actions

Size

82 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php b/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
	index c48f9eb172..8d1b82e002 100644
	--- a/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
	+++ b/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
	@@ -1,797 +1,802 @@
	<?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 = end($diffs);
	$target_id = $request->getInt('id');
	if ($target_id) {
	if (isset($diffs[$target_id])) {
	$target = $diffs[$target_id];
	}
	}

	$diffs = mpull($diffs, null, 'getID');
	if (empty($diffs[$diff_vs])) {
	$diff_vs = null;
	}

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

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

	$comments = $revision->loadComments();
	$comments = array_merge(
	$this->getImplicitComments($revision),
	$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. Use ".
	"Table of Contents to open files in a standalone view. ".
	"<strong>".
	phutil_render_tag(
	'a',
	array(
	'href' => $request_uri->alter('large', 'true'),
	),
	'Show All Files Inline').
	"</strong>");
	$warning = $warning->render();

	$visible_changesets = array();
	} 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.
	PhutilSymbolLoader::loadClass($custom_renderer_class);
	$custom_renderer =
	newv($custom_renderer_class, array());
	$actions = array_merge(
	$actions,
	$custom_renderer->generateActionLinks($revision, $target));
	}

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

	$arc_project = $target->loadArcanistProject();

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

	$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($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, $target);
	}
	$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'));

	$other_revisions = $this->loadOtherRevisions(
	$changesets,
	$target,
	$repository);

	$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->setUnitTestData(idx($props, 'arc:unit', array()));
	if ($repository) {
	$toc_view->setRepository($repository);
	}
	$toc_view->setDiff($target);
	$toc_view->setUser($user);
	$toc_view->setStandaloneViewLink(empty($visible_changesets));
	$toc_view->setVsMap($vs_map);
	$toc_view->setRevisionID($revision->getID());
	$toc_view->setWhitespace($whitespace);

	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->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,
	));

	$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());
	}
	return $this->buildStandardPageResponse(
	array(
	$reviewer_warning,
	$revision_detail,
	$page_pane,
	),
	array(
	'title' => 'D'.$revision->getID().' '.$revision->getTitle(),
	));
	}

	private function getImplicitComments(DifferentialRevision $revision) {

	$template = new DifferentialComment();
	$template->setAuthorPHID($revision->getAuthorPHID());
	$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}",
	);
	}

	return $links;
	}

	private function getRevisionCommentActions(DifferentialRevision $revision) {

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

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

	if ($viewer_is_owner) {
	switch ($revision->getStatus()) {
	case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
	$actions[DifferentialAction::ACTION_ABANDON] = true;
	$actions[DifferentialAction::ACTION_RETHINK] = true;
	break;
	case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
	$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_COMMIT] = true;
	break;
	case ArcanistDifferentialRevisionStatus::COMMITTED:
	break;
	case ArcanistDifferentialRevisionStatus::ABANDONED:
	$actions[DifferentialAction::ACTION_RECLAIM] = true;
	break;
	}
	} else {
	switch ($revision->getStatus()) {
	case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
	$admin_actions[DifferentialAction::ACTION_ABANDON] = $viewer_is_admin;
	$actions[DifferentialAction::ACTION_ACCEPT] = true;
	$actions[DifferentialAction::ACTION_REJECT] = true;
	$actions[DifferentialAction::ACTION_RESIGN] = $viewer_is_reviewer;
	break;
	case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
	$admin_actions[DifferentialAction::ACTION_ABANDON] = $viewer_is_admin;
	$actions[DifferentialAction::ACTION_ACCEPT] = true;
	$actions[DifferentialAction::ACTION_RESIGN] = $viewer_is_reviewer;
	break;
	case ArcanistDifferentialRevisionStatus::ACCEPTED:
	$admin_actions[DifferentialAction::ACTION_ABANDON] = $viewer_is_admin;
	$actions[DifferentialAction::ACTION_REJECT] = true;
	$actions[DifferentialAction::ACTION_RESIGN] =
	$viewer_is_reviewer && !$viewer_did_accept;
	break;
	case ArcanistDifferentialRevisionStatus::COMMITTED:
	case ArcanistDifferentialRevisionStatus::ABANDONED:
	break;
	}
	}

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

	$actions = array_keys(array_filter($actions));
	$admin_actions = array_keys(array_filter($admin_actions));
	$actions_dict = array();

	foreach ($actions as $action) {
	$actions_dict[$action] = DifferentialAction::getActionVerb($action);
	}
	foreach ($admin_actions as $action) {
	$actions_dict[$action] =
	'(Admin) ' . 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(
	array $diffs,
	$diff_vs,
	DifferentialDiff $target) {
	assert_instances_of($diffs, 'DifferentialDiff');

	$load_ids = array();
	if ($diff_vs) {
	$load_ids[] = $diff_vs;
	}
	$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();
	foreach ($changesets as $changeset) {
	$refs[$changeset->getID()] = $changeset->getID();
	}

	$vs_map = array();
	if ($diff_vs) {
	$vs_changesets = idx($changeset_groups, $diff_vs, array());
	$vs_changesets = mpull($vs_changesets, null, 'getFilename');
	foreach ($changesets as $key => $changeset) {
	$file = $changeset->getFilename();
	if (isset($vs_changesets[$file])) {
	$vs_map[$changeset->getID()] = $vs_changesets[$file]->getID();
	$refs[$changeset->getID()] =
	$changeset->getID().'/'.$vs_changesets[$file]->getID();
	unset($vs_changesets[$file]);
	} else {
	$refs[$changeset->getID()] = $changeset->getID();
	}
	}
	foreach ($vs_changesets as $changeset) {
	$changesets[$changeset->getID()] = $changeset;
	$vs_map[$changeset->getID()] = -1;
	$refs[$changeset->getID()] = $changeset->getID().'/-1';
	}
	}

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

	return array($changesets, $vs_map, $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]);
	}
	}

	$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(
	DifferentialDiff $target,
	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($changesets, $target, $repository) {
	+ private function loadOtherRevisions(
	+ array $changesets,
	+ DifferentialDiff $target,
	+ PhabricatorRepository $repository) {
	+ assert_instances_of($changesets, 'DifferentialChangeset');
	+
	if (!$repository) {
	return array();
	}

	$paths = array();
	foreach ($changesets as $changeset) {
	$paths[] = $changeset->getAbsoluteRepositoryPath(
	- $target,
	- $repository);
	+ $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>';
	}

	}
	diff --git a/src/applications/differential/storage/changeset/DifferentialChangeset.php b/src/applications/differential/storage/changeset/DifferentialChangeset.php
	index 3485e50bc1..dc7d02be0a 100644
	--- a/src/applications/differential/storage/changeset/DifferentialChangeset.php
	+++ b/src/applications/differential/storage/changeset/DifferentialChangeset.php
	@@ -1,199 +1,199 @@
	<?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 DifferentialChangeset extends DifferentialDAO {

	protected $diffID;
	protected $oldFile;
	protected $filename;
	protected $awayPaths;
	protected $changeType;
	protected $fileType;
	protected $metadata;
	protected $oldProperties;
	protected $newProperties;
	protected $addLines;
	protected $delLines;

	private $unsavedHunks = array();
	private $hunks;

	const TABLE_CACHE = 'differential_changeset_parse_cache';

	protected function getConfiguration() {
	return array(
	self::CONFIG_SERIALIZATION => array(
	'metadata' => self::SERIALIZATION_JSON,
	'oldProperties' => self::SERIALIZATION_JSON,
	'newProperties' => self::SERIALIZATION_JSON,
	'awayPaths' => self::SERIALIZATION_JSON,
	)) + parent::getConfiguration();
	}

	public function getAffectedLineCount() {
	return $this->getAddLines() + $this->getDelLines();
	}

	public function getFileType() {
	return $this->fileType;
	}

	public function getChangeType() {
	return $this->changeType;
	}

	public function attachHunks(array $hunks) {
	assert_instances_of($hunks, 'DifferentialHunk');
	$this->hunks = $hunks;
	return $this;
	}

	public function getHunks() {
	if ($this->hunks === null) {
	throw new Exception("Must load and attach hunks first!");
	}
	return $this->hunks;
	}

	public function getDisplayFilename() {
	$name = $this->getFilename();
	if ($this->getFileType() == DifferentialChangeType::FILE_DIRECTORY) {
	$name .= '/';
	}
	return $name;
	}

	public function addUnsavedHunk(DifferentialHunk $hunk) {
	if ($this->hunks === null) {
	$this->hunks = array();
	}
	$this->hunks[] = $hunk;
	$this->unsavedHunks[] = $hunk;
	return $this;
	}

	public function loadHunks() {
	if (!$this->getID()) {
	return array();
	}
	return id(new DifferentialHunk())->loadAllWhere(
	'changesetID = %d',
	$this->getID());
	}

	public function save() {
	// TODO: Sort out transactions
	// $this->openTransaction();
	$ret = parent::save();
	foreach ($this->unsavedHunks as $hunk) {
	$hunk->setChangesetID($this->getID());
	$hunk->save();
	}
	// $this->saveTransaction();
	return $ret;
	}

	public function delete() {
	// $this->openTransaction();
	foreach ($this->loadHunks() as $hunk) {
	$hunk->delete();
	}
	$this->_hunks = array();
	$ret = parent::delete();
	// $this->saveTransaction();
	return $ret;
	}

	public function getSortKey() {
	$sort_key = $this->getFilename();
	// Sort files with ".h" in them first, so headers (.h, .hpp) come before
	// implementations (.c, .cpp, .cs).
	$sort_key = str_replace('.h', '.!h', $sort_key);
	return $sort_key;
	}

	public function makeNewFile() {
	$file = array();
	foreach ($this->getHunks() as $hunk) {
	$file[] = $hunk->makeNewFile();
	}
	return implode("\n", $file);
	}

	public function makeOldFile() {
	$file = array();
	foreach ($this->getHunks() as $hunk) {
	$file[] = $hunk->makeOldFile();
	}
	return implode("\n", $file);
	}

	public function getAnchorName() {
	return substr(md5($this->getFilename()), 0, 8);
	}

	public function getAbsoluteRepositoryPath(
	- DifferentialDiff $diff,
	- PhabricatorRepository $repository) {
	+ PhabricatorRepository $repository,
	+ DifferentialDiff $diff = null) {

	$base = '/';
	- if ($diff->getSourceControlPath()) {
	+ if ($diff && $diff->getSourceControlPath()) {
	$base = id(new PhutilURI($diff->getSourceControlPath()))->getPath();
	}

	$path = $this->getFilename();
	$path = rtrim($base, '/').'/'.ltrim($path, '/');

	$vcs = $repository->getVersionControlSystem();
	if ($vcs == PhabricatorRepositoryType::REPOSITORY_TYPE_SVN) {
	$prefix = $repository->getDetail('remote-uri');
	$prefix = id(new PhutilURI($prefix))->getPath();
	if (!strncmp($path, $prefix, strlen($prefix))) {
	$path = substr($path, strlen($prefix));
	}
	$path = '/'.ltrim($path, '/');
	}

	return $path;
	}

	/**
	* Retreive the configured wordwrap width for this changeset.
	*/
	public function getWordWrapWidth() {
	$config = PhabricatorEnv::getEnvConfig('differential.wordwrap');
	foreach ($config as $regexp => $width) {
	if (preg_match($regexp, $this->getFilename())) {
	return $width;
	}
	}
	return 80;
	}

	public function getWhitespaceMatters() {
	$config = PhabricatorEnv::getEnvConfig('differential.whitespace-matters');
	foreach ($config as $regexp) {
	if (preg_match($regexp, $this->getFilename())) {
	return true;
	}
	}

	return false;
	}

	}
	diff --git a/src/applications/differential/view/changesetlistview/DifferentialChangesetListView.php b/src/applications/differential/view/changesetlistview/DifferentialChangesetListView.php
	index 74eb6abeb6..30cc64fc6d 100644
	--- a/src/applications/differential/view/changesetlistview/DifferentialChangesetListView.php
	+++ b/src/applications/differential/view/changesetlistview/DifferentialChangesetListView.php
	@@ -1,286 +1,286 @@
	<?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 DifferentialChangesetListView extends AphrontView {

	private $changesets = array();
	private $references = array();
	private $inlineURI;
	private $renderURI = '/differential/changeset/';
	private $whitespace;

	private $standaloneURI;
	private $leftRawFileURI;
	private $rightRawFileURI;

	private $user;
	private $symbolIndexes = array();
	private $repository;
	private $diff;
	private $vsMap = array();

	public function setChangesets($changesets) {
	$this->changesets = $changesets;
	return $this;
	}

	public function setInlineCommentControllerURI($uri) {
	$this->inlineURI = $uri;
	return $this;
	}

	public function setUser(PhabricatorUser $user) {
	$this->user = $user;
	return $this;
	}

	public function setRepository(PhabricatorRepository $repository) {
	$this->repository = $repository;
	return $this;
	}

	public function setDiff(DifferentialDiff $diff) {
	$this->diff = $diff;
	return $this;
	}

	public function setRenderingReferences(array $references) {
	$this->references = $references;
	return $this;
	}

	public function setSymbolIndexes(array $indexes) {
	$this->symbolIndexes = $indexes;
	return $this;
	}

	public function setRenderURI($render_uri) {
	$this->renderURI = $render_uri;
	return $this;
	}

	public function setWhitespace($whitespace) {
	$this->whitespace = $whitespace;
	return $this;
	}

	public function setVsMap(array $vs_map) {
	$this->vsMap = $vs_map;
	return $this;
	}

	public function getVsMap() {
	return $this->vsMap;
	}

	public function setStandaloneURI($uri) {
	$this->standaloneURI = $uri;
	return $this;
	}

	public function setRawFileURIs($l, $r) {
	$this->leftRawFileURI = $l;
	$this->rightRawFileURI = $r;
	return $this;
	}

	public function render() {
	require_celerity_resource('differential-changeset-view-css');

	$changesets = $this->changesets;

	Javelin::initBehavior('buoyant', array());

	$output = array();
	$mapping = array();
	foreach ($changesets as $key => $changeset) {
	$file = $changeset->getFilename();
	$class = 'differential-changeset';
	if (!$this->inlineURI) {
	$class .= ' differential-changeset-noneditable';
	}

	$ref = $this->references[$key];

	$detail = new DifferentialChangesetDetailView();

	$view_options = $this->renderViewOptionsDropdown(
	$detail,
	$ref,
	$changeset);

	$detail->setChangeset($changeset);
	$detail->addButton($view_options);
	$detail->setSymbolIndex(idx($this->symbolIndexes, $key));
	$detail->setVsChangesetID(idx($this->vsMap, $changeset->getID()));

	$uniq_id = celerity_generate_unique_node_id();
	$detail->appendChild(
	phutil_render_tag(
	'div',
	array(
	'id' => $uniq_id,
	),
	'<div class="differential-loading">Loading...</div>'));
	$output[] = $detail->render();

	$mapping[$uniq_id] = $ref;
	}

	require_celerity_resource('aphront-tooltip-css');

	Javelin::initBehavior('differential-populate', array(
	'registry' => $mapping,
	'whitespace' => $this->whitespace,
	'uri' => $this->renderURI,
	));

	Javelin::initBehavior('differential-show-more', array(
	'uri' => $this->renderURI,
	'whitespace' => $this->whitespace,
	));

	Javelin::initBehavior('differential-comment-jump', array());

	if ($this->inlineURI) {
	$undo_templates = $this->renderUndoTemplates();

	Javelin::initBehavior('differential-edit-inline-comments', array(
	'uri' => $this->inlineURI,
	'undo_templates' => $undo_templates,
	'stage' => 'differential-review-stage',
	));
	}

	return phutil_render_tag(
	'div',
	array(
	'class' => 'differential-review-stage',
	'id' => 'differential-review-stage',
	),
	implode("\n", $output));
	}

	/**
	* Render the "Undo" markup for the inline comment undo feature.
	*/
	private function renderUndoTemplates() {
	$link = javelin_render_tag(
	'a',
	array(
	'href' => '#',
	'sigil' => 'differential-inline-comment-undo',
	),
	'Undo');

	$div = phutil_render_tag(
	'div',
	array(
	'class' => 'differential-inline-undo',
	),
	'Changes discarded. '.$link);

	$content = '<th></th><td>'.$div.'</td>';
	$empty = '<th></th><td></td>';

	$left = array($content, $empty);
	$right = array($empty, $content);

	return array(
	'l' => '<table><tr>'.implode('', $left).'</tr></table>',
	'r' => '<table><tr>'.implode('', $right).'</tr></table>',
	);
	}

	private function renderViewOptionsDropdown(
	DifferentialChangesetDetailView $detail,
	$ref,
	DifferentialChangeset $changeset) {

	$meta = array();

	$qparams = array(
	'ref' => $ref,
	'whitespace' => $this->whitespace,
	);

	if ($this->standaloneURI) {
	$uri = new PhutilURI($this->standaloneURI);
	$uri->setQueryParams($uri->getQueryParams() + $qparams);
	$meta['standaloneURI'] = (string)$uri;
	}

	$repository = $this->repository;
	if ($repository) {
	$meta['diffusionURI'] = (string)$repository->getDiffusionBrowseURIForPath(
	- $changeset->getAbsoluteRepositoryPath($this->diff, $repository));
	+ $changeset->getAbsoluteRepositoryPath($repository, $this->diff));
	}

	$change = $changeset->getChangeType();

	if ($this->leftRawFileURI) {
	if ($change != DifferentialChangeType::TYPE_ADD) {
	$uri = new PhutilURI($this->leftRawFileURI);
	$uri->setQueryParams($uri->getQueryParams() + $qparams);
	$meta['leftURI'] = (string)$uri;
	}
	}

	if ($this->rightRawFileURI) {
	if ($change != DifferentialChangeType::TYPE_DELETE &&
	$change != DifferentialChangeType::TYPE_MULTICOPY) {
	$uri = new PhutilURI($this->rightRawFileURI);
	$uri->setQueryParams($uri->getQueryParams() + $qparams);
	$meta['rightURI'] = (string)$uri;
	}
	}

	$user = $this->user;
	if ($user && $repository) {
	$path = ltrim(
	- $changeset->getAbsoluteRepositoryPath($this->diff, $repository),
	+ $changeset->getAbsoluteRepositoryPath($repository, $this->diff),
	'/');
	$line = 1; // TODO: get first changed line
	$callsign = $repository->getCallsign();
	$editor_link = $user->loadEditorLink($path, $line, $callsign);
	if ($editor_link) {
	$meta['editor'] = $editor_link;
	} else {
	$meta['editorConfigure'] = '/settings/page/preferences/';
	}
	}

	$meta['containerID'] = $detail->getID();

	Javelin::initBehavior(
	'differential-dropdown-menus',
	array());

	return javelin_render_tag(
	'a',
	array(
	'class' => 'button small grey',
	'meta' => $meta,
	'href' => idx($meta, 'detailURI', '#'),
	'target' => '_blank',
	'sigil' => 'differential-view-options',
	),
	"View Options \xE2\x96\xBC");
	}

	}
	diff --git a/src/applications/differential/view/difftableofcontents/DifferentialDiffTableOfContentsView.php b/src/applications/differential/view/difftableofcontents/DifferentialDiffTableOfContentsView.php
	index 39a27f4508..bd2a996fbf 100644
	--- a/src/applications/differential/view/difftableofcontents/DifferentialDiffTableOfContentsView.php
	+++ b/src/applications/differential/view/difftableofcontents/DifferentialDiffTableOfContentsView.php
	@@ -1,288 +1,288 @@
	<?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 DifferentialDiffTableOfContentsView extends AphrontView {

	private $changesets = array();
	private $visibleChangesets = array();
	private $repository;
	private $diff;
	private $user;
	private $standaloneViewLink = null;
	private $renderURI = '/differential/changeset/';
	private $revisionID;
	private $whitespace;
	private $unitTestData;

	public function setChangesets($changesets) {
	$this->changesets = $changesets;
	return $this;
	}

	public function setVisibleChangesets($visible_changesets) {
	$this->visibleChangesets = $visible_changesets;
	return $this;
	}

	public function setRepository(PhabricatorRepository $repository) {
	$this->repository = $repository;
	return $this;
	}

	public function setDiff(DifferentialDiff $diff) {
	$this->diff = $diff;
	return $this;
	}

	public function setUnitTestData($unit_test_data) {
	$this->unitTestData = $unit_test_data;
	return $this;
	}

	public function setUser(PhabricatorUser $user) {
	$this->user = $user;
	return $this;
	}

	public function setStandaloneViewLink($standalone_view_link) {
	$this->standaloneViewLink = $standalone_view_link;
	return $this;
	}

	public function setVsMap(array $vs_map) {
	$this->vsMap = $vs_map;
	return $this;
	}

	public function setRevisionID($revision_id) {
	$this->revisionID = $revision_id;
	return $this;
	}

	public function setWhitespace($whitespace) {
	$this->whitespace = $whitespace;
	return $this;
	}

	public function render() {

	require_celerity_resource('differential-core-view-css');
	require_celerity_resource('differential-table-of-contents-css');

	$rows = array();

	$coverage = array();
	if ($this->unitTestData) {
	$coverage_by_file = array();
	foreach ($this->unitTestData as $result) {
	$test_coverage = idx($result, 'coverage');
	if (!$test_coverage) {
	continue;
	}
	foreach ($test_coverage as $file => $results) {
	$coverage_by_file[$file][] = $results;
	}
	}
	foreach ($coverage_by_file as $file => $coverages) {
	$coverage[$file] = ArcanistUnitTestResult::mergeCoverage($coverages);
	}
	}

	$changesets = $this->changesets;
	$paths = array();
	foreach ($changesets as $id => $changeset) {
	$type = $changeset->getChangeType();
	$ftype = $changeset->getFileType();
	$link = $this->renderChangesetLink($changeset);

	if (DifferentialChangeType::isOldLocationChangeType($type)) {
	$away = $changeset->getAwayPaths();
	if (count($away) > 1) {
	$meta = array();
	if ($type == DifferentialChangeType::TYPE_MULTICOPY) {
	$meta[] = 'Deleted after being copied to multiple locations:';
	} else {
	$meta[] = 'Copied to multiple locations:';
	}
	foreach ($away as $path) {
	$meta[] = phutil_escape_html($path);
	}
	$meta = implode('<br />', $meta);
	} else {
	if ($type == DifferentialChangeType::TYPE_MOVE_AWAY) {
	$meta = 'Moved to '.phutil_escape_html(reset($away));
	} else {
	$meta = 'Copied to '.phutil_escape_html(reset($away));
	}
	}
	} else if ($type == DifferentialChangeType::TYPE_MOVE_HERE) {
	$meta = 'Moved from '.phutil_escape_html($changeset->getOldFile());
	} else if ($type == DifferentialChangeType::TYPE_COPY_HERE) {
	$meta = 'Copied from '.phutil_escape_html($changeset->getOldFile());
	} else {
	$meta = null;
	}

	$line_count = $changeset->getAffectedLineCount();
	if ($line_count == 0) {
	$lines = null;
	} else if ($line_count == 1) {
	$lines = ' (1 line)';
	} else {
	$lines = ' ('.$line_count.' lines)';
	}

	$char = DifferentialChangeType::getSummaryCharacterForChangeType($type);
	$chartitle = DifferentialChangeType::getFullNameForChangeType($type);
	$desc = DifferentialChangeType::getShortNameForFileType($ftype);
	if ($desc) {
	$desc = '('.$desc.')';
	}
	$pchar =
	($changeset->getOldProperties() === $changeset->getNewProperties())
	? null
	: '<span title="Properties Changed">M</span>';

	$fname = $changeset->getFilename();
	$cov = $this->renderCoverage($coverage, $fname);
	if ($cov === null) {
	$mcov = $cov = '<em>-</em>';
	} else {
	$mcov = phutil_render_tag(
	'div',
	array(
	'id' => 'differential-mcoverage-'.md5($fname),
	'class' => 'differential-mcoverage-loading',
	),
	(isset($this->visibleChangesets[$id]) ? 'Loading...' : '?'));
	}

	$rows[] =
	'<tr>'.
	phutil_render_tag(
	'td',
	array(
	'class' => 'differential-toc-char',
	'title' => $chartitle,
	),
	$char).
	'<td class="differential-toc-prop">'.$pchar.'</td>'.
	'<td class="differential-toc-ftype">'.$desc.'</td>'.
	'<td class="differential-toc-file">'.$link.$lines.'</td>'.
	'<td class="differential-toc-cov">'.$cov.'</td>'.
	'<td class="differential-toc-mcov">'.$mcov.'</td>'.
	'</tr>';
	if ($meta) {
	$rows[] =
	'<tr>'.
	'<td colspan="3"></td>'.
	'<td class="differential-toc-meta">'.$meta.'</td>'.
	'</tr>';
	}
	if ($this->diff && $this->repository) {
	$paths[] =
	- $changeset->getAbsoluteRepositoryPath($this->diff, $this->repository);
	+ $changeset->getAbsoluteRepositoryPath($this->repository, $this->diff);
	}
	}

	$editor_link = null;
	if ($paths && $this->user) {
	$editor_link = $this->user->loadEditorLink(
	implode(' ', $paths),
	1, // line number
	$this->repository->getCallsign());
	if ($editor_link) {
	$editor_link = phutil_render_tag(
	'a',
	array(
	'href' => $editor_link,
	'class' => 'button differential-toc-edit-all',
	),
	'Open All in Editor');
	}
	}

	return
	'<div id="differential-review-toc" '.
	'class="differential-toc differential-panel">'.
	$editor_link.
	'<h1>Table of Contents</h1>'.
	'<table>'.
	'<tr>'.
	'<th></th>'.
	'<th></th>'.
	'<th></th>'.
	'<th>Path</th>'.
	'<th class="differential-toc-cov">Coverage (All)</th>'.
	'<th class="differential-toc-mcov">Coverage (Touched)</th>'.
	'</tr>'.
	implode("\n", $rows).
	'</table>'.
	'</div>';
	}

	private function renderCoverage(array $coverage, $file) {
	$info = idx($coverage, $file);
	if (!$info) {
	return null;
	}

	$not_covered = substr_count($info, 'U');
	$covered = substr_count($info, 'C');

	if (!$not_covered && !$covered) {
	return null;
	}

	return sprintf('%d%%', 100 * ($covered / ($covered + $not_covered)));
	}


	private function renderChangesetLink(DifferentialChangeset $changeset) {
	$display_file = $changeset->getDisplayFilename();

	if ($this->standaloneViewLink) {
	$id = $changeset->getID();
	$vs_id = idx($this->vsMap, $id);

	$ref = $vs_id ? $id.'/'.$vs_id : $id;
	$detail_uri = new PhutilURI($this->renderURI);
	$detail_uri->setQueryParams(
	array(
	'ref' => $ref,
	'whitespace' => $this->whitespace,
	'revision_id' => $this->revisionID,
	));

	return phutil_render_tag(
	'a',
	array(
	'href' => $detail_uri,
	'target' => '_blank',
	),
	phutil_escape_html($display_file));
	}
	return phutil_render_tag(
	'a',
	array(
	'href' => '#'.$changeset->getAnchorName(),
	),
	phutil_escape_html($display_file));
	}

	}
	diff --git a/src/applications/diffusion/controller/commit/DiffusionCommitController.php b/src/applications/diffusion/controller/commit/DiffusionCommitController.php
	index b0604a5a52..2ab79be19a 100644
	--- a/src/applications/diffusion/controller/commit/DiffusionCommitController.php
	+++ b/src/applications/diffusion/controller/commit/DiffusionCommitController.php
	@@ -1,679 +1,680 @@
	<?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();

	$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).")");

	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->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('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);
	}

	$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();

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

	if ($branches) {
	// TODO: Separate these into 'tracked' and other; link tracked branches.
	$branches = implode(', ', array_keys($branches));
	$branches = phutil_escape_html($branches);
	$props['Branches'] = $branches;
	}

	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 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('audit-preview', array(
	'uri' => '/audit/preview/'.$commit->getID().'/',
	'preview' => 'audit-preview',
	'content' => 'audit-content',
	'action' => 'audit-action',
	));

	$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;

	// 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;
	foreach ($audit_requests as $request) {
	if (empty($this->auditAuthorityPHIDs[$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);

	$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) {

	$user = $this->getRequest()->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_list = new AphrontHeadsupActionListView();
	$action_list->setActions($actions);

	return $action_list;
	}


	}
	diff --git a/src/applications/herald/adapter/differential/HeraldDifferentialRevisionAdapter.php b/src/applications/herald/adapter/differential/HeraldDifferentialRevisionAdapter.php
	index b6ce5da89e..a5d305a0f1 100644
	--- a/src/applications/herald/adapter/differential/HeraldDifferentialRevisionAdapter.php
	+++ b/src/applications/herald/adapter/differential/HeraldDifferentialRevisionAdapter.php
	@@ -1,317 +1,317 @@
	<?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 HeraldDifferentialRevisionAdapter extends HeraldObjectAdapter {

	protected $revision;
	protected $diff;

	protected $explicitCCs;
	protected $explicitReviewers;
	protected $forbiddenCCs;

	protected $newCCs = array();
	protected $remCCs = array();
	protected $emailPHIDs = array();

	protected $repository;
	protected $affectedPackages;
	protected $changesets;

	public function __construct(
	DifferentialRevision $revision,
	DifferentialDiff $diff) {

	$revision->loadRelationships();
	$this->revision = $revision;
	$this->diff = $diff;
	}

	public function setExplicitCCs($explicit_ccs) {
	$this->explicitCCs = $explicit_ccs;
	return $this;
	}

	public function setExplicitReviewers($explicit_reviewers) {
	$this->explicitReviewers = $explicit_reviewers;
	return $this;
	}

	public function setForbiddenCCs($forbidden_ccs) {
	$this->forbiddenCCs = $forbidden_ccs;
	return $this;
	}

	public function getCCsAddedByHerald() {
	return array_diff_key($this->newCCs, $this->remCCs);
	}

	public function getCCsRemovedByHerald() {
	return $this->remCCs;
	}

	public function getEmailPHIDsAddedByHerald() {
	return $this->emailPHIDs;
	}

	public function getPHID() {
	return $this->revision->getPHID();
	}

	public function getHeraldName() {
	return $this->revision->getTitle();
	}

	public function getHeraldTypeName() {
	return HeraldContentTypeConfig::CONTENT_TYPE_DIFFERENTIAL;
	}

	public function loadRepository() {
	if ($this->repository === null) {
	$diff = $this->diff;

	$repository = false;

	if ($diff->getRepositoryUUID()) {
	$repository = id(new PhabricatorRepository())->loadOneWhere(
	'uuid = %s',
	$diff->getRepositoryUUID());
	}

	if (!$repository && $diff->getArcanistProjectPHID()) {
	$project = id(new PhabricatorRepositoryArcanistProject())->loadOneWhere(
	'phid = %s',
	$diff->getArcanistProjectPHID());
	if ($project && $project->getRepositoryID()) {
	$repository = id(new PhabricatorRepository())->load(
	$project->getRepositoryID());
	}
	}

	$this->repository = $repository;
	}
	return $this->repository;
	}

	protected function loadChangesets() {
	if ($this->changesets === null) {
	$this->changesets = $this->diff->loadChangesets();
	}
	return $this->changesets;
	}

	protected function loadAffectedPaths() {
	$changesets = $this->loadChangesets();

	$paths = array();
	foreach ($changesets as $changeset) {
	$paths[] = $this->getAbsoluteRepositoryPathForChangeset($changeset);
	}
	return $paths;
	}

	protected function getAbsoluteRepositoryPathForChangeset(
	DifferentialChangeset $changeset) {

	$repository = $this->loadRepository();
	if (!$repository) {
	return '/'.ltrim($changeset->getFilename(), '/');
	}

	$diff = $this->diff;

	- return $changeset->getAbsoluteRepositoryPath($diff, $repository);
	+ return $changeset->getAbsoluteRepositoryPath($repository, $diff);
	}

	protected function loadContentDictionary() {
	$changesets = $this->loadChangesets();

	$hunks = array();
	if ($changesets) {
	$hunks = id(new DifferentialHunk())->loadAllWhere(
	'changesetID in (%Ld)',
	mpull($changesets, 'getID'));
	}

	$dict = array();
	$hunks = mgroup($hunks, 'getChangesetID');
	$changesets = mpull($changesets, null, 'getID');
	foreach ($changesets as $id => $changeset) {
	$path = $this->getAbsoluteRepositoryPathForChangeset($changeset);
	$content = array();
	foreach (idx($hunks, $id, array()) as $hunk) {
	$content[] = $hunk->makeChanges();
	}
	$dict[$path] = implode("\n", $content);
	}

	return $dict;
	}

	public function loadAffectedPackages() {
	if ($this->affectedPackages === null) {
	$this->affectedPackages = array();

	$repository = $this->loadRepository();
	if ($repository) {
	$packages = PhabricatorOwnersPackage::loadAffectedPackages(
	$repository,
	$this->loadAffectedPaths());
	$this->affectedPackages = $packages;
	}
	}
	return $this->affectedPackages;
	}

	public function getHeraldField($field) {
	switch ($field) {
	case HeraldFieldConfig::FIELD_TITLE:
	return $this->revision->getTitle();
	break;
	case HeraldFieldConfig::FIELD_BODY:
	return $this->revision->getSummary()."\n".
	$this->revision->getTestPlan();
	break;
	case HeraldFieldConfig::FIELD_AUTHOR:
	return $this->revision->getAuthorPHID();
	break;
	case HeraldFieldConfig::FIELD_DIFF_FILE:
	return $this->loadAffectedPaths();
	case HeraldFieldConfig::FIELD_CC:
	if (isset($this->explicitCCs)) {
	return array_keys($this->explicitCCs);
	} else {
	return $this->revision->getCCPHIDs();
	}
	case HeraldFieldConfig::FIELD_REVIEWERS:
	if (isset($this->explicitReviewers)) {
	return array_keys($this->explicitReviewers);
	} else {
	return $this->revision->getReviewers();
	}
	case HeraldFieldConfig::FIELD_REPOSITORY:
	$repository = $this->loadRepository();
	if (!$repository) {
	return null;
	}
	return $repository->getPHID();
	case HeraldFieldConfig::FIELD_DIFF_CONTENT:
	return $this->loadContentDictionary();
	case HeraldFieldConfig::FIELD_AFFECTED_PACKAGE:
	$packages = $this->loadAffectedPackages();
	return mpull($packages, 'getPHID');
	case HeraldFieldConfig::FIELD_AFFECTED_PACKAGE_OWNER:
	$packages = $this->loadAffectedPackages();
	return PhabricatorOwnersOwner::loadAffiliatedUserPHIDs(
	mpull($packages, 'getID'));
	default:
	throw new Exception("Invalid field '{$field}'.");
	}
	}

	public function applyHeraldEffects(array $effects) {
	assert_instances_of($effects, 'HeraldEffect');

	$result = array();
	if ($this->explicitCCs) {
	$effect = new HeraldEffect();
	$effect->setAction(HeraldActionConfig::ACTION_ADD_CC);
	$effect->setTarget(array_keys($this->explicitCCs));
	$effect->setReason(
	'CCs provided explicitly by revision author or carried over from a '.
	'previous version of the revision.');
	$result[] = new HeraldApplyTranscript(
	$effect,
	true,
	'Added addresses to CC list.');
	}

	$forbidden_ccs = array_fill_keys(
	nonempty($this->forbiddenCCs, array()),
	true);

	foreach ($effects as $effect) {
	$action = $effect->getAction();
	switch ($action) {
	case HeraldActionConfig::ACTION_NOTHING:
	$result[] = new HeraldApplyTranscript(
	$effect,
	true,
	'OK, did nothing.');
	break;
	case HeraldActionConfig::ACTION_FLAG:
	$result[] = parent::applyFlagEffect(
	$effect,
	$this->revision->getPHID());
	break;
	case HeraldActionConfig::ACTION_EMAIL:
	case HeraldActionConfig::ACTION_ADD_CC:
	$op = ($action == HeraldActionConfig::ACTION_EMAIL) ? 'email' : 'CC';
	$base_target = $effect->getTarget();
	$forbidden = array();
	foreach ($base_target as $key => $fbid) {
	if (isset($forbidden_ccs[$fbid])) {
	$forbidden[] = $fbid;
	unset($base_target[$key]);
	} else {
	if ($action == HeraldActionConfig::ACTION_EMAIL) {
	$this->emailPHIDs[$fbid] = true;
	} else {
	$this->newCCs[$fbid] = true;
	}
	}
	}

	if ($forbidden) {
	$failed = clone $effect;
	$failed->setTarget($forbidden);
	if ($base_target) {
	$effect->setTarget($base_target);
	$result[] = new HeraldApplyTranscript(
	$effect,
	true,
	'Added these addresses to '.$op.' list. '.
	'Others could not be added.');
	}
	$result[] = new HeraldApplyTranscript(
	$failed,
	false,
	$op.' forbidden, these addresses have unsubscribed.');
	} else {
	$result[] = new HeraldApplyTranscript(
	$effect,
	true,
	'Added addresses to '.$op.' list.');
	}
	break;
	case HeraldActionConfig::ACTION_REMOVE_CC:
	foreach ($effect->getTarget() as $fbid) {
	$this->remCCs[$fbid] = true;
	}
	$result[] = new HeraldApplyTranscript(
	$effect,
	true,
	'Removed addresses from CC list.');
	break;
	default:
	throw new Exception("No rules to handle action '{$action}'.");
	}
	}
	return $result;
	}
	}

File Metadata

Mime Type: text/x-diff
Expires: Tue, Feb 24, 7:38 PM (1 d, 18 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 851163
Default Alt Text: (82 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions