No OneTemporary
Actions

Size

83 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
	index 2c8f4e0bd9..7d0eae99c2 100644
	--- a/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
	+++ b/src/applications/differential/config/PhabricatorDifferentialConfigOptions.php
	@@ -1,306 +1,306 @@
	<?php

	final class PhabricatorDifferentialConfigOptions
	extends PhabricatorApplicationConfigOptions {

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

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

	public function getFontIcon() {
	return 'fa-cog';
	}

	public function getGroup() {
	return 'apps';
	}

	public function getOptions() {
	$caches_href = PhabricatorEnv::getDoclink('Managing Caches');

	$custom_field_type = 'custom:PhabricatorCustomFieldConfigOptionType';

	$fields = array(
	new DifferentialTitleField(),
	new DifferentialSummaryField(),
	new DifferentialTestPlanField(),
	new DifferentialAuthorField(),
	new DifferentialReviewersField(),
	new DifferentialProjectReviewersField(),
	new DifferentialReviewedByField(),
	new DifferentialSubscribersField(),
	new DifferentialRepositoryField(),
	- new DifferentialLintField(),
	new DifferentialProjectsField(),
	- new DifferentialUnitField(),
	new DifferentialViewPolicyField(),
	new DifferentialEditPolicyField(),

	new DifferentialDependsOnField(),
	new DifferentialDependenciesField(),
	new DifferentialManiphestTasksField(),
	new DifferentialCommitsField(),

	new DifferentialJIRAIssuesField(),
	new DifferentialAsanaRepresentationField(),

	new DifferentialChangesSinceLastUpdateField(),
	new DifferentialBranchField(),

	new DifferentialBlameRevisionField(),
	new DifferentialPathField(),
	new DifferentialHostField(),
	+ new DifferentialLintField(),
	+ new DifferentialUnitField(),
	new DifferentialRevertPlanField(),

	new DifferentialApplyPatchField(),

	new DifferentialRevisionIDField(),
	);

	$default_fields = array();
	foreach ($fields as $field) {
	$default_fields[$field->getFieldKey()] = array(
	'disabled' => $field->shouldDisableByDefault(),
	);
	}

	return array(
	$this->newOption(
	'differential.fields',
	$custom_field_type,
	$default_fields)
	->setCustomData(
	id(new DifferentialRevision())->getCustomFieldBaseClass())
	->setDescription(
	pht(
	"Select and reorder revision fields.\n\n".
	"NOTE: This feature is under active development and subject ".
	"to change.")),
	$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.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.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 be hidden by '.
	'default in Differential.'.
	"\n\n".
	'NOTE: This property is cached, so you will need to purge the '.
	'cache after making changes if you want the new configuration '.
	'to affect existing revisions. For instructions, see '.
	'[[ %s \| Managing Caches ]] in the documentation.',
	$caches_href))
	->addExample("/config\.h$/\n#/autobuilt/#", pht('Valid Setting')),
	$this->newOption('differential.sticky-accept', 'bool', true)
	->setBoolOptions(
	array(
	pht('Accepts persist across updates'),
	pht('Accepts are reset by updates'),
	))
	->setSummary(
	pht('Should "Accepted" revisions remain "Accepted" after updates?'))
	->setDescription(
	pht(
	'Normally, when revisions that have been "Accepted" are updated, '.
	'they remain "Accepted". This allows reviewers to suggest minor '.
	'alterations when accepting, and encourages authors to update '.
	'if they make minor changes in response to this feedback.'.
	"\n\n".
	'If you want updates to always require re-review, you can disable '.
	'the "stickiness" of the "Accepted" status with this option. '.
	'This may make the process for minor changes much more burdensome '.
	'to both authors and reviewers.')),
	$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.always-allow-abandon', 'bool', false)
	->setBoolOptions(
	array(
	pht('Allow any user'),
	pht('Restrict to submitter'),
	))
	->setSummary(pht('Allows any user to abandon revisions.'))
	->setDescription(
	pht(
	'If you set this to true, any user can abandon any revision. If '.
	'false, only the submitter can abandon 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.close-on-accept', 'bool', false)
	->setBoolOptions(
	array(
	pht('Treat Accepted Revisions as "Closed"'),
	pht('Treat Accepted Revisions as "Open"'),
	))
	->setSummary(pht('Allows "Accepted" to act as a closed status.'))
	->setDescription(
	pht(
	'Normally, Differential revisions remain on the dashboard when '.
	'they are "Accepted", and the author then commits the changes '.
	'to "Close" the revision and move it off the dashboard.'.
	"\n\n".
	'If you have an unusual workflow where Differential is used for '.
	'post-commit review (normally called "Audit", elsewhere in '.
	'Phabricator), you can set this flag to treat the "Accepted" '.
	'state as a "Closed" state and end the review workflow early.'.
	"\n\n".
	'This sort of workflow is very unusual. Very few installs should '.
	'need to change this option.')),
	$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 `%s` but marks stale revisions. ".
	"If the revision is even older than it is when marked as 'old'.",
	'differential.days-fresh')),
	$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 and the comment thread.')),
	);
	}

	}
	diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
	index 7069e5ae97..be61b6c153 100644
	--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
	+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
	@@ -1,977 +1,1043 @@
	<?php

	final class DifferentialRevisionViewController extends DifferentialController {

	private $revisionID;

	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(
	pht('This revision has no diffs. Something has gone quite wrong.'));
	}

	$revision->attachActiveDiff(last($diffs));

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

	$repository = null;
	$repository_phid = $target->getRepositoryPHID();
	if ($repository_phid) {
	if ($repository_phid == $revision->getRepositoryPHID()) {
	$repository = $revision->getRepository();
	} else {
	$repository = id(new PhabricatorRepositoryQuery())
	->setViewer($user)
	->withPHIDs(array($repository_phid))
	->executeOne();
	}
	}

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

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

	$map = $vs_map;
	if (!$map) {
	$map = array_fill_keys(array_keys($changesets), 0);
	}

	$old_ids = array();
	$new_ids = array();
	foreach ($map as $id => $vs) {
	if ($vs <= 0) {
	$old_ids[] = $id;
	$new_ids[] = $id;
	} else {
	$new_ids[] = $id;
	$new_ids[] = $vs;
	}
	}

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

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

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

	$field_list = PhabricatorCustomField::getObjectFields(
	$revision,
	PhabricatorCustomField::ROLE_VIEW);

	$field_list->setViewer($user);
	$field_list->readFieldsFromStorage($revision);

	$warning_handle_map = array();
	foreach ($field_list->getFields() as $key => $field) {
	$req = $field->getRequiredHandlePHIDsForRevisionHeaderWarnings();
	foreach ($req as $phid) {
	$warning_handle_map[$key][] = $phid;
	$object_phids[] = $phid;
	}
	}

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

	$request_uri = $request->getRequestURI();

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

	$old = array_select_keys($changesets, $old_ids);
	$new = array_select_keys($changesets, $new_ids);

	$query = id(new DifferentialInlineCommentQuery())
	->setViewer($user)
	->needHidden(true)
	->withRevisionPHIDs(array($revision->getPHID()));
	$inlines = $query->execute();
	$inlines = $query->adjustInlinesForChangesets(
	$inlines,
	$old,
	$new,
	$revision);

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

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

	-
	- // TODO: This should be in a DiffQuery or similar.
	- $need_props = array();
	- foreach ($field_list->getFields() as $field) {
	- foreach ($field->getRequiredDiffPropertiesForRevisionView() as $prop) {
	- $need_props[$prop] = $prop;
	- }
	- }
	-
	- if ($need_props) {
	- $prop_diff = $revision->getActiveDiff();
	- $load_props = id(new DifferentialDiffProperty())->loadAllWhere(
	- 'diffID = %d AND name IN (%Ls)',
	- $prop_diff->getID(),
	- $need_props);
	- $load_props = mpull($load_props, 'getData', 'getName');
	- foreach ($need_props as $need) {
	- $prop_diff->attachProperty($need, idx($load_props, $need));
	- }
	- }
	-
	$commit_hashes = mpull($diffs, 'getSourceControlBaseRevision');
	$local_commits = idx($props, 'local:commits', array());
	foreach ($local_commits as $local_commit) {
	$commit_hashes[] = idx($local_commit, 'tree');
	$commit_hashes[] = idx($local_commit, 'local');
	}
	$commit_hashes = array_unique(array_filter($commit_hashes));
	if ($commit_hashes) {
	$commits_for_links = id(new DiffusionCommitQuery())
	->setViewer($user)
	->withIdentifiers($commit_hashes)
	->execute();
	$commits_for_links = mpull(
	$commits_for_links,
	null,
	'getCommitIdentifier');
	} else {
	$commits_for_links = array();
	}

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

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

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

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

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

	$revision_detail_box = $revision_detail->render();

	$revision_warnings = $this->buildRevisionWarnings(
	$revision,
	$field_list,
	$warning_handle_map,
	$handles);
	if ($revision_warnings) {
	$revision_warnings = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_WARNING)
	->setErrors($revision_warnings);
	$revision_detail_box->setInfoView($revision_warnings);
	}

	+ $diff_detail_box = $this->buildDiffDetailView(
	+ array_select_keys($diffs, array($diff_vs, $target->getID())),
	+ $revision,
	+ $field_list);
	+
	$comment_view = $this->buildTransactions(
	$revision,
	$diff_vs ? $diffs[$diff_vs] : $target,
	$target,
	$old_ids,
	$new_ids);

	if (!$viewer_is_anonymous) {
	$comment_view->setQuoteRef('D'.$revision->getID());
	$comment_view->setQuoteTargetID('comment-content');
	}

	$wrap_id = celerity_generate_unique_node_id();
	$comment_view = phutil_tag(
	'div',
	array(
	'id' => $wrap_id,
	),
	$comment_view);

	$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(pht('Diff %s', $target->getID()));

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

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

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

	$review_warnings = array();
	foreach ($field_list->getFields() as $field) {
	$review_warnings[] = $field->getWarningsForDetailView();
	}
	$review_warnings = array_mergev($review_warnings);

	if ($review_warnings) {
	$review_warnings_panel = id(new PHUIInfoView())
	->setSeverity(PHUIInfoView::SEVERITY_WARNING)
	->setErrors($review_warnings);
	$comment_form->setInfoView($review_warnings_panel);
	}

	$comment_form->setActions($this->getRevisionCommentActions($revision));
	$action_uri = $this->getApplicationURI(
	'comment/save/'.$revision->getID().'/');

	$comment_form->setActionURI($action_uri);
	$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($comment_view);

	$signatures = DifferentialRequiredSignaturesField::loadForRevision(
	$revision);
	$missing_signatures = false;
	foreach ($signatures as $phid => $signed) {
	if (!$signed) {
	$missing_signatures = true;
	}
	}

	if ($missing_signatures) {
	$signature_message = id(new PHUIInfoView())
	->setErrors(
	array(
	array(
	phutil_tag('strong', array(), pht('Content Hidden:')),
	' ',
	pht(
	'The content of this revision is hidden until the author has '.
	'signed all of the required legal agreements.'),
	),
	));
	$page_pane->appendChild($signature_message);
	} else {
	$page_pane->appendChild(
	array(
	$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();

	$content = array(
	$revision_detail_box,
	+ $diff_detail_box,
	$page_pane,
	);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb($object_id, '/'.$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())
	->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) {
	$viewer = $this->getRequest()->getUser();
	$revision_id = $revision->getID();
	$revision_phid = $revision->getPHID();

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

	$actions = array();

	$actions[] = id(new PhabricatorActionView())
	->setIcon('fa-pencil')
	->setHref("/differential/revision/edit/{$revision_id}/")
	->setName(pht('Edit Revision'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit);

	$actions[] = id(new PhabricatorActionView())
	->setIcon('fa-upload')
	->setHref("/differential/revision/update/{$revision_id}/")
	->setName(pht('Update Diff'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit);

	$this->requireResource('phabricator-object-selector-css');
	$this->requireResource('javelin-behavior-phabricator-object-selector');

	$actions[] = id(new PhabricatorActionView())
	->setIcon('fa-link')
	->setName(pht('Edit Dependencies'))
	->setHref("/search/attach/{$revision_phid}/DREV/dependencies/")
	->setWorkflow(true)
	->setDisabled(!$can_edit);

	$maniphest = 'PhabricatorManiphestApplication';
	if (PhabricatorApplication::isClassInstalled($maniphest)) {
	$actions[] = id(new PhabricatorActionView())
	->setIcon('fa-anchor')
	->setName(pht('Edit Maniphest Tasks'))
	->setHref("/search/attach/{$revision_phid}/TASK/")
	->setWorkflow(true)
	->setDisabled(!$can_edit);
	}

	$request_uri = $this->getRequest()->getRequestURI();
	$actions[] = id(new PhabricatorActionView())
	->setIcon('fa-download')
	->setName(pht('Download Raw Diff'))
	->setHref($request_uri->alter('download', 'true'));

	return $actions;
	}

	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_abandon = PhabricatorEnv::getEnvConfig(
	'differential.always-allow-abandon');
	$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:
	case ArcanistDifferentialRevisionStatus::CHANGES_PLANNED:
	$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_ABANDON] = $always_allow_abandon;
	$actions[DifferentialAction::ACTION_ACCEPT] = true;
	$actions[DifferentialAction::ACTION_REJECT] = true;
	$actions[DifferentialAction::ACTION_RESIGN] = $viewer_is_reviewer;
	break;
	case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
	case ArcanistDifferentialRevisionStatus::CHANGES_PLANNED:
	$actions[DifferentialAction::ACTION_ABANDON] = $always_allow_abandon;
	$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_ABANDON] = $always_allow_abandon;
	$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 loadChangesetsAndVsMap(
	DifferentialDiff $target,
	DifferentialDiff $diff_vs = null,
	PhabricatorRepository $repository = null) {

	$load_diffs = array($target);
	if ($diff_vs) {
	$load_diffs[] = $diff_vs;
	}

	$raw_changesets = id(new DifferentialChangesetQuery())
	->setViewer($this->getRequest()->getUser())
	->withDiffs($load_diffs)
	->execute();
	$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 buildSymbolIndexes(
	PhabricatorRepository $repository,
	array $visible_changesets) {
	assert_instances_of($visible_changesets, 'DifferentialChangeset');

	$engine = PhabricatorSyntaxHighlighter::newEngine();

	$langs = $repository->getSymbolLanguages();
	$langs = nonempty($langs, array());

	$sources = $repository->getSymbolSources();
	$sources = nonempty($sources, array());

	$symbol_indexes = array();

	if ($langs && $sources) {
	$have_symbols = id(new DiffusionSymbolQuery())
	->existsSymbolsInRepository($repository->getPHID());
	if (!$have_symbols) {
	return $symbol_indexes;
	}
	}

	$repository_phids = array_merge(
	array($repository->getPHID()),
	$sources);

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

	return $symbol_indexes;
	}

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

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

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

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

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

	$recent = (PhabricatorTime::getNow() - phutil_units('30 days in seconds'));

	$query = id(new DifferentialRevisionQuery())
	->setViewer($this->getRequest()->getUser())
	->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
	->withUpdatedEpochBetween($recent, null)
	->setOrder(DifferentialRevisionQuery::ORDER_MODIFIED)
	->setLimit(10)
	->needFlags(true)
	->needDrafts(true)
	->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');
	$viewer = $this->getViewer();

	$header = id(new PHUIHeaderView())
	->setHeader(pht('Similar Open Revisions'))
	->setSubheader(
	pht('Recently updated open revisions affecting the same files.'));

	$view = id(new DifferentialRevisionListView())
	->setHeader($header)
	->setRevisions($revisions)
	->setUser($viewer);

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

	return $view;
	}


	/**
	* Note this code is somewhat similar to the buildPatch method in
	* @{class:DifferentialReviewRequestMail}.
	*
	* @return @{class:AphrontRedirectResponse}
	*/
	private function buildRawDiffResponse(
	DifferentialRevision $revision,
	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();

	id(new DifferentialHunkQuery())
	->setViewer($viewer)
	->withChangesets($changesets)
	->needAttachToChangesets(true)
	->execute();

	$diff = new DifferentialDiff();
	$diff->attachChangesets($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,
	'ttl' => (60 * 60 * 24),
	'viewPolicy' => PhabricatorPolicies::POLICY_NOONE,
	));

	$unguarded = AphrontWriteGuard::beginScopedUnguardedWrites();
	$file->attachToObject($revision->getPHID());
	unset($unguarded);

	return $file->getRedirectResponse();
	}

	private function buildTransactions(
	DifferentialRevision $revision,
	DifferentialDiff $left_diff,
	DifferentialDiff $right_diff,
	array $old_ids,
	array $new_ids) {

	$timeline = $this->buildTransactionTimeline(
	$revision,
	new DifferentialTransactionQuery(),
	$engine = null,
	array(
	'left' => $left_diff->getID(),
	'right' => $right_diff->getID(),
	'old' => implode(',', $old_ids),
	'new' => implode(',', $new_ids),
	));

	return $timeline;
	}

	private function buildRevisionWarnings(
	DifferentialRevision $revision,
	PhabricatorCustomFieldList $field_list,
	array $warning_handle_map,
	array $handles) {

	$warnings = array();
	foreach ($field_list->getFields() as $key => $field) {
	$phids = idx($warning_handle_map, $key, array());
	$field_handles = array_select_keys($handles, $phids);
	$field_warnings = $field->getWarningsForRevisionHeader($field_handles);
	foreach ($field_warnings as $warning) {
	$warnings[] = $warning;
	}
	}

	return $warnings;
	}

	+ private function buildDiffDetailView(
	+ array $diffs,
	+ DifferentialRevision $revision,
	+ PhabricatorCustomFieldList $field_list) {
	+ $viewer = $this->getViewer();
	+
	+ $fields = array();
	+ foreach ($field_list->getFields() as $field) {
	+ if ($field->shouldAppearInDiffPropertyView()) {
	+ $fields[] = $field;
	+ }
	+ }
	+
	+ if (!$fields) {
	+ return null;
	+ }
	+
	+ // Make sure we're only going to render unique diffs.
	+ $diffs = mpull($diffs, null, 'getID');
	+ $labels = array(pht('Left'), pht('Right'));
	+
	+ $property_lists = array();
	+ foreach ($diffs as $diff) {
	+ if (count($diffs) == 2) {
	+ $label = array_shift($labels);
	+ $label = pht('%s (Diff %d)', $label, $diff->getID());
	+ } else {
	+ $label = pht('Diff %d', $diff->getID());
	+ }
	+
	+ $property_lists[] = array(
	+ $label,
	+ $this->buildDiffPropertyList($diff, $revision, $fields),
	+ );
	+ }
	+
	+ $box = id(new PHUIObjectBoxView())
	+ ->setHeaderText(pht('Diff Detail'))
	+ ->setUser($viewer);
	+
	+ $last_tab = null;
	+ foreach ($property_lists as $key => $property_list) {
	+ list($tab_name, $list_view) = $property_list;
	+
	+ $tab = id(new PHUIListItemView())
	+ ->setKey($key)
	+ ->setName($tab_name);
	+
	+ $box->addPropertyList($list_view, $tab);
	+ $last_tab = $tab;
	+ }
	+
	+ if ($last_tab) {
	+ $last_tab->setSelected(true);
	+ }
	+
	+ return $box;
	+ }
	+
	+ private function buildDiffPropertyList(
	+ DifferentialDiff $diff,
	+ DifferentialRevision $revision,
	+ array $fields) {
	+ $viewer = $this->getViewer();
	+
	+ $view = id(new PHUIPropertyListView())
	+ ->setUser($viewer)
	+ ->setObject($diff);
	+
	+ foreach ($fields as $field) {
	+ $label = $field->renderDiffPropertyViewLabel($diff);
	+ $value = $field->renderDiffPropertyViewValue($diff);
	+ if ($value !== null) {
	+ $view->addProperty($label, $value);
	+ }
	+ }
	+
	+ return $view;
	+ }
	+
	+
	}
	diff --git a/src/applications/differential/customfield/DifferentialBranchField.php b/src/applications/differential/customfield/DifferentialBranchField.php
	index 35ed809f12..fc50943f1d 100644
	--- a/src/applications/differential/customfield/DifferentialBranchField.php
	+++ b/src/applications/differential/customfield/DifferentialBranchField.php
	@@ -1,80 +1,88 @@
	<?php

	final class DifferentialBranchField
	extends DifferentialCustomField {

	public function getFieldKey() {
	return 'differential:branch';
	}

	public function getFieldName() {
	return pht('Branch');
	}

	public function getFieldDescription() {
	return pht('Shows the branch a diff came from.');
	}

	public function shouldAppearInPropertyView() {
	return true;
	}

	- public function renderPropertyViewLabel() {
	+ public function renderPropertyViewValue(array $handles) {
	+ return null;
	+ }
	+
	+ public function shouldAppearInDiffPropertyView() {
	+ return true;
	+ }
	+
	+ public function renderDiffPropertyViewLabel(DifferentialDiff $diff) {
	return $this->getFieldName();
	}

	- public function renderPropertyViewValue(array $handles) {
	- return $this->getBranchDescription($this->getObject()->getActiveDiff());
	+ public function renderDiffPropertyViewValue(DifferentialDiff $diff) {
	+ return $this->getBranchDescription($diff);
	}

	private function getBranchDescription(DifferentialDiff $diff) {
	$branch = $diff->getBranch();
	$bookmark = $diff->getBookmark();

	if (strlen($branch) && strlen($bookmark)) {
	return pht('%s (bookmark) on %s (branch)', $bookmark, $branch);
	} else if (strlen($bookmark)) {
	return pht('%s (bookmark)', $bookmark);
	} else if (strlen($branch)) {
	return $branch;
	} else {
	return null;
	}
	}

	public function getProTips() {
	return array(
	pht(
	'In Git and Mercurial, use a branch like "%s" to automatically '.
	'associate changes with the corresponding task.',
	'T123'),
	);
	}

	public function shouldAppearInTransactionMail() {
	return true;
	}

	public function updateTransactionMailBody(
	PhabricatorMetaMTAMailBody $body,
	PhabricatorApplicationTransactionEditor $editor,
	array $xactions) {

	$status_accepted = ArcanistDifferentialRevisionStatus::ACCEPTED;

	// Show the "BRANCH" section only if there's a new diff or the revision
	// is "Accepted".
	if ((!$editor->getDiffUpdateTransaction($xactions)) &&
	($this->getObject()->getStatus() != $status_accepted)) {
	return;
	}

	$branch = $this->getBranchDescription($this->getObject()->getActiveDiff());
	if ($branch === null) {
	return;
	}

	$body->addTextSection(pht('BRANCH'), $branch);
	}

	}
	diff --git a/src/applications/differential/customfield/DifferentialCustomField.php b/src/applications/differential/customfield/DifferentialCustomField.php
	index 088e7beeac..b4ef47c274 100644
	--- a/src/applications/differential/customfield/DifferentialCustomField.php
	+++ b/src/applications/differential/customfield/DifferentialCustomField.php
	@@ -1,220 +1,251 @@
	<?php

	/**
	* @task commitmessage Integration with Commit Messages
	+ * @task diff Integration with Diff Properties
	*/
	abstract class DifferentialCustomField
	extends PhabricatorCustomField {

	const ROLE_COMMITMESSAGE = 'differential:commitmessage';
	const ROLE_COMMITMESSAGEEDIT = 'differential:commitmessageedit';

	/**
	* TODO: It would be nice to remove this, but a lot of different code is
	* bound together by it. Until everything is modernized, retaining the old
	* field keys is the only reasonable way to update things one piece
	* at a time.
	*/
	public function getFieldKeyForConduit() {
	return $this->getFieldKey();
	}

	public function shouldEnableForRole($role) {
	switch ($role) {
	case self::ROLE_COMMITMESSAGE:
	return $this->shouldAppearInCommitMessage();
	case self::ROLE_COMMITMESSAGEEDIT:
	return $this->shouldAppearInCommitMessage() &&
	$this->shouldAllowEditInCommitMessage();
	}

	return parent::shouldEnableForRole($role);
	}

	- public function getRequiredDiffPropertiesForRevisionView() {
	- if ($this->getProxy()) {
	- return $this->getProxy()->getRequiredDiffPropertiesForRevisionView();
	- }
	- return array();
	- }
	-
	protected function parseObjectList(
	$value,
	array $types,
	$allow_partial = false) {
	return id(new PhabricatorObjectListQuery())
	->setViewer($this->getViewer())
	->setAllowedTypes($types)
	->setObjectList($value)
	->setAllowPartialResults($allow_partial)
	->execute();
	}

	protected function renderObjectList(array $handles) {
	if (!$handles) {
	return null;
	}

	$out = array();
	foreach ($handles as $handle) {
	if ($handle->getPolicyFiltered()) {
	$out[] = $handle->getPHID();
	} else if ($handle->isComplete()) {
	$out[] = $handle->getObjectName();
	}
	}

	return implode(', ', $out);
	}

	public function getWarningsForDetailView() {
	if ($this->getProxy()) {
	return $this->getProxy()->getWarningsForDetailView();
	}
	return array();
	}

	public function getRequiredHandlePHIDsForRevisionHeaderWarnings() {
	return array();
	}

	public function getWarningsForRevisionHeader(array $handles) {
	return array();
	}

	+
	/* -( Integration with Commit Messages )----------------------------------- */


	/**
	* @task commitmessage
	*/
	public function shouldAppearInCommitMessage() {
	if ($this->getProxy()) {
	return $this->getProxy()->shouldAppearInCommitMessage();
	}
	return false;
	}


	/**
	* @task commitmessage
	*/
	public function shouldAppearInCommitMessageTemplate() {
	if ($this->getProxy()) {
	return $this->getProxy()->shouldAppearInCommitMessageTemplate();
	}
	return false;
	}


	/**
	* @task commitmessage
	*/
	public function shouldAllowEditInCommitMessage() {
	if ($this->getProxy()) {
	return $this->getProxy()->shouldAllowEditInCommitMessage();
	}
	return true;
	}


	/**
	* @task commitmessage
	*/
	public function getProTips() {
	if ($this->getProxy()) {
	return $this->getProxy()->getProTips();
	}
	return array();
	}


	/**
	* @task commitmessage
	*/
	public function getCommitMessageLabels() {
	if ($this->getProxy()) {
	return $this->getProxy()->getCommitMessageLabels();
	}
	return array($this->renderCommitMessageLabel());
	}


	/**
	* @task commitmessage
	*/
	public function parseValueFromCommitMessage($value) {
	if ($this->getProxy()) {
	return $this->getProxy()->parseValueFromCommitMessage($value);
	}
	return $value;
	}


	/**
	* @task commitmessage
	*/
	public function readValueFromCommitMessage($value) {
	if ($this->getProxy()) {
	$this->getProxy()->readValueFromCommitMessage($value);
	return $this;
	}
	return $this;
	}


	/**
	* @task commitmessage
	*/
	public function shouldOverwriteWhenCommitMessageIsEdited() {
	if ($this->getProxy()) {
	return $this->getProxy()->shouldOverwriteWhenCommitMessageIsEdited();
	}
	return false;
	}


	/**
	* @task commitmessage
	*/
	public function getRequiredHandlePHIDsForCommitMessage() {
	if ($this->getProxy()) {
	return $this->getProxy()->getRequiredHandlePHIDsForCommitMessage();
	}
	return array();
	}


	/**
	* @task commitmessage
	*/
	public function renderCommitMessageLabel() {
	if ($this->getProxy()) {
	return $this->getProxy()->renderCommitMessageLabel();
	}
	return $this->getFieldName();
	}


	/**
	* @task commitmessage
	*/
	public function renderCommitMessageValue(array $handles) {
	if ($this->getProxy()) {
	return $this->getProxy()->renderCommitMessageValue($handles);
	}
	throw new PhabricatorCustomFieldImplementationIncompleteException($this);
	}


	/**
	* @task commitmessage
	*/
	public function validateCommitMessageValue($value) {
	if ($this->getProxy()) {
	return $this->getProxy()->validateCommitMessageValue($value);
	}
	return;
	}

	+
	+/* -( Integration with Diff Properties )----------------------------------- */
	+
	+
	+ /**
	+ * @task diff
	+ */
	+ public function shouldAppearInDiffPropertyView() {
	+ if ($this->getProxy()) {
	+ return $this->getProxy()->shouldAppearInDiffPropertyView();
	+ }
	+ return false;
	+ }
	+
	+
	+ /**
	+ * @task diff
	+ */
	+ public function renderDiffPropertyViewLabel(DifferentialDiff $diff) {
	+ if ($this->proxy) {
	+ return $this->proxy->renderDiffPropertyViewLabel($diff);
	+ }
	+ return $this->getFieldName();
	+ }
	+
	+
	+ /**
	+ * @task diff
	+ */
	+ public function renderDiffPropertyViewValue(DifferentialDiff $diff) {
	+ if ($this->proxy) {
	+ return $this->proxy->renderDiffPropertyViewValue($diff);
	+ }
	+ throw new PhabricatorCustomFieldImplementationIncompleteException($this);
	+ }
	+
	}
	diff --git a/src/applications/differential/customfield/DifferentialHostField.php b/src/applications/differential/customfield/DifferentialHostField.php
	index 2c5c65b8c1..af71dcf987 100644
	--- a/src/applications/differential/customfield/DifferentialHostField.php
	+++ b/src/applications/differential/customfield/DifferentialHostField.php
	@@ -1,39 +1,47 @@
	<?php

	final class DifferentialHostField
	extends DifferentialCustomField {

	public function getFieldKey() {
	return 'differential:host';
	}

	public function getFieldName() {
	return pht('Host');
	}

	public function getFieldDescription() {
	return pht('Shows the local host where the diff came from.');
	}

	public function shouldDisableByDefault() {
	return true;
	}

	public function shouldAppearInPropertyView() {
	return true;
	}

	- public function renderPropertyViewLabel() {
	+ public function renderPropertyViewValue(array $handles) {
	+ return null;
	+ }
	+
	+ public function shouldAppearInDiffPropertyView() {
	+ return true;
	+ }
	+
	+ public function renderDiffPropertyViewLabel(DifferentialDiff $diff) {
	return $this->getFieldName();
	}

	- public function renderPropertyViewValue(array $handles) {
	- $host = $this->getObject()->getActiveDiff()->getSourceMachine();
	+ public function renderDiffPropertyViewValue(DifferentialDiff $diff) {
	+ $host = $diff->getSourceMachine();
	if (!$host) {
	return null;
	}

	return $host;
	}

	}
	diff --git a/src/applications/differential/customfield/DifferentialLintField.php b/src/applications/differential/customfield/DifferentialLintField.php
	index c43034dd06..94df1b7e07 100644
	--- a/src/applications/differential/customfield/DifferentialLintField.php
	+++ b/src/applications/differential/customfield/DifferentialLintField.php
	@@ -1,264 +1,281 @@
	<?php

	final class DifferentialLintField
	extends DifferentialCustomField {

	public function getFieldKey() {
	return 'differential:lint';
	}

	public function getFieldName() {
	return pht('Lint');
	}

	public function getFieldDescription() {
	return pht('Shows lint results.');
	}

	public function shouldAppearInPropertyView() {
	return true;
	}

	- public function renderPropertyViewLabel() {
	+ public function renderPropertyViewValue(array $handles) {
	+ return null;
	+ }
	+
	+ public function shouldAppearInDiffPropertyView() {
	+ return true;
	+ }
	+
	+ public function renderDiffPropertyViewLabel(DifferentialDiff $diff) {
	return $this->getFieldName();
	}

	- public function getRequiredDiffPropertiesForRevisionView() {
	- return array(
	+ public function renderDiffPropertyViewValue(DifferentialDiff $diff) {
	+ // TODO: This load is slightly inefficient, but most of this is moving
	+ // to Harbormaster and this simplifies the transition. Eat 1-2 extra
	+ // queries for now.
	+ $keys = array(
	'arc:lint',
	'arc:lint-excuse',
	'arc:lint-postponed',
	);
	- }

	- public function renderPropertyViewValue(array $handles) {
	- $diff = $this->getObject()->getActiveDiff();
	+ $properties = id(new DifferentialDiffProperty())->loadAllWhere(
	+ 'diffID = %d AND name IN (%Ls)',
	+ $diff->getID(),
	+ $keys);
	+ $properties = mpull($properties, 'getData', 'getName');
	+
	+ foreach ($keys as $key) {
	+ $diff->attachProperty($key, idx($properties, $key));
	+ }

	$path_changesets = mpull($diff->loadChangesets(), 'getID', 'getFilename');

	$lstar = DifferentialRevisionUpdateHistoryView::renderDiffLintStar($diff);
	$lmsg = DifferentialRevisionUpdateHistoryView::getDiffLintMessage($diff);
	$ldata = $diff->getProperty('arc:lint');
	$ltail = null;

	$rows = array();

	$rows[] = array(
	'style' => 'star',
	'name' => $lstar,
	'value' => $lmsg,
	'show' => true,
	);

	$excuse = $diff->getProperty('arc:lint-excuse');
	if ($excuse) {
	$rows[] = array(
	'style' => 'excuse',
	'name' => 'Excuse',
	'value' => phutil_escape_html_newlines($excuse),
	'show' => true,
	);
	}

	$show_limit = 10;
	$hidden = array();

	if ($ldata) {
	$ldata = igroup($ldata, 'path');
	foreach ($ldata as $path => $messages) {

	$rows[] = array(
	'style' => 'section',
	'name' => $path,
	'show' => $show_limit,
	);

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

	$line_link = pht('line %d', intval($line));
	if (isset($path_changesets[$path])) {
	$href = '#C'.$path_changesets[$path].'NL'.max(1, $line);

	// TODO: We are always showing the active diff
	// if ($diff->getID() != $this->getDiff()->getID()) {
	// $href = '/D'.$diff->getRevisionID().'?id='.$diff->getID().$href;
	// }

	$line_link = phutil_tag(
	'a',
	array(
	'href' => $href,
	),
	$line_link);
	}

	if ($show_limit) {
	--$show_limit;
	$show = true;
	} else {
	$show = false;
	if (empty($hidden[$severity])) {
	$hidden[$severity] = 0;
	}
	$hidden[$severity]++;
	}

	$rows[] = array(
	'style' => $this->getSeverityStyle($severity),
	'name' => ucwords($severity),
	'value' => hsprintf(
	'(%s) %s at %s',
	$code,
	$name,
	$line_link),
	'show' => $show,
	);

	if (!empty($message['locations'])) {
	$locations = array();
	foreach ($message['locations'] as $location) {
	$other_line = idx($location, 'line');
	$locations[] =
	idx($location, 'path', $path).
	($other_line ? ":{$other_line}" : '');
	}
	$description .= "\n".pht(
	'Other locations: %s',
	implode(', ', $locations));
	}

	if (strlen($description)) {
	$rows[] = array(
	'style' => 'details',
	'value' => phutil_escape_html_newlines($description),
	'show' => false,
	);
	if (empty($hidden['details'])) {
	$hidden['details'] = 0;
	}
	$hidden['details']++;
	}
	}
	}
	}

	$postponed = $diff->getProperty('arc:lint-postponed');
	if ($postponed) {
	foreach ($postponed as $linter) {
	$rows[] = array(
	'style' => $this->getPostponedStyle(),
	'name' => 'Postponed',
	'value' => $linter,
	'show' => false,
	);
	if (empty($hidden['postponed'])) {
	$hidden['postponed'] = 0;
	}
	$hidden['postponed']++;
	}
	}

	$show_string = $this->renderShowString($hidden);

	$view = new DifferentialResultsTableView();
	$view->setRows($rows);
	$view->setShowMoreString($show_string);

	return $view->render();
	}

	private function getSeverityStyle($severity) {
	$map = array(
	ArcanistLintSeverity::SEVERITY_ERROR => 'red',
	ArcanistLintSeverity::SEVERITY_WARNING => 'yellow',
	ArcanistLintSeverity::SEVERITY_AUTOFIX => 'yellow',
	ArcanistLintSeverity::SEVERITY_ADVICE => 'yellow',
	);
	return idx($map, $severity);
	}

	private function getPostponedStyle() {
	return 'blue';
	}

	private function renderShowString(array $hidden) {
	if (!$hidden) {
	return null;
	}

	// Reorder hidden things by severity.
	$hidden = array_select_keys(
	$hidden,
	array(
	ArcanistLintSeverity::SEVERITY_ERROR,
	ArcanistLintSeverity::SEVERITY_WARNING,
	ArcanistLintSeverity::SEVERITY_AUTOFIX,
	ArcanistLintSeverity::SEVERITY_ADVICE,
	'details',
	'postponed',
	)) + $hidden;

	$show = array();
	foreach ($hidden as $key => $value) {
	switch ($key) {
	case ArcanistLintSeverity::SEVERITY_ERROR:
	$show[] = pht('%d Error(s)', $value);
	break;
	case ArcanistLintSeverity::SEVERITY_WARNING:
	$show[] = pht('%d Warning(s)', $value);
	break;
	case ArcanistLintSeverity::SEVERITY_AUTOFIX:
	$show[] = pht('%d Auto-Fix(es)', $value);
	break;
	case ArcanistLintSeverity::SEVERITY_ADVICE:
	$show[] = pht('%d Advice(s)', $value);
	break;
	case 'details':
	$show[] = pht('%d Detail(s)', $value);
	break;
	case 'postponed':
	$show[] = pht('%d Postponed', $value);
	break;
	default:
	$show[] = $value;
	break;
	}
	}

	return pht(
	'Show Full Lint Results (%s)',
	implode(', ', $show));
	}

	public function getWarningsForDetailView() {
	$status = $this->getObject()->getActiveDiff()->getLintStatus();
	if ($status < DifferentialLintStatus::LINT_WARN) {
	return array();
	}
	if ($status == DifferentialLintStatus::LINT_AUTO_SKIP) {
	return array();
	}

	$warnings = array();
	if ($status == DifferentialLintStatus::LINT_SKIP) {
	$warnings[] = pht(
	'Lint was skipped when generating these changes.');
	} else if ($status == DifferentialLintStatus::LINT_POSTPONED) {
	$warnings[] = pht(
	'Background linting has not finished executing on these changes.');
	} else {
	$warnings[] = pht('These changes have lint problems.');
	}

	return $warnings;
	}

	}
	diff --git a/src/applications/differential/customfield/DifferentialPathField.php b/src/applications/differential/customfield/DifferentialPathField.php
	index 1eb0ffbf50..39ca8abd50 100644
	--- a/src/applications/differential/customfield/DifferentialPathField.php
	+++ b/src/applications/differential/customfield/DifferentialPathField.php
	@@ -1,39 +1,47 @@
	<?php

	final class DifferentialPathField
	extends DifferentialCustomField {

	public function getFieldKey() {
	return 'differential:path';
	}

	public function getFieldName() {
	return pht('Path');
	}

	public function getFieldDescription() {
	return pht('Shows the local path where the diff came from.');
	}

	public function shouldDisableByDefault() {
	return true;
	}

	public function shouldAppearInPropertyView() {
	return true;
	}

	- public function renderPropertyViewLabel() {
	+ public function renderPropertyViewValue(array $handles) {
	+ return null;
	+ }
	+
	+ public function shouldAppearInDiffPropertyView() {
	+ return true;
	+ }
	+
	+ public function renderDiffPropertyViewLabel(DifferentialDiff $diff) {
	return $this->getFieldName();
	}

	- public function renderPropertyViewValue(array $handles) {
	- $path = $this->getObject()->getActiveDiff()->getSourcePath();
	+ public function renderDiffPropertyViewValue(DifferentialDiff $diff) {
	+ $path = $diff->getSourcePath();
	if (!$path) {
	return null;
	}

	return $path;
	}

	}
	diff --git a/src/applications/differential/customfield/DifferentialRepositoryField.php b/src/applications/differential/customfield/DifferentialRepositoryField.php
	index fc6c88194a..7f39d25823 100644
	--- a/src/applications/differential/customfield/DifferentialRepositoryField.php
	+++ b/src/applications/differential/customfield/DifferentialRepositoryField.php
	@@ -1,163 +1,167 @@
	<?php

	final class DifferentialRepositoryField
	extends DifferentialCoreCustomField {

	public function getFieldKey() {
	return 'differential:repository';
	}

	public function getFieldName() {
	return pht('Repository');
	}

	public function getFieldDescription() {
	return pht('Associates a revision with a repository.');
	}

	protected function readValueFromRevision(
	DifferentialRevision $revision) {
	return $revision->getRepositoryPHID();
	}

	protected function writeValueToRevision(
	DifferentialRevision $revision,
	$value) {
	$revision->setRepositoryPHID($value);
	}

	public function readValueFromRequest(AphrontRequest $request) {
	$phids = $request->getArr($this->getFieldKey());
	$first = head($phids);
	$this->setValue(nonempty($first, null));
	}

	public function renderEditControl(array $handles) {
	if ($this->getValue()) {
	$value = array($this->getValue());
	} else {
	$value = array();
	}

	return id(new AphrontFormTokenizerControl())
	->setUser($this->getViewer())
	->setName($this->getFieldKey())
	->setDatasource(new DiffusionRepositoryDatasource())
	->setValue($value)
	->setError($this->getFieldError())
	->setLabel($this->getFieldName())
	->setLimit(1);
	}

	public function getApplicationTransactionRequiredHandlePHIDs(
	PhabricatorApplicationTransaction $xaction) {

	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();

	$phids = array();
	if ($old) {
	$phids[] = $old;
	}
	if ($new) {
	$phids[] = $new;
	}

	return $phids;
	}

	public function getApplicationTransactionTitle(
	PhabricatorApplicationTransaction $xaction) {
	$author_phid = $xaction->getAuthorPHID();
	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();

	if ($old && $new) {
	return pht(
	'%s changed the repository for this revision from %s to %s.',
	$xaction->renderHandleLink($author_phid),
	$xaction->renderHandleLink($old),
	$xaction->renderHandleLink($new));
	} else if ($new) {
	return pht(
	'%s set the repository for this revision to %s.',
	$xaction->renderHandleLink($author_phid),
	$xaction->renderHandleLink($new));
	} else {
	return pht(
	'%s removed %s as the repository for this revision.',
	$xaction->renderHandleLink($author_phid),
	$xaction->renderHandleLink($old));
	}
	}

	public function getApplicationTransactionTitleForFeed(
	PhabricatorApplicationTransaction $xaction) {

	$object_phid = $xaction->getObjectPHID();
	$author_phid = $xaction->getAuthorPHID();
	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();

	if ($old && $new) {
	return pht(
	'%s updated the repository for %s from %s to %s.',
	$xaction->renderHandleLink($author_phid),
	$xaction->renderHandleLink($object_phid),
	$xaction->renderHandleLink($old),
	$xaction->renderHandleLink($new));
	} else if ($new) {
	return pht(
	'%s set the repository for %s to %s.',
	$xaction->renderHandleLink($author_phid),
	$xaction->renderHandleLink($object_phid),
	$xaction->renderHandleLink($new));
	} else {
	return pht(
	'%s removed the repository for %s. (Repository was %s.)',
	$xaction->renderHandleLink($author_phid),
	$xaction->renderHandleLink($object_phid),
	$xaction->renderHandleLink($old));
	}
	}

	public function shouldAppearInPropertyView() {
	return true;
	}

	- public function renderPropertyViewLabel() {
	+ public function renderPropertyViewValue(array $handles) {
	+ return null;
	+ }
	+
	+ public function shouldAppearInDiffPropertyView() {
	+ return true;
	+ }
	+
	+ public function renderDiffPropertyViewLabel(DifferentialDiff $diff) {
	return $this->getFieldName();
	}

	- public function getRequiredHandlePHIDsForPropertyView() {
	- $repository_phid = $this->getObject()->getRepositoryPHID();
	- if ($repository_phid) {
	- return array($repository_phid);
	+ public function renderDiffPropertyViewValue(DifferentialDiff $diff) {
	+ if (!$diff->getRepositoryPHID()) {
	+ return null;
	}
	- return array();
	- }

	- public function renderPropertyViewValue(array $handles) {
	- return $this->renderHandleList($handles);
	+ return $this->getViewer()->renderHandle($diff->getRepositoryPHID());
	}

	public function shouldAppearInTransactionMail() {
	return true;
	}

	public function updateTransactionMailBody(
	PhabricatorMetaMTAMailBody $body,
	PhabricatorApplicationTransactionEditor $editor,
	array $xactions) {

	$repository = $this->getObject()->getRepository();
	if ($repository === null) {
	return;
	}

	$body->addTextSection(
	pht('REPOSITORY'),
	$repository->getMonogram().' '.$repository->getName());
	}

	}
	diff --git a/src/applications/differential/customfield/DifferentialUnitField.php b/src/applications/differential/customfield/DifferentialUnitField.php
	index 2cc86d2660..56ea06d3ae 100644
	--- a/src/applications/differential/customfield/DifferentialUnitField.php
	+++ b/src/applications/differential/customfield/DifferentialUnitField.php
	@@ -1,236 +1,251 @@
	<?php

	final class DifferentialUnitField
	extends DifferentialCustomField {

	public function getFieldKey() {
	return 'differential:unit';
	}

	public function getFieldName() {
	return pht('Unit');
	}

	public function getFieldDescription() {
	return pht('Shows unit test results.');
	}

	public function shouldAppearInPropertyView() {
	return true;
	}

	- public function renderPropertyViewLabel() {
	+ public function renderPropertyViewValue(array $handles) {
	+ return null;
	+ }
	+
	+ public function shouldAppearInDiffPropertyView() {
	+ return true;
	+ }
	+
	+ public function renderDiffPropertyViewLabel(DifferentialDiff $diff) {
	return $this->getFieldName();
	}

	- public function getRequiredDiffPropertiesForRevisionView() {
	- return array(
	+ public function renderDiffPropertyViewValue(DifferentialDiff $diff) {
	+ // TODO: See DifferentialLintField.
	+ $keys = array(
	'arc:unit',
	'arc:unit-excuse',
	);
	- }

	- public function renderPropertyViewValue(array $handles) {
	- $diff = $this->getObject()->getActiveDiff();
	+ $properties = id(new DifferentialDiffProperty())->loadAllWhere(
	+ 'diffID = %d AND name IN (%Ls)',
	+ $diff->getID(),
	+ $keys);
	+ $properties = mpull($properties, 'getData', 'getName');
	+
	+ foreach ($keys as $key) {
	+ $diff->attachProperty($key, idx($properties, $key));
	+ }

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

	$rows = array();

	$rows[] = array(
	'style' => 'star',
	'name' => $ustar,
	'value' => $umsg,
	'show' => true,
	);

	$excuse = $diff->getProperty('arc:unit-excuse');
	if ($excuse) {
	$rows[] = array(
	'style' => 'excuse',
	'name' => pht('Excuse'),
	'value' => phutil_escape_html_newlines($excuse),
	'show' => true,
	);
	}

	$show_limit = 10;
	$hidden = array();

	$udata = $diff->getProperty('arc:unit');
	if ($udata) {
	$sort_map = array(
	ArcanistUnitTestResult::RESULT_BROKEN => 0,
	ArcanistUnitTestResult::RESULT_FAIL => 1,
	ArcanistUnitTestResult::RESULT_UNSOUND => 2,
	ArcanistUnitTestResult::RESULT_SKIP => 3,
	ArcanistUnitTestResult::RESULT_POSTPONED => 4,
	ArcanistUnitTestResult::RESULT_PASS => 5,
	);

	foreach ($udata as $key => $test) {
	$udata[$key]['sort'] = idx($sort_map, idx($test, 'result'));
	}
	$udata = isort($udata, 'sort');
	$engine = new PhabricatorMarkupEngine();
	$engine->setViewer($this->getViewer());
	$markup_objects = array();
	foreach ($udata as $key => $test) {
	$userdata = idx($test, 'userdata');
	if ($userdata) {
	if ($userdata !== false) {
	$userdata = str_replace("\000", '', $userdata);
	}
	$markup_object = id(new PhabricatorMarkupOneOff())
	->setContent($userdata)
	->setPreserveLinebreaks(true);
	$engine->addObject($markup_object, 'default');
	$markup_objects[$key] = $markup_object;
	}
	}
	$engine->process();
	foreach ($udata as $key => $test) {
	$result = idx($test, 'result');

	$default_hide = false;
	switch ($result) {
	case ArcanistUnitTestResult::RESULT_POSTPONED:
	case ArcanistUnitTestResult::RESULT_PASS:
	$default_hide = true;
	break;
	}

	if ($show_limit && !$default_hide) {
	--$show_limit;
	$show = true;
	} else {
	$show = false;
	if (empty($hidden[$result])) {
	$hidden[$result] = 0;
	}
	$hidden[$result]++;
	}

	$value = idx($test, 'name');

	$namespace = idx($test, 'namespace');
	if ($namespace) {
	$value = $namespace.'::'.$value;
	}

	if (!empty($test['link'])) {
	$value = phutil_tag(
	'a',
	array(
	'href' => $test['link'],
	'target' => '_blank',
	),
	$value);
	}
	$rows[] = array(
	'style' => $this->getResultStyle($result),
	'name' => ucwords($result),
	'value' => $value,
	'show' => $show,
	);

	if (isset($markup_objects[$key])) {
	$rows[] = array(
	'style' => 'details',
	'value' => $engine->getOutput($markup_objects[$key], 'default'),
	'show' => false,
	);
	if (empty($hidden['details'])) {
	$hidden['details'] = 0;
	}
	$hidden['details']++;
	}
	}
	}

	$show_string = $this->renderShowString($hidden);

	$view = new DifferentialResultsTableView();
	$view->setRows($rows);
	$view->setShowMoreString($show_string);

	return $view->render();
	}

	private function getResultStyle($result) {
	$map = array(
	ArcanistUnitTestResult::RESULT_PASS => 'green',
	ArcanistUnitTestResult::RESULT_FAIL => 'red',
	ArcanistUnitTestResult::RESULT_SKIP => 'blue',
	ArcanistUnitTestResult::RESULT_BROKEN => 'red',
	ArcanistUnitTestResult::RESULT_UNSOUND => 'yellow',
	ArcanistUnitTestResult::RESULT_POSTPONED => 'blue',
	);
	return idx($map, $result);
	}

	private function renderShowString(array $hidden) {
	if (!$hidden) {
	return null;
	}

	// Reorder hidden things by severity.
	$hidden = array_select_keys(
	$hidden,
	array(
	ArcanistUnitTestResult::RESULT_BROKEN,
	ArcanistUnitTestResult::RESULT_FAIL,
	ArcanistUnitTestResult::RESULT_UNSOUND,
	ArcanistUnitTestResult::RESULT_SKIP,
	ArcanistUnitTestResult::RESULT_POSTPONED,
	ArcanistUnitTestResult::RESULT_PASS,
	'details',
	)) + $hidden;

	$noun = array(
	ArcanistUnitTestResult::RESULT_BROKEN => pht('Broken'),
	ArcanistUnitTestResult::RESULT_FAIL => pht('Failed'),
	ArcanistUnitTestResult::RESULT_UNSOUND => pht('Unsound'),
	ArcanistUnitTestResult::RESULT_SKIP => pht('Skipped'),
	ArcanistUnitTestResult::RESULT_POSTPONED => pht('Postponed'),
	ArcanistUnitTestResult::RESULT_PASS => pht('Passed'),
	);

	$show = array();
	foreach ($hidden as $key => $value) {
	if ($key == 'details') {
	$show[] = pht('%d Detail(s)', $value);
	} else {
	$show[] = $value.' '.idx($noun, $key);
	}
	}

	return pht(
	'Show Full Unit Results (%s)',
	implode(', ', $show));
	}

	public function getWarningsForDetailView() {
	$status = $this->getObject()->getActiveDiff()->getUnitStatus();

	$warnings = array();
	if ($status < DifferentialUnitStatus::UNIT_WARN) {
	// Don't show any warnings.
	} else if ($status == DifferentialUnitStatus::UNIT_AUTO_SKIP) {
	// Don't show any warnings.
	} else if ($status == DifferentialUnitStatus::UNIT_POSTPONED) {
	$warnings[] = pht(
	'Background tests have not finished executing on these changes.');
	} else if ($status == DifferentialUnitStatus::UNIT_SKIP) {
	$warnings[] = pht(
	'Unit tests were skipped when generating these changes.');
	} else {
	$warnings[] = pht('These changes have unit test problems.');
	}

	return $warnings;
	}


	}
	diff --git a/src/applications/harbormaster/event/HarbormasterUIEventListener.php b/src/applications/harbormaster/event/HarbormasterUIEventListener.php
	index 7df5c111bd..e965e67fb6 100644
	--- a/src/applications/harbormaster/event/HarbormasterUIEventListener.php
	+++ b/src/applications/harbormaster/event/HarbormasterUIEventListener.php
	@@ -1,90 +1,97 @@
	<?php

	final class HarbormasterUIEventListener
	extends PhabricatorEventListener {

	public function register() {
	$this->listen(PhabricatorEventType::TYPE_UI_WILLRENDERPROPERTIES);
	}

	public function handleEvent(PhutilEvent $event) {
	switch ($event->getType()) {
	case PhabricatorEventType::TYPE_UI_WILLRENDERPROPERTIES:
	$this->handlePropertyEvent($event);
	break;
	}
	}

	private function handlePropertyEvent($ui_event) {
	$user = $ui_event->getUser();
	$object = $ui_event->getValue('object');

	if (!$object \|\| !$object->getPHID()) {
	// No object, or the object has no PHID yet..
	return;
	}

	if ($object instanceof HarbormasterBuildable) {
	// Although HarbormasterBuildable implements the correct interface, it
	// does not make sense to show a build's build status. In the best case
	// it is meaningless, and in the worst case it's confusing.
	return;
	}

	+ if ($object instanceof DifferentialRevision) {
	+ // TODO: This is a bit hacky and we could probably find a cleaner fix
	+ // eventually, but we show build status on each diff, immediately below
	+ // this property list, so it's redundant to show it on the revision view.
	+ return;
	+ }
	+
	if (!($object instanceof HarbormasterBuildableInterface)) {
	return;
	}

	$buildable_phid = $object->getHarbormasterBuildablePHID();
	if (!$buildable_phid) {
	return;
	}

	if (!$this->canUseApplication($ui_event->getUser())) {
	return;
	}

	$buildables = id(new HarbormasterBuildableQuery())
	->setViewer($user)
	->withManualBuildables(false)
	->withBuildablePHIDs(array($buildable_phid))
	->execute();
	if (!$buildables) {
	return;
	}

	$builds = id(new HarbormasterBuildQuery())
	->setViewer($user)
	->withBuildablePHIDs(mpull($buildables, 'getPHID'))
	->execute();
	if (!$builds) {
	return;
	}

	$build_handles = id(new PhabricatorHandleQuery())
	->setViewer($user)
	->withPHIDs(mpull($builds, 'getPHID'))
	->execute();

	$status_view = new PHUIStatusListView();

	foreach ($builds as $build) {
	$item = new PHUIStatusItemView();
	$item->setTarget($build_handles[$build->getPHID()]->renderLink());

	$status = $build->getBuildStatus();
	$status_name = HarbormasterBuild::getBuildStatusName($status);
	$icon = HarbormasterBuild::getBuildStatusIcon($status);
	$color = HarbormasterBuild::getBuildStatusColor($status);

	$item->setIcon($icon, $color, $status_name);


	$status_view->addItem($item);
	}

	$view = $ui_event->getValue('view');
	$view->addProperty(pht('Build Status'), $status_view);
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Jul 27, 2:08 PM (1 w, 5 h ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 185815
Default Alt Text: (83 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions