No OneTemporary
Actions

Size

99 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/differential/application/PhabricatorApplicationDifferential.php b/src/applications/differential/application/PhabricatorApplicationDifferential.php
	index 197dbdf77f..c1b032e271 100644
	--- a/src/applications/differential/application/PhabricatorApplicationDifferential.php
	+++ b/src/applications/differential/application/PhabricatorApplicationDifferential.php
	@@ -1,103 +1,103 @@
	<?php

	final class PhabricatorApplicationDifferential extends PhabricatorApplication {

	public function getBaseURI() {
	return '/differential/';
	}

	public function getShortDescription() {
	- return 'Review Code';
	+ return pht('Review Code');
	}

	public function getIconName() {
	return 'differential';
	}

	public function getHelpURI() {
	return PhabricatorEnv::getDoclink('article/Differential_User_Guide.html');
	}

	public function getFactObjectsForAnalysis() {
	return array(
	new DifferentialRevision(),
	);
	}

	public function getTitleGlyph() {
	return "\xE2\x9A\x99";
	}

	public function getRoutes() {
	return array(
	'/D(?P<id>[1-9]\d*)' => 'DifferentialRevisionViewController',
	'/differential/' => array(
	'' => 'DifferentialRevisionListController',
	'filter/(?P<filter>\w+)/(?:(?P<username>[\w\.-_]+)/)?' =>
	'DifferentialRevisionListController',
	'stats/(?P<filter>\w+)/' => 'DifferentialRevisionStatsController',
	'diff/' => array(
	'(?P<id>[1-9]\d*)/' => 'DifferentialDiffViewController',
	'create/' => 'DifferentialDiffCreateController',
	),
	'changeset/' => 'DifferentialChangesetViewController',
	'revision/edit/(?:(?P<id>[1-9]\d*)/)?'
	=> 'DifferentialRevisionEditController',
	'comment/' => array(
	'preview/(?P<id>[1-9]\d*)/' => 'DifferentialCommentPreviewController',
	'save/' => 'DifferentialCommentSaveController',
	'inline/' => array(
	'preview/(?P<id>[1-9]\d*)/'
	=> 'DifferentialInlineCommentPreviewController',
	'edit/(?P<id>[1-9]\d*)/'
	=> 'DifferentialInlineCommentEditController',
	),
	),
	'subscribe/(?P<action>add\|rem)/(?P<id>[1-9]\d*)/'
	=> 'DifferentialSubscribeController',
	),
	);
	}

	public function getApplicationGroup() {
	return self::GROUP_CORE;
	}

	public function getApplicationOrder() {
	return 0.100;
	}

	public function loadStatus(PhabricatorUser $user) {
	$revisions = id(new DifferentialRevisionQuery())
	->withResponsibleUsers(array($user->getPHID()))
	->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
	->execute();

	list($active, $waiting) = DifferentialRevisionQuery::splitResponsible(
	$revisions,
	array($user->getPHID()));

	$status = array();

	$active = count($active);
	$type = $active
	? PhabricatorApplicationStatusView::TYPE_NEEDS_ATTENTION
	: PhabricatorApplicationStatusView::TYPE_EMPTY;
	$status[] = id(new PhabricatorApplicationStatusView())
	->setType($type)
	->setText(pht('%d Review(s) Need Attention', $active))
	->setCount($active);

	$waiting = count($waiting);
	$type = $waiting
	? PhabricatorApplicationStatusView::TYPE_INFO
	: PhabricatorApplicationStatusView::TYPE_EMPTY;
	$status[] = id(new PhabricatorApplicationStatusView())
	->setType($type)
	->setText(pht('%d Review(s) Waiting on Others', $waiting));

	return $status;
	}

	}

	diff --git a/src/applications/differential/constants/DifferentialAction.php b/src/applications/differential/constants/DifferentialAction.php
	index 3c9d67cf2c..89ad3a2a04 100644
	--- a/src/applications/differential/constants/DifferentialAction.php
	+++ b/src/applications/differential/constants/DifferentialAction.php
	@@ -1,83 +1,83 @@
	<?php

	final class DifferentialAction {

	const ACTION_CLOSE = 'commit';
	const ACTION_COMMENT = 'none';
	const ACTION_ACCEPT = 'accept';
	const ACTION_REJECT = 'reject';
	const ACTION_RETHINK = 'rethink';
	const ACTION_ABANDON = 'abandon';
	const ACTION_REQUEST = 'request_review';
	const ACTION_RECLAIM = 'reclaim';
	const ACTION_UPDATE = 'update';
	const ACTION_RESIGN = 'resign';
	const ACTION_SUMMARIZE = 'summarize';
	const ACTION_TESTPLAN = 'testplan';
	const ACTION_CREATE = 'create';
	const ACTION_ADDREVIEWERS = 'add_reviewers';
	const ACTION_ADDCCS = 'add_ccs';
	const ACTION_CLAIM = 'claim';
	const ACTION_REOPEN = 'reopen';

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

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

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

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

	public static function allowReviewers($action) {
	if ($action == DifferentialAction::ACTION_ADDREVIEWERS \|\|
	$action == DifferentialAction::ACTION_REQUEST) {
	return true;
	}
	return false;
	}

	}
	diff --git a/src/applications/differential/constants/DifferentialChangeType.php b/src/applications/differential/constants/DifferentialChangeType.php
	index 078b9bd3a9..0a4f7861cc 100644
	--- a/src/applications/differential/constants/DifferentialChangeType.php
	+++ b/src/applications/differential/constants/DifferentialChangeType.php
	@@ -1,111 +1,111 @@
	<?php

	final class DifferentialChangeType {

	const TYPE_ADD = 1;
	const TYPE_CHANGE = 2;
	const TYPE_DELETE = 3;
	const TYPE_MOVE_AWAY = 4;
	const TYPE_COPY_AWAY = 5;
	const TYPE_MOVE_HERE = 6;
	const TYPE_COPY_HERE = 7;
	const TYPE_MULTICOPY = 8;
	const TYPE_MESSAGE = 9;
	const TYPE_CHILD = 10;

	const FILE_TEXT = 1;
	const FILE_IMAGE = 2;
	const FILE_BINARY = 3;
	const FILE_DIRECTORY = 4;
	const FILE_SYMLINK = 5;
	const FILE_DELETED = 6;
	const FILE_NORMAL = 7;
	const FILE_SUBMODULE = 8;

	public static function getSummaryCharacterForChangeType($type) {
	static $types = array(
	self::TYPE_ADD => 'A',
	self::TYPE_CHANGE => 'M',
	self::TYPE_DELETE => 'D',
	self::TYPE_MOVE_AWAY => 'V',
	self::TYPE_COPY_AWAY => 'P',
	self::TYPE_MOVE_HERE => 'V',
	self::TYPE_COPY_HERE => 'P',
	self::TYPE_MULTICOPY => 'P',
	self::TYPE_MESSAGE => 'Q',
	self::TYPE_CHILD => '@',
	);
	return idx($types, coalesce($type, '?'), '~');
	}

	public static function getShortNameForFileType($type) {
	static $names = array(
	self::FILE_TEXT => null,
	self::FILE_DIRECTORY => 'dir',
	self::FILE_IMAGE => 'img',
	self::FILE_BINARY => 'bin',
	self::FILE_SYMLINK => 'sym',
	self::FILE_SUBMODULE => 'sub',
	);
	return idx($names, coalesce($type, '?'), '???');
	}

	public static function isOldLocationChangeType($type) {
	static $types = array(
	DifferentialChangeType::TYPE_MOVE_AWAY => true,
	DifferentialChangeType::TYPE_COPY_AWAY => true,
	DifferentialChangeType::TYPE_MULTICOPY => true,
	);
	return isset($types[$type]);
	}

	public static function isNewLocationChangeType($type) {
	static $types = array(
	DifferentialChangeType::TYPE_MOVE_HERE => true,
	DifferentialChangeType::TYPE_COPY_HERE => true,
	);
	return isset($types[$type]);
	}

	public static function isDeleteChangeType($type) {
	static $types = array(
	DifferentialChangeType::TYPE_DELETE => true,
	DifferentialChangeType::TYPE_MOVE_AWAY => true,
	DifferentialChangeType::TYPE_MULTICOPY => true,
	);
	return isset($types[$type]);
	}

	public static function isCreateChangeType($type) {
	static $types = array(
	DifferentialChangeType::TYPE_ADD => true,
	DifferentialChangeType::TYPE_COPY_HERE => true,
	DifferentialChangeType::TYPE_MOVE_HERE => true,
	);
	return isset($types[$type]);
	}

	public static function isModifyChangeType($type) {
	static $types = array(
	DifferentialChangeType::TYPE_CHANGE => true,
	);
	return isset($types[$type]);
	}

	public static function getFullNameForChangeType($type) {
	- static $types = array(
	- self::TYPE_ADD => 'Added',
	- self::TYPE_CHANGE => 'Modified',
	- self::TYPE_DELETE => 'Deleted',
	- self::TYPE_MOVE_AWAY => 'Moved Away',
	- self::TYPE_COPY_AWAY => 'Copied Away',
	- self::TYPE_MOVE_HERE => 'Moved Here',
	- self::TYPE_COPY_HERE => 'Copied Here',
	- self::TYPE_MULTICOPY => 'Deleted After Multiple Copy',
	- self::TYPE_MESSAGE => 'Commit Message',
	- self::TYPE_CHILD => 'Contents Modified',
	+ $types = array(
	+ self::TYPE_ADD => pht('Added'),
	+ self::TYPE_CHANGE => pht('Modified'),
	+ self::TYPE_DELETE => pht('Deleted'),
	+ self::TYPE_MOVE_AWAY => pht('Moved Away'),
	+ self::TYPE_COPY_AWAY => pht('Copied Away'),
	+ self::TYPE_MOVE_HERE => pht('Moved Here'),
	+ self::TYPE_COPY_HERE => pht('Copied Here'),
	+ self::TYPE_MULTICOPY => pht('Deleted After Multiple Copy'),
	+ self::TYPE_MESSAGE => pht('Commit Message'),
	+ self::TYPE_CHILD => pht('Contents Modified'),
	);
	return idx($types, coalesce($type, '?'), 'Unknown');
	}

	}
	diff --git a/src/applications/differential/controller/DifferentialChangesetViewController.php b/src/applications/differential/controller/DifferentialChangesetViewController.php
	index 3a3e7883ca..dc09fd6db5 100644
	--- a/src/applications/differential/controller/DifferentialChangesetViewController.php
	+++ b/src/applications/differential/controller/DifferentialChangesetViewController.php
	@@ -1,350 +1,350 @@
	<?php

	final class DifferentialChangesetViewController extends DifferentialController {

	public function shouldRequireLogin() {
	return !$this->allowsAnonymousAccess();
	}

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

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

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

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

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

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

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

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

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

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

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

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

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

	$render_cache_key = null;
	}

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

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

	if ($left) {

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

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

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

	$changeset = $choice;
	}

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

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

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

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

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

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


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

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

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

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

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

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

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

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

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

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

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

	$mcov = $parser->renderModifiedCoverage();

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

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

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

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

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

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

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

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

	return id(new DifferentialInlineComment())->loadAllWhere(
	'changesetID IN (%Ld) AND (commentID IS NOT NULL OR authorPHID = %s)',
	$changeset_ids,
	$author_phid);
	}

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

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

	$metadata = $changeset->getMetadata();

	$file = null;
	$phid = idx($metadata, $key);
	if ($phid) {
	$file = id(new PhabricatorFile())->loadOneWhere(
	'phid = %s',
	$phid);
	}

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

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

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

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

	unset($unguard);
	}

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

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

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

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

	$inlines[] = $inline;
	}

	return $inlines;
	}

	}
	diff --git a/src/applications/differential/controller/DifferentialCommentSaveController.php b/src/applications/differential/controller/DifferentialCommentSaveController.php
	index ff92e55b65..f03b26c01a 100644
	--- a/src/applications/differential/controller/DifferentialCommentSaveController.php
	+++ b/src/applications/differential/controller/DifferentialCommentSaveController.php
	@@ -1,86 +1,86 @@
	<?php

	final class DifferentialCommentSaveController extends DifferentialController {

	public function processRequest() {
	$request = $this->getRequest();
	if (!$request->isFormPost()) {
	return new Aphront400Response();
	}

	$revision_id = $request->getInt('revision_id');
	$revision = id(new DifferentialRevision())->load($revision_id);
	if (!$revision) {
	return new Aphront400Response();
	}

	$comment = $request->getStr('comment');
	$action = $request->getStr('action');
	$reviewers = $request->getArr('reviewers');
	$ccs = $request->getArr('ccs');

	$editor = new DifferentialCommentEditor(
	$revision,
	$action);

	$content_source = PhabricatorContentSource::newForSource(
	PhabricatorContentSource::SOURCE_WEB,
	array(
	'ip' => $request->getRemoteAddr(),
	));

	try {
	$editor
	->setActor($request->getUser())
	->setMessage($comment)
	->setContentSource($content_source)
	->setAttachInlineComments(true)
	->setAddedReviewers($reviewers)
	->setAddedCCs($ccs)
	->save();
	} catch (DifferentialActionHasNoEffectException $no_effect) {
	$has_inlines = id(new DifferentialInlineComment())->loadAllWhere(
	'authorPHID = %s AND revisionID = %d AND commentID IS NULL',
	$request->getUser()->getPHID(),
	$revision->getID());

	$dialog = new AphrontDialogView();
	$dialog->setUser($request->getUser());
	$dialog->addCancelButton('/D'.$revision_id);

	$dialog->addHiddenInput('revision_id', $revision_id);
	$dialog->addHiddenInput('action', 'none');
	$dialog->addHiddenInput('reviewers', $reviewers);
	$dialog->addHiddenInput('ccs', $ccs);
	$dialog->addHiddenInput('comment', $comment);

	- $dialog->setTitle('Action Has No Effect');
	+ $dialog->setTitle(pht('Action Has No Effect'));
	$dialog->appendChild(
	'<p>'.phutil_escape_html($no_effect->getMessage()).'</p>');

	if (strlen($comment) \|\| $has_inlines) {
	- $dialog->addSubmitButton('Post as Comment');
	+ $dialog->addSubmitButton(pht('Post as Comment'));
	$dialog->appendChild('<br />');
	$dialog->appendChild(
	- '<p>Do you want to post your feedback anyway, as a normal '.
	- 'comment?</p>');
	+ '<p>'.pht('Do you want to post your feedback anyway, as a normal '.
	+ 'comment?').'</p>');
	}

	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	// TODO: Diff change detection?

	$draft = id(new PhabricatorDraft())->loadOneWhere(
	'authorPHID = %s AND draftKey = %s',
	$request->getUser()->getPHID(),
	'differential-comment-'.$revision->getID());
	if ($draft) {
	$draft->delete();
	}

	return id(new AphrontRedirectResponse())
	->setURI('/D'.$revision->getID());
	}

	}
	diff --git a/src/applications/differential/controller/DifferentialController.php b/src/applications/differential/controller/DifferentialController.php
	index cdcbb10c34..9d79c82f14 100644
	--- a/src/applications/differential/controller/DifferentialController.php
	+++ b/src/applications/differential/controller/DifferentialController.php
	@@ -1,40 +1,40 @@
	<?php

	abstract class DifferentialController extends PhabricatorController {

	protected function allowsAnonymousAccess() {
	return PhabricatorEnv::getEnvConfig('differential.anonymous-access');
	}

	public function buildStandardPageResponse($view, array $data) {

	require_celerity_resource('differential-core-view-css');

	$viewer_is_anonymous = !$this->getRequest()->getUser()->isLoggedIn();

	$page = $this->buildStandardPageView();
	- $page->setApplicationName('Differential');
	+ $page->setApplicationName(pht('Differential'));
	$page->setBaseURI('/differential/');
	$page->setTitle(idx($data, 'title'));
	$page->setGlyph("\xE2\x9A\x99");
	$page->appendChild($view);
	$page->setSearchDefaultScope(PhabricatorSearchScope::SCOPE_OPEN_REVISIONS);

	$response = new AphrontWebpageResponse();
	return $response->setContent($page->render());
	}

	public function buildApplicationCrumbs() {
	$crumbs = parent::buildApplicationCrumbs();

	$create_uri = new PhutilURI('/differential/diff/create/');
	$crumbs->addAction(
	id(new PhabricatorMenuItemView())
	->setHref($this->getApplicationURI('/diff/create/'))
	- ->setName('Create Diff')
	+ ->setName(pht('Create Diff'))
	->setIcon('create'));

	return $crumbs;
	}

	}
	diff --git a/src/applications/differential/controller/DifferentialDiffCreateController.php b/src/applications/differential/controller/DifferentialDiffCreateController.php
	index 69e8faf8c8..76fc629dbd 100644
	--- a/src/applications/differential/controller/DifferentialDiffCreateController.php
	+++ b/src/applications/differential/controller/DifferentialDiffCreateController.php
	@@ -1,75 +1,75 @@
	<?php

	final class DifferentialDiffCreateController extends DifferentialController {

	public function processRequest() {

	$request = $this->getRequest();

	if ($request->isFormPost()) {
	$diff = null;

	if ($request->getFileExists('diff-file')) {
	$diff = PhabricatorFile::readUploadedFileData($_FILES['diff-file']);
	} else {
	$diff = $request->getStr('diff');
	}

	$call = new ConduitCall(
	'differential.createrawdiff',
	array(
	'diff' => $diff,
	));
	$call->setUser($request->getUser());
	$result = $call->execute();

	$path = id(new PhutilURI($result['uri']))->getPath();
	return id(new AphrontRedirectResponse())->setURI($path);
	}

	$form = new AphrontFormView();
	$arcanist_href = PhabricatorEnv::getDoclink(
	'article/Arcanist_User_Guide.html');
	$arcanist_link = phutil_render_tag(
	'a',
	array(
	'href' => $arcanist_href,
	'target' => '_blank',
	),
	'Arcanist');
	$form
	->setAction('/differential/diff/create/')
	->setEncType('multipart/form-data')
	->setUser($request->getUser())
	->appendChild(
	- '<p class="aphront-form-instructions">The best way to create a '.
	- "Differential diff is by using $arcanist_link, but you ".
	+ '<p class="aphront-form-instructions">'.pht('The best way to create '.
	+ 'a Differential diff is by using %s, but you '.
	'can also just paste a diff (e.g., from <tt>svn diff</tt> or '.
	'<tt>git diff</tt>) into this box or upload it as a file if you '.
	- 'really want.</p>')
	+ 'really want.', $arcanist_link).'</p>')
	->appendChild(
	id(new AphrontFormTextAreaControl())
	- ->setLabel('Raw Diff')
	+ ->setLabel(pht('Raw Diff'))
	->setName('diff')
	->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_TALL))
	->appendChild(
	id(new AphrontFormFileControl())
	- ->setLabel('Raw Diff from file')
	+ ->setLabel(pht('Raw Diff from file'))
	->setName('diff-file'))
	->appendChild(
	id(new AphrontFormSubmitControl())
	- ->setValue("Create Diff \xC2\xBB"));
	+ ->setValue(pht("Create Diff \xC2\xBB")));

	$panel = new AphrontPanelView();
	- $panel->setHeader('Create New Diff');
	+ $panel->setHeader(pht('Create New Diff'));
	$panel->appendChild($form);
	$panel->setWidth(AphrontPanelView::WIDTH_FORM);

	return $this->buildStandardPageResponse(
	$panel,
	array(
	- 'title' => 'Create Diff',
	+ 'title' => pht('Create Diff'),
	));
	}

	}
	diff --git a/src/applications/differential/controller/DifferentialDiffViewController.php b/src/applications/differential/controller/DifferentialDiffViewController.php
	index 7cc4a4bcb9..b212c20293 100644
	--- a/src/applications/differential/controller/DifferentialDiffViewController.php
	+++ b/src/applications/differential/controller/DifferentialDiffViewController.php
	@@ -1,153 +1,156 @@
	<?php

	final class DifferentialDiffViewController extends DifferentialController {

	private $id;

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

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

	$diff = id(new DifferentialDiff())->load($this->id);
	if (!$diff) {
	return new Aphront404Response();
	}

	if ($diff->getRevisionID()) {
	$top_panel = new AphrontPanelView();
	$top_panel->setWidth(AphrontPanelView::WIDTH_WIDE);
	$link = phutil_render_tag(
	'a',
	array(
	'href' => PhabricatorEnv::getURI('/D'.$diff->getRevisionID()),
	),
	phutil_escape_html('D'.$diff->getRevisionID()));
	- $top_panel->appendChild("<h1>This diff belongs to revision {$link}</h1>");
	+ $top_panel->appendChild(
	+ "<h1>".pht('This diff belongs to revision %s', $link)."</h1>");
	} else {
	$action_panel = new AphrontPanelView();
	$action_panel->setHeader('Preview Diff');
	$action_panel->setWidth(AphrontPanelView::WIDTH_WIDE);
	$action_panel->appendChild(
	- '<p class="aphront-panel-instructions">Review the diff for '.
	+ '<p class="aphront-panel-instructions">'.pht('Review the diff for '.
	'correctness. When you are satisfied, either <strong>create a new '.
	- 'revision</strong> or <strong>update an existing revision</strong>.');
	+ 'revision</strong> or <strong>update an existing revision</strong>.'));

	// TODO: implmenent optgroup support in AphrontFormSelectControl?
	$select = array();
	$select[] = '<optgroup label="Create New Revision">';
	- $select[] = '<option value="">Create a new Revision...</option>';
	+ $select[] = '<option value="">'.
	+ pht('Create a new Revision...').
	+ '</option>';
	$select[] = '</optgroup>';

	$revision_data = new DifferentialRevisionListData(
	DifferentialRevisionListData::QUERY_OPEN_OWNED,
	array($request->getUser()->getPHID()));
	$revisions = $revision_data->loadRevisions();

	if ($revisions) {
	- $select[] = '<optgroup label="Update Existing Revision">';
	+ $select[] = '<optgroup label="'.pht('Update Existing Revision').'">';
	foreach ($revisions as $revision) {
	$select[] = phutil_render_tag(
	'option',
	array(
	'value' => $revision->getID(),
	),
	phutil_escape_html($revision->getTitle()));
	}
	$select[] = '</optgroup>';
	}

	$select =
	'<select name="revisionID">'.
	implode("\n", $select).
	'</select>';

	$action_form = new AphrontFormView();
	$action_form
	->setUser($request->getUser())
	->setAction('/differential/revision/edit/')
	->addHiddenInput('diffID', $diff->getID())
	->addHiddenInput('viaDiffView', 1)
	->appendChild(
	id(new AphrontFormMarkupControl())
	- ->setLabel('Attach To')
	+ ->setLabel(pht('Attach To'))
	->setValue($select))
	->appendChild(
	id(new AphrontFormSubmitControl())
	- ->setValue('Continue'));
	+ ->setValue(pht('Continue')));

	$action_panel->appendChild($action_form);

	$top_panel = $action_panel;
	}

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

	$action_panel = new AphrontHeadsupView();
	$action_panel->setProperties($dict);
	$action_panel->setHeader(pht('Diff Properties'));

	$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('Diff '.$diff->getID())
	+ ->setTitle(pht('Diff %d', $diff->getID()))
	->setUser($request->getUser());

	return $this->buildStandardPageResponse(
	id(new DifferentialPrimaryPaneView())
	->appendChild(
	array(
	$top_panel->render(),
	$action_panel->render(),
	$table_of_contents->render(),
	$details->render(),
	)),
	array(
	- 'title' => 'Diff View',
	+ 'title' => pht('Diff View'),
	));
	}

	}
	diff --git a/src/applications/differential/controller/DifferentialRevisionEditController.php b/src/applications/differential/controller/DifferentialRevisionEditController.php
	index e94ddb866a..3dcc0f4542 100644
	--- a/src/applications/differential/controller/DifferentialRevisionEditController.php
	+++ b/src/applications/differential/controller/DifferentialRevisionEditController.php
	@@ -1,175 +1,176 @@
	<?php

	final class DifferentialRevisionEditController extends DifferentialController {

	private $id;

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

	public function processRequest() {

	$request = $this->getRequest();

	if (!$this->id) {
	$this->id = $request->getInt('revisionID');
	}

	if ($this->id) {
	$revision = id(new DifferentialRevision())->load($this->id);
	if (!$revision) {
	return new Aphront404Response();
	}
	} else {
	$revision = new DifferentialRevision();
	}

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

	$diff_id = $request->getInt('diffID');
	if ($diff_id) {
	$diff = id(new DifferentialDiff())->load($diff_id);
	if (!$diff) {
	return new Aphront404Response();
	}
	if ($diff->getRevisionID()) {
	// TODO: Redirect?
	throw new Exception("This diff is already attached to a revision!");
	}
	} else {
	$diff = null;
	}

	$errors = array();


	if ($request->isFormPost() && !$request->getStr('viaDiffView')) {
	foreach ($aux_fields as $aux_field) {
	$aux_field->setValueFromRequest($request);
	try {
	$aux_field->validateField();
	} catch (DifferentialFieldValidationException $ex) {
	$errors[] = $ex->getMessage();
	}
	}

	if (!$errors) {
	$editor = new DifferentialRevisionEditor($revision);
	$editor->setActor($request->getUser());
	if ($diff) {
	$editor->addDiff($diff, $request->getStr('comments'));
	}
	$editor->setAuxiliaryFields($aux_fields);
	$editor->save();

	return id(new AphrontRedirectResponse())
	->setURI('/D'.$revision->getID());
	}
	}

	$aux_phids = array();
	foreach ($aux_fields as $key => $aux_field) {
	$aux_phids[$key] = $aux_field->getRequiredHandlePHIDsForRevisionEdit();
	}
	$phids = array_mergev($aux_phids);
	$phids = array_unique($phids);
	$handles = $this->loadViewerHandles($phids);
	foreach ($aux_fields as $key => $aux_field) {
	$aux_field->setHandles(array_select_keys($handles, $aux_phids[$key]));
	}

	$form = new AphrontFormView();
	$form->setUser($request->getUser());
	if ($diff) {
	$form->addHiddenInput('diffID', $diff->getID());
	}

	if ($revision->getID()) {
	$form->setAction('/differential/revision/edit/'.$revision->getID().'/');
	} else {
	$form->setAction('/differential/revision/edit/');
	}

	$error_view = null;
	if ($errors) {
	$error_view = id(new AphrontErrorView())
	- ->setTitle('Form Errors')
	+ ->setTitle(pht('Form Errors'))
	->setErrors($errors);
	}

	if ($diff && $revision->getID()) {
	$form
	->appendChild(
	id(new AphrontFormTextAreaControl())
	- ->setLabel('Comments')
	+ ->setLabel(pht('Comments'))
	->setName('comments')
	- ->setCaption("Explain what's new in this diff.")
	+ ->setCaption(pht("Explain what's new in this diff."))
	->setValue($request->getStr('comments')))
	->appendChild(
	id(new AphrontFormSubmitControl())
	- ->setValue('Save'))
	+ ->setValue(pht('Save')))
	->appendChild(
	id(new AphrontFormDividerControl()));
	}

	foreach ($aux_fields as $aux_field) {
	$control = $aux_field->renderEditControl();
	if ($control) {
	$form->appendChild($control);
	}
	}

	$submit = id(new AphrontFormSubmitControl())
	->setValue('Save');
	if ($diff) {
	$submit->addCancelButton('/differential/diff/'.$diff->getID().'/');
	} else {
	$submit->addCancelButton('/D'.$revision->getID());
	}

	$form->appendChild($submit);

	$panel = new AphrontPanelView();
	if ($revision->getID()) {
	if ($diff) {
	- $panel->setHeader('Update Differential Revision');
	+ $panel->setHeader(pht('Update Differential Revision'));
	} else {
	- $panel->setHeader('Edit Differential Revision');
	+ $panel->setHeader(pht('Edit Differential Revision'));
	}
	} else {
	- $panel->setHeader('Create New Differential Revision');
	+ $panel->setHeader(pht('Create New Differential Revision'));
	}

	$panel->appendChild($form);
	$panel->setWidth(AphrontPanelView::WIDTH_FORM);
	+ $panel->setNoBackground();

	return $this->buildStandardPageResponse(
	array($error_view, $panel),
	array(
	- 'title' => 'Edit Differential Revision',
	+ 'title' => pht('Edit Differential Revision'),
	));
	}

	private function loadAuxiliaryFields(DifferentialRevision $revision) {

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

	$aux_fields = DifferentialFieldSelector::newSelector()
	->getFieldSpecifications();
	foreach ($aux_fields as $key => $aux_field) {
	$aux_field->setRevision($revision);
	if (!$aux_field->shouldAppearOnEdit()) {
	unset($aux_fields[$key]);
	} else {
	$aux_field->setUser($user);
	}
	}

	return DifferentialAuxiliaryField::loadFromStorage(
	$revision,
	$aux_fields);
	}

	}
	diff --git a/src/applications/differential/controller/DifferentialRevisionListController.php b/src/applications/differential/controller/DifferentialRevisionListController.php
	index 191bf8043c..8e7972c6df 100644
	--- a/src/applications/differential/controller/DifferentialRevisionListController.php
	+++ b/src/applications/differential/controller/DifferentialRevisionListController.php
	@@ -1,508 +1,507 @@
	<?php

	final class DifferentialRevisionListController extends DifferentialController {

	private $filter;
	private $username;

	public function shouldRequireLogin() {
	return !$this->allowsAnonymousAccess();
	}

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

	public function processRequest() {
	$request = $this->getRequest();
	$user = $request->getUser();
	$viewer_is_anonymous = !$user->isLoggedIn();

	$params = array_filter(
	array(
	'status' => $request->getStr('status'),
	'order' => $request->getStr('order'),
	));
	$params['participants'] = $request->getArr('participants');

	$default_filter = ($viewer_is_anonymous ? 'all' : 'active');
	$filters = $this->getFilters();
	$this->filter = $this->selectFilter(
	$filters,
	$this->filter,
	$default_filter);

	// Redirect from search to canonical URL.
	$phid_arr = $request->getArr('view_users');
	if ($phid_arr) {
	$view_users = id(new PhabricatorUser())
	->loadAllWhere('phid IN (%Ls)', $phid_arr);

	if (count($view_users) == 1) {
	// This is a single user, so generate a pretty URI.
	$uri = new PhutilURI(
	'/differential/filter/'.$this->filter.'/'.
	phutil_escape_uri(reset($view_users)->getUserName()).'/');
	$uri->setQueryParams($params);

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

	}

	$uri = new PhutilURI('/differential/filter/'.$this->filter.'/');
	$uri->setQueryParams($params);

	$username = '';
	if ($this->username) {
	$view_user = id(new PhabricatorUser())
	->loadOneWhere('userName = %s', $this->username);
	if (!$view_user) {
	return new Aphront404Response();
	}
	$username = phutil_escape_uri($this->username).'/';
	$uri->setPath('/differential/filter/'.$this->filter.'/'.$username);
	$params['view_users'] = array($view_user->getPHID());
	} else {
	$phids = $request->getArr('view_users');
	if ($phids) {
	$params['view_users'] = $phids;
	$uri->setQueryParams($params);
	}
	}

	// Fill in the defaults we'll actually use for calculations if any
	// parameters are missing.
	$params += array(
	'view_users' => array($user->getPHID()),
	'status' => 'all',
	'order' => 'modified',
	);

	$side_nav = new AphrontSideNavFilterView();
	$side_nav->setBaseURI(id(clone $uri)->setPath('/differential/filter/'));
	foreach ($filters as $filter) {
	list($filter_name, $display_name) = $filter;
	if ($filter_name) {
	$side_nav->addFilter($filter_name.'/'.$username, $display_name);
	} else {
	$side_nav->addLabel($display_name);
	}
	}
	$side_nav->selectFilter($this->filter.'/'.$username, null);

	$panels = array();
	$handles = array();
	$controls = $this->getFilterControls($this->filter);
	if ($this->getFilterRequiresUser($this->filter) && !$params['view_users']) {
	// In the anonymous case, we still want to let you see some user's
	// list, but we don't have a default PHID to provide (normally, we use
	// the viewing user's). Show a warning instead.
	$warning = new AphrontErrorView();
	$warning->setSeverity(AphrontErrorView::SEVERITY_WARNING);
	- $warning->setTitle('User Required');
	+ $warning->setTitle(pht('User Required'));
	$warning->appendChild(
	- 'This filter requires that a user be specified above.');
	+ pht('This filter requires that a user be specified above.'));
	$panels[] = $warning;
	} else {
	$query = $this->buildQuery($this->filter, $params);

	$pager = null;
	if ($this->getFilterAllowsPaging($this->filter)) {
	$pager = new AphrontPagerView();
	$pager->setOffset($request->getInt('page'));
	$pager->setPageSize(1000);
	$pager->setURI($uri, 'page');

	$query->setOffset($pager->getOffset());
	$query->setLimit($pager->getPageSize() + 1);
	}

	foreach ($controls as $control) {
	$this->applyControlToQuery($control, $query, $params);
	}

	$revisions = $query->execute();

	if ($pager) {
	$revisions = $pager->sliceResults($revisions);
	}

	$views = $this->buildViews(
	$this->filter,
	$params['view_users'],
	$revisions);

	$view_objects = array();
	foreach ($views as $view) {
	if (empty($view['special'])) {
	$view_objects[] = $view['view'];
	}
	}
	$phids = mpull($view_objects, 'getRequiredHandlePHIDs');
	$phids[] = $params['view_users'];
	$phids = array_mergev($phids);
	$handles = $this->loadViewerHandles($phids);

	foreach ($views as $view) {
	if (empty($view['special'])) {
	$view['view']->setHandles($handles);
	}
	$panel = new AphrontPanelView();
	$panel->setHeader($view['title']);
	$panel->appendChild($view['view']);
	if ($pager) {
	$panel->appendChild($pager);
	}
	$panel->setNoBackground();
	$panels[] = $panel;
	}
	}

	$filter_form = id(new AphrontFormView())
	->setMethod('GET')
	->setAction('/differential/filter/'.$this->filter.'/')
	->setUser($user);
	foreach ($controls as $control) {
	$control_view = $this->renderControl($control, $handles, $uri, $params);
	$filter_form->appendChild($control_view);
	}
	$filter_form
	->addHiddenInput('status', $params['status'])
	->addHiddenInput('order', $params['order'])
	->appendChild(
	id(new AphrontFormSubmitControl())
	- ->setValue('Filter Revisions'));
	+ ->setValue(pht('Filter Revisions')));

	$filter_view = new AphrontListFilterView();
	$filter_view->appendChild($filter_form);

	$side_nav->appendChild($filter_view);

	foreach ($panels as $panel) {
	$side_nav->appendChild($panel);
	}

	$crumbs = $this->buildApplicationCrumbs();
	$name = $side_nav
	->getMenu()
	->getItem($side_nav->getSelectedFilter())
	->getName();
	$crumbs->addCrumb(
	id(new PhabricatorCrumbView())
	->setName($name)
	->setHref($request->getRequestURI()));
	$side_nav->setCrumbs($crumbs);

	return $this->buildApplicationPage(
	$side_nav,
	array(
	- 'title' => 'Differential Home',
	+ 'title' => pht('Differential Home'),
	));
	}

	private function getFilters() {
	return array(
	- array(null, 'User Revisions'),
	- array('active', 'Active'),
	- array('revisions', 'Revisions'),
	- array('reviews', 'Reviews'),
	- array('subscribed', 'Subscribed'),
	- array('drafts', 'Draft Reviews'),
	- array(null, 'All Revisions'),
	- array('all', 'All'),
	+ array(null, pht('User Revisions')),
	+ array('active', pht('Active')),
	+ array('revisions', pht('Revisions')),
	+ array('reviews', pht('Reviews')),
	+ array('subscribed', pht('Subscribed')),
	+ array('drafts', pht('Draft Reviews')),
	+ array(null, pht('All Revisions')),
	+ array('all', pht('All')),
	);
	}

	private function selectFilter(
	array $filters,
	$requested_filter,
	$default_filter) {

	// If the user requested a filter, make sure it actually exists.
	if ($requested_filter) {
	foreach ($filters as $filter) {
	if ($filter[0] === $requested_filter) {
	return $requested_filter;
	}
	}
	}

	// If not, return the default filter.
	return $default_filter;
	}

	private function getFilterRequiresUser($filter) {
	static $requires = array(
	'active' => true,
	'revisions' => true,
	'reviews' => true,
	'subscribed' => true,
	'drafts' => true,
	'all' => false,
	);
	if (!isset($requires[$filter])) {
	throw new Exception("Unknown filter '{$filter}'!");
	}
	return $requires[$filter];
	}

	private function getFilterAllowsPaging($filter) {
	static $allows = array(
	'active' => false,
	'revisions' => true,
	'reviews' => true,
	'subscribed' => true,
	'drafts' => true,
	'all' => true,
	);
	if (!isset($allows[$filter])) {
	throw new Exception("Unknown filter '{$filter}'!");
	}
	return $allows[$filter];
	}

	private function getFilterControls($filter) {
	static $controls = array(
	'active' => array('phid'),
	'revisions' => array('phid', 'participants', 'status', 'order'),
	'reviews' => array('phid', 'participants', 'status', 'order'),
	'subscribed' => array('subscriber', 'status', 'order'),
	'drafts' => array('phid', 'status', 'order'),
	'all' => array('status', 'order'),
	);
	if (!isset($controls[$filter])) {
	throw new Exception("Unknown filter '{$filter}'!");
	}
	return $controls[$filter];
	}

	private function buildQuery($filter, array $params) {
	$user_phids = $params['view_users'];
	$query = new DifferentialRevisionQuery();

	$query->needRelationships(true);

	switch ($filter) {
	case 'active':
	$query->withResponsibleUsers($user_phids);
	$query->withStatus(DifferentialRevisionQuery::STATUS_OPEN);
	$query->setLimit(null);
	break;
	case 'revisions':
	$query->withAuthors($user_phids);
	$query->withReviewers($params['participants']);
	break;
	case 'reviews':
	$query->withReviewers($user_phids);
	$query->withAuthors($params['participants']);
	break;
	case 'subscribed':
	$query->withSubscribers($user_phids);
	break;
	case 'drafts':
	$query->withDraftRepliesByAuthors($user_phids);
	break;
	case 'all':
	break;
	default:
	throw new Exception("Unknown filter '{$filter}'!");
	}
	return $query;
	}

	private function renderControl(
	$control,
	array $handles,
	PhutilURI $uri,
	array $params) {
	assert_instances_of($handles, 'PhabricatorObjectHandle');

	switch ($control) {
	case 'subscriber':
	case 'phid':
	$value = mpull(
	array_select_keys($handles, $params['view_users']),
	'getFullName');

	if ($control == 'subscriber') {
	$source = '/typeahead/common/allmailable/';
	- $label = 'View Subscribers';
	+ $label = pht('View Subscribers');
	} else {
	$source = '/typeahead/common/accounts/';
	switch ($this->filter) {
	case 'revisions':
	- $label = 'Authors';
	+ $label = pht('Authors');
	break;
	case 'reviews':
	- $label = 'Reviewers';
	+ $label = pht('Reviewers');
	break;
	default:
	- $label = 'View Users';
	+ $label = pht('View Users');
	break;
	}
	}

	return id(new AphrontFormTokenizerControl())
	->setDatasource($source)
	->setLabel($label)
	->setName('view_users')
	->setValue($value);

	case 'participants':
	switch ($this->filter) {
	case 'revisions':
	- $label = 'Reviewers';
	+ $label = pht('Reviewers');
	break;
	case 'reviews':
	- $label = 'Authors';
	+ $label = pht('Authors');
	break;
	}
	$value = mpull(
	array_select_keys($handles, $params['participants']),
	'getFullName');
	return id(new AphrontFormTokenizerControl())
	->setDatasource('/typeahead/common/allmailable/')
	->setLabel($label)
	->setName('participants')
	->setValue($value);

	case 'status':
	return id(new AphrontFormToggleButtonsControl())
	- ->setLabel('Status')
	+ ->setLabel(pht('Status'))
	->setValue($params['status'])
	->setBaseURI($uri, 'status')
	->setButtons(
	array(
	- 'all' => 'All',
	- 'open' => 'Open',
	+ 'all' => pht('All'),
	+ 'open' => pht('Open'),
	'closed' => pht('Closed'),
	- 'abandoned' => 'Abandoned',
	+ 'abandoned' => pht('Abandoned'),
	));

	case 'order':
	return id(new AphrontFormToggleButtonsControl())
	- ->setLabel('Order')
	+ ->setLabel(pht('Order'))
	->setValue($params['order'])
	->setBaseURI($uri, 'order')
	->setButtons(
	array(
	- 'modified' => 'Updated',
	- 'created' => 'Created',
	+ 'modified' => pht('Updated'),
	+ 'created' => pht('Created'),
	));

	default:
	throw new Exception("Unknown control '{$control}'!");
	}
	}

	private function applyControlToQuery($control, $query, array $params) {
	switch ($control) {
	case 'phid':
	case 'subscriber':
	case 'participants':
	// Already applied by query construction.
	break;
	case 'status':
	if ($params['status'] == 'open') {
	$query->withStatus(DifferentialRevisionQuery::STATUS_OPEN);
	} else if ($params['status'] == 'closed') {
	$query->withStatus(DifferentialRevisionQuery::STATUS_CLOSED);
	} else if ($params['status'] == 'abandoned') {
	$query->withStatus(DifferentialRevisionQuery::STATUS_ABANDONED);
	}
	break;
	case 'order':
	if ($params['order'] == 'created') {
	$query->setOrder(DifferentialRevisionQuery::ORDER_CREATED);
	}
	break;
	default:
	throw new Exception("Unknown control '{$control}'!");
	}
	}

	private function buildViews($filter, array $user_phids, array $revisions) {
	assert_instances_of($revisions, 'DifferentialRevision');

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

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

	$views = array();
	switch ($filter) {
	case 'active':
	list($active, $waiting) = DifferentialRevisionQuery::splitResponsible(
	$revisions,
	$user_phids);

	$view = id(clone $template)
	->setHighlightAge(true)
	->setRevisions($active)
	->loadAssets();
	$views[] = array(
	- 'title' => 'Action Required',
	+ 'title' => pht('Action Required'),
	'view' => $view,
	);

	// Flags are sort of private, so only show the flag panel if you're
	// looking at your own requests.
	if (in_array($user->getPHID(), $user_phids)) {
	$flags = id(new PhabricatorFlagQuery())
	->withOwnerPHIDs(array($user->getPHID()))
	->withTypes(array(PhabricatorPHIDConstants::PHID_TYPE_DREV))
	->needHandles(true)
	->execute();

	if ($flags) {
	$view = id(new PhabricatorFlagListView())
	->setFlags($flags)
	->setUser($user);

	$views[] = array(
	- 'title' => 'Flagged Revisions',
	+ 'title' => pht('Flagged Revisions'),
	'view' => $view,
	'special' => true,
	);
	}
	}

	$view = id(clone $template)
	->setRevisions($waiting)
	->loadAssets();
	$views[] = array(
	- 'title' => 'Waiting On Others',
	+ 'title' => pht('Waiting On Others'),
	'view' => $view,
	);
	break;
	case 'revisions':
	case 'reviews':
	case 'subscribed':
	case 'drafts':
	case 'all':
	$titles = array(
	- 'revisions' => 'Revisions by Author',
	- 'reviews' => 'Revisions by Reviewer',
	- 'subscribed' => 'Revisions by Subscriber',
	- 'all' => 'Revisions',
	+ 'revisions' => pht('Revisions by Author'),
	+ 'reviews' => pht('Revisions by Reviewer'),
	+ 'subscribed' => pht('Revisions by Subscriber'),
	+ 'all' => pht('Revisions'),
	);
	$view = id(clone $template)
	->setRevisions($revisions)
	->loadAssets();
	$views[] = array(
	'title' => idx($titles, $filter),
	'view' => $view,
	);
	break;
	default:
	throw new Exception("Unknown filter '{$filter}'!");
	}

	return $views;
	}

	-
	}
	diff --git a/src/applications/differential/controller/DifferentialRevisionStatsController.php b/src/applications/differential/controller/DifferentialRevisionStatsController.php
	index cb2a470a2c..37249d0168 100644
	--- a/src/applications/differential/controller/DifferentialRevisionStatsController.php
	+++ b/src/applications/differential/controller/DifferentialRevisionStatsController.php
	@@ -1,166 +1,166 @@
	<?php

	final class DifferentialRevisionStatsController extends DifferentialController {
	private $filter;

	private function loadRevisions($phid) {
	$table = new DifferentialRevision();
	$conn_r = $table->establishConnection('r');
	$rows = queryfx_all(
	$conn_r,
	'SELECT revisions.* FROM %T revisions ' .
	'JOIN %T comments ON comments.revisionID = revisions.id ' .
	'JOIN (' .
	' SELECT revisionID FROM %T WHERE objectPHID = %s ' .
	' UNION ALL ' .
	' SELECT id from differential_revision WHERE authorPHID = %s) rel ' .
	'ON (comments.revisionID = rel.revisionID)' .
	'WHERE comments.action = %s' .
	'AND comments.authorPHID = %s',
	$table->getTableName(),
	id(new DifferentialComment())->getTableName(),
	DifferentialRevision::RELATIONSHIP_TABLE,
	$phid,
	$phid,
	$this->filter,
	$phid
	);
	return $table->loadAllFromArray($rows);
	}

	private function loadComments($phid) {
	$table = new DifferentialComment();
	$conn_r = $table->establishConnection('r');
	$rows = queryfx_all(
	$conn_r,
	'SELECT comments.* FROM %T comments ' .
	'JOIN (' .
	' SELECT revisionID FROM %T WHERE objectPHID = %s ' .
	' UNION ALL ' .
	' SELECT id from differential_revision WHERE authorPHID = %s) rel ' .
	'ON (comments.revisionID = rel.revisionID)' .
	'WHERE comments.action = %s' .
	'AND comments.authorPHID = %s',
	$table->getTableName(),
	DifferentialRevision::RELATIONSHIP_TABLE,
	$phid,
	$phid,
	$this->filter,
	$phid
	);

	return $table->loadAllFromArray($rows);
	}

	private function loadDiffs(array $revisions) {
	if (!$revisions) {
	return array();
	}

	$diff_teml = new DifferentialDiff();
	$diffs = $diff_teml->loadAllWhere(
	'revisionID in (%Ld)',
	array_keys($revisions)
	);
	return $diffs;
	}

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

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

	if ($request->isFormPost()) {
	$phid_arr = $request->getArr('view_user');
	$view_target = head($phid_arr);
	return id(new AphrontRedirectResponse())
	->setURI($request->getRequestURI()->alter('phid', $view_target));
	}

	$params = array_filter(
	array(
	'phid' => $request->getStr('phid'),
	));

	// Fill in the defaults we'll actually use for calculations if any
	// parameters are missing.
	$params += array(
	'phid' => $user->getPHID(),
	);

	$side_nav = new AphrontSideNavFilterView();
	$side_nav->setBaseURI(id(new PhutilURI('/differential/stats/'))
	->alter('phid', $params['phid']));
	foreach (array(
	DifferentialAction::ACTION_CLOSE,
	DifferentialAction::ACTION_ACCEPT,
	DifferentialAction::ACTION_REJECT,
	DifferentialAction::ACTION_UPDATE,
	DifferentialAction::ACTION_COMMENT,
	) as $action) {
	$verb = ucfirst(DifferentialAction::getActionPastTenseVerb($action));
	$side_nav->addFilter($action, $verb);
	}
	$this->filter =
	$side_nav->selectFilter($this->filter,
	DifferentialAction::ACTION_CLOSE);

	$panels = array();
	$handles = $this->loadViewerHandles(array($params['phid']));

	$filter_form = id(new AphrontFormView())
	->setAction('/differential/stats/'.$this->filter.'/')
	->setUser($user);

	$filter_form->appendChild(
	$this->renderControl($params['phid'], $handles));
	$filter_form->appendChild(id(new AphrontFormSubmitControl())
	- ->setValue('Filter Revisions'));
	+ ->setValue(pht('Filter Revisions')));

	$side_nav->appendChild($filter_form);

	$comments = $this->loadComments($params['phid']);
	$revisions = $this->loadRevisions($params['phid']);
	$diffs = $this->loadDiffs($revisions);

	$panel = new AphrontPanelView();
	- $panel->setHeader('Differential rate analysis');
	+ $panel->setHeader(pht('Differential rate analysis'));
	$panel->appendChild(
	id(new DifferentialRevisionStatsView())
	->setComments($comments)
	->setFilter($this->filter)
	->setRevisions($revisions)
	->setDiffs($diffs)
	->setUser($user));
	$panels[] = $panel;

	foreach ($panels as $panel) {
	$side_nav->appendChild($panel);
	}

	return $this->buildStandardPageResponse(
	$side_nav,
	array(
	- 'title' => 'Differential statistics',
	+ 'title' => pht('Differential Statistics'),
	));
	}

	private function renderControl($view_phid, $handles) {
	$value = array();
	if ($view_phid) {
	$value = array(
	$view_phid => $handles[$view_phid]->getFullName(),
	);
	}
	return id(new AphrontFormTokenizerControl())
	->setDatasource('/typeahead/common/users/')
	- ->setLabel('View User')
	+ ->setLabel(pht('View User'))
	->setName('view_user')
	->setValue($value)
	->setLimit(1);
	}

	}
	diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php
	index 2845d0f42b..9cbead02b4 100644
	--- a/src/applications/differential/controller/DifferentialRevisionViewController.php
	+++ b/src/applications/differential/controller/DifferentialRevisionViewController.php
	@@ -1,976 +1,976 @@
	<?php

	final class DifferentialRevisionViewController extends DifferentialController {

	private $revisionID;

	public function shouldRequireLogin() {
	return !$this->allowsAnonymousAccess();
	}

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

	public function processRequest() {

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

	$revision = id(new DifferentialRevision())->load($this->revisionID);
	if (!$revision) {
	return new Aphront404Response();
	}

	$revision->loadRelationships();

	$diffs = $revision->loadDiffs();

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

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

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

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

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

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

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

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

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

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

	$comments = $revision->loadComments();
	$comments = array_merge(
	$this->getImplicitComments($revision, reset($diffs)),
	$comments);

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

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

	foreach ($comments as $comment) {
	$metadata = $comment->getMetadata();
	$added_reviewers = idx(
	$metadata,
	DifferentialComment::METADATA_ADDED_REVIEWERS);
	if ($added_reviewers) {
	foreach ($added_reviewers as $phid) {
	$object_phids[] = $phid;
	}
	}
	$added_ccs = idx(
	$metadata,
	DifferentialComment::METADATA_ADDED_CCS);
	if ($added_ccs) {
	foreach ($added_ccs as $phid) {
	$object_phids[] = $phid;
	}
	}
	}

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

	$aux_phids = array();
	foreach ($aux_fields as $key => $aux_field) {
	$aux_field->setDiff($target);
	$aux_field->setManualDiff($target_manual);
	$aux_field->setDiffProperties($props);
	$aux_phids[$key] = $aux_field->getRequiredHandlePHIDsForRevisionView();
	}
	$object_phids = array_merge($object_phids, array_mergev($aux_phids));
	$object_phids = array_unique($object_phids);

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

	foreach ($aux_fields as $key => $aux_field) {
	// Make sure each field only has access to handles it specifically
	// requested, not all handles. Otherwise you can get a field which works
	// only in the presence of other fields.
	$aux_field->setHandles(array_select_keys($handles, $aux_phids[$key]));
	}

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

	$request_uri = $request->getRequestURI();

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

	$my_inlines = id(new DifferentialInlineComment())->loadAllWhere(
	'revisionID = %d AND commentID IS NULL AND authorPHID = %s AND '.
	'changesetID IN (%Ld)',
	$this->revisionID,
	$user->getPHID(),
	mpull($changesets, 'getID'));

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

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

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

	$revision_detail = new DifferentialRevisionDetailView();
	$revision_detail->setRevision($revision);
	$revision_detail->setDiff(reset($diffs));
	$revision_detail->setAuxiliaryFields($aux_fields);

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

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

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

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

	if ($arc_project) {
	list($symbol_indexes, $project_phids) = $this->buildSymbolIndexes(
	$arc_project,
	$visible_changesets);
	} else {
	$symbol_indexes = array();
	$project_phids = null;
	}

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

	$comment_view = new DifferentialRevisionCommentListView();
	$comment_view->setComments($comments);
	$comment_view->setHandles($handles);
	$comment_view->setInlineComments($inlines);
	$comment_view->setChangesets($all_changesets);
	$comment_view->setUser($user);
	$comment_view->setTargetDiff($target);
	$comment_view->setVersusDiffID($diff_vs);

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

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

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

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

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

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

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

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

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

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

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

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

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

	$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->render().
	$diff_history->render().
	$warning.
	$local_view->render().
	$toc_view->render().
	$other_view.
	$changeset_view->render());
	if ($comment_form) {
	$page_pane->appendChild($comment_form->render());
	}

	PhabricatorFeedStoryNotification::updateObjectNotificationViews(
	$user, $revision->getPHID());

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

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

	$nav = id(new DifferentialChangesetFileTreeSideNavBuilder())
	->setAnchorName('top')
	->setTitle('D'.$revision->getID())
	->setBaseURI(new PhutilURI('/D'.$revision->getID()))
	->build($changesets);
	$nav->appendChild(
	array(
	$reviewer_warning,
	$top_anchor,
	$revision_detail,
	$page_pane,
	));


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

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

	private function getImplicitComments(
	DifferentialRevision $revision,
	DifferentialDiff $diff) {

	$author_phid = nonempty(
	$diff->getAuthorPHID(),
	$revision->getAuthorPHID());

	$template = new DifferentialComment();
	$template->setAuthorPHID($author_phid);
	$template->setRevisionID($revision->getID());
	$template->setDateCreated($revision->getDateCreated());

	$comments = array();

	if (strlen($revision->getSummary())) {
	$summary_comment = clone $template;
	$summary_comment->setContent($revision->getSummary());
	$summary_comment->setAction(DifferentialAction::ACTION_SUMMARIZE);
	$comments[] = $summary_comment;
	}

	if (strlen($revision->getTestPlan())) {
	$testplan_comment = clone $template;
	$testplan_comment->setContent($revision->getTestPlan());
	$testplan_comment->setAction(DifferentialAction::ACTION_TESTPLAN);
	$comments[] = $testplan_comment;
	}

	return $comments;
	}

	private function getRevisionActions(DifferentialRevision $revision) {
	$user = $this->getRequest()->getUser();
	$viewer_phid = $user->getPHID();
	$viewer_is_owner = ($revision->getAuthorPHID() == $viewer_phid);
	$viewer_is_reviewer = in_array($viewer_phid, $revision->getReviewers());
	$viewer_is_cc = in_array($viewer_phid, $revision->getCCPHIDs());
	$viewer_is_anonymous = !$this->getRequest()->getUser()->isLoggedIn();
	$status = $revision->getStatus();
	$revision_id = $revision->getID();
	$revision_phid = $revision->getPHID();

	$links = array();

	if ($viewer_is_owner) {
	$links[] = array(
	'icon' => 'edit',
	'href' => "/differential/revision/edit/{$revision_id}/",
	- 'name' => 'Edit Revision',
	+ 'name' => pht('Edit Revision'),
	);
	}

	if (!$viewer_is_anonymous) {

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

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

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

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

	if ($user->getIsAdmin()) {
	$links[] = array(
	'icon' => 'file',
	- 'name' => 'MetaMTA Transcripts',
	+ 'name' => pht('MetaMTA Transcripts'),
	'href' => "/mail/?phid={$revision_phid}",
	);
	}

	$links[] = array(
	'icon' => 'file',
	- 'name' => 'Herald Transcripts',
	+ 'name' => pht('Herald Transcripts'),
	'href' => "/herald/transcript/?phid={$revision_phid}",
	);
	}

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

	return $links;
	}

	private function getRevisionCommentActions(DifferentialRevision $revision) {

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

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

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

	if ($viewer_is_owner) {
	switch ($status) {
	case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
	$actions[DifferentialAction::ACTION_ACCEPT] = $allow_self_accept;
	$actions[DifferentialAction::ACTION_ABANDON] = true;
	$actions[DifferentialAction::ACTION_RETHINK] = true;
	break;
	case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
	$actions[DifferentialAction::ACTION_ACCEPT] = $allow_self_accept;
	$actions[DifferentialAction::ACTION_ABANDON] = true;
	$actions[DifferentialAction::ACTION_REQUEST] = true;
	break;
	case ArcanistDifferentialRevisionStatus::ACCEPTED:
	$actions[DifferentialAction::ACTION_ABANDON] = true;
	$actions[DifferentialAction::ACTION_REQUEST] = true;
	$actions[DifferentialAction::ACTION_RETHINK] = true;
	$actions[DifferentialAction::ACTION_CLOSE] = true;
	break;
	case ArcanistDifferentialRevisionStatus::CLOSED:
	break;
	case ArcanistDifferentialRevisionStatus::ABANDONED:
	$actions[DifferentialAction::ACTION_RECLAIM] = true;
	break;
	}
	} else {
	switch ($status) {
	case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
	$actions[DifferentialAction::ACTION_ACCEPT] = true;
	$actions[DifferentialAction::ACTION_REJECT] = true;
	$actions[DifferentialAction::ACTION_RESIGN] = $viewer_is_reviewer;
	break;
	case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
	$actions[DifferentialAction::ACTION_ACCEPT] = true;
	$actions[DifferentialAction::ACTION_RESIGN] = $viewer_is_reviewer;
	break;
	case ArcanistDifferentialRevisionStatus::ACCEPTED:
	$actions[DifferentialAction::ACTION_REJECT] = true;
	$actions[DifferentialAction::ACTION_RESIGN] =
	$viewer_is_reviewer && !$viewer_did_accept;
	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(array $comments, array &$changesets) {
	assert_instances_of($comments, 'DifferentialComment');
	assert_instances_of($changesets, 'DifferentialChangeset');

	$inline_comments = array();

	$comment_ids = array_filter(mpull($comments, 'getID'));
	if (!$comment_ids) {
	return $inline_comments;
	}

	$inline_comments = id(new DifferentialInlineComment())
	->loadAllWhere(
	'commentID in (%Ld)',
	$comment_ids);

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

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

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

	return $inline_comments;
	}

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

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

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

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

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

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

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

	private function loadAuxiliaryFields(DifferentialRevision $revision) {

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

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

	return $aux_fields;
	}

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

	$engine = PhabricatorSyntaxHighlighter::newEngine();

	$langs = $arc_project->getSymbolIndexLanguages();
	if (!$langs) {
	return array(array(), array());
	}

	$symbol_indexes = array();

	$project_phids = array_merge(
	array($arc_project->getPHID()),
	nonempty($arc_project->getSymbolIndexProjects(), array()));

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

	return array($symbol_indexes, $project_phids);
	}

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

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

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

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

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

	$query = id(new DifferentialRevisionQuery())
	->withStatus(DifferentialRevisionQuery::STATUS_OPEN)
	->setOrder(DifferentialRevisionQuery::ORDER_PATH_MODIFIED)
	->setLimit(10)
	->needRelationships(true);

	foreach ($path_map as $path => $path_id) {
	$query->withPath($repository->getID(), $path_id);
	}

	$results = $query->execute();

	// Strip out this revision.
	foreach ($results as $key => $result) {
	if ($result->getID() == $this->revisionID) {
	unset($results[$key]);
	}
	}

	return $results;
	}

	private function renderOtherRevisions(array $revisions) {
	assert_instances_of($revisions, 'DifferentialRevision');

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

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

	return
	id(new PhabricatorHeaderView())
	->setHeader(pht('Open Revisions Affecting These Files'))
	->render().
	'<div class="differential-panel">'.
	$view->render().
	'</div>';
	}

	/**
	* Straight copy of the loadFileByPhid method in
	* @{class:DifferentialReviewRequestMail}.
	*
	* This is because of the code similarity between the buildPatch method in
	* @{class:DifferentialReviewRequestMail} and @{method:buildRawDiffResponse}
	* in this class. Both of these methods end up using call_user_func and this
	* piece of code is the lucky function.
	*
	* @return mixed (@{class:PhabricatorFile} if found, null if not)
	*/
	public function loadFileByPHID($phid) {
	$file = id(new PhabricatorFile())->loadOneWhere(
	'phid = %s',
	$phid);
	if (!$file) {
	return null;
	}
	return $file->loadFileData();
	}

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

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

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

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

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

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

	$generated_changesets[] = $choice;
	}

	$diff = new DifferentialDiff();
	$diff->attachChangesets($generated_changesets);
	$diff_dict = $diff->getDiffDict();

	$changes = array();
	foreach ($diff_dict['changes'] as $changedict) {
	$changes[] = ArcanistDiffChange::newFromDictionary($changedict);
	}
	$bundle = ArcanistBundle::newFromChanges($changes);

	$bundle->setLoadFileDataCallback(array($this, 'loadFileByPHID'));

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

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

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

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

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

	}
	}
	diff --git a/src/applications/differential/controller/DifferentialSubscribeController.php b/src/applications/differential/controller/DifferentialSubscribeController.php
	index 32ce5cecef..bc3e0630af 100644
	--- a/src/applications/differential/controller/DifferentialSubscribeController.php
	+++ b/src/applications/differential/controller/DifferentialSubscribeController.php
	@@ -1,76 +1,76 @@
	<?php

	final class DifferentialSubscribeController extends DifferentialController {

	private $id;
	private $action;

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

	public function processRequest() {

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

	$revision = id(new DifferentialRevision())->load($this->id);
	if (!$revision) {
	return new Aphront404Response();
	}

	if (!$request->isFormPost()) {
	$dialog = new AphrontDialogView();

	switch ($this->action) {
	case 'add':
	- $button = 'Subscribe';
	- $title = 'Subscribe to Revision';
	- $prompt = 'Really subscribe to this revision?';
	+ $button = pht('Subscribe');
	+ $title = pht('Subscribe to Revision');
	+ $prompt = pht('Really subscribe to this revision?');
	break;
	case 'rem':
	- $button = 'Unsubscribe';
	- $title = 'Unsubscribe from Revision';
	- $prompt = 'Really unsubscribe from this revision? Herald will '.
	+ $button = pht('Unsubscribe');
	+ $title = pht('Unsubscribe from Revision');
	+ $prompt = pht('Really unsubscribe from this revision? Herald will '.
	'not resubscribe you to a revision you unsubscribe '.
	- 'from.';
	+ 'from.');
	break;
	default:
	return new Aphront400Response();
	}

	$dialog
	->setUser($user)
	->setTitle($title)
	->appendChild('<p>'.$prompt.'</p>')
	->setSubmitURI($request->getRequestURI())
	->addSubmitButton($button)
	->addCancelButton('/D'.$revision->getID());

	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	$revision->loadRelationships();
	$phid = $user->getPHID();

	switch ($this->action) {
	case 'add':
	DifferentialRevisionEditor::addCCAndUpdateRevision(
	$revision,
	$phid,
	$phid);
	break;
	case 'rem':
	DifferentialRevisionEditor::removeCCAndUpdateRevision(
	$revision,
	$phid,
	$phid);
	break;
	default:
	return new Aphront400Response();
	}

	return id(new AphrontRedirectResponse())->setURI('/D'.$revision->getID());
	}
	}

File Metadata

Mime Type: text/x-diff
Expires: Tue, Jun 10, 12:06 AM (13 h, 7 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 140172
Default Alt Text: (99 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions