No OneTemporary
Actions

Size

107 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 984e2c1472..c04bb8185b 100644
	--- a/src/applications/audit/editor/PhabricatorAuditEditor.php
	+++ b/src/applications/audit/editor/PhabricatorAuditEditor.php
	@@ -1,883 +1,895 @@
	<?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;
	- }
	+ $author_phid = $object->getAuthorPHID();
	+ $actor_is_author = ($actor_phid == $author_phid);

	$state_map = PhabricatorTransactions::getInlineStateMap();

	- $inlines = id(new DiffusionDiffInlineCommentQuery())
	+ $query = id(new DiffusionDiffInlineCommentQuery())
	->setViewer($this->getActor())
	->withCommitPHIDs(array($object->getPHID()))
	- ->withFixedStates(array_keys($state_map))
	+ ->withFixedStates(array_keys($state_map));
	+
	+ $inlines = array();
	+
	+ $inlines[] = id(clone $query)
	+ ->withAuthorPHIDs(array($actor_phid))
	+ ->withHasTransaction(false)
	->execute();

	+ if ($actor_is_author) {
	+ $inlines[] = id(clone $query)
	+ ->withHasTransaciton(true)
	+ ->execute();
	+ }
	+
	+ $inlines = array_mergev($inlines);
	+
	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) {

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

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

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

	$subject = "{$name}: {$summary}";

	$template = id(new PhabricatorMetaMTAMail())
	->setSubject($subject);

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

	return $template;
	}

	protected function getMailTo(PhabricatorLiskDAO $object) {
	$this->requireAuditors($object);

	$phids = array();

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

	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->isResigned()) {
	$phids[] = $audit->getAuditorPHID();
	}
	}

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

	return $phids;
	}

	protected function newMailUnexpandablePHIDs(PhabricatorLiskDAO $object) {
	$this->requireAuditors($object);

	$phids = array();

	foreach ($object->getAudits() as $auditor) {
	if ($auditor->isResigned()) {
	$phids[] = $auditor->getAuditorPHID();
	}
	}

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

	private function requireAuditors(PhabricatorRepositoryCommit $commit) {
	if ($commit->hasAttachedAudits()) {
	return;
	}

	$with_auditors = id(new DiffusionCommitQuery())
	->setViewer($this->getActor())
	->needAuditRequests(true)
	->withPHIDs(array($commit->getPHID()))
	->executeOne();
	if (!$with_auditors) {
	throw new Exception(
	pht(
	'Failed to reload commit ("%s").',
	$commit->getPHID()));
	}

	$commit->attachAudits($with_auditors->getAudits());
	}

	}
	diff --git a/src/applications/differential/controller/DifferentialInlineCommentEditController.php b/src/applications/differential/controller/DifferentialInlineCommentEditController.php
	index 2e44e86822..9741cc93ee 100644
	--- a/src/applications/differential/controller/DifferentialInlineCommentEditController.php
	+++ b/src/applications/differential/controller/DifferentialInlineCommentEditController.php
	@@ -1,222 +1,235 @@
	<?php

	final class DifferentialInlineCommentEditController
	extends PhabricatorInlineCommentController {

	private function getRevisionID() {
	return $this->getRequest()->getURIData('id');
	}

	private function loadRevision() {
	$viewer = $this->getViewer();
	$revision_id = $this->getRevisionID();

	$revision = id(new DifferentialRevisionQuery())
	->setViewer($viewer)
	->withIDs(array($revision_id))
	->executeOne();
	if (!$revision) {
	throw new Exception(pht('Invalid revision ID "%s".', $revision_id));
	}

	return $revision;
	}

	protected function createComment() {
	// Verify revision and changeset correspond to actual objects, and are
	// connected to one another.
	$changeset_id = $this->getChangesetID();
	$viewer = $this->getViewer();

	$revision = $this->loadRevision();

	$changeset = id(new DifferentialChangesetQuery())
	->setViewer($viewer)
	->withIDs(array($changeset_id))
	->executeOne();
	if (!$changeset) {
	throw new Exception(
	pht(
	'Invalid changeset ID "%s"!',
	$changeset_id));
	}

	$diff = $changeset->getDiff();
	if ($diff->getRevisionID() != $revision->getID()) {
	throw new Exception(
	pht(
	'Changeset ID "%s" is part of diff ID "%s", but that diff '.
	'is attached to revision "%s", not revision "%s".',
	$changeset_id,
	$diff->getID(),
	$diff->getRevisionID(),
	$revision->getID()));
	}

	return id(new DifferentialInlineComment())
	->setRevision($revision)
	->setChangesetID($changeset_id);
	}

	protected function loadComment($id) {
	return id(new DifferentialInlineCommentQuery())
	->setViewer($this->getViewer())
	->withIDs(array($id))
	->withDeletedDrafts(true)
	->needHidden(true)
	->executeOne();
	}

	protected function loadCommentByPHID($phid) {
	return id(new DifferentialInlineCommentQuery())
	->setViewer($this->getViewer())
	->withPHIDs(array($phid))
	->withDeletedDrafts(true)
	->needHidden(true)
	->executeOne();
	}

	protected function loadCommentForEdit($id) {
	$viewer = $this->getViewer();

	$inline = $this->loadComment($id);
	if (!$this->canEditInlineComment($viewer, $inline)) {
	throw new Exception(pht('That comment is not editable!'));
	}
	return $inline;
	}

	protected function loadCommentForDone($id) {
	$viewer = $this->getViewer();

	$inline = $this->loadComment($id);
	if (!$inline) {
	throw new Exception(pht('Unable to load inline "%d".', $id));
	}

	$changeset = id(new DifferentialChangesetQuery())
	->setViewer($viewer)
	->withIDs(array($inline->getChangesetID()))
	->executeOne();
	if (!$changeset) {
	throw new Exception(pht('Unable to load changeset.'));
	}

	$diff = id(new DifferentialDiffQuery())
	->setViewer($viewer)
	->withIDs(array($changeset->getDiffID()))
	->executeOne();
	if (!$diff) {
	throw new Exception(pht('Unable to load diff.'));
	}

	$revision = id(new DifferentialRevisionQuery())
	->setViewer($viewer)
	->withIDs(array($diff->getRevisionID()))
	->executeOne();
	if (!$revision) {
	throw new Exception(pht('Unable to load revision.'));
	}

	- if ($revision->getAuthorPHID() !== $viewer->getPHID()) {
	- throw new Exception(pht('You are not the revision owner.'));
	+ $viewer_phid = $viewer->getPHID();
	+ $is_owner = ($viewer_phid == $revision->getAuthorPHID());
	+ $is_author = ($viewer_phid == $inline->getAuthorPHID());
	+ $is_draft = ($inline->isDraft());
	+
	+ if ($is_owner) {
	+ // You own the revision, so you can mark the comment as "Done".
	+ } else if ($is_author && $is_draft) {
	+ // You made this comment and it's still a draft, so you can mark
	+ // it as "Done".
	+ } else {
	+ throw new Exception(
	+ pht(
	+ 'You are not the revision owner, and this is not a draft comment '.
	+ 'you authored.'));
	}

	return $inline;
	}

	private function canEditInlineComment(
	PhabricatorUser $viewer,
	DifferentialInlineComment $inline) {

	// Only the author may edit a comment.
	if ($inline->getAuthorPHID() != $viewer->getPHID()) {
	return false;
	}

	// Saved comments may not be edited, for now, although the schema now
	// supports it.
	if (!$inline->isDraft()) {
	return false;
	}

	// Inline must be attached to the active revision.
	if ($inline->getRevisionID() != $this->getRevisionID()) {
	return false;
	}

	return true;
	}

	protected function deleteComment(PhabricatorInlineCommentInterface $inline) {
	$inline->openTransaction();
	$inline->setIsDeleted(1)->save();
	$this->syncDraft();
	$inline->saveTransaction();
	}

	protected function undeleteComment(
	PhabricatorInlineCommentInterface $inline) {
	$inline->openTransaction();
	$inline->setIsDeleted(0)->save();
	$this->syncDraft();
	$inline->saveTransaction();
	}

	protected function saveComment(PhabricatorInlineCommentInterface $inline) {
	$inline->openTransaction();
	$inline->save();
	$this->syncDraft();
	$inline->saveTransaction();
	}

	protected function loadObjectOwnerPHID(
	PhabricatorInlineCommentInterface $inline) {
	return $this->loadRevision()->getAuthorPHID();
	}

	protected function hideComments(array $ids) {
	$viewer = $this->getViewer();
	$table = new DifferentialHiddenComment();
	$conn_w = $table->establishConnection('w');

	$sql = array();
	foreach ($ids as $id) {
	$sql[] = qsprintf(
	$conn_w,
	'(%s, %d)',
	$viewer->getPHID(),
	$id);
	}

	queryfx(
	$conn_w,
	'INSERT IGNORE INTO %T (userPHID, commentID) VALUES %Q',
	$table->getTableName(),
	implode(', ', $sql));
	}

	protected function showComments(array $ids) {
	$viewer = $this->getViewer();
	$table = new DifferentialHiddenComment();
	$conn_w = $table->establishConnection('w');

	queryfx(
	$conn_w,
	'DELETE FROM %T WHERE userPHID = %s AND commentID IN (%Ld)',
	$table->getTableName(),
	$viewer->getPHID(),
	$ids);
	}

	private function syncDraft() {
	$viewer = $this->getViewer();
	$revision = $this->loadRevision();

	$revision->newDraftEngine()
	->setObject($revision)
	->setViewer($viewer)
	->synchronize();
	}

	}
	diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
	index 29dac38b5a..c452cb9346 100644
	--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
	+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
	@@ -1,1747 +1,1762 @@
	<?php

	final class DifferentialTransactionEditor
	extends PhabricatorApplicationTransactionEditor {

	private $changedPriorToCommitURI;
	private $isCloseByCommit;
	private $repositoryPHIDOverride = false;
	private $didExpandInlineState = false;
	private $firstBroadcast = false;
	private $wasBroadcasting;
	private $isDraftDemotion;

	private $ownersDiff;
	private $ownersChangesets;

	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 = DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE;

	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;

	return $types;
	}

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

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

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

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

	switch ($xaction->getTransactionType()) {
	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;
	}

	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 DifferentialRevisionPlanChangesTransaction::TRANSACTIONTYPE:
	if ($xaction->getMetadataValue('draft.demote')) {
	$this->isDraftDemotion = true;
	}
	break;
	}
	}

	$this->wasBroadcasting = $object->getShouldBroadcast();

	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;

	$want_downgrade = array();
	$must_downgrade = array();
	if ($this->getIsCloseByCommit()) {
	// Never downgrade reviewers when we're closing a revision after a
	// commit.
	} else {
	switch ($xaction->getTransactionType()) {
	case DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE:
	$want_downgrade[] = DifferentialReviewerStatus::STATUS_ACCEPTED;
	$want_downgrade[] = DifferentialReviewerStatus::STATUS_REJECTED;
	break;
	case DifferentialRevisionRequestReviewTransaction::TRANSACTIONTYPE:
	if (!$object->isChangePlanned()) {
	// If the old state isn't "Changes Planned", downgrade the accepts
	// even if they're sticky.

	// We don't downgrade for "Changes Planned" to allow an author to
	// undo a "Plan Changes" by immediately following it up with a
	// "Request Review".
	$want_downgrade[] = DifferentialReviewerStatus::STATUS_ACCEPTED;
	$must_downgrade[] = DifferentialReviewerStatus::STATUS_ACCEPTED;
	}
	$want_downgrade[] = DifferentialReviewerStatus::STATUS_REJECTED;
	break;
	}
	}

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

	$results[] = id(new DifferentialTransaction())
	->setTransactionType($void_type)
	->setIgnoreOnNoEffect(true)
	->setMetadataValue('void.force', $must_downgrade)
	->setNewValue($want_downgrade);
	}

	$is_commandeer = false;
	switch ($xaction->getTransactionType()) {
	case DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE:
	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 DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE:
	case DifferentialTransaction::TYPE_INLINE:
	$this->didExpandInlineState = true;

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

	$state_map = PhabricatorTransactions::getInlineStateMap();

	- $inlines = id(new DifferentialDiffInlineCommentQuery())
	+ $query = id(new DifferentialDiffInlineCommentQuery())
	->setViewer($this->getActor())
	->withRevisionPHIDs(array($object->getPHID()))
	- ->withFixedStates(array_keys($state_map))
	+ ->withFixedStates(array_keys($state_map));
	+
	+ $inlines = array();
	+
	+ // We're going to undraft any "done" marks on your own inlines.
	+ $inlines[] = id(clone $query)
	+ ->withAuthorPHIDs(array($actor_phid))
	+ ->withHasTransaction(false)
	->execute();

	+ // If you're the author, we also undraft any "done" marks on other
	+ // inlines.
	+ if ($actor_is_author) {
	+ $inlines[] = id(clone $query)
	+ ->withHasTransaction(true)
	+ ->execute();
	+ }
	+
	+ $inlines = array_mergev($inlines);
	+
	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;
	}

	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 DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE:
	$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 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->getShouldBroadcast()) {
	return false;
	}

	return true;
	}

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

	protected function getMailTo(PhabricatorLiskDAO $object) {
	if ($object->getShouldBroadcast()) {
	$this->requireReviewers($object);

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

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

	// If we're demoting a draft after a build failure, just notify the author.
	if ($this->isDraftDemotion) {
	$author_phid = $object->getAuthorPHID();
	return array(
	$author_phid,
	);
	}

	return array();
	}

	protected function getMailCC(PhabricatorLiskDAO $object) {
	if (!$object->getShouldBroadcast()) {
	return array();
	}

	return parent::getMailCC($object);
	}

	protected function newMailUnexpandablePHIDs(PhabricatorLiskDAO $object) {
	$this->requireReviewers($object);

	$phids = array();

	foreach ($object->getReviewers() as $reviewer) {
	if ($reviewer->isResigned()) {
	$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 = DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE;
	if ($strongest->getTransactionType() == $type_update) {
	$show_lines = true;
	}
	}

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

	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) {
	$monogram = $object->getMonogram();
	$title = $object->getTitle();

	return id(new PhabricatorMetaMTAMail())
	->setSubject(pht('%s: %s', $monogram, $title))
	->setMustEncryptSubject(pht('%s: Revision Updated', $monogram))
	->setMustEncryptURI($object->getURI());
	}

	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 = $object->getURI();
	$revision_uri = PhabricatorEnv::getProductionURI($revision_uri);
	$new_uri = $revision_uri.'/new/';

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

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

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

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

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

	if (!$this->isFirstBroadcast()) {
	$body->addLinkSection(pht('CHANGES SINCE LAST ACTION'), $new_uri);
	}

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

	if ($update_xaction) {
	$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');

	try {
	$patch = $this->buildPatchForMail($diff, $body_limit);
	} catch (ArcanistDiffByteSizeException $ex) {
	$patch = null;
	}

	if (($patch !== null) && $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 (($patch !== null) && $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;
	}
	}

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

	// See PHI574. Respect any unmentionable PHIDs which were set on the
	// Editor by the caller.
	$unmentionable_map = $this->getUnmentionablePHIDMap();
	$unmentionable_map += $task_phids;
	$unmentionable_map += $rev_phids;
	$unmentionable_map += $revert_phids;
	$this->setUnmentionablePHIDMap($unmentionable_map);

	$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) {

	$limit = 100;
	$limit_note = null;
	if (count($inlines) > $limit) {
	$limit_note = pht(
	'(Showing first %s of %s inline comments.)',
	new PhutilNumber($limit),
	phutil_count($inlines));

	$inlines = array_slice($inlines, 0, $limit, true);
	}

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

	$header = pht('INLINE COMMENTS');

	$section_text = "\n".$section->getPlaintext();
	if ($limit_note) {
	$section_text = $limit_note."\n".$section_text;
	}

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

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

	if ($limit_note) {
	$section_html = array(
	phutil_tag(
	'em',
	array(),
	$limit_note),
	$section_html,
	);
	}

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

	public 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();
	}

	$diff = $this->ownersDiff;
	$changesets = $this->ownersChangesets;

	$this->ownersDiff = null;
	$this->ownersChangesets = null;

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

	$packages = PhabricatorOwnersPackage::loadAffectedPackagesForChangesets(
	$repository,
	$diff,
	$changesets);
	if (!$packages) {
	return array();
	}

	// Identify the packages with "Non-Owner Author" review rules and remove
	// them if the author has authority over the package.

	$autoreview_map = PhabricatorOwnersPackage::getAutoreviewOptionsMap();
	$need_authority = array();
	foreach ($packages as $package) {
	$autoreview_setting = $package->getAutoReview();

	$spec = idx($autoreview_map, $autoreview_setting);
	if (!$spec) {
	continue;
	}

	if (idx($spec, 'authority')) {
	$need_authority[$package->getPHID()] = $package->getPHID();
	}
	}

	if ($need_authority) {
	$authority = id(new PhabricatorOwnersPackageQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withPHIDs($need_authority)
	->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_REVIEW:
	case PhabricatorOwnersPackage::AUTOREVIEW_REVIEW_ALWAYS:
	$auto_review[] = $package;
	break;
	case PhabricatorOwnersPackage::AUTOREVIEW_BLOCK:
	case PhabricatorOwnersPackage::AUTOREVIEW_BLOCK_ALWAYS:
	$auto_block[] = $package;
	break;
	case PhabricatorOwnersPackage::AUTOREVIEW_SUBSCRIBE:
	case PhabricatorOwnersPackage::AUTOREVIEW_SUBSCRIBE_ALWAYS:
	$auto_subscribe[] = $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->getShouldBroadcast()) {
	$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 = DifferentialRevisionUpdateTransaction::TRANSACTIONTYPE;
	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();
	}

	// If this change affected paths, save the changesets so we can apply
	// Owners rules to them later.
	if ($paths) {
	$this->ownersDiff = $diff;
	$this->ownersChangesets = $changesets;
	}

	// 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, $byte_limit) {
	$format = PhabricatorEnv::getEnvConfig('metamta.differential.patch-format');

	return id(new DifferentialRawDiffRenderer())
	->setViewer($this->getActor())
	->setFormat($format)
	->setChangesets($diff->getChangesets())
	->setByteLimit($byte_limit)
	->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,
	'isDraftDemotion' => $this->isDraftDemotion,
	);
	}

	protected function loadCustomWorkerState(array $state) {
	$this->changedPriorToCommitURI = idx($state, 'changedPriorToCommitURI');
	$this->firstBroadcast = idx($state, 'firstBroadcast');
	$this->isDraftDemotion = idx($state, 'isDraftDemotion');
	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;
	}

	$can_promote = false;
	$can_demote = false;

	// "Draft" revisions can promote to "Review Requested" after builds pass,
	// or demote to "Changes Planned" after builds fail.
	if ($object->isDraft()) {
	$can_promote = true;
	$can_demote = true;
	}

	// See PHI584. "Changes Planned" revisions which are not yet broadcasting
	// can promote to "Review Requested" if builds pass.

	// This pass is presumably the result of someone restarting the builds and
	// having them work this time, perhaps because the builds are not perfectly
	// reliable or perhaps because someone fixed some issue with build hardware
	// or some other dependency.

	// Currently, there's no legitimate way to end up in this state except
	// through automatic demotion, so this behavior should not generate an
	// undue level of confusion or ambiguity. Also note that these changes can
	// not demote again since they've already been demoted once.
	if ($object->isChangePlanned()) {
	if (!$object->getShouldBroadcast()) {
	$can_promote = true;
	}
	}

	if (($can_promote \|\| $can_demote) && $auto_undraft) {
	$status = $this->loadCompletedBuildableStatus($object);

	$is_passed = ($status === HarbormasterBuildableStatus::STATUS_PASSED);
	$is_failed = ($status === HarbormasterBuildableStatus::STATUS_FAILED);

	if ($is_passed && $can_promote) {
	// 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);
	} else if ($is_failed && $can_demote) {
	// When demoting a revision, we act as "Harbormaster" instead of
	// the author since this feels a little more natural.
	$harbormaster_phid = id(new PhabricatorHarbormasterApplication())
	->getPHID();

	$xaction = $object->getApplicationTransactionTemplate()
	->setAuthorPHID($harbormaster_phid)
	->setMetadataValue('draft.demote', true)
	->setTransactionType(
	DifferentialRevisionPlanChangesTransaction::TRANSACTIONTYPE)
	->setNewValue(true);

	$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_broadcasting = $this->wasBroadcasting;

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

	return $xactions;
	}

	private function loadCompletedBuildableStatus(
	DifferentialRevision $revision) {
	$viewer = $this->requireActor();
	$builds = $revision->loadImpactfulBuilds($viewer);
	return $revision->newBuildableStatusForBuilds($builds);
	}

	private function requireReviewers(DifferentialRevision $revision) {
	if ($revision->hasAttachedReviewers()) {
	return;
	}

	$with_reviewers = id(new DifferentialRevisionQuery())
	->setViewer($this->getActor())
	->needReviewers(true)
	->withPHIDs(array($revision->getPHID()))
	->executeOne();
	if (!$with_reviewers) {
	throw new Exception(
	pht(
	'Failed to reload revision ("%s").',
	$revision->getPHID()));
	}

	$revision->attachReviewers($with_reviewers->getReviewers());
	}


	}
	diff --git a/src/applications/diffusion/controller/DiffusionInlineCommentController.php b/src/applications/diffusion/controller/DiffusionInlineCommentController.php
	index bc7448a9e2..ce69511dde 100644
	--- a/src/applications/diffusion/controller/DiffusionInlineCommentController.php
	+++ b/src/applications/diffusion/controller/DiffusionInlineCommentController.php
	@@ -1,127 +1,139 @@
	<?php

	final class DiffusionInlineCommentController
	extends PhabricatorInlineCommentController {

	private function getCommitPHID() {
	return $this->getRequest()->getURIData('phid');
	}

	private function loadCommit() {
	$viewer = $this->getViewer();
	$commit_phid = $this->getCommitPHID();

	$commit = id(new DiffusionCommitQuery())
	->setViewer($viewer)
	->withPHIDs(array($commit_phid))
	->executeOne();
	if (!$commit) {
	throw new Exception(pht('Invalid commit PHID "%s"!', $commit_phid));
	}

	return $commit;
	}

	protected function createComment() {
	$commit = $this->loadCommit();

	// TODO: Write a real PathQuery object?
	$path_id = $this->getChangesetID();
	$path = queryfx_one(
	id(new PhabricatorRepository())->establishConnection('r'),
	'SELECT path FROM %T WHERE id = %d',
	PhabricatorRepository::TABLE_PATH,
	$path_id);
	if (!$path) {
	throw new Exception(pht('Invalid path ID!'));
	}

	return id(new PhabricatorAuditInlineComment())
	->setCommitPHID($commit->getPHID())
	->setPathID($path_id);
	}

	protected function loadComment($id) {
	return PhabricatorAuditInlineComment::loadID($id);
	}

	protected function loadCommentByPHID($phid) {
	return PhabricatorAuditInlineComment::loadPHID($phid);
	}

	protected function loadCommentForEdit($id) {
	$viewer = $this->getViewer();

	$inline = $this->loadComment($id);
	if (!$this->canEditInlineComment($viewer, $inline)) {
	throw new Exception(pht('That comment is not editable!'));
	}
	return $inline;
	}

	protected function loadCommentForDone($id) {
	$viewer = $this->getViewer();

	$inline = $this->loadComment($id);
	if (!$inline) {
	throw new Exception(pht('Failed to load comment "%d".', $id));
	}

	$commit = id(new DiffusionCommitQuery())
	->setViewer($viewer)
	->withPHIDs(array($inline->getCommitPHID()))
	->executeOne();
	if (!$commit) {
	throw new Exception(pht('Failed to load commit.'));
	}

	- if ((!$commit->getAuthorPHID()) \|\|
	- ($commit->getAuthorPHID() != $viewer->getPHID())) {
	- throw new Exception(pht('You can not mark this comment as complete.'));
	+ $owner_phid = $commit->getAuthorPHID();
	+ $viewer_phid = $viewer->getPHID();
	+ $viewer_is_owner = ($owner_phid && ($owner_phid == $viewer_phid));
	+ $viewer_is_author = ($viewer_phid == $inline->getAuthorPHID());
	+ $is_draft = $inline->isDraft();
	+
	+ if ($viewer_is_owner) {
	+ // You can mark inlines on your own commits as "Done".
	+ } else if ($viewer_is_author && $is_draft) {
	+ // You can mark your own unsubmitted inlines as "Done".
	+ } else {
	+ throw new Exception(
	+ pht(
	+ 'You can not mark this comment as complete: you did not author '.
	+ 'the commit and the comment is not a draft you wrote.'));
	}

	return $inline;
	}

	private function canEditInlineComment(
	PhabricatorUser $viewer,
	PhabricatorAuditInlineComment $inline) {

	// Only the author may edit a comment.
	if ($inline->getAuthorPHID() != $viewer->getPHID()) {
	return false;
	}

	// Saved comments may not be edited.
	if ($inline->getAuditCommentID()) {
	return false;
	}

	// Inline must be attached to the active revision.
	if ($inline->getCommitPHID() != $this->getCommitPHID()) {
	return false;
	}

	return true;
	}

	protected function deleteComment(PhabricatorInlineCommentInterface $inline) {
	$inline->setIsDeleted(1)->save();
	}

	protected function undeleteComment(
	PhabricatorInlineCommentInterface $inline) {
	$inline->setIsDeleted(0)->save();
	}

	protected function saveComment(PhabricatorInlineCommentInterface $inline) {
	return $inline->save();
	}

	protected function loadObjectOwnerPHID(
	PhabricatorInlineCommentInterface $inline) {
	return $this->loadCommit()->getAuthorPHID();
	}


	}
	diff --git a/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
	index a32197059a..4da3bbd8fa 100644
	--- a/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
	+++ b/src/infrastructure/diff/view/PHUIDiffInlineCommentDetailView.php
	@@ -1,508 +1,515 @@
	<?php

	final class PHUIDiffInlineCommentDetailView
	extends PHUIDiffInlineCommentView {

	private $inlineComment;
	private $handles;
	private $markupEngine;
	private $editable;
	private $preview;
	private $allowReply;
	private $renderer;
	private $canMarkDone;
	private $objectOwnerPHID;

	public function setInlineComment(PhabricatorInlineCommentInterface $comment) {
	$this->inlineComment = $comment;
	return $this;
	}

	public function isHidden() {
	return $this->inlineComment->isHidden();
	}

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

	public function setMarkupEngine(PhabricatorMarkupEngine $engine) {
	$this->markupEngine = $engine;
	return $this;
	}

	public function setEditable($editable) {
	$this->editable = $editable;
	return $this;
	}

	public function setPreview($preview) {
	$this->preview = $preview;
	return $this;
	}

	public function setAllowReply($allow_reply) {
	$this->allowReply = $allow_reply;
	return $this;
	}

	public function setRenderer($renderer) {
	$this->renderer = $renderer;
	return $this;
	}

	public function getRenderer() {
	return $this->renderer;
	}

	public function setCanMarkDone($can_mark_done) {
	$this->canMarkDone = $can_mark_done;
	return $this;
	}

	public function getCanMarkDone() {
	return $this->canMarkDone;
	}

	public function setObjectOwnerPHID($phid) {
	$this->objectOwnerPHID = $phid;
	return $this;
	}

	public function getObjectOwnerPHID() {
	return $this->objectOwnerPHID;
	}

	public function getAnchorName() {
	$inline = $this->inlineComment;
	if ($inline->getID()) {
	return 'inline-'.$inline->getID();
	}
	return null;
	}

	public function getScaffoldCellID() {
	$anchor = $this->getAnchorName();
	if ($anchor) {
	return 'anchor-'.$anchor;
	}
	return null;
	}

	public function render() {
	require_celerity_resource('phui-inline-comment-view-css');
	$inline = $this->inlineComment;

	$classes = array(
	'differential-inline-comment',
	);

	$is_fixed = false;
	switch ($inline->getFixedState()) {
	case PhabricatorInlineCommentInterface::STATE_DONE:
	case PhabricatorInlineCommentInterface::STATE_DRAFT:
	$is_fixed = true;
	break;
	}

	$is_draft_done = false;
	switch ($inline->getFixedState()) {
	case PhabricatorInlineCommentInterface::STATE_DRAFT:
	case PhabricatorInlineCommentInterface::STATE_UNDRAFT:
	$is_draft_done = true;
	break;
	}

	$is_synthetic = false;
	if ($inline->getSyntheticAuthor()) {
	$is_synthetic = true;
	}

	$metadata = array(
	'id' => $inline->getID(),
	'phid' => $inline->getPHID(),
	'changesetID' => $inline->getChangesetID(),
	'number' => $inline->getLineNumber(),
	'length' => $inline->getLineLength(),
	'isNewFile' => (bool)$inline->getIsNewFile(),
	'on_right' => $this->getIsOnRight(),
	'original' => $inline->getContent(),
	'replyToCommentPHID' => $inline->getReplyToCommentPHID(),
	'isDraft' => $inline->isDraft(),
	'isFixed' => $is_fixed,
	'isGhost' => $inline->getIsGhost(),
	'isSynthetic' => $is_synthetic,
	'isDraftDone' => $is_draft_done,
	);

	$sigil = 'differential-inline-comment';
	if ($this->preview) {
	$sigil = $sigil.' differential-inline-comment-preview';
	}

	$classes = array(
	'differential-inline-comment',
	);

	$content = $inline->getContent();
	$handles = $this->handles;

	$links = array();

	$draft_text = null;
	if (!$is_synthetic) {
	// This display is controlled by CSS
	$draft_text = id(new PHUITagView())
	->setType(PHUITagView::TYPE_SHADE)
	->setName(pht('Unsubmitted'))
	->setSlimShady(true)
	->setColor(PHUITagView::COLOR_RED)
	->addClass('mml inline-draft-text');
	}

	$ghost_tag = null;
	$ghost = $inline->getIsGhost();
	$ghost_id = null;
	if ($ghost) {
	if ($ghost['new']) {
	$ghosticon = 'fa-fast-forward';
	$reason = pht('View on forward revision');
	} else {
	$ghosticon = 'fa-fast-backward';
	$reason = pht('View on previous revision');
	}

	$ghost_icon = id(new PHUIIconView())
	->setIcon($ghosticon)
	->addSigil('has-tooltip')
	->setMetadata(
	array(
	'tip' => $reason,
	'size' => 300,
	));
	$ghost_tag = phutil_tag(
	'a',
	array(
	'class' => 'ghost-icon',
	'href' => $ghost['href'],
	'target' => '_blank',
	),
	$ghost_icon);
	$classes[] = 'inline-comment-ghost';
	}

	// I think this is unused
	if ($inline->getHasReplies()) {
	$classes[] = 'inline-comment-has-reply';
	}

	if ($inline->getReplyToCommentPHID()) {
	$classes[] = 'inline-comment-is-reply';
	}

	$viewer_phid = $this->getUser()->getPHID();
	$owner_phid = $this->getObjectOwnerPHID();

	if ($viewer_phid) {
	if ($viewer_phid == $owner_phid) {
	$classes[] = 'viewer-is-object-owner';
	}
	}

	$anchor_name = $this->getAnchorName();

	$action_buttons = array();

	$can_reply =
	(!$this->editable) &&
	(!$this->preview) &&
	($this->allowReply) &&

	// NOTE: No product reason why you can't reply to synthetic comments,
	// but the reply mechanism currently sends the inline comment ID to the
	// server, not file/line information, and synthetic comments don't have
	// an inline comment ID.
	(!$is_synthetic);


	if ($can_reply) {
	$action_buttons[] = id(new PHUIButtonView())
	->setTag('a')
	->setIcon('fa-reply')
	->setTooltip(pht('Reply'))
	->addSigil('differential-inline-reply')
	->setMustCapture(true)
	->setAuralLabel(pht('Reply'));
	}

	if ($this->editable && !$this->preview) {
	$action_buttons[] = id(new PHUIButtonView())
	->setTag('a')
	->setIcon('fa-pencil')
	->setTooltip(pht('Edit'))
	->addSigil('differential-inline-edit')
	->setMustCapture(true)
	->setAuralLabel(pht('Edit'));

	$action_buttons[] = id(new PHUIButtonView())
	->setTag('a')
	->setIcon('fa-trash-o')
	->setTooltip(pht('Delete'))
	->addSigil('differential-inline-delete')
	->setMustCapture(true)
	->setAuralLabel(pht('Delete'));

	} else if ($this->preview) {
	$links[] = javelin_tag(
	'a',
	array(
	'class' => 'inline-button-divider pml msl',
	'meta' => array(
	'anchor' => $anchor_name,
	),
	'sigil' => 'differential-inline-preview-jump',
	),
	pht('View'));

	$action_buttons[] = id(new PHUIButtonView())
	->setTag('a')
	->setTooltip(pht('Delete'))
	->setIcon('fa-trash-o')
	->addSigil('differential-inline-delete')
	->setMustCapture(true)
	->setAuralLabel(pht('Delete'));
	}

	if (!$this->preview && $this->canHide()) {
	$action_buttons[] = id(new PHUIButtonView())
	->setTag('a')
	->setTooltip(pht('Collapse'))
	->setIcon('fa-times')
	->addSigil('hide-inline')
	->setMustCapture(true)
	->setAuralLabel(pht('Collapse'));
	}

	$done_button = null;

	+ $mark_done = $this->getCanMarkDone();
	+
	+ // Allow users to mark their own draft inlines as "Done".
	+ if ($viewer_phid == $inline->getAuthorPHID()) {
	+ if ($inline->isDraft()) {
	+ $mark_done = true;
	+ }
	+ }
	+
	if (!$is_synthetic) {
	$draft_state = false;
	switch ($inline->getFixedState()) {
	case PhabricatorInlineCommentInterface::STATE_DRAFT:
	- $is_done = ($this->getCanMarkDone());
	+ $is_done = $mark_done;
	$draft_state = true;
	break;
	case PhabricatorInlineCommentInterface::STATE_UNDRAFT:
	- $is_done = !($this->getCanMarkDone());
	+ $is_done = !$mark_done;
	$draft_state = true;
	break;
	case PhabricatorInlineCommentInterface::STATE_DONE:
	$is_done = true;
	break;
	default:
	case PhabricatorInlineCommentInterface::STATE_UNDONE:
	$is_done = false;
	break;
	}

	// If you don't have permission to mark the comment as "Done", you also
	// can not see the draft state.
	- if (!$this->getCanMarkDone()) {
	+ if (!$mark_done) {
	$draft_state = false;
	}

	if ($is_done) {
	$classes[] = 'inline-is-done';
	}

	if ($draft_state) {
	$classes[] = 'inline-state-is-draft';
	}

	- if ($this->getCanMarkDone()) {
	+ if ($mark_done && !$this->preview) {
	$done_input = javelin_tag(
	'input',
	array(
	'type' => 'checkbox',
	'checked' => ($is_done ? 'checked' : null),
	- 'disabled' => ($this->getCanMarkDone() ? null : 'disabled'),
	'class' => 'differential-inline-done',
	'sigil' => 'differential-inline-done',
	));
	$done_button = phutil_tag(
	'label',
	array(
	- 'class' => 'differential-inline-done-label '.
	- ($this->getCanMarkDone() ? null : 'done-is-disabled'),
	+ 'class' => 'differential-inline-done-label ',
	),
	array(
	$done_input,
	pht('Done'),
	));
	} else {
	if ($is_done) {
	$icon = id(new PHUIIconView())->setIcon('fa-check sky msr');
	$label = pht('Done');
	$class = 'button-done';
	} else {
	$icon = null;
	$label = pht('Not Done');
	$class = 'button-not-done';
	}
	$done_button = phutil_tag(
	'div',
	array(
	'class' => 'done-label '.$class,
	),
	array(
	$icon,
	$label,
	));
	}
	}

	$content = $this->markupEngine->getOutput(
	$inline,
	PhabricatorInlineCommentInterface::MARKUP_FIELD_BODY);

	if ($this->preview) {
	$anchor = null;
	} else {
	$anchor = phutil_tag(
	'a',
	array(
	'name' => $anchor_name,
	'id' => $anchor_name,
	'class' => 'differential-inline-comment-anchor',
	),
	'');
	}

	if ($inline->isDraft() && !$is_synthetic) {
	$classes[] = 'inline-state-is-draft';
	}
	if ($is_synthetic) {
	$classes[] = 'differential-inline-comment-synthetic';
	}
	$classes = implode(' ', $classes);

	$author_owner = null;
	if ($is_synthetic) {
	$author = $inline->getSyntheticAuthor();
	} else {
	$author = $handles[$inline->getAuthorPHID()]->getName();
	if ($inline->getAuthorPHID() == $this->objectOwnerPHID) {
	$author_owner = id(new PHUITagView())
	->setType(PHUITagView::TYPE_SHADE)
	->setName(pht('Author'))
	->setSlimShady(true)
	->setColor(PHUITagView::COLOR_YELLOW)
	->addClass('mml');
	}
	}

	$actions = null;
	if ($action_buttons) {
	$actions = new PHUIButtonBarView();
	$actions->setBorderless(true);
	$actions->addClass('inline-button-divider');
	foreach ($action_buttons as $button) {
	$actions->addButton($button);
	}
	}

	$group_left = phutil_tag(
	'div',
	array(
	'class' => 'inline-head-left',
	),
	array(
	$author,
	$author_owner,
	$draft_text,
	$ghost_tag,
	));

	$group_right = phutil_tag(
	'div',
	array(
	'class' => 'inline-head-right',
	),
	array(
	$done_button,
	$links,
	$actions,
	));

	$snippet = id(new PhutilUTF8StringTruncator())
	->setMaximumGlyphs(96)
	->truncateString($inline->getContent());
	$metadata['snippet'] = pht('%s: %s', $author, $snippet);

	$markup = javelin_tag(
	'div',
	array(
	'class' => $classes,
	'sigil' => $sigil,
	'meta' => $metadata,
	),
	array(
	javelin_tag(
	'div',
	array(
	'class' => 'differential-inline-comment-head grouped',
	'sigil' => 'differential-inline-header',
	),
	array(
	$group_left,
	$group_right,
	)),
	phutil_tag_div(
	'differential-inline-comment-content',
	phutil_tag_div('phabricator-remarkup', $content)),
	));

	$summary = phutil_tag(
	'div',
	array(
	'class' => 'differential-inline-summary',
	),
	array(
	phutil_tag('strong', array(), pht('%s:', $author)),
	' ',
	$snippet,
	));

	return array(
	$anchor,
	$markup,
	$summary,
	);
	}

	private function canHide() {
	$inline = $this->inlineComment;

	if ($inline->isDraft()) {
	return false;
	}

	if (!$inline->getID()) {
	return false;
	}

	$viewer = $this->getUser();
	if (!$viewer->isLoggedIn()) {
	return false;
	}

	if (!$inline->supportsHiding()) {
	return false;
	}

	return true;
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Wed, Jul 2, 9:54 AM (1 d, 18 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 164838
Default Alt Text: (107 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions