No OneTemporary
Actions

Size

66 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/config/check/PhabricatorSetupCheckExtraConfig.php b/src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
	index ed76ab1997..0cb174e888 100644
	--- a/src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
	+++ b/src/applications/config/check/PhabricatorSetupCheckExtraConfig.php
	@@ -1,171 +1,174 @@
	<?php

	final class PhabricatorSetupCheckExtraConfig extends PhabricatorSetupCheck {

	protected function executeChecks() {
	$ancient_config = self::getAncientConfig();

	$all_keys = PhabricatorEnv::getAllConfigKeys();
	$all_keys = array_keys($all_keys);
	sort($all_keys);

	$defined_keys = PhabricatorApplicationConfigOptions::loadAllOptions();

	foreach ($all_keys as $key) {
	if (isset($defined_keys[$key])) {
	continue;
	}

	if (isset($ancient_config[$key])) {
	$summary = pht(
	'This option has been removed. You may delete it at your '.
	'convenience.');
	$message = pht(
	"The configuration option '%s' has been removed. You may delete ".
	"it at your convenience.".
	"\n\n%s",
	$key,
	$ancient_config[$key]);
	$short = pht('Obsolete Config');
	$name = pht('Obsolete Configuration Option "%s"', $key);
	} else {
	$summary = pht("This option is not recognized. It may be misspelled.");
	$message = pht(
	"The configuration option '%s' is not recognized. It may be ".
	"misspelled, or it might have existed in an older version of ".
	"Phabricator. It has no effect, and should be corrected or deleted.",
	$key);
	$short = pht('Unknown Config');
	$name = pht('Unknown Configuration Option "%s"', $key);
	}

	$issue = $this->newIssue('config.unknown.'.$key)
	->setShortName($short)
	->setName($name)
	->setSummary($summary);

	$stack = PhabricatorEnv::getConfigSourceStack();
	$stack = $stack->getStack();

	$found = array();
	$found_local = false;
	$found_database = false;

	foreach ($stack as $source_key => $source) {
	$value = $source->getKeys(array($key));
	if ($value) {
	$found[] = $source->getName();
	if ($source instanceof PhabricatorConfigDatabaseSource) {
	$found_database = true;
	}
	if ($source instanceof PhabricatorConfigLocalSource) {
	$found_local = true;
	}
	}
	}

	$message = $message."\n\n".pht(
	"This configuration value is defined in these %d ".
	"configuration source(s): %s.",
	count($found),
	implode(', ', $found));
	$issue->setMessage($message);

	if ($found_local) {
	$command = csprintf('phabricator/ $ ./bin/config delete %s', $key);
	$issue->addCommand($command);
	}

	if ($found_database) {
	$issue->addPhabricatorConfig($key);
	}
	}
	}

	/**
	* Return a map of deleted config options. Keys are option keys; values are
	* explanations of what happened to the option.
	*/
	public static function getAncientConfig() {
	$reason_auth = pht(
	'This option has been migrated to the "Auth" application. Your old '.
	'configuration is still in effect, but now stored in "Auth" instead of '.
	'configuration. Going forward, you can manage authentication from '.
	'the web UI.');

	$auth_config = array(
	'controller.oauth-registration',
	'auth.password-auth-enabled',
	'facebook.auth-enabled',
	'facebook.registration-enabled',
	'facebook.auth-permanent',
	'facebook.application-id',
	'facebook.application-secret',
	'facebook.require-https-auth',
	'github.auth-enabled',
	'github.registration-enabled',
	'github.auth-permanent',
	'github.application-id',
	'github.application-secret',
	'google.auth-enabled',
	'google.registration-enabled',
	'google.auth-permanent',
	'google.application-id',
	'google.application-secret',
	'ldap.auth-enabled',
	'ldap.hostname',
	'ldap.port',
	'ldap.base_dn',
	'ldap.search_attribute',
	'ldap.search-first',
	'ldap.username-attribute',
	'ldap.real_name_attributes',
	'ldap.activedirectory_domain',
	'ldap.version',
	'ldap.referrals',
	'ldap.anonymous-user-name',
	'ldap.anonymous-user-password',
	'ldap.start-tls',
	'disqus.auth-enabled',
	'disqus.registration-enabled',
	'disqus.auth-permanent',
	'disqus.application-id',
	'disqus.application-secret',
	'phabricator.oauth-uri',
	'phabricator.auth-enabled',
	'phabricator.registration-enabled',
	'phabricator.auth-permanent',
	'phabricator.application-id',
	'phabricator.application-secret',
	);

	$ancient_config = array_fill_keys($auth_config, $reason_auth);

	$markup_reason = pht(
	'Custom remarkup rules are now added by subclassing '.
	'PhabricatorRemarkupCustomInlineRule or '.
	'PhabricatorRemarkupCustomBlockRule.');

	$ancient_config += array(
	'phid.external-loaders' =>
	pht(
	'External loaders have been replaced. Extend `PhabricatorPHIDType` '.
	'to implement new PHID and handle types.'),
	'maniphest.custom-task-extensions-class' =>
	pht(
	'Maniphest fields are now loaded automatically. You can configure '.
	'them with `maniphest.fields`.'),
	'maniphest.custom-fields' =>
	pht(
	'Maniphest fields are now defined in '.
	'`maniphest.custom-field-definitions`. Existing definitions have '.
	'been migrated.'),
	'differential.custom-remarkup-rules' => $markup_reason,
	'differential.custom-remarkup-block-rules' => $markup_reason,
	'auth.sshkeys.enabled' => pht(
	'SSH keys are now actually useful, so they are always enabled.'),
	+ 'differential.anonymous-access' => pht(
	+ 'Phabricator now has meaningful global access controls. See '.
	+ '`policy.allow-public`.'),
	);

	return $ancient_config;
	}
	}
	diff --git a/src/applications/differential/conduit/ConduitAPI_differential_getdiff_Method.php b/src/applications/differential/conduit/ConduitAPI_differential_getdiff_Method.php
	index 2c864a43ab..dd5d6e495f 100644
	--- a/src/applications/differential/conduit/ConduitAPI_differential_getdiff_Method.php
	+++ b/src/applications/differential/conduit/ConduitAPI_differential_getdiff_Method.php
	@@ -1,80 +1,80 @@
	<?php

	/**
	* @group conduit
	*/
	final class ConduitAPI_differential_getdiff_Method
	extends ConduitAPIMethod {

	+ public function shouldAllowPublic() {
	+ return true;
	+ }
	+
	public function getMethodStatus() {
	return self::METHOD_STATUS_DEPRECATED;
	}

	public function getMethodStatusDescription() {
	return pht(
	'This method has been deprecated in favor of differential.querydiffs.');
	}


	public function getMethodDescription() {
	return pht('Load the content of a diff from Differential by revision id '.
	'or diff id.');
	}

	public function defineParamTypes() {
	return array(
	'revision_id' => 'optional id',
	'diff_id' => 'optional id',
	);
	}

	public function defineReturnType() {
	return 'nonempty dict';
	}

	public function defineErrorTypes() {
	return array(
	'ERR_BAD_DIFF' => 'No such diff exists.',
	);
	}

	- public function shouldRequireAuthentication() {
	- return !PhabricatorEnv::getEnvConfig('differential.anonymous-access');
	- }
	-
	protected function execute(ConduitAPIRequest $request) {
	$diff_id = $request->getValue('diff_id');

	// If we have a revision ID, we need the most recent diff. Figure that out
	// without loading all the attached data.
	$revision_id = $request->getValue('revision_id');
	if ($revision_id) {
	$diffs = id(new DifferentialDiffQuery())
	->setViewer($request->getUser())
	->withRevisionIDs(array($revision_id))
	->execute();
	if ($diffs) {
	$diff_id = head($diffs)->getID();
	} else {
	throw new ConduitException('ERR_BAD_DIFF');
	}
	}

	$diff = null;
	if ($diff_id) {
	$diff = id(new DifferentialDiffQuery())
	->setViewer($request->getUser())
	->withIDs(array($diff_id))
	->needChangesets(true)
	->needArcanistProjects(true)
	->executeOne();
	}

	if (!$diff) {
	throw new ConduitException('ERR_BAD_DIFF');
	}

	return $diff->getDiffDict();
	}

	}
	diff --git a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
	index 6f86a907c3..0066d40271 100644
	--- a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
	+++ b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
	@@ -1,248 +1,236 @@
	<?php

	final class PhabricatorDifferentialConfigOptions
	extends PhabricatorApplicationConfigOptions {

	public function getName() {
	return pht('Differential');
	}

	public function getDescription() {
	return pht('Configure Differential code review.');
	}

	public function getOptions() {
	return array(
	$this->newOption(
	'differential.revision-custom-detail-renderer',
	'class',
	null)
	->setBaseClass('DifferentialRevisionDetailRenderer')
	->setDescription(pht("Custom revision detail renderer.")),
	$this->newOption(
	'differential.whitespace-matters',
	'list<regex>',
	array(
	'/\.py$/',
	'/\.l?hs$/',
	))
	->setDescription(
	pht(
	"List of file regexps where whitespace is meaningful and should ".
	"not use 'ignore-all' by default")),
	$this->newOption(
	'differential.field-selector',
	'class',
	'DifferentialDefaultFieldSelector')
	->setBaseClass('DifferentialFieldSelector')
	->setDescription(pht('Field selector class')),
	$this->newOption('differential.show-host-field', 'bool', false)
	->setBoolOptions(
	array(
	pht('Show "Host" Fields'),
	pht('Hide "Host" Fields'),
	))
	->setSummary(pht('Show or hide the "Host" and "Path" fields.'))
	->setDescription(
	pht(
	'Differential can show "Host" and "Path" fields on revisions, '.
	'with information about the machine and working directory where '.
	'the change came from. These fields are disabled by default '.
	'because they may occasionally have sensitive information, but '.
	'they can be useful if you work in an environment with shared '.
	'development machines. You can set this option to true to enable '.
	'these fields.')),
	$this->newOption('differential.show-test-plan-field', 'bool', true)
	->setBoolOptions(
	array(
	pht('Show "Test Plan" Field'),
	pht('Hide "Test Plan" Field'),
	))
	->setSummary(pht('Show or hide the "Test Plan" field.'))
	->setDescription(
	pht(
	'Differential has a required "Test Plan" field by default, which '.
	'requires authors to fill out information about how they verified '.
	'the correctness of their changes when they send code for review. '.
	'If you would prefer not to use this field, you can disable it '.
	'here. You can also make it optional (instead of required) by '.
	'setting {{differential.require-test-plan-field}}.')),
	$this->newOption('differential.require-test-plan-field', 'bool', true)
	->setBoolOptions(
	array(
	pht("Require 'Test Plan' field"),
	pht("Make 'Test Plan' field optional"),
	))
	->setSummary(pht('Require "Test Plan" field?'))
	->setDescription(
	pht(
	"Differential has a required 'Test Plan' field by default. You ".
	"can make it optional by setting this to false. You can also ".
	"completely remove it above, if you prefer.")),
	$this->newOption('differential.enable-email-accept', 'bool', false)
	->setBoolOptions(
	array(
	pht('Enable Email "!accept" Action'),
	pht('Disable Email "!accept" Action'),
	))
	->setSummary(pht('Enable or disable "!accept" action via email.'))
	->setDescription(
	pht(
	'If inbound email is configured, users can interact with '.
	'revisions by using "!actions" in email replies (for example, '.
	'"!resign" or "!rethink"). However, by default, users may not '.
	'"!accept" revisions via email: email authentication can be '.
	'configured to be very weak, and email "!accept" is kind of '.
	'sketchy and implies the revision may not actually be receiving '.
	'thorough review. You can enable "!accept" by setting this '.
	'option to true.')),
	- $this->newOption('differential.anonymous-access', 'bool', false)
	- ->setBoolOptions(
	- array(
	- pht('Allow guests to view revisions'),
	- pht('Require authentication to view revisions'),
	- ))
	- ->setSummary(pht('Anonymous access to Differential revisions.'))
	- ->setDescription(
	- pht(
	- "If you set this to true, users won't need to login to view ".
	- "Differential revisions. Anonymous users will have read-only ".
	- "access and won't be able to interact with the revisions.")),
	$this->newOption('differential.generated-paths', 'list<regex>', array())
	->setSummary(pht("File regexps to treat as automatically generated."))
	->setDescription(
	pht(
	"List of file regexps that should be treated as if they are ".
	"generated by an automatic process, and thus get hidden by ".
	"default in differential."))
	->addExample("/config\.h$/\n#/autobuilt/#", pht("Valid Setting")),
	$this->newOption('differential.allow-self-accept', 'bool', false)
	->setBoolOptions(
	array(
	pht("Allow self-accept"),
	pht("Disallow self-accept"),
	))
	->setSummary(pht("Allows users to accept their own revisions."))
	->setDescription(
	pht(
	"If you set this to true, users can accept their own revisions. ".
	"This action is disabled by default because it's most likely not ".
	"a behavior you want, but it proves useful if you are working ".
	"alone on a project and want to make use of all of ".
	"differential's features.")),
	$this->newOption('differential.always-allow-close', 'bool', false)
	->setBoolOptions(
	array(
	pht("Allow any user"),
	pht("Restrict to submitter"),
	))
	->setSummary(pht("Allows any user to close accepted revisions."))
	->setDescription(
	pht(
	"If you set this to true, any user can close any revision so ".
	"long as it has been accepted. This can be useful depending on ".
	"your development model. For example, github-style pull requests ".
	"where the reviewer is often the actual committer can benefit ".
	"from turning this option to true. If false, only the submitter ".
	"can close a revision.")),
	$this->newOption('differential.allow-reopen', 'bool', false)
	->setBoolOptions(
	array(
	pht("Enable reopen"),
	pht("Disable reopen"),
	))
	->setSummary(pht("Allows any user to reopen a closed revision."))
	->setDescription(
	pht("If you set this to true, any user can reopen a revision so ".
	"long as it has been closed. This can be useful if a revision ".
	"is accidentally closed or if a developer changes his or her ".
	"mind after closing a revision. If it is false, reopening ".
	"is not allowed.")),
	$this->newOption('differential.days-fresh', 'int', 1)
	->setSummary(
	pht(
	"For how many business days should a revision be considered ".
	"'fresh'?"))
	->setDescription(
	pht(
	"Revisions newer than this number of days are marked as fresh in ".
	"Action Required and Revisions Waiting on You views. Only work ".
	"days (not weekends and holidays) are included. Set to 0 to ".
	"disable this feature.")),
	$this->newOption('differential.days-stale', 'int', 3)
	->setSummary(
	pht("After this many days, a revision will be considered 'stale'."))
	->setDescription(
	pht(
	"Similar to `differential.days-fresh` but marks stale revisions. ".
	"If the revision is even older than it is when marked as 'old'.")),
	$this->newOption(
	'metamta.differential.reply-handler-domain',
	'string',
	null)
	->setDescription(
	pht('Inbound email domain for Differential replies.')),
	$this->newOption(
	'metamta.differential.reply-handler',
	'class',
	'DifferentialReplyHandler')
	->setBaseClass('PhabricatorMailReplyHandler')
	->setDescription(pht('Alternate reply handler class.')),
	$this->newOption(
	'metamta.differential.subject-prefix',
	'string',
	'[Differential]')
	->setDescription(pht('Subject prefix for Differential mail.')),
	$this->newOption(
	'metamta.differential.attach-patches',
	'bool',
	false)
	->setBoolOptions(
	array(
	pht("Attach Patches"),
	pht("Do Not Attach Patches"),
	))
	->setSummary(pht("Attach patches to email, as text attachments."))
	->setDescription(
	pht(
	"If you set this to true, Phabricator will attach patches to ".
	"Differential mail (as text attachments). This will not work if ".
	"you are using SendGrid as your mail adapter.")),
	$this->newOption(
	'metamta.differential.inline-patches',
	'int',
	0)
	->setSummary(pht("Inline patches in email, as body text."))
	->setDescription(
	pht(
	"To include patches inline in email bodies, set this to a ".
	"positive integer. Patches will be inlined if they are at most ".
	"that many lines. For instance, a value of 100 means 'inline ".
	"patches if they are no longer than 100 lines'. By default, ".
	"patches are not inlined.")),
	// TODO: Implement 'enum'? Options are 'unified' or 'git'.
	$this->newOption(
	'metamta.differential.patch-format',
	'string',
	'unified')
	->setDescription(
	pht("Format for inlined or attached patches: 'git' or 'unified'.")),
	$this->newOption(
	'metamta.differential.unified-comment-context',
	'bool',
	false)
	->setBoolOptions(
	array(
	pht("Show context"),
	pht("Do not show context"),
	))
	->setSummary(pht("Show diff context around inline comments in email."))
	->setDescription(
	pht(
	"Normally, inline comments in emails are shown with a file and ".
	"line but without any diff context. Enabling this option adds ".
	"diff context.")),
	);
	}

	}
	diff --git a/src/applications/differential/controller/DifferentialChangesetViewController.php b/src/applications/differential/controller/DifferentialChangesetViewController.php
	index a99ad41268..b952c7dee4 100644
	--- a/src/applications/differential/controller/DifferentialChangesetViewController.php
	+++ b/src/applications/differential/controller/DifferentialChangesetViewController.php
	@@ -1,380 +1,372 @@
	<?php

	final class DifferentialChangesetViewController extends DifferentialController {

	- public function shouldRequireLogin() {
	- if ($this->allowsAnonymousAccess()) {
	- return false;
	- }
	-
	- return parent::shouldRequireLogin();
	- }
	-
	public function shouldAllowPublic() {
	return true;
	}

	public function processRequest() {
	$request = $this->getRequest();

	$author_phid = $request->getUser()->getPHID();

	$rendering_reference = $request->getStr('ref');
	$parts = explode('/', $rendering_reference);
	if (count($parts) == 2) {
	list($id, $vs) = $parts;
	} else {
	$id = $parts[0];
	$vs = 0;
	}

	$id = (int)$id;
	$vs = (int)$vs;

	$changeset = id(new DifferentialChangeset())->load($id);
	if (!$changeset) {
	return new Aphront404Response();
	}

	// TODO: (T603) Make Changeset policy-aware. For now, just fake it
	// by making sure we can see the diff.
	$diff = id(new DifferentialDiffQuery())
	->setViewer($request->getUser())
	->withIDs(array($changeset->getDiffID()))
	->executeOne();
	if (!$diff) {
	return new Aphront404Response();
	}


	$view = $request->getStr('view');
	if ($view) {
	$changeset->attachHunks($changeset->loadHunks());
	$phid = idx($changeset->getMetadata(), "$view:binary-phid");
	if ($phid) {
	return id(new AphrontRedirectResponse())->setURI("/file/info/$phid/");
	}
	switch ($view) {
	case 'new':
	return $this->buildRawFileResponse($changeset, $is_new = true);
	case 'old':
	if ($vs && ($vs != -1)) {
	$vs_changeset = id(new DifferentialChangeset())->load($vs);
	if ($vs_changeset) {
	$vs_changeset->attachHunks($vs_changeset->loadHunks());
	return $this->buildRawFileResponse($vs_changeset, $is_new = true);
	}
	}
	return $this->buildRawFileResponse($changeset, $is_new = false);
	default:
	return new Aphront400Response();
	}
	}

	if ($vs && ($vs != -1)) {
	$vs_changeset = id(new DifferentialChangeset())->load($vs);
	if (!$vs_changeset) {
	return new Aphront404Response();
	}
	}

	if (!$vs) {
	$right = $changeset;
	$left = null;

	$right_source = $right->getID();
	$right_new = true;
	$left_source = $right->getID();
	$left_new = false;

	$render_cache_key = $right->getID();
	} else if ($vs == -1) {
	$right = null;
	$left = $changeset;

	$right_source = $left->getID();
	$right_new = false;
	$left_source = $left->getID();
	$left_new = true;

	$render_cache_key = null;
	} else {
	$right = $changeset;
	$left = $vs_changeset;

	$right_source = $right->getID();
	$right_new = true;
	$left_source = $left->getID();
	$left_new = true;

	$render_cache_key = null;
	}

	if ($left) {
	$left->attachHunks($left->loadHunks());
	}

	if ($right) {
	$right->attachHunks($right->loadHunks());
	}

	if ($left) {

	$left_data = $left->makeNewFile();
	if ($right) {
	$right_data = $right->makeNewFile();
	} else {
	$right_data = $left->makeOldFile();
	}

	$engine = new PhabricatorDifferenceEngine();
	$synthetic = $engine->generateChangesetFromFileContent(
	$left_data,
	$right_data);

	$choice = clone nonempty($left, $right);
	$choice->attachHunks($synthetic->getHunks());

	$changeset = $choice;
	}

	$coverage = null;
	if ($right && $right->getDiffID()) {
	$unit = id(new DifferentialDiffProperty())->loadOneWhere(
	'diffID = %d AND name = %s',
	$right->getDiffID(),
	'arc:unit');

	if ($unit) {
	$coverage = array();
	foreach ($unit->getData() as $result) {
	$result_coverage = idx($result, 'coverage');
	if (!$result_coverage) {
	continue;
	}
	$file_coverage = idx($result_coverage, $right->getFileName());
	if (!$file_coverage) {
	continue;
	}
	$coverage[] = $file_coverage;
	}

	$coverage = ArcanistUnitTestResult::mergeCoverage($coverage);
	}
	}

	$spec = $request->getStr('range');
	list($range_s, $range_e, $mask) =
	DifferentialChangesetParser::parseRangeSpecification($spec);

	$parser = new DifferentialChangesetParser();
	$parser->setCoverage($coverage);
	$parser->setChangeset($changeset);
	$parser->setRenderingReference($rendering_reference);
	$parser->setRenderCacheKey($render_cache_key);
	$parser->setRightSideCommentMapping($right_source, $right_new);
	$parser->setLeftSideCommentMapping($left_source, $left_new);
	$parser->setWhitespaceMode($request->getStr('whitespace'));

	if ($request->getStr('renderer') == '1up') {
	$parser->setRenderer(new DifferentialChangesetOneUpRenderer());
	}


	if ($left && $right) {
	$parser->setOriginals($left, $right);
	}

	// Load both left-side and right-side inline comments.
	$inlines = $this->loadInlineComments(
	array($left_source, $right_source),
	$author_phid);

	if ($left_new) {
	$inlines = array_merge(
	$inlines,
	$this->buildLintInlineComments($left));
	}

	if ($right_new) {
	$inlines = array_merge(
	$inlines,
	$this->buildLintInlineComments($right));
	}

	$phids = array();
	foreach ($inlines as $inline) {
	$parser->parseInlineComment($inline);
	if ($inline->getAuthorPHID()) {
	$phids[$inline->getAuthorPHID()] = true;
	}
	}
	$phids = array_keys($phids);

	$handles = $this->loadViewerHandles($phids);
	$parser->setHandles($handles);

	$engine = new PhabricatorMarkupEngine();
	$engine->setViewer($request->getUser());

	foreach ($inlines as $inline) {
	$engine->addObject(
	$inline,
	PhabricatorInlineCommentInterface::MARKUP_FIELD_BODY);
	}

	$engine->process();
	$parser->setMarkupEngine($engine);

	if ($request->isAjax()) {
	// TODO: This is sort of lazy, the effect is just to not render "Edit"
	// and "Reply" links on the "standalone view".
	$parser->setUser($request->getUser());
	}

	$output = $parser->render($range_s, $range_e, $mask);

	$mcov = $parser->renderModifiedCoverage();

	if ($request->isAjax()) {
	$coverage = array(
	'differential-mcoverage-'.md5($changeset->getFilename()) => $mcov,
	);

	return id(new PhabricatorChangesetResponse())
	->setRenderedChangeset($output)
	->setCoverage($coverage);
	}

	Javelin::initBehavior('differential-show-more', array(
	'uri' => '/differential/changeset/',
	'whitespace' => $request->getStr('whitespace'),
	));

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

	// TODO: [HTML] Clean up DifferentialChangesetParser output, but it's
	// undergoing like six kinds of refactoring anyway.
	$output = phutil_safe_html($output);

	$detail = new DifferentialChangesetDetailView();
	$detail->setChangeset($changeset);
	$detail->appendChild($output);
	$detail->setVsChangesetID($left_source);

	$panel = new DifferentialPrimaryPaneView();
	$panel->appendChild(
	phutil_tag(
	'div',
	array(
	'class' => 'differential-review-stage',
	'id' => 'differential-review-stage',
	),
	$detail->render()));

	return $this->buildApplicationPage(
	array(
	$panel
	),
	array(
	'title' => pht('Changeset View'),
	));
	}

	private function loadInlineComments(array $changeset_ids, $author_phid) {
	$changeset_ids = array_unique(array_filter($changeset_ids));
	if (!$changeset_ids) {
	return;
	}

	return id(new DifferentialInlineCommentQuery())
	->withViewerAndChangesetIDs($author_phid, $changeset_ids)
	->execute();
	}

	private function buildRawFileResponse(
	DifferentialChangeset $changeset,
	$is_new) {

	$viewer = $this->getRequest()->getUser();

	if ($is_new) {
	$key = 'raw:new:phid';
	} else {
	$key = 'raw:old:phid';
	}

	$metadata = $changeset->getMetadata();

	$file = null;
	$phid = idx($metadata, $key);
	if ($phid) {
	$file = id(new PhabricatorFileQuery())
	->setViewer($viewer)
	->withPHIDs(array($phid))
	->execute();
	if ($file) {
	$file = head($file);
	}
	}

	if (!$file) {
	// This is just building a cache of the changeset content in the file
	// tool, and is safe to run on a read pathway.
	$unguard = AphrontWriteGuard::beginScopedUnguardedWrites();

	if ($is_new) {
	$data = $changeset->makeNewFile();
	} else {
	$data = $changeset->makeOldFile();
	}

	$file = PhabricatorFile::newFromFileData(
	$data,
	array(
	'name' => $changeset->getFilename(),
	'mime-type' => 'text/plain',
	));

	$metadata[$key] = $file->getPHID();
	$changeset->setMetadata($metadata);
	$changeset->save();

	unset($unguard);
	}

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

	private function buildLintInlineComments($changeset) {
	$lint = id(new DifferentialDiffProperty())->loadOneWhere(
	'diffID = %d AND name = %s',
	$changeset->getDiffID(),
	'arc:lint');
	if (!$lint) {
	return array();
	}
	$lint = $lint->getData();

	$inlines = array();
	foreach ($lint as $msg) {
	if ($msg['path'] != $changeset->getFilename()) {
	continue;
	}
	$inline = new DifferentialInlineComment();
	$inline->setChangesetID($changeset->getID());
	$inline->setIsNewFile(true);
	$inline->setSyntheticAuthor('Lint: '.$msg['name']);
	$inline->setLineNumber($msg['line']);
	$inline->setLineLength(0);

	$inline->setContent('%%%'.$msg['description'].'%%%');

	$inlines[] = $inline;
	}

	return $inlines;
	}

	}
	diff --git a/src/applications/differential/controller/DifferentialController.php b/src/applications/differential/controller/DifferentialController.php
	index f61722d078..c6a27020bc 100644
	--- a/src/applications/differential/controller/DifferentialController.php
	+++ b/src/applications/differential/controller/DifferentialController.php
	@@ -1,40 +1,36 @@
	<?php

	abstract class DifferentialController extends PhabricatorController {

	- protected function allowsAnonymousAccess() {
	- return PhabricatorEnv::getEnvConfig('differential.anonymous-access');
	- }
	-
	public function buildApplicationCrumbs() {
	$crumbs = parent::buildApplicationCrumbs();

	$crumbs->addAction(
	id(new PHUIListItemView())
	->setHref($this->getApplicationURI('/diff/create/'))
	->setName(pht('Create Diff'))
	->setIcon('create'));

	return $crumbs;
	}

	public function buildSideNavView($for_app = false) {
	$viewer = $this->getRequest()->getUser();

	$nav = new AphrontSideNavFilterView();
	$nav->setBaseURI(new PhutilURI($this->getApplicationURI()));

	id(new DifferentialRevisionSearchEngine())
	->setViewer($viewer)
	->addNavigationItems($nav->getMenu());

	$nav->selectFilter(null);

	return $nav;
	}

	public function buildApplicationMenu() {
	return $this->buildSideNavView(true)->getMenu();
	}

	}
	diff --git a/src/applications/differential/controller/DifferentialRevisionListController.php b/src/applications/differential/controller/DifferentialRevisionListController.php
	index 8322f5615b..39cc2a605b 100644
	--- a/src/applications/differential/controller/DifferentialRevisionListController.php
	+++ b/src/applications/differential/controller/DifferentialRevisionListController.php
	@@ -1,98 +1,91 @@
	<?php

	final class DifferentialRevisionListController extends DifferentialController
	implements PhabricatorApplicationSearchResultsControllerInterface {

	private $queryKey;

	- public function shouldRequireLogin() {
	- if ($this->allowsAnonymousAccess()) {
	- return false;
	- }
	- return parent::shouldRequireLogin();
	- }
	-
	public function shouldAllowPublic() {
	return true;
	}

	public function willProcessRequest(array $data) {
	$this->queryKey = idx($data, 'queryKey');
	}

	public function processRequest() {
	$request = $this->getRequest();
	$controller = id(new PhabricatorApplicationSearchController($request))
	->setQueryKey($this->queryKey)
	->setSearchEngine(new DifferentialRevisionSearchEngine())
	->setNavigation($this->buildSideNavView());

	return $this->delegateToController($controller);
	}

	public function renderResultsList(
	array $revisions,
	PhabricatorSavedQuery $query) {
	assert_instances_of($revisions, 'DifferentialRevision');

	$user = $this->getRequest()->getUser();
	$template = id(new DifferentialRevisionListView())
	->setUser($user)
	->setFields(DifferentialRevisionListView::getDefaultFields($user));

	$views = array();
	if ($query->getQueryKey() == 'active') {
	$split = DifferentialRevisionQuery::splitResponsible(
	$revisions,
	$query->getParameter('responsiblePHIDs'));
	list($blocking, $active, $waiting) = $split;

	$views[] = id(clone $template)
	->setHeader(pht('Blocking Others'))
	->setNoDataString(
	pht('No revisions are blocked on your action.'))
	->setHighlightAge(true)
	->setRevisions($blocking)
	->setHandles(array())
	->loadAssets();

	$views[] = id(clone $template)
	->setHeader(pht('Action Required'))
	->setNoDataString(
	pht('No revisions require your action.'))
	->setHighlightAge(true)
	->setRevisions($active)
	->setHandles(array())
	->loadAssets();

	$views[] = id(clone $template)
	->setHeader(pht('Waiting on Others'))
	->setNoDataString(
	pht('You have no revisions waiting on others.'))
	->setRevisions($waiting)
	->setHandles(array())
	->loadAssets();
	} else {
	$views[] = id(clone $template)
	->setRevisions($revisions)
	->setHandles(array())
	->loadAssets();
	}

	$phids = array_mergev(mpull($views, 'getRequiredHandlePHIDs'));
	$handles = $this->loadViewerHandles($phids);

	foreach ($views as $view) {
	$view->setHandles($handles);
	}

	if (count($views) == 1) {
	// Reduce this to a PHUIObjectItemListView so we can get the free
	// support from ApplicationSearch.
	return head($views)->render();
	} else {
	return $views;
	}
	}

	}
	diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
	index ee0e13f6eb..460d24f529 100644
	--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
	+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
	@@ -1,959 +1,952 @@
	<?php

	final class DifferentialRevisionViewController extends DifferentialController {

	private $revisionID;

	- public function shouldRequireLogin() {
	- if ($this->allowsAnonymousAccess()) {
	- return false;
	- }
	- return parent::shouldRequireLogin();
	- }
	-
	public function shouldAllowPublic() {
	return true;
	}

	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 DifferentialRevisionQuery())
	->withIDs(array($this->revisionID))
	->setViewer($request->getUser())
	->needRelationships(true)
	->needReviewerStatus(true)
	->needReviewerAuthority(true)
	->executeOne();

	if (!$revision) {
	return new Aphront404Response();
	}

	$diffs = id(new DifferentialDiffQuery())
	->setViewer($request->getUser())
	->withRevisionIDs(array($this->revisionID))
	->execute();
	$diffs = array_reverse($diffs, $preserve_keys = true);

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

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

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

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

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

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

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

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

	$props = id(new DifferentialDiffProperty())->loadAllWhere(
	'diffID = %d',
	$target_manual->getID());
	$props = mpull($props, 'getData', 'getName');

	$aux_fields = $this->loadAuxiliaryFields($revision);

	$comments = $revision->loadComments();

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

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

	foreach ($comments as $comment) {
	foreach ($comment->getRequiredHandlePHIDs() 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_field->setDiff($target);
	$aux_field->setManualDiff($target_manual);
	$aux_field->setDiffProperties($props);
	$aux_phids[$key] = $aux_field->getRequiredHandlePHIDsForRevisionView();
	}
	$object_phids = array_merge($object_phids, array_mergev($aux_phids));
	$object_phids = array_unique($object_phids);

	$handles = $this->loadViewerHandles($object_phids);

	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;
	if ($revision->getStatus() ==
	ArcanistDifferentialRevisionStatus::NEEDS_REVIEW) {
	$has_live_reviewer = false;
	foreach ($revision->getReviewers() as $reviewer) {
	if (!$handles[$reviewer]->isDisabled()) {
	$has_live_reviewer = true;
	break;
	}
	}
	if (!$has_live_reviewer) {
	$reviewer_warning = new AphrontErrorView();
	$reviewer_warning->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	$reviewer_warning->setTitle(pht('No Active Reviewers'));
	if ($revision->getReviewers()) {
	$reviewer_warning->appendChild(
	phutil_tag(
	'p',
	array(),
	pht('All specified reviewers are disabled and this revision '.
	'needs review. You may want to add some new reviewers.')));
	} else {
	$reviewer_warning->appendChild(
	phutil_tag(
	'p',
	array(),
	pht('This revision has no specified reviewers and needs '.
	'review. You may want to add some reviewers.')));
	}
	}
	}

	$request_uri = $request->getRequestURI();

	$limit = 100;
	$large = $request->getStr('large');
	if (count($changesets) > $limit && !$large) {
	$count = count($changesets);
	$warning = new AphrontErrorView();
	$warning->setTitle('Very Large Diff');
	$warning->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	$warning->appendChild(hsprintf(
	'%s <strong>%s</strong>',
	pht(
	'This diff is very large and affects %s files. Load each file '.
	'individually.',
	new PhutilNumber($count)),
	phutil_tag(
	'a',
	array(
	'href' => $request_uri
	->alter('large', 'true')
	->setFragment('toc'),
	),
	pht('Show All Files Inline'))));
	$warning = $warning->render();

	$my_inlines = id(new DifferentialInlineCommentQuery())
	->withDraftComments($user->getPHID(), $this->revisionID)
	->execute();

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

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

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

	$revision_detail = id(new DifferentialRevisionDetailView())
	->setUser($user)
	->setRevision($revision)
	->setDiff(end($diffs))
	->setAuxiliaryFields($aux_fields)
	->setURI($request->getRequestURI());

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

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

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

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

	if ($arc_project) {
	list($symbol_indexes, $project_phids) = $this->buildSymbolIndexes(
	$arc_project,
	$visible_changesets);
	} else {
	$symbol_indexes = array();
	$project_phids = 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);

	if ($arc_project) {
	Javelin::initBehavior(
	'repository-crossreference',
	array(
	'section' => $comment_view->getID(),
	'projects' => $project_phids,
	));
	}

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

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

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

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

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

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

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

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

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

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

	$reviewers = array();
	$ccs = array();
	if ($draft) {
	$reviewers = idx($draft->getMetadata(), 'reviewers', array());
	$ccs = idx($draft->getMetadata(), 'ccs', array());
	if ($reviewers \|\| $ccs) {
	$handles = $this->loadViewerHandles(array_merge($reviewers, $ccs));
	$reviewers = array_select_keys($handles, $reviewers);
	$ccs = array_select_keys($handles, $ccs);
	}
	}

	$comment_form = new DifferentialAddCommentView();
	$comment_form->setRevision($revision);
	$comment_form->setAuxFields($aux_fields);
	$comment_form->setActions($this->getRevisionCommentActions($revision));
	$comment_form->setActionURI('/differential/comment/save/');
	$comment_form->setUser($user);
	$comment_form->setDraft($draft);
	$comment_form->setReviewers(mpull($reviewers, 'getFullName', 'getPHID'));
	$comment_form->setCCs(mpull($ccs, 'getFullName', 'getPHID'));

	// TODO: This just makes the "Z" key work. Generalize this and remove
	// it at some point.
	$comment_form = phutil_tag(
	'div',
	array(
	'class' => 'differential-add-comment-panel',
	),
	$comment_form);
	}

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

	$page_pane = id(new DifferentialPrimaryPaneView())
	->setID($pane_id)
	->appendChild(array(
	$comment_view,
	$diff_history,
	$warning,
	$local_view,
	$toc_view,
	$other_view,
	$changeset_view,
	));
	if ($comment_form) {
	$page_pane->appendChild($comment_form);
	} else {
	// TODO: For now, just use this to get "Login to Comment".
	$page_pane->appendChild(
	id(new PhabricatorApplicationTransactionCommentView())
	->setUser($user)
	->setRequestURI($request->getRequestURI()));
	}


	$object_id = 'D'.$revision->getID();

	$top_anchor = id(new PhabricatorAnchorView())
	->setAnchorName('top')
	->setNavigationMarker(true);

	$content = array(
	$reviewer_warning,
	$top_anchor,
	$revision_detail,
	$page_pane,
	);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addCrumb(
	id(new PhabricatorCrumbView())
	->setName($object_id)
	->setHref('/'.$object_id));

	$prefs = $user->loadPreferences();

	$pref_filetree = PhabricatorUserPreferences::PREFERENCE_DIFF_FILETREE;
	if ($prefs->getPreference($pref_filetree)) {
	$collapsed = $prefs->getPreference(
	PhabricatorUserPreferences::PREFERENCE_NAV_COLLAPSED,
	false);

	$nav = id(new DifferentialChangesetFileTreeSideNavBuilder())
	->setAnchorName('top')
	->setTitle('D'.$revision->getID())
	->setBaseURI(new PhutilURI('/D'.$revision->getID()))
	->setCollapsed((bool)$collapsed)
	->build($changesets);
	$nav->appendChild($content);
	$nav->setCrumbs($crumbs);
	$content = $nav;
	} else {
	array_unshift($content, $crumbs);
	}

	return $this->buildApplicationPage(
	$content,
	array(
	'title' => $object_id.' '.$revision->getTitle(),
	'pageObjects' => array($revision->getPHID()),
	));
	}

	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());
	$logged_in = $this->getRequest()->getUser()->isLoggedIn();
	$status = $revision->getStatus();
	$revision_id = $revision->getID();
	$revision_phid = $revision->getPHID();

	$links = array();

	$can_edit = PhabricatorPolicyFilter::hasCapability(
	$user,
	$revision,
	PhabricatorPolicyCapability::CAN_EDIT);

	$links[] = array(
	'icon' => 'edit',
	'href' => "/differential/revision/edit/{$revision_id}/",
	'name' => pht('Edit Revision'),
	'disabled' => !$can_edit,
	'sigil' => $can_edit ? null : 'workflow',
	);

	if (!$viewer_is_owner && !$viewer_is_reviewer) {
	$action = $viewer_is_cc ? 'rem' : 'add';
	$links[] = array(
	'icon' => $viewer_is_cc ? 'disable' : 'check',
	'href' => "/differential/subscribe/{$action}/{$revision_id}/",
	'name' => $viewer_is_cc ? pht('Unsubscribe') : pht('Subscribe'),
	'instant' => $logged_in,
	'disabled' => !$logged_in,
	'sigil' => $can_edit ? null : 'workflow',
	);
	} else {
	$links[] = array(
	'icon' => 'enable',
	'name' => pht('Automatically Subscribed'),
	'disabled' => true,
	);
	}

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

	$links[] = array(
	'icon' => 'link',
	'name' => pht('Edit Dependencies'),
	'href' => "/search/attach/{$revision_phid}/DREV/dependencies/",
	'sigil' => 'workflow',
	'disabled' => !$can_edit,
	);

	$maniphest = 'PhabricatorApplicationManiphest';
	if (PhabricatorApplication::isClassInstalled($maniphest)) {
	$links[] = array(
	'icon' => 'attach',
	'name' => pht('Edit Maniphest Tasks'),
	'href' => "/search/attach/{$revision_phid}/TASK/",
	'sigil' => 'workflow',
	'disabled' => !$can_edit,
	);
	}

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

	return $links;
	}

	private function getRevisionCommentActions(DifferentialRevision $revision) {

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

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

	$viewer_has_accepted = false;
	$viewer_has_rejected = false;
	$status_accepted = DifferentialReviewerStatus::STATUS_ACCEPTED;
	$status_rejected = DifferentialReviewerStatus::STATUS_REJECTED;
	foreach ($revision->getReviewerStatus() as $reviewer) {
	if ($reviewer->getReviewerPHID() == $viewer_phid) {
	if ($reviewer->getStatus() == $status_accepted) {
	$viewer_has_accepted = true;
	}
	if ($reviewer->getStatus() == $status_rejected) {
	$viewer_has_rejected = true;
	}
	break;
	}
	}

	$allow_self_accept = PhabricatorEnv::getEnvConfig(
	'differential.allow-self-accept');
	$always_allow_close = PhabricatorEnv::getEnvConfig(
	'differential.always-allow-close');
	$allow_reopen = PhabricatorEnv::getEnvConfig(
	'differential.allow-reopen');

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

	$actions[DifferentialAction::ACTION_ADDREVIEWERS] = true;
	$actions[DifferentialAction::ACTION_ADDCCS] = true;
	$actions[DifferentialAction::ACTION_REOPEN] = $allow_reopen &&
	($status == ArcanistDifferentialRevisionStatus::CLOSED);

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

	return $actions_dict;
	}

	private function loadInlineComments(
	DifferentialRevision $revision,
	array &$changesets) {
	assert_instances_of($changesets, 'DifferentialChangeset');

	$inline_comments = array();

	$inline_comments = id(new DifferentialInlineCommentQuery())
	->withRevisionIDs(array($revision->getID()))
	->withNotDraft(true)
	->execute();

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

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

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

	return $inline_comments;
	}

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

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

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

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

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

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

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

	private function loadAuxiliaryFields(DifferentialRevision $revision) {

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

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

	return $aux_fields;
	}

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

	$engine = PhabricatorSyntaxHighlighter::newEngine();

	$langs = $arc_project->getSymbolIndexLanguages();
	if (!$langs) {
	return array(array(), 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 array($symbol_indexes, $project_phids);
	}

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

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

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

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

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

	$query = id(new DifferentialRevisionQuery())
	->setViewer($this->getRequest()->getUser())
	->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');

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

	$view = id(new DifferentialRevisionListView())
	->setRevisions($revisions)
	->setFields(DifferentialRevisionListView::getDefaultFields($user))
	->setUser($user)
	->loadAssets();

	$phids = $view->getRequiredHandlePHIDs();
	$handles = $this->loadViewerHandles($phids);
	$view->setHandles($handles);

	return id(new PHUIObjectBoxView())
	->setHeaderText(pht('Open Revisions Affecting These Files'))
	->appendChild($view);
	}


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

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

	$viewer = $this->getRequest()->getUser();

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

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

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

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

	$generated_changesets[] = $choice;
	}

	$diff = new DifferentialDiff();
	$diff->attachChangesets($generated_changesets);
	$raw_changes = $diff->buildChangesList();
	$changes = array();
	foreach ($raw_changes as $changedict) {
	$changes[] = ArcanistDiffChange::newFromDictionary($changedict);
	}

	$loader = id(new PhabricatorFileBundleLoader())
	->setViewer($viewer);

	$bundle = ArcanistBundle::newFromChanges($changes);
	$bundle->setLoadFileDataCallback(array($loader, 'loadFileData'));

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

	$request_uri = $this->getRequest()->getRequestURI();

	// this ends up being something like
	// D123.diff
	// or the verbose
	// D123.vs123.id123.whitespaceignore-all.diff
	// lame but nice to include these options
	$file_name = ltrim($request_uri->getPath(), '/').'.';
	foreach ($request_uri->getQueryParams() as $key => $value) {
	if ($key == 'download') {
	continue;
	}
	$file_name .= $key.$value.'.';
	}
	$file_name .= 'diff';

	$file = PhabricatorFile::buildFromFileDataOrHash(
	$raw_diff,
	array(
	'name' => $file_name,
	));

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

	}
	}

File Metadata

Mime Type: text/x-diff
Expires: Mon, Mar 16, 11:27 PM (1 d, 10 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 963594
Default Alt Text: (66 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions