No OneTemporary
Actions

Size

45 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/differential/constants/action/DifferentialAction.php b/src/applications/differential/constants/action/DifferentialAction.php
	index 9d71fff450..49633d60e9 100644
	--- a/src/applications/differential/constants/action/DifferentialAction.php
	+++ b/src/applications/differential/constants/action/DifferentialAction.php
	@@ -1,78 +1,81 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	final class DifferentialAction {

	const ACTION_COMMIT = 'commit';
	const ACTION_COMMENT = 'none';
	const ACTION_ACCEPT = 'accept';
	const ACTION_REJECT = 'reject';
	+ const ACTION_RETHINK = 'rethink';
	const ACTION_ABANDON = 'abandon';
	const ACTION_REQUEST = 'request_review';
	const ACTION_RECLAIM = 'reclaim';
	const ACTION_UPDATE = 'update';
	const ACTION_RESIGN = 'resign';
	const ACTION_SUMMARIZE = 'summarize';
	const ACTION_TESTPLAN = 'testplan';
	const ACTION_CREATE = 'create';
	const ACTION_ADDREVIEWERS = 'add_reviewers';

	public static function getActionPastTenseVerb($action) {
	static $verbs = array(
	self::ACTION_COMMENT => 'commented on',
	self::ACTION_ACCEPT => 'accepted',
	self::ACTION_REJECT => 'requested changes to',
	+ self::ACTION_RETHINK => 'planned changes to',
	self::ACTION_ABANDON => 'abandoned',
	self::ACTION_COMMIT => 'committed',
	self::ACTION_REQUEST => 'requested a review of',
	self::ACTION_RECLAIM => 'reclaimed',
	self::ACTION_UPDATE => 'updated',
	self::ACTION_RESIGN => 'resigned from',
	self::ACTION_SUMMARIZE => 'summarized',
	self::ACTION_TESTPLAN => 'explained the test plan for',
	self::ACTION_CREATE => 'created',
	self::ACTION_ADDREVIEWERS => 'added reviewers to',
	);

	if (!empty($verbs[$action])) {
	return $verbs[$action];
	} else {
	return 'brazenly "'.$action.'ed"';
	}
	}

	public static function getActionVerb($action) {
	static $verbs = array(
	self::ACTION_COMMENT => 'Comment',
	self::ACTION_ACCEPT => "Accept Revision \xE2\x9C\x94",
	self::ACTION_REJECT => "Request Changes \xE2\x9C\x98",
	+ self::ACTION_RETHINK => "Plan Changes \xE2\x9C\x98",
	self::ACTION_ABANDON => 'Abandon Revision',
	self::ACTION_REQUEST => 'Request Review',
	self::ACTION_RECLAIM => 'Reclaim Revision',
	self::ACTION_RESIGN => 'Resign as Reviewer',
	self::ACTION_ADDREVIEWERS => 'Add Reviewers',
	);

	if (!empty($verbs[$action])) {
	return $verbs[$action];
	} else {
	return 'brazenly '.$action;
	}
	}

	}
	diff --git a/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php b/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
	index 7c1a338088..1075c35b15 100644
	--- a/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
	+++ b/src/applications/differential/controller/revisionview/DifferentialRevisionViewController.php
	@@ -1,855 +1,860 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	class DifferentialRevisionViewController extends DifferentialController {

	private $revisionID;

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

	public function processRequest() {

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

	$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($changesets, $vs_map) =
	$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 ($revision->getAttached() as $type => $phids) {
	foreach ($phids as $phid => $info) {
	$object_phids[] = $phid;
	}
	}
	$object_phids = array_unique($object_phids);

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

	$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. Only ".
	"the first {$limit} files are shown. ".
	"<strong>".
	phutil_render_tag(
	'a',
	array(
	'href' => $request_uri->alter('large', 'true'),
	),
	'Show All Files').
	"</strong>");
	$warning = $warning->render();

	$visible_changesets = array_slice($changesets, 0, $limit, true);
	} else {
	$warning = null;
	$visible_changesets = $changesets;
	}

	$diff_properties = id(new DifferentialDiffProperty())->loadAllWhere(
	'diffID = %d AND name IN (%Ls)',
	$target->getID(),
	array(
	'arc:lint',
	'arc:unit',
	));
	$diff_properties = mpull($diff_properties, 'getData', 'getName');

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

	$custom_renderer_class = PhabricatorEnv::getEnvConfig(
	'differential.revision-custom-detail-renderer');
	if ($custom_renderer_class) {
	PhutilSymbolLoader::loadClass($custom_renderer_class);
	$custom_renderer =
	newv($custom_renderer_class, array());
	}

	$properties = $this->getRevisionProperties(
	$revision,
	$target,
	$handles,
	$diff_properties);
	if ($custom_renderer) {
	$properties = array_merge(
	$properties,
	$custom_renderer->generateProperties($revision, $target));
	}

	$revision_detail->setProperties($properties);

	$actions = $this->getRevisionActions($revision);
	if ($custom_renderer) {
	$actions = array_merge(
	$actions,
	$custom_renderer->generateActionLinks($revision, $target));
	}

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

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

	$toc_view = new DifferentialDiffTableOfContentsView();
	$toc_view->setChangesets($changesets);

	$changeset_view = new DifferentialChangesetListView();
	$changeset_view->setChangesets($visible_changesets);
	$changeset_view->setEditable(true);
	$changeset_view->setRevision($revision);
	$changeset_view->setVsMap($vs_map);

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

	return $this->buildStandardPageResponse(
	'<div class="differential-primary-pane">'.
	$revision_detail->render().
	$comment_view->render().
	$diff_history->render().
	$toc_view->render().
	$warning.
	$changeset_view->render().
	$comment_form->render().
	'</div>',
	array(
	'title' => $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 getRevisionProperties(
	DifferentialRevision $revision,
	DifferentialDiff $diff,
	array $handles,
	array $diff_properties) {

	$properties = array();

	$status = $revision->getStatus();
	$status = DifferentialRevisionStatus::getNameForRevisionStatus($status);
	$properties['Revision Status'] = '<strong>'.$status.'</strong>';

	$author = $handles[$revision->getAuthorPHID()];
	$properties['Author'] = $author->renderLink();

	$properties['Reviewers'] = $this->renderHandleLinkList(
	array_select_keys(
	$handles,
	$revision->getReviewers()));

	$properties['CCs'] = $this->renderHandleLinkList(
	array_select_keys(
	$handles,
	$revision->getCCPHIDs()));

	$host = $diff->getSourceMachine();
	if ($host) {
	$properties['Host'] = phutil_escape_html($host);
	}

	$path = $diff->getSourcePath();
	if ($path) {
	$branch = $diff->getBranch() ? ' ('.$diff->getBranch().')' : '';
	$properties['Path'] = phutil_escape_html("{$path} {$branch}");
	}

	$lstar = DifferentialRevisionUpdateHistoryView::renderDiffLintStar($diff);
	$lmsg = DifferentialRevisionUpdateHistoryView::getDiffLintMessage($diff);
	$ldata = idx($diff_properties, 'arc:lint');
	$ltail = null;
	if ($ldata) {
	$ldata = igroup($ldata, 'path');
	$lint_messages = array();
	foreach ($ldata as $path => $messages) {
	$message_markup = array();
	foreach ($messages as $message) {
	$path = idx($message, 'path');
	$line = idx($message, 'line');

	$code = idx($message, 'code');
	$severity = idx($message, 'severity');

	$name = idx($message, 'name');
	$description = idx($message, 'description');

	$message_markup[] =
	'<li>'.
	'<span class="lint-severity-'.phutil_escape_html($severity).'">'.
	phutil_escape_html(ucwords($severity)).
	'</span>'.
	' '.
	'('.phutil_escape_html($code).') '.
	phutil_escape_html($name).
	' at line '.phutil_escape_html($line).
	'<p>'.phutil_escape_html($description).'</p>'.
	'</li>';
	}
	$lint_messages[] =
	'<li class="lint-file-block">'.
	'Lint for <strong>'.phutil_escape_html($path).'</strong>'.
	'<ul>'.implode("\n", $message_markup).'</ul>'.
	'</li>';
	}
	$ltail =
	'<div class="differential-lint-block">'.
	'<ul>'.
	implode("\n", $lint_messages).
	'</ul>'.
	'</div>';
	}

	$properties['Lint'] = $lstar.' '.$lmsg.$ltail;

	$ustar = DifferentialRevisionUpdateHistoryView::renderDiffUnitStar($diff);
	$umsg = DifferentialRevisionUpdateHistoryView::getDiffUnitMessage($diff);

	$udata = idx($diff_properties, 'arc:unit');
	$utail = null;
	if ($udata) {
	$unit_messages = array();
	foreach ($udata as $test) {
	$name = phutil_escape_html(idx($test, 'name'));
	$result = phutil_escape_html(idx($test, 'result'));
	$userdata = phutil_escape_html(idx($test, 'userdata'));
	if (strlen($userdata) > 256) {
	$userdata = substr($userdata, 0, 256).'...';
	}
	$userdata = str_replace("\n", '<br />', $userdata);
	$unit_messages[] =
	'<tr>'.
	'<th>'.$name.'</th>'.
	'<th class="unit-test-result">'.
	'<div class="result-'.$result.'">'.
	strtoupper($result).
	'</div>'.
	'</th>'.
	'<td>'.$userdata.'</td>'.
	'</tr>';
	}

	$utail =
	'<div class="differential-unit-block">'.
	'<table class="differential-unit-table">'.
	implode("\n", $unit_messages).
	'</table>'.
	'</div>';
	}

	$properties['Unit'] = $ustar.' '.$umsg.$utail;

	if (PhabricatorEnv::getEnvConfig('maniphest.enabled')) {
	$tasks = $revision->getAttachedPHIDs(
	PhabricatorPHIDConstants::PHID_TYPE_TASK);
	if ($tasks) {
	$links = array();
	foreach ($tasks as $task_phid) {
	$links[] = $handles[$task_phid]->renderLink();
	}
	$properties['Maniphest Tasks'] = implode('<br />', $links);
	}
	}

	$commit_phids = $revision->getCommitPHIDs();
	if ($commit_phids) {
	$links = array();
	foreach ($commit_phids as $commit_phid) {
	$links[] = $handles[$commit_phid]->renderLink();
	}
	$properties['Commits'] = implode('<br />', $links);
	}

	return $properties;
	}

	private function getRevisionActions(DifferentialRevision $revision) {
	$viewer_phid = $this->getRequest()->getUser()->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());
	$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_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');

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

	$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 renderHandleLinkList(array $list) {
	if (empty($list)) {
	return '<em>None</em>';
	}
	return implode(', ', mpull($list, 'renderLink'));
	}

	private function getRevisionCommentActions(DifferentialRevision $revision) {

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

	$viewer_phid = $this->getRequest()->getUser()->getPHID();
	$viewer_is_owner = ($viewer_phid == $revision->getAuthorPHID());
	$viewer_is_reviewer = in_array($viewer_phid, $revision->getReviewers());

	if ($viewer_is_owner) {
	switch ($revision->getStatus()) {
	case DifferentialRevisionStatus::NEEDS_REVIEW:
	$actions[DifferentialAction::ACTION_ABANDON] = true;
	+ $actions[DifferentialAction::ACTION_RETHINK] = true;
	break;
	case DifferentialRevisionStatus::NEEDS_REVISION:
	+ $actions[DifferentialAction::ACTION_ABANDON] = true;
	+ $actions[DifferentialAction::ACTION_REQUEST] = true;
	+ break;
	case DifferentialRevisionStatus::ACCEPTED:
	$actions[DifferentialAction::ACTION_ABANDON] = true;
	$actions[DifferentialAction::ACTION_REQUEST] = true;
	+ $actions[DifferentialAction::ACTION_RETHINK] = true;
	break;
	case DifferentialRevisionStatus::COMMITTED:
	break;
	case DifferentialRevisionStatus::ABANDONED:
	$actions[DifferentialAction::ACTION_RECLAIM] = true;
	break;
	}
	} else {
	switch ($revision->getStatus()) {
	case DifferentialRevisionStatus::NEEDS_REVIEW:
	$actions[DifferentialAction::ACTION_ACCEPT] = true;
	$actions[DifferentialAction::ACTION_REJECT] = true;
	$actions[DifferentialAction::ACTION_RESIGN] = $viewer_is_reviewer;
	break;
	case DifferentialRevisionStatus::NEEDS_REVISION:
	$actions[DifferentialAction::ACTION_ACCEPT] = true;
	$actions[DifferentialAction::ACTION_RESIGN] = $viewer_is_reviewer;
	break;
	case DifferentialRevisionStatus::ACCEPTED:
	$actions[DifferentialAction::ACTION_REJECT] = true;
	break;
	case DifferentialRevisionStatus::COMMITTED:
	case DifferentialRevisionStatus::ABANDONED:
	break;
	}
	}

	$actions[DifferentialAction::ACTION_ADDREVIEWERS] = true;

	return array_keys($actions);
	}

	private function loadInlineComments(array $comments, array &$changesets) {

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

	$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();
	unset($vs_changesets[$file]);
	}
	}
	foreach ($vs_changesets as $changeset) {
	$changesets[$changeset->getID()] = $changeset;
	$vs_map[$changeset->getID()] = -1;
	}
	}

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

	return array($changesets, $vs_map);
	}

	}
	/*


	protected function getSandcastleURI(Diff $diff) {
	$uri = $this->getDiffProperty($diff, 'facebook:sandcastle_uri');
	if (!$uri) {
	$uri = $diff->getSandboxURL();
	}
	return $uri;
	}

	protected function getDiffProperty(Diff $diff, $property, $default = null) {
	$diff_id = $diff->getID();
	if (empty($this->diffProperties[$diff_id])) {
	$props = id(new DifferentialDiffProperty())
	->loadAllWhere('diffID = %s', $diff_id);
	$dict = array_pull($props, 'getData', 'getName');
	$this->diffProperties[$diff_id] = $dict;
	}
	return idx($this->diffProperties[$diff_id], $property, $default);
	}

	$diff_table->appendChild(
	<tr>
	<td colspan="8" class="diff-differ-submit">
	<label>Whitespace Changes:</label>
	{id(<select name="whitespace" />)->setOptions(
	array(
	'ignore-all' => 'Ignore All',
	'ignore-trailing' => 'Ignore Trailing',
	'show-all' => 'Show All',
	), $request->getStr('whitespace'))}{' '}
	<button type="submit">Show Diff</button>
	</td>
	</tr>);

	$load_ids = array_filter(array($old, $diff->getID()));

	$viewer_id = $this->getRequest()->getViewerContext()->getUserID();

	$raw_objects = queryfx_all(
	smc_get_db('cdb.differential', 'r'),
	'SELECT * FROM changeset WHERE changeset.diffID IN (%Ld)',
	$load_ids);

	$raw_objects = array_group($raw_objects, 'diffID');
	$objects = $raw_objects[$diff->getID()];

	if (!$objects) {
	$changesets = array();
	} else {
	$changesets = id(new DifferentialChangeset())->loadAllFromArray($objects);
	}



	$feedback = id(new DifferentialFeedback())->loadAllWithRevision($revision);
	$feedback = array_merge($implied_feedback, $feedback);

	$inline_comments = $this->loadInlineComments($feedback, $changesets);

	$diff_map = array();
	$diffs = array_psort($diffs, 'getID');
	foreach ($diffs as $diff) {
	$diff_map[$diff->getID()] = count($diff_map) + 1;
	}
	$visible_changesets = array_fill_keys($visible_changesets, true);
	$hidden_changesets = array();
	foreach ($changesets as $changeset) {
	$id = $changeset->getID();
	if (isset($visible_changesets[$id])) {
	continue;
	}
	$hidden_changesets[$id] = $diff_map[$changeset->getDiffID()];
	}


	$engine = new RemarkupEngine();
	$engine->enableFeature(RemarkupEngine::FEATURE_GUESS_IMAGES);
	$engine->enableFeature(RemarkupEngine::FEATURE_YOUTUBE);
	$engine->setCurrentSandcastle($this->getSandcastleURI($target_diff));

	$syntax_link =
	<a href={'http://www.intern.facebook.com/intern/wiki/index.php' .
	'/Articles/Remarkup_Syntax_Reference'}
	target="_blank"
	tabindex="4">Remarkup Reference</a>;


	$notice = null;
	if ($this->getRequest()->getBool('diff_changed')) {
	$notice =
	<tools:notice title="Revision Updated Recently">
	This revision was updated with a <strong>new diff</strong> while you
	were providing feedback. Your inline comments appear on the
	<strong>old diff</strong>.
	</tools:notice>;
	}

	$engineering_repository_id = RepositoryRef::getByCallsign('E')->getID();
	$svn_revision = $revision->getSVNRevision();
	if ($status == DifferentialConstants::COMMITTED &&
	$svn_revision &&
	$revision->getRepositoryID() == $engineering_repository_id) {
	$href = '/intern/push/request.php?rev='.$svn_revision;
	$href = RedirectURI($href)->setTier('intern');
	$links[] = array(
	'merge',
	<a href={$href} id="ask_for_merge_link">Ask for Merge</a>,
	);
	}

	}


	protected function renderDiffPropertyMoreLink(Diff $diff, $name) {
	$target = <div class="star-more"
	style="display: none;">
	<div class="star-loading">Loading...</div>
	</div>;
	$meta = array(
	'target' => $target->requireUniqueID(),
	'uri' => '/differential/diffprop/'.$diff->getID().'/'.$name.'/',
	);
	$more =
	<span sigil="star-link-container">
	·
	<a mustcapture="true"
	sigil="star-more"
	href="#"
	meta={$meta}>Show Details</a>
	</span>;
	return <x:frag>{$more}{$target}</x:frag>;
	}



	protected function getRevisionStatusDisplay(DifferentialRevision $revision) {
	$viewer_id = $this->getRequest()->getViewerContext()->getUserID();
	$viewer_is_owner = ($viewer_id == $revision->getOwnerID());
	$status = $revision->getStatus();

	$more = null;
	switch ($status) {
	case DifferentialConstants::NEEDS_REVIEW:
	$message = 'Pending Review';
	break;
	case DifferentialConstants::NEEDS_REVISION:
	$message = 'Awaiting Revision';
	if ($viewer_is_owner) {
	$more = 'Make the requested changes and update the revision.';
	}
	break;
	case DifferentialConstants::ACCEPTED:
	$message = 'Ready for Commit';
	if ($viewer_is_owner) {
	$more =
	<x:frag>
	Run <tt>arc commit</tt> (svn) or <tt>arc amend</tt> (git) to
	proceed.
	</x:frag>;
	}
	break;
	case DifferentialConstants::COMMITTED:
	$message = 'Committed';
	$ref = $revision->getRevisionRef();
	$more = $ref
	? (<a href={URI($ref->getDetailURL())}>
	{$ref->getName()}
	</a>)
	: null;

	$engineering_repository_id = RepositoryRef::getByCallsign('E')->getID();
	if ($revision->getSVNRevision() &&
	$revision->getRepositoryID() == $engineering_repository_id) {
	Javelin::initBehavior(
	'differential-revtracker-status',
	array(
	'uri' => '/differential/revtracker/'.$revision->getID().'/',
	'statusId' => 'revtracker_status',
	'mergeLinkId' => 'ask_for_merge_link',
	));
	}
	break;
	case DifferentialConstants::ABANDONED:
	$message = 'Abandoned';
	break;
	default:
	throw new Exception("Unknown revision status.");
	}

	if ($more) {
	$message =
	<x:frag>
	<strong id="revtracker_status">{$message}</strong>
	· {$more}
	</x:frag>;
	} else {
	$message = <strong id="revtracker_status">{$message}</strong>;
	}

	return $message;
	}

	}
	protected function getDetailFields(
	DifferentialRevision $revision,
	Diff $diff,
	array $handles) {

	$sandcastle = $this->getSandcastleURI($diff);
	if ($sandcastle) {
	$fields['Sandcastle'] = <a href={$sandcastle}>{$sandcastle}</a>;
	}


	$blame_rev = $revision->getSvnBlameRevision();
	if ($blame_rev) {
	if ($revision->getRepositoryRef() && is_numeric($blame_rev)) {
	$ref = new RevisionRef($revision->getRepositoryRef(), $blame_rev);
	$fields['Blame Revision'] =
	<a href={URI($ref->getDetailURL())}>
	{$ref->getName()}
	</a>;
	} else {
	$fields['Blame Revision'] = $blame_rev;
	}
	}


	$bugzilla_id = $revision->getBugzillaID();
	if ($bugzilla_id) {
	$href = 'http://bugs.developers.facebook.com/show_bug.cgi?id='.
	$bugzilla_id;
	$fields['Bugzilla'] = <a href={$href}>{'#'.$bugzilla_id}</a>;
	}

	$fields['Apply Patch'] = <tt>arc patch --revision {$revision->getID()}</tt>;

	if ($diff->getParentRevisionID()) {
	$parent = id(new DifferentialRevision())->load(
	$diff->getParentRevisionID());
	if ($parent) {
	$fields['Depends On'] =
	<a href={$parent->getURI()}>
	D{$parent->getID()}: {$parent->getName()}
	</a>;
	}
	}

	Javelin::initBehavior('differential-star-more');
	if ($unit_details) {
	$fields['Unit Tests'] =
	<x:frag>
	{$fields['Unit Tests']}
	{$this->renderDiffPropertyMoreLink($diff, 'unit')}
	</x:frag>;
	}

	$platform_impact = $revision->getPlatformImpact();
	if ($platform_impact) {
	$fields['Platform Impact'] =
	<text linebreaks="true">{$platform_impact}</text>;
	}

	return $fields;
	}


	*/
	diff --git a/src/applications/differential/editor/comment/DifferentialCommentEditor.php b/src/applications/differential/editor/comment/DifferentialCommentEditor.php
	index 4f7baa813d..51281885e4 100644
	--- a/src/applications/differential/editor/comment/DifferentialCommentEditor.php
	+++ b/src/applications/differential/editor/comment/DifferentialCommentEditor.php
	@@ -1,322 +1,338 @@
	<?php

	/*
	* Copyright 2011 Facebook, Inc.
	*
	* Licensed under the Apache License, Version 2.0 (the "License");
	* you may not use this file except in compliance with the License.
	* You may obtain a copy of the License at
	*
	* http://www.apache.org/licenses/LICENSE-2.0
	*
	* Unless required by applicable law or agreed to in writing, software
	* distributed under the License is distributed on an "AS IS" BASIS,
	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
	* See the License for the specific language governing permissions and
	* limitations under the License.
	*/

	class DifferentialCommentEditor {

	protected $revision;
	protected $actorPHID;
	protected $action;

	protected $attachInlineComments;
	protected $message;
	protected $addCC;
	protected $changedByCommit;
	protected $addedReviewers = array();

	public function __construct(
	DifferentialRevision $revision,
	$actor_phid,
	$action) {

	$this->revision = $revision;
	$this->actorPHID = $actor_phid;
	$this->action = $action;
	}

	public function setMessage($message) {
	$this->message = $message;
	return $this;
	}

	public function setAttachInlineComments($attach) {
	$this->attachInlineComments = $attach;
	return $this;
	}

	public function setAddCC($add) {
	$this->addCC = $add;
	return $this;
	}

	public function setChangedByCommit($changed_by_commit) {
	$this->changedByCommit = $changed_by_commit;
	return $this;
	}

	public function getChangedByCommit() {
	return $this->changedByCommit;
	}

	public function setAddedReviewers($added_reviewers) {
	$this->addedReviewers = $added_reviewers;
	return $this;
	}

	public function getAddedReviewers() {
	return $this->addedReviewers;
	}

	public function save() {
	$revision = $this->revision;
	$action = $this->action;
	$actor_phid = $this->actorPHID;
	$actor_is_author = ($actor_phid == $revision->getAuthorPHID());
	$revision_status = $revision->getStatus();

	$revision->loadRelationships();
	$reviewer_phids = $revision->getReviewers();
	if ($reviewer_phids) {
	$reviewer_phids = array_combine($reviewer_phids, $reviewer_phids);
	}

	switch ($action) {
	case DifferentialAction::ACTION_COMMENT:
	break;

	case DifferentialAction::ACTION_RESIGN:
	if ($actor_is_author) {
	throw new Exception('You can not resign from your own revision!');
	}
	if (isset($reviewer_phids[$actor_phid])) {
	DifferentialRevisionEditor::alterReviewers(
	$revision,
	$reviewer_phids,
	$rem = array($actor_phid),
	$add = array(),
	$actor_phid);
	}
	break;

	case DifferentialAction::ACTION_ABANDON:
	if (!$actor_is_author) {
	throw new Exception('You can only abandon your revisions.');
	}
	if ($revision_status == DifferentialRevisionStatus::COMMITTED) {
	throw new Exception('You can not abandon a committed revision.');
	}
	if ($revision_status == DifferentialRevisionStatus::ABANDONED) {
	$action = DifferentialAction::ACTION_COMMENT;
	break;
	}

	$revision
	->setStatus(DifferentialRevisionStatus::ABANDONED)
	->save();
	break;

	case DifferentialAction::ACTION_ACCEPT:
	if ($actor_is_author) {
	throw new Exception('You can not accept your own revision.');
	}
	if (($revision_status != DifferentialRevisionStatus::NEEDS_REVIEW) &&
	($revision_status != DifferentialRevisionStatus::NEEDS_REVISION)) {
	$action = DifferentialAction::ACTION_COMMENT;
	break;
	}

	$revision
	->setStatus(DifferentialRevisionStatus::ACCEPTED)
	->save();

	if (!isset($reviewer_phids[$actor_phid])) {
	DifferentialRevisionEditor::alterReviewers(
	$revision,
	$reviewer_phids,
	$rem = array(),
	$add = array($actor_phid),
	$actor_phid);
	}
	break;

	case DifferentialAction::ACTION_REQUEST:
	if (!$actor_is_author) {
	throw new Exception('You must own a revision to request review.');
	}
	if (($revision_status != DifferentialRevisionStatus::NEEDS_REVISION) &&
	($revision_status != DifferentialRevisionStatus::ACCEPTED)) {
	$action = DifferentialAction::ACTION_COMMENT;
	break;
	}

	$revision
	->setStatus(DifferentialRevisionStatus::NEEDS_REVIEW)
	->save();
	break;

	case DifferentialAction::ACTION_REJECT:
	if ($actor_is_author) {
	throw new Exception(
	'You can not request changes to your own revision.');
	}
	if (($revision_status != DifferentialRevisionStatus::NEEDS_REVIEW) &&
	($revision_status != DifferentialRevisionStatus::ACCEPTED)) {
	$action = DifferentialAction::ACTION_COMMENT;
	break;
	}

	if (!isset($reviewer_phids[$actor_phid])) {
	DifferentialRevisionEditor::alterReviewers(
	$revision,
	$reviewer_phids,
	$rem = array(),
	$add = array($actor_phid),
	$actor_phid);
	}

	$revision
	->setStatus(DifferentialRevisionStatus::NEEDS_REVISION)
	->save();
	break;

	+ case DifferentialAction::ACTION_RETHINK:
	+ if (!$actor_is_author) {
	+ throw new Exception(
	+ "You can not plan changes to somebody else's revision");
	+ }
	+ if (($revision_status != DifferentialRevisionStatus::NEEDS_REVIEW) &&
	+ ($revision_status != DifferentialRevisionStatus::ACCEPTED)) {
	+ $action = DifferentialAction::ACTION_COMMENT;
	+ break;
	+ }
	+
	+ $revision
	+ ->setStatus(DifferentialRevisionStatus::NEEDS_REVISION)
	+ ->save();
	+ break;
	+
	case DifferentialAction::ACTION_RECLAIM:
	if (!$actor_is_author) {
	throw new Exception('You can not reclaim a revision you do not own.');
	}
	if ($revision_status != DifferentialRevisionStatus::ABANDONED) {
	$action = DifferentialAction::ACTION_COMMENT;
	break;
	}
	$revision
	->setStatus(DifferentialRevisionStatus::NEEDS_REVIEW)
	->save();
	break;

	case DifferentialAction::ACTION_COMMIT:
	if (!$actor_is_author) {
	throw new Exception('You can not commit a revision you do not own.');
	}
	$revision
	->setStatus(DifferentialRevisionStatus::COMMITTED)
	->save();
	break;

	case DifferentialAction::ACTION_ADDREVIEWERS:
	$added_reviewers = $this->getAddedReviewers();
	foreach ($added_reviewers as $k => $user_phid) {
	if ($user_phid == $revision->getAuthorPHID()) {
	unset($added_reviewers[$k]);
	}
	if (!empty($reviewer_phids[$user_phid])) {
	unset($added_reviewers[$k]);
	}
	}

	$added_reviewers = array_unique($added_reviewers);

	if ($added_reviewers) {
	DifferentialRevisionEditor::alterReviewers(
	$revision,
	$reviewer_phids,
	$rem = array(),
	$add = $added_reviewers,
	$actor_phid);

	$handles = id(new PhabricatorObjectHandleData($added_reviewers))
	->loadHandles();
	$usernames = mpull($handles, 'getName');

	$this->message =
	'Added reviewers: '.implode(', ', $usernames)."\n\n".
	$this->message;

	} else {
	$action = DifferentialAction::ACTION_COMMENT;
	}
	break;

	default:
	throw new Exception('Unsupported action.');
	}

	if ($this->addCC) {
	DifferentialRevisionEditor::addCC(
	$revision,
	$this->actorPHID,
	$this->actorPHID);
	}

	// Reload relationships to pick up any reviewer/CC changes.
	$revision->loadRelationships();

	$inline_comments = array();
	if ($this->attachInlineComments) {
	$inline_comments = id(new DifferentialInlineComment())->loadAllWhere(
	'authorPHID = %s AND revisionID = %d AND commentID IS NULL',
	$this->actorPHID,
	$revision->getID());
	}

	$comment = id(new DifferentialComment())
	->setAuthorPHID($this->actorPHID)
	->setRevisionID($revision->getID())
	->setAction($action)
	->setContent((string)$this->message)
	->save();

	$changesets = array();
	if ($inline_comments) {
	$load_ids = mpull($inline_comments, 'getChangesetID');
	if ($load_ids) {
	$load_ids = array_unique($load_ids);
	$changesets = id(new DifferentialChangeset())->loadAllWhere(
	'id in (%Ld)',
	$load_ids);
	}
	foreach ($inline_comments as $inline) {
	$inline->setCommentID($comment->getID());
	$inline->save();
	}
	}

	$phids = array($this->actorPHID);
	$handles = id(new PhabricatorObjectHandleData($phids))
	->loadHandles();
	$actor_handle = $handles[$this->actorPHID];

	id(new DifferentialCommentMail(
	$revision,
	$actor_handle,
	$comment,
	$changesets,
	$inline_comments))
	->setToPHIDs(
	array_merge(
	$revision->getReviewers(),
	array($revision->getAuthorPHID())))
	->setCCPHIDs($revision->getCCPHIDs())
	->setChangedByCommit($this->getChangedByCommit())
	->send();

	/*

	TODO

	$event = array(
	'revision_id' => $revision->getID(),
	'fbid' => $revision->getFBID(),
	'feedback_id' => $feedback->getID(),
	'action' => $feedback->getAction(),
	'actor' => $this->actorPHID,
	);
	id(new ToolsTimelineEvent('difx', fb_json_encode($event)))->record();
	*/

	return $comment;
	}

	}
	diff --git a/webroot/rsrc/css/application/differential/revision-comment.css b/webroot/rsrc/css/application/differential/revision-comment.css
	index 488249700f..fb8b5f169e 100644
	--- a/webroot/rsrc/css/application/differential/revision-comment.css
	+++ b/webroot/rsrc/css/application/differential/revision-comment.css
	@@ -1,147 +1,152 @@
	/**
	* @provides differential-revision-comment-css
	*/


	.differential-comment-date {
	color: #666666;
	float: right;
	font-size: 11px;
	margin: 0em;
	padding-top: 6px;
	}

	.differential-comment-title {
	font-weight: bold;
	height: 16px;
	margin: 4px 0em 0em 0em;
	padding: 4px 0em;
	position: relative;
	}

	.differential-comment-body {
	min-height: 56px;
	padding-left: 62px;
	background-repeat: no-repeat;
	background-position: 6px 0px;
	margin-bottom: 14px;
	}

	.differential-comment-content {
	background: #fbfbfb;
	border-color: #c3c3c3;
	border-style: solid;
	border-width: 1px 10px 1px 10px;
	clear: both;
	line-height: 1.4em;
	margin: 0em;
	padding: .3em 5px .4em 1.25em;
	}

	.differential-comment-content {
	overflow: hidden;
	}

	.differential-comment-content .phabricator-remarkup code,
	.differential-comment-core .phabricator-remarkup code {
	width: 88ex;
	width: 81ch;
	}

	.differential-comment-nocontent {
	font-weight: bold;
	}

	.differential-comment-action-testplan .differential-comment-content {
	border-color: #660099;
	background: #f6f3ff;
	}

	.differential-comment-action-abandon .differential-comment-content {
	border-color: #222222;
	background: #f3f3f3;
	}

	.differential-comment-action-accept .differential-comment-content {
	border-color: #009966;
	background: #f3fff3;
	}

	.differential-comment-action-reject .differential-comment-content {
	border-color: #aa0000;
	background: #fff3f3;
	}

	+.differential-comment-action-rethink .differential-comment-content {
	+ border-color: #aa0000;
	+ background: #fff3f3;
	+}
	+
	.differential-comment-action-commit .differential-comment-content {
	border-color: #006699;
	background: #f3f3ff;
	}


	.differential-comment-action-reclaim .differential-comment-content {
	border-color: #0099aa;
	background: #f3fff9;
	}

	.differential-comment-action-update .differential-comment-content {
	border-color: #6699cc;
	background: #f3f9ff;
	}

	.differential-comment-action-add_reviewers .differential-comment-content {
	border-color: #aa99cc;
	background: #f9f3ff;
	}

	.differential-comment-action-request_review .differential-comment-content {
	border-color: #cc9966;
	background: #fff9f3;
	}

	.differential-inline-summary th,
	.differential-inline-summary td {
	vertical-align: top;
	padding: 0 0 6px;
	}

	.differential-inline-summary th {
	padding-top: 16px;
	color: #666666;
	font-weight: bold;
	}

	.differential-inline-summary tr > th:first-child {
	padding-top: 2px;
	}


	.differential-inline-summary td.inline-line-number {
	color: #444444;
	white-space: nowrap;
	text-align: left;
	font-weight: bold;
	padding: 0 4px;
	width: 90px;
	}

	.differential-inline-summary td.inline-line-number .num {
	display: block;
	position: relative;
	padding-left: 15px;
	padding-right: 5px;
	width: 70px; /* Need lots of width for 23,950-23,951 */
	}

	.differential-inline-summary td.inline-line-number a:hover {
	background: #3b5998;
	color: white;
	text-decoration: none;
	}


	.differential-inline-summary-section {
	margin: 1em 0 .5em;
	font-size: 11px;
	border-bottom: 1px solid #dddddd;
	color: #666666;
	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jan 19, 18:21 (1 w, 4 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1127391
Default Alt Text: (45 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions