No OneTemporary
Actions

Size

65 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/differential/controller/DifferentialDiffViewController.php b/src/applications/differential/controller/DifferentialDiffViewController.php
	index 4bfd373c2b..dd909da1d6 100644
	--- a/src/applications/differential/controller/DifferentialDiffViewController.php
	+++ b/src/applications/differential/controller/DifferentialDiffViewController.php
	@@ -1,169 +1,144 @@
	<?php

	final class DifferentialDiffViewController extends DifferentialController {

	private $id;

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

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

	$diff = id(new DifferentialDiffQuery())
	->setViewer($viewer)
	->withIDs(array($this->id))
	->executeOne();
	if (!$diff) {
	return new Aphront404Response();
	}

	$error_view = id(new AphrontErrorView())
	->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
	if ($diff->getRevisionID()) {
	$error_view->appendChild(
	pht(
	'This diff belongs to revision %s.',
	phutil_tag(
	'a',
	array(
	'href' => '/D'.$diff->getRevisionID(),
	),
	'D'.$diff->getRevisionID())));
	} else {
	// TODO: implement optgroup support in AphrontFormSelectControl?
	$select = array();
	$select[] = hsprintf('<optgroup label="%s">', pht('Create New Revision'));
	$select[] = phutil_tag(
	'option',
	array('value' => ''),
	pht('Create a new Revision...'));
	$select[] = hsprintf('</optgroup>');

	$revisions = id(new DifferentialRevisionQuery())
	->setViewer($viewer)
	->withAuthors(array($viewer->getPHID()))
	->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
	->execute();

	if ($revisions) {
	$select[] = hsprintf(
	'<optgroup label="%s">',
	pht('Update Existing Revision'));
	foreach ($revisions as $revision) {
	$select[] = phutil_tag(
	'option',
	array(
	'value' => $revision->getID(),
	),
	phutil_utf8_shorten(
	'D'.$revision->getID().' '.$revision->getTitle(), 128));
	}
	$select[] = hsprintf('</optgroup>');
	}

	$select = phutil_tag(
	'select',
	array('name' => 'revisionID'),
	$select);

	$form = id(new AphrontFormView())
	->setUser($request->getUser())
	->setAction('/differential/revision/edit/')
	->addHiddenInput('diffID', $diff->getID())
	->addHiddenInput('viaDiffView', 1)
	->appendRemarkupInstructions(
	pht(
	'Review the diff for correctness. When you are satisfied, either '.
	'create a new revision or update an existing revision.'))
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel(pht('Attach To'))
	->setValue($select))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Continue')));

	$error_view->appendChild($form);
	}

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

	- $aux_fields = DifferentialFieldSelector::newSelector()
	- ->getFieldSpecifications();
	- foreach ($aux_fields as $key => $aux_field) {
	- if (!$aux_field->shouldAppearOnDiffView()) {
	- unset($aux_fields[$key]);
	- } else {
	- $aux_field->setUser($this->getRequest()->getUser());
	- }
	- }
	-
	- $dict = array();
	- foreach ($aux_fields as $key => $aux_field) {
	- $aux_field->setDiff($diff);
	- $aux_field->setManualDiff($diff);
	- $aux_field->setDiffProperties($props);
	- $value = $aux_field->renderValueForDiffView();
	- if (strlen($value)) {
	- $label = rtrim($aux_field->renderLabelForDiffView(), ':');
	- $dict[$label] = $value;
	- }
	- }
	-
	$property_head = id(new PHUIHeaderView())
	->setHeader(pht('Properties'));

	$property_view = new PHUIPropertyListView();
	- foreach ($dict as $key => $value) {
	- $property_view->addProperty($key, $value);
	- }

	$changesets = $diff->loadChangesets();
	$changesets = msort($changesets, 'getSortKey');

	$table_of_contents = id(new DifferentialDiffTableOfContentsView())
	->setChangesets($changesets)
	->setVisibleChangesets($changesets)
	->setUnitTestData(idx($props, 'arc:unit', array()));

	$refs = array();
	foreach ($changesets as $changeset) {
	$refs[$changeset->getID()] = $changeset->getID();
	}

	$details = id(new DifferentialChangesetListView())
	->setChangesets($changesets)
	->setVisibleChangesets($changesets)
	->setRenderingReferences($refs)
	->setStandaloneURI('/differential/changeset/')
	->setDiff($diff)
	->setTitle(pht('Diff %d', $diff->getID()))
	->setUser($request->getUser());

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Diff %d', $diff->getID()));

	$prop_box = id(new PHUIObjectBoxView())
	->setHeader($property_head)
	->addPropertyList($property_view)
	->setErrorView($error_view);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$prop_box,
	$table_of_contents,
	$details,
	),
	array(
	'title' => pht('Diff View'),
	));
	}

	}
	diff --git a/src/applications/differential/controller/DifferentialRevisionListController.php b/src/applications/differential/controller/DifferentialRevisionListController.php
	index 331d353a1b..d3048325ab 100644
	--- a/src/applications/differential/controller/DifferentialRevisionListController.php
	+++ b/src/applications/differential/controller/DifferentialRevisionListController.php
	@@ -1,87 +1,86 @@
	<?php

	final class DifferentialRevisionListController extends DifferentialController
	implements PhabricatorApplicationSearchResultsControllerInterface {

	private $queryKey;

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

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

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

	$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 9b919d1244..026f664dad 100644
	--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
	+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
	@@ -1,919 +1,918 @@
	<?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(
	"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;
	}

	$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(
	$revision,
	$changesets,
	$vs_changesets,
	$vs_map,
	$repository);
	}

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

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

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

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

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


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


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

	$revision_detail_box = $revision_detail->render();

	$revision_warnings = $this->buildRevisionWarnings($revision, $handles);
	if ($revision_warnings) {
	$revision_detail_box->setErrorView($revision_warnings);
	}

	$comment_view = $this->buildTransactions(
	$revision,
	$diff_vs ? $diffs[$diff_vs] : $target,
	$target,
	$all_changesets);

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

	if ($arc_project) {
	Javelin::initBehavior(
	'repository-crossreference',
	array(
	'section' => $wrap_id,
	'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);

	// TODO: Restore the ability for fields to add accept warnings.

	$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(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(
	$top_anchor,
	$revision_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())
	->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) {
	$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('edit')
	->setHref("/differential/revision/edit/{$revision_id}/")
	->setName(pht('Edit Revision'))
	->setDisabled(!$can_edit)
	->setWorkflow(!$can_edit);

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

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

	$maniphest = 'PhabricatorApplicationManiphest';
	if (PhabricatorApplication::isClassInstalled($maniphest)) {
	$actions[] = id(new PhabricatorActionView())
	->setIcon('attach')
	->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('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_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_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_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 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)
	->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');

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

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

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

	foreach ($changesets as $changeset) {
	$changeset->attachHunks($changeset->loadHunks());
	}

	$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(
	$this->getRequest()->getUser(),
	$revision->getPHID());
	unset($unguarded);

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

	}

	private function buildTransactions(
	DifferentialRevision $revision,
	DifferentialDiff $left_diff,
	DifferentialDiff $right_diff,
	array $changesets) {
	$viewer = $this->getRequest()->getUser();

	$xactions = id(new DifferentialTransactionQuery())
	->setViewer($viewer)
	->withObjectPHIDs(array($revision->getPHID()))
	->needComments(true)
	->execute();

	$timeline = id(new DifferentialTransactionView())
	->setUser($viewer)
	->setObjectPHID($revision->getPHID())
	->setChangesets($changesets)
	->setRevision($revision)
	->setLeftDiff($left_diff)
	->setRightDiff($right_diff)
	->setTransactions($xactions);

	return $timeline;
	}

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

	$status_needs_review = ArcanistDifferentialRevisionStatus::NEEDS_REVIEW;
	if ($revision->getStatus() != $status_needs_review) {
	return;
	}

	foreach ($revision->getReviewers() as $reviewer) {
	if (!$handles[$reviewer]->isDisabled()) {
	return;
	}
	}

	$warnings = array();
	if ($revision->getReviewers()) {
	$warnings[] = pht(
	'This revision needs review, but all specified reviewers are '.
	'disabled or inactive.');
	} else {
	$warnings[] = pht(
	'This revision needs review, but there are no reviewers specified.');
	}

	return id(new AphrontErrorView())
	->setSeverity(AphrontErrorView::SEVERITY_WARNING)
	->setErrors($warnings);
	}

	}
	diff --git a/src/applications/differential/view/DifferentialRevisionListView.php b/src/applications/differential/view/DifferentialRevisionListView.php
	index ad7f32f303..636390feaa 100644
	--- a/src/applications/differential/view/DifferentialRevisionListView.php
	+++ b/src/applications/differential/view/DifferentialRevisionListView.php
	@@ -1,227 +1,188 @@
	<?php

	/**
	* Render a table of Differential revisions.
	*/
	final class DifferentialRevisionListView extends AphrontView {

	private $revisions;
	private $handles;
	- private $fields;
	private $highlightAge;
	private $header;
	private $noDataString;

	public function setNoDataString($no_data_string) {
	$this->noDataString = $no_data_string;
	return $this;
	}

	public function setHeader($header) {
	$this->header = $header;
	return $this;
	}

	- public function setFields(array $fields) {
	- assert_instances_of($fields, 'DifferentialFieldSpecification');
	- $this->fields = $fields;
	- return $this;
	- }
	-
	public function setRevisions(array $revisions) {
	assert_instances_of($revisions, 'DifferentialRevision');
	$this->revisions = $revisions;
	return $this;
	}

	public function setHighlightAge($bool) {
	$this->highlightAge = $bool;
	return $this;
	}

	public function getRequiredHandlePHIDs() {
	$phids = array();
	- foreach ($this->fields as $field) {
	- foreach ($this->revisions as $revision) {
	- $phids[] = $field->getRequiredHandlePHIDsForRevisionList($revision);
	- }
	+ foreach ($this->revisions as $revision) {
	+ $phids[] = array($revision->getAuthorPHID());
	+
	+ // TODO: Switch to getReviewerStatus(), but not all callers pass us
	+ // revisions with this data loaded.
	+ $phids[] = $revision->getReviewers();
	}
	return array_mergev($phids);
	}

	public function setHandles(array $handles) {
	assert_instances_of($handles, 'PhabricatorObjectHandle');
	$this->handles = $handles;
	return $this;
	}

	public function render() {

	$user = $this->user;
	if (!$user) {
	throw new Exception("Call setUser() before render()!");
	}

	$fresh = PhabricatorEnv::getEnvConfig('differential.days-fresh');
	if ($fresh) {
	$fresh = PhabricatorCalendarHoliday::getNthBusinessDay(
	time(),
	-$fresh);
	}

	$stale = PhabricatorEnv::getEnvConfig('differential.days-stale');
	if ($stale) {
	$stale = PhabricatorCalendarHoliday::getNthBusinessDay(
	time(),
	-$stale);
	}

	$this->initBehavior('phabricator-tooltips', array());
	$this->requireResource('aphront-tooltip-css');

	- foreach ($this->fields as $field) {
	- $field->setHandles($this->handles);
	- }
	-
	$list = new PHUIObjectItemListView();
	$list->setCards(true);

	foreach ($this->revisions as $revision) {
	$item = id(new PHUIObjectItemView())
	->setUser($user);

	- $rev_fields = array();
	$icons = array();

	$phid = $revision->getPHID();
	$flag = $revision->getFlag($user);
	if ($flag) {
	$flag_class = PhabricatorFlagColor::getCSSClass($flag->getColor());
	$icons['flag'] = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-flag-icon '.$flag_class,
	),
	'');
	}

	if ($revision->getDrafts($user)) {
	$icons['draft'] = true;
	}

	$modified = $revision->getDateModified();

	$status = $revision->getStatus();
	$show_age = ($fresh \|\| $stale) &&
	$this->highlightAge &&
	!$revision->isClosed();

	- $object_age = PHUIObjectItemView::AGE_FRESH;
	- foreach ($this->fields as $field) {
	- if ($show_age) {
	- if ($field instanceof DifferentialDateModifiedFieldSpecification) {
	- if ($stale && $modified < $stale) {
	- $object_age = PHUIObjectItemView::AGE_OLD;
	- } else if ($fresh && $modified < $fresh) {
	- $object_age = PHUIObjectItemView::AGE_STALE;
	- }
	- }
	- }
	-
	- $rev_header = $field->renderHeaderForRevisionList();
	- $rev_fields[$rev_header] = $field
	- ->renderValueForRevisionList($revision);
	+ if ($stale && $modified < $stale) {
	+ $object_age = PHUIObjectItemView::AGE_OLD;
	+ } else if ($fresh && $modified < $fresh) {
	+ $object_age = PHUIObjectItemView::AGE_STALE;
	+ } else {
	+ $object_age = PHUIObjectItemView::AGE_FRESH;
	}

	$status_name =
	ArcanistDifferentialRevisionStatus::getNameForRevisionStatus($status);

	if (isset($icons['flag'])) {
	$item->addHeadIcon($icons['flag']);
	}

	$item->setObjectName('D'.$revision->getID());
	$item->setHeader(phutil_tag('a',
	array('href' => '/D'.$revision->getID()),
	$revision->getTitle()));

	if (isset($icons['draft'])) {
	$draft = id(new PHUIIconView())
	->setSpriteSheet(PHUIIconView::SPRITE_ICONS)
	->setSpriteIcon('file-grey')
	->addSigil('has-tooltip')
	->setMetadata(
	array(
	'tip' => pht('Unsubmitted Comments'),
	));
	$item->addAttribute($draft);
	}

	$item->addAttribute($status_name);

	// Author
	$author_handle = $this->handles[$revision->getAuthorPHID()];
	$item->addByline(pht('Author: %s', $author_handle->renderLink()));

	- // Reviewers
	- $item->addAttribute(pht('Reviewers: %s', $rev_fields['Reviewers']));
	+ $reviewers = array();
	+ // TODO: As above, this should be based on `getReviewerStatus()`.
	+ foreach ($revision->getReviewers() as $reviewer) {
	+ $reviewers[] = $this->handles[$reviewer]->renderLink();
	+ }
	+ if (!$reviewers) {
	+ $reviewers = phutil_tag('em', array(), pht('None'));
	+ } else {
	+ $reviewers = phutil_implode_html(', ', $reviewers);
	+ }

	+ $item->addAttribute(pht('Reviewers: %s', $reviewers));
	$item->setEpoch($revision->getDateModified(), $object_age);

	- // First remove the fields we already have
	- $count = 7;
	- $rev_fields = array_slice($rev_fields, $count);
	-
	- // Then add each one of them
	- // TODO: Add render-to-foot-icon support
	- foreach ($rev_fields as $header => $field) {
	- $item->addAttribute(pht('%s: %s', $header, $field));
	- }
	-
	switch ($status) {
	case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
	break;
	case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
	case ArcanistDifferentialRevisionStatus::CHANGES_PLANNED:
	$item->setBarColor('red');
	break;
	case ArcanistDifferentialRevisionStatus::ACCEPTED:
	$item->setBarColor('green');
	break;
	case ArcanistDifferentialRevisionStatus::CLOSED:
	$item->setDisabled(true);
	break;
	case ArcanistDifferentialRevisionStatus::ABANDONED:
	$item->setBarColor('black');
	break;
	}

	$list->addItem($item);
	}

	$list->setHeader($this->header);
	$list->setNoDataString($this->noDataString);

	return $list;
	}

	- public static function getDefaultFields(PhabricatorUser $user) {
	- $selector = DifferentialFieldSelector::newSelector();
	- $fields = $selector->getFieldSpecifications();
	- foreach ($fields as $key => $field) {
	- $field->setUser($user);
	- if (!$field->shouldAppearOnRevisionList()) {
	- unset($fields[$key]);
	- }
	- }
	-
	- if (!$fields) {
	- throw new Exception(
	- "Phabricator configuration has no fields that appear on the list ".
	- "interface!");
	- }
	-
	- return $selector->sortFieldsForRevisionList($fields);
	- }
	-
	}
	diff --git a/src/applications/diffusion/controller/DiffusionBrowseController.php b/src/applications/diffusion/controller/DiffusionBrowseController.php
	index 0c1a7325e2..ce1f14cab3 100644
	--- a/src/applications/diffusion/controller/DiffusionBrowseController.php
	+++ b/src/applications/diffusion/controller/DiffusionBrowseController.php
	@@ -1,227 +1,226 @@
	<?php

	abstract class DiffusionBrowseController extends DiffusionController {

	public function shouldAllowPublic() {
	return true;
	}

	protected function renderSearchForm($collapsed) {
	$drequest = $this->getDiffusionRequest();

	$forms = array();
	$form = id(new AphrontFormView())
	->setUser($this->getRequest()->getUser())
	->setMethod('GET');

	switch ($drequest->getRepository()->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_SVN:
	$forms[] = id(clone $form)
	->appendChild(pht('Search is not available in Subversion.'));
	break;
	default:
	$forms[] = id(clone $form)
	->appendChild(
	id(new AphrontFormTextWithSubmitControl())
	->setLabel(pht('File Name'))
	->setSubmitLabel(pht('Search File Names'))
	->setName('find')
	->setValue($this->getRequest()->getStr('find')));
	$forms[] = id(clone $form)
	->appendChild(
	id(new AphrontFormTextWithSubmitControl())
	->setLabel(pht('Pattern'))
	->setSubmitLabel(pht('Grep File Content'))
	->setName('grep')
	->setValue($this->getRequest()->getStr('grep')));
	break;
	}


	$filter = new AphrontListFilterView();
	$filter->appendChild($forms);


	if ($collapsed) {
	$filter->setCollapsed(
	pht('Show Search'),
	pht('Hide Search'),
	pht('Search for file names or content in this directory.'),
	'#');
	}

	return $filter;
	}

	protected function markupText($text) {
	$engine = PhabricatorMarkupEngine::newDiffusionMarkupEngine();
	$engine->setConfig('viewer', $this->getRequest()->getUser());
	$text = $engine->markupText($text);

	$text = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-remarkup',
	),
	$text);

	return $text;
	}

	protected function buildHeaderView(DiffusionRequest $drequest) {
	$viewer = $this->getRequest()->getUser();

	$header = id(new PHUIHeaderView())
	->setUser($viewer)
	->setHeader($this->renderPathLinks($drequest, $mode = 'browse'))
	->setPolicyObject($drequest->getRepository());

	return $header;
	}

	protected function buildActionView(DiffusionRequest $drequest) {
	$viewer = $this->getRequest()->getUser();

	$view = id(new PhabricatorActionListView())
	->setUser($viewer);

	$history_uri = $drequest->generateURI(
	array(
	'action' => 'history',
	));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('View History'))
	->setHref($history_uri)
	->setIcon('history'));

	$behind_head = $drequest->getRawCommit();
	$head_uri = $drequest->generateURI(
	array(
	'commit' => '',
	'action' => 'browse',
	));
	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Jump to HEAD'))
	->setHref($head_uri)
	->setIcon('home')
	->setDisabled(!$behind_head));

	// TODO: Ideally, this should live in Owners and be event-triggered, but
	// there's no reasonable object for it to react to right now.

	$owners = 'PhabricatorApplicationOwners';
	if (PhabricatorApplication::isClassInstalled($owners)) {
	$owners_uri = id(new PhutilURI('/owners/view/search/'))
	->setQueryParams(
	array(
	'repository' => $drequest->getCallsign(),
	'path' => '/'.$drequest->getPath(),
	));

	$view->addAction(
	id(new PhabricatorActionView())
	->setName(pht('Find Owners'))
	->setHref((string)$owners_uri)
	->setIcon('preview'));
	}

	return $view;
	}

	protected function buildPropertyView(
	DiffusionRequest $drequest,
	PhabricatorActionListView $actions) {

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

	$view = id(new PHUIPropertyListView())
	->setUser($viewer)
	->setActionList($actions);

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

	$view->addProperty(
	pht('Commit'),
	phutil_tag(
	'a',
	array(
	'href' => $drequest->generateURI(
	array(
	'action' => 'commit',
	'commit' => $stable_commit,
	)),
	),
	$drequest->getRepository()->formatCommitName($stable_commit)));

	if ($drequest->getCommitType() == 'tag') {
	$symbolic = $drequest->getSymbolicCommit();
	$view->addProperty(pht('Tag'), $symbolic);

	$tags = $this->callConduitWithDiffusionRequest(
	'diffusion.tagsquery',
	array(
	'names' => array($symbolic),
	'needMessages' => true,
	));
	$tags = DiffusionRepositoryTag::newFromConduit($tags);

	$tags = mpull($tags, null, 'getName');
	$tag = idx($tags, $symbolic);

	if ($tag && strlen($tag->getMessage())) {
	$view->addSectionHeader(pht('Tag Content'));
	$view->addTextContent($this->markupText($tag->getMessage()));
	}
	}

	return $view;
	}

	protected function buildOpenRevisions() {
	$user = $this->getRequest()->getUser();

	$drequest = $this->getDiffusionRequest();
	$repository = $drequest->getRepository();
	$path = $drequest->getPath();

	$path_map = id(new DiffusionPathIDQuery(array($path)))->loadPathIDs();
	$path_id = idx($path_map, $path);
	if (!$path_id) {
	return null;
	}

	$revisions = id(new DifferentialRevisionQuery())
	->setViewer($user)
	->withPath($repository->getID(), $path_id)
	->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
	->setOrder(DifferentialRevisionQuery::ORDER_PATH_MODIFIED)
	->setLimit(10)
	->needRelationships(true)
	->needFlags(true)
	->needDrafts(true)
	->execute();

	if (!$revisions) {
	return null;
	}

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

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

	return id(new PHUIObjectBoxView())
	->setHeaderText(pht('Pending Differential Revisions'))
	->appendChild($view);

	}

	}
	diff --git a/src/applications/home/controller/PhabricatorHomeMainController.php b/src/applications/home/controller/PhabricatorHomeMainController.php
	index 86c7396f43..488d73da66 100644
	--- a/src/applications/home/controller/PhabricatorHomeMainController.php
	+++ b/src/applications/home/controller/PhabricatorHomeMainController.php
	@@ -1,468 +1,467 @@
	<?php

	final class PhabricatorHomeMainController
	extends PhabricatorHomeController {

	private $filter;
	private $minipanels = array();

	public function shouldAllowPublic() {
	return true;
	}

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

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

	if ($this->filter == 'jump') {
	return $this->buildJumpResponse();
	}

	$nav = $this->buildNav();

	$project_query = new PhabricatorProjectQuery();
	$project_query->setViewer($user);
	$project_query->withMemberPHIDs(array($user->getPHID()));
	$projects = $project_query->execute();

	return $this->buildMainResponse($nav, $projects);
	}

	private function buildMainResponse($nav, array $projects) {
	assert_instances_of($projects, 'PhabricatorProject');

	$maniphest = 'PhabricatorApplicationManiphest';
	if (PhabricatorApplication::isClassInstalled($maniphest)) {
	$unbreak_panel = $this->buildUnbreakNowPanel();
	$triage_panel = $this->buildNeedsTriagePanel($projects);
	$tasks_panel = $this->buildTasksPanel();
	} else {
	$unbreak_panel = null;
	$triage_panel = null;
	$tasks_panel = null;
	}

	$audit = 'PhabricatorApplicationAudit';
	if (PhabricatorApplication::isClassInstalled($audit)) {
	$audit_panel = $this->buildAuditPanel();
	$commit_panel = $this->buildCommitPanel();
	} else {
	$audit_panel = null;
	$commit_panel = null;
	}

	if (PhabricatorEnv::getEnvConfig('welcome.html') !== null) {
	$welcome_panel = $this->buildWelcomePanel();
	} else {
	$welcome_panel = null;
	}

	$jump_panel = $this->buildJumpPanel();
	$revision_panel = $this->buildRevisionPanel();

	$content = array(
	$jump_panel,
	$welcome_panel,
	$unbreak_panel,
	$triage_panel,
	$revision_panel,
	$tasks_panel,
	$audit_panel,
	$commit_panel,
	$this->minipanels,
	);

	$user = $this->getRequest()->getUser();
	$nav->appendChild($content);
	$nav->appendChild(id(new PhabricatorGlobalUploadTargetView())
	->setUser($user));

	return $this->buildApplicationPage(
	$nav,
	array(
	'title' => 'Phabricator',
	'device' => true,
	));
	}

	private function buildJumpResponse() {
	$request = $this->getRequest();
	$jump = $request->getStr('jump');

	$response = PhabricatorJumpNavHandler::getJumpResponse(
	$request->getUser(),
	$jump);

	if ($response) {
	return $response;
	} else if ($request->isFormPost()) {
	$uri = new PhutilURI('/search/');
	$uri->setQueryParam('query', $jump);
	$uri->setQueryParam('search:primary', 'true');

	return id(new AphrontRedirectResponse())->setURI((string)$uri);
	} else {
	return id(new AphrontRedirectResponse())->setURI('/');
	}
	}

	private function buildUnbreakNowPanel() {
	$unbreak_now = PhabricatorEnv::getEnvConfig(
	'maniphest.priorities.unbreak-now');
	if (!$unbreak_now) {
	return null;
	}

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

	$task_query = id(new ManiphestTaskQuery())
	->setViewer($user)
	->withStatuses(ManiphestTaskStatus::getOpenStatusConstants())
	->withPriorities(array($unbreak_now))
	->setLimit(10);

	$tasks = $task_query->execute();

	if (!$tasks) {
	return $this->renderMiniPanel(
	'No "Unbreak Now!" Tasks',
	'Nothing appears to be critically broken right now.');
	}

	$href = '/maniphest/?statuses[]=0&priorities[]='.$unbreak_now.'#R';
	$title = pht('Unbreak Now!');
	$panel = new AphrontPanelView();
	$panel->setHeader($this->renderSectionHeader($title, $href));
	$panel->appendChild($this->buildTaskListView($tasks));
	$panel->setNoBackground();

	return $panel;
	}

	private function buildNeedsTriagePanel(array $projects) {
	assert_instances_of($projects, 'PhabricatorProject');

	$needs_triage = PhabricatorEnv::getEnvConfig(
	'maniphest.priorities.needs-triage');
	if (!$needs_triage) {
	return null;
	}

	$user = $this->getRequest()->getUser();
	if (!$user->isLoggedIn()) {
	return null;
	}

	if ($projects) {
	$task_query = id(new ManiphestTaskQuery())
	->setViewer($user)
	->withStatuses(ManiphestTaskStatus::getOpenStatusConstants())
	->withPriorities(array($needs_triage))
	->withAnyProjects(mpull($projects, 'getPHID'))
	->setLimit(10);
	$tasks = $task_query->execute();
	} else {
	$tasks = array();
	}

	if (!$tasks) {
	return $this->renderMiniPanel(
	'No "Needs Triage" Tasks',
	hsprintf(
	'No tasks in <a href="/project/">projects you are a member of</a> '.
	'need triage.'));
	}

	$title = pht('Needs Triage');
	$href = '/maniphest/?statuses[]=0&priorities[]='.$needs_triage.
	'&userProjects[]='.$user->getPHID().'#R';
	$panel = new AphrontPanelView();
	$panel->setHeader($this->renderSectionHeader($title, $href));
	$panel->appendChild($this->buildTaskListView($tasks));
	$panel->setNoBackground();

	return $panel;
	}

	private function buildRevisionPanel() {
	$user = $this->getRequest()->getUser();
	$user_phid = $user->getPHID();

	$revision_query = id(new DifferentialRevisionQuery())
	->setViewer($user)
	->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
	->withResponsibleUsers(array($user_phid))
	->needRelationships(true)
	->needFlags(true)
	->needDrafts(true);

	$revisions = $revision_query->execute();

	list($blocking, $active, ) = DifferentialRevisionQuery::splitResponsible(
	$revisions,
	array($user_phid));

	if (!$blocking && !$active) {
	return $this->renderMiniPanel(
	'No Waiting Revisions',
	'No revisions are waiting on you.');
	}

	$title = pht('Revisions Waiting on You');
	$href = '/differential';
	$panel = new AphrontPanelView();
	$panel->setHeader($this->renderSectionHeader($title, $href));

	$revision_view = id(new DifferentialRevisionListView())
	->setHighlightAge(true)
	->setRevisions(array_merge($blocking, $active))
	- ->setFields(DifferentialRevisionListView::getDefaultFields($user))
	->setUser($user);
	$phids = array_merge(
	array($user_phid),
	$revision_view->getRequiredHandlePHIDs());
	$handles = $this->loadViewerHandles($phids);

	$revision_view->setHandles($handles);

	$list_view = $revision_view->render();
	$list_view->setFlush(true);

	$panel->appendChild($list_view);
	$panel->setNoBackground();

	return $panel;
	}

	private function buildWelcomePanel() {
	$panel = new AphrontPanelView();
	$panel->appendChild(
	phutil_safe_html(
	PhabricatorEnv::getEnvConfig('welcome.html')));
	$panel->setNoBackground();

	return $panel;
	}

	private function buildTasksPanel() {
	$user = $this->getRequest()->getUser();
	$user_phid = $user->getPHID();

	$task_query = id(new ManiphestTaskQuery())
	->setViewer($user)
	->withStatuses(ManiphestTaskStatus::getOpenStatusConstants())
	->setGroupBy(ManiphestTaskQuery::GROUP_PRIORITY)
	->withOwners(array($user_phid))
	->setLimit(10);

	$tasks = $task_query->execute();


	if (!$tasks) {
	return $this->renderMiniPanel(
	'No Assigned Tasks',
	'You have no assigned tasks.');
	}

	$title = pht('Assigned Tasks');
	$href = '/maniphest';
	$panel = new AphrontPanelView();
	$panel->setHeader($this->renderSectionHeader($title, $href));
	$panel->appendChild($this->buildTaskListView($tasks));
	$panel->setNoBackground();

	return $panel;
	}

	private function buildTaskListView(array $tasks) {
	assert_instances_of($tasks, 'ManiphestTask');
	$user = $this->getRequest()->getUser();

	$phids = array_merge(
	array_filter(mpull($tasks, 'getOwnerPHID')),
	array_mergev(mpull($tasks, 'getProjectPHIDs')));

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

	$view = new ManiphestTaskListView();
	$view->setTasks($tasks);
	$view->setUser($user);
	$view->setHandles($handles);

	return $view;
	}

	private function buildJumpPanel($query=null) {
	$request = $this->getRequest();
	$user = $request->getUser();

	$uniq_id = celerity_generate_unique_node_id();

	Javelin::initBehavior(
	'phabricator-autofocus',
	array(
	'id' => $uniq_id,
	));

	require_celerity_resource('phabricator-jump-nav');

	$doc_href = PhabricatorEnv::getDocLink('article/Jump_Nav_User_Guide.html');
	$doc_link = phutil_tag(
	'a',
	array(
	'href' => $doc_href,
	),
	'Jump Nav User Guide');

	$jump_input = phutil_tag(
	'input',
	array(
	'type' => 'text',
	'class' => 'phabricator-jump-nav',
	'name' => 'jump',
	'id' => $uniq_id,
	'value' => $query,
	));
	$jump_caption = phutil_tag(
	'p',
	array(
	'class' => 'phabricator-jump-nav-caption',
	),
	hsprintf(
	'Enter the name of an object like <tt>D123</tt> to quickly jump to '.
	'it. See %s or type <tt>help</tt>.',
	$doc_link));

	$form = phabricator_form(
	$user,
	array(
	'action' => '/jump/',
	'method' => 'POST',
	'class' => 'phabricator-jump-nav-form',
	),
	array(
	$jump_input,
	$jump_caption,
	));

	$panel = new AphrontPanelView();
	$panel->setNoBackground();
	// $panel->appendChild();

	$list_filter = new AphrontListFilterView();
	$list_filter->appendChild($form);

	$container = phutil_tag('div',
	array('class' => 'phabricator-jump-nav-container'),
	$list_filter);

	return $container;
	}

	private function renderSectionHeader($title, $href) {
	$header = phutil_tag(
	'a',
	array(
	'href' => $href,
	),
	$title);
	return $header;
	}

	private function renderMiniPanel($title, $body) {
	$panel = new AphrontMiniPanelView();
	$panel->appendChild(
	phutil_tag(
	'p',
	array(
	),
	array(
	phutil_tag('strong', array(), $title.': '),
	$body
	)));
	$this->minipanels[] = $panel;
	}

	public function buildAuditPanel() {
	$request = $this->getRequest();
	$user = $request->getUser();

	$phids = PhabricatorAuditCommentEditor::loadAuditPHIDsForUser($user);

	$query = new PhabricatorAuditQuery();
	$query->withAuditorPHIDs($phids);
	$query->withStatus(PhabricatorAuditQuery::STATUS_OPEN);
	$query->withAwaitingUser($user);
	$query->needCommitData(true);
	$query->setLimit(10);

	$audits = $query->execute();
	$commits = $query->getCommits();

	if (!$audits) {
	return $this->renderMinipanel(
	'No Audits',
	'No commits are waiting for you to audit them.');
	}

	$view = new PhabricatorAuditListView();
	$view->setAudits($audits);
	$view->setCommits($commits);
	$view->setUser($user);

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

	$title = pht('Audits');
	$href = '/audit/';
	$panel = new AphrontPanelView();
	$panel->setHeader($this->renderSectionHeader($title, $href));
	$panel->appendChild($view);
	$panel->setNoBackground();

	return $panel;
	}

	public function buildCommitPanel() {
	$request = $this->getRequest();
	$user = $request->getUser();

	$phids = array($user->getPHID());

	$query = new PhabricatorAuditCommitQuery();
	$query->withAuthorPHIDs($phids);
	$query->withStatus(PhabricatorAuditCommitQuery::STATUS_CONCERN);
	$query->needCommitData(true);
	$query->setLimit(10);

	$commits = $query->execute();

	if (!$commits) {
	return $this->renderMinipanel(
	'No Problem Commits',
	'No one has raised concerns with your commits.');
	}

	$view = new PhabricatorAuditCommitListView();
	$view->setCommits($commits);
	$view->setUser($user);

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

	$title = pht('Problem Commits');
	$href = '/audit/';
	$panel = new AphrontPanelView();
	$panel->setHeader($this->renderSectionHeader($title, $href));
	$panel->appendChild($view);
	$panel->setNoBackground();

	return $panel;
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Jan 19 2025, 21:54 (6 w, 2 d ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1129145
Default Alt Text: (65 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions