No OneTemporary
Actions

Size

197 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/src/applications/audit/editor/PhabricatorAuditEditor.php b/src/applications/audit/editor/PhabricatorAuditEditor.php
	index 0cf6339239..049733f777 100644
	--- a/src/applications/audit/editor/PhabricatorAuditEditor.php
	+++ b/src/applications/audit/editor/PhabricatorAuditEditor.php
	@@ -1,805 +1,851 @@
	<?php

	final class PhabricatorAuditEditor
	extends PhabricatorApplicationTransactionEditor {

	const MAX_FILES_SHOWN_IN_EMAIL = 1000;

	private $affectedFiles;
	private $rawPatch;
	private $auditorPHIDs = array();

	private $didExpandInlineState = false;
	private $oldAuditStatus = null;

	public function setRawPatch($patch) {
	$this->rawPatch = $patch;
	return $this;
	}

	public function getRawPatch() {
	return $this->rawPatch;
	}

	public function getEditorApplicationClass() {
	return 'PhabricatorDiffusionApplication';
	}

	public function getEditorObjectsDescription() {
	return pht('Audits');
	}

	public function getTransactionTypes() {
	$types = parent::getTransactionTypes();

	$types[] = PhabricatorTransactions::TYPE_COMMENT;
	$types[] = PhabricatorTransactions::TYPE_EDGE;
	$types[] = PhabricatorTransactions::TYPE_INLINESTATE;

	$types[] = PhabricatorAuditTransaction::TYPE_COMMIT;

	// TODO: These will get modernized eventually, but that can happen one
	// at a time later on.
	$types[] = PhabricatorAuditActionConstants::INLINE;

	return $types;
	}

	protected function expandTransactions(
	PhabricatorLiskDAO $object,
	array $xactions) {

	foreach ($xactions as $xaction) {
	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_INLINESTATE:
	$this->didExpandInlineState = true;
	break;
	}
	}

	$this->oldAuditStatus = $object->getAuditStatus();

	$object->loadAndAttachAuditAuthority(
	$this->getActor(),
	$this->getActingAsPHID());

	return parent::expandTransactions($object, $xactions);
	}

	protected function transactionHasEffect(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorAuditActionConstants::INLINE:
	return $xaction->hasComment();
	}

	return parent::transactionHasEffect($object, $xaction);
	}

	protected function getCustomTransactionOldValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {
	switch ($xaction->getTransactionType()) {
	case PhabricatorAuditActionConstants::INLINE:
	case PhabricatorAuditTransaction::TYPE_COMMIT:
	return null;
	}

	return parent::getCustomTransactionOldValue($object, $xaction);
	}

	protected function getCustomTransactionNewValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorAuditActionConstants::INLINE:
	case PhabricatorAuditTransaction::TYPE_COMMIT:
	return $xaction->getNewValue();
	}

	return parent::getCustomTransactionNewValue($object, $xaction);
	}

	protected function applyCustomInternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorAuditActionConstants::INLINE:
	case PhabricatorAuditTransaction::TYPE_COMMIT:
	return;
	}

	return parent::applyCustomInternalTransaction($object, $xaction);
	}

	protected function applyCustomExternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorAuditTransaction::TYPE_COMMIT:
	return;
	case PhabricatorAuditActionConstants::INLINE:
	$reply = $xaction->getComment()->getReplyToComment();
	if ($reply && !$reply->getHasReplies()) {
	$reply->setHasReplies(1)->save();
	}
	return;
	}

	return parent::applyCustomExternalTransaction($object, $xaction);
	}

	protected function applyBuiltinExternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_INLINESTATE:
	$table = new PhabricatorAuditTransactionComment();
	$conn_w = $table->establishConnection('w');
	foreach ($xaction->getNewValue() as $phid => $state) {
	queryfx(
	$conn_w,
	'UPDATE %T SET fixedState = %s WHERE phid = %s',
	$table->getTableName(),
	$state,
	$phid);
	}
	break;
	}

	return parent::applyBuiltinExternalTransaction($object, $xaction);
	}

	protected function applyFinalEffects(
	PhabricatorLiskDAO $object,
	array $xactions) {

	// Load auditors explicitly; we may not have them if the caller was a
	// generic piece of infrastructure.

	$commit = id(new DiffusionCommitQuery())
	->setViewer($this->requireActor())
	->withIDs(array($object->getID()))
	->needAuditRequests(true)
	->executeOne();
	if (!$commit) {
	throw new Exception(
	pht('Failed to load commit during transaction finalization!'));
	}
	$object->attachAudits($commit->getAudits());

	$status_concerned = PhabricatorAuditStatusConstants::CONCERNED;
	$status_closed = PhabricatorAuditStatusConstants::CLOSED;
	$status_resigned = PhabricatorAuditStatusConstants::RESIGNED;
	$status_accepted = PhabricatorAuditStatusConstants::ACCEPTED;
	$status_concerned = PhabricatorAuditStatusConstants::CONCERNED;

	$actor_phid = $this->getActingAsPHID();
	$actor_is_author = ($object->getAuthorPHID()) &&
	($actor_phid == $object->getAuthorPHID());

	$import_status_flag = null;
	foreach ($xactions as $xaction) {
	switch ($xaction->getTransactionType()) {
	case PhabricatorAuditTransaction::TYPE_COMMIT:
	$import_status_flag = PhabricatorRepositoryCommit::IMPORTED_HERALD;
	break;
	}
	}

	$old_status = $this->oldAuditStatus;

	$requests = $object->getAudits();
	$object->updateAuditStatus($requests);

	$new_status = $object->getAuditStatus();

	$object->save();

	if ($import_status_flag) {
	$object->writeImportStatusFlag($import_status_flag);
	}

	$partial_status = PhabricatorAuditCommitStatusConstants::PARTIALLY_AUDITED;

	// If the commit has changed state after this edit, add an informational
	// transaction about the state change.
	if ($old_status != $new_status) {
	if ($new_status == $partial_status) {
	// This state isn't interesting enough to get a transaction. The
	// best way we could lead the user forward is something like "This
	// commit still requires additional audits." but that's redundant and
	// probably not very useful.
	} else {
	$xaction = $object->getApplicationTransactionTemplate()
	->setTransactionType(DiffusionCommitStateTransaction::TRANSACTIONTYPE)
	->setOldValue($old_status)
	->setNewValue($new_status);

	$xaction = $this->populateTransaction($object, $xaction);

	$xaction->save();
	}
	}

	// Collect auditor PHIDs for building mail.
	$this->auditorPHIDs = mpull($object->getAudits(), 'getAuditorPHID');

	return $xactions;
	}

	protected function expandTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	$xactions = parent::expandTransaction($object, $xaction);
	switch ($xaction->getTransactionType()) {
	case PhabricatorAuditTransaction::TYPE_COMMIT:
	$request = $this->createAuditRequestTransactionFromCommitMessage(
	$object);
	if ($request) {
	$xactions[] = $request;
	$this->setUnmentionablePHIDMap($request->getNewValue());
	}
	break;
	default:
	break;
	}

	if (!$this->didExpandInlineState) {
	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	$this->didExpandInlineState = true;

	$actor_phid = $this->getActingAsPHID();
	$actor_is_author = ($object->getAuthorPHID() == $actor_phid);
	if (!$actor_is_author) {
	break;
	}

	$state_map = PhabricatorTransactions::getInlineStateMap();

	$inlines = id(new DiffusionDiffInlineCommentQuery())
	->setViewer($this->getActor())
	->withCommitPHIDs(array($object->getPHID()))
	->withFixedStates(array_keys($state_map))
	->execute();

	if (!$inlines) {
	break;
	}

	$old_value = mpull($inlines, 'getFixedState', 'getPHID');
	$new_value = array();
	foreach ($old_value as $key => $state) {
	$new_value[$key] = $state_map[$state];
	}

	$xactions[] = id(new PhabricatorAuditTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_INLINESTATE)
	->setIgnoreOnNoEffect(true)
	->setOldValue($old_value)
	->setNewValue($new_value);
	break;
	}
	}

	return $xactions;
	}

	private function createAuditRequestTransactionFromCommitMessage(
	PhabricatorRepositoryCommit $commit) {

	$actor = $this->getActor();
	$data = $commit->getCommitData();
	$message = $data->getCommitMessage();

	$result = DifferentialCommitMessageParser::newStandardParser($actor)
	->setRaiseMissingFieldErrors(false)
	->parseFields($message);

	$field_key = DifferentialAuditorsCommitMessageField::FIELDKEY;
	$phids = idx($result, $field_key, null);

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

	// If a commit lists its author as an auditor, just pretend it does not.
	foreach ($phids as $key => $phid) {
	if ($phid == $commit->getAuthorPHID()) {
	unset($phids[$key]);
	}
	}

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

	return $commit->getApplicationTransactionTemplate()
	->setTransactionType(DiffusionCommitAuditorsTransaction::TRANSACTIONTYPE)
	->setNewValue(
	array(
	'+' => array_fuse($phids),
	));
	}

	protected function sortTransactions(array $xactions) {
	$xactions = parent::sortTransactions($xactions);

	$head = array();
	$tail = array();

	foreach ($xactions as $xaction) {
	$type = $xaction->getTransactionType();
	if ($type == PhabricatorAuditActionConstants::INLINE) {
	$tail[] = $xaction;
	} else {
	$head[] = $xaction;
	}
	}

	return array_values(array_merge($head, $tail));
	}

	protected function supportsSearch() {
	return true;
	}

	protected function expandCustomRemarkupBlockTransactions(
	PhabricatorLiskDAO $object,
	array $xactions,
	array $changes,
	PhutilMarkupEngine $engine) {

	- // we are only really trying to find unmentionable phids here...
	- // don't bother with this outside initial commit (i.e. create)
	- // transaction
	+ $actor = $this->getActor();
	+ $result = array();
	+
	+ // Some interactions (like "Fixes Txxx" interacting with Maniphest) have
	+ // already been processed, so we're only re-parsing them here to avoid
	+ // generating an extra redundant mention. Other interactions are being
	+ // processed for the first time.
	+
	+ // We're only recognizing magic in the commit message itself, not in
	+ // audit comments.
	+
	$is_commit = false;
	foreach ($xactions as $xaction) {
	switch ($xaction->getTransactionType()) {
	case PhabricatorAuditTransaction::TYPE_COMMIT:
	$is_commit = true;
	break;
	}
	}

	- // "result" is always an array....
	- $result = array();
	if (!$is_commit) {
	return $result;
	}

	$flat_blocks = mpull($changes, 'getNewValue');
	$huge_block = implode("\n\n", $flat_blocks);
	$phid_map = array();
	$phid_map[] = $this->getUnmentionablePHIDMap();
	$monograms = array();

	$task_refs = id(new ManiphestCustomFieldStatusParser())
	->parseCorpus($huge_block);
	foreach ($task_refs as $match) {
	foreach ($match['monograms'] as $monogram) {
	$monograms[] = $monogram;
	}
	}

	$rev_refs = id(new DifferentialCustomFieldDependsOnParser())
	->parseCorpus($huge_block);
	foreach ($rev_refs as $match) {
	foreach ($match['monograms'] as $monogram) {
	$monograms[] = $monogram;
	}
	}

	$objects = id(new PhabricatorObjectQuery())
	->setViewer($this->getActor())
	->withNames($monograms)
	->execute();
	$phid_map[] = mpull($objects, 'getPHID', 'getPHID');
	+
	+
	+ $reverts_refs = id(new DifferentialCustomFieldRevertsParser())
	+ ->parseCorpus($huge_block);
	+ $reverts = array_mergev(ipull($reverts_refs, 'monograms'));
	+ if ($reverts) {
	+ // Only allow commits to revert other commits in the same repository.
	+ $reverted_commits = id(new DiffusionCommitQuery())
	+ ->setViewer($actor)
	+ ->withRepository($object->getRepository())
	+ ->withIdentifiers($reverts)
	+ ->execute();
	+
	+ $reverted_revisions = id(new PhabricatorObjectQuery())
	+ ->setViewer($actor)
	+ ->withNames($reverts)
	+ ->withTypes(
	+ array(
	+ DifferentialRevisionPHIDType::TYPECONST,
	+ ))
	+ ->execute();
	+
	+ $reverted_phids =
	+ mpull($reverted_commits, 'getPHID', 'getPHID') +
	+ mpull($reverted_revisions, 'getPHID', 'getPHID');
	+
	+ // NOTE: Skip any write attempts if a user cleverly implies a commit
	+ // reverts itself, although this would be exceptionally clever in Git
	+ // or Mercurial.
	+ unset($reverted_phids[$object->getPHID()]);
	+
	+ $reverts_edge = DiffusionCommitRevertsCommitEdgeType::EDGECONST;
	+ $result[] = id(new PhabricatorAuditTransaction())
	+ ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	+ ->setMetadataValue('edge:type', $reverts_edge)
	+ ->setNewValue(array('+' => $reverted_phids));
	+
	+ $phid_map[] = $reverted_phids;
	+ }
	+
	$phid_map = array_mergev($phid_map);
	$this->setUnmentionablePHIDMap($phid_map);

	return $result;
	}

	protected function buildReplyHandler(PhabricatorLiskDAO $object) {
	$reply_handler = new PhabricatorAuditReplyHandler();
	$reply_handler->setMailReceiver($object);
	return $reply_handler;
	}

	protected function getMailSubjectPrefix() {
	return PhabricatorEnv::getEnvConfig('metamta.diffusion.subject-prefix');
	}

	protected function getMailThreadID(PhabricatorLiskDAO $object) {
	// For backward compatibility, use this legacy thread ID.
	return 'diffusion-audit-'.$object->getPHID();
	}

	protected function buildMailTemplate(PhabricatorLiskDAO $object) {
	$identifier = $object->getCommitIdentifier();
	$repository = $object->getRepository();
	$monogram = $repository->getMonogram();

	$summary = $object->getSummary();
	$name = $repository->formatCommitName($identifier);

	$subject = "{$name}: {$summary}";
	$thread_topic = "Commit {$monogram}{$identifier}";

	$template = id(new PhabricatorMetaMTAMail())
	->setSubject($subject)
	->addHeader('Thread-Topic', $thread_topic);

	$this->attachPatch(
	$template,
	$object);

	return $template;
	}

	protected function getMailTo(PhabricatorLiskDAO $object) {
	$phids = array();

	if ($object->getAuthorPHID()) {
	$phids[] = $object->getAuthorPHID();
	}

	$status_resigned = PhabricatorAuditStatusConstants::RESIGNED;
	foreach ($object->getAudits() as $audit) {
	if (!$audit->isInteresting()) {
	// Don't send mail to uninteresting auditors, like packages which
	// own this code but which audits have not triggered for.
	continue;
	}

	if ($audit->getAuditStatus() != $status_resigned) {
	$phids[] = $audit->getAuditorPHID();
	}
	}

	$phids[] = $this->getActingAsPHID();

	return $phids;
	}

	protected function buildMailBody(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$body = parent::buildMailBody($object, $xactions);

	$type_inline = PhabricatorAuditActionConstants::INLINE;
	$type_push = PhabricatorAuditTransaction::TYPE_COMMIT;

	$is_commit = false;
	$inlines = array();
	foreach ($xactions as $xaction) {
	if ($xaction->getTransactionType() == $type_inline) {
	$inlines[] = $xaction;
	}
	if ($xaction->getTransactionType() == $type_push) {
	$is_commit = true;
	}
	}

	if ($inlines) {
	$body->addTextSection(
	pht('INLINE COMMENTS'),
	$this->renderInlineCommentsForMail($object, $inlines));
	}

	if ($is_commit) {
	$data = $object->getCommitData();
	$body->addTextSection(pht('AFFECTED FILES'), $this->affectedFiles);
	$this->inlinePatch(
	$body,
	$object);
	}

	$data = $object->getCommitData();

	$user_phids = array();

	$author_phid = $object->getAuthorPHID();
	if ($author_phid) {
	$user_phids[$author_phid][] = pht('Author');
	}

	$committer_phid = $data->getCommitDetail('committerPHID');
	if ($committer_phid && ($committer_phid != $author_phid)) {
	$user_phids[$committer_phid][] = pht('Committer');
	}

	foreach ($this->auditorPHIDs as $auditor_phid) {
	$user_phids[$auditor_phid][] = pht('Auditor');
	}

	// TODO: It would be nice to show pusher here too, but that information
	// is a little tricky to get at right now.

	if ($user_phids) {
	$handle_phids = array_keys($user_phids);
	$handles = id(new PhabricatorHandleQuery())
	->setViewer($this->requireActor())
	->withPHIDs($handle_phids)
	->execute();

	$user_info = array();
	foreach ($user_phids as $phid => $roles) {
	$user_info[] = pht(
	'%s (%s)',
	$handles[$phid]->getName(),
	implode(', ', $roles));
	}

	$body->addTextSection(
	pht('USERS'),
	implode("\n", $user_info));
	}

	$monogram = $object->getRepository()->formatCommitName(
	$object->getCommitIdentifier());

	$body->addLinkSection(
	pht('COMMIT'),
	PhabricatorEnv::getProductionURI('/'.$monogram));

	return $body;
	}

	private function attachPatch(
	PhabricatorMetaMTAMail $template,
	PhabricatorRepositoryCommit $commit) {

	if (!$this->getRawPatch()) {
	return;
	}

	$attach_key = 'metamta.diffusion.attach-patches';
	$attach_patches = PhabricatorEnv::getEnvConfig($attach_key);
	if (!$attach_patches) {
	return;
	}

	$repository = $commit->getRepository();
	$encoding = $repository->getDetail('encoding', 'UTF-8');

	$raw_patch = $this->getRawPatch();
	$commit_name = $repository->formatCommitName(
	$commit->getCommitIdentifier());

	$template->addAttachment(
	new PhabricatorMetaMTAAttachment(
	$raw_patch,
	$commit_name.'.patch',
	'text/x-patch; charset='.$encoding));
	}

	private function inlinePatch(
	PhabricatorMetaMTAMailBody $body,
	PhabricatorRepositoryCommit $commit) {

	if (!$this->getRawPatch()) {
	return;
	}

	$inline_key = 'metamta.diffusion.inline-patches';
	$inline_patches = PhabricatorEnv::getEnvConfig($inline_key);
	if (!$inline_patches) {
	return;
	}

	$repository = $commit->getRepository();
	$raw_patch = $this->getRawPatch();
	$result = null;
	$len = substr_count($raw_patch, "\n");
	if ($len <= $inline_patches) {
	// We send email as utf8, so we need to convert the text to utf8 if
	// we can.
	$encoding = $repository->getDetail('encoding', 'UTF-8');
	if ($encoding) {
	$raw_patch = phutil_utf8_convert($raw_patch, 'UTF-8', $encoding);
	}
	$result = phutil_utf8ize($raw_patch);
	}

	if ($result) {
	$result = "PATCH\n\n{$result}\n";
	}
	$body->addRawSection($result);
	}

	private function renderInlineCommentsForMail(
	PhabricatorLiskDAO $object,
	array $inline_xactions) {

	$inlines = mpull($inline_xactions, 'getComment');

	$block = array();

	$path_map = id(new DiffusionPathQuery())
	->withPathIDs(mpull($inlines, 'getPathID'))
	->execute();
	$path_map = ipull($path_map, 'path', 'id');

	foreach ($inlines as $inline) {
	$path = idx($path_map, $inline->getPathID());
	if ($path === null) {
	continue;
	}

	$start = $inline->getLineNumber();
	$len = $inline->getLineLength();
	if ($len) {
	$range = $start.'-'.($start + $len);
	} else {
	$range = $start;
	}

	$content = $inline->getContent();
	$block[] = "{$path}:{$range} {$content}";
	}

	return implode("\n", $block);
	}

	public function getMailTagsMap() {
	return array(
	PhabricatorAuditTransaction::MAILTAG_COMMIT =>
	pht('A commit is created.'),
	PhabricatorAuditTransaction::MAILTAG_ACTION_CONCERN =>
	pht('A commit has a concerned raised against it.'),
	PhabricatorAuditTransaction::MAILTAG_ACTION_ACCEPT =>
	pht('A commit is accepted.'),
	PhabricatorAuditTransaction::MAILTAG_ACTION_RESIGN =>
	pht('A commit has an auditor resign.'),
	PhabricatorAuditTransaction::MAILTAG_ACTION_CLOSE =>
	pht('A commit is closed.'),
	PhabricatorAuditTransaction::MAILTAG_ADD_AUDITORS =>
	pht('A commit has auditors added.'),
	PhabricatorAuditTransaction::MAILTAG_ADD_CCS =>
	pht("A commit's subscribers change."),
	PhabricatorAuditTransaction::MAILTAG_PROJECTS =>
	pht("A commit's projects change."),
	PhabricatorAuditTransaction::MAILTAG_COMMENT =>
	pht('Someone comments on a commit.'),
	PhabricatorAuditTransaction::MAILTAG_OTHER =>
	pht('Other commit activity not listed above occurs.'),
	);
	}

	protected function shouldApplyHeraldRules(
	PhabricatorLiskDAO $object,
	array $xactions) {

	foreach ($xactions as $xaction) {
	switch ($xaction->getTransactionType()) {
	case PhabricatorAuditTransaction::TYPE_COMMIT:
	$repository = $object->getRepository();
	if (!$repository->shouldPublish()) {
	return false;
	}
	return true;
	default:
	break;
	}
	}
	return parent::shouldApplyHeraldRules($object, $xactions);
	}

	protected function buildHeraldAdapter(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return id(new HeraldCommitAdapter())
	->setObject($object);
	}

	protected function didApplyHeraldRules(
	PhabricatorLiskDAO $object,
	HeraldAdapter $adapter,
	HeraldTranscript $transcript) {

	$limit = self::MAX_FILES_SHOWN_IN_EMAIL;
	$files = $adapter->loadAffectedPaths();
	sort($files);
	if (count($files) > $limit) {
	array_splice($files, $limit);
	$files[] = pht(
	'(This commit affected more than %d files. Only %d are shown here '.
	'and additional ones are truncated.)',
	$limit,
	$limit);
	}
	$this->affectedFiles = implode("\n", $files);

	return array();
	}

	private function isCommitMostlyImported(PhabricatorLiskDAO $object) {
	$has_message = PhabricatorRepositoryCommit::IMPORTED_MESSAGE;
	$has_changes = PhabricatorRepositoryCommit::IMPORTED_CHANGE;

	// Don't publish feed stories or email about events which occur during
	// import. In particular, this affects tasks being attached when they are
	// closed by "Fixes Txxxx" in a commit message. See T5851.

	$mask = ($has_message \| $has_changes);

	return $object->isPartiallyImported($mask);
	}


	private function shouldPublishRepositoryActivity(
	PhabricatorLiskDAO $object,
	array $xactions) {

	// not every code path loads the repository so tread carefully
	// TODO: They should, and then we should simplify this.
	$repository = $object->getRepository($assert_attached = false);
	if ($repository != PhabricatorLiskDAO::ATTACHABLE) {
	if (!$repository->shouldPublish()) {
	return false;
	}
	}

	return $this->isCommitMostlyImported($object);
	}

	protected function shouldSendMail(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return $this->shouldPublishRepositoryActivity($object, $xactions);
	}

	protected function shouldEnableMentions(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return $this->shouldPublishRepositoryActivity($object, $xactions);
	}

	protected function shouldPublishFeedStory(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return $this->shouldPublishRepositoryActivity($object, $xactions);
	}

	protected function getCustomWorkerState() {
	return array(
	'rawPatch' => $this->rawPatch,
	'affectedFiles' => $this->affectedFiles,
	'auditorPHIDs' => $this->auditorPHIDs,
	);
	}

	protected function getCustomWorkerStateEncoding() {
	return array(
	'rawPatch' => self::STORAGE_ENCODING_BINARY,
	);
	}

	protected function loadCustomWorkerState(array $state) {
	$this->rawPatch = idx($state, 'rawPatch');
	$this->affectedFiles = idx($state, 'affectedFiles');
	$this->auditorPHIDs = idx($state, 'auditorPHIDs');
	return $this;
	}

	protected function willPublish(PhabricatorLiskDAO $object, array $xactions) {
	return id(new DiffusionCommitQuery())
	->setViewer($this->requireActor())
	->withIDs(array($object->getID()))
	->needAuditRequests(true)
	->needCommitData(true)
	->executeOne();
	}

	}
	diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
	index ecd1e6c95c..3a1537b01d 100644
	--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
	+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
	@@ -1,1696 +1,1733 @@
	<?php

	final class DifferentialTransactionEditor
	extends PhabricatorApplicationTransactionEditor {

	private $changedPriorToCommitURI;
	private $isCloseByCommit;
	private $repositoryPHIDOverride = false;
	private $didExpandInlineState = false;
	private $hasReviewTransaction = false;
	private $affectedPaths;
	private $firstBroadcast = false;
	private $wasDraft = false;

	public function getEditorApplicationClass() {
	return 'PhabricatorDifferentialApplication';
	}

	public function getEditorObjectsDescription() {
	return pht('Differential Revisions');
	}

	public function getCreateObjectTitle($author, $object) {
	return pht('%s created this revision.', $author);
	}

	public function getCreateObjectTitleForFeed($author, $object) {
	return pht('%s created %s.', $author, $object);
	}

	public function isFirstBroadcast() {
	return $this->firstBroadcast;
	}

	public function getDiffUpdateTransaction(array $xactions) {
	$type_update = DifferentialTransaction::TYPE_UPDATE;

	foreach ($xactions as $xaction) {
	if ($xaction->getTransactionType() == $type_update) {
	return $xaction;
	}
	}

	return null;
	}

	public function setIsCloseByCommit($is_close_by_commit) {
	$this->isCloseByCommit = $is_close_by_commit;
	return $this;
	}

	public function getIsCloseByCommit() {
	return $this->isCloseByCommit;
	}

	public function setChangedPriorToCommitURI($uri) {
	$this->changedPriorToCommitURI = $uri;
	return $this;
	}

	public function getChangedPriorToCommitURI() {
	return $this->changedPriorToCommitURI;
	}

	public function setRepositoryPHIDOverride($phid_or_null) {
	$this->repositoryPHIDOverride = $phid_or_null;
	return $this;
	}

	public function getTransactionTypes() {
	$types = parent::getTransactionTypes();

	$types[] = PhabricatorTransactions::TYPE_COMMENT;
	$types[] = PhabricatorTransactions::TYPE_VIEW_POLICY;
	$types[] = PhabricatorTransactions::TYPE_EDIT_POLICY;
	$types[] = PhabricatorTransactions::TYPE_INLINESTATE;

	$types[] = DifferentialTransaction::TYPE_INLINE;
	$types[] = DifferentialTransaction::TYPE_UPDATE;

	return $types;
	}

	protected function getCustomTransactionOldValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case DifferentialTransaction::TYPE_INLINE:
	return null;
	case DifferentialTransaction::TYPE_UPDATE:
	if ($this->getIsNewObject()) {
	return null;
	} else {
	return $object->getActiveDiff()->getPHID();
	}
	}

	return parent::getCustomTransactionOldValue($object, $xaction);
	}

	protected function getCustomTransactionNewValue(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case DifferentialTransaction::TYPE_UPDATE:
	return $xaction->getNewValue();
	case DifferentialTransaction::TYPE_INLINE:
	return null;
	}

	return parent::getCustomTransactionNewValue($object, $xaction);
	}

	protected function applyCustomInternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case DifferentialTransaction::TYPE_INLINE:
	return;
	case DifferentialTransaction::TYPE_UPDATE:
	if (!$this->getIsCloseByCommit()) {
	if ($object->isNeedsRevision() \|\|
	$object->isChangePlanned() \|\|
	$object->isAbandoned()) {
	$object->setModernRevisionStatus(
	DifferentialRevisionStatus::NEEDS_REVIEW);
	}
	}

	$diff = $this->requireDiff($xaction->getNewValue());

	$this->updateRevisionLineCounts($object, $diff);

	if ($this->repositoryPHIDOverride !== false) {
	$object->setRepositoryPHID($this->repositoryPHIDOverride);
	} else {
	$object->setRepositoryPHID($diff->getRepositoryPHID());
	}

	$object->attachActiveDiff($diff);
	$object->setActiveDiffPHID($diff->getPHID());
	return;
	}

	return parent::applyCustomInternalTransaction($object, $xaction);
	}

	protected function expandTransactions(
	PhabricatorLiskDAO $object,
	array $xactions) {

	foreach ($xactions as $xaction) {
	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_INLINESTATE:
	// If we have an "Inline State" transaction already, the caller
	// built it for us so we don't need to expand it again.
	$this->didExpandInlineState = true;
	break;
	case DifferentialRevisionAcceptTransaction::TRANSACTIONTYPE:
	case DifferentialRevisionRejectTransaction::TRANSACTIONTYPE:
	case DifferentialRevisionResignTransaction::TRANSACTIONTYPE:
	// If we have a review transaction, we'll skip marking the user
	// as "Commented" later. This should get cleaner after T10967.
	$this->hasReviewTransaction = true;
	break;
	}
	}

	$this->wasDraft = $object->isDraft();

	return parent::expandTransactions($object, $xactions);
	}

	protected function expandTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	$results = parent::expandTransaction($object, $xaction);

	$actor = $this->getActor();
	$actor_phid = $this->getActingAsPHID();
	$type_edge = PhabricatorTransactions::TYPE_EDGE;

	$edge_ref_task = DifferentialRevisionHasTaskEdgeType::EDGECONST;

	$is_sticky_accept = PhabricatorEnv::getEnvConfig(
	'differential.sticky-accept');

	$downgrade_rejects = false;
	$downgrade_accepts = false;
	if ($this->getIsCloseByCommit()) {
	// Never downgrade reviewers when we're closing a revision after a
	// commit.
	} else {
	switch ($xaction->getTransactionType()) {
	case DifferentialTransaction::TYPE_UPDATE:
	$downgrade_rejects = true;
	if (!$is_sticky_accept) {
	// If "sticky accept" is disabled, also downgrade the accepts.
	$downgrade_accepts = true;
	}
	break;
	case DifferentialRevisionRequestReviewTransaction::TRANSACTIONTYPE:
	$downgrade_rejects = true;
	if ((!$is_sticky_accept) \|\|
	(!$object->isChangePlanned())) {
	// If the old state isn't "changes planned", downgrade the accepts.
	// This exception allows an accepted revision to go through
	// "Plan Changes" -> "Request Review" and return to "accepted" if
	// the author didn't update the revision, essentially undoing the
	// "Plan Changes".
	$downgrade_accepts = true;
	}
	break;
	}
	}

	$new_accept = DifferentialReviewerStatus::STATUS_ACCEPTED;
	$new_reject = DifferentialReviewerStatus::STATUS_REJECTED;
	$old_accept = DifferentialReviewerStatus::STATUS_ACCEPTED_OLDER;
	$old_reject = DifferentialReviewerStatus::STATUS_REJECTED_OLDER;

	$downgrade = array();
	if ($downgrade_accepts) {
	$downgrade[] = DifferentialReviewerStatus::STATUS_ACCEPTED;
	}

	if ($downgrade_rejects) {
	$downgrade[] = DifferentialReviewerStatus::STATUS_REJECTED;
	}

	if ($downgrade) {
	$void_type = DifferentialRevisionVoidTransaction::TRANSACTIONTYPE;

	$results[] = id(new DifferentialTransaction())
	->setTransactionType($void_type)
	->setIgnoreOnNoEffect(true)
	->setNewValue($downgrade);
	}

	$is_commandeer = false;
	switch ($xaction->getTransactionType()) {
	case DifferentialTransaction::TYPE_UPDATE:
	if ($this->getIsCloseByCommit()) {
	// Don't bother with any of this if this update is a side effect of
	// commit detection.
	break;
	}

	// When a revision is updated and the diff comes from a branch named
	// "T123" or similar, automatically associate the commit with the
	// task that the branch names.

	$maniphest = 'PhabricatorManiphestApplication';
	if (PhabricatorApplication::isClassInstalled($maniphest)) {
	$diff = $this->requireDiff($xaction->getNewValue());
	$branch = $diff->getBranch();

	// No "$", to allow for branches like T123_demo.
	$match = null;
	if (preg_match('/^T(\d+)/i', $branch, $match)) {
	$task_id = $match[1];
	$tasks = id(new ManiphestTaskQuery())
	->setViewer($this->getActor())
	->withIDs(array($task_id))
	->execute();
	if ($tasks) {
	$task = head($tasks);
	$task_phid = $task->getPHID();

	$results[] = id(new DifferentialTransaction())
	->setTransactionType($type_edge)
	->setMetadataValue('edge:type', $edge_ref_task)
	->setIgnoreOnNoEffect(true)
	->setNewValue(array('+' => array($task_phid => $task_phid)));
	}
	}
	}
	break;

	case DifferentialRevisionCommandeerTransaction::TRANSACTIONTYPE:
	$is_commandeer = true;
	break;
	}

	if ($is_commandeer) {
	$results[] = $this->newCommandeerReviewerTransaction($object);
	}

	if (!$this->didExpandInlineState) {
	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	case DifferentialTransaction::TYPE_UPDATE:
	case DifferentialTransaction::TYPE_INLINE:
	$this->didExpandInlineState = true;

	$actor_phid = $this->getActingAsPHID();
	$actor_is_author = ($object->getAuthorPHID() == $actor_phid);
	if (!$actor_is_author) {
	break;
	}

	$state_map = PhabricatorTransactions::getInlineStateMap();

	$inlines = id(new DifferentialDiffInlineCommentQuery())
	->setViewer($this->getActor())
	->withRevisionPHIDs(array($object->getPHID()))
	->withFixedStates(array_keys($state_map))
	->execute();

	if (!$inlines) {
	break;
	}

	$old_value = mpull($inlines, 'getFixedState', 'getPHID');
	$new_value = array();
	foreach ($old_value as $key => $state) {
	$new_value[$key] = $state_map[$state];
	}

	$results[] = id(new DifferentialTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_INLINESTATE)
	->setIgnoreOnNoEffect(true)
	->setOldValue($old_value)
	->setNewValue($new_value);
	break;
	}
	}

	return $results;
	}

	protected function applyCustomExternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case DifferentialTransaction::TYPE_INLINE:
	$reply = $xaction->getComment()->getReplyToComment();
	if ($reply && !$reply->getHasReplies()) {
	$reply->setHasReplies(1)->save();
	}
	return;
	case DifferentialTransaction::TYPE_UPDATE:
	// Now that we're inside the transaction, do a final check.
	$diff = $this->requireDiff($xaction->getNewValue());

	// TODO: It would be slightly cleaner to just revalidate this
	// transaction somehow using the same validation code, but that's
	// not easy to do at the moment.

	$revision_id = $diff->getRevisionID();
	if ($revision_id && ($revision_id != $object->getID())) {
	throw new Exception(
	pht(
	'Diff is already attached to another revision. You lost '.
	'a race?'));
	}

	// TODO: This can race with diff updates, particularly those from
	// Harbormaster. See discussion in T8650.
	$diff->setRevisionID($object->getID());
	$diff->save();

	// Update Harbormaster to set the containerPHID correctly for any
	// existing buildables. We may otherwise have buildables stuck with
	// the old (`null`) container.

	// TODO: This is a bit iffy, maybe we can find a cleaner approach?
	// In particular, this could (rarely) be overwritten by Harbormaster
	// workers.
	$table = new HarbormasterBuildable();
	$conn_w = $table->establishConnection('w');
	queryfx(
	$conn_w,
	'UPDATE %T SET containerPHID = %s WHERE buildablePHID = %s',
	$table->getTableName(),
	$object->getPHID(),
	$diff->getPHID());

	return;
	}

	return parent::applyCustomExternalTransaction($object, $xaction);
	}

	protected function applyBuiltinExternalTransaction(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_INLINESTATE:
	$table = new DifferentialTransactionComment();
	$conn_w = $table->establishConnection('w');
	foreach ($xaction->getNewValue() as $phid => $state) {
	queryfx(
	$conn_w,
	'UPDATE %T SET fixedState = %s WHERE phid = %s',
	$table->getTableName(),
	$state,
	$phid);
	}
	break;
	}

	return parent::applyBuiltinExternalTransaction($object, $xaction);
	}

	protected function applyFinalEffects(
	PhabricatorLiskDAO $object,
	array $xactions) {

	// Load the most up-to-date version of the revision and its reviewers,
	// so we don't need to try to deduce the state of reviewers by examining
	// all the changes made by the transactions. Then, update the reviewers
	// on the object to make sure we're acting on the current reviewer set
	// (and, for example, sending mail to the right people).

	$new_revision = id(new DifferentialRevisionQuery())
	->setViewer($this->getActor())
	->needReviewers(true)
	->needActiveDiffs(true)
	->withIDs(array($object->getID()))
	->executeOne();
	if (!$new_revision) {
	throw new Exception(
	pht('Failed to load revision from transaction finalization.'));
	}

	$object->attachReviewers($new_revision->getReviewers());
	$object->attachActiveDiff($new_revision->getActiveDiff());
	$object->attachRepository($new_revision->getRepository());

	foreach ($xactions as $xaction) {
	switch ($xaction->getTransactionType()) {
	case DifferentialTransaction::TYPE_UPDATE:
	$diff = $this->requireDiff($xaction->getNewValue(), true);

	// Update these denormalized index tables when we attach a new
	// diff to a revision.

	$this->updateRevisionHashTable($object, $diff);
	$this->updateAffectedPathTable($object, $diff);
	break;
	}
	}

	$xactions = $this->updateReviewStatus($object, $xactions);
	$this->markReviewerComments($object, $xactions);

	return $xactions;
	}

	private function updateReviewStatus(
	DifferentialRevision $revision,
	array $xactions) {

	$was_accepted = $revision->isAccepted();
	$was_revision = $revision->isNeedsRevision();
	$was_review = $revision->isNeedsReview();
	if (!$was_accepted && !$was_revision && !$was_review) {
	// Revisions can't transition out of other statuses (like closed or
	// abandoned) as a side effect of reviewer status changes.
	return $xactions;
	}

	// Try to move a revision to "accepted". We look for:
	//
	// - at least one accepting reviewer who is a user; and
	// - no rejects; and
	// - no rejects of older diffs; and
	// - no blocking reviewers.

	$has_accepting_user = false;
	$has_rejecting_reviewer = false;
	$has_rejecting_older_reviewer = false;
	$has_blocking_reviewer = false;

	$active_diff = $revision->getActiveDiff();
	foreach ($revision->getReviewers() as $reviewer) {
	$reviewer_status = $reviewer->getReviewerStatus();
	switch ($reviewer_status) {
	case DifferentialReviewerStatus::STATUS_REJECTED:
	$active_phid = $active_diff->getPHID();
	if ($reviewer->isRejected($active_phid)) {
	$has_rejecting_reviewer = true;
	} else {
	$has_rejecting_older_reviewer = true;
	}
	break;
	case DifferentialReviewerStatus::STATUS_REJECTED_OLDER:
	$has_rejecting_older_reviewer = true;
	break;
	case DifferentialReviewerStatus::STATUS_BLOCKING:
	$has_blocking_reviewer = true;
	break;
	case DifferentialReviewerStatus::STATUS_ACCEPTED:
	if ($reviewer->isUser()) {
	$active_phid = $active_diff->getPHID();
	if ($reviewer->isAccepted($active_phid)) {
	$has_accepting_user = true;
	}
	}
	break;
	}
	}

	$new_status = null;
	if ($has_accepting_user &&
	!$has_rejecting_reviewer &&
	!$has_rejecting_older_reviewer &&
	!$has_blocking_reviewer) {
	$new_status = DifferentialRevisionStatus::ACCEPTED;
	} else if ($has_rejecting_reviewer) {
	// This isn't accepted, and there's at least one rejecting reviewer,
	// so the revision needs changes. This usually happens after a
	// "reject".
	$new_status = DifferentialRevisionStatus::NEEDS_REVISION;
	} else if ($was_accepted) {
	// This revision was accepted, but it no longer satisfies the
	// conditions for acceptance. This usually happens after an accepting
	// reviewer resigns or is removed.
	$new_status = DifferentialRevisionStatus::NEEDS_REVIEW;
	}

	if ($new_status === null) {
	return $xactions;
	}

	$old_status = $revision->getModernRevisionStatus();
	if ($new_status == $old_status) {
	return $xactions;
	}

	$xaction = id(new DifferentialTransaction())
	->setTransactionType(
	DifferentialRevisionStatusTransaction::TRANSACTIONTYPE)
	->setOldValue($old_status)
	->setNewValue($new_status);

	$xaction = $this->populateTransaction($revision, $xaction)
	->save();
	$xactions[] = $xaction;

	// Save the status adjustment we made earlier.
	$revision
	->setModernRevisionStatus($new_status)
	->save();

	return $xactions;
	}


	protected function validateTransaction(
	PhabricatorLiskDAO $object,
	$type,
	array $xactions) {

	$errors = parent::validateTransaction($object, $type, $xactions);

	$config_self_accept_key = 'differential.allow-self-accept';
	$allow_self_accept = PhabricatorEnv::getEnvConfig($config_self_accept_key);

	foreach ($xactions as $xaction) {
	switch ($type) {
	case DifferentialTransaction::TYPE_UPDATE:
	$diff = $this->loadDiff($xaction->getNewValue());
	if (!$diff) {
	$errors[] = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Invalid'),
	pht('The specified diff does not exist.'),
	$xaction);
	} else if (($diff->getRevisionID()) &&
	($diff->getRevisionID() != $object->getID())) {
	$errors[] = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Invalid'),
	pht(
	'You can not update this revision to the specified diff, '.
	'because the diff is already attached to another revision.'),
	$xaction);
	}
	break;
	}
	}

	return $errors;
	}

	protected function sortTransactions(array $xactions) {
	$xactions = parent::sortTransactions($xactions);

	$head = array();
	$tail = array();

	foreach ($xactions as $xaction) {
	$type = $xaction->getTransactionType();
	if ($type == DifferentialTransaction::TYPE_INLINE) {
	$tail[] = $xaction;
	} else {
	$head[] = $xaction;
	}
	}

	return array_values(array_merge($head, $tail));
	}

	protected function shouldPublishFeedStory(
	PhabricatorLiskDAO $object,
	array $xactions) {

	if (!$object->shouldBroadcast()) {
	return false;
	}

	return true;
	}

	protected function shouldSendMail(
	PhabricatorLiskDAO $object,
	array $xactions) {

	if (!$object->shouldBroadcast()) {
	return false;
	}

	return true;
	}

	protected function getMailTo(PhabricatorLiskDAO $object) {
	$phids = array();
	$phids[] = $object->getAuthorPHID();
	foreach ($object->getReviewers() as $reviewer) {
	if ($reviewer->isResigned()) {
	continue;
	}

	$phids[] = $reviewer->getReviewerPHID();
	}
	return $phids;
	}

	protected function getMailAction(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$show_lines = false;
	if ($this->isFirstBroadcast()) {
	$action = pht('Request');

	$show_lines = true;
	} else {
	$action = parent::getMailAction($object, $xactions);

	$strongest = $this->getStrongestAction($object, $xactions);
	$type_update = DifferentialTransaction::TYPE_UPDATE;
	if ($strongest->getTransactionType() == $type_update) {
	$show_lines = true;
	}
	}

	if ($show_lines) {
	$count = new PhutilNumber($object->getLineCount());
	$action = pht('%s, %s line(s)', $action, $count);
	}

	return $action;
	}

	protected function getMailSubjectPrefix() {
	return PhabricatorEnv::getEnvConfig('metamta.differential.subject-prefix');
	}

	protected function getMailThreadID(PhabricatorLiskDAO $object) {
	// This is nonstandard, but retains threading with older messages.
	$phid = $object->getPHID();
	return "differential-rev-{$phid}-req";
	}

	protected function buildReplyHandler(PhabricatorLiskDAO $object) {
	return id(new DifferentialReplyHandler())
	->setMailReceiver($object);
	}

	protected function buildMailTemplate(PhabricatorLiskDAO $object) {
	$id = $object->getID();
	$title = $object->getTitle();

	$original_title = $object->getOriginalTitle();

	$subject = "D{$id}: {$title}";
	$thread_topic = "D{$id}: {$original_title}";

	return id(new PhabricatorMetaMTAMail())
	->setSubject($subject)
	->addHeader('Thread-Topic', $thread_topic);
	}

	protected function getTransactionsForMail(
	PhabricatorLiskDAO $object,
	array $xactions) {
	// If this is the first time we're sending mail about this revision, we
	// generate mail for all prior transactions, not just whatever is being
	// applied now. This gets the "added reviewers" lines and other relevant
	// information into the mail.
	if ($this->isFirstBroadcast()) {
	return $this->loadUnbroadcastTransactions($object);
	}

	return $xactions;
	}

	protected function buildMailBody(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$viewer = $this->requireActor();

	$body = new PhabricatorMetaMTAMailBody();
	$body->setViewer($this->requireActor());

	$revision_uri = PhabricatorEnv::getProductionURI('/D'.$object->getID());

	$this->addHeadersAndCommentsToMailBody(
	$body,
	$xactions,
	pht('View Revision'),
	$revision_uri);

	$type_inline = DifferentialTransaction::TYPE_INLINE;

	$inlines = array();
	foreach ($xactions as $xaction) {
	if ($xaction->getTransactionType() == $type_inline) {
	$inlines[] = $xaction;
	}
	}

	if ($inlines) {
	$this->appendInlineCommentsForMail($object, $inlines, $body);
	}

	$changed_uri = $this->getChangedPriorToCommitURI();
	if ($changed_uri) {
	$body->addLinkSection(
	pht('CHANGED PRIOR TO COMMIT'),
	$changed_uri);
	}

	$this->addCustomFieldsToMailBody($body, $object, $xactions);

	$body->addLinkSection(
	pht('REVISION DETAIL'),
	$revision_uri);

	$update_xaction = null;
	foreach ($xactions as $xaction) {
	switch ($xaction->getTransactionType()) {
	case DifferentialTransaction::TYPE_UPDATE:
	$update_xaction = $xaction;
	break;
	}
	}

	if ($update_xaction) {
	$diff = $this->requireDiff($update_xaction->getNewValue(), true);

	$body->addTextSection(
	pht('AFFECTED FILES'),
	$this->renderAffectedFilesForMail($diff));

	$config_key_inline = 'metamta.differential.inline-patches';
	$config_inline = PhabricatorEnv::getEnvConfig($config_key_inline);

	$config_key_attach = 'metamta.differential.attach-patches';
	$config_attach = PhabricatorEnv::getEnvConfig($config_key_attach);

	if ($config_inline \|\| $config_attach) {
	$body_limit = PhabricatorEnv::getEnvConfig('metamta.email-body-limit');

	$patch = $this->buildPatchForMail($diff);
	if ($config_inline) {
	$lines = substr_count($patch, "\n");
	$bytes = strlen($patch);

	// Limit the patch size to the smaller of 256 bytes per line or
	// the mail body limit. This prevents degenerate behavior for patches
	// with one line that is 10MB long. See T11748.
	$byte_limits = array();
	$byte_limits[] = (256 * $config_inline);
	$byte_limits[] = $body_limit;
	$byte_limit = min($byte_limits);

	$lines_ok = ($lines <= $config_inline);
	$bytes_ok = ($bytes <= $byte_limit);

	if ($lines_ok && $bytes_ok) {
	$this->appendChangeDetailsForMail($object, $diff, $patch, $body);
	} else {
	// TODO: Provide a helpful message about the patch being too
	// large or lengthy here.
	}
	}

	if ($config_attach) {
	// See T12033, T11767, and PHI55. This is a crude fix to stop the
	// major concrete problems that lackluster email size limits cause.
	if (strlen($patch) < $body_limit) {
	$name = pht('D%s.%s.patch', $object->getID(), $diff->getID());
	$mime_type = 'text/x-patch; charset=utf-8';
	$body->addAttachment(
	new PhabricatorMetaMTAAttachment($patch, $name, $mime_type));
	}
	}
	}
	}

	return $body;
	}

	public function getMailTagsMap() {
	return array(
	DifferentialTransaction::MAILTAG_REVIEW_REQUEST =>
	pht('A revision is created.'),
	DifferentialTransaction::MAILTAG_UPDATED =>
	pht('A revision is updated.'),
	DifferentialTransaction::MAILTAG_COMMENT =>
	pht('Someone comments on a revision.'),
	DifferentialTransaction::MAILTAG_CLOSED =>
	pht('A revision is closed.'),
	DifferentialTransaction::MAILTAG_REVIEWERS =>
	pht("A revision's reviewers change."),
	DifferentialTransaction::MAILTAG_CC =>
	pht("A revision's CCs change."),
	DifferentialTransaction::MAILTAG_OTHER =>
	pht('Other revision activity not listed above occurs.'),
	);
	}

	protected function supportsSearch() {
	return true;
	}

	protected function expandCustomRemarkupBlockTransactions(
	PhabricatorLiskDAO $object,
	array $xactions,
	array $changes,
	PhutilMarkupEngine $engine) {

	// For "Fixes ..." and "Depends on ...", we're only going to look at
	// content blocks which are part of the revision itself (like "Summary"
	// and "Test Plan"), not comments.
	$content_parts = array();
	foreach ($changes as $change) {
	if ($change->getTransaction()->isCommentTransaction()) {
	continue;
	}
	$content_parts[] = $change->getNewValue();
	}
	if (!$content_parts) {
	return array();
	}
	$content_block = implode("\n\n", $content_parts);
	$task_map = array();
	$task_refs = id(new ManiphestCustomFieldStatusParser())
	->parseCorpus($content_block);
	foreach ($task_refs as $match) {
	foreach ($match['monograms'] as $monogram) {
	$task_id = (int)trim($monogram, 'tT');
	$task_map[$task_id] = true;
	}
	}

	$rev_map = array();
	$rev_refs = id(new DifferentialCustomFieldDependsOnParser())
	->parseCorpus($content_block);
	foreach ($rev_refs as $match) {
	foreach ($match['monograms'] as $monogram) {
	$rev_id = (int)trim($monogram, 'dD');
	$rev_map[$rev_id] = true;
	}
	}

	$edges = array();
	$task_phids = array();
	$rev_phids = array();

	if ($task_map) {
	$tasks = id(new ManiphestTaskQuery())
	->setViewer($this->getActor())
	->withIDs(array_keys($task_map))
	->execute();

	if ($tasks) {
	$task_phids = mpull($tasks, 'getPHID', 'getPHID');
	$edge_related = DifferentialRevisionHasTaskEdgeType::EDGECONST;
	$edges[$edge_related] = $task_phids;
	}
	}

	if ($rev_map) {
	$revs = id(new DifferentialRevisionQuery())
	->setViewer($this->getActor())
	->withIDs(array_keys($rev_map))
	->execute();
	$rev_phids = mpull($revs, 'getPHID', 'getPHID');

	// NOTE: Skip any write attempts if a user cleverly implies a revision
	// depends upon itself.
	unset($rev_phids[$object->getPHID()]);

	if ($revs) {
	$depends = DifferentialRevisionDependsOnRevisionEdgeType::EDGECONST;
	$edges[$depends] = $rev_phids;
	}
	}

	- $this->setUnmentionablePHIDMap(array_merge($task_phids, $rev_phids));
	+ $revert_refs = id(new DifferentialCustomFieldRevertsParser())
	+ ->parseCorpus($content_block);
	+
	+ $revert_monograms = array();
	+ foreach ($revert_refs as $match) {
	+ foreach ($match['monograms'] as $monogram) {
	+ $revert_monograms[] = $monogram;
	+ }
	+ }
	+
	+ if ($revert_monograms) {
	+ $revert_objects = id(new PhabricatorObjectQuery())
	+ ->setViewer($this->getActor())
	+ ->withNames($revert_monograms)
	+ ->withTypes(
	+ array(
	+ DifferentialRevisionPHIDType::TYPECONST,
	+ PhabricatorRepositoryCommitPHIDType::TYPECONST,
	+ ))
	+ ->execute();
	+
	+ $revert_phids = mpull($revert_objects, 'getPHID', 'getPHID');
	+
	+ // Don't let an object revert itself, although other silly stuff like
	+ // cycles of objects reverting each other is not prevented.
	+ unset($revert_phids[$object->getPHID()]);
	+
	+ $revert_type = DiffusionCommitRevertsCommitEdgeType::EDGECONST;
	+ $edges[$revert_type] = $revert_phids;
	+ } else {
	+ $revert_phids = array();
	+ }
	+
	+ $this->setUnmentionablePHIDMap(
	+ array_merge(
	+ $task_phids,
	+ $rev_phids,
	+ $revert_phids));

	$result = array();
	foreach ($edges as $type => $specs) {
	$result[] = id(new DifferentialTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	->setMetadataValue('edge:type', $type)
	->setNewValue(array('+' => $specs));
	}

	return $result;
	}

	private function appendInlineCommentsForMail(
	PhabricatorLiskDAO $object,
	array $inlines,
	PhabricatorMetaMTAMailBody $body) {

	$section = id(new DifferentialInlineCommentMailView())
	->setViewer($this->getActor())
	->setInlines($inlines)
	->buildMailSection();

	$header = pht('INLINE COMMENTS');

	$section_text = "\n".$section->getPlaintext();

	$style = array(
	'margin: 6px 0 12px 0;',
	);

	$section_html = phutil_tag(
	'div',
	array(
	'style' => implode(' ', $style),
	),
	$section->getHTML());

	$body->addPlaintextSection($header, $section_text, false);
	$body->addHTMLSection($header, $section_html);
	}

	private function appendChangeDetailsForMail(
	PhabricatorLiskDAO $object,
	DifferentialDiff $diff,
	$patch,
	PhabricatorMetaMTAMailBody $body) {

	$section = id(new DifferentialChangeDetailMailView())
	->setViewer($this->getActor())
	->setDiff($diff)
	->setPatch($patch)
	->buildMailSection();

	$header = pht('CHANGE DETAILS');

	$section_text = "\n".$section->getPlaintext();

	$style = array(
	'margin: 6px 0 12px 0;',
	);

	$section_html = phutil_tag(
	'div',
	array(
	'style' => implode(' ', $style),
	),
	$section->getHTML());

	$body->addPlaintextSection($header, $section_text, false);
	$body->addHTMLSection($header, $section_html);
	}

	private function loadDiff($phid, $need_changesets = false) {
	$query = id(new DifferentialDiffQuery())
	->withPHIDs(array($phid))
	->setViewer($this->getActor());

	if ($need_changesets) {
	$query->needChangesets(true);
	}

	return $query->executeOne();
	}

	private function requireDiff($phid, $need_changesets = false) {
	$diff = $this->loadDiff($phid, $need_changesets);
	if (!$diff) {
	throw new Exception(pht('Diff "%s" does not exist!', $phid));
	}

	return $diff;
	}

	/* -( Herald Integration )------------------------------------------------- */

	protected function shouldApplyHeraldRules(
	PhabricatorLiskDAO $object,
	array $xactions) {
	return true;
	}

	protected function didApplyHeraldRules(
	PhabricatorLiskDAO $object,
	HeraldAdapter $adapter,
	HeraldTranscript $transcript) {

	$repository = $object->getRepository();
	if (!$repository) {
	return array();
	}

	if (!$this->affectedPaths) {
	return array();
	}

	$packages = PhabricatorOwnersPackage::loadAffectedPackages(
	$repository,
	$this->affectedPaths);
	if (!$packages) {
	return array();
	}

	// Remove packages that the revision author is an owner of. If you own
	// code, you don't need another owner to review it.
	$authority = id(new PhabricatorOwnersPackageQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withPHIDs(mpull($packages, 'getPHID'))
	->withAuthorityPHIDs(array($object->getAuthorPHID()))
	->execute();
	$authority = mpull($authority, null, 'getPHID');

	foreach ($packages as $key => $package) {
	$package_phid = $package->getPHID();
	if (isset($authority[$package_phid])) {
	unset($packages[$key]);
	continue;
	}
	}

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

	$auto_subscribe = array();
	$auto_review = array();
	$auto_block = array();

	foreach ($packages as $package) {
	switch ($package->getAutoReview()) {
	case PhabricatorOwnersPackage::AUTOREVIEW_SUBSCRIBE:
	$auto_subscribe[] = $package;
	break;
	case PhabricatorOwnersPackage::AUTOREVIEW_REVIEW:
	$auto_review[] = $package;
	break;
	case PhabricatorOwnersPackage::AUTOREVIEW_BLOCK:
	$auto_block[] = $package;
	break;
	case PhabricatorOwnersPackage::AUTOREVIEW_NONE:
	default:
	break;
	}
	}

	$owners_phid = id(new PhabricatorOwnersApplication())
	->getPHID();

	$xactions = array();
	if ($auto_subscribe) {
	$xactions[] = $object->getApplicationTransactionTemplate()
	->setAuthorPHID($owners_phid)
	->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS)
	->setNewValue(
	array(
	'+' => mpull($auto_subscribe, 'getPHID'),
	));
	}

	$specs = array(
	array($auto_review, false),
	array($auto_block, true),
	);

	foreach ($specs as $spec) {
	list($reviewers, $blocking) = $spec;
	if (!$reviewers) {
	continue;
	}

	$phids = mpull($reviewers, 'getPHID');
	$xaction = $this->newAutoReviewTransaction($object, $phids, $blocking);
	if ($xaction) {
	$xactions[] = $xaction;
	}
	}

	return $xactions;
	}

	private function newAutoReviewTransaction(
	PhabricatorLiskDAO $object,
	array $phids,
	$is_blocking) {

	// TODO: This is substantially similar to DifferentialReviewersHeraldAction
	// and both are needlessly complex. This logic should live in the normal
	// transaction application pipeline. See T10967.

	$reviewers = $object->getReviewers();
	$reviewers = mpull($reviewers, null, 'getReviewerPHID');

	if ($is_blocking) {
	$new_status = DifferentialReviewerStatus::STATUS_BLOCKING;
	} else {
	$new_status = DifferentialReviewerStatus::STATUS_ADDED;
	}

	$new_strength = DifferentialReviewerStatus::getStatusStrength(
	$new_status);

	$current = array();
	foreach ($phids as $phid) {
	if (!isset($reviewers[$phid])) {
	continue;
	}

	// If we're applying a stronger status (usually, upgrading a reviewer
	// into a blocking reviewer), skip this check so we apply the change.
	$old_strength = DifferentialReviewerStatus::getStatusStrength(
	$reviewers[$phid]->getReviewerStatus());
	if ($old_strength <= $new_strength) {
	continue;
	}

	$current[] = $phid;
	}

	$phids = array_diff($phids, $current);

	if (!$phids) {
	return null;
	}

	$phids = array_fuse($phids);

	$value = array();
	foreach ($phids as $phid) {
	if ($is_blocking) {
	$value[] = 'blocking('.$phid.')';
	} else {
	$value[] = $phid;
	}
	}

	$owners_phid = id(new PhabricatorOwnersApplication())
	->getPHID();

	$reviewers_type = DifferentialRevisionReviewersTransaction::TRANSACTIONTYPE;

	return $object->getApplicationTransactionTemplate()
	->setAuthorPHID($owners_phid)
	->setTransactionType($reviewers_type)
	->setNewValue(
	array(
	'+' => $value,
	));
	}

	protected function buildHeraldAdapter(
	PhabricatorLiskDAO $object,
	array $xactions) {

	$revision = id(new DifferentialRevisionQuery())
	->setViewer($this->getActor())
	->withPHIDs(array($object->getPHID()))
	->needActiveDiffs(true)
	->needReviewers(true)
	->executeOne();
	if (!$revision) {
	throw new Exception(
	pht('Failed to load revision for Herald adapter construction!'));
	}

	$adapter = HeraldDifferentialRevisionAdapter::newLegacyAdapter(
	$revision,
	$revision->getActiveDiff());

	// If the object is still a draft, prevent "Send me an email" and other
	// similar rules from acting yet.
	if (!$object->shouldBroadcast()) {
	$adapter->setForbiddenAction(
	HeraldMailableState::STATECONST,
	DifferentialHeraldStateReasons::REASON_DRAFT);
	}

	// If this edit didn't actually change the diff (for example, a user
	// edited the title or changed subscribers), prevent "Run build plan"
	// and other similar rules from acting yet, since the build results will
	// not (or, at least, should not) change unless the actual source changes.
	// We also don't run Differential builds if the update was caused by
	// discovering a commit, as the expectation is that Diffusion builds take
	// over once things land.
	$has_update = false;
	$has_commit = false;

	$type_update = DifferentialTransaction::TYPE_UPDATE;
	foreach ($xactions as $xaction) {
	if ($xaction->getTransactionType() != $type_update) {
	continue;
	}

	if ($xaction->getMetadataValue('isCommitUpdate')) {
	$has_commit = true;
	} else {
	$has_update = true;
	}

	break;
	}

	if ($has_commit) {
	$adapter->setForbiddenAction(
	HeraldBuildableState::STATECONST,
	DifferentialHeraldStateReasons::REASON_LANDED);
	} else if (!$has_update) {
	$adapter->setForbiddenAction(
	HeraldBuildableState::STATECONST,
	DifferentialHeraldStateReasons::REASON_UNCHANGED);
	}

	return $adapter;
	}

	/**
	* Update the table which links Differential revisions to paths they affect,
	* so Diffusion can efficiently find pending revisions for a given file.
	*/
	private function updateAffectedPathTable(
	DifferentialRevision $revision,
	DifferentialDiff $diff) {

	$repository = $revision->getRepository();
	if (!$repository) {
	// The repository where the code lives is untracked.
	return;
	}

	$path_prefix = null;

	$local_root = $diff->getSourceControlPath();
	if ($local_root) {
	// We're in a working copy which supports subdirectory checkouts (e.g.,
	// SVN) so we need to figure out what prefix we should add to each path
	// (e.g., trunk/projects/example/) to get the absolute path from the
	// root of the repository. DVCS systems like Git and Mercurial are not
	// affected.

	// Normalize both paths and check if the repository root is a prefix of
	// the local root. If so, throw it away. Note that this correctly handles
	// the case where the remote path is "/".
	$local_root = id(new PhutilURI($local_root))->getPath();
	$local_root = rtrim($local_root, '/');

	$repo_root = id(new PhutilURI($repository->getRemoteURI()))->getPath();
	$repo_root = rtrim($repo_root, '/');

	if (!strncmp($repo_root, $local_root, strlen($repo_root))) {
	$path_prefix = substr($local_root, strlen($repo_root));
	}
	}

	$changesets = $diff->getChangesets();
	$paths = array();
	foreach ($changesets as $changeset) {
	$paths[] = $path_prefix.'/'.$changeset->getFilename();
	}

	// Save the affected paths; we'll use them later to query Owners. This
	// uses the un-expanded paths.
	$this->affectedPaths = $paths;

	// Mark this as also touching all parent paths, so you can see all pending
	// changes to any file within a directory.
	$all_paths = array();
	foreach ($paths as $local) {
	foreach (DiffusionPathIDQuery::expandPathToRoot($local) as $path) {
	$all_paths[$path] = true;
	}
	}
	$all_paths = array_keys($all_paths);

	$path_ids =
	PhabricatorRepositoryCommitChangeParserWorker::lookupOrCreatePaths(
	$all_paths);

	$table = new DifferentialAffectedPath();
	$conn_w = $table->establishConnection('w');

	$sql = array();
	foreach ($path_ids as $path_id) {
	$sql[] = qsprintf(
	$conn_w,
	'(%d, %d, %d, %d)',
	$repository->getID(),
	$path_id,
	time(),
	$revision->getID());
	}

	queryfx(
	$conn_w,
	'DELETE FROM %T WHERE revisionID = %d',
	$table->getTableName(),
	$revision->getID());
	foreach (array_chunk($sql, 256) as $chunk) {
	queryfx(
	$conn_w,
	'INSERT INTO %T (repositoryID, pathID, epoch, revisionID) VALUES %Q',
	$table->getTableName(),
	implode(', ', $chunk));
	}
	}

	/**
	* Update the table connecting revisions to DVCS local hashes, so we can
	* identify revisions by commit/tree hashes.
	*/
	private function updateRevisionHashTable(
	DifferentialRevision $revision,
	DifferentialDiff $diff) {

	$vcs = $diff->getSourceControlSystem();
	if ($vcs == DifferentialRevisionControlSystem::SVN) {
	// Subversion has no local commit or tree hash information, so we don't
	// have to do anything.
	return;
	}

	$property = id(new DifferentialDiffProperty())->loadOneWhere(
	'diffID = %d AND name = %s',
	$diff->getID(),
	'local:commits');
	if (!$property) {
	return;
	}

	$hashes = array();

	$data = $property->getData();
	switch ($vcs) {
	case DifferentialRevisionControlSystem::GIT:
	foreach ($data as $commit) {
	$hashes[] = array(
	ArcanistDifferentialRevisionHash::HASH_GIT_COMMIT,
	$commit['commit'],
	);
	$hashes[] = array(
	ArcanistDifferentialRevisionHash::HASH_GIT_TREE,
	$commit['tree'],
	);
	}
	break;
	case DifferentialRevisionControlSystem::MERCURIAL:
	foreach ($data as $commit) {
	$hashes[] = array(
	ArcanistDifferentialRevisionHash::HASH_MERCURIAL_COMMIT,
	$commit['rev'],
	);
	}
	break;
	}

	$conn_w = $revision->establishConnection('w');

	$sql = array();
	foreach ($hashes as $info) {
	list($type, $hash) = $info;
	$sql[] = qsprintf(
	$conn_w,
	'(%d, %s, %s)',
	$revision->getID(),
	$type,
	$hash);
	}

	queryfx(
	$conn_w,
	'DELETE FROM %T WHERE revisionID = %d',
	ArcanistDifferentialRevisionHash::TABLE_NAME,
	$revision->getID());

	if ($sql) {
	queryfx(
	$conn_w,
	'INSERT INTO %T (revisionID, type, hash) VALUES %Q',
	ArcanistDifferentialRevisionHash::TABLE_NAME,
	implode(', ', $sql));
	}
	}

	private function renderAffectedFilesForMail(DifferentialDiff $diff) {
	$changesets = $diff->getChangesets();

	$filenames = mpull($changesets, 'getDisplayFilename');
	sort($filenames);

	$count = count($filenames);
	$max = 250;
	if ($count > $max) {
	$filenames = array_slice($filenames, 0, $max);
	$filenames[] = pht('(%d more files...)', ($count - $max));
	}

	return implode("\n", $filenames);
	}

	private function renderPatchHTMLForMail($patch) {
	return phutil_tag('pre',
	array('style' => 'font-family: monospace;'), $patch);
	}

	private function buildPatchForMail(DifferentialDiff $diff) {
	$format = PhabricatorEnv::getEnvConfig('metamta.differential.patch-format');

	return id(new DifferentialRawDiffRenderer())
	->setViewer($this->getActor())
	->setFormat($format)
	->setChangesets($diff->getChangesets())
	->buildPatch();
	}

	protected function willPublish(PhabricatorLiskDAO $object, array $xactions) {
	// Reload to pick up the active diff and reviewer status.
	return id(new DifferentialRevisionQuery())
	->setViewer($this->getActor())
	->needReviewers(true)
	->needActiveDiffs(true)
	->withIDs(array($object->getID()))
	->executeOne();
	}

	protected function getCustomWorkerState() {
	return array(
	'changedPriorToCommitURI' => $this->changedPriorToCommitURI,
	'firstBroadcast' => $this->firstBroadcast,
	);
	}

	protected function loadCustomWorkerState(array $state) {
	$this->changedPriorToCommitURI = idx($state, 'changedPriorToCommitURI');
	$this->firstBroadcast = idx($state, 'firstBroadcast');
	return $this;
	}

	private function newCommandeerReviewerTransaction(
	DifferentialRevision $revision) {

	$actor_phid = $this->getActingAsPHID();
	$owner_phid = $revision->getAuthorPHID();

	// If the user is commandeering, add the previous owner as a
	// reviewer and remove the actor.

	$edits = array(
	'-' => array(
	$actor_phid,
	),
	'+' => array(
	$owner_phid,
	),
	);

	// NOTE: We're setting setIsCommandeerSideEffect() on this because normally
	// you can't add a revision's author as a reviewer, but this action swaps
	// them after validation executes.

	$xaction_type = DifferentialRevisionReviewersTransaction::TRANSACTIONTYPE;

	return id(new DifferentialTransaction())
	->setTransactionType($xaction_type)
	->setIgnoreOnNoEffect(true)
	->setIsCommandeerSideEffect(true)
	->setNewValue($edits);
	}

	public function getActiveDiff($object) {
	if ($this->getIsNewObject()) {
	return null;
	} else {
	return $object->getActiveDiff();
	}
	}

	/**
	* When a reviewer makes a comment, mark the last revision they commented
	* on.
	*
	* This allows us to show a hint to help authors and other reviewers quickly
	* distinguish between reviewers who have participated in the discussion and
	* reviewers who haven't been part of it.
	*/
	private function markReviewerComments($object, array $xactions) {
	$acting_phid = $this->getActingAsPHID();
	if (!$acting_phid) {
	return;
	}

	$diff = $this->getActiveDiff($object);
	if (!$diff) {
	return;
	}

	$has_comment = false;
	foreach ($xactions as $xaction) {
	if ($xaction->hasComment()) {
	$has_comment = true;
	break;
	}
	}

	if (!$has_comment) {
	return;
	}

	$reviewer_table = new DifferentialReviewer();
	$conn = $reviewer_table->establishConnection('w');

	queryfx(
	$conn,
	'UPDATE %T SET lastCommentDiffPHID = %s
	WHERE revisionPHID = %s
	AND reviewerPHID = %s',
	$reviewer_table->getTableName(),
	$diff->getPHID(),
	$object->getPHID(),
	$acting_phid);
	}

	private function loadUnbroadcastTransactions($object) {
	$viewer = $this->requireActor();

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

	return array_reverse($xactions);
	}


	protected function didApplyTransactions($object, array $xactions) {
	// In a moment, we're going to try to publish draft revisions which have
	// completed all their builds. However, we only want to do that if the
	// actor is either the revision author or an omnipotent user (generally,
	// the Harbormaster application).

	// If we let any actor publish the revision as a side effect of other
	// changes then an unlucky third party who innocently comments on the draft
	// can end up racing Harbormaster and promoting the revision. At best, this
	// is confusing. It can also run into validation problems with the "Request
	// Review" transaction. See PHI309 for some discussion.
	$author_phid = $object->getAuthorPHID();
	$viewer = $this->requireActor();
	$can_undraft =
	($this->getActingAsPHID() === $author_phid) \|\|
	($viewer->isOmnipotent());

	// If a draft revision has no outstanding builds and we're automatically
	// making drafts public after builds finish, make the revision public.
	if ($can_undraft) {
	$auto_undraft = !$object->getHoldAsDraft();
	} else {
	$auto_undraft = false;
	}

	if ($object->isDraft() && $auto_undraft) {
	$active_builds = $this->hasActiveBuilds($object);
	if (!$active_builds) {
	// When Harbormaster moves a revision out of the draft state, we
	// attribute the action to the revision author since this is more
	// natural and more useful.

	// Additionally, we change the acting PHID for the transaction set
	// to the author if it isn't already a user so that mail comes from
	// the natural author.
	$acting_phid = $this->getActingAsPHID();
	$user_type = PhabricatorPeopleUserPHIDType::TYPECONST;
	if (phid_get_type($acting_phid) != $user_type) {
	$this->setActingAsPHID($author_phid);
	}

	$xaction = $object->getApplicationTransactionTemplate()
	->setAuthorPHID($author_phid)
	->setTransactionType(
	DifferentialRevisionRequestReviewTransaction::TRANSACTIONTYPE)
	->setNewValue(true);

	// If we're creating this revision and immediately moving it out of
	// the draft state, mark this as a create transaction so it gets
	// hidden in the timeline and mail, since it isn't interesting: it
	// is as though the draft phase never happened.
	if ($this->getIsNewObject()) {
	$xaction->setIsCreateTransaction(true);
	}

	// Queue this transaction and apply it separately after the current
	// batch of transactions finishes so that Herald can fire on the new
	// revision state. See T13027 for discussion.
	$this->queueTransaction($xaction);
	}
	}

	// If the revision is new or was a draft, and is no longer a draft, we
	// might be sending the first email about it.

	// This might mean it was created directly into a non-draft state, or
	// it just automatically undrafted after builds finished, or a user
	// explicitly promoted it out of the draft state with an action like
	// "Request Review".

	// If we haven't sent any email about it yet, mark this email as the first
	// email so the mail gets enriched with "SUMMARY" and "TEST PLAN".

	$is_new = $this->getIsNewObject();
	$was_draft = $this->wasDraft;

	if (!$object->isDraft() && ($was_draft \|\| $is_new)) {
	if (!$object->getHasBroadcast()) {
	// Mark this as the first broadcast we're sending about the revision
	// so mail can generate specially.
	$this->firstBroadcast = true;

	$object
	->setHasBroadcast(true)
	->save();
	}
	}

	return $xactions;
	}

	private function hasActiveBuilds($object) {
	$viewer = $this->requireActor();

	$builds = $object->loadActiveBuilds($viewer);
	if (!$builds) {
	return false;
	}

	return true;
	}

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

	$revision->setLineCount($diff->getLineCount());

	$conn = $revision->establishConnection('r');

	$row = queryfx_one(
	$conn,
	'SELECT SUM(addLines) A, SUM(delLines) D FROM %T
	WHERE diffID = %d',
	id(new DifferentialChangeset())->getTableName(),
	$diff->getID());

	if ($row) {
	$revision->setAddedLineCount((int)$row['A']);
	$revision->setRemovedLineCount((int)$row['D']);
	}
	}

	}
	diff --git a/src/applications/diffusion/edge/DiffusionCommitRevertedByCommitEdgeType.php b/src/applications/diffusion/edge/DiffusionCommitRevertedByCommitEdgeType.php
	index 53c39e54c9..ae59a3b1e6 100644
	--- a/src/applications/diffusion/edge/DiffusionCommitRevertedByCommitEdgeType.php
	+++ b/src/applications/diffusion/edge/DiffusionCommitRevertedByCommitEdgeType.php
	@@ -1,104 +1,104 @@
	<?php

	final class DiffusionCommitRevertedByCommitEdgeType
	extends PhabricatorEdgeType {

	const EDGECONST = 56;

	public function getInverseEdgeConstant() {
	return DiffusionCommitRevertsCommitEdgeType::EDGECONST;
	}

	public function shouldWriteInverseTransactions() {
	return true;
	}

	public function getTransactionAddString(
	$actor,
	$add_count,
	$add_edges) {

	return pht(
	- '%s added %s reverting commit(s): %s.',
	+ '%s added %s reverting change(s): %s.',
	$actor,
	$add_count,
	$add_edges);
	}

	public function getTransactionRemoveString(
	$actor,
	$rem_count,
	$rem_edges) {

	return pht(
	- '%s removed %s reverting commit(s): %s.',
	+ '%s removed %s reverting change(s): %s.',
	$actor,
	$rem_count,
	$rem_edges);
	}

	public function getTransactionEditString(
	$actor,
	$total_count,
	$add_count,
	$add_edges,
	$rem_count,
	$rem_edges) {

	return pht(
	- '%s edited reverting commit(s), added %s: %s; removed %s: %s.',
	+ '%s edited reverting change(s), added %s: %s; removed %s: %s.',
	$actor,
	$add_count,
	$add_edges,
	$rem_count,
	$rem_edges);
	}

	public function getFeedAddString(
	$actor,
	$object,
	$add_count,
	$add_edges) {

	return pht(
	- '%s added %s reverting commit(s) for %s: %s.',
	+ '%s added %s reverting change(s) for %s: %s.',
	$actor,
	$add_count,
	$object,
	$add_edges);
	}

	public function getFeedRemoveString(
	$actor,
	$object,
	$rem_count,
	$rem_edges) {

	return pht(
	- '%s removed %s reverting commit(s) for %s: %s.',
	+ '%s removed %s reverting change(s) for %s: %s.',
	$actor,
	$rem_count,
	$object,
	$rem_edges);
	}

	public function getFeedEditString(
	$actor,
	$object,
	$total_count,
	$add_count,
	$add_edges,
	$rem_count,
	$rem_edges) {

	return pht(
	- '%s edited reverting commit(s) for %s, added %s: %s; removed %s: %s.',
	+ '%s edited reverting change(s) for %s, added %s: %s; removed %s: %s.',
	$actor,
	$object,
	$add_count,
	$add_edges,
	$rem_count,
	$rem_edges);
	}

	}
	diff --git a/src/applications/diffusion/edge/DiffusionCommitRevertsCommitEdgeType.php b/src/applications/diffusion/edge/DiffusionCommitRevertsCommitEdgeType.php
	index 8f32797173..ee0223c966 100644
	--- a/src/applications/diffusion/edge/DiffusionCommitRevertsCommitEdgeType.php
	+++ b/src/applications/diffusion/edge/DiffusionCommitRevertsCommitEdgeType.php
	@@ -1,107 +1,107 @@
	<?php

	final class DiffusionCommitRevertsCommitEdgeType extends PhabricatorEdgeType {

	const EDGECONST = 55;

	public function getInverseEdgeConstant() {
	return DiffusionCommitRevertedByCommitEdgeType::EDGECONST;
	}

	public function shouldWriteInverseTransactions() {
	return true;
	}

	public function shouldPreventCycles() {
	return true;
	}

	public function getTransactionAddString(
	$actor,
	$add_count,
	$add_edges) {

	return pht(
	- '%s added %s reverted commit(s): %s.',
	+ '%s added %s reverted change(s): %s.',
	$actor,
	$add_count,
	$add_edges);
	}

	public function getTransactionRemoveString(
	$actor,
	$rem_count,
	$rem_edges) {

	return pht(
	- '%s removed %s reverted commit(s): %s.',
	+ '%s removed %s reverted change(s): %s.',
	$actor,
	$rem_count,
	$rem_edges);
	}

	public function getTransactionEditString(
	$actor,
	$total_count,
	$add_count,
	$add_edges,
	$rem_count,
	$rem_edges) {

	return pht(
	- '%s edited reverted commit(s), added %s: %s; removed %s: %s.',
	+ '%s edited reverted change(s), added %s: %s; removed %s: %s.',
	$actor,
	$add_count,
	$add_edges,
	$rem_count,
	$rem_edges);
	}

	public function getFeedAddString(
	$actor,
	$object,
	$add_count,
	$add_edges) {

	return pht(
	- '%s added %s reverted commit(s) for %s: %s.',
	+ '%s added %s reverted change(s) for %s: %s.',
	$actor,
	$add_count,
	$object,
	$add_edges);
	}

	public function getFeedRemoveString(
	$actor,
	$object,
	$rem_count,
	$rem_edges) {

	return pht(
	- '%s removed %s reverted commit(s) for %s: %s.',
	+ '%s removed %s reverted change(s) for %s: %s.',
	$actor,
	$rem_count,
	$object,
	$rem_edges);
	}

	public function getFeedEditString(
	$actor,
	$object,
	$total_count,
	$add_count,
	$add_edges,
	$rem_count,
	$rem_edges) {

	return pht(
	- '%s edited reverted commit(s) for %s, added %s: %s; removed %s: %s.',
	+ '%s edited reverted change(s) for %s, added %s: %s; removed %s: %s.',
	$actor,
	$object,
	$add_count,
	$add_edges,
	$rem_count,
	$rem_edges);
	}

	}
	diff --git a/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php b/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
	index 9fb6667924..818d1e8781 100644
	--- a/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
	+++ b/src/applications/repository/worker/PhabricatorRepositoryCommitHeraldWorker.php
	@@ -1,168 +1,146 @@
	<?php

	final class PhabricatorRepositoryCommitHeraldWorker
	extends PhabricatorRepositoryCommitParserWorker {

	protected function getImportStepFlag() {
	return PhabricatorRepositoryCommit::IMPORTED_HERALD;
	}

	public function getRequiredLeaseTime() {
	// Herald rules may take a long time to process.
	return phutil_units('4 hours in seconds');
	}

	protected function parseCommit(
	PhabricatorRepository $repository,
	PhabricatorRepositoryCommit $commit) {
	+ $viewer = PhabricatorUser::getOmnipotentUser();

	if ($this->shouldSkipImportStep()) {
	// This worker has no followup tasks, so we can just bail out
	// right away without queueing anything.
	return;
	}

	// Reload the commit to pull commit data and audit requests.
	$commit = id(new DiffusionCommitQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withIDs(array($commit->getID()))
	->needCommitData(true)
	->needAuditRequests(true)
	->executeOne();
	$data = $commit->getCommitData();

	if (!$data) {
	throw new PhabricatorWorkerPermanentFailureException(
	pht(
	'Unable to load commit data. The data for this task is invalid '.
	'or no longer exists.'));
	}

	$commit->attachRepository($repository);

	$content_source = $this->newContentSource();

	$committer_phid = $data->getCommitDetail('committerPHID');
	$author_phid = $data->getCommitDetail('authorPHID');
	$acting_as_phid = nonempty(
	$committer_phid,
	$author_phid,
	id(new PhabricatorDiffusionApplication())->getPHID());

	$editor = id(new PhabricatorAuditEditor())
	- ->setActor(PhabricatorUser::getOmnipotentUser())
	+ ->setActor($viewer)
	->setActingAsPHID($acting_as_phid)
	->setContinueOnMissingFields(true)
	->setContinueOnNoEffect(true)
	->setContentSource($content_source);

	$xactions = array();
	$xactions[] = id(new PhabricatorAuditTransaction())
	->setTransactionType(PhabricatorAuditTransaction::TYPE_COMMIT)
	->setDateCreated($commit->getEpoch())
	->setNewValue(array(
	'description' => $data->getCommitMessage(),
	'summary' => $data->getSummary(),
	'authorName' => $data->getAuthorName(),
	'authorPHID' => $commit->getAuthorPHID(),
	'committerName' => $data->getCommitDetail('committer'),
	'committerPHID' => $data->getCommitDetail('committerPHID'),
	));

	- $reverts_refs = id(new DifferentialCustomFieldRevertsParser())
	- ->parseCorpus($data->getCommitMessage());
	- $reverts = array_mergev(ipull($reverts_refs, 'monograms'));
	-
	- if ($reverts) {
	- $reverted_commits = id(new DiffusionCommitQuery())
	- ->setViewer(PhabricatorUser::getOmnipotentUser())
	- ->withRepository($repository)
	- ->withIdentifiers($reverts)
	- ->execute();
	- $reverted_commit_phids = mpull($reverted_commits, 'getPHID', 'getPHID');
	-
	- // NOTE: Skip any write attempts if a user cleverly implies a commit
	- // reverts itself.
	- unset($reverted_commit_phids[$commit->getPHID()]);
	-
	- $reverts_edge = DiffusionCommitRevertsCommitEdgeType::EDGECONST;
	- $xactions[] = id(new PhabricatorAuditTransaction())
	- ->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	- ->setMetadataValue('edge:type', $reverts_edge)
	- ->setNewValue(array('+' => array_fuse($reverted_commit_phids)));
	- }
	-
	try {
	$raw_patch = $this->loadRawPatchText($repository, $commit);
	} catch (Exception $ex) {
	$raw_patch = pht('Unable to generate patch: %s', $ex->getMessage());
	}
	$editor->setRawPatch($raw_patch);

	return $editor->applyTransactions($commit, $xactions);
	}

	private function loadRawPatchText(
	PhabricatorRepository $repository,
	PhabricatorRepositoryCommit $commit) {
	$viewer = PhabricatorUser::getOmnipotentUser();

	$identifier = $commit->getCommitIdentifier();

	$drequest = DiffusionRequest::newFromDictionary(
	array(
	'user' => $viewer,
	'repository' => $repository,
	));

	$time_key = 'metamta.diffusion.time-limit';
	$byte_key = 'metamta.diffusion.byte-limit';
	$time_limit = PhabricatorEnv::getEnvConfig($time_key);
	$byte_limit = PhabricatorEnv::getEnvConfig($byte_key);

	$diff_info = DiffusionQuery::callConduitWithDiffusionRequest(
	$viewer,
	$drequest,
	'diffusion.rawdiffquery',
	array(
	'commit' => $identifier,
	'linesOfContext' => 3,
	'timeout' => $time_limit,
	'byteLimit' => $byte_limit,
	));

	if ($diff_info['tooSlow']) {
	throw new Exception(
	pht(
	'Patch generation took longer than configured limit ("%s") of '.
	'%s second(s).',
	$time_key,
	new PhutilNumber($time_limit)));
	}

	if ($diff_info['tooHuge']) {
	$pretty_limit = phutil_format_bytes($byte_limit);
	throw new Exception(
	pht(
	'Patch size exceeds configured byte size limit ("%s") of %s.',
	$byte_key,
	$pretty_limit));
	}

	$file_phid = $diff_info['filePHID'];
	$file = id(new PhabricatorFileQuery())
	->setViewer($viewer)
	->withPHIDs(array($file_phid))
	->executeOne();
	if (!$file) {
	throw new Exception(
	pht(
	'Failed to load file ("%s") returned by "%s".',
	$file_phid,
	'diffusion.rawdiffquery'));
	}

	return $file->loadFileData();
	}

	}
	diff --git a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
	index 97b57009ec..d5c28b83bf 100644
	--- a/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
	+++ b/src/applications/transactions/storage/PhabricatorApplicationTransaction.php
	@@ -1,1702 +1,1716 @@
	<?php

	abstract class PhabricatorApplicationTransaction
	extends PhabricatorLiskDAO
	implements
	PhabricatorPolicyInterface,
	PhabricatorDestructibleInterface {

	const TARGET_TEXT = 'text';
	const TARGET_HTML = 'html';

	protected $phid;
	protected $objectPHID;
	protected $authorPHID;
	protected $viewPolicy;
	protected $editPolicy;

	protected $commentPHID;
	protected $commentVersion = 0;
	protected $transactionType;
	protected $oldValue;
	protected $newValue;
	protected $metadata = array();

	protected $contentSource;

	private $comment;
	private $commentNotLoaded;

	private $handles;
	private $renderingTarget = self::TARGET_HTML;
	private $transactionGroup = array();
	private $viewer = self::ATTACHABLE;
	private $object = self::ATTACHABLE;
	private $oldValueHasBeenSet = false;

	private $ignoreOnNoEffect;


	/**
	* Flag this transaction as a pure side-effect which should be ignored when
	* applying transactions if it has no effect, even if transaction application
	* would normally fail. This both provides users with better error messages
	* and allows transactions to perform optional side effects.
	*/
	public function setIgnoreOnNoEffect($ignore) {
	$this->ignoreOnNoEffect = $ignore;
	return $this;
	}

	public function getIgnoreOnNoEffect() {
	return $this->ignoreOnNoEffect;
	}

	public function shouldGenerateOldValue() {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_BUILDABLE:
	case PhabricatorTransactions::TYPE_TOKEN:
	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	case PhabricatorTransactions::TYPE_INLINESTATE:
	return false;
	}
	return true;
	}

	abstract public function getApplicationTransactionType();

	private function getApplicationObjectTypeName() {
	$types = PhabricatorPHIDType::getAllTypes();

	$type = idx($types, $this->getApplicationTransactionType());
	if ($type) {
	return $type->getTypeName();
	}

	return pht('Object');
	}

	public function getApplicationTransactionCommentObject() {
	throw new PhutilMethodNotImplementedException();
	}

	public function getApplicationTransactionViewObject() {
	return new PhabricatorApplicationTransactionView();
	}

	public function getMetadataValue($key, $default = null) {
	return idx($this->metadata, $key, $default);
	}

	public function setMetadataValue($key, $value) {
	$this->metadata[$key] = $value;
	return $this;
	}

	public function generatePHID() {
	$type = PhabricatorApplicationTransactionTransactionPHIDType::TYPECONST;
	$subtype = $this->getApplicationTransactionType();

	return PhabricatorPHID::generateNewPHID($type, $subtype);
	}

	protected function getConfiguration() {
	return array(
	self::CONFIG_AUX_PHID => true,
	self::CONFIG_SERIALIZATION => array(
	'oldValue' => self::SERIALIZATION_JSON,
	'newValue' => self::SERIALIZATION_JSON,
	'metadata' => self::SERIALIZATION_JSON,
	),
	self::CONFIG_COLUMN_SCHEMA => array(
	'commentPHID' => 'phid?',
	'commentVersion' => 'uint32',
	'contentSource' => 'text',
	'transactionType' => 'text32',
	),
	self::CONFIG_KEY_SCHEMA => array(
	'key_object' => array(
	'columns' => array('objectPHID'),
	),
	),
	) + parent::getConfiguration();
	}

	public function setContentSource(PhabricatorContentSource $content_source) {
	$this->contentSource = $content_source->serialize();
	return $this;
	}

	public function getContentSource() {
	return PhabricatorContentSource::newFromSerialized($this->contentSource);
	}

	public function hasComment() {
	return $this->getComment() && strlen($this->getComment()->getContent());
	}

	public function getComment() {
	if ($this->commentNotLoaded) {
	throw new Exception(pht('Comment for this transaction was not loaded.'));
	}
	return $this->comment;
	}

	public function setIsCreateTransaction($create) {
	return $this->setMetadataValue('core.create', $create);
	}

	public function getIsCreateTransaction() {
	return (bool)$this->getMetadataValue('core.create', false);
	}

	public function setIsDefaultTransaction($default) {
	return $this->setMetadataValue('core.default', $default);
	}

	public function getIsDefaultTransaction() {
	return (bool)$this->getMetadataValue('core.default', false);
	}

	public function setIsSilentTransaction($silent) {
	return $this->setMetadataValue('core.silent', $silent);
	}

	public function getIsSilentTransaction() {
	return (bool)$this->getMetadataValue('core.silent', false);
	}

	public function attachComment(
	PhabricatorApplicationTransactionComment $comment) {
	$this->comment = $comment;
	$this->commentNotLoaded = false;
	return $this;
	}

	public function setCommentNotLoaded($not_loaded) {
	$this->commentNotLoaded = $not_loaded;
	return $this;
	}

	public function attachObject($object) {
	$this->object = $object;
	return $this;
	}

	public function getObject() {
	return $this->assertAttached($this->object);
	}

	public function getRemarkupChanges() {
	$changes = $this->newRemarkupChanges();
	assert_instances_of($changes, 'PhabricatorTransactionRemarkupChange');

	// Convert older-style remarkup blocks into newer-style remarkup changes.
	// This builds changes that do not have the correct "old value", so rules
	// that operate differently against edits (like @user mentions) won't work
	// properly.
	foreach ($this->getRemarkupBlocks() as $block) {
	$changes[] = $this->newRemarkupChange()
	->setOldValue(null)
	->setNewValue($block);
	}

	$comment = $this->getComment();
	if ($comment) {
	if ($comment->hasOldComment()) {
	$old_value = $comment->getOldComment()->getContent();
	} else {
	$old_value = null;
	}

	$new_value = $comment->getContent();

	$changes[] = $this->newRemarkupChange()
	->setOldValue($old_value)
	->setNewValue($new_value);
	}

	return $changes;
	}

	protected function newRemarkupChanges() {
	return array();
	}

	protected function newRemarkupChange() {
	return id(new PhabricatorTransactionRemarkupChange())
	->setTransaction($this);
	}

	/**
	* @deprecated
	*/
	public function getRemarkupBlocks() {
	$blocks = array();

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$field = $this->getTransactionCustomField();
	if ($field) {
	$custom_blocks = $field->getApplicationTransactionRemarkupBlocks(
	$this);
	foreach ($custom_blocks as $custom_block) {
	$blocks[] = $custom_block;
	}
	}
	break;
	}

	return $blocks;
	}

	public function setOldValue($value) {
	$this->oldValueHasBeenSet = true;
	$this->writeField('oldValue', $value);
	return $this;
	}

	public function hasOldValue() {
	return $this->oldValueHasBeenSet;
	}


	/* -( Rendering )---------------------------------------------------------- */

	public function setRenderingTarget($rendering_target) {
	$this->renderingTarget = $rendering_target;
	return $this;
	}

	public function getRenderingTarget() {
	return $this->renderingTarget;
	}

	public function attachViewer(PhabricatorUser $viewer) {
	$this->viewer = $viewer;
	return $this;
	}

	public function getViewer() {
	return $this->assertAttached($this->viewer);
	}

	public function getRequiredHandlePHIDs() {
	$phids = array();

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

	$phids[] = array($this->getAuthorPHID());
	$phids[] = array($this->getObjectPHID());
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$field = $this->getTransactionCustomField();
	if ($field) {
	$phids[] = $field->getApplicationTransactionRequiredHandlePHIDs(
	$this);
	}
	break;
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	$phids[] = $old;
	$phids[] = $new;
	break;
	case PhabricatorTransactions::TYPE_EDGE:
	$record = PhabricatorEdgeChangeRecord::newFromTransaction($this);
	$phids[] = $record->getChangedPHIDs();
	break;
	case PhabricatorTransactions::TYPE_COLUMNS:
	foreach ($new as $move) {
	$phids[] = array(
	$move['columnPHID'],
	$move['boardPHID'],
	);
	$phids[] = $move['fromColumnPHIDs'];
	}
	break;
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	if (!PhabricatorPolicyQuery::isSpecialPolicy($old)) {
	$phids[] = array($old);
	}
	if (!PhabricatorPolicyQuery::isSpecialPolicy($new)) {
	$phids[] = array($new);
	}
	break;
	case PhabricatorTransactions::TYPE_SPACE:
	if ($old) {
	$phids[] = array($old);
	}
	if ($new) {
	$phids[] = array($new);
	}
	break;
	case PhabricatorTransactions::TYPE_TOKEN:
	break;
	case PhabricatorTransactions::TYPE_BUILDABLE:
	$phid = $this->getMetadataValue('harbormaster:buildablePHID');
	if ($phid) {
	$phids[] = array($phid);
	}
	break;
	}

	if ($this->getComment()) {
	$phids[] = array($this->getComment()->getAuthorPHID());
	}

	return array_mergev($phids);
	}

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

	public function getHandle($phid) {
	if (empty($this->handles[$phid])) {
	throw new Exception(
	pht(
	'Transaction ("%s", of type "%s") requires a handle ("%s") that it '.
	'did not load.',
	$this->getPHID(),
	$this->getTransactionType(),
	$phid));
	}
	return $this->handles[$phid];
	}

	public function getHandleIfExists($phid) {
	return idx($this->handles, $phid);
	}

	public function getHandles() {
	if ($this->handles === null) {
	throw new Exception(
	pht('Transaction requires handles and it did not load them.'));
	}
	return $this->handles;
	}

	public function renderHandleLink($phid) {
	if ($this->renderingTarget == self::TARGET_HTML) {
	return $this->getHandle($phid)->renderLink();
	} else {
	return $this->getHandle($phid)->getLinkName();
	}
	}

	public function renderHandleList(array $phids) {
	$links = array();
	foreach ($phids as $phid) {
	$links[] = $this->renderHandleLink($phid);
	}
	if ($this->renderingTarget == self::TARGET_HTML) {
	return phutil_implode_html(', ', $links);
	} else {
	return implode(', ', $links);
	}
	}

	private function renderSubscriberList(array $phids, $change_type) {
	if ($this->getRenderingTarget() == self::TARGET_TEXT) {
	return $this->renderHandleList($phids);
	} else {
	$handles = array_select_keys($this->getHandles(), $phids);
	return id(new SubscriptionListStringBuilder())
	->setHandles($handles)
	->setObjectPHID($this->getPHID())
	->buildTransactionString($change_type);
	}
	}

	protected function renderPolicyName($phid, $state = 'old') {
	$policy = PhabricatorPolicy::newFromPolicyAndHandle(
	$phid,
	$this->getHandleIfExists($phid));
	if ($this->renderingTarget == self::TARGET_HTML) {
	switch ($policy->getType()) {
	case PhabricatorPolicyType::TYPE_CUSTOM:
	$policy->setHref('/transactions/'.$state.'/'.$this->getPHID().'/');
	$policy->setWorkflow(true);
	break;
	default:
	break;
	}
	$output = $policy->renderDescription();
	} else {
	$output = hsprintf('%s', $policy->getFullName());
	}
	return $output;
	}

	public function getIcon() {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	$comment = $this->getComment();
	if ($comment && $comment->getIsRemoved()) {
	return 'fa-trash';
	}
	return 'fa-comment';
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	$old = $this->getOldValue();
	$new = $this->getNewValue();
	$add = array_diff($new, $old);
	$rem = array_diff($old, $new);
	if ($add && $rem) {
	return 'fa-user';
	} else if ($add) {
	return 'fa-user-plus';
	} else if ($rem) {
	return 'fa-user-times';
	} else {
	return 'fa-user';
	}
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	return 'fa-lock';
	case PhabricatorTransactions::TYPE_EDGE:
	+ switch ($this->getMetadataValue('edge:type')) {
	+ case DiffusionCommitRevertedByCommitEdgeType::EDGECONST:
	+ return 'fa-undo';
	+ case DiffusionCommitRevertsCommitEdgeType::EDGECONST:
	+ return 'fa-ambulance';
	+ }
	return 'fa-link';
	case PhabricatorTransactions::TYPE_BUILDABLE:
	return 'fa-wrench';
	case PhabricatorTransactions::TYPE_TOKEN:
	return 'fa-trophy';
	case PhabricatorTransactions::TYPE_SPACE:
	return 'fa-th-large';
	case PhabricatorTransactions::TYPE_COLUMNS:
	return 'fa-columns';
	}

	return 'fa-pencil';
	}

	public function getToken() {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_TOKEN:
	$old = $this->getOldValue();
	$new = $this->getNewValue();
	if ($new) {
	$icon = substr($new, 10);
	} else {
	$icon = substr($old, 10);
	}
	return array($icon, !$this->getNewValue());
	}

	return array(null, null);
	}

	public function getColor() {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT;
	$comment = $this->getComment();
	if ($comment && $comment->getIsRemoved()) {
	return 'black';
	}
	break;
	+ case PhabricatorTransactions::TYPE_EDGE:
	+ switch ($this->getMetadataValue('edge:type')) {
	+ case DiffusionCommitRevertedByCommitEdgeType::EDGECONST:
	+ return 'pink';
	+ case DiffusionCommitRevertsCommitEdgeType::EDGECONST:
	+ return 'sky';
	+ }
	+ break;
	case PhabricatorTransactions::TYPE_BUILDABLE:
	switch ($this->getNewValue()) {
	case HarbormasterBuildable::STATUS_PASSED:
	return 'green';
	case HarbormasterBuildable::STATUS_FAILED:
	return 'red';
	}
	break;
	}
	return null;
	}

	protected function getTransactionCustomField() {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$key = $this->getMetadataValue('customfield:key');
	if (!$key) {
	return null;
	}

	$object = $this->getObject();

	if (!($object instanceof PhabricatorCustomFieldInterface)) {
	return null;
	}

	$field = PhabricatorCustomField::getObjectField(
	$object,
	PhabricatorCustomField::ROLE_APPLICATIONTRANSACTIONS,
	$key);
	if (!$field) {
	return null;
	}

	$field->setViewer($this->getViewer());
	return $field;
	}

	return null;
	}

	public function shouldHide() {
	// Never hide comments.
	if ($this->hasComment()) {
	return false;
	}

	// Hide creation transactions if the old value is empty. These are
	// transactions like "alice set the task tile to: ...", which are
	// essentially never interesting.
	if ($this->getIsCreateTransaction()) {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_CREATE:
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	case PhabricatorTransactions::TYPE_SPACE:
	break;
	case PhabricatorTransactions::TYPE_SUBTYPE:
	return true;
	default:
	$old = $this->getOldValue();

	if (is_array($old) && !$old) {
	return true;
	}

	if (!is_array($old)) {
	if (!strlen($old)) {
	return true;
	}

	// The integer 0 is also uninteresting by default; this is often
	// an "off" flag for something like "All Day Event".
	if ($old === 0) {
	return true;
	}
	}

	break;
	}
	}

	// Hide creation transactions setting values to defaults, even if
	// the old value is not empty. For example, tasks may have a global
	// default view policy of "All Users", but a particular form sets the
	// policy to "Administrators". The transaction corresponding to this
	// change is not interesting, since it is the default behavior of the
	// form.

	if ($this->getIsCreateTransaction()) {
	if ($this->getIsDefaultTransaction()) {
	return true;
	}
	}

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	case PhabricatorTransactions::TYPE_SPACE:
	if ($this->getIsCreateTransaction()) {
	break;
	}

	// TODO: Remove this eventually, this is handling old changes during
	// object creation prior to the introduction of "create" and "default"
	// transaction display flags.

	// NOTE: We can also hit this case with Space transactions that later
	// update a default space (`null`) to an explicit space, so handling
	// the Space case may require some finesse.

	if ($this->getOldValue() === null) {
	return true;
	} else {
	return false;
	}
	break;
	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$field = $this->getTransactionCustomField();
	if ($field) {
	return $field->shouldHideInApplicationTransactions($this);
	}
	break;
	case PhabricatorTransactions::TYPE_COLUMNS:
	return !$this->getInterestingMoves($this->getNewValue());
	case PhabricatorTransactions::TYPE_EDGE:
	$edge_type = $this->getMetadataValue('edge:type');
	switch ($edge_type) {
	case PhabricatorObjectMentionsObjectEdgeType::EDGECONST:
	case ManiphestTaskHasDuplicateTaskEdgeType::EDGECONST:
	case ManiphestTaskIsDuplicateOfTaskEdgeType::EDGECONST:
	return true;
	break;
	case PhabricatorObjectMentionedByObjectEdgeType::EDGECONST:
	$record = PhabricatorEdgeChangeRecord::newFromTransaction($this);
	$add = $record->getAddedPHIDs();
	$add_value = reset($add);
	$add_handle = $this->getHandle($add_value);
	if ($add_handle->getPolicyFiltered()) {
	return true;
	}
	return false;
	break;
	default:
	break;
	}
	break;
	}

	return false;
	}

	public function shouldHideForMail(array $xactions) {
	if ($this->isSelfSubscription()) {
	return true;
	}

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_TOKEN:
	return true;
	case PhabricatorTransactions::TYPE_BUILDABLE:
	switch ($this->getNewValue()) {
	case HarbormasterBuildable::STATUS_FAILED:
	// For now, only ever send mail when builds fail. We might let
	// you customize this later, but in most cases this is probably
	// completely uninteresting.
	return false;
	}
	return true;
	case PhabricatorTransactions::TYPE_EDGE:
	$edge_type = $this->getMetadataValue('edge:type');
	switch ($edge_type) {
	case PhabricatorObjectMentionsObjectEdgeType::EDGECONST:
	case PhabricatorObjectMentionedByObjectEdgeType::EDGECONST:
	return true;
	case PhabricatorProjectObjectHasProjectEdgeType::EDGECONST:
	// When an object is first created, we hide any corresponding
	// project transactions in the web UI because you can just look at
	// the UI element elsewhere on screen to see which projects it
	// is tagged with. However, in mail there's no other way to get
	// this information, and it has some amount of value to users, so
	// we keep the transaction. See T10493.
	return false;
	default:
	break;
	}
	break;
	}

	if ($this->isInlineCommentTransaction()) {
	$inlines = array();

	// If there's a normal comment, we don't need to publish the inline
	// transaction, since the normal comment covers things.
	foreach ($xactions as $xaction) {
	if ($xaction->isInlineCommentTransaction()) {
	$inlines[] = $xaction;
	continue;
	}

	// We found a normal comment, so hide this inline transaction.
	if ($xaction->hasComment()) {
	return true;
	}
	}

	// If there are several inline comments, only publish the first one.
	if ($this !== head($inlines)) {
	return true;
	}
	}

	return $this->shouldHide();
	}

	public function shouldHideForFeed() {
	if ($this->isSelfSubscription()) {
	return true;
	}

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_TOKEN:
	return true;
	case PhabricatorTransactions::TYPE_BUILDABLE:
	switch ($this->getNewValue()) {
	case HarbormasterBuildable::STATUS_FAILED:
	// For now, don't notify on build passes either. These are pretty
	// high volume and annoying, with very little present value. We
	// might want to turn them back on in the specific case of
	// build successes on the current document?
	return false;
	}
	return true;
	case PhabricatorTransactions::TYPE_EDGE:
	$edge_type = $this->getMetadataValue('edge:type');
	switch ($edge_type) {
	case PhabricatorObjectMentionsObjectEdgeType::EDGECONST:
	case PhabricatorObjectMentionedByObjectEdgeType::EDGECONST:
	return true;
	break;
	default:
	break;
	}
	break;
	case PhabricatorTransactions::TYPE_INLINESTATE:
	return true;
	}

	return $this->shouldHide();
	}

	public function getTitleForMail() {
	return id(clone $this)->setRenderingTarget('text')->getTitle();
	}

	public function getTitleForHTMLMail() {
	$title = $this->getTitleForMail();
	if ($title === null) {
	return null;
	}

	if ($this->hasChangeDetails()) {
	$details_uri = $this->getChangeDetailsURI();
	$details_uri = PhabricatorEnv::getProductionURI($details_uri);

	$show_details = phutil_tag(
	'a',
	array(
	'href' => $details_uri,
	),
	pht('(Show Details)'));

	$title = array($title, ' ', $show_details);
	}

	return $title;
	}

	public function getChangeDetailsURI() {
	return '/transactions/detail/'.$this->getPHID().'/';
	}

	public function getBodyForMail() {
	if ($this->isInlineCommentTransaction()) {
	// We don't return inline comment content as mail body content, because
	// applications need to contextualize it (by adding line numbers, for
	// example) in order for it to make sense.
	return null;
	}

	$comment = $this->getComment();
	if ($comment && strlen($comment->getContent())) {
	return $comment->getContent();
	}

	return null;
	}

	public function getNoEffectDescription() {

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	return pht('You can not post an empty comment.');
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	return pht(
	'This %s already has that view policy.',
	$this->getApplicationObjectTypeName());
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	return pht(
	'This %s already has that edit policy.',
	$this->getApplicationObjectTypeName());
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	return pht(
	'This %s already has that join policy.',
	$this->getApplicationObjectTypeName());
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	return pht(
	'All users are already subscribed to this %s.',
	$this->getApplicationObjectTypeName());
	case PhabricatorTransactions::TYPE_SPACE:
	return pht('This object is already in that space.');
	case PhabricatorTransactions::TYPE_EDGE:
	return pht('Edges already exist; transaction has no effect.');
	case PhabricatorTransactions::TYPE_COLUMNS:
	return pht(
	'You have not moved this object to any columns it is not '.
	'already in.');
	}

	return pht(
	'Transaction (of type "%s") has no effect.',
	$this->getTransactionType());
	}

	public function getTitle() {
	$author_phid = $this->getAuthorPHID();

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

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_CREATE:
	return pht(
	'%s created this object.',
	$this->renderHandleLink($author_phid));
	case PhabricatorTransactions::TYPE_COMMENT:
	return pht(
	'%s added a comment.',
	$this->renderHandleLink($author_phid));
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	if ($this->getIsCreateTransaction()) {
	return pht(
	'%s created this object with visibility "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderPolicyName($new, 'new'));
	} else {
	return pht(
	'%s changed the visibility from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderPolicyName($old, 'old'),
	$this->renderPolicyName($new, 'new'));
	}
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	if ($this->getIsCreateTransaction()) {
	return pht(
	'%s created this object with edit policy "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderPolicyName($new, 'new'));
	} else {
	return pht(
	'%s changed the edit policy from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderPolicyName($old, 'old'),
	$this->renderPolicyName($new, 'new'));
	}
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	if ($this->getIsCreateTransaction()) {
	return pht(
	'%s created this object with join policy "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderPolicyName($new, 'new'));
	} else {
	return pht(
	'%s changed the join policy from "%s" to "%s".',
	$this->renderHandleLink($author_phid),
	$this->renderPolicyName($old, 'old'),
	$this->renderPolicyName($new, 'new'));
	}
	case PhabricatorTransactions::TYPE_SPACE:
	if ($this->getIsCreateTransaction()) {
	return pht(
	'%s created this object in space %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($new));
	} else {
	return pht(
	'%s shifted this object from the %s space to the %s space.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($old),
	$this->renderHandleLink($new));
	}
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	$add = array_diff($new, $old);
	$rem = array_diff($old, $new);

	if ($add && $rem) {
	return pht(
	'%s edited subscriber(s), added %d: %s; removed %d: %s.',
	$this->renderHandleLink($author_phid),
	count($add),
	$this->renderSubscriberList($add, 'add'),
	count($rem),
	$this->renderSubscriberList($rem, 'rem'));
	} else if ($add) {
	return pht(
	'%s added %d subscriber(s): %s.',
	$this->renderHandleLink($author_phid),
	count($add),
	$this->renderSubscriberList($add, 'add'));
	} else if ($rem) {
	return pht(
	'%s removed %d subscriber(s): %s.',
	$this->renderHandleLink($author_phid),
	count($rem),
	$this->renderSubscriberList($rem, 'rem'));
	} else {
	// This is used when rendering previews, before the user actually
	// selects any CCs.
	return pht(
	'%s updated subscribers...',
	$this->renderHandleLink($author_phid));
	}
	break;
	case PhabricatorTransactions::TYPE_EDGE:
	$record = PhabricatorEdgeChangeRecord::newFromTransaction($this);
	$add = $record->getAddedPHIDs();
	$rem = $record->getRemovedPHIDs();

	$type = $this->getMetadata('edge:type');
	$type = head($type);

	try {
	$type_obj = PhabricatorEdgeType::getByConstant($type);
	} catch (Exception $ex) {
	// Recover somewhat gracefully from edge transactions which
	// we don't have the classes for.
	return pht(
	'%s edited an edge.',
	$this->renderHandleLink($author_phid));
	}

	if ($add && $rem) {
	return $type_obj->getTransactionEditString(
	$this->renderHandleLink($author_phid),
	new PhutilNumber(count($add) + count($rem)),
	phutil_count($add),
	$this->renderHandleList($add),
	phutil_count($rem),
	$this->renderHandleList($rem));
	} else if ($add) {
	return $type_obj->getTransactionAddString(
	$this->renderHandleLink($author_phid),
	phutil_count($add),
	$this->renderHandleList($add));
	} else if ($rem) {
	return $type_obj->getTransactionRemoveString(
	$this->renderHandleLink($author_phid),
	phutil_count($rem),
	$this->renderHandleList($rem));
	} else {
	return $type_obj->getTransactionPreviewString(
	$this->renderHandleLink($author_phid));
	}

	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$field = $this->getTransactionCustomField();
	if ($field) {
	return $field->getApplicationTransactionTitle($this);
	} else {
	$developer_mode = 'phabricator.developer-mode';
	$is_developer = PhabricatorEnv::getEnvConfig($developer_mode);
	if ($is_developer) {
	return pht(
	'%s edited a custom field (with key "%s").',
	$this->renderHandleLink($author_phid),
	$this->getMetadata('customfield:key'));
	} else {
	return pht(
	'%s edited a custom field.',
	$this->renderHandleLink($author_phid));
	}
	}

	case PhabricatorTransactions::TYPE_TOKEN:
	if ($old && $new) {
	return pht(
	'%s updated a token.',
	$this->renderHandleLink($author_phid));
	} else if ($old) {
	return pht(
	'%s rescinded a token.',
	$this->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s awarded a token.',
	$this->renderHandleLink($author_phid));
	}

	case PhabricatorTransactions::TYPE_BUILDABLE:
	switch ($this->getNewValue()) {
	case HarbormasterBuildable::STATUS_BUILDING:
	return pht(
	'%s started building %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink(
	$this->getMetadataValue('harbormaster:buildablePHID')));
	case HarbormasterBuildable::STATUS_PASSED:
	return pht(
	'%s completed building %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink(
	$this->getMetadataValue('harbormaster:buildablePHID')));
	case HarbormasterBuildable::STATUS_FAILED:
	return pht(
	'%s failed to build %s!',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink(
	$this->getMetadataValue('harbormaster:buildablePHID')));
	default:
	return null;
	}

	case PhabricatorTransactions::TYPE_INLINESTATE:
	$done = 0;
	$undone = 0;
	foreach ($new as $phid => $state) {
	if ($state == PhabricatorInlineCommentInterface::STATE_DONE) {
	$done++;
	} else {
	$undone++;
	}
	}
	if ($done && $undone) {
	return pht(
	'%s marked %s inline comment(s) as done and %s inline comment(s) '.
	'as not done.',
	$this->renderHandleLink($author_phid),
	new PhutilNumber($done),
	new PhutilNumber($undone));
	} else if ($done) {
	return pht(
	'%s marked %s inline comment(s) as done.',
	$this->renderHandleLink($author_phid),
	new PhutilNumber($done));
	} else {
	return pht(
	'%s marked %s inline comment(s) as not done.',
	$this->renderHandleLink($author_phid),
	new PhutilNumber($undone));
	}
	break;

	case PhabricatorTransactions::TYPE_COLUMNS:
	$moves = $this->getInterestingMoves($new);
	if (count($moves) == 1) {
	$move = head($moves);
	$from_columns = $move['fromColumnPHIDs'];
	$to_column = $move['columnPHID'];
	$board_phid = $move['boardPHID'];
	if (count($from_columns) == 1) {
	return pht(
	'%s moved this task from %s to %s on the %s board.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink(head($from_columns)),
	$this->renderHandleLink($to_column),
	$this->renderHandleLink($board_phid));
	} else {
	return pht(
	'%s moved this task to %s on the %s board.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($to_column),
	$this->renderHandleLink($board_phid));
	}
	} else {
	$fragments = array();
	foreach ($moves as $move) {
	$fragments[] = pht(
	'%s (%s)',
	$this->renderHandleLink($board_phid),
	$this->renderHandleLink($to_column));
	}

	return pht(
	'%s moved this task on %s board(s): %s.',
	$this->renderHandleLink($author_phid),
	phutil_count($moves),
	phutil_implode_html(', ', $fragments));
	}
	break;

	default:
	// In developer mode, provide a better hint here about which string
	// we're missing.
	$developer_mode = 'phabricator.developer-mode';
	$is_developer = PhabricatorEnv::getEnvConfig($developer_mode);
	if ($is_developer) {
	return pht(
	'%s edited this object (transaction type "%s").',
	$this->renderHandleLink($author_phid),
	$this->getTransactionType());
	} else {
	return pht(
	'%s edited this %s.',
	$this->renderHandleLink($author_phid),
	$this->getApplicationObjectTypeName());
	}
	}
	}

	public function getTitleForFeed() {
	$author_phid = $this->getAuthorPHID();
	$object_phid = $this->getObjectPHID();

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

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_CREATE:
	return pht(
	'%s created %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case PhabricatorTransactions::TYPE_COMMENT:
	return pht(
	'%s added a comment to %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	return pht(
	'%s changed the visibility for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	return pht(
	'%s changed the edit policy for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	return pht(
	'%s changed the join policy for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	return pht(
	'%s updated subscribers of %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	case PhabricatorTransactions::TYPE_SPACE:
	if ($this->getIsCreateTransaction()) {
	return pht(
	'%s created %s in the %s space.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$this->renderHandleLink($new));
	} else {
	return pht(
	'%s shifted %s from the %s space to the %s space.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$this->renderHandleLink($old),
	$this->renderHandleLink($new));
	}
	case PhabricatorTransactions::TYPE_EDGE:
	$record = PhabricatorEdgeChangeRecord::newFromTransaction($this);
	$add = $record->getAddedPHIDs();
	$rem = $record->getRemovedPHIDs();

	$type = $this->getMetadata('edge:type');
	$type = head($type);

	$type_obj = PhabricatorEdgeType::getByConstant($type);

	if ($add && $rem) {
	return $type_obj->getFeedEditString(
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	new PhutilNumber(count($add) + count($rem)),
	phutil_count($add),
	$this->renderHandleList($add),
	phutil_count($rem),
	$this->renderHandleList($rem));
	} else if ($add) {
	return $type_obj->getFeedAddString(
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	phutil_count($add),
	$this->renderHandleList($add));
	} else if ($rem) {
	return $type_obj->getFeedRemoveString(
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	phutil_count($rem),
	$this->renderHandleList($rem));
	} else {
	return pht(
	'%s edited edge metadata for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}

	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$field = $this->getTransactionCustomField();
	if ($field) {
	return $field->getApplicationTransactionTitleForFeed($this);
	} else {
	return pht(
	'%s edited a custom field on %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid));
	}
	case PhabricatorTransactions::TYPE_BUILDABLE:
	switch ($this->getNewValue()) {
	case HarbormasterBuildable::STATUS_BUILDING:
	return pht(
	'%s started building %s for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink(
	$this->getMetadataValue('harbormaster:buildablePHID')),
	$this->renderHandleLink($object_phid));
	case HarbormasterBuildable::STATUS_PASSED:
	return pht(
	'%s completed building %s for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink(
	$this->getMetadataValue('harbormaster:buildablePHID')),
	$this->renderHandleLink($object_phid));
	case HarbormasterBuildable::STATUS_FAILED:
	return pht(
	'%s failed to build %s for %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink(
	$this->getMetadataValue('harbormaster:buildablePHID')),
	$this->renderHandleLink($object_phid));
	default:
	return null;
	}

	case PhabricatorTransactions::TYPE_COLUMNS:
	$moves = $this->getInterestingMoves($new);
	if (count($moves) == 1) {
	$move = head($moves);
	$from_columns = $move['fromColumnPHIDs'];
	$to_column = $move['columnPHID'];
	$board_phid = $move['boardPHID'];
	if (count($from_columns) == 1) {
	return pht(
	'%s moved %s from %s to %s on the %s board.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$this->renderHandleLink(head($from_columns)),
	$this->renderHandleLink($to_column),
	$this->renderHandleLink($board_phid));
	} else {
	return pht(
	'%s moved %s to %s on the %s board.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	$this->renderHandleLink($to_column),
	$this->renderHandleLink($board_phid));
	}
	} else {
	$fragments = array();
	foreach ($moves as $move) {
	$fragments[] = pht(
	'%s (%s)',
	$this->renderHandleLink($board_phid),
	$this->renderHandleLink($to_column));
	}

	return pht(
	'%s moved %s on %s board(s): %s.',
	$this->renderHandleLink($author_phid),
	$this->renderHandleLink($object_phid),
	phutil_count($moves),
	phutil_implode_html(', ', $fragments));
	}
	break;

	}

	return $this->getTitle();
	}

	public function getMarkupFieldsForFeed(PhabricatorFeedStory $story) {
	$fields = array();

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	$text = $this->getComment()->getContent();
	if (strlen($text)) {
	$fields[] = 'comment/'.$this->getID();
	}
	break;
	}

	return $fields;
	}

	public function getMarkupTextForFeed(PhabricatorFeedStory $story, $field) {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	$text = $this->getComment()->getContent();
	return PhabricatorMarkupEngine::summarize($text);
	}

	return null;
	}

	public function getBodyForFeed(PhabricatorFeedStory $story) {
	$remarkup = $this->getRemarkupBodyForFeed($story);
	if ($remarkup !== null) {
	$remarkup = PhabricatorMarkupEngine::summarize($remarkup);
	return new PHUIRemarkupView($this->viewer, $remarkup);
	}

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

	$body = null;

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	$text = $this->getComment()->getContent();
	if (strlen($text)) {
	$body = $story->getMarkupFieldOutput('comment/'.$this->getID());
	}
	break;
	}

	return $body;
	}

	public function getRemarkupBodyForFeed(PhabricatorFeedStory $story) {
	return null;
	}

	public function getActionStrength() {
	if ($this->isInlineCommentTransaction()) {
	return 0.25;
	}

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	return 0.5;
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	if ($this->isSelfSubscription()) {
	// Make this weaker than TYPE_COMMENT.
	return 0.25;
	}

	if ($this->isApplicationAuthor()) {
	// When applications (most often: Herald) change subscriptions it
	// is very uninteresting.
	return 0.000000001;
	}

	// In other cases, subscriptions are more interesting than comments
	// (which are shown anyway) but less interesting than any other type of
	// transaction.
	return 0.75;
	}

	return 1.0;
	}

	public function isCommentTransaction() {
	if ($this->hasComment()) {
	return true;
	}

	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	return true;
	}

	return false;
	}

	public function isInlineCommentTransaction() {
	return false;
	}

	public function getActionName() {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_COMMENT:
	return pht('Commented On');
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	case PhabricatorTransactions::TYPE_JOIN_POLICY:
	return pht('Changed Policy');
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	return pht('Changed Subscribers');
	case PhabricatorTransactions::TYPE_BUILDABLE:
	switch ($this->getNewValue()) {
	case HarbormasterBuildable::STATUS_PASSED:
	return pht('Build Passed');
	case HarbormasterBuildable::STATUS_FAILED:
	return pht('Build Failed');
	default:
	return pht('Build Status');
	}
	default:
	return pht('Updated');
	}
	}

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

	public function hasChangeDetails() {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$field = $this->getTransactionCustomField();
	if ($field) {
	return $field->getApplicationTransactionHasChangeDetails($this);
	}
	break;
	}
	return false;
	}

	public function hasChangeDetailsForMail() {
	return $this->hasChangeDetails();
	}

	public function renderChangeDetailsForMail(PhabricatorUser $viewer) {
	$view = $this->renderChangeDetails($viewer);
	if ($view instanceof PhabricatorApplicationTransactionTextDiffDetailView) {
	return $view->renderForMail();
	}
	return null;
	}

	public function renderChangeDetails(PhabricatorUser $viewer) {
	switch ($this->getTransactionType()) {
	case PhabricatorTransactions::TYPE_CUSTOMFIELD:
	$field = $this->getTransactionCustomField();
	if ($field) {
	return $field->getApplicationTransactionChangeDetails($this, $viewer);
	}
	break;
	}

	return $this->renderTextCorpusChangeDetails(
	$viewer,
	$this->getOldValue(),
	$this->getNewValue());
	}

	public function renderTextCorpusChangeDetails(
	PhabricatorUser $viewer,
	$old,
	$new) {
	return id(new PhabricatorApplicationTransactionTextDiffDetailView())
	->setUser($viewer)
	->setOldText($old)
	->setNewText($new);
	}

	public function attachTransactionGroup(array $group) {
	assert_instances_of($group, __CLASS__);
	$this->transactionGroup = $group;
	return $this;
	}

	public function getTransactionGroup() {
	return $this->transactionGroup;
	}

	/**
	* Should this transaction be visually grouped with an existing transaction
	* group?
	*
	* @param list<PhabricatorApplicationTransaction> List of transactions.
	* @return bool True to display in a group with the other transactions.
	*/
	public function shouldDisplayGroupWith(array $group) {
	$this_source = null;
	if ($this->getContentSource()) {
	$this_source = $this->getContentSource()->getSource();
	}

	foreach ($group as $xaction) {
	// Don't group transactions by different authors.
	if ($xaction->getAuthorPHID() != $this->getAuthorPHID()) {
	return false;
	}

	// Don't group transactions for different objects.
	if ($xaction->getObjectPHID() != $this->getObjectPHID()) {
	return false;
	}

	// Don't group anything into a group which already has a comment.
	if ($xaction->isCommentTransaction()) {
	return false;
	}

	// Don't group transactions from different content sources.
	$other_source = null;
	if ($xaction->getContentSource()) {
	$other_source = $xaction->getContentSource()->getSource();
	}

	if ($other_source != $this_source) {
	return false;
	}

	// Don't group transactions which happened more than 2 minutes apart.
	$apart = abs($xaction->getDateCreated() - $this->getDateCreated());
	if ($apart > (60 * 2)) {
	return false;
	}

	// Don't group silent and nonsilent transactions together.
	$is_silent = $this->getIsSilentTransaction();
	if ($is_silent != $xaction->getIsSilentTransaction()) {
	return false;
	}
	}

	return true;
	}

	public function renderExtraInformationLink() {
	$herald_xscript_id = $this->getMetadataValue('herald:transcriptID');

	if ($herald_xscript_id) {
	return phutil_tag(
	'a',
	array(
	'href' => '/herald/transcript/'.$herald_xscript_id.'/',
	),
	pht('View Herald Transcript'));
	}

	return null;
	}

	public function renderAsTextForDoorkeeper(
	DoorkeeperFeedStoryPublisher $publisher,
	PhabricatorFeedStory $story,
	array $xactions) {

	$text = array();
	$body = array();

	foreach ($xactions as $xaction) {
	$xaction_body = $xaction->getBodyForMail();
	if ($xaction_body !== null) {
	$body[] = $xaction_body;
	}

	if ($xaction->shouldHideForMail($xactions)) {
	continue;
	}

	$old_target = $xaction->getRenderingTarget();
	$new_target = self::TARGET_TEXT;
	$xaction->setRenderingTarget($new_target);

	if ($publisher->getRenderWithImpliedContext()) {
	$text[] = $xaction->getTitle();
	} else {
	$text[] = $xaction->getTitleForFeed();
	}

	$xaction->setRenderingTarget($old_target);
	}

	$text = implode("\n", $text);
	$body = implode("\n\n", $body);

	return rtrim($text."\n\n".$body);
	}

	/**
	* Test if this transaction is just a user subscribing or unsubscribing
	* themselves.
	*/
	private function isSelfSubscription() {
	$type = $this->getTransactionType();
	if ($type != PhabricatorTransactions::TYPE_SUBSCRIBERS) {
	return false;
	}

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

	$add = array_diff($old, $new);
	$rem = array_diff($new, $old);

	if ((count($add) + count($rem)) != 1) {
	// More than one user affected.
	return false;
	}

	$affected_phid = head(array_merge($add, $rem));
	if ($affected_phid != $this->getAuthorPHID()) {
	// Affected user is someone else.
	return false;
	}

	return true;
	}

	private function isApplicationAuthor() {
	$author_phid = $this->getAuthorPHID();
	$author_type = phid_get_type($author_phid);
	$application_type = PhabricatorApplicationApplicationPHIDType::TYPECONST;
	return ($author_type == $application_type);
	}


	private function getInterestingMoves(array $moves) {
	// Remove moves which only shift the position of a task within a column.
	foreach ($moves as $key => $move) {
	$from_phids = array_fuse($move['fromColumnPHIDs']);
	if (isset($from_phids[$move['columnPHID']])) {
	unset($moves[$key]);
	}
	}

	return $moves;
	}


	/* -( PhabricatorPolicyInterface Implementation )-------------------------- */


	public function getCapabilities() {
	return array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	);
	}

	public function getPolicy($capability) {
	switch ($capability) {
	case PhabricatorPolicyCapability::CAN_VIEW:
	return $this->getViewPolicy();
	case PhabricatorPolicyCapability::CAN_EDIT:
	return $this->getEditPolicy();
	}
	}

	public function hasAutomaticCapability($capability, PhabricatorUser $viewer) {
	return ($viewer->getPHID() == $this->getAuthorPHID());
	}

	public function describeAutomaticCapability($capability) {
	return pht(
	'Transactions are visible to users that can see the object which was '.
	'acted upon. Some transactions - in particular, comments - are '.
	'editable by the transaction author.');
	}

	public function getModularType() {
	return null;
	}


	/* -( PhabricatorDestructibleInterface )----------------------------------- */


	public function destroyObjectPermanently(
	PhabricatorDestructionEngine $engine) {

	$this->openTransaction();
	$comment_template = null;
	try {
	$comment_template = $this->getApplicationTransactionCommentObject();
	} catch (Exception $ex) {
	// Continue; no comments for these transactions.
	}

	if ($comment_template) {
	$comments = $comment_template->loadAllWhere(
	'transactionPHID = %s',
	$this->getPHID());
	foreach ($comments as $comment) {
	$engine->destroyObject($comment);
	}
	}

	$this->delete();
	$this->saveTransaction();
	}


	}
	diff --git a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
	index 40cedacf06..eb74f8debf 100644
	--- a/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
	+++ b/src/infrastructure/internationalization/translation/PhabricatorUSEnglishTranslation.php
	@@ -1,1657 +1,1657 @@
	<?php

	final class PhabricatorUSEnglishTranslation
	extends PhutilTranslation {

	public function getLocaleCode() {
	return 'en_US';
	}

	protected function getTranslations() {
	return array(
	'No daemon(s) with id(s) "%s" exist!' => array(
	'No daemon with id %s exists!',
	'No daemons with ids %s exist!',
	),
	'These %d configuration value(s) are related:' => array(
	'This configuration value is related:',
	'These configuration values are related:',
	),
	'%s Task(s)' => array('Task', 'Tasks'),

	'%s ERROR(S)' => array('ERROR', 'ERRORS'),
	'%d Error(s)' => array('%d Error', '%d Errors'),
	'%d Warning(s)' => array('%d Warning', '%d Warnings'),
	'%d Auto-Fix(es)' => array('%d Auto-Fix', '%d Auto-Fixes'),
	'%d Advice(s)' => array('%d Advice', '%d Pieces of Advice'),
	'%d Detail(s)' => array('%d Detail', '%d Details'),

	'(%d line(s))' => array('(%d line)', '(%d lines)'),

	'%d line(s)' => array('%d line', '%d lines'),
	'%d path(s)' => array('%d path', '%d paths'),
	'%d diff(s)' => array('%d diff', '%d diffs'),

	'%s Answer(s)' => array('%s Answer', '%s Answers'),
	'Show %d Comment(s)' => array('Show %d Comment', 'Show %d Comments'),

	'%s DIFF LINK(S)' => array('DIFF LINK', 'DIFF LINKS'),
	'You successfully created %d diff(s).' => array(
	'You successfully created %d diff.',
	'You successfully created %d diffs.',
	),
	'Diff creation failed; see body for %s error(s).' => array(
	'Diff creation failed; see body for error.',
	'Diff creation failed; see body for errors.',
	),

	'There are %d raw fact(s) in storage.' => array(
	'There is %d raw fact in storage.',
	'There are %d raw facts in storage.',
	),

	'There are %d aggregate fact(s) in storage.' => array(
	'There is %d aggregate fact in storage.',
	'There are %d aggregate facts in storage.',
	),

	'%s Commit(s) Awaiting Audit' => array(
	'%s Commit Awaiting Audit',
	'%s Commits Awaiting Audit',
	),

	'%s Problem Commit(s)' => array(
	'%s Problem Commit',
	'%s Problem Commits',
	),

	'%s Review(s) Blocking Others' => array(
	'%s Review Blocking Others',
	'%s Reviews Blocking Others',
	),

	'%s Review(s) Need Attention' => array(
	'%s Review Needs Attention',
	'%s Reviews Need Attention',
	),

	'%s Review(s) Waiting on Others' => array(
	'%s Review Waiting on Others',
	'%s Reviews Waiting on Others',
	),

	'%s Active Review(s)' => array(
	'%s Active Review',
	'%s Active Reviews',
	),

	'%s Flagged Object(s)' => array(
	'%s Flagged Object',
	'%s Flagged Objects',
	),

	'%s Object(s) Tracked' => array(
	'%s Object Tracked',
	'%s Objects Tracked',
	),

	'%s Assigned Task(s)' => array(
	'%s Assigned Task',
	'%s Assigned Tasks',
	),

	'Show %d Lint Message(s)' => array(
	'Show %d Lint Message',
	'Show %d Lint Messages',
	),
	'Hide %d Lint Message(s)' => array(
	'Hide %d Lint Message',
	'Hide %d Lint Messages',
	),

	'This is a binary file. It is %s byte(s) in length.' => array(
	'This is a binary file. It is %s byte in length.',
	'This is a binary file. It is %s bytes in length.',
	),

	'%s Action(s) Have No Effect' => array(
	'Action Has No Effect',
	'Actions Have No Effect',
	),

	'%s Action(s) With No Effect' => array(
	'Action With No Effect',
	'Actions With No Effect',
	),

	'Some of your %s action(s) have no effect:' => array(
	'One of your actions has no effect:',
	'Some of your actions have no effect:',
	),

	'Apply remaining %d action(s)?' => array(
	'Apply remaining action?',
	'Apply remaining actions?',
	),

	'Apply %d Other Action(s)' => array(
	'Apply Remaining Action',
	'Apply Remaining Actions',
	),

	'The %s action(s) you are taking have no effect:' => array(
	'The action you are taking has no effect:',
	'The actions you are taking have no effect:',
	),

	'%s edited member(s), added %d: %s; removed %d: %s.' =>
	'%s edited members, added: %3$s; removed: %5$s.',

	'%s added %s member(s): %s.' => array(
	array(
	'%s added a member: %3$s.',
	'%s added members: %3$s.',
	),
	),

	'%s removed %s member(s): %s.' => array(
	array(
	'%s removed a member: %3$s.',
	'%s removed members: %3$s.',
	),
	),

	'%s edited project(s), added %s: %s; removed %s: %s.' =>
	'%s edited projects, added: %3$s; removed: %5$s.',

	'%s added %s project(s): %s.' => array(
	array(
	'%s added a project: %3$s.',
	'%s added projects: %3$s.',
	),
	),

	'%s removed %s project(s): %s.' => array(
	array(
	'%s removed a project: %3$s.',
	'%s removed projects: %3$s.',
	),
	),

	'%s merged %s task(s): %s.' => array(
	array(
	'%s merged a task: %3$s.',
	'%s merged tasks: %3$s.',
	),
	),

	'%s merged %s task(s) %s into %s.' => array(
	array(
	'%s merged %3$s into %4$s.',
	'%s merged tasks %3$s into %4$s.',
	),
	),

	'%s added %s voting user(s): %s.' => array(
	array(
	'%s added a voting user: %3$s.',
	'%s added voting users: %3$s.',
	),
	),

	'%s removed %s voting user(s): %s.' => array(
	array(
	'%s removed a voting user: %3$s.',
	'%s removed voting users: %3$s.',
	),
	),

	'%s added %s subtask(s): %s.' => array(
	array(
	'%s added a subtask: %3$s.',
	'%s added subtasks: %3$s.',
	),
	),

	'%s added %s parent task(s): %s.' => array(
	array(
	'%s added a parent task: %3$s.',
	'%s added parent tasks: %3$s.',
	),
	),

	'%s removed %s subtask(s): %s.' => array(
	array(
	'%s removed a subtask: %3$s.',
	'%s removed subtasks: %3$s.',
	),
	),

	'%s removed %s parent task(s): %s.' => array(
	array(
	'%s removed a parent task: %3$s.',
	'%s removed parent tasks: %3$s.',
	),
	),

	'%s added %s subtask(s) for %s: %s.' => array(
	array(
	'%s added a subtask for %3$s: %4$s.',
	'%s added subtasks for %3$s: %4$s.',
	),
	),

	'%s added %s parent task(s) for %s: %s.' => array(
	array(
	'%s added a parent task for %3$s: %4$s.',
	'%s added parent tasks for %3$s: %4$s.',
	),
	),

	'%s removed %s subtask(s) for %s: %s.' => array(
	array(
	'%s removed a subtask for %3$s: %4$s.',
	'%s removed subtasks for %3$s: %4$s.',
	),
	),

	'%s removed %s parent task(s) for %s: %s.' => array(
	array(
	'%s removed a parent task for %3$s: %4$s.',
	'%s removed parent tasks for %3$s: %4$s.',
	),
	),

	'%s edited subtask(s), added %s: %s; removed %s: %s.' =>
	'%s edited subtasks, added: %3$s; removed: %5$s.',

	'%s edited subtask(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited subtasks for %s, added: %4$s; removed: %6$s.',

	'%s edited parent task(s), added %s: %s; removed %s: %s.' =>
	'%s edited parent tasks, added: %3$s; removed: %5$s.',

	'%s edited parent task(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited parent tasks for %s, added: %4$s; removed: %6$s.',

	'%s edited answer(s), added %s: %s; removed %d: %s.' =>
	'%s edited answers, added: %3$s; removed: %5$s.',

	'%s added %s answer(s): %s.' => array(
	array(
	'%s added an answer: %3$s.',
	'%s added answers: %3$s.',
	),
	),

	'%s removed %s answer(s): %s.' => array(
	array(
	'%s removed a answer: %3$s.',
	'%s removed answers: %3$s.',
	),
	),

	'%s edited question(s), added %s: %s; removed %s: %s.' =>
	'%s edited questions, added: %3$s; removed: %5$s.',

	'%s added %s question(s): %s.' => array(
	array(
	'%s added a question: %3$s.',
	'%s added questions: %3$s.',
	),
	),

	'%s removed %s question(s): %s.' => array(
	array(
	'%s removed a question: %3$s.',
	'%s removed questions: %3$s.',
	),
	),

	'%s edited mock(s), added %s: %s; removed %s: %s.' =>
	'%s edited mocks, added: %3$s; removed: %5$s.',

	'%s added %s mock(s): %s.' => array(
	array(
	'%s added a mock: %3$s.',
	'%s added mocks: %3$s.',
	),
	),

	'%s removed %s mock(s): %s.' => array(
	array(
	'%s removed a mock: %3$s.',
	'%s removed mocks: %3$s.',
	),
	),

	'%s added %s task(s): %s.' => array(
	array(
	'%s added a task: %3$s.',
	'%s added tasks: %3$s.',
	),
	),

	'%s removed %s task(s): %s.' => array(
	array(
	'%s removed a task: %3$s.',
	'%s removed tasks: %3$s.',
	),
	),

	'%s edited file(s), added %s: %s; removed %s: %s.' =>
	'%s edited files, added: %3$s; removed: %5$s.',

	'%s added %s file(s): %s.' => array(
	array(
	'%s added a file: %3$s.',
	'%s added files: %3$s.',
	),
	),

	'%s removed %s file(s): %s.' => array(
	array(
	'%s removed a file: %3$s.',
	'%s removed files: %3$s.',
	),
	),

	'%s edited contributor(s), added %s: %s; removed %s: %s.' =>
	'%s edited contributors, added: %3$s; removed: %5$s.',

	'%s added %s contributor(s): %s.' => array(
	array(
	'%s added a contributor: %3$s.',
	'%s added contributors: %3$s.',
	),
	),

	'%s removed %s contributor(s): %s.' => array(
	array(
	'%s removed a contributor: %3$s.',
	'%s removed contributors: %3$s.',
	),
	),

	'%s edited %s reviewer(s), added %s: %s; removed %s: %s.' =>
	'%s edited reviewers, added: %4$s; removed: %6$s.',

	'%s edited %s reviewer(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited reviewers for %3$s, added: %5$s; removed: %7$s.',

	'%s added %s reviewer(s): %s.' => array(
	array(
	'%s added a reviewer: %3$s.',
	'%s added reviewers: %3$s.',
	),
	),

	'%s added %s reviewer(s) for %s: %s.' => array(
	array(
	'%s added a reviewer for %3$s: %4$s.',
	'%s added reviewers for %3$s: %4$s.',
	),
	),

	'%s removed %s reviewer(s): %s.' => array(
	array(
	'%s removed a reviewer: %3$s.',
	'%s removed reviewers: %3$s.',
	),
	),

	'%s removed %s reviewer(s) for %s: %s.' => array(
	array(
	'%s removed a reviewer for %3$s: %4$s.',
	'%s removed reviewers for %3$s: %4$s.',
	),
	),

	'%d other(s)' => array(
	'1 other',
	'%d others',
	),

	'%s edited subscriber(s), added %d: %s; removed %d: %s.' =>
	'%s edited subscribers, added: %3$s; removed: %5$s.',

	'%s added %d subscriber(s): %s.' => array(
	array(
	'%s added a subscriber: %3$s.',
	'%s added subscribers: %3$s.',
	),
	),

	'%s removed %d subscriber(s): %s.' => array(
	array(
	'%s removed a subscriber: %3$s.',
	'%s removed subscribers: %3$s.',
	),
	),

	'%s edited watcher(s), added %s: %s; removed %d: %s.' =>
	'%s edited watchers, added: %3$s; removed: %5$s.',

	'%s added %s watcher(s): %s.' => array(
	array(
	'%s added a watcher: %3$s.',
	'%s added watchers: %3$s.',
	),
	),

	'%s removed %s watcher(s): %s.' => array(
	array(
	'%s removed a watcher: %3$s.',
	'%s removed watchers: %3$s.',
	),
	),

	'%s edited participant(s), added %d: %s; removed %d: %s.' =>
	'%s edited participants, added: %3$s; removed: %5$s.',

	'%s added %d participant(s): %s.' => array(
	array(
	'%s added a participant: %3$s.',
	'%s added participants: %3$s.',
	),
	),

	'%s removed %d participant(s): %s.' => array(
	array(
	'%s removed a participant: %3$s.',
	'%s removed participants: %3$s.',
	),
	),

	'%s edited image(s), added %d: %s; removed %d: %s.' =>
	'%s edited images, added: %3$s; removed: %5$s',

	'%s added %d image(s): %s.' => array(
	array(
	'%s added an image: %3$s.',
	'%s added images: %3$s.',
	),
	),

	'%s removed %d image(s): %s.' => array(
	array(
	'%s removed an image: %3$s.',
	'%s removed images: %3$s.',
	),
	),

	'%s Line(s)' => array(
	'%s Line',
	'%s Lines',
	),

	'Indexing %d object(s) of type %s.' => array(
	'Indexing %d object of type %s.',
	'Indexing %d object of type %s.',
	),

	'Run these %d command(s):' => array(
	'Run this command:',
	'Run these commands:',
	),

	'Install these %d PHP extension(s):' => array(
	'Install this PHP extension:',
	'Install these PHP extensions:',
	),

	'The current Phabricator configuration has these %d value(s):' => array(
	'The current Phabricator configuration has this value:',
	'The current Phabricator configuration has these values:',
	),

	'The current MySQL configuration has these %d value(s):' => array(
	'The current MySQL configuration has this value:',
	'The current MySQL configuration has these values:',
	),

	'You can update these %d value(s) here:' => array(
	'You can update this value here:',
	'You can update these values here:',
	),

	'The current PHP configuration has these %d value(s):' => array(
	'The current PHP configuration has this value:',
	'The current PHP configuration has these values:',
	),

	'To update these %d value(s), edit your PHP configuration file.' => array(
	'To update this %d value, edit your PHP configuration file.',
	'To update these %d values, edit your PHP configuration file.',
	),

	'To update these %d value(s), edit your PHP configuration file, located '.
	'here:' => array(
	'To update this value, edit your PHP configuration file, located '.
	'here:',
	'To update these values, edit your PHP configuration file, located '.
	'here:',
	),

	'PHP also loaded these %s configuration file(s):' => array(
	'PHP also loaded this configuration file:',
	'PHP also loaded these configuration files:',
	),

	'%s added %d inline comment(s).' => array(
	array(
	'%s added an inline comment.',
	'%s added inline comments.',
	),
	),

	'%s comment(s)' => array('%s comment', '%s comments'),
	'%s rejection(s)' => array('%s rejection', '%s rejections'),
	'%s update(s)' => array('%s update', '%s updates'),

	'This configuration value is defined in these %d '.
	'configuration source(s): %s.' => array(
	'This configuration value is defined in this '.
	'configuration source: %2$s.',
	'This configuration value is defined in these %d '.
	'configuration sources: %s.',
	),

	'%s Open Pull Request(s)' => array(
	'%s Open Pull Request',
	'%s Open Pull Requests',
	),

	'Stale (%s day(s))' => array(
	'Stale (%s day)',
	'Stale (%s days)',
	),

	'Old (%s day(s))' => array(
	'Old (%s day)',
	'Old (%s days)',
	),

	'%s Commit(s)' => array(
	'%s Commit',
	'%s Commits',
	),

	'%s attached %d file(s): %s.' => array(
	array(
	'%s attached a file: %3$s.',
	'%s attached files: %3$s.',
	),
	),

	'%s detached %d file(s): %s.' => array(
	array(
	'%s detached a file: %3$s.',
	'%s detached files: %3$s.',
	),
	),

	'%s changed file(s), attached %d: %s; detached %d: %s.' =>
	'%s changed files, attached: %3$s; detached: %5$s.',


	'%s added %s dependencie(s): %s.' => array(
	array(
	'%s added a dependency: %3$s.',
	'%s added dependencies: %3$s.',
	),
	),

	'%s added %s dependencie(s) for %s: %s.' => array(
	array(
	'%s added a dependency for %3$s: %4$s.',
	'%s added dependencies for %3$s: %4$s.',
	),
	),

	'%s removed %s dependencie(s): %s.' => array(
	array(
	'%s removed a dependency: %3$s.',
	'%s removed dependencies: %3$s.',
	),
	),

	'%s removed %s dependencie(s) for %s: %s.' => array(
	array(
	'%s removed a dependency for %3$s: %4$s.',
	'%s removed dependencies for %3$s: %4$s.',
	),
	),

	'%s edited dependencie(s), added %s: %s; removed %s: %s.' => array(
	'%s edited dependencies, added: %3$s; removed: %5$s.',
	),

	'%s edited dependencie(s) for %s, added %s: %s; removed %s: %s.' => array(
	'%s edited dependencies for %s, added: %3$s; removed: %5$s.',
	),

	'%s added %s dependent revision(s): %s.' => array(
	array(
	'%s added a dependent revision: %3$s.',
	'%s added dependent revisions: %3$s.',
	),
	),

	'%s added %s dependent revision(s) for %s: %s.' => array(
	array(
	'%s added a dependent revision for %3$s: %4$s.',
	'%s added dependent revisions for %3$s: %4$s.',
	),
	),

	'%s removed %s dependent revision(s): %s.' => array(
	array(
	'%s removed a dependent revision: %3$s.',
	'%s removed dependent revisions: %3$s.',
	),
	),

	'%s removed %s dependent revision(s) for %s: %s.' => array(
	array(
	'%s removed a dependent revision for %3$s: %4$s.',
	'%s removed dependent revisions for %3$s: %4$s.',
	),
	),

	'%s added %s commit(s): %s.' => array(
	array(
	'%s added a commit: %3$s.',
	'%s added commits: %3$s.',
	),
	),

	'%s removed %s commit(s): %s.' => array(
	array(
	'%s removed a commit: %3$s.',
	'%s removed commits: %3$s.',
	),
	),

	'%s edited commit(s), added %s: %s; removed %s: %s.' =>
	'%s edited commits, added %3$s; removed %5$s.',

	- '%s added %s reverted commit(s): %s.' => array(
	+ '%s added %s reverted change(s): %s.' => array(
	array(
	- '%s added a reverted commit: %3$s.',
	- '%s added reverted commits: %3$s.',
	+ '%s added a reverted change: %3$s.',
	+ '%s added reverted changes: %3$s.',
	),
	),

	- '%s removed %s reverted commit(s): %s.' => array(
	+ '%s removed %s reverted change(s): %s.' => array(
	array(
	- '%s removed a reverted commit: %3$s.',
	- '%s removed reverted commits: %3$s.',
	+ '%s removed a reverted change: %3$s.',
	+ '%s removed reverted changes: %3$s.',
	),
	),

	- '%s edited reverted commit(s), added %s: %s; removed %s: %s.' =>
	- '%s edited reverted commits, added %3$s; removed %5$s.',
	+ '%s edited reverted change(s), added %s: %s; removed %s: %s.' =>
	+ '%s edited reverted changes, added %3$s; removed %5$s.',

	- '%s added %s reverted commit(s) for %s: %s.' => array(
	+ '%s added %s reverted change(s) for %s: %s.' => array(
	array(
	- '%s added a reverted commit for %3$s: %4$s.',
	- '%s added reverted commits for %3$s: %4$s.',
	+ '%s added a reverted change for %3$s: %4$s.',
	+ '%s added reverted changes for %3$s: %4$s.',
	),
	),

	- '%s removed %s reverted commit(s) for %s: %s.' => array(
	+ '%s removed %s reverted change(s) for %s: %s.' => array(
	array(
	- '%s removed a reverted commit for %3$s: %4$s.',
	- '%s removed reverted commits for %3$s: %4$s.',
	+ '%s removed a reverted change for %3$s: %4$s.',
	+ '%s removed reverted changes for %3$s: %4$s.',
	),
	),

	- '%s edited reverted commit(s) for %s, added %s: %s; removed %s: %s.' =>
	- '%s edited reverted commits for %2$s, added %4$s; removed %6$s.',
	+ '%s edited reverted change(s) for %s, added %s: %s; removed %s: %s.' =>
	+ '%s edited reverted changes for %2$s, added %4$s; removed %6$s.',

	- '%s added %s reverting commit(s): %s.' => array(
	+ '%s added %s reverting change(s): %s.' => array(
	array(
	- '%s added a reverting commit: %3$s.',
	- '%s added reverting commits: %3$s.',
	+ '%s added a reverting change: %3$s.',
	+ '%s added reverting changes: %3$s.',
	),
	),

	- '%s removed %s reverting commit(s): %s.' => array(
	+ '%s removed %s reverting change(s): %s.' => array(
	array(
	- '%s removed a reverting commit: %3$s.',
	- '%s removed reverting commits: %3$s.',
	+ '%s removed a reverting change: %3$s.',
	+ '%s removed reverting changes: %3$s.',
	),
	),

	- '%s edited reverting commit(s), added %s: %s; removed %s: %s.' =>
	- '%s edited reverting commits, added %3$s; removed %5$s.',
	+ '%s edited reverting change(s), added %s: %s; removed %s: %s.' =>
	+ '%s edited reverting changes, added %3$s; removed %5$s.',

	- '%s added %s reverting commit(s) for %s: %s.' => array(
	+ '%s added %s reverting change(s) for %s: %s.' => array(
	array(
	- '%s added a reverting commit for %3$s: %4$s.',
	- '%s added reverting commits for %3$s: %4$s.',
	+ '%s added a reverting change for %3$s: %4$s.',
	+ '%s added reverting changes for %3$s: %4$s.',
	),
	),

	- '%s removed %s reverting commit(s) for %s: %s.' => array(
	+ '%s removed %s reverting change(s) for %s: %s.' => array(
	array(
	- '%s removed a reverting commit for %3$s: %4$s.',
	- '%s removed reverting commits for %3$s: %4$s.',
	+ '%s removed a reverting change for %3$s: %4$s.',
	+ '%s removed reverting changes for %3$s: %4$s.',
	),
	),

	- '%s edited reverting commit(s) for %s, added %s: %s; removed %s: %s.' =>
	- '%s edited reverting commits for %s, added %4$s; removed %6$s.',
	+ '%s edited reverting change(s) for %s, added %s: %s; removed %s: %s.' =>
	+ '%s edited reverting changes for %s, added %4$s; removed %6$s.',

	'%s changed project member(s), added %d: %s; removed %d: %s.' =>
	'%s changed project members, added %3$s; removed %5$s.',

	'%s added %d project member(s): %s.' => array(
	array(
	'%s added a member: %3$s.',
	'%s added members: %3$s.',
	),
	),

	'%s removed %d project member(s): %s.' => array(
	array(
	'%s removed a member: %3$s.',
	'%s removed members: %3$s.',
	),
	),

	'%s project hashtag(s) are already used by other projects: %s.' => array(
	'Project hashtag "%2$s" is already used by another project.',
	'Some project hashtags are already used by other projects: %2$s.',
	),

	'%s changed project hashtag(s), added %d: %s; removed %d: %s.' =>
	'%s changed project hashtags, added %3$s; removed %5$s.',

	'Hashtags must contain at least one letter or number. %s '.
	'project hashtag(s) are invalid: %s.' => array(
	'Hashtags must contain at least one letter or number. The '.
	'hashtag "%2$s" is not valid.',
	'Hashtags must contain at least one letter or number. These '.
	'hashtags are invalid: %2$s.',
	),

	'%s added %d project hashtag(s): %s.' => array(
	array(
	'%s added a hashtag: %3$s.',
	'%s added hashtags: %3$s.',
	),
	),

	'%s removed %d project hashtag(s): %s.' => array(
	array(
	'%s removed a hashtag: %3$s.',
	'%s removed hashtags: %3$s.',
	),
	),

	'%s changed %s hashtag(s), added %d: %s; removed %d: %s.' =>
	'%s changed hashtags for %s, added %4$s; removed %6$s.',

	'%s added %d %s hashtag(s): %s.' => array(
	array(
	'%s added a hashtag to %3$s: %4$s.',
	'%s added hashtags to %3$s: %4$s.',
	),
	),

	'%s removed %d %s hashtag(s): %s.' => array(
	array(
	'%s removed a hashtag from %3$s: %4$s.',
	'%s removed hashtags from %3$s: %4$s.',
	),
	),

	'%d User(s) Need Approval' => array(
	'%d User Needs Approval',
	'%d Users Need Approval',
	),

	'%s, %s line(s)' => array(
	array(
	'%s, %s line',
	'%s, %s lines',
	),
	),

	'%s pushed %d commit(s) to %s.' => array(
	array(
	'%s pushed a commit to %3$s.',
	'%s pushed %d commits to %s.',
	),
	),

	'%s commit(s)' => array(
	'1 commit',
	'%s commits',
	),

	'%s removed %s JIRA issue(s): %s.' => array(
	array(
	'%s removed a JIRA issue: %3$s.',
	'%s removed JIRA issues: %3$s.',
	),
	),

	'%s added %s JIRA issue(s): %s.' => array(
	array(
	'%s added a JIRA issue: %3$s.',
	'%s added JIRA issues: %3$s.',
	),
	),

	'%s added %s required legal document(s): %s.' => array(
	array(
	'%s added a required legal document: %3$s.',
	'%s added required legal documents: %3$s.',
	),
	),

	'%s updated JIRA issue(s): added %s %s; removed %d %s.' =>
	'%s updated JIRA issues: added %3$s; removed %5$s.',

	'%s edited %s task(s), added %s: %s; removed %s: %s.' =>
	'%s edited tasks, added %4$s; removed %6$s.',

	'%s added %s task(s) to %s: %s.' => array(
	array(
	'%s added a task to %3$s: %4$s.',
	'%s added tasks to %3$s: %4$s.',
	),
	),

	'%s removed %s task(s) from %s: %s.' => array(
	array(
	'%s removed a task from %3$s: %4$s.',
	'%s removed tasks from %3$s: %4$s.',
	),
	),

	'%s edited %s task(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited tasks for %3$s, added: %5$s; removed %7$s.',

	'%s edited %s commit(s), added %s: %s; removed %s: %s.' =>
	'%s edited commits, added %4$s; removed %6$s.',

	'%s added %s commit(s) to %s: %s.' => array(
	array(
	'%s added a commit to %3$s: %4$s.',
	'%s added commits to %3$s: %4$s.',
	),
	),

	'%s removed %s commit(s) from %s: %s.' => array(
	array(
	'%s removed a commit from %3$s: %4$s.',
	'%s removed commits from %3$s: %4$s.',
	),
	),

	'%s edited %s commit(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited commits for %3$s, added: %5$s; removed %7$s.',

	'%s added %s revision(s): %s.' => array(
	array(
	'%s added a revision: %3$s.',
	'%s added revisions: %3$s.',
	),
	),

	'%s removed %s revision(s): %s.' => array(
	array(
	'%s removed a revision: %3$s.',
	'%s removed revisions: %3$s.',
	),
	),

	'%s edited %s revision(s), added %s: %s; removed %s: %s.' =>
	'%s edited revisions, added %4$s; removed %6$s.',

	'%s added %s revision(s) to %s: %s.' => array(
	array(
	'%s added a revision to %3$s: %4$s.',
	'%s added revisions to %3$s: %4$s.',
	),
	),

	'%s removed %s revision(s) from %s: %s.' => array(
	array(
	'%s removed a revision from %3$s: %4$s.',
	'%s removed revisions from %3$s: %4$s.',
	),
	),

	'%s edited %s revision(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited revisions for %3$s, added: %5$s; removed %7$s.',

	'%s edited %s project(s), added %s: %s; removed %s: %s.' =>
	'%s edited projects, added %4$s; removed %6$s.',

	'%s added %s project(s) to %s: %s.' => array(
	array(
	'%s added a project to %3$s: %4$s.',
	'%s added projects to %3$s: %4$s.',
	),
	),

	'%s removed %s project(s) from %s: %s.' => array(
	array(
	'%s removed a project from %3$s: %4$s.',
	'%s removed projects from %3$s: %4$s.',
	),
	),

	'%s edited %s project(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited projects for %3$s, added: %5$s; removed %7$s.',

	'%s added %s panel(s): %s.' => array(
	array(
	'%s added a panel: %3$s.',
	'%s added panels: %3$s.',
	),
	),

	'%s removed %s panel(s): %s.' => array(
	array(
	'%s removed a panel: %3$s.',
	'%s removed panels: %3$s.',
	),
	),

	'%s edited %s panel(s), added %s: %s; removed %s: %s.' =>
	'%s edited panels, added %4$s; removed %6$s.',

	'%s added %s dashboard(s): %s.' => array(
	array(
	'%s added a dashboard: %3$s.',
	'%s added dashboards: %3$s.',
	),
	),

	'%s removed %s dashboard(s): %s.' => array(
	array(
	'%s removed a dashboard: %3$s.',
	'%s removed dashboards: %3$s.',
	),
	),

	'%s edited %s dashboard(s), added %s: %s; removed %s: %s.' =>
	'%s edited dashboards, added %4$s; removed %6$s.',

	'%s added %s edge(s): %s.' => array(
	array(
	'%s added an edge: %3$s.',
	'%s added edges: %3$s.',
	),
	),

	'%s added %s edge(s) to %s: %s.' => array(
	array(
	'%s added an edge to %3$s: %4$s.',
	'%s added edges to %3$s: %4$s.',
	),
	),

	'%s removed %s edge(s): %s.' => array(
	array(
	'%s removed an edge: %3$s.',
	'%s removed edges: %3$s.',
	),
	),

	'%s removed %s edge(s) from %s: %s.' => array(
	array(
	'%s removed an edge from %3$s: %4$s.',
	'%s removed edges from %3$s: %4$s.',
	),
	),

	'%s edited edge(s), added %s: %s; removed %s: %s.' =>
	'%s edited edges, added: %3$s; removed: %5$s.',

	'%s edited %s edge(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited edges for %3$s, added: %5$s; removed %7$s.',

	'%s added %s member(s) for %s: %s.' => array(
	array(
	'%s added a member for %3$s: %4$s.',
	'%s added members for %3$s: %4$s.',
	),
	),

	'%s removed %s member(s) for %s: %s.' => array(
	array(
	'%s removed a member for %3$s: %4$s.',
	'%s removed members for %3$s: %4$s.',
	),
	),

	'%s edited %s member(s) for %s, added %s: %s; removed %s: %s.' =>
	'%s edited members for %3$s, added: %5$s; removed %7$s.',

	'%d related link(s):' => array(
	'Related link:',
	'Related links:',
	),

	'You have %d unpaid invoice(s).' => array(
	'You have an unpaid invoice.',
	'You have unpaid invoices.',
	),

	'The configurations differ in the following %s way(s):' => array(
	'The configurations differ:',
	'The configurations differ in these ways:',
	),

	'Phabricator is configured with an email domain whitelist (in %s), so '.
	'only users with a verified email address at one of these %s '.
	'allowed domain(s) will be able to register an account: %s' => array(
	array(
	'Phabricator is configured with an email domain whitelist (in %s), '.
	'so only users with a verified email address at %3$s will be '.
	'allowed to register an account.',
	'Phabricator is configured with an email domain whitelist (in %s), '.
	'so only users with a verified email address at one of these '.
	'allowed domains will be able to register an account: %3$s',
	),
	),

	'Show First %d Line(s)' => array(
	'Show First Line',
	'Show First %d Lines',
	),

	"\xE2\x96\xB2 Show %d Line(s)" => array(
	"\xE2\x96\xB2 Show Line",
	"\xE2\x96\xB2 Show %d Lines",
	),

	'Show All %d Line(s)' => array(
	'Show Line',
	'Show All %d Lines',
	),

	"\xE2\x96\xBC Show %d Line(s)" => array(
	"\xE2\x96\xBC Show Line",
	"\xE2\x96\xBC Show %d Lines",
	),

	'Show Last %d Line(s)' => array(
	'Show Last Line',
	'Show Last %d Lines',
	),

	'%s marked %s inline comment(s) as done and %s inline comment(s) as '.
	'not done.' => array(
	array(
	array(
	'%s marked an inline comment as done and an inline comment '.
	'as not done.',
	'%s marked an inline comment as done and %3$s inline comments '.
	'as not done.',
	),
	array(
	'%s marked %s inline comments as done and an inline comment '.
	'as not done.',
	'%s marked %s inline comments as done and %s inline comments '.
	'as done.',
	),
	),
	),

	'%s marked %s inline comment(s) as done.' => array(
	array(
	'%s marked an inline comment as done.',
	'%s marked %s inline comments as done.',
	),
	),

	'%s marked %s inline comment(s) as not done.' => array(
	array(
	'%s marked an inline comment as not done.',
	'%s marked %s inline comments as not done.',
	),
	),

	'These %s object(s) will be destroyed forever:' => array(
	'This object will be destroyed forever:',
	'These objects will be destroyed forever:',
	),

	'Are you absolutely certain you want to destroy these %s '.
	'object(s)?' => array(
	'Are you absolutely certain you want to destroy this object?',
	'Are you absolutely certain you want to destroy these objects?',
	),

	'%s added %s owner(s): %s.' => array(
	array(
	'%s added an owner: %3$s.',
	'%s added owners: %3$s.',
	),
	),

	'%s removed %s owner(s): %s.' => array(
	array(
	'%s removed an owner: %3$s.',
	'%s removed owners: %3$s.',
	),
	),

	'%s changed %s package owner(s), added %s: %s; removed %s: %s.' => array(
	'%s changed package owners, added: %4$s; removed: %6$s.',
	),

	'Found %s book(s).' => array(
	'Found %s book.',
	'Found %s books.',
	),
	'Found %s file(s)...' => array(
	'Found %s file...',
	'Found %s files...',
	),
	'Found %s file(s) in project.' => array(
	'Found %s file in project.',
	'Found %s files in project.',
	),
	'Found %s unatomized, uncached file(s).' => array(
	'Found %s unatomized, uncached file.',
	'Found %s unatomized, uncached files.',
	),
	'Found %s file(s) to atomize.' => array(
	'Found %s file to atomize.',
	'Found %s files to atomize.',
	),
	'Atomizing %s file(s).' => array(
	'Atomizing %s file.',
	'Atomizing %s files.',
	),
	'Creating %s document(s).' => array(
	'Creating %s document.',
	'Creating %s documents.',
	),
	'Deleting %s document(s).' => array(
	'Deleting %s document.',
	'Deleting %s documents.',
	),
	'Found %s obsolete atom(s) in graph.' => array(
	'Found %s obsolete atom in graph.',
	'Found %s obsolete atoms in graph.',
	),
	'Found %s new atom(s) in graph.' => array(
	'Found %s new atom in graph.',
	'Found %s new atoms in graph.',
	),
	'This call takes %s parameter(s), but only %s are documented.' => array(
	array(
	'This call takes %s parameter, but only %s is documented.',
	'This call takes %s parameter, but only %s are documented.',
	),
	array(
	'This call takes %s parameters, but only %s is documented.',
	'This call takes %s parameters, but only %s are documented.',
	),
	),

	'%s Passed Test(s)' => '%s Passed',
	'%s Failed Test(s)' => '%s Failed',
	'%s Skipped Test(s)' => '%s Skipped',
	'%s Broken Test(s)' => '%s Broken',
	'%s Unsound Test(s)' => '%s Unsound',
	'%s Other Test(s)' => '%s Other',

	'%s Bulk Task(s)' => array(
	'%s Task',
	'%s Tasks',
	),

	'%s added %s badge(s) for %s: %s.' => array(
	array(
	'%s added a badge for %s: %3$s.',
	'%s added badges for %s: %3$s.',
	),
	),
	'%s added %s badge(s): %s.' => array(
	array(
	'%s added a badge: %3$s.',
	'%s added badges: %3$s.',
	),
	),
	'%s awarded %s recipient(s) for %s: %s.' => array(
	array(
	'%s awarded %3$s to %4$s.',
	'%s awarded %3$s to multiple recipients: %4$s.',
	),
	),
	'%s awarded %s recipients(s): %s.' => array(
	array(
	'%s awarded a recipient: %3$s.',
	'%s awarded multiple recipients: %3$s.',
	),
	),
	'%s edited badge(s) for %s, added %s: %s; revoked %s: %s.' => array(
	array(
	'%s edited badges for %s, added %s: %s; revoked %s: %s.',
	'%s edited badges for %s, added %s: %s; revoked %s: %s.',
	),
	),
	'%s edited badge(s), added %s: %s; revoked %s: %s.' => array(
	array(
	'%s edited badges, added %s: %s; revoked %s: %s.',
	'%s edited badges, added %s: %s; revoked %s: %s.',
	),
	),
	'%s edited recipient(s) for %s, awarded %s: %s; revoked %s: %s.' => array(
	array(
	'%s edited recipients for %s, awarded %s: %s; revoked %s: %s.',
	'%s edited recipients for %s, awarded %s: %s; revoked %s: %s.',
	),
	),
	'%s edited recipient(s), awarded %s: %s; revoked %s: %s.' => array(
	array(
	'%s edited recipients, awarded %s: %s; revoked %s: %s.',
	'%s edited recipients, awarded %s: %s; revoked %s: %s.',
	),
	),
	'%s revoked %s badge(s) for %s: %s.' => array(
	array(
	'%s revoked a badge for %3$s: %4$s.',
	'%s revoked multiple badges for %3$s: %4$s.',
	),
	),
	'%s revoked %s badge(s): %s.' => array(
	array(
	'%s revoked a badge: %3$s.',
	'%s revoked multiple badges: %3$s.',
	),
	),
	'%s revoked %s recipient(s) for %s: %s.' => array(
	array(
	'%s revoked %3$s from %4$s.',
	'%s revoked multiple recipients for %3$s: %4$s.',
	),
	),

	'%s revoked %s recipients(s): %s.' => array(
	array(
	'%s revoked a recipient: %3$s.',
	'%s revoked multiple recipients: %3$s.',
	),
	),

	'%s automatically subscribed target(s) were not affected: %s.' => array(
	'An automatically subscribed target was not affected: %2$s.',
	'Automatically subscribed targets were not affected: %2$s.',
	),

	'Declined to resubscribe %s target(s) because they previously '.
	'unsubscribed: %s.' => array(
	'Delined to resubscribe a target because they previously '.
	'unsubscribed: %2$s.',
	'Declined to resubscribe targets because they previously '.
	'unsubscribed: %2$s.',
	),

	'%s target(s) are not subscribed: %s.' => array(
	'A target is not subscribed: %2$s.',
	'Targets are not subscribed: %2$s.',
	),

	'%s target(s) are already subscribed: %s.' => array(
	'A target is already subscribed: %2$s.',
	'Targets are already subscribed: %2$s.',
	),

	'Added %s subscriber(s): %s.' => array(
	'Added a subscriber: %2$s.',
	'Added subscribers: %2$s.',
	),

	'Removed %s subscriber(s): %s.' => array(
	'Removed a subscriber: %2$s.',
	'Removed subscribers: %2$s.',
	),

	'Queued email to be delivered to %s target(s): %s.' => array(
	'Queued email to be delivered to target: %2$s.',
	'Queued email to be delivered to targets: %2$s.',
	),

	'Queued email to be delivered to %s target(s), ignoring their '.
	'notification preferences: %s.' => array(
	'Queued email to be delivered to target, ignoring notification '.
	'preferences: %2$s.',
	'Queued email to be delivered to targets, ignoring notification '.
	'preferences: %2$s.',
	),

	'%s project(s) are not associated: %s.' => array(
	'A project is not associated: %2$s.',
	'Projects are not associated: %2$s.',
	),

	'%s project(s) are already associated: %s.' => array(
	'A project is already associated: %2$s.',
	'Projects are already associated: %2$s.',
	),

	'Added %s project(s): %s.' => array(
	'Added a project: %2$s.',
	'Added projects: %2$s.',
	),

	'Removed %s project(s): %s.' => array(
	'Removed a project: %2$s.',
	'Removed projects: %2$s.',
	),

	'Added %s reviewer(s): %s.' => array(
	'Added a reviewer: %2$s.',
	'Added reviewers: %2$s.',
	),

	'Added %s blocking reviewer(s): %s.' => array(
	'Added a blocking reviewer: %2$s.',
	'Added blocking reviewers: %2$s.',
	),

	'Required %s signature(s): %s.' => array(
	'Required a signature: %2$s.',
	'Required signatures: %2$s.',
	),

	'Started %s build(s): %s.' => array(
	'Started a build: %2$s.',
	'Started builds: %2$s.',
	),

	'Added %s auditor(s): %s.' => array(
	'Added an auditor: %2$s.',
	'Added auditors: %2$s.',
	),

	'%s target(s) do not have permission to see this object: %s.' => array(
	'A target does not have permission to see this object: %2$s.',
	'Targets do not have permission to see this object: %2$s.',
	),

	'This action has no effect on %s target(s): %s.' => array(
	'This action has no effect on a target: %2$s.',
	'This action has no effect on targets: %2$s.',
	),

	'Mail sent in the last %s day(s).' => array(
	'Mail sent in the last day.',
	'Mail sent in the last %s days.',
	),

	'%s Day(s)' => array(
	'%s Day',
	'%s Days',
	),
	'%s Day(s) Ago' => array(
	'%s Day Ago',
	'%s Days Ago',
	),

	'Setting retention policy for "%s" to %s day(s).' => array(
	array(
	'Setting retention policy for "%s" to one day.',
	'Setting retention policy for "%s" to %s days.',
	),
	),

	'Waiting %s second(s) for lease to activate.' => array(
	'Waiting a second for lease to activate.',
	'Waiting %s seconds for lease to activate.',
	),

	'%s changed %s automation blueprint(s), added %s: %s; removed %s: %s.' =>
	'%s changed automation blueprints, added: %4$s; removed: %6$s.',

	'%s added %s automation blueprint(s): %s.' => array(
	array(
	'%s added an automation blueprint: %3$s.',
	'%s added automation blueprints: %3$s.',
	),
	),

	'%s removed %s automation blueprint(s): %s.' => array(
	array(
	'%s removed an automation blueprint: %3$s.',
	'%s removed automation blueprints: %3$s.',
	),
	),

	'WARNING: There are %s unapproved authorization(s)!' => array(
	'WARNING: There is an unapproved authorization!',
	'WARNING: There are unapproved authorizations!',
	),

	'Found %s Open Resource(s)' => array(
	'Found %s Open Resource',
	'Found %s Open Resources',
	),

	'%s Open Resource(s) Remain' => array(
	'%s Open Resource Remain',
	'%s Open Resources Remain',
	),

	'Found %s Blueprint(s)' => array(
	'Found %s Blueprint',
	'Found %s Blueprints',
	),

	'%s Blueprint(s) Can Allocate' => array(
	'%s Blueprint Can Allocate',
	'%s Blueprints Can Allocate',
	),

	'%s Blueprint(s) Enabled' => array(
	'%s Blueprint Enabled',
	'%s Blueprints Enabled',
	),

	'%s Event(s)' => array(
	'%s Event',
	'%s Events',
	),

	'%s Unit(s)' => array(
	'%s Unit',
	'%s Units',
	),

	'QUEUEING TASKS (%s Commit(s)):' => array(
	'QUEUEING TASKS (%s Commit):',
	'QUEUEING TASKS (%s Commits):',
	),

	'Found %s total commit(s); updating...' => array(
	'Found %s total commit; updating...',
	'Found %s total commits; updating...',
	),

	'Not enough process slots to schedule the other %s '.
	'repository(s) for updates yet.' => array(
	'Not enough process slots to schedule the other '.'
	repository for update yet.',
	'Not enough process slots to schedule the other %s '.
	'repositories for updates yet.',
	),


	'%s updated %s, added %d: %s.' =>
	'%s updated %s, added: %4$s.',

	'%s updated %s, removed %s: %s.' =>
	'%s updated %s, removed: %4$s.',

	'%s updated %s, added %s: %s; removed %s: %s.' =>
	'%s updated %s, added: %4$s; removed: %6$s.',

	'%s updated %s for %s, added %d: %s.' =>
	'%s updated %s for %s, added: %5$s.',

	'%s updated %s for %s, removed %s: %s.' =>
	'%s updated %s for %s, removed: %5$s.',

	'%s updated %s for %s, added %s: %s; removed %s: %s.' =>
	'%s updated %s for %s, added: %5$s; removed; %7$s.',

	'Permanently destroyed %s object(s).' => array(
	'Permanently destroyed %s object.',
	'Permanently destroyed %s objects.',
	),

	'%s added %s watcher(s) for %s: %s.' => array(
	array(
	'%s added a watcher for %3$s: %4$s.',
	'%s added watchers for %3$s: %4$s.',
	),
	),

	'%s removed %s watcher(s) for %s: %s.' => array(
	array(
	'%s removed a watcher for %3$s: %4$s.',
	'%s removed watchers for %3$s: %4$s.',
	),
	),

	'%s awarded this badge to %s recipient(s): %s.' => array(
	array(
	'%s awarded this badge to recipient: %3$s.',
	'%s awarded this badge to recipients: %3$s.',
	),
	),

	'%s revoked this badge from %s recipient(s): %s.' => array(
	array(
	'%s revoked this badge from recipient: %3$s.',
	'%s revoked this badge from recipients: %3$s.',
	),
	),

	'%s awarded %s to %s recipient(s): %s.' => array(
	array(
	array(
	'%s awarded %s to recipient: %4$s.',
	'%s awarded %s to recipients: %4$s.',
	),
	),
	),

	'%s revoked %s from %s recipient(s): %s.' => array(
	array(
	array(
	'%s revoked %s from recipient: %4$s.',
	'%s revoked %s from recipients: %4$s.',
	),
	),
	),

	'%s invited %s attendee(s): %s.' =>
	'%s invited: %3$s.',

	'%s uninvited %s attendee(s): %s.' =>
	'%s uninvited: %3$s.',

	'%s invited %s attendee(s): %s; uninvited %s attendee(s): %s.' =>
	'%s invited: %3$s; uninvited: %5$s.',

	'%s invited %s attendee(s) to %s: %s.' =>
	'%s added invites for %3$s: %4$s.',

	'%s uninvited %s attendee(s) to %s: %s.' =>
	'%s removed invites for %3$s: %4$s.',

	'%s updated the invite list for %s, invited %s: %s; uninvited %s: %s.' =>
	'%s updated the invite list for %s, invited: %4$s; uninvited: %6$s.',

	'Restart %s build(s)?' => array(
	'Restart %s build?',
	'Restart %s builds?',
	),

	'%s is starting in %s minute(s), at %s.' => array(
	array(
	'%s is starting in one minute, at %3$s.',
	'%s is starting in %s minutes, at %s.',
	),
	),

	'%s added %s auditor(s): %s.' => array(
	array(
	'%s added an auditor: %3$s.',
	'%s added auditors: %3$s.',
	),
	),

	'%s removed %s auditor(s): %s.' => array(
	array(
	'%s removed an auditor: %3$s.',
	'%s removed auditors: %3$s.',
	),
	),

	'%s edited %s auditor(s), removed %s: %s; added %s: %s.' => array(
	array(
	'%s edited auditors, removed: %4$s; added: %6$s.',
	),
	),

	'%s accepted this revision as %s reviewer(s): %s.' =>
	'%s accepted this revision as: %3$s.',

	'%s added %s merchant manager(s): %s.' => array(
	array(
	'%s added a merchant manager: %3$s.',
	'%s added merchant managers: %3$s.',
	),
	),

	'%s removed %s merchant manager(s): %s.' => array(
	array(
	'%s removed a merchant manager: %3$s.',
	'%s removed merchant managers: %3$s.',
	),
	),

	'%s added %s account manager(s): %s.' => array(
	array(
	'%s added an account manager: %3$s.',
	'%s added account managers: %3$s.',
	),
	),

	'%s removed %s account manager(s): %s.' => array(
	array(
	'%s removed an account manager: %3$s.',
	'%s removed account managers: %3$s.',
	),
	),

	'You are about to apply a bulk edit which will affect '.
	'%s object(s).' => array(
	'You are about to apply a bulk edit to a single object.',
	'You are about to apply a bulk edit which will affect '.
	'%s objects.',
	),

	'Destroyed %s credential(s) of type "%s".' => array(
	'Destroyed one credential of type "%2$s".',
	'Destroyed %s credentials of type "%s".',
	),

	);
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Tue, Apr 29, 7:07 AM (1 d, 41 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 108225
Default Alt Text: (197 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions