No OneTemporary
Actions

Size

376 KB

Referenced Files

None

Subscribers

None

View Options

This file is larger than 256 KB, so syntax highlighting was skipped.

	diff --git a/resources/sql/patches/098.heraldruletypemigration.php b/resources/sql/patches/098.heraldruletypemigration.php
	index 9340455b2e..0efc8c7e94 100644
	--- a/resources/sql/patches/098.heraldruletypemigration.php
	+++ b/resources/sql/patches/098.heraldruletypemigration.php
	@@ -1,51 +1,51 @@
	<?php

	echo "Checking for rules that can be converted to 'personal'. ";
	$table = new HeraldRule();
	$table->openTransaction();
	$table->beginReadLocking();

	$rules = $table->loadAll();

	foreach ($rules as $rule) {
	if ($rule->getRuleType() !== HeraldRuleTypeConfig::RULE_TYPE_PERSONAL) {
	$actions = $rule->loadActions();
	$can_be_personal = true;
	foreach ($actions as $action) {
	$target = $action->getTarget();
	if (is_array($target)) {
	if (count($target) > 1) {
	$can_be_personal = false;
	break;
	} else {
	$targetPHID = head($target);
	if ($targetPHID !== $rule->getAuthorPHID()) {
	$can_be_personal = false;
	break;
	}
	}
	} else if ($target) {
	if ($target !== $rule->getAuthorPHID()) {
	$can_be_personal = false;
	break;
	}
	}
	}

	if ($can_be_personal) {
	$rule->setRuleType(HeraldRuleTypeConfig::RULE_TYPE_PERSONAL);
	queryfx(
	$rule->establishConnection('w'),
	'UPDATE %T SET ruleType = %s WHERE id = %d',
	$rule->getTableName(),
	$rule->getRuleType(),
	$rule->getID());

	- echo "Setting rule '" . $rule->getName() . "' to personal. ";
	+ echo "Setting rule '".$rule->getName()."' to personal. ";
	}
	}
	}

	$table->endReadLocking();
	$table->saveTransaction();
	echo "Done.\n";
	diff --git a/scripts/aphront/aphrontpath.php b/scripts/aphront/aphrontpath.php
	index 627ae064c1..04a051212c 100755
	--- a/scripts/aphront/aphrontpath.php
	+++ b/scripts/aphront/aphrontpath.php
	@@ -1,26 +1,26 @@
	#!/usr/bin/env php
	<?php

	$root = dirname(dirname(dirname(__FILE__)));
	require_once $root.'/scripts/__init_script__.php';

	if ($argc !== 2 \|\| $argv[1] === '--help') {
	echo "Usage: aphrontpath.php <url>\n";
	echo "Purpose: Print controller which will process passed <url>.\n";
	exit(1);
	}

	$url = parse_url($argv[1]);
	$path = '/'.(isset($url['path']) ? ltrim($url['path'], '/') : '');

	$config_key = 'aphront.default-application-configuration-class';
	$application = PhabricatorEnv::newObjectFromConfig($config_key);
	$application->setRequest(new AphrontRequest('', $path));

	list($controller) = $application->buildControllerForPath($path);
	if (!$controller && substr($path, -1) !== '/') {
	list($controller) = $application->buildControllerForPath($path.'/');
	}
	if ($controller) {
	- echo get_class($controller) . "\n";
	+ echo get_class($controller)."\n";
	}
	diff --git a/scripts/symbols/generate_ctags_symbols.php b/scripts/symbols/generate_ctags_symbols.php
	index 42d3dbf25f..6c52521d7e 100755
	--- a/scripts/symbols/generate_ctags_symbols.php
	+++ b/scripts/symbols/generate_ctags_symbols.php
	@@ -1,124 +1,124 @@
	#!/usr/bin/env php
	<?php

	$root = dirname(dirname(dirname(__FILE__)));
	require_once $root.'/scripts/__init_script__.php';

	if (ctags_check_executable() == false) {
	echo phutil_console_format(
	"Could not find Exuberant ctags. Make sure it is installed and\n".
	"available in executable path.\n\n".
	"Exuberant ctags project page: http://ctags.sourceforge.net/\n");
	exit(1);
	}

	if ($argc !== 1 \|\| posix_isatty(STDIN)) {
	echo phutil_console_format(
	"usage: find . -type f -name '*.py' \| ./generate_ctags_symbols.php\n");
	exit(1);
	}

	$input = file_get_contents('php://stdin');
	$input = trim($input);
	$input = explode("\n", $input);

	$data = array();
	$futures = array();

	foreach ($input as $file) {
	$file = Filesystem::readablePath($file);
	$futures[$file] = ctags_get_parser_future($file);
	}

	foreach (Futures($futures)->limit(8) as $file => $future) {
	$tags = $future->resolve();
	$tags = explode("\n", $tags[1]);

	foreach ($tags as $tag) {
	$parts = explode(';', $tag);
	// skip lines that we can not parse
	if (count($parts) < 2) {
	continue;
	}

	// split ctags information
	$tag_info = explode("\t", $parts[0]);
	// split exuberant ctags "extension fields" (additional information)
	$parts[1] = trim($parts[1], "\t \"");
	$extension_fields = explode("\t", $parts[1]);

	// skip lines that we can not parse
	if (count($tag_info) < 3 \|\| count($extension_fields) < 2) {
	continue;
	}

	// default $context to empty
	$extension_fields[] = '';
	list($token, $file_path, $line_num) = $tag_info;
	list($type, $language, $context) = $extension_fields;

	// skip lines with tokens containing a space
	if (strpos($token, ' ') !== false) {
	continue;
	}

	// strip "language:"
	$language = substr($language, 9);

	// To keep consistent with "Separate with commas, for example: php, py"
	// in Arcanist Project edit form.
	$language = str_ireplace('python', 'py', $language);

	// also, "normalize" c++ and c#
	$language = str_ireplace('c++', 'cpp', $language);
	$language = str_ireplace('c#', 'cs', $language);

	// Ruby has "singleton method", for example
	$type = substr(str_replace(' ', '_', $type), 0, 12);
	// class:foo, struct:foo, union:foo, enum:foo, ...
	$context = last(explode(':', $context, 2));

	$ignore = array(
	'variable' => true,
	);
	if (empty($ignore[$type])) {
	print_symbol($file_path, $line_num, $type, $token, $context, $language);
	}
	}
	}

	function ctags_get_parser_future($file_path) {
	$future = new ExecFuture('ctags -n --fields=Kls -o - %s',
	$file_path);
	return $future;
	}

	function ctags_check_executable() {
	$future = new ExecFuture('ctags --version');
	$result = $future->resolve();

	if (empty($result[1])) {
	return false;
	}

	return true;
	}

	function print_symbol($file, $line_num, $type, $token, $context, $language) {
	// get rid of relative path
	$file = explode('/', $file);
	if ($file[0] == '.' \|\| $file[0] == '..') {
	array_shift($file);
	}
	- $file = '/' . implode('/', $file);
	+ $file = '/'.implode('/', $file);

	$parts = array(
	$context,
	$token,
	$type,
	strtolower($language),
	$line_num,
	$file,
	);
	echo implode(' ', $parts)."\n";
	}
	diff --git a/src/aphront/AphrontRequest.php b/src/aphront/AphrontRequest.php
	index cf609011bb..5393dc37d3 100644
	--- a/src/aphront/AphrontRequest.php
	+++ b/src/aphront/AphrontRequest.php
	@@ -1,599 +1,599 @@
	<?php

	/**
	* @task data Accessing Request Data
	* @task cookie Managing Cookies
	*
	*/
	final class AphrontRequest {

	// NOTE: These magic request-type parameters are automatically included in
	// certain requests (e.g., by phabricator_form(), JX.Request,
	// JX.Workflow, and ConduitClient) and help us figure out what sort of
	// response the client expects.

	const TYPE_AJAX = '__ajax__';
	const TYPE_FORM = '__form__';
	const TYPE_CONDUIT = '__conduit__';
	const TYPE_WORKFLOW = '__wflow__';
	const TYPE_CONTINUE = '__continue__';
	const TYPE_PREVIEW = '__preview__';
	const TYPE_HISEC = '__hisec__';

	private $host;
	private $path;
	private $requestData;
	private $user;
	private $applicationConfiguration;

	final public function __construct($host, $path) {
	$this->host = $host;
	$this->path = $path;
	}

	final public function setApplicationConfiguration(
	$application_configuration) {
	$this->applicationConfiguration = $application_configuration;
	return $this;
	}

	final public function getApplicationConfiguration() {
	return $this->applicationConfiguration;
	}

	final public function setPath($path) {
	$this->path = $path;
	return $this;
	}

	final public function getPath() {
	return $this->path;
	}

	final public function getHost() {
	// The "Host" header may include a port number, or may be a malicious
	// header in the form "realdomain.com:ignored@evil.com". Invoke the full
	// parser to extract the real domain correctly. See here for coverage of
	// a similar issue in Django:
	//
	// https://www.djangoproject.com/weblog/2012/oct/17/security/
	$uri = new PhutilURI('http://'.$this->host);
	return $uri->getDomain();
	}


	/* -( Accessing Request Data )--------------------------------------------- */


	/**
	* @task data
	*/
	final public function setRequestData(array $request_data) {
	$this->requestData = $request_data;
	return $this;
	}


	/**
	* @task data
	*/
	final public function getRequestData() {
	return $this->requestData;
	}


	/**
	* @task data
	*/
	final public function getInt($name, $default = null) {
	if (isset($this->requestData[$name])) {
	return (int)$this->requestData[$name];
	} else {
	return $default;
	}
	}


	/**
	* @task data
	*/
	final public function getBool($name, $default = null) {
	if (isset($this->requestData[$name])) {
	if ($this->requestData[$name] === 'true') {
	return true;
	} else if ($this->requestData[$name] === 'false') {
	return false;
	} else {
	return (bool)$this->requestData[$name];
	}
	} else {
	return $default;
	}
	}


	/**
	* @task data
	*/
	final public function getStr($name, $default = null) {
	if (isset($this->requestData[$name])) {
	$str = (string)$this->requestData[$name];
	// Normalize newline craziness.
	$str = str_replace(
	array("\r\n", "\r"),
	array("\n", "\n"),
	$str);
	return $str;
	} else {
	return $default;
	}
	}


	/**
	* @task data
	*/
	final public function getArr($name, $default = array()) {
	if (isset($this->requestData[$name]) &&
	is_array($this->requestData[$name])) {
	return $this->requestData[$name];
	} else {
	return $default;
	}
	}


	/**
	* @task data
	*/
	final public function getStrList($name, $default = array()) {
	if (!isset($this->requestData[$name])) {
	return $default;
	}
	$list = $this->getStr($name);
	$list = preg_split('/[\s,]+/', $list, $limit = -1, PREG_SPLIT_NO_EMPTY);
	return $list;
	}


	/**
	* @task data
	*/
	final public function getExists($name) {
	return array_key_exists($name, $this->requestData);
	}

	final public function getFileExists($name) {
	return isset($_FILES[$name]) &&
	(idx($_FILES[$name], 'error') !== UPLOAD_ERR_NO_FILE);
	}

	final public function isHTTPGet() {
	return ($_SERVER['REQUEST_METHOD'] == 'GET');
	}

	final public function isHTTPPost() {
	return ($_SERVER['REQUEST_METHOD'] == 'POST');
	}

	final public function isAjax() {
	return $this->getExists(self::TYPE_AJAX);
	}

	final public function isJavelinWorkflow() {
	return $this->getExists(self::TYPE_WORKFLOW);
	}

	final public function isConduit() {
	return $this->getExists(self::TYPE_CONDUIT);
	}

	public static function getCSRFTokenName() {
	return '__csrf__';
	}

	public static function getCSRFHeaderName() {
	return 'X-Phabricator-Csrf';
	}

	final public function validateCSRF() {
	$token_name = self::getCSRFTokenName();
	$token = $this->getStr($token_name);

	// No token in the request, check the HTTP header which is added for Ajax
	// requests.
	if (empty($token)) {
	$token = self::getHTTPHeader(self::getCSRFHeaderName());
	}

	$valid = $this->getUser()->validateCSRFToken($token);
	if (!$valid) {

	// Add some diagnostic details so we can figure out if some CSRF issues
	// are JS problems or people accessing Ajax URIs directly with their
	// browsers.
	$more_info = array();

	if ($this->isAjax()) {
	$more_info[] = pht('This was an Ajax request.');
	} else {
	$more_info[] = pht('This was a Web request.');
	}

	if ($token) {
	$more_info[] = pht('This request had an invalid CSRF token.');
	} else {
	$more_info[] = pht('This request had no CSRF token.');
	}

	// Give a more detailed explanation of how to avoid the exception
	// in developer mode.
	if (PhabricatorEnv::getEnvConfig('phabricator.developer-mode')) {
	// TODO: Clean this up, see T1921.
	$more_info[] =
	- "To avoid this error, use phabricator_form() to construct forms. " .
	- "If you are already using phabricator_form(), make sure the form " .
	- "'action' uses a relative URI (i.e., begins with a '/'). Forms " .
	- "using absolute URIs do not include CSRF tokens, to prevent " .
	- "leaking tokens to external sites.\n\n" .
	- "If this page performs writes which do not require CSRF " .
	- "protection (usually, filling caches or logging), you can use " .
	- "AphrontWriteGuard::beginScopedUnguardedWrites() to temporarily " .
	- "bypass CSRF protection while writing. You should use this only " .
	- "for writes which can not be protected with normal CSRF " .
	- "mechanisms.\n\n" .
	- "Some UI elements (like PhabricatorActionListView) also have " .
	- "methods which will allow you to render links as forms (like " .
	+ "To avoid this error, use phabricator_form() to construct forms. ".
	+ "If you are already using phabricator_form(), make sure the form ".
	+ "'action' uses a relative URI (i.e., begins with a '/'). Forms ".
	+ "using absolute URIs do not include CSRF tokens, to prevent ".
	+ "leaking tokens to external sites.\n\n".
	+ "If this page performs writes which do not require CSRF ".
	+ "protection (usually, filling caches or logging), you can use ".
	+ "AphrontWriteGuard::beginScopedUnguardedWrites() to temporarily ".
	+ "bypass CSRF protection while writing. You should use this only ".
	+ "for writes which can not be protected with normal CSRF ".
	+ "mechanisms.\n\n".
	+ "Some UI elements (like PhabricatorActionListView) also have ".
	+ "methods which will allow you to render links as forms (like ".
	"setRenderAsForm(true)).";
	}

	// This should only be able to happen if you load a form, pull your
	// internet for 6 hours, and then reconnect and immediately submit,
	// but give the user some indication of what happened since the workflow
	// is incredibly confusing otherwise.
	throw new AphrontCSRFException(
	pht(
	"You are trying to save some data to Phabricator, but the request ".
	"your browser made included an incorrect token. Reload the page ".
	"and try again. You may need to clear your cookies.\n\n%s",
	implode("\n", $more_info)));
	}

	return true;
	}

	final public function isFormPost() {
	$post = $this->getExists(self::TYPE_FORM) &&
	!$this->getExists(self::TYPE_HISEC) &&
	$this->isHTTPPost();

	if (!$post) {
	return false;
	}

	return $this->validateCSRF();
	}

	final public function setCookiePrefix($prefix) {
	$this->cookiePrefix = $prefix;
	return $this;
	}

	final private function getPrefixedCookieName($name) {
	if (strlen($this->cookiePrefix)) {
	return $this->cookiePrefix.'_'.$name;
	} else {
	return $name;
	}
	}

	final public function getCookie($name, $default = null) {
	$name = $this->getPrefixedCookieName($name);
	$value = idx($_COOKIE, $name, $default);

	// Internally, PHP deletes cookies by setting them to the value 'deleted'
	// with an expiration date in the past.

	// At least in Safari, the browser may send this cookie anyway in some
	// circumstances. After logging out, the 302'd GET to /login/ consistently
	// includes deleted cookies on my local install. If a cookie value is
	// literally 'deleted', pretend it does not exist.

	if ($value === 'deleted') {
	return null;
	}

	return $value;
	}

	final public function clearCookie($name) {
	$name = $this->getPrefixedCookieName($name);
	$this->setCookieWithExpiration($name, '', time() - (60 * 60 * 24 * 30));
	unset($_COOKIE[$name]);
	}

	/**
	* Get the domain which cookies should be set on for this request, or null
	* if the request does not correspond to a valid cookie domain.
	*
	* @return PhutilURI\|null Domain URI, or null if no valid domain exists.
	*
	* @task cookie
	*/
	private function getCookieDomainURI() {
	if (PhabricatorEnv::getEnvConfig('security.require-https') &&
	!$this->isHTTPS()) {
	return null;
	}

	$host = $this->getHost();

	// If there's no base domain configured, just use whatever the request
	// domain is. This makes setup easier, and we'll tell administrators to
	// configure a base domain during the setup process.
	$base_uri = PhabricatorEnv::getEnvConfig('phabricator.base-uri');
	if (!strlen($base_uri)) {
	return new PhutilURI('http://'.$host.'/');
	}

	$alternates = PhabricatorEnv::getEnvConfig('phabricator.allowed-uris');
	$allowed_uris = array_merge(
	array($base_uri),
	$alternates);

	foreach ($allowed_uris as $allowed_uri) {
	$uri = new PhutilURI($allowed_uri);
	if ($uri->getDomain() == $host) {
	return $uri;
	}
	}

	return null;
	}

	/**
	* Determine if security policy rules will allow cookies to be set when
	* responding to the request.
	*
	* @return bool True if setCookie() will succeed. If this method returns
	* false, setCookie() will throw.
	*
	* @task cookie
	*/
	final public function canSetCookies() {
	return (bool)$this->getCookieDomainURI();
	}


	/**
	* Set a cookie which does not expire for a long time.
	*
	* To set a temporary cookie, see @{method:setTemporaryCookie}.
	*
	* @param string Cookie name.
	* @param string Cookie value.
	* @return this
	* @task cookie
	*/
	final public function setCookie($name, $value) {
	$far_future = time() + (60 * 60 * 24 * 365 * 5);
	return $this->setCookieWithExpiration($name, $value, $far_future);
	}


	/**
	* Set a cookie which expires soon.
	*
	* To set a durable cookie, see @{method:setCookie}.
	*
	* @param string Cookie name.
	* @param string Cookie value.
	* @return this
	* @task cookie
	*/
	final public function setTemporaryCookie($name, $value) {
	return $this->setCookieWithExpiration($name, $value, 0);
	}


	/**
	* Set a cookie with a given expiration policy.
	*
	* @param string Cookie name.
	* @param string Cookie value.
	* @param int Epoch timestamp for cookie expiration.
	* @return this
	* @task cookie
	*/
	final private function setCookieWithExpiration(
	$name,
	$value,
	$expire) {

	$is_secure = false;

	$base_domain_uri = $this->getCookieDomainURI();
	if (!$base_domain_uri) {
	$configured_as = PhabricatorEnv::getEnvConfig('phabricator.base-uri');
	$accessed_as = $this->getHost();

	throw new Exception(
	pht(
	'This Phabricator install is configured as "%s", but you are '.
	'using the domain name "%s" to access a page which is trying to '.
	'set a cookie. Acccess Phabricator on the configured primary '.
	'domain or a configured alternate domain. Phabricator will not '.
	'set cookies on other domains for security reasons.',
	$configured_as,
	$accessed_as));
	}

	$base_domain = $base_domain_uri->getDomain();
	$is_secure = ($base_domain_uri->getProtocol() == 'https');

	$name = $this->getPrefixedCookieName($name);

	if (php_sapi_name() == 'cli') {
	// Do nothing, to avoid triggering "Cannot modify header information"
	// warnings.

	// TODO: This is effectively a test for whether we're running in a unit
	// test or not. Move this actual call to HTTPSink?
	} else {
	setcookie(
	$name,
	$value,
	$expire,
	$path = '/',
	$base_domain,
	$is_secure,
	$http_only = true);
	}

	$_COOKIE[$name] = $value;

	return $this;
	}

	final public function setUser($user) {
	$this->user = $user;
	return $this;
	}

	final public function getUser() {
	return $this->user;
	}

	final public function getRequestURI() {
	$get = $_GET;
	unset($get['__path__']);
	$path = phutil_escape_uri($this->getPath());
	return id(new PhutilURI($path))->setQueryParams($get);
	}

	final public function isDialogFormPost() {
	return $this->isFormPost() && $this->getStr('__dialog__');
	}

	final public function getRemoteAddr() {
	return $_SERVER['REMOTE_ADDR'];
	}

	public function isHTTPS() {
	if (empty($_SERVER['HTTPS'])) {
	return false;
	}
	if (!strcasecmp($_SERVER['HTTPS'], 'off')) {
	return false;
	}
	return true;
	}

	public function isContinueRequest() {
	return $this->isFormPost() && $this->getStr('__continue__');
	}

	public function isPreviewRequest() {
	return $this->isFormPost() && $this->getStr('__preview__');
	}

	/**
	* Get application request parameters in a flattened form suitable for
	* inclusion in an HTTP request, excluding parameters with special meanings.
	* This is primarily useful if you want to ask the user for more input and
	* then resubmit their request.
	*
	* @return dict<string, string> Original request parameters.
	*/
	public function getPassthroughRequestParameters() {
	return self::flattenData($this->getPassthroughRequestData());
	}

	/**
	* Get request data other than "magic" parameters.
	*
	* @return dict<string, wild> Request data, with magic filtered out.
	*/
	public function getPassthroughRequestData() {
	$data = $this->getRequestData();

	// Remove magic parameters like __dialog__ and __ajax__.
	foreach ($data as $key => $value) {
	if (!strncmp($key, '__', 2)) {
	unset($data[$key]);
	}
	}

	return $data;
	}


	/**
	* Flatten an array of key-value pairs (possibly including arrays as values)
	* into a list of key-value pairs suitable for submitting via HTTP request
	* (with arrays flattened).
	*
	* @param dict<string, wild> Data to flatten.
	* @return dict<string, string> Flat data suitable for inclusion in an HTTP
	* request.
	*/
	public static function flattenData(array $data) {
	$result = array();
	foreach ($data as $key => $value) {
	if (is_array($value)) {
	foreach (self::flattenData($value) as $fkey => $fvalue) {
	$fkey = '['.preg_replace('/(?=\[)\|$/', ']', $fkey, $limit = 1);
	$result[$key.$fkey] = $fvalue;
	}
	} else {
	$result[$key] = (string)$value;
	}
	}

	ksort($result);

	return $result;
	}


	/**
	* Read the value of an HTTP header from `$_SERVER`, or a similar datasource.
	*
	* This function accepts a canonical header name, like `"Accept-Encoding"`,
	* and looks up the appropriate value in `$_SERVER` (in this case,
	* `"HTTP_ACCEPT_ENCODING"`).
	*
	* @param string Canonical header name, like `"Accept-Encoding"`.
	* @param wild Default value to return if header is not present.
	* @param array? Read this instead of `$_SERVER`.
	* @return string\|wild Header value if present, or `$default` if not.
	*/
	public static function getHTTPHeader($name, $default = null, $data = null) {
	// PHP mangles HTTP headers by uppercasing them and replacing hyphens with
	// underscores, then prepending 'HTTP_'.
	$php_index = strtoupper($name);
	$php_index = str_replace('-', '_', $php_index);

	$try_names = array();

	$try_names[] = 'HTTP_'.$php_index;
	if ($php_index == 'CONTENT_TYPE' \|\| $php_index == 'CONTENT_LENGTH') {
	// These headers may be available under alternate names. See
	// http://www.php.net/manual/en/reserved.variables.server.php#110763
	$try_names[] = $php_index;
	}

	if ($data === null) {
	$data = $_SERVER;
	}

	foreach ($try_names as $try_name) {
	if (array_key_exists($try_name, $data)) {
	return $data[$try_name];
	}
	}

	return $default;
	}

	}
	diff --git a/src/applications/audit/editor/PhabricatorAuditCommentEditor.php b/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
	index b157b4d2fe..88a293a576 100644
	--- a/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
	+++ b/src/applications/audit/editor/PhabricatorAuditCommentEditor.php
	@@ -1,568 +1,568 @@
	<?php

	final class PhabricatorAuditCommentEditor extends PhabricatorEditor {

	private $commit;

	private $attachInlineComments;
	private $auditors = array();
	private $ccs = array();

	private $noEmail;

	public function __construct(PhabricatorRepositoryCommit $commit) {
	$this->commit = $commit;
	return $this;
	}

	public function addAuditors(array $auditor_phids) {
	$this->auditors = array_merge($this->auditors, $auditor_phids);
	return $this;
	}

	public function addCCs(array $cc_phids) {
	$this->ccs = array_merge($this->ccs, $cc_phids);
	return $this;
	}

	public function setAttachInlineComments($attach_inline_comments) {
	$this->attachInlineComments = $attach_inline_comments;
	return $this;
	}

	public function setNoEmail($no_email) {
	$this->noEmail = $no_email;
	return $this;
	}

	public function addComment(PhabricatorAuditComment $comment) {

	$commit = $this->commit;
	$actor = $this->getActor();

	$other_comments = id(new PhabricatorAuditComment())->loadAllWhere(
	'targetPHID = %s',
	$commit->getPHID());

	$inline_comments = array();
	if ($this->attachInlineComments) {
	$inline_comments = id(new PhabricatorAuditInlineComment())->loadAllWhere(
	'authorPHID = %s AND commitPHID = %s
	AND auditCommentID IS NULL',
	$actor->getPHID(),
	$commit->getPHID());
	}

	$comment
	->setActorPHID($actor->getPHID())
	->setTargetPHID($commit->getPHID())
	->save();

	$content_blocks = array($comment->getContent());

	if ($inline_comments) {
	foreach ($inline_comments as $inline) {
	$inline->setAuditCommentID($comment->getID());
	$inline->save();
	$content_blocks[] = $inline->getContent();
	}
	}

	$ccs = $this->ccs;
	$auditors = $this->auditors;

	$metadata = $comment->getMetadata();
	$metacc = array();

	// Find any "@mentions" in the content blocks.
	$mention_ccs = PhabricatorMarkupEngine::extractPHIDsFromMentions(
	$this->getActor(),
	$content_blocks);
	if ($mention_ccs) {
	$metacc = idx(
	$metadata,
	PhabricatorAuditComment::METADATA_ADDED_CCS,
	array());
	foreach ($mention_ccs as $cc_phid) {
	$metacc[] = $cc_phid;
	}
	}

	if ($metacc) {
	$ccs = array_merge($ccs, $metacc);
	}

	// When an actor submits an audit comment, we update all the audit requests
	// they have authority over to reflect the most recent status. The general
	// idea here is that if audit has triggered for, e.g., several packages, but
	// a user owns all of them, they can clear the audit requirement in one go
	// without auditing the commit for each trigger.

	$audit_phids = self::loadAuditPHIDsForUser($actor);
	$audit_phids = array_fill_keys($audit_phids, true);

	$requests = id(new PhabricatorRepositoryAuditRequest())
	->loadAllWhere(
	'commitPHID = %s',
	$commit->getPHID());

	$action = $comment->getAction();


	// TODO: We should validate the action, currently we allow anyone to, e.g.,
	// close an audit if they muck with form parameters. I'll followup with this
	// and handle the no-effect cases (e.g., closing and already-closed audit).


	$actor_is_author = ($actor->getPHID() == $commit->getAuthorPHID());

	if ($action == PhabricatorAuditActionConstants::CLOSE) {
	if (!PhabricatorEnv::getEnvConfig('audit.can-author-close-audit')) {
	throw new Exception('Cannot Close Audit without enabling'.
	'audit.can-author-close-audit');
	}
	// "Close" means wipe out all the concerns.
	$concerned_status = PhabricatorAuditStatusConstants::CONCERNED;
	foreach ($requests as $request) {
	if ($request->getAuditStatus() == $concerned_status) {
	$request->setAuditStatus(PhabricatorAuditStatusConstants::CLOSED);
	$request->save();
	}
	}
	} else if ($action == PhabricatorAuditActionConstants::RESIGN) {
	// "Resign" has unusual rules for writing user rows, only affects the
	// user row (never package/project rows), and always affects the user
	// row (other actions don't, if they were able to affect a package/project
	// row).
	$actor_request = null;
	foreach ($requests as $request) {
	if ($request->getAuditorPHID() == $actor->getPHID()) {
	$actor_request = $request;
	break;
	}
	}
	if (!$actor_request) {
	$actor_request = id(new PhabricatorRepositoryAuditRequest())
	->setCommitPHID($commit->getPHID())
	->setAuditorPHID($actor->getPHID())
	->setAuditReasons(array('Resigned'));
	}

	$actor_request
	->setAuditStatus(PhabricatorAuditStatusConstants::RESIGNED)
	->save();

	$requests[] = $actor_request;
	} else {
	$have_any_requests = false;
	foreach ($requests as $request) {
	if (empty($audit_phids[$request->getAuditorPHID()])) {
	continue;
	}

	$request_is_for_actor =
	($request->getAuditorPHID() == $actor->getPHID());

	$have_any_requests = true;
	$new_status = null;
	switch ($action) {
	case PhabricatorAuditActionConstants::COMMENT:
	case PhabricatorAuditActionConstants::ADD_CCS:
	case PhabricatorAuditActionConstants::ADD_AUDITORS:
	// Commenting or adding cc's/auditors doesn't change status.
	break;
	case PhabricatorAuditActionConstants::ACCEPT:
	if (!$actor_is_author \|\| $request_is_for_actor) {
	// When modifying your own commits, you act only on behalf of
	// yourself, not your packages/projects -- the idea being that
	// you can't accept your own commits.
	$new_status = PhabricatorAuditStatusConstants::ACCEPTED;
	}
	break;
	case PhabricatorAuditActionConstants::CONCERN:
	if (!$actor_is_author \|\| $request_is_for_actor) {
	// See above.
	$new_status = PhabricatorAuditStatusConstants::CONCERNED;
	}
	break;
	default:
	throw new Exception("Unknown action '{$action}'!");
	}
	if ($new_status !== null) {
	$request->setAuditStatus($new_status);
	$request->save();
	}
	}

	// If the actor has no current authority over any audit trigger, make a
	// new one to represent their audit state.
	if (!$have_any_requests) {
	$new_status = null;
	switch ($action) {
	case PhabricatorAuditActionConstants::COMMENT:
	case PhabricatorAuditActionConstants::ADD_CCS:
	case PhabricatorAuditActionConstants::ADD_AUDITORS:
	$new_status = PhabricatorAuditStatusConstants::AUDIT_NOT_REQUIRED;
	break;
	case PhabricatorAuditActionConstants::ACCEPT:
	$new_status = PhabricatorAuditStatusConstants::ACCEPTED;
	break;
	case PhabricatorAuditActionConstants::CONCERN:
	$new_status = PhabricatorAuditStatusConstants::CONCERNED;
	break;
	case PhabricatorAuditActionConstants::CLOSE:
	// Impossible to reach this block with 'close'.
	default:
	throw new Exception("Unknown or invalid action '{$action}'!");
	}

	$request = id(new PhabricatorRepositoryAuditRequest())
	->setCommitPHID($commit->getPHID())
	->setAuditorPHID($actor->getPHID())
	->setAuditStatus($new_status)
	->setAuditReasons(array('Voluntary Participant'))
	->save();
	$requests[] = $request;
	}
	}

	$requests_by_auditor = mpull($requests, null, 'getAuditorPHID');
	$requests_phids = array_keys($requests_by_auditor);

	$ccs = array_diff($ccs, $requests_phids);
	$auditors = array_diff($auditors, $requests_phids);

	if ($action == PhabricatorAuditActionConstants::ADD_CCS) {
	if ($ccs) {
	$metadata[PhabricatorAuditComment::METADATA_ADDED_CCS] = $ccs;
	$comment->setMetaData($metadata);
	} else {
	$comment->setAction(PhabricatorAuditActionConstants::COMMENT);
	}
	}

	if ($action == PhabricatorAuditActionConstants::ADD_AUDITORS) {
	if ($auditors) {
	$metadata[PhabricatorAuditComment::METADATA_ADDED_AUDITORS]
	= $auditors;
	$comment->setMetaData($metadata);
	} else {
	$comment->setAction(PhabricatorAuditActionConstants::COMMENT);
	}
	}

	$comment->save();

	if ($auditors) {
	foreach ($auditors as $auditor_phid) {
	$audit_requested = PhabricatorAuditStatusConstants::AUDIT_REQUESTED;
	$requests[] = id (new PhabricatorRepositoryAuditRequest())
	->setCommitPHID($commit->getPHID())
	->setAuditorPHID($auditor_phid)
	->setAuditStatus($audit_requested)
	->setAuditReasons(
	- array('Added by ' . $actor->getUsername()))
	+ array('Added by '.$actor->getUsername()))
	->save();
	}
	}

	if ($ccs) {
	foreach ($ccs as $cc_phid) {
	$audit_cc = PhabricatorAuditStatusConstants::CC;
	$requests[] = id (new PhabricatorRepositoryAuditRequest())
	->setCommitPHID($commit->getPHID())
	->setAuditorPHID($cc_phid)
	->setAuditStatus($audit_cc)
	->setAuditReasons(
	- array('Added by ' . $actor->getUsername()))
	+ array('Added by '.$actor->getUsername()))
	->save();
	}
	}

	$commit->updateAuditStatus($requests);
	$commit->save();

	$feed_dont_publish_phids = array();
	foreach ($requests as $request) {
	$status = $request->getAuditStatus();
	switch ($status) {
	case PhabricatorAuditStatusConstants::RESIGNED:
	case PhabricatorAuditStatusConstants::NONE:
	case PhabricatorAuditStatusConstants::AUDIT_NOT_REQUIRED:
	case PhabricatorAuditStatusConstants::CC:
	$feed_dont_publish_phids[$request->getAuditorPHID()] = 1;
	break;
	default:
	unset($feed_dont_publish_phids[$request->getAuditorPHID()]);
	break;
	}
	}
	$feed_dont_publish_phids = array_keys($feed_dont_publish_phids);

	$feed_phids = array_diff($requests_phids, $feed_dont_publish_phids);
	$this->publishFeedStory($comment, $feed_phids);

	id(new PhabricatorSearchIndexer())
	->queueDocumentForIndexing($commit->getPHID());

	if (!$this->noEmail) {
	$this->sendMail($comment, $other_comments, $inline_comments, $requests);
	}
	}


	/**
	* Load the PHIDs for all objects the user has the authority to act as an
	* audit for. This includes themselves, and any packages they are an owner
	* of.
	*/
	public static function loadAuditPHIDsForUser(PhabricatorUser $user) {
	$phids = array();

	// TODO: This method doesn't really use the right viewer, but in practice we
	// never issue this query of this type on behalf of another user and are
	// unlikely to do so in the future. This entire method should be refactored
	// into a Query class, however, and then we should use a proper viewer.

	// The user can audit on their own behalf.
	$phids[$user->getPHID()] = true;

	$owned_packages = id(new PhabricatorOwnersPackageQuery())
	->setViewer($user)
	->withOwnerPHIDs(array($user->getPHID()))
	->execute();
	foreach ($owned_packages as $package) {
	$phids[$package->getPHID()] = true;
	}

	// The user can audit on behalf of all projects they are a member of.
	$projects = id(new PhabricatorProjectQuery())
	->setViewer($user)
	->withMemberPHIDs(array($user->getPHID()))
	->execute();
	foreach ($projects as $project) {
	$phids[$project->getPHID()] = true;
	}

	return array_keys($phids);
	}

	private function publishFeedStory(
	PhabricatorAuditComment $comment,
	array $more_phids) {

	$commit = $this->commit;
	$actor = $this->getActor();

	$related_phids = array_merge(
	array(
	$actor->getPHID(),
	$commit->getPHID(),
	),
	$more_phids);

	id(new PhabricatorFeedStoryPublisher())
	->setRelatedPHIDs($related_phids)
	->setStoryAuthorPHID($actor->getPHID())
	->setStoryTime(time())
	->setStoryType(PhabricatorFeedStoryTypeConstants::STORY_AUDIT)
	->setStoryData(
	array(
	'commitPHID' => $commit->getPHID(),
	'action' => $comment->getAction(),
	'content' => $comment->getContent(),
	))
	->publish();
	}

	private function sendMail(
	PhabricatorAuditComment $comment,
	array $other_comments,
	array $inline_comments,
	array $requests) {

	assert_instances_of($other_comments, 'PhabricatorAuditComment');
	assert_instances_of($inline_comments, 'PhabricatorInlineCommentInterface');

	$commit = $this->commit;

	$data = $commit->loadCommitData();
	$summary = $data->getSummary();

	$commit_phid = $commit->getPHID();
	$phids = array($commit_phid);
	$handles = id(new PhabricatorHandleQuery())
	->setViewer($this->getActor())
	->withPHIDs($phids)
	->execute();
	$handle = $handles[$commit_phid];

	$name = $handle->getName();

	$map = array(
	PhabricatorAuditActionConstants::CONCERN => 'Raised Concern',
	PhabricatorAuditActionConstants::ACCEPT => 'Accepted',
	PhabricatorAuditActionConstants::RESIGN => 'Resigned',
	PhabricatorAuditActionConstants::CLOSE => 'Closed',
	PhabricatorAuditActionConstants::ADD_CCS => 'Added CCs',
	PhabricatorAuditActionConstants::ADD_AUDITORS => 'Added Auditors',
	);
	$verb = idx($map, $comment->getAction(), 'Commented On');

	$reply_handler = self::newReplyHandlerForCommit($commit);

	$prefix = PhabricatorEnv::getEnvConfig('metamta.diffusion.subject-prefix');

	$repository = id(new PhabricatorRepositoryQuery())
	->setViewer($this->getActor())
	->withIDs(array($commit->getRepositoryID()))
	->executeOne();
	$threading = self::getMailThreading($repository, $commit);
	list($thread_id, $thread_topic) = $threading;

	$body = $this->renderMailBody(
	$comment,
	"{$name}: {$summary}",
	$handle,
	$reply_handler,
	$inline_comments);

	$email_to = array();
	$email_cc = array();

	$email_to[$comment->getActorPHID()] = true;

	$author_phid = $data->getCommitDetail('authorPHID');
	if ($author_phid) {
	$email_to[$author_phid] = true;
	}

	foreach ($other_comments as $other_comment) {
	$email_cc[$other_comment->getActorPHID()] = true;
	}

	foreach ($requests as $request) {
	switch ($request->getAuditStatus()) {
	case PhabricatorAuditStatusConstants::CC:
	case PhabricatorAuditStatusConstants::AUDIT_REQUIRED:
	$email_cc[$request->getAuditorPHID()] = true;
	break;
	case PhabricatorAuditStatusConstants::RESIGNED:
	unset($email_cc[$request->getAuditorPHID()]);
	break;
	case PhabricatorAuditStatusConstants::CONCERNED:
	case PhabricatorAuditStatusConstants::AUDIT_REQUESTED:
	$email_to[$request->getAuditorPHID()] = true;
	break;
	}
	}

	$email_to = array_keys($email_to);
	$email_cc = array_keys($email_cc);

	$phids = array_merge($email_to, $email_cc);
	$handles = id(new PhabricatorHandleQuery())
	->setViewer($this->getActor())
	->withPHIDs($phids)
	->execute();

	// NOTE: Always set $is_new to false, because the "first" mail in the
	// thread is the Herald notification of the commit.
	$is_new = false;

	$template = id(new PhabricatorMetaMTAMail())
	->setSubject("{$name}: {$summary}")
	->setSubjectPrefix($prefix)
	->setVarySubjectPrefix("[{$verb}]")
	->setFrom($comment->getActorPHID())
	->setThreadID($thread_id, $is_new)
	->addHeader('Thread-Topic', $thread_topic)
	->setRelatedPHID($commit->getPHID())
	->setExcludeMailRecipientPHIDs($this->getExcludeMailRecipientPHIDs())
	->setIsBulk(true)
	->setBody($body);

	$mails = $reply_handler->multiplexMail(
	$template,
	array_select_keys($handles, $email_to),
	array_select_keys($handles, $email_cc));

	foreach ($mails as $mail) {
	$mail->saveAndSend();
	}
	}

	public static function getMailThreading(
	PhabricatorRepository $repository,
	PhabricatorRepositoryCommit $commit) {

	return array(
	'diffusion-audit-'.$commit->getPHID(),
	'Commit r'.$repository->getCallsign().$commit->getCommitIdentifier(),
	);
	}

	public static function newReplyHandlerForCommit($commit) {
	$reply_handler = PhabricatorEnv::newObjectFromConfig(
	'metamta.diffusion.reply-handler');
	$reply_handler->setMailReceiver($commit);
	return $reply_handler;
	}

	private function renderMailBody(
	PhabricatorAuditComment $comment,
	$cname,
	PhabricatorObjectHandle $handle,
	PhabricatorMailReplyHandler $reply_handler,
	array $inline_comments) {
	assert_instances_of($inline_comments, 'PhabricatorInlineCommentInterface');

	$commit = $this->commit;
	$actor = $this->getActor();
	$name = $actor->getUsername();

	$verb = PhabricatorAuditActionConstants::getActionPastTenseVerb(
	$comment->getAction());

	$body = new PhabricatorMetaMTAMailBody();
	$body->addRawSection("{$name} {$verb} commit {$cname}.");
	$body->addRawSection($comment->getContent());

	if ($inline_comments) {
	$block = array();

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

	foreach ($inline_comments 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}";
	}

	$body->addTextSection(pht('INLINE COMMENTS'), implode("\n", $block));
	}

	$body->addTextSection(
	pht('COMMIT'),
	PhabricatorEnv::getProductionURI($handle->getURI()));
	$body->addReplySection($reply_handler->getReplyHandlerInstructions());

	return $body->render();
	}

	}
	diff --git a/src/applications/auth/provider/PhabricatorAuthProviderOAuth.php b/src/applications/auth/provider/PhabricatorAuthProviderOAuth.php
	index 786057c970..0547da8200 100644
	--- a/src/applications/auth/provider/PhabricatorAuthProviderOAuth.php
	+++ b/src/applications/auth/provider/PhabricatorAuthProviderOAuth.php
	@@ -1,168 +1,168 @@
	<?php

	abstract class PhabricatorAuthProviderOAuth extends PhabricatorAuthProvider {

	const PROPERTY_NOTE = 'oauth:app:note';

	protected $adapter;

	abstract protected function newOAuthAdapter();
	abstract protected function getIDKey();
	abstract protected function getSecretKey();

	public function getDescriptionForCreate() {
	return pht('Configure %s OAuth.', $this->getProviderName());
	}

	public function getAdapter() {
	if (!$this->adapter) {
	$adapter = $this->newOAuthAdapter();
	$this->adapter = $adapter;
	$this->configureAdapter($adapter);
	}
	return $this->adapter;
	}

	public function isLoginFormAButton() {
	return true;
	}

	public function readFormValuesFromProvider() {
	$config = $this->getProviderConfig();
	$id = $config->getProperty($this->getIDKey());
	$secret = $config->getProperty($this->getSecretKey());
	$note = $config->getProperty(self::PROPERTY_NOTE);

	return array(
	$this->getIDKey() => $id,
	$this->getSecretKey() => $secret,
	self::PROPERTY_NOTE => $note,
	);
	}

	public function readFormValuesFromRequest(AphrontRequest $request) {
	return array(
	$this->getIDKey() => $request->getStr($this->getIDKey()),
	$this->getSecretKey() => $request->getStr($this->getSecretKey()),
	self::PROPERTY_NOTE => $request->getStr(self::PROPERTY_NOTE),
	);
	}

	protected function processOAuthEditForm(
	AphrontRequest $request,
	array $values,
	$id_error,
	$secret_error) {

	$errors = array();
	$issues = array();
	$key_id = $this->getIDKey();
	$key_secret = $this->getSecretKey();

	if (!strlen($values[$key_id])) {
	$errors[] = $id_error;
	$issues[$key_id] = pht('Required');
	}

	if (!strlen($values[$key_secret])) {
	$errors[] = $secret_error;
	$issues[$key_secret] = pht('Required');
	}

	// If the user has not changed the secret, don't update it (that is,
	// don't cause a bunch of "****" to be written to the database).
	if (preg_match('/^[*]+$/', $values[$key_secret])) {
	unset($values[$key_secret]);
	}

	return array($errors, $issues, $values);
	}

	public function getConfigurationHelp() {
	$help = $this->getProviderConfigurationHelp();

	- return $help . "\n\n" .
	+ return $help."\n\n".
	pht('Use the OAuth App Notes field to record details about which '.
	'account the external application is registered under.');
	}

	abstract protected function getProviderConfigurationHelp();

	protected function extendOAuthEditForm(
	AphrontRequest $request,
	AphrontFormView $form,
	array $values,
	array $issues,
	$id_label,
	$secret_label) {

	$key_id = $this->getIDKey();
	$key_secret = $this->getSecretKey();
	$key_note = self::PROPERTY_NOTE;

	$v_id = $values[$key_id];
	$v_secret = $values[$key_secret];
	if ($v_secret) {
	$v_secret = str_repeat('*', strlen($v_secret));
	}
	$v_note = $values[$key_note];

	$e_id = idx($issues, $key_id, $request->isFormPost() ? null : true);
	$e_secret = idx($issues, $key_secret, $request->isFormPost() ? null : true);

	$form
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel($id_label)
	->setName($key_id)
	->setValue($v_id)
	->setError($e_id))
	->appendChild(
	id(new AphrontFormPasswordControl())
	->setLabel($secret_label)
	->setName($key_secret)
	->setValue($v_secret)
	->setError($e_secret))
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel(pht('OAuth App Notes'))
	->setHeight(AphrontFormTextAreaControl::HEIGHT_VERY_SHORT)
	->setName($key_note)
	->setValue($v_note));
	}

	public function renderConfigPropertyTransactionTitle(
	PhabricatorAuthProviderConfigTransaction $xaction) {

	$author_phid = $xaction->getAuthorPHID();
	$old = $xaction->getOldValue();
	$new = $xaction->getNewValue();
	$key = $xaction->getMetadataValue(
	PhabricatorAuthProviderConfigTransaction::PROPERTY_KEY);

	switch ($key) {
	case self::PROPERTY_NOTE:
	if (strlen($old)) {
	return pht(
	'%s updated the OAuth application notes for this provider.',
	$xaction->renderHandleLink($author_phid));
	} else {
	return pht(
	'%s set the OAuth application notes for this provider.',
	$xaction->renderHandleLink($author_phid));
	}

	}

	return parent::renderConfigPropertyTransactionTitle($xaction);
	}

	protected function willSaveAccount(PhabricatorExternalAccount $account) {
	parent::willSaveAccount($account);
	$this->synchronizeOAuthAccount($account);
	}

	abstract protected function synchronizeOAuthAccount(
	PhabricatorExternalAccount $account);

	}
	diff --git a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
	index b5e78baf27..e0727e1ea2 100644
	--- a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
	+++ b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php
	@@ -1,330 +1,330 @@
	<?php

	final class PhabricatorChatLogChannelLogController
	extends PhabricatorChatLogController {

	private $channelID;

	public function shouldAllowPublic() {
	return true;
	}

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

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

	$uri = clone $request->getRequestURI();
	$uri->setQueryParams(array());

	$pager = new AphrontCursorPagerView();
	$pager->setURI($uri);
	$pager->setPageSize(250);

	$query = id(new PhabricatorChatLogQuery())
	->setViewer($user)
	->withChannelIDs(array($this->channelID));

	$channel = id(new PhabricatorChatLogChannelQuery())
	->setViewer($user)
	->withIDs(array($this->channelID))
	->executeOne();

	if (!$channel) {
	return new Aphront404Response();
	}

	list($after, $before, $map) = $this->getPagingParameters($request, $query);

	$pager->setAfterID($after);
	$pager->setBeforeID($before);

	$logs = $query->executeWithCursorPager($pager);

	// Show chat logs oldest-first.
	$logs = array_reverse($logs);


	// Divide all the logs into blocks, where a block is the same author saying
	// several things in a row. A block ends when another user speaks, or when
	// two minutes pass without the author speaking.

	$blocks = array();
	$block = null;

	$last_author = null;
	$last_epoch = null;
	foreach ($logs as $log) {
	$this_author = $log->getAuthor();
	$this_epoch = $log->getEpoch();

	// Decide whether we should start a new block or not.
	$new_block = ($this_author !== $last_author) \|\|
	($this_epoch - (60 * 2) > $last_epoch);

	if ($new_block) {
	if ($block) {
	$blocks[] = $block;
	}
	$block = array(
	'id' => $log->getID(),
	'epoch' => $this_epoch,
	'author' => $this_author,
	'logs' => array($log),
	);
	} else {
	$block['logs'][] = $log;
	}

	$last_author = $this_author;
	$last_epoch = $this_epoch;
	}
	if ($block) {
	$blocks[] = $block;
	}

	// Figure out CSS classes for the blocks. We alternate colors between
	// lines, and highlight the entire block which contains the target ID or
	// date, if applicable.

	foreach ($blocks as $key => $block) {
	$classes = array();
	if ($key % 2) {
	$classes[] = 'alternate';
	}
	$ids = mpull($block['logs'], 'getID', 'getID');
	if (array_intersect_key($ids, $map)) {
	$classes[] = 'highlight';
	}
	$blocks[$key]['class'] = $classes ? implode(' ', $classes) : null;
	}


	require_celerity_resource('phabricator-chatlog-css');

	$out = array();
	foreach ($blocks as $block) {
	$author = $block['author'];
	$author = phutil_utf8_shorten($author, 18);
	$author = phutil_tag('td', array('class' => 'author'), $author);

	$href = $uri->alter('at', $block['id']);
	$timestamp = $block['epoch'];
	$timestamp = phabricator_datetime($timestamp, $user);
	$timestamp = phutil_tag(
	'a',
	array(
	'href' => $href,
	'class' => 'timestamp'
	),
	$timestamp);

	$message = mpull($block['logs'], 'getMessage');
	$message = implode("\n", $message);
	$message = phutil_tag(
	'td',
	array(
	'class' => 'message'
	),
	array(
	$timestamp,
	$message));

	$out[] = phutil_tag(
	'tr',
	array(
	'class' => $block['class'],
	),
	array(
	$author,
	$message));
	}

	$links = array();

	$first_uri = $pager->getFirstPageURI();
	if ($first_uri) {
	$links[] = phutil_tag(
	'a',
	array(
	'href' => $first_uri,
	),
	- "\xC2\xAB ". pht('Newest'));
	+ "\xC2\xAB ".pht('Newest'));
	}

	$prev_uri = $pager->getPrevPageURI();
	if ($prev_uri) {
	$links[] = phutil_tag(
	'a',
	array(
	'href' => $prev_uri,
	),
	- "\xE2\x80\xB9 " . pht('Newer'));
	+ "\xE2\x80\xB9 ".pht('Newer'));
	}

	$next_uri = $pager->getNextPageURI();
	if ($next_uri) {
	$links[] = phutil_tag(
	'a',
	array(
	'href' => $next_uri,
	),
	- pht('Older') . " \xE2\x80\xBA");
	+ pht('Older')." \xE2\x80\xBA");
	}

	$pager_top = phutil_tag(
	'div',
	array('class' => 'phabricator-chat-log-pager-top'),
	$links);

	$pager_bottom = phutil_tag(
	'div',
	array('class' => 'phabricator-chat-log-pager-bottom'),
	$links);

	$crumbs = $this
	->buildApplicationCrumbs()
	->addTextCrumb($channel->getChannelName(), $uri);

	$form = id(new AphrontFormView())
	->setUser($user)
	->setMethod('GET')
	->setAction($uri)
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Date'))
	->setName('date')
	->setValue($request->getStr('date')))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Jump')));

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

	$table = phutil_tag(
	'table',
	array(
	'class' => 'phabricator-chat-log'
	),
	$out);

	$log = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-chat-log-panel'
	),
	$table);

	$jump_link = phutil_tag(
	'a',
	array(
	'href' => '#latest'
	),
	- pht('Jump to Bottom') . " \xE2\x96\xBE");
	+ pht('Jump to Bottom')." \xE2\x96\xBE");

	$jump = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-chat-log-jump'
	),
	$jump_link);

	$jump_target = phutil_tag(
	'div',
	array(
	'id' => 'latest'
	));

	$content = phutil_tag(
	'div',
	array(
	'class' => 'phabricator-chat-log-wrap'
	),
	array(
	$jump,
	$pager_top,
	$log,
	$jump_target,
	$pager_bottom,
	));

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$filter,
	$content,
	),
	array(
	'title' => pht('Channel Log'),
	'device' => true,
	));
	}

	/**
	* From request parameters, figure out where we should jump to in the log.
	* We jump to either a date or log ID, but load a few lines of context before
	* it so the user can see the nearby conversation.
	*/
	private function getPagingParameters(
	AphrontRequest $request,
	PhabricatorChatLogQuery $query) {

	$user = $request->getUser();

	$at_id = $request->getInt('at');
	$at_date = $request->getStr('date');

	$context_log = null;
	$map = array();

	$query = clone $query;
	$query->setLimit(8);

	if ($at_id) {
	// Jump to the log in question, and load a few lines of context before
	// it.
	$context_logs = $query
	->setAfterID($at_id)
	->execute();

	$context_log = last($context_logs);

	$map = array(
	$at_id => true,
	);

	} else if ($at_date) {
	$timestamp = PhabricatorTime::parseLocalTime($at_date, $user);

	if ($timestamp) {
	$context_logs = $query
	->withMaximumEpoch($timestamp)
	->execute();

	$context_log = last($context_logs);

	$target_log = head($context_logs);
	if ($target_log) {
	$map = array(
	$target_log->getID() => true,
	);
	}
	}
	}

	if ($context_log) {
	$after = null;
	$before = $context_log->getID() - 1;
	} else {
	$after = $request->getInt('after');
	$before = $request->getInt('before');
	}

	return array($after, $before, $map);
	}

	}
	diff --git a/src/applications/conduit/call/ConduitCall.php b/src/applications/conduit/call/ConduitCall.php
	index 99f266ff1e..85d7ecc5bb 100644
	--- a/src/applications/conduit/call/ConduitCall.php
	+++ b/src/applications/conduit/call/ConduitCall.php
	@@ -1,213 +1,213 @@
	<?php

	/**
	* Run a conduit method in-process, without requiring HTTP requests. Usage:
	*
	* $call = new ConduitCall('method.name', array('param' => 'value'));
	* $call->setUser($user);
	* $result = $call->execute();
	*
	*/
	final class ConduitCall {

	private $method;
	private $request;
	private $user;
	private $servers;
	private $forceLocal;

	public function __construct($method, array $params) {
	$this->method = $method;
	$this->handler = $this->buildMethodHandler($method);
	$this->servers = PhabricatorEnv::getEnvConfig('conduit.servers');
	$this->forceLocal = false;

	$invalid_params = array_diff_key(
	$params,
	$this->handler->defineParamTypes());
	if ($invalid_params) {
	throw new ConduitException(
	- "Method '{$method}' doesn't define these parameters: '" .
	- implode("', '", array_keys($invalid_params)) . "'.");
	+ "Method '{$method}' doesn't define these parameters: '".
	+ implode("', '", array_keys($invalid_params))."'.");
	}

	if ($this->servers) {
	$current_host = AphrontRequest::getHTTPHeader('HOST');
	foreach ($this->servers as $server) {
	if ($current_host === id(new PhutilURI($server))->getDomain()) {
	$this->forceLocal = true;
	break;
	}
	}
	}

	$this->request = new ConduitAPIRequest($params);
	}

	public function setUser(PhabricatorUser $user) {
	$this->user = $user;
	return $this;
	}

	public function getUser() {
	return $this->user;
	}

	public function setForceLocal($force_local) {
	$this->forceLocal = $force_local;
	return $this;
	}

	public function shouldForceLocal() {
	return $this->forceLocal;
	}

	public function shouldRequireAuthentication() {
	return $this->handler->shouldRequireAuthentication();
	}

	public function shouldAllowUnguardedWrites() {
	return $this->handler->shouldAllowUnguardedWrites();
	}

	public function getRequiredScope() {
	return $this->handler->getRequiredScope();
	}

	public function getErrorDescription($code) {
	return $this->handler->getErrorDescription($code);
	}

	public function execute() {
	$profiler = PhutilServiceProfiler::getInstance();
	$call_id = $profiler->beginServiceCall(
	array(
	'type' => 'conduit',
	'method' => $this->method,
	));

	try {
	$result = $this->executeMethod();
	} catch (Exception $ex) {
	$profiler->endServiceCall($call_id, array());
	throw $ex;
	}

	$profiler->endServiceCall($call_id, array());
	return $result;
	}

	private function executeMethod() {
	$user = $this->getUser();
	if (!$user) {
	$user = new PhabricatorUser();
	}

	$this->request->setUser($user);

	if (!$this->shouldRequireAuthentication()) {
	// No auth requirement here.
	} else {

	$allow_public = $this->handler->shouldAllowPublic() &&
	PhabricatorEnv::getEnvConfig('policy.allow-public');
	if (!$allow_public) {
	if (!$user->isLoggedIn() && !$user->isOmnipotent()) {
	// TODO: As per below, this should get centralized and cleaned up.
	throw new ConduitException('ERR-INVALID-AUTH');
	}
	}

	// TODO: This would be slightly cleaner by just using a Query, but the
	// Conduit auth workflow requires the Call and User be built separately.
	// Just do it this way for the moment.
	$application = $this->handler->getApplication();
	if ($application) {
	$can_view = PhabricatorPolicyFilter::hasCapability(
	$user,
	$application,
	PhabricatorPolicyCapability::CAN_VIEW);

	if (!$can_view) {
	throw new ConduitException(
	pht(
	'You do not have access to the application which provides this '.
	'API method.'));
	}
	}
	}

	if (!$this->shouldForceLocal() && $this->servers) {
	$server = $this->pickRandomServer($this->servers);
	$client = new ConduitClient($server);
	$params = $this->request->getAllParameters();

	$params['__conduit__']['isProxied'] = true;

	if ($this->handler->shouldRequireAuthentication()) {
	$client->callMethodSynchronous(
	'conduit.connect',
	array(
	'client' => 'PhabricatorConduit',
	'clientVersion' => '1.0',
	'user' => $this->getUser()->getUserName(),
	'certificate' => $this->getUser()->getConduitCertificate(),
	'__conduit__' => $params['__conduit__'],
	));
	}

	return $client->callMethodSynchronous(
	$this->method,
	$params);
	} else {
	return $this->handler->executeMethod($this->request);
	}
	}

	protected function pickRandomServer($servers) {
	return $servers[array_rand($servers)];
	}

	protected function buildMethodHandler($method) {
	$method_class = ConduitAPIMethod::getClassNameFromAPIMethodName($method);

	// Test if the method exists.
	$ok = false;
	try {
	$ok = class_exists($method_class);
	} catch (Exception $ex) {
	// Discard, we provide a more specific exception below.
	}
	if (!$ok) {
	throw new ConduitException(
	"Conduit method '{$method}' does not exist.");
	}

	$class_info = new ReflectionClass($method_class);
	if ($class_info->isAbstract()) {
	throw new ConduitException(
	"Method '{$method}' is not valid; the implementation is an abstract ".
	"base class.");
	}

	$method = newv($method_class, array());

	if (!($method instanceof ConduitAPIMethod)) {
	throw new ConduitException(
	"Method '{$method_class}' is not valid; the implementation must be ".
	"a subclass of ConduitAPIMethod.");
	}

	$application = $method->getApplication();
	if ($application && !$application->isInstalled()) {
	$app_name = $application->getName();
	throw new ConduitException(
	"Method '{$method_class}' belongs to application '{$app_name}', ".
	"which is not installed.");
	}

	return $method;
	}


	}
	diff --git a/src/applications/config/controller/PhabricatorConfigIgnoreController.php b/src/applications/config/controller/PhabricatorConfigIgnoreController.php
	index 9bc23d3458..2a6fe1886c 100644
	--- a/src/applications/config/controller/PhabricatorConfigIgnoreController.php
	+++ b/src/applications/config/controller/PhabricatorConfigIgnoreController.php
	@@ -1,65 +1,65 @@
	<?php

	final class PhabricatorConfigIgnoreController
	extends PhabricatorApplicationsController {

	private $verb;
	private $issue;

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

	public function processRequest() {
	$request = $this->getRequest();
	$issue_uri = $this->getApplicationURI('issue');

	if ($request->isDialogFormPost()) {
	$this->manageApplication();
	return id(new AphrontRedirectResponse())->setURI($issue_uri);
	}

	if ($this->verb == 'ignore') {
	$title = pht('Really ignore this setup issue?');
	$submit_title = pht('Ignore');
	$body = pht(
	"You can ignore an issue if you don't want to fix it, or plan to ".
	"fix it later. Ignored issues won't appear on every page but will ".
	"still be shown in the list of open issues.");
	} else if ($this->verb == 'unignore') {
	$title = pht('Unignore this setup issue?');
	$submit_title = pht('Unignore');
	$body = pht(
	'This issue will no longer be suppressed, and will return to its '.
	'rightful place as a global setup warning.');
	} else {
	- throw new Exception('Unrecognized verb: ' . $this->verb);
	+ throw new Exception('Unrecognized verb: '.$this->verb);
	}

	$dialog = id(new AphrontDialogView())
	->setUser($request->getUser())
	->setTitle($title)
	->appendChild($body)
	->addSubmitButton($submit_title)
	->addCancelButton($issue_uri);

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

	public function manageApplication() {
	$key = 'config.ignore-issues';
	$config_entry = PhabricatorConfigEntry::loadConfigEntry($key);
	$list = $config_entry->getValue();

	if (isset($list[$this->issue])) {
	unset($list[$this->issue]);
	} else {
	$list[$this->issue] = true;
	}

	PhabricatorConfigEditor::storeNewValue(
	$config_entry, $list, $this->getRequest());
	}

	}
	diff --git a/src/applications/conpherence/controller/ConpherenceWidgetController.php b/src/applications/conpherence/controller/ConpherenceWidgetController.php
	index 809b04a64a..d72b348c9d 100644
	--- a/src/applications/conpherence/controller/ConpherenceWidgetController.php
	+++ b/src/applications/conpherence/controller/ConpherenceWidgetController.php
	@@ -1,385 +1,385 @@
	<?php

	/**
	* @group conpherence
	*/
	final class ConpherenceWidgetController extends
	ConpherenceController {

	private $conpherenceID;
	private $conpherence;
	private $userPreferences;

	public function setUserPreferences(PhabricatorUserPreferences $pref) {
	$this->userPreferences = $pref;
	return $this;
	}
	public function getUserPreferences() {
	return $this->userPreferences;
	}

	public function setConpherence(ConpherenceThread $conpherence) {
	$this->conpherence = $conpherence;
	return $this;
	}
	public function getConpherence() {
	return $this->conpherence;
	}

	public function setConpherenceID($conpherence_id) {
	$this->conpherenceID = $conpherence_id;
	return $this;
	}
	public function getConpherenceID() {
	return $this->conpherenceID;
	}

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

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

	$conpherence_id = $this->getConpherenceID();
	if (!$conpherence_id) {
	return new Aphront404Response();
	}
	$conpherence = id(new ConpherenceThreadQuery())
	->setViewer($user)
	->withIDs(array($conpherence_id))
	->needWidgetData(true)
	->executeOne();
	$this->setConpherence($conpherence);

	$this->setUserPreferences($user->loadPreferences());

	$widgets = $this->renderWidgetPaneContent();
	$content = $widgets;
	return id(new AphrontAjaxResponse())->setContent($content);
	}

	private function renderWidgetPaneContent() {
	require_celerity_resource('sprite-conpherence-css');
	$conpherence = $this->getConpherence();

	$widgets = array();
	$new_icon = id(new PHUIIconView())
	->setIconFont('fa-plus')
	->setHref($this->getWidgetURI())
	->setMetadata(array('widget' => null))
	->addSigil('conpherence-widget-adder');
	$widgets[] = phutil_tag(
	'div',
	array(
	'class' => 'widgets-header',
	),
	id(new PhabricatorActionHeaderView())
	->setHeaderColor(PhabricatorActionHeaderView::HEADER_GREY)
	->setHeaderTitle(pht('Participants'))
	->setHeaderHref('#')
	->setDropdown(true)
	->addAction($new_icon)
	->addHeaderSigil('widgets-selector'));
	$user = $this->getRequest()->getUser();
	// now the widget bodies
	$widgets[] = javelin_tag(
	'div',
	array(
	'class' => 'widgets-body',
	'id' => 'widgets-people',
	'sigil' => 'widgets-people',
	),
	id(new ConpherencePeopleWidgetView())
	->setUser($user)
	->setConpherence($conpherence)
	->setUpdateURI($this->getWidgetURI()));
	$widgets[] = javelin_tag(
	'div',
	array(
	'class' => 'widgets-body',
	'id' => 'widgets-files',
	'sigil' => 'widgets-files',
	'style' => 'display: none;'
	),
	id(new ConpherenceFileWidgetView())
	->setUser($user)
	->setConpherence($conpherence)
	->setUpdateURI($this->getWidgetURI()));
	$widgets[] = phutil_tag(
	'div',
	array(
	'class' => 'widgets-body',
	'id' => 'widgets-calendar',
	'style' => 'display: none;'
	),
	$this->renderCalendarWidgetPaneContent());
	$widgets[] = phutil_tag(
	'div',
	array(
	'class' => 'widgets-body',
	'id' => 'widgets-settings',
	'style' => 'display: none'
	),
	$this->renderSettingsWidgetPaneContent());

	// without this implosion we get "," between each element in our widgets
	// array
	return array('widgets' => phutil_implode_html('', $widgets));
	}

	private function renderSettingsWidgetPaneContent() {
	$user = $this->getRequest()->getUser();
	$conpherence = $this->getConpherence();
	$participants = $conpherence->getParticipants();
	$participant = $participants[$user->getPHID()];
	$default = ConpherenceSettings::EMAIL_ALWAYS;
	$preference = $this->getUserPreferences();
	if ($preference) {
	$default = $preference->getPreference(
	PhabricatorUserPreferences::PREFERENCE_CONPH_NOTIFICATIONS,
	ConpherenceSettings::EMAIL_ALWAYS);
	}
	$settings = $participant->getSettings();
	$notifications = idx(
	$settings,
	'notifications',
	$default);
	$options = id(new AphrontFormRadioButtonControl())
	->addButton(
	ConpherenceSettings::EMAIL_ALWAYS,
	ConpherenceSettings::getHumanString(
	ConpherenceSettings::EMAIL_ALWAYS),
	'')
	->addButton(
	ConpherenceSettings::NOTIFICATIONS_ONLY,
	ConpherenceSettings::getHumanString(
	ConpherenceSettings::NOTIFICATIONS_ONLY),
	'')
	->setName('notifications')
	->setValue($notifications);

	$layout = array(
	$options,
	phutil_tag(
	'input',
	array(
	'type' => 'hidden',
	'name' => 'action',
	'value' => 'notifications'
	)),
	phutil_tag(
	'button',
	array(
	'type' => 'submit',
	'class' => 'notifications-update',
	),
	pht('Save'))
	);

	return phabricator_form(
	$user,
	array(
	'method' => 'POST',
	'action' => $this->getWidgetURI(),
	'sigil' => 'notifications-update',
	),
	$layout);
	}

	private function renderCalendarWidgetPaneContent() {
	$user = $this->getRequest()->getUser();

	$conpherence = $this->getConpherence();
	$participants = $conpherence->getParticipants();
	$widget_data = $conpherence->getWidgetData();
	$statuses = $widget_data['statuses'];
	$handles = $conpherence->getHandles();
	$content = array();
	$layout = id(new AphrontMultiColumnView())
	->setFluidLayout(true);
	$timestamps = CalendarTimeUtil::getCalendarWidgetTimestamps($user);
	$today = $timestamps['today'];
	$epoch_stamps = $timestamps['epoch_stamps'];
	$one_day = 24 * 60 * 60;
	$is_today = false;
	$calendar_columns = 0;
	$list_days = 0;
	foreach ($epoch_stamps as $day) {
	// build a header for the new day
	if ($day->format('Ymd') == $today->format('Ymd')) {
	$active_class = 'today';
	$is_today = true;
	} else {
	$active_class = '';
	$is_today = false;
	}

	$should_draw_list = $list_days < 7;
	$list_days++;

	if ($should_draw_list) {
	$content[] = phutil_tag(
	'div',
	array(
	'class' => 'day-header '.$active_class
	),
	array(
	phutil_tag(
	'div',
	array(
	'class' => 'day-name'
	),
	$day->format('l')),
	phutil_tag(
	'div',
	array(
	'class' => 'day-date'
	),
	$day->format('m/d/y'))));
	}

	$week_day_number = $day->format('w');

	$epoch_start = $day->format('U');
	$next_day = clone $day;
	$next_day->modify('+1 day');
	$epoch_end = $next_day->format('U');

	$first_status_of_the_day = true;
	$statuses_of_the_day = array();
	// keep looking through statuses where we last left off
	foreach ($statuses as $status) {
	if ($status->getDateFrom() >= $epoch_end) {
	// This list is sorted, so we can stop looking.
	break;
	}

	if ($status->getDateFrom() < $epoch_end &&
	$status->getDateTo() > $epoch_start) {
	$statuses_of_the_day[$status->getUserPHID()] = $status;
	if ($should_draw_list) {
	$top_border = '';
	if (!$first_status_of_the_day) {
	$top_border = ' top-border';
	}
	$timespan = $status->getDateTo() - $status->getDateFrom();
	if ($timespan > $one_day) {
	$time_str = 'm/d';
	} else {
	$time_str = 'h:i A';
	}
	$epoch_range =
	phabricator_format_local_time(
	$status->getDateFrom(),
	$user,
	- $time_str) .
	- ' - ' .
	+ $time_str).
	+ ' - '.
	phabricator_format_local_time(
	$status->getDateTo(),
	$user,
	$time_str);

	$secondary_info = pht('%s, %s',
	$handles[$status->getUserPHID()]->getName(), $epoch_range);

	$content[] = phutil_tag(
	'div',
	array(
	'class' => 'user-status '.$status->getTextStatus().$top_border,
	),
	array(
	phutil_tag(
	'div',
	array(
	'class' => 'icon',
	),
	''),
	phutil_tag(
	'div',
	array(
	'class' => 'description'
	),
	array(
	$status->getTerseSummary($user),
	phutil_tag(
	'div',
	array(
	'class' => 'participant'
	),
	$secondary_info)))));
	}
	$first_status_of_the_day = false;
	}
	}

	// we didn't get a status on this day so add a spacer
	if ($first_status_of_the_day && $should_draw_list) {
	$content[] = phutil_tag(
	'div',
	array('class' => 'no-events pm'),
	pht('No Events Scheduled.'));
	}
	if ($is_today \|\| ($calendar_columns && $calendar_columns < 3)) {
	$active_class = '';
	if ($is_today) {
	$active_class = '-active';
	}
	$inner_layout = array();
	foreach ($participants as $phid => $participant) {
	$status = idx($statuses_of_the_day, $phid, false);
	if ($status) {
	$inner_layout[] = phutil_tag(
	'div',
	array(
	'class' => $status->getTextStatus()
	),
	'');
	} else {
	$inner_layout[] = phutil_tag(
	'div',
	array(
	'class' => 'present'
	),
	'');
	}
	}
	$layout->addColumn(
	phutil_tag(
	'div',
	array(
	'class' => 'day-column'.$active_class
	),
	array(
	phutil_tag(
	'div',
	array(
	'class' => 'day-name'
	),
	$day->format('D')),
	phutil_tag(
	'div',
	array(
	'class' => 'day-number',
	),
	$day->format('j')),
	$inner_layout
	)));
	$calendar_columns++;
	}
	}

	return
	array(
	$layout,
	$content
	);
	}

	private function getWidgetURI() {
	$conpherence = $this->getConpherence();
	return $this->getApplicationURI('update/'.$conpherence->getID().'/');
	}

	}
	diff --git a/src/applications/conpherence/view/ConpherenceLayoutView.php b/src/applications/conpherence/view/ConpherenceLayoutView.php
	index 3bd75347d8..5036304f73 100644
	--- a/src/applications/conpherence/view/ConpherenceLayoutView.php
	+++ b/src/applications/conpherence/view/ConpherenceLayoutView.php
	@@ -1,239 +1,239 @@
	<?php

	final class ConpherenceLayoutView extends AphrontView {

	private $thread;
	private $baseURI;
	private $threadView;
	private $role;
	private $header;
	private $messages;
	private $replyForm;

	public function setMessages($messages) {
	$this->messages = $messages;
	return $this;
	}

	public function setReplyForm($reply_form) {
	$this->replyForm = $reply_form;
	return $this;
	}

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

	public function setRole($role) {
	$this->role = $role;
	return $this;
	}

	public function getThreadView() {
	return $this->threadView;
	}

	public function setBaseURI($base_uri) {
	$this->baseURI = $base_uri;
	return $this;
	}

	public function setThread(ConpherenceThread $thread) {
	$this->thread = $thread;
	return $this;
	}

	public function setThreadView(ConpherenceThreadListView $thead_view) {
	$this->threadView = $thead_view;
	return $this;
	}

	public function render() {
	require_celerity_resource('conpherence-menu-css');
	require_celerity_resource('conpherence-message-pane-css');
	require_celerity_resource('conpherence-widget-pane-css');

	$layout_id = celerity_generate_unique_node_id();

	$selected_id = null;
	$selected_thread_id = null;
	if ($this->thread) {
	- $selected_id = $this->thread->getPHID() . '-nav-item';
	+ $selected_id = $this->thread->getPHID().'-nav-item';
	$selected_thread_id = $this->thread->getID();
	}
	$this->initBehavior('conpherence-menu',
	array(
	'baseURI' => $this->baseURI,
	'layoutID' => $layout_id,
	'selectedID' => $selected_id,
	'selectedThreadID' => $selected_thread_id,
	'role' => $this->role,
	'hasThreadList' => (bool)$this->threadView,
	'hasThread' => (bool)$this->messages,
	'hasWidgets' => false,
	));

	$this->initBehavior(
	'conpherence-widget-pane',
	array(
	- 'widgetBaseUpdateURI' => $this->baseURI . 'update/',
	+ 'widgetBaseUpdateURI' => $this->baseURI.'update/',
	'widgetRegistry' => array(
	'conpherence-message-pane' => array(
	'name' => pht('Thread'),
	'icon' => 'fa-comment',
	'deviceOnly' => true,
	'hasCreate' => false
	),
	'widgets-people' => array(
	'name' => pht('Participants'),
	'icon' => 'fa-users',
	'deviceOnly' => false,
	'hasCreate' => true,
	'createData' => array(
	'refreshFromResponse' => true,
	'action' => ConpherenceUpdateActions::ADD_PERSON,
	'customHref' => null
	)
	),
	'widgets-files' => array(
	'name' => pht('Files'),
	'icon' => 'fa-files-o',
	'deviceOnly' => false,
	'hasCreate' => false
	),
	'widgets-calendar' => array(
	'name' => pht('Calendar'),
	'icon' => 'fa-calendar',
	'deviceOnly' => false,
	'hasCreate' => true,
	'createData' => array(
	'refreshFromResponse' => false,
	'action' => ConpherenceUpdateActions::ADD_STATUS,
	'customHref' => '/calendar/event/create/'
	)
	),
	'widgets-settings' => array(
	'name' => pht('Settings'),
	'icon' => 'fa-wrench',
	'deviceOnly' => false,
	'hasCreate' => false
	),
	)));


	return javelin_tag(
	'div',
	array(
	'id' => $layout_id,
	'sigil' => 'conpherence-layout',
	'class' => 'conpherence-layout conpherence-role-'.$this->role,
	),
	array(
	javelin_tag(
	'div',
	array(
	'class' => 'phabricator-nav-column-background',
	'sigil' => 'phabricator-nav-column-background',
	),
	''),
	javelin_tag(
	'div',
	array(
	'id' => 'conpherence-menu-pane',
	'class' => 'conpherence-menu-pane phabricator-side-menu',
	'sigil' => 'conpherence-menu-pane',
	),
	$this->threadView),
	javelin_tag(
	'div',
	array(
	'class' => 'conpherence-content-pane',
	),
	array(
	javelin_tag(
	'div',
	array(
	'class' => 'conpherence-header-pane',
	'id' => 'conpherence-header-pane',
	'sigil' => 'conpherence-header-pane',
	),
	nonempty($this->header, '')),
	javelin_tag(
	'div',
	array(
	'class' => 'conpherence-no-threads',
	'sigil' => 'conpherence-no-threads',
	'style' => 'display: none;',
	),
	array(
	phutil_tag(
	'div',
	array(
	'class' => 'text'
	),
	pht('You do not have any messages yet.')),
	javelin_tag(
	'a',
	array(
	'href' => '/conpherence/new/',
	'class' => 'button grey',
	'sigil' => 'workflow',
	),
	pht('Send a Message'))
	)),
	javelin_tag(
	'div',
	array(
	'class' => 'conpherence-widget-pane',
	'id' => 'conpherence-widget-pane',
	'sigil' => 'conpherence-widget-pane',
	),
	array(
	phutil_tag(
	'div',
	array(
	'class' => 'widgets-loading-mask'
	),
	''),
	javelin_tag(
	'div',
	array(
	'sigil' => 'conpherence-widgets-holder'
	),
	''))),
	javelin_tag(
	'div',
	array(
	'class' => 'conpherence-message-pane',
	'id' => 'conpherence-message-pane',
	'sigil' => 'conpherence-message-pane'
	),
	array(
	javelin_tag(
	'div',
	array(
	'class' => 'conpherence-messages',
	'id' => 'conpherence-messages',
	'sigil' => 'conpherence-messages',
	),
	nonempty($this->messages, '')),
	phutil_tag(
	'div',
	array(
	'class' => 'messages-loading-mask',
	),
	''),
	javelin_tag(
	'div',
	array(
	'id' => 'conpherence-form',
	'sigil' => 'conpherence-form'
	),
	nonempty($this->replyForm, ''))
	)),
	)),
	));
	}

	}
	diff --git a/src/applications/dashboard/controller/PhabricatorDashboardViewController.php b/src/applications/dashboard/controller/PhabricatorDashboardViewController.php
	index 0201a8e2ee..695428c88a 100644
	--- a/src/applications/dashboard/controller/PhabricatorDashboardViewController.php
	+++ b/src/applications/dashboard/controller/PhabricatorDashboardViewController.php
	@@ -1,77 +1,77 @@
	<?php

	final class PhabricatorDashboardViewController
	extends PhabricatorDashboardController {

	private $id;

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

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

	$dashboard = id(new PhabricatorDashboardQuery())
	->setViewer($viewer)
	->withIDs(array($this->id))
	->needPanels(true)
	->executeOne();
	if (!$dashboard) {
	return new Aphront404Response();
	}

	$title = $dashboard->getName();
	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Dashboard %d', $dashboard->getID()));

	if ($dashboard->getPanelPHIDs()) {
	$rendered_dashboard = id(new PhabricatorDashboardRenderingEngine())
	->setViewer($viewer)
	->setDashboard($dashboard)
	->renderDashboard();
	} else {
	$rendered_dashboard = $this->buildEmptyView();
	}

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

	public function buildApplicationCrumbs() {
	$crumbs = parent::buildApplicationCrumbs();
	$id = $this->id;

	$crumbs->addAction(
	id(new PHUIListItemView())
	->setIcon('fa-th')
	->setName(pht('Manage Dashboard'))
	->setHref($this->getApplicationURI("manage/{$id}/")));

	return $crumbs;
	}

	public function buildEmptyView() {
	$id = $this->id;
	$manage_uri = $this->getApplicationURI("manage/{$id}/");

	return id(new AphrontErrorView())
	->setSeverity(AphrontErrorView::SEVERITY_NODATA)
	->appendChild(
	pht('This dashboard has no panels '.
	'yet. Use %s to add panels.',
	phutil_tag(
	'a',
	- array('href'=>$manage_uri),
	+ array('href' => $manage_uri),
	pht('Manage Dashboard'))));
	}

	}
	diff --git a/src/applications/differential/DifferentialGetWorkingCopy.php b/src/applications/differential/DifferentialGetWorkingCopy.php
	index 91245bf296..7708d84833 100644
	--- a/src/applications/differential/DifferentialGetWorkingCopy.php
	+++ b/src/applications/differential/DifferentialGetWorkingCopy.php
	@@ -1,73 +1,73 @@
	<?php

	/**
	* Can't find a good place for this, so I'm putting it in the most notably
	* wrong place.
	*/
	final class DifferentialGetWorkingCopy {

	/**
	* Creates and/or cleans a workspace for the requested repo.
	*
	* return ArcanistGitAPI
	*/
	public static function getCleanGitWorkspace(
	PhabricatorRepository $repo) {

	$origin_path = $repo->getLocalPath();

	$path = rtrim($origin_path, '/');
	- $path = $path . '__workspace';
	+ $path = $path.'__workspace';

	if (!Filesystem::pathExists($path)) {
	$repo->execxLocalCommand(
	'clone -- file://%s %s',
	$origin_path,
	$path);

	if (!$repo->isHosted()) {
	id(new ArcanistGitAPI($path))->execxLocal(
	'remote set-url origin %s',
	$repo->getRemoteURI());
	}
	}

	$workspace = new ArcanistGitAPI($path);
	$workspace->execxLocal('clean -f -d');
	$workspace->execxLocal('checkout master');
	$workspace->execxLocal('fetch');
	$workspace->execxLocal('reset --hard origin/master');
	$workspace->reloadWorkingCopy();

	return $workspace;
	}

	/**
	* Creates and/or cleans a workspace for the requested repo.
	*
	* return ArcanistMercurialAPI
	*/
	public static function getCleanMercurialWorkspace(
	PhabricatorRepository $repo) {

	$origin_path = $repo->getLocalPath();

	$path = rtrim($origin_path, '/');
	- $path = $path . '__workspace';
	+ $path = $path.'__workspace';

	if (!Filesystem::pathExists($path)) {
	$repo->execxLocalCommand(
	'clone -- file://%s %s',
	$origin_path,
	$path);
	}

	$workspace = new ArcanistMercurialAPI($path);
	$workspace->execxLocal('pull');
	$workspace->execxLocal('update --clean default');
	$workspace->reloadWorkingCopy();

	return $workspace;
	}

	}
	diff --git a/src/applications/differential/editor/DifferentialTransactionEditor.php b/src/applications/differential/editor/DifferentialTransactionEditor.php
	index 87e73ab085..eb61f82276 100644
	--- a/src/applications/differential/editor/DifferentialTransactionEditor.php
	+++ b/src/applications/differential/editor/DifferentialTransactionEditor.php
	@@ -1,1707 +1,1707 @@
	<?php

	final class DifferentialTransactionEditor
	extends PhabricatorApplicationTransactionEditor {

	private $heraldEmailPHIDs;
	private $changedPriorToCommitURI;
	private $isCloseByCommit;

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

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

	return null;
	}

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

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

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

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

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

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

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

	return $types;
	}

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

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

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

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

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

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

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

	switch ($xaction->getTransactionType()) {
	case DifferentialTransaction::TYPE_INLINE:
	return $xaction->hasComment();
	case DifferentialTransaction::TYPE_ACTION:
	$status_closed = ArcanistDifferentialRevisionStatus::CLOSED;
	$status_abandoned = ArcanistDifferentialRevisionStatus::ABANDONED;
	$status_review = ArcanistDifferentialRevisionStatus::NEEDS_REVIEW;
	$status_revision = ArcanistDifferentialRevisionStatus::NEEDS_REVISION;
	$status_plan = ArcanistDifferentialRevisionStatus::CHANGES_PLANNED;

	$action_type = $xaction->getNewValue();
	switch ($action_type) {
	case DifferentialAction::ACTION_ACCEPT:
	case DifferentialAction::ACTION_REJECT:
	if ($action_type == DifferentialAction::ACTION_ACCEPT) {
	$new_status = DifferentialReviewerStatus::STATUS_ACCEPTED;
	} else {
	$new_status = DifferentialReviewerStatus::STATUS_REJECTED;
	}

	$actor = $this->getActor();
	$actor_phid = $actor->getPHID();

	// These transactions can cause effects in two ways: by altering the
	// status of an existing reviewer; or by adding the actor as a new
	// reviewer.

	$will_add_reviewer = true;
	foreach ($object->getReviewerStatus() as $reviewer) {
	if ($reviewer->hasAuthority($actor)) {
	if ($reviewer->getStatus() != $new_status) {
	return true;
	}
	}
	if ($reviewer->getReviewerPHID() == $actor_phid) {
	$will_add_reviwer = false;
	}
	}

	return $will_add_reviewer;
	case DifferentialAction::ACTION_CLOSE:
	return ($object->getStatus() != $status_closed);
	case DifferentialAction::ACTION_ABANDON:
	return ($object->getStatus() != $status_abandoned);
	case DifferentialAction::ACTION_RECLAIM:
	return ($object->getStatus() == $status_abandoned);
	case DifferentialAction::ACTION_REOPEN:
	return ($object->getStatus() == $status_closed);
	case DifferentialAction::ACTION_RETHINK:
	return ($object->getStatus() != $status_plan);
	case DifferentialAction::ACTION_REQUEST:
	return ($object->getStatus() != $status_review);
	case DifferentialAction::ACTION_RESIGN:
	$actor_phid = $this->getActor()->getPHID();
	foreach ($object->getReviewerStatus() as $reviewer) {
	if ($reviewer->getReviewerPHID() == $actor_phid) {
	return true;
	}
	}
	return false;
	case DifferentialAction::ACTION_CLAIM:
	$actor_phid = $this->getActor()->getPHID();
	return ($actor_phid != $object->getAuthorPHID());
	}
	}

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


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

	$status_review = ArcanistDifferentialRevisionStatus::NEEDS_REVIEW;
	$status_revision = ArcanistDifferentialRevisionStatus::NEEDS_REVISION;
	$status_plan = ArcanistDifferentialRevisionStatus::CHANGES_PLANNED;

	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	$object->setViewPolicy($xaction->getNewValue());
	return;
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	$object->setEditPolicy($xaction->getNewValue());
	return;
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	case PhabricatorTransactions::TYPE_COMMENT:
	case DifferentialTransaction::TYPE_INLINE:
	return;
	case PhabricatorTransactions::TYPE_EDGE:
	return;
	case DifferentialTransaction::TYPE_UPDATE:
	if (!$this->getIsCloseByCommit() &&
	(($object->getStatus() == $status_revision) \|\|
	($object->getStatus() == $status_plan))) {
	$object->setStatus($status_review);
	}

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

	$object->setLineCount($diff->getLineCount());
	$object->setRepositoryPHID($diff->getRepositoryPHID());
	$object->setArcanistProjectPHID($diff->getArcanistProjectPHID());
	$object->attachActiveDiff($diff);

	// TODO: Update the `diffPHID` once we add that.
	return;
	case DifferentialTransaction::TYPE_ACTION:
	switch ($xaction->getNewValue()) {
	case DifferentialAction::ACTION_RESIGN:
	case DifferentialAction::ACTION_ACCEPT:
	case DifferentialAction::ACTION_REJECT:
	// These have no direct effects, and affect review status only
	// indirectly by altering reviewers with TYPE_EDGE transactions.
	return;
	case DifferentialAction::ACTION_ABANDON:
	$object->setStatus(ArcanistDifferentialRevisionStatus::ABANDONED);
	return;
	case DifferentialAction::ACTION_RETHINK:
	$object->setStatus($status_plan);
	return;
	case DifferentialAction::ACTION_RECLAIM:
	$object->setStatus($status_review);
	return;
	case DifferentialAction::ACTION_REOPEN:
	$object->setStatus($status_review);
	return;
	case DifferentialAction::ACTION_REQUEST:
	$object->setStatus($status_review);
	return;
	case DifferentialAction::ACTION_CLOSE:
	$object->setStatus(ArcanistDifferentialRevisionStatus::CLOSED);
	return;
	case DifferentialAction::ACTION_CLAIM:
	$object->setAuthorPHID($this->getActor()->getPHID());
	return;
	}
	break;
	}

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

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

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

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

	$status_plan = ArcanistDifferentialRevisionStatus::CHANGES_PLANNED;

	$edge_reviewer = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER;
	$edge_ref_task = PhabricatorEdgeConfig::TYPE_DREV_HAS_RELATED_TASK;

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

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

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

	if ($downgrade_rejects \|\| $downgrade_accepts) {
	// When a revision is updated, change all "reject" to "rejected older
	// revision". This means we won't immediately push the update back into
	// "needs review", but outstanding rejects will still block it from
	// moving to "accepted".

	// We also do this for "Request Review", even though the diff is not
	// updated directly. Essentially, this acts like an update which doesn't
	// actually change the diff text.

	$edits = array();
	foreach ($object->getReviewerStatus() as $reviewer) {
	if ($downgrade_rejects) {
	if ($reviewer->getStatus() == $new_reject) {
	$edits[$reviewer->getReviewerPHID()] = array(
	'data' => array(
	'status' => $old_reject,
	),
	);
	}
	}

	if ($downgrade_accepts) {
	if ($reviewer->getStatus() == $new_accept) {
	$edits[$reviewer->getReviewerPHID()] = array(
	'data' => array(
	'status' => $old_accept,
	),
	);
	}
	}
	}

	if ($edits) {
	$results[] = id(new DifferentialTransaction())
	->setTransactionType($type_edge)
	->setMetadataValue('edge:type', $edge_reviewer)
	->setIgnoreOnNoEffect(true)
	->setNewValue(array('+' => $edits));
	}
	}

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

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

	$maniphest = 'PhabricatorApplicationManiphest';
	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 PhabricatorTransactions::TYPE_COMMENT:
	// When a user leaves a comment, upgrade their reviewer status from
	// "added" to "commented" if they're also a reviewer. We may further
	// upgrade this based on other actions in the transaction group.

	$status_added = DifferentialReviewerStatus::STATUS_ADDED;
	$status_commented = DifferentialReviewerStatus::STATUS_COMMENTED;

	$data = array(
	'status' => $status_commented,
	);

	$edits = array();
	foreach ($object->getReviewerStatus() as $reviewer) {
	if ($reviewer->getReviewerPHID() == $actor_phid) {
	if ($reviewer->getStatus() == $status_added) {
	$edits[$actor_phid] = array(
	'data' => $data,
	);
	}
	}
	}

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

	case DifferentialTransaction::TYPE_ACTION:
	$action_type = $xaction->getNewValue();

	switch ($action_type) {
	case DifferentialAction::ACTION_ACCEPT:
	case DifferentialAction::ACTION_REJECT:
	if ($action_type == DifferentialAction::ACTION_ACCEPT) {
	$data = array(
	'status' => DifferentialReviewerStatus::STATUS_ACCEPTED,
	);
	} else {
	$data = array(
	'status' => DifferentialReviewerStatus::STATUS_REJECTED,
	);
	}

	$edits = array();

	foreach ($object->getReviewerStatus() as $reviewer) {
	if ($reviewer->hasAuthority($actor)) {
	$edits[$reviewer->getReviewerPHID()] = array(
	'data' => $data,
	);
	}
	}

	// Also either update or add the actor themselves as a reviewer.
	$edits[$actor_phid] = array(
	'data' => $data,
	);

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

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

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

	$owner_phid = $object->getAuthorPHID();
	if ($owner_phid) {
	$reviewer = new DifferentialReviewer(
	$owner_phid,
	array(
	'status' => DifferentialReviewerStatus::STATUS_ADDED,
	));

	$edits['+'] = array(
	$owner_phid => array(
	'data' => $reviewer->getEdgeData(),
	),
	);
	}

	// 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.

	$results[] = id(new DifferentialTransaction())
	->setTransactionType($type_edge)
	->setMetadataValue('edge:type', $edge_reviewer)
	->setIgnoreOnNoEffect(true)
	->setIsCommandeerSideEffect(true)
	->setNewValue($edits);

	break;
	case DifferentialAction::ACTION_RESIGN:
	// If the user is resigning, add a separate reviewer edit
	// transaction which removes them as a reviewer.

	$results[] = id(new DifferentialTransaction())
	->setTransactionType($type_edge)
	->setMetadataValue('edge:type', $edge_reviewer)
	->setIgnoreOnNoEffect(true)
	->setNewValue(
	array(
	'-' => array(
	$actor_phid => $actor_phid,
	),
	));

	break;
	}
	break;
	}

	return $results;
	}

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

	switch ($xaction->getTransactionType()) {
	case PhabricatorTransactions::TYPE_VIEW_POLICY:
	case PhabricatorTransactions::TYPE_EDIT_POLICY:
	return;
	case PhabricatorTransactions::TYPE_SUBSCRIBERS:
	case PhabricatorTransactions::TYPE_EDGE:
	case PhabricatorTransactions::TYPE_COMMENT:
	case DifferentialTransaction::TYPE_ACTION:
	case DifferentialTransaction::TYPE_INLINE:
	return;
	case DifferentialTransaction::TYPE_UPDATE:
	// Now that we're inside the transaction, do a final check.
	$diff = $this->requireDiff($xaction->getNewValue());

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

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

	$diff->setRevisionID($object->getID());
	$diff->save();
	return;
	}

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

	protected function mergeEdgeData($type, array $u, array $v) {
	$result = parent::mergeEdgeData($type, $u, $v);

	switch ($type) {
	case PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER:
	// When the same reviewer has their status updated by multiple
	// transactions, we want the strongest status to win. An example of
	// this is when a user adds a comment and also accepts a revision which
	// they are a reviewer on. The comment creates a "commented" status,
	// while the accept creates an "accepted" status. Since accept is
	// stronger, it should win and persist.

	$u_status = idx($u, 'status');
	$v_status = idx($v, 'status');
	$u_str = DifferentialReviewerStatus::getStatusStrength($u_status);
	$v_str = DifferentialReviewerStatus::getStatusStrength($v_status);
	if ($u_str > $v_str) {
	$result['status'] = $u_status;
	} else {
	$result['status'] = $v_status;
	}
	break;
	}

	return $result;
	}



	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())
	->needReviewerStatus(true)
	->needActiveDiffs(true)
	->withIDs(array($object->getID()))
	->executeOne();
	if (!$new_revision) {
	throw new Exception(
	pht('Failed to load revision from transaction finalization.'));
	}

	$object->attachReviewerStatus($new_revision->getReviewerStatus());
	$object->attachActiveDiff($new_revision->getActiveDiff());
	$object->attachRepository($new_revision->getRepository());

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

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

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

	$status_accepted = ArcanistDifferentialRevisionStatus::ACCEPTED;
	$status_revision = ArcanistDifferentialRevisionStatus::NEEDS_REVISION;
	$status_review = ArcanistDifferentialRevisionStatus::NEEDS_REVIEW;

	$old_status = $object->getStatus();
	switch ($old_status) {
	case $status_accepted:
	case $status_revision:
	case $status_review:
	// 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;
	foreach ($object->getReviewerStatus() as $reviewer) {
	$reviewer_status = $reviewer->getStatus();
	switch ($reviewer_status) {
	case DifferentialReviewerStatus::STATUS_REJECTED:
	$has_rejecting_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()) {
	$has_accepting_user = true;
	}
	break;
	}
	}

	$new_status = null;
	if ($has_accepting_user &&
	!$has_rejecting_reviewer &&
	!$has_rejecting_older_reviewer &&
	!$has_blocking_reviewer) {
	$new_status = $status_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 = $status_revision;
	} else if ($old_status == $status_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 = $status_review;
	}

	if ($new_status !== null && ($new_status != $old_status)) {
	$xaction = id(new DifferentialTransaction())
	->setTransactionType(DifferentialTransaction::TYPE_STATUS)
	->setOldValue($old_status)
	->setNewValue($new_status);

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

	$xactions[] = $xaction;

	$object->setStatus($new_status)->save();
	}
	break;
	default:
	// Revisions can't transition out of other statuses (like closed or
	// abandoned) as a side effect of reviewer status changes.
	break;
	}

	return $xactions;
	}


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

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

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

	foreach ($xactions as $xaction) {
	switch ($type) {
	case PhabricatorTransactions::TYPE_EDGE:
	switch ($xaction->getMetadataValue('edge:type')) {
	case PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER:

	// Prevent the author from becoming a reviewer.

	// NOTE: This is pretty gross, but this restriction is unusual.
	// If we end up with too much more of this, we should try to clean
	// this up -- maybe by moving validation to after transactions
	// are adjusted (so we can just examine the final value) or adding
	// a second phase there?

	$author_phid = $object->getAuthorPHID();
	$new = $xaction->getNewValue();

	$add = idx($new, '+', array());
	$eq = idx($new, '=', array());
	$phids = array_keys($add + $eq);

	foreach ($phids as $phid) {
	if (($phid == $author_phid) &&
	!$allow_self_accept &&
	!$xaction->getIsCommandeerSideEffect()) {
	$errors[] =
	new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Invalid'),
	pht('The author of a revision can not be a reviewer.'),
	$xaction);
	}
	}
	break;
	}
	break;
	case DifferentialTransaction::TYPE_UPDATE:
	$diff = $this->loadDiff($xaction->getNewValue());
	if (!$diff) {
	$errors[] = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Invalid'),
	pht('The specified diff does not exist.'),
	$xaction);
	} else if (($diff->getRevisionID()) &&
	($diff->getRevisionID() != $object->getID())) {
	$errors[] = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Invalid'),
	pht(
	'You can not update this revision to the specified diff, '.
	'because the diff is already attached to another revision.'),
	$xaction);
	}
	break;
	case DifferentialTransaction::TYPE_ACTION:
	$error = $this->validateDifferentialAction(
	$object,
	$type,
	$xaction,
	$xaction->getNewValue());
	if ($error) {
	$errors[] = new PhabricatorApplicationTransactionValidationError(
	$type,
	pht('Invalid'),
	$error,
	$xaction);
	}
	break;
	}
	}

	return $errors;
	}

	private function validateDifferentialAction(
	DifferentialRevision $revision,
	$type,
	DifferentialTransaction $xaction,
	$action) {

	$author_phid = $revision->getAuthorPHID();
	$actor_phid = $this->getActor()->getPHID();
	$actor_is_author = ($author_phid == $actor_phid);

	$config_abandon_key = 'differential.always-allow-abandon';
	$always_allow_abandon = PhabricatorEnv::getEnvConfig($config_abandon_key);

	$config_close_key = 'differential.always-allow-close';
	$always_allow_close = PhabricatorEnv::getEnvConfig($config_close_key);

	$config_reopen_key = 'differential.allow-reopen';
	$allow_reopen = PhabricatorEnv::getEnvConfig($config_reopen_key);

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

	$revision_status = $revision->getStatus();

	$status_accepted = ArcanistDifferentialRevisionStatus::ACCEPTED;
	$status_abandoned = ArcanistDifferentialRevisionStatus::ABANDONED;
	$status_closed = ArcanistDifferentialRevisionStatus::CLOSED;

	switch ($action) {
	case DifferentialAction::ACTION_ACCEPT:
	if ($actor_is_author && !$allow_self_accept) {
	return pht(
	'You can not accept this revision because you are the owner.');
	}

	if ($revision_status == $status_abandoned) {
	return pht(
	'You can not accept this revision because it has been '.
	'abandoned.');
	}

	if ($revision_status == $status_closed) {
	return pht(
	'You can not accept this revision because it has already been '.
	'closed.');
	}
	break;

	case DifferentialAction::ACTION_REJECT:
	if ($actor_is_author) {
	return pht(
	'You can not request changes to your own revision.');
	}

	if ($revision_status == $status_abandoned) {
	return pht(
	'You can not request changes to this revision because it has been '.
	'abandoned.');
	}

	if ($revision_status == $status_closed) {
	return pht(
	'You can not request changes to this revision because it has '.
	'already been closed.');
	}
	break;

	case DifferentialAction::ACTION_RESIGN:
	// You can always resign from a revision if you're a reviewer. If you
	// aren't, this is a no-op rather than invalid.
	break;

	case DifferentialAction::ACTION_CLAIM:
	// You can claim a revision if you're not the owner. If you are, this
	// is a no-op rather than invalid.

	if ($revision_status == $status_closed) {
	return pht(
	'You can not commandeer this revision because it has already been '.
	'closed.');
	}
	break;

	case DifferentialAction::ACTION_ABANDON:
	if (!$actor_is_author && !$always_allow_abandon) {
	return pht(
	'You can not abandon this revision because you do not own it. '.
	'You can only abandon revisions you own.');
	}

	if ($revision_status == $status_closed) {
	return pht(
	'You can not abandon this revision because it has already been '.
	'closed.');
	}

	// NOTE: Abandons of already-abandoned revisions are treated as no-op
	// instead of invalid. Other abandons are OK.

	break;

	case DifferentialAction::ACTION_RECLAIM:
	if (!$actor_is_author) {
	return pht(
	'You can not reclaim this revision because you do not own '.
	'it. You can only reclaim revisions you own.');
	}

	if ($revision_status == $status_closed) {
	return pht(
	'You can not reclaim this revision because it has already been '.
	'closed.');
	}

	// NOTE: Reclaims of other non-abandoned revisions are treated as no-op
	// instead of invalid.

	break;

	case DifferentialAction::ACTION_REOPEN:
	if (!$allow_reopen) {
	return pht(
	'The reopen action is not enabled on this Phabricator install. '.
	'Adjust your configuration to enable it.');
	}

	// NOTE: If the revision is not closed, this is caught as a no-op
	// instead of an invalid transaction.

	break;

	case DifferentialAction::ACTION_RETHINK:
	if (!$actor_is_author) {
	return pht(
	'You can not plan changes to this revision because you do not '.
	'own it. To plan changes to a revision, you must be its owner.');
	}

	switch ($revision_status) {
	case ArcanistDifferentialRevisionStatus::ACCEPTED:
	case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
	case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
	// These are OK.
	break;
	case ArcanistDifferentialRevisionStatus::CHANGES_PLANNED:
	// Let this through, it's a no-op.
	break;
	case ArcanistDifferentialRevisionStatus::ABANDONED:
	return pht(
	'You can not plan changes to this revision because it has '.
	'been abandoned.');
	case ArcanistDifferentialRevisionStatus::CLOSED:
	return pht(
	'You can not plan changes to this revision because it has '.
	'already been closed.');
	default:
	throw new Exception(
	pht(
	'Encountered unexpected revision status ("%s") when '.
	'validating "%s" action.',
	$revision_status,
	$action));
	}
	break;

	case DifferentialAction::ACTION_REQUEST:
	if (!$actor_is_author) {
	return pht(
	'You can not request review of this revision because you do '.
	'not own it. To request review of a revision, you must be its '.
	'owner.');
	}

	switch ($revision_status) {
	case ArcanistDifferentialRevisionStatus::ACCEPTED:
	case ArcanistDifferentialRevisionStatus::NEEDS_REVISION:
	case ArcanistDifferentialRevisionStatus::CHANGES_PLANNED:
	// These are OK.
	break;
	case ArcanistDifferentialRevisionStatus::NEEDS_REVIEW:
	// This will be caught as "no effect" later on.
	break;
	case ArcanistDifferentialRevisionStatus::ABANDONED:
	return pht(
	'You can not request review of this revision because it has '.
	'been abandoned. Instead, reclaim it.');
	case ArcanistDifferentialRevisionStatus::CLOSED:
	return pht(
	'You can not request review of this revision because it has '.
	'already been closed.');
	default:
	throw new Exception(
	pht(
	'Encountered unexpected revision status ("%s") when '.
	'validating "%s" action.',
	$revision_status,
	$action));
	}
	break;

	case DifferentialAction::ACTION_CLOSE:
	// We force revisions closed when we discover a corresponding commit.
	// In this case, revisions are allowed to transition to closed from
	// any state. This is an automated action taken by the daemons.

	if (!$this->getIsCloseByCommit()) {
	if (!$actor_is_author && !$always_allow_close) {
	return pht(
	'You can not close this revision because you do not own it. To '.
	'close a revision, you must be its owner.');
	}

	if ($revision_status != $status_accepted) {
	return pht(
	'You can not close this revision because it has not been '.
	'accepted. You can only close accepted revisions.');
	}
	}
	break;
	}

	return null;
	}

	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 requireCapabilities(
	PhabricatorLiskDAO $object,
	PhabricatorApplicationTransaction $xaction) {

	switch ($xaction->getTransactionType()) {
	}

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

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

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

	protected function getMailTo(PhabricatorLiskDAO $object) {
	$phids = array();
	$phids[] = $object->getAuthorPHID();
	foreach ($object->getReviewerStatus() as $reviewer) {
	$phids[] = $reviewer->getReviewerPHID();
	}
	return $phids;
	}

	protected function getMailCC(PhabricatorLiskDAO $object) {
	$phids = parent::getMailCC($object);

	if ($this->heraldEmailPHIDs) {
	foreach ($this->heraldEmailPHIDs as $phid) {
	$phids[] = $phid;
	}
	}

	return $phids;
	}

	protected function getMailAction(
	PhabricatorLiskDAO $object,
	array $xactions) {
	$action = parent::getMailAction($object, $xactions);

	$strongest = $this->getStrongestAction($object, $xactions);
	switch ($strongest->getTransactionType()) {
	case DifferentialTransaction::TYPE_UPDATE:
	$count = new PhutilNumber($object->getLineCount());
	$action = pht('%s, %s line(s)', $action, $count);
	break;
	}

	return $action;
	}

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

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

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

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

	$original_title = $object->getOriginalTitle();

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

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

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

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

	$type_inline = DifferentialTransaction::TYPE_INLINE;

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

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

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

	$body->addTextSection(
	pht('REVISION DETAIL'),
	PhabricatorEnv::getProductionURI('/D'.$object->getID()));

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

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

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

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

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

	if ($config_inline \|\| $config_attach) {
	$patch = $this->renderPatchForMail($diff);
	$lines = count(phutil_split_lines($patch));

	if ($config_inline && ($lines <= $config_inline)) {
	$body->addTextSection(
	pht('CHANGE DETAILS'),
	$patch);
	}

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

	protected function supportsSearch() {
	return true;
	}

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

	switch ($xaction->getTransactionType()) {
	}

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

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


	$flat_blocks = array_mergev($blocks);
	$huge_block = implode("\n\n", $flat_blocks);

	$task_map = array();
	$task_refs = id(new ManiphestCustomFieldStatusParser())
	->parseCorpus($huge_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($huge_block);
	foreach ($rev_refs as $match) {
	foreach ($match['monograms'] as $monogram) {
	$rev_id = (int)trim($monogram, 'dD');
	$rev_map[$rev_id] = true;
	}
	}

	$edges = array();

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

	if ($tasks) {
	$edge_related = PhabricatorEdgeConfig::TYPE_DREV_HAS_RELATED_TASK;
	$edges[$edge_related] = mpull($tasks, 'getPHID', 'getPHID');
	}
	}

	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) {
	$edge_depends = PhabricatorEdgeConfig::TYPE_DREV_DEPENDS_ON_DREV;
	$edges[$edge_depends] = $rev_phids;
	}
	}

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

	return $result;
	}

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

	$context_key = 'metamta.differential.unified-comment-context';
	$show_context = PhabricatorEnv::getEnvConfig($context_key);

	$changeset_ids = array();
	foreach ($inlines as $inline) {
	$id = $inline->getComment()->getChangesetID();
	$changeset_ids[$id] = $id;
	}

	$changesets = id(new DifferentialChangesetQuery())
	->setViewer($this->getActor())
	->withIDs($changeset_ids)
	->needHunks(true)
	->execute();

	$inline_groups = DifferentialTransactionComment::sortAndGroupInlines(
	$inlines,
	$changesets);

	if ($show_context) {
	$hunk_parser = new DifferentialHunkParser();
	}

	$result = array();
	foreach ($inline_groups as $changeset_id => $group) {
	$changeset = idx($changesets, $changeset_id);
	if (!$changeset) {
	continue;
	}

	foreach ($group as $inline) {
	$comment = $inline->getComment();
	$file = $changeset->getFilename();
	$start = $comment->getLineNumber();
	$len = $comment->getLineLength();
	if ($len) {
	$range = $start.'-'.($start + $len);
	} else {
	$range = $start;
	}

	$inline_content = $comment->getContent();

	if (!$show_context) {
	$result[] = "{$file}:{$range} {$inline_content}";
	} else {
	$result[] = '================';
	- $result[] = 'Comment at: ' . $file . ':' . $range;
	+ $result[] = 'Comment at: '.$file.':'.$range;
	$result[] = $hunk_parser->makeContextDiff(
	$changeset->getHunks(),
	$comment->getIsNewFile(),
	$comment->getLineNumber(),
	$comment->getLineLength(),
	1);
	$result[] = '----------------';

	$result[] = $inline_content;
	$result[] = null;
	}
	}
	}

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

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

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

	return $query->executeOne();
	}

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

	return $diff;
	}

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

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

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

	foreach ($xactions as $xaction) {
	switch ($xaction->getTransactionType()) {
	case DifferentialTransaction::TYPE_UPDATE:
	if (!$this->getIsCloseByCommit()) {
	return true;
	}
	}
	}

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

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

	$unsubscribed_phids = PhabricatorEdgeQuery::loadDestinationPHIDs(
	$object->getPHID(),
	PhabricatorEdgeConfig::TYPE_OBJECT_HAS_UNSUBSCRIBER);

	$subscribed_phids = PhabricatorSubscribersQuery::loadSubscribersForPHID(
	$object->getPHID());

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

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

	$reviewers = $revision->getReviewerStatus();
	$reviewer_phids = mpull($reviewers, 'getReviewerPHID');

	$adapter->setExplicitCCs($subscribed_phids);
	$adapter->setExplicitReviewers($reviewer_phids);
	$adapter->setForbiddenCCs($unsubscribed_phids);

	$adapter->setIsNewObject($this->getIsNewObject());

	return $adapter;
	}

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

	$xactions = array();

	// Build a transaction to adjust CCs.
	$ccs = array(
	'+' => array_keys($adapter->getCCsAddedByHerald()),
	'-' => array_keys($adapter->getCCsRemovedByHerald()),
	);
	$value = array();
	foreach ($ccs as $type => $phids) {
	foreach ($phids as $phid) {
	$value[$type][$phid] = $phid;
	}
	}

	if ($value) {
	$xactions[] = id(new DifferentialTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_SUBSCRIBERS)
	->setNewValue($value);
	}

	// Build a transaction to adjust reviewers.
	$reviewers = array(
	DifferentialReviewerStatus::STATUS_ADDED =>
	array_keys($adapter->getReviewersAddedByHerald()),
	DifferentialReviewerStatus::STATUS_BLOCKING =>
	array_keys($adapter->getBlockingReviewersAddedByHerald()),
	);

	$old_reviewers = $object->getReviewerStatus();
	$old_reviewers = mpull($old_reviewers, null, 'getReviewerPHID');

	$value = array();
	foreach ($reviewers as $status => $phids) {
	foreach ($phids as $phid) {
	if ($phid == $object->getAuthorPHID()) {
	// Don't try to add the revision's author as a reviewer, since this
	// isn't valid and doesn't make sense.
	continue;
	}

	// If the target is already a reviewer, don't try to change anything
	// if their current status is at least as strong as the new status.
	// For example, don't downgrade an "Accepted" to a "Blocking Reviewer".
	$old_reviewer = idx($old_reviewers, $phid);
	if ($old_reviewer) {
	$old_status = $old_reviewer->getStatus();

	$old_strength = DifferentialReviewerStatus::getStatusStrength(
	$old_status);
	$new_strength = DifferentialReviewerStatus::getStatusStrength(
	$status);

	if ($new_strength <= $old_strength) {
	continue;
	}
	}

	$value['+'][$phid] = array(
	'data' => array(
	'status' => $status,
	),
	);
	}
	}

	if ($value) {
	$edge_reviewer = PhabricatorEdgeConfig::TYPE_DREV_HAS_REVIEWER;

	$xactions[] = id(new DifferentialTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_EDGE)
	->setMetadataValue('edge:type', $edge_reviewer)
	->setNewValue($value);
	}

	// Save extra email PHIDs for later.
	$email_phids = $adapter->getEmailPHIDsAddedByHerald();
	$this->heraldEmailPHIDs = array_keys($email_phids);

	// Apply build plans.
	HarbormasterBuildable::applyBuildPlans(
	$adapter->getDiff()->getPHID(),
	$adapter->getPHID(),
	$adapter->getBuildPlans());

	return $xactions;
	}

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

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

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

	}
	diff --git a/src/applications/differential/landing/DifferentialLandingToHostedGit.php b/src/applications/differential/landing/DifferentialLandingToHostedGit.php
	index 0b4642a776..2cf3350341 100644
	--- a/src/applications/differential/landing/DifferentialLandingToHostedGit.php
	+++ b/src/applications/differential/landing/DifferentialLandingToHostedGit.php
	@@ -1,135 +1,135 @@
	<?php

	final class DifferentialLandingToHostedGit
	extends DifferentialLandingStrategy {

	public function processLandRequest(
	AphrontRequest $request,
	DifferentialRevision $revision,
	PhabricatorRepository $repository) {

	$viewer = $request->getUser();

	$workspace = $this->getGitWorkspace($repository);

	try {
	$this->commitRevisionToWorkspace(
	$revision,
	$workspace,
	$viewer);
	} catch (Exception $e) {
	throw new PhutilProxyException(
	'Failed to commit patch',
	$e);
	}

	try {
	$this->pushWorkspaceRepository(
	$repository,
	$workspace,
	$viewer);
	} catch (Exception $e) {
	throw new PhutilProxyException(
	'Failed to push changes upstream',
	$e);
	}
	}

	public function commitRevisionToWorkspace(
	DifferentialRevision $revision,
	ArcanistRepositoryAPI $workspace,
	PhabricatorUser $user) {

	$diff_id = $revision->loadActiveDiff()->getID();

	$call = new ConduitCall(
	'differential.getrawdiff',
	array(
	'diffID' => $diff_id,
	));

	$call->setUser($user);
	$raw_diff = $call->execute();

	$missing_binary =
	"\nindex "
	- . "0000000000000000000000000000000000000000.."
	- . "0000000000000000000000000000000000000000\n";
	+ ."0000000000000000000000000000000000000000.."
	+ ."0000000000000000000000000000000000000000\n";
	if (strpos($raw_diff, $missing_binary) !== false) {
	throw new Exception('Patch is missing content for a binary file');
	}

	$future = $workspace->execFutureLocal('apply --index -');
	$future->write($raw_diff);
	$future->resolvex();

	$workspace->reloadWorkingCopy();

	$call = new ConduitCall(
	'differential.getcommitmessage',
	array(
	'revision_id' => $revision->getID(),
	));

	$call->setUser($user);
	$message = $call->execute();

	$author = id(new PhabricatorUser())->loadOneWhere(
	'phid = %s',
	$revision->getAuthorPHID());

	$author_string = sprintf(
	'%s <%s>',
	$author->getRealName(),
	$author->loadPrimaryEmailAddress());
	$author_date = $revision->getDateCreated();

	$workspace->execxLocal(
	- '-c user.name=%s -c user.email=%s ' .
	+ '-c user.name=%s -c user.email=%s '.
	'commit --date=%s --author=%s '.
	'--message=%s',
	// -c will set the 'committer'
	$user->getRealName(),
	$user->loadPrimaryEmailAddress(),
	$author_date,
	$author_string,
	$message);
	}


	public function pushWorkspaceRepository(
	PhabricatorRepository $repository,
	ArcanistRepositoryAPI $workspace,
	PhabricatorUser $user) {

	$workspace->execxLocal('push origin HEAD:master');
	}

	public function createMenuItem(
	PhabricatorUser $viewer,
	DifferentialRevision $revision,
	PhabricatorRepository $repository) {

	$vcs = $repository->getVersionControlSystem();
	if ($vcs !== PhabricatorRepositoryType::REPOSITORY_TYPE_GIT) {
	return;
	}

	if (!$repository->isHosted()) {
	return;
	}

	if (!$repository->isWorkingCopyBare()) {
	return;
	}

	// TODO: This temporarily disables this action, because it doesn't work
	// and is confusing to users. If you want to use it, comment out this line
	// for now and we'll provide real support eventually.
	return;

	return $this->createActionView(
	$revision,
	pht('Land to Hosted Repository'));
	}
	}
	diff --git a/src/applications/differential/mail/DifferentialReplyHandler.php b/src/applications/differential/mail/DifferentialReplyHandler.php
	index 1abb30bc97..39e5dd2506 100644
	--- a/src/applications/differential/mail/DifferentialReplyHandler.php
	+++ b/src/applications/differential/mail/DifferentialReplyHandler.php
	@@ -1,175 +1,175 @@
	<?php

	/**
	* NOTE: Do not extend this!
	*
	* @concrete-extensible
	*/
	class DifferentialReplyHandler extends PhabricatorMailReplyHandler {

	private $receivedMail;

	public function validateMailReceiver($mail_receiver) {
	if (!($mail_receiver instanceof DifferentialRevision)) {
	throw new Exception('Receiver is not a DifferentialRevision!');
	}
	}

	public function getPrivateReplyHandlerEmailAddress(
	PhabricatorObjectHandle $handle) {
	return $this->getDefaultPrivateReplyHandlerEmailAddress($handle, 'D');
	}

	public function getPublicReplyHandlerEmailAddress() {
	return $this->getDefaultPublicReplyHandlerEmailAddress('D');
	}

	public function getReplyHandlerDomain() {
	return PhabricatorEnv::getEnvConfig(
	'metamta.differential.reply-handler-domain');
	}

	/*
	* Generate text like the following from the supported commands.
	* "
	*
	* ACTIONS
	* Reply to comment, or !accept, !reject, !abandon, !resign, !reclaim.
	*
	* "
	*/
	public function getReplyHandlerInstructions() {
	if (!$this->supportsReplies()) {
	return null;
	}

	$supported_commands = $this->getSupportedCommands();
	$text = '';
	if (empty($supported_commands)) {
	return $text;
	}

	$comment_command_printed = false;
	if (in_array(DifferentialAction::ACTION_COMMENT, $supported_commands)) {
	$text .= pht('Reply to comment');
	$comment_command_printed = true;

	$supported_commands = array_diff(
	$supported_commands, array(DifferentialAction::ACTION_COMMENT));
	}

	if (!empty($supported_commands)) {
	if ($comment_command_printed) {
	$text .= ', or ';
	}

	$modified_commands = array();
	foreach ($supported_commands as $command) {
	$modified_commands[] = '!'.$command;
	}

	$text .= implode(', ', $modified_commands);
	}

	$text .= '.';

	return $text;
	}

	public function getSupportedCommands() {
	$actions = array(
	DifferentialAction::ACTION_COMMENT,
	DifferentialAction::ACTION_REJECT,
	DifferentialAction::ACTION_ABANDON,
	DifferentialAction::ACTION_RECLAIM,
	DifferentialAction::ACTION_RESIGN,
	DifferentialAction::ACTION_RETHINK,
	'unsubscribe',
	);

	if (PhabricatorEnv::getEnvConfig('differential.enable-email-accept')) {
	$actions[] = DifferentialAction::ACTION_ACCEPT;
	}

	return $actions;
	}

	protected function receiveEmail(PhabricatorMetaMTAReceivedMail $mail) {
	$this->receivedMail = $mail;
	$this->handleAction($mail->getCleanTextBody(), $mail->getAttachments());
	}

	public function handleAction($body, array $attachments) {
	// all commands start with a bang and separated from the body by a newline
	// to make sure that actual feedback text couldn't trigger an action.
	// unrecognized commands will be parsed as part of the comment.
	$command = DifferentialAction::ACTION_COMMENT;
	$supported_commands = $this->getSupportedCommands();
	- $regex = "/\A\n!(" . implode('\|', $supported_commands) . ")\n/";
	+ $regex = "/\A\n!(".implode('\|', $supported_commands).")\n/";
	$matches = array();
	if (preg_match($regex, $body, $matches)) {
	$command = $matches[1];
	- $body = trim(str_replace('!' . $command, '', $body));
	+ $body = trim(str_replace('!'.$command, '', $body));
	}

	$actor = $this->getActor();
	if (!$actor) {
	throw new Exception('No actor is set for the reply action.');
	}

	switch ($command) {
	case 'unsubscribe':
	id(new PhabricatorSubscriptionsEditor())
	->setObject($this->getMailReceiver())
	->unsubscribe(array($actor->getPHID()))
	->save();
	// TODO: Send the user a confirmation email?
	return null;
	}

	$body = $this->enhanceBodyWithAttachments($body, $attachments);

	$xactions = array();

	if ($command && ($command != DifferentialAction::ACTION_COMMENT)) {
	$xactions[] = id(new DifferentialTransaction())
	->setTransactionType(DifferentialTransaction::TYPE_ACTION)
	->setNewValue($command);
	}

	if (strlen($body)) {
	$xactions[] = id(new DifferentialTransaction())
	->setTransactionType(PhabricatorTransactions::TYPE_COMMENT)
	->attachComment(
	id(new DifferentialTransactionComment())
	->setContent($body));
	}

	$editor = id(new DifferentialTransactionEditor())
	->setActor($actor)
	->setExcludeMailRecipientPHIDs($this->getExcludeMailRecipientPHIDs())
	->setContinueOnMissingFields(true)
	->setContinueOnNoEffect(true);

	// NOTE: We have to be careful about this because Facebook's
	// implementation jumps straight into handleAction() and will not have
	// a PhabricatorMetaMTAReceivedMail object.
	if ($this->receivedMail) {
	$content_source = PhabricatorContentSource::newForSource(
	PhabricatorContentSource::SOURCE_EMAIL,
	array(
	'id' => $this->receivedMail->getID(),
	));
	$editor->setContentSource($content_source);
	$editor->setParentMessageID($this->receivedMail->getMessageID());
	} else {
	$content_source = PhabricatorContentSource::newForSource(
	PhabricatorContentSource::SOURCE_LEGACY,
	array());
	$editor->setContentSource($content_source);
	}

	$editor->applyTransactions($this->getMailReceiver(), $xactions);
	}

	}
	diff --git a/src/applications/differential/parser/DifferentialHunkParser.php b/src/applications/differential/parser/DifferentialHunkParser.php
	index f404d81f4a..79e8d7eb5a 100644
	--- a/src/applications/differential/parser/DifferentialHunkParser.php
	+++ b/src/applications/differential/parser/DifferentialHunkParser.php
	@@ -1,670 +1,670 @@
	<?php

	final class DifferentialHunkParser {

	private $oldLines;
	private $newLines;
	private $intraLineDiffs;
	private $visibleLinesMask;
	private $whitespaceMode;

	/**
	* Get a map of lines on which hunks start, other than line 1. This
	* datastructure is used to determine when to render "Context not available."
	* in diffs with multiple hunks.
	*
	* @return dict<int, bool> Map of lines where hunks start, other than line 1.
	*/
	public function getHunkStartLines(array $hunks) {
	assert_instances_of($hunks, 'DifferentialHunk');

	$map = array();
	foreach ($hunks as $hunk) {
	$line = $hunk->getOldOffset();
	if ($line > 1) {
	$map[$line] = true;
	}
	}

	return $map;
	}

	private function setVisibleLinesMask($mask) {
	$this->visibleLinesMask = $mask;
	return $this;
	}
	public function getVisibleLinesMask() {
	if ($this->visibleLinesMask === null) {
	throw new Exception(
	'You must generateVisibileLinesMask before accessing this data.'
	);
	}
	return $this->visibleLinesMask;
	}

	private function setIntraLineDiffs($intra_line_diffs) {
	$this->intraLineDiffs = $intra_line_diffs;
	return $this;
	}
	public function getIntraLineDiffs() {
	if ($this->intraLineDiffs === null) {
	throw new Exception(
	'You must generateIntraLineDiffs before accessing this data.'
	);
	}
	return $this->intraLineDiffs;
	}

	private function setNewLines($new_lines) {
	$this->newLines = $new_lines;
	return $this;
	}
	public function getNewLines() {
	if ($this->newLines === null) {
	throw new Exception(
	'You must parseHunksForLineData before accessing this data.'
	);
	}
	return $this->newLines;
	}

	private function setOldLines($old_lines) {
	$this->oldLines = $old_lines;
	return $this;
	}
	public function getOldLines() {
	if ($this->oldLines === null) {
	throw new Exception(
	'You must parseHunksForLineData before accessing this data.'
	);
	}
	return $this->oldLines;
	}

	public function getOldLineTypeMap() {
	$map = array();
	$old = $this->getOldLines();
	foreach ($old as $o) {
	if (!$o) {
	continue;
	}
	$map[$o['line']] = $o['type'];
	}
	return $map;
	}

	public function setOldLineTypeMap(array $map) {
	$lines = $this->getOldLines();
	foreach ($lines as $key => $data) {
	$lines[$key]['type'] = $map[$data['line']];
	}
	$this->oldLines = $lines;
	return $this;
	}

	public function getNewLineTypeMap() {
	$map = array();
	$new = $this->getNewLines();
	foreach ($new as $n) {
	if (!$n) {
	continue;
	}
	$map[$n['line']] = $n['type'];
	}
	return $map;
	}

	public function setNewLineTypeMap(array $map) {
	$lines = $this->getNewLines();
	foreach ($lines as $key => $data) {
	$lines[$key]['type'] = $map[$data['line']];
	}
	$this->newLines = $lines;
	return $this;
	}


	public function setWhitespaceMode($white_space_mode) {
	$this->whitespaceMode = $white_space_mode;
	return $this;
	}

	private function getWhitespaceMode() {
	if ($this->whitespaceMode === null) {
	throw new Exception(
	'You must setWhitespaceMode before accessing this data.'
	);
	}
	return $this->whitespaceMode;
	}

	public function getIsDeleted() {
	foreach ($this->getNewLines() as $line) {
	if ($line) {
	// At least one new line, so the entire file wasn't deleted.
	return false;
	}
	}

	foreach ($this->getOldLines() as $line) {
	if ($line) {
	// No new lines, at least one old line; the entire file was deleted.
	return true;
	}
	}

	// This is an empty file.
	return false;
	}

	/**
	* Returns true if the hunks change any text, not just whitespace.
	*/
	public function getHasTextChanges() {
	return $this->getHasChanges('text');
	}

	/**
	* Returns true if the hunks change anything, including whitespace.
	*/
	public function getHasAnyChanges() {
	return $this->getHasChanges('any');
	}

	private function getHasChanges($filter) {
	if ($filter !== 'any' && $filter !== 'text') {
	throw new Exception("Unknown change filter '{$filter}'.");
	}

	$old = $this->getOldLines();
	$new = $this->getNewLines();

	$is_any = ($filter === 'any');

	foreach ($old as $key => $o) {
	$n = $new[$key];
	if ($o === null \|\| $n === null) {
	// One side is missing, and it's impossible for both sides to be null,
	// so the other side must have something, and thus the two sides are
	// different and the file has been changed under any type of filter.
	return true;
	}

	if ($o['type'] !== $n['type']) {
	// The types are different, so either the underlying text is actually
	// different or whatever whitespace rules we're using consider them
	// different.
	return true;
	}

	if ($o['text'] !== $n['text']) {
	if ($is_any) {
	// The text is different, so there's a change.
	return true;
	} else if (trim($o['text']) !== trim($n['text'])) {
	return true;
	}
	}
	}

	// No changes anywhere in the file.
	return false;
	}


	/**
	* This function takes advantage of the parsing work done in
	* @{method:parseHunksForLineData} and continues the struggle to hammer this
	* data into something we can display to a user.
	*
	* In particular, this function re-parses the hunks to make them equivalent
	* in length for easy rendering, adding `null` as necessary to pad the
	* length.
	*
	* Anyhoo, this function is not particularly well-named but I try.
	*
	* NOTE: this function must be called after
	* @{method:parseHunksForLineData}.
	*/
	public function reparseHunksForSpecialAttributes() {
	$rebuild_old = array();
	$rebuild_new = array();

	$old_lines = array_reverse($this->getOldLines());
	$new_lines = array_reverse($this->getNewLines());

	while (count($old_lines) \|\| count($new_lines)) {
	$old_line_data = array_pop($old_lines);
	$new_line_data = array_pop($new_lines);

	if ($old_line_data) {
	$o_type = $old_line_data['type'];
	} else {
	$o_type = null;
	}

	if ($new_line_data) {
	$n_type = $new_line_data['type'];
	} else {
	$n_type = null;
	}

	// This line does not exist in the new file.
	if (($o_type != null) && ($n_type == null)) {
	$rebuild_old[] = $old_line_data;
	$rebuild_new[] = null;
	if ($new_line_data) {
	array_push($new_lines, $new_line_data);
	}
	continue;
	}

	// This line does not exist in the old file.
	if (($n_type != null) && ($o_type == null)) {
	$rebuild_old[] = null;
	$rebuild_new[] = $new_line_data;
	if ($old_line_data) {
	array_push($old_lines, $old_line_data);
	}
	continue;
	}

	$rebuild_old[] = $old_line_data;
	$rebuild_new[] = $new_line_data;
	}

	$this->setOldLines($rebuild_old);
	$this->setNewLines($rebuild_new);

	$this->updateChangeTypesForWhitespaceMode();

	return $this;
	}

	private function updateChangeTypesForWhitespaceMode() {
	$mode = $this->getWhitespaceMode();

	$mode_show_all = DifferentialChangesetParser::WHITESPACE_SHOW_ALL;
	if ($mode === $mode_show_all) {
	// If we're showing all whitespace, we don't need to perform any updates.
	return;
	}

	$mode_trailing = DifferentialChangesetParser::WHITESPACE_IGNORE_TRAILING;
	$is_trailing = ($mode === $mode_trailing);

	$new = $this->getNewLines();
	$old = $this->getOldLines();
	foreach ($old as $key => $o) {
	$n = $new[$key];

	if (!$o \|\| !$n) {
	continue;
	}

	if ($is_trailing) {
	// In "trailing" mode, we need to identify lines which are marked
	// changed but differ only by trailing whitespace. We mark these lines
	// unchanged.
	if ($o['type'] != $n['type']) {
	if (rtrim($o['text']) === rtrim($n['text'])) {
	$old[$key]['type'] = null;
	$new[$key]['type'] = null;
	}
	}
	} else {
	// In "ignore most" and "ignore all" modes, we need to identify lines
	// which are marked unchanged but have internal whitespace changes.
	// We want to ignore leading and trailing whitespace changes only, not
	// internal whitespace changes (`diff` doesn't have a mode for this, so
	// we have to fix it here). If the text is marked unchanged but the
	// old and new text differs by internal space, mark the lines changed.
	if ($o['type'] === null && $n['type'] === null) {
	if ($o['text'] !== $n['text']) {
	if (trim($o['text']) !== trim($n['text'])) {
	$old[$key]['type'] = '-';
	$new[$key]['type'] = '+';
	}
	}
	}
	}
	}

	$this->setOldLines($old);
	$this->setNewLines($new);

	return $this;
	}

	public function generateIntraLineDiffs() {
	$old = $this->getOldLines();
	$new = $this->getNewLines();

	$diffs = array();
	foreach ($old as $key => $o) {
	$n = $new[$key];

	if (!$o \|\| !$n) {
	continue;
	}

	if ($o['type'] != $n['type']) {
	$diffs[$key] = ArcanistDiffUtils::generateIntralineDiff(
	$o['text'],
	$n['text']);
	}
	}

	$this->setIntraLineDiffs($diffs);

	return $this;
	}

	public function generateVisibileLinesMask() {
	$lines_context = DifferentialChangesetParser::LINES_CONTEXT;
	$old = $this->getOldLines();
	$new = $this->getNewLines();
	$max_length = max(count($old), count($new));
	$visible = false;
	$last = 0;
	$mask = array();
	for ($cursor = -$lines_context; $cursor < $max_length; $cursor++) {
	$offset = $cursor + $lines_context;
	if ((isset($old[$offset]) && $old[$offset]['type']) \|\|
	(isset($new[$offset]) && $new[$offset]['type'])) {
	$visible = true;
	$last = $offset;
	} else if ($cursor > $last + $lines_context) {
	$visible = false;
	}
	if ($visible && $cursor > 0) {
	$mask[$cursor] = 1;
	}
	}

	$this->setVisibleLinesMask($mask);

	return $this;
	}

	public function getOldCorpus() {
	return $this->getCorpus($this->getOldLines());
	}

	public function getNewCorpus() {
	return $this->getCorpus($this->getNewLines());
	}

	private function getCorpus(array $lines) {

	$corpus = array();
	foreach ($lines as $l) {
	if ($l['type'] != '\\') {
	if ($l['text'] === null) {
	// There's no text on this side of the diff, but insert a placeholder
	// newline so the highlighted line numbers match up.
	$corpus[] = "\n";
	} else {
	$corpus[] = $l['text'];
	}
	}
	}
	return $corpus;
	}

	public function parseHunksForLineData(array $hunks) {
	assert_instances_of($hunks, 'DifferentialHunk');

	$old_lines = array();
	$new_lines = array();
	foreach ($hunks as $hunk) {

	$lines = $hunk->getChanges();
	$lines = phutil_split_lines($lines);

	$line_type_map = array();
	$line_text = array();
	foreach ($lines as $line_index => $line) {
	if (isset($line[0])) {
	$char = $line[0];
	switch ($char) {
	case ' ':
	$line_type_map[$line_index] = null;
	$line_text[$line_index] = substr($line, 1);
	break;
	case "\r":
	case "\n":
	// NOTE: Normally, the first character is a space, plus, minus or
	// backslash, but it may be a newline if it used to be a space and
	// trailing whitespace has been stripped via email transmission or
	// some similar mechanism. In these cases, we essentially pretend
	// the missing space is still there.
	$line_type_map[$line_index] = null;
	$line_text[$line_index] = $line;
	break;
	case '+':
	case '-':
	case '\\':
	$line_type_map[$line_index] = $char;
	$line_text[$line_index] = substr($line, 1);
	break;
	default:
	throw new Exception(
	pht(
	'Unexpected leading character "%s" at line index %s!',
	$char,
	$line_index));
	}
	} else {
	$line_type_map[$line_index] = null;
	$line_text[$line_index] = '';
	}
	}

	$old_line = $hunk->getOldOffset();
	$new_line = $hunk->getNewOffset();

	$num_lines = count($lines);
	for ($cursor = 0; $cursor < $num_lines; $cursor++) {
	$type = $line_type_map[$cursor];
	$data = array(
	'type' => $type,
	'text' => $line_text[$cursor],
	'line' => $new_line,
	);
	if ($type == '\\') {
	$type = $line_type_map[$cursor - 1];
	$data['text'] = ltrim($data['text']);
	}
	switch ($type) {
	case '+':
	$new_lines[] = $data;
	++$new_line;
	break;
	case '-':
	$data['line'] = $old_line;
	$old_lines[] = $data;
	++$old_line;
	break;
	default:
	$new_lines[] = $data;
	$data['line'] = $old_line;
	$old_lines[] = $data;
	++$new_line;
	++$old_line;
	break;
	}
	}
	}

	$this->setOldLines($old_lines);
	$this->setNewLines($new_lines);

	return $this;
	}

	public function parseHunksForHighlightMasks(
	array $changeset_hunks,
	array $old_hunks,
	array $new_hunks) {
	assert_instances_of($changeset_hunks, 'DifferentialHunk');
	assert_instances_of($old_hunks, 'DifferentialHunk');
	assert_instances_of($new_hunks, 'DifferentialHunk');

	// Put changes side by side.
	$olds = array();
	$news = array();
	foreach ($changeset_hunks as $hunk) {
	$n_old = $hunk->getOldOffset();
	$n_new = $hunk->getNewOffset();
	$changes = phutil_split_lines($hunk->getChanges());
	foreach ($changes as $line) {
	$diff_type = $line[0]; // Change type in diff of diffs.
	$orig_type = $line[1]; // Change type in the original diff.
	if ($diff_type == ' ') {
	// Use the same key for lines that are next to each other.
	$key = max(last_key($olds), last_key($news)) + 1;
	$olds[$key] = null;
	$news[$key] = null;
	} else if ($diff_type == '-') {
	$olds[] = array($n_old, $orig_type);
	} else if ($diff_type == '+') {
	$news[] = array($n_new, $orig_type);
	}
	if (($diff_type == '-' \|\| $diff_type == ' ') && $orig_type != '-') {
	$n_old++;
	}
	if (($diff_type == '+' \|\| $diff_type == ' ') && $orig_type != '-') {
	$n_new++;
	}
	}
	}

	$offsets_old = $this->computeOffsets($old_hunks);
	$offsets_new = $this->computeOffsets($new_hunks);

	// Highlight lines that were added on each side or removed on the other
	// side.
	$highlight_old = array();
	$highlight_new = array();
	$last = max(last_key($olds), last_key($news));
	for ($i = 0; $i <= $last; $i++) {
	if (isset($olds[$i])) {
	list($n, $type) = $olds[$i];
	if ($type == '+' \|\|
	($type == ' ' && isset($news[$i]) && $news[$i][1] != ' ')) {
	$highlight_old[] = $offsets_old[$n];
	}
	}
	if (isset($news[$i])) {
	list($n, $type) = $news[$i];
	if ($type == '+' \|\|
	($type == ' ' && isset($olds[$i]) && $olds[$i][1] != ' ')) {
	$highlight_new[] = $offsets_new[$n];
	}
	}
	}

	return array($highlight_old, $highlight_new);
	}

	public function makeContextDiff(
	array $hunks,
	$is_new,
	$line_number,
	$line_length,
	$add_context) {

	assert_instances_of($hunks, 'DifferentialHunk');

	$context = array();

	if ($is_new) {
	$prefix = '+';
	} else {
	$prefix = '-';
	}

	foreach ($hunks as $hunk) {
	if ($is_new) {
	$offset = $hunk->getNewOffset();
	$length = $hunk->getNewLen();
	} else {
	$offset = $hunk->getOldOffset();
	$length = $hunk->getOldLen();
	}
	$start = $line_number - $offset;
	$end = $start + $line_length;
	// We need to go in if $start == $length, because the last line
	// might be a "\No newline at end of file" marker, which we want
	// to show if the additional context is > 0.
	if ($start <= $length && $end >= 0) {
	$start = $start - $add_context;
	$end = $end + $add_context;
	$hunk_content = array();
	$hunk_pos = array( '-' => 0, '+' => 0 );
	$hunk_offset = array( '-' => null, '+' => null );
	$hunk_last = array( '-' => null, '+' => null );
	foreach (explode("\n", $hunk->getChanges()) as $line) {
	$in_common = strncmp($line, ' ', 1) === 0;
	$in_old = strncmp($line, '-', 1) === 0 \|\| $in_common;
	$in_new = strncmp($line, '+', 1) === 0 \|\| $in_common;
	$in_selected = strncmp($line, $prefix, 1) === 0;
	$skip = !$in_selected && !$in_common;
	if ($hunk_pos[$prefix] <= $end) {
	if ($start <= $hunk_pos[$prefix]) {
	if (!$skip \|\| ($hunk_pos[$prefix] != $start &&
	$hunk_pos[$prefix] != $end)) {
	if ($in_old) {
	if ($hunk_offset['-'] === null) {
	$hunk_offset['-'] = $hunk_pos['-'];
	}
	$hunk_last['-'] = $hunk_pos['-'];
	}
	if ($in_new) {
	if ($hunk_offset['+'] === null) {
	$hunk_offset['+'] = $hunk_pos['+'];
	}
	$hunk_last['+'] = $hunk_pos['+'];
	}

	$hunk_content[] = $line;
	}
	}
	if ($in_old) { ++$hunk_pos['-']; }
	if ($in_new) { ++$hunk_pos['+']; }
	}
	}
	if ($hunk_offset['-'] !== null \|\| $hunk_offset['+'] !== null) {
	$header = '@@';
	if ($hunk_offset['-'] !== null) {
	- $header .= ' -' . ($hunk->getOldOffset() + $hunk_offset['-']) .
	- ',' . ($hunk_last['-'] - $hunk_offset['-'] + 1);
	+ $header .= ' -'.($hunk->getOldOffset() + $hunk_offset['-']).
	+ ','.($hunk_last['-'] - $hunk_offset['-'] + 1);
	}
	if ($hunk_offset['+'] !== null) {
	- $header .= ' +' . ($hunk->getNewOffset() + $hunk_offset['+']) .
	- ',' . ($hunk_last['+'] - $hunk_offset['+'] + 1);
	+ $header .= ' +'.($hunk->getNewOffset() + $hunk_offset['+']).
	+ ','.($hunk_last['+'] - $hunk_offset['+'] + 1);
	}
	$header .= ' @@';
	$context[] = $header;
	$context[] = implode("\n", $hunk_content);
	}
	}
	}
	return implode("\n", $context);
	}

	private function computeOffsets(array $hunks) {
	assert_instances_of($hunks, 'DifferentialHunk');

	$offsets = array();
	$n = 1;
	foreach ($hunks as $hunk) {
	for ($i = 0; $i < $hunk->getNewLen(); $i++) {
	$offsets[$n] = $hunk->getNewOffset() + $i;
	$n++;
	}
	}
	return $offsets;
	}
	}
	diff --git a/src/applications/differential/parser/__tests__/data/missing_context.diff b/src/applications/differential/parser/__tests__/data/missing_context.diff
	index e5f2e19ad6..357a785299 100644
	--- a/src/applications/differential/parser/__tests__/data/missing_context.diff
	+++ b/src/applications/differential/parser/__tests__/data/missing_context.diff
	@@ -1,11 +1,10 @@
	diff --git a/fruit b/fruit
	index a1f7255..b5fb7b8 100644
	--- a/fruit
	+++ b/fruit
	@@ -4,6 +4,5 @@ cherry
	date
	elderberry
	fig
	-grape
	honeydew
	-
	diff --git a/src/applications/differential/parser/__tests__/data/missing_context_2.diff b/src/applications/differential/parser/__tests__/data/missing_context_2.diff
	index 4e683981ad..514236ded2 100644
	--- a/src/applications/differential/parser/__tests__/data/missing_context_2.diff
	+++ b/src/applications/differential/parser/__tests__/data/missing_context_2.diff
	@@ -1,12 +1,11 @@
	diff --git a/fruit b/fruit
	index a1f7255..fa84742 100644
	--- a/fruit
	+++ b/fruit
	@@ -5,5 +5,7 @@ date
	elderberry
	fig
	grape
	+guava
	+gooseberry
	honeydew
	-
	diff --git a/src/applications/differential/parser/__tests__/data/missing_context_3.diff b/src/applications/differential/parser/__tests__/data/missing_context_3.diff
	index d8802ab89e..28f93725a4 100644
	--- a/src/applications/differential/parser/__tests__/data/missing_context_3.diff
	+++ b/src/applications/differential/parser/__tests__/data/missing_context_3.diff
	@@ -1,18 +1,17 @@
	diff --git a/fruit b/fruit
	index bf66874..071dd49 100644
	--- a/fruit
	+++ b/fruit
	@@ -4,7 +4,6 @@ date
	elderberry
	fig
	banana
	-grape
	honeydew
	apple
	cherry
	@@ -13,5 +12,4 @@ elderberry
	fig
	banana
	grape
	-honeydew
	-
	diff --git a/src/applications/differential/view/DifferentialInlineCommentView.php b/src/applications/differential/view/DifferentialInlineCommentView.php
	index 0b491b64e0..074d202405 100644
	--- a/src/applications/differential/view/DifferentialInlineCommentView.php
	+++ b/src/applications/differential/view/DifferentialInlineCommentView.php
	@@ -1,269 +1,269 @@
	<?php

	final class DifferentialInlineCommentView extends AphrontView {

	private $inlineComment;
	private $onRight;
	private $buildScaffolding;
	private $handles;
	private $markupEngine;
	private $editable;
	private $preview;
	private $allowReply;

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

	public function setOnRight($on_right) {
	$this->onRight = $on_right;
	return $this;
	}

	public function setBuildScaffolding($scaffold) {
	$this->buildScaffolding = $scaffold;
	return $this;
	}

	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 render() {

	$inline = $this->inlineComment;

	$start = $inline->getLineNumber();
	$length = $inline->getLineLength();
	if ($length) {
	$end = $start + $length;
	$line = 'Lines '.number_format($start).'-'.number_format($end);
	} else {
	$line = 'Line '.number_format($start);
	}

	$metadata = array(
	'id' => $inline->getID(),
	'number' => $inline->getLineNumber(),
	'length' => $inline->getLineLength(),
	'on_right' => $this->onRight,
	'original' => $inline->getContent(),
	);

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

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

	$links = array();

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

	$is_draft = false;
	if ($inline->isDraft() && !$is_synthetic) {
	$links[] = pht('Not Submitted Yet');
	$is_draft = true;
	}

	if (!$this->preview) {
	$links[] = javelin_tag(
	'a',
	array(
	'href' => '#',
	'mustcapture' => true,
	'sigil' => 'differential-inline-prev',
	),
	pht('Previous'));

	$links[] = javelin_tag(
	'a',
	array(
	'href' => '#',
	'mustcapture' => true,
	'sigil' => 'differential-inline-next',
	),
	pht('Next'));

	if ($this->allowReply) {

	if (!$is_synthetic) {

	// NOTE: No product reason why you can't reply to these, 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.

	$links[] = javelin_tag(
	'a',
	array(
	'href' => '#',
	'mustcapture' => true,
	'sigil' => 'differential-inline-reply',
	),
	pht('Reply'));
	}

	}
	}

	$anchor_name = 'inline-'.$inline->getID();

	if ($this->editable && !$this->preview) {
	$links[] = javelin_tag(
	'a',
	array(
	'href' => '#',
	'mustcapture' => true,
	'sigil' => 'differential-inline-edit',
	),
	pht('Edit'));
	$links[] = javelin_tag(
	'a',
	array(
	'href' => '#',
	'mustcapture' => true,
	'sigil' => 'differential-inline-delete',
	),
	pht('Delete'));
	} else if ($this->preview) {
	$links[] = javelin_tag(
	'a',
	array(
	'meta' => array(
	'anchor' => $anchor_name,
	),
	'sigil' => 'differential-inline-preview-jump',
	),
	pht('Not Visible'));
	$links[] = javelin_tag(
	'a',
	array(
	'href' => '#',
	'mustcapture' => true,
	'sigil' => 'differential-inline-delete',
	),
	pht('Delete'));
	}

	if ($links) {
	$links = phutil_tag(
	'span',
	array('class' => 'differential-inline-comment-links'),
	phutil_implode_html(" \xC2\xB7 ", $links));
	} else {
	$links = null;
	}

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

	$classes = array(
	'differential-inline-comment',
	);
	if ($is_draft) {
	$classes[] = 'differential-inline-comment-unsaved-draft';
	}
	if ($is_synthetic) {
	$classes[] = 'differential-inline-comment-synthetic';
	}
	$classes = implode(' ', $classes);

	if ($is_synthetic) {
	$author = $inline->getSyntheticAuthor();
	} else {
	$author = $handles[$inline->getAuthorPHID()]->getName();
	}

	$line = phutil_tag(
	'span',
	array('class' => 'differential-inline-comment-line'),
	$line);

	$markup = javelin_tag(
	'div',
	array(
	'class' => $classes,
	'sigil' => $sigil,
	'meta' => $metadata,
	),
	array(
	phutil_tag_div('differential-inline-comment-head', array(
	$anchor,
	$links,
	' ',
	$line,
	' ',
	$author,
	)),
	phutil_tag_div(
	'differential-inline-comment-content',
	phutil_tag_div('phabricator-remarkup', $content)),
	));

	return $this->scaffoldMarkup($markup);
	}

	private function scaffoldMarkup($markup) {
	if (!$this->buildScaffolding) {
	return $markup;
	}

	$left_markup = !$this->onRight ? $markup : '';
	$right_markup = $this->onRight ? $markup : '';

	return phutil_tag('table', array(),
	phutil_tag('tr', array(), array(
	phutil_tag('th', array()),
	phutil_tag('td', array('class' => 'left'), $left_markup),
	phutil_tag('th', array()),
	phutil_tag(
	'td',
	array('colspan' => 3, 'class' => 'right3'),
	$right_markup),
	)));
	}

	}
	diff --git a/src/applications/diffusion/protocol/__tests__/DiffusionSubversionWireProtocolTestCase.php b/src/applications/diffusion/protocol/__tests__/DiffusionSubversionWireProtocolTestCase.php
	index 088f7222ed..bd99b82035 100644
	--- a/src/applications/diffusion/protocol/__tests__/DiffusionSubversionWireProtocolTestCase.php
	+++ b/src/applications/diffusion/protocol/__tests__/DiffusionSubversionWireProtocolTestCase.php
	@@ -1,105 +1,105 @@
	<?php

	final class DiffusionSubversionWireProtocolTestCase
	extends PhabricatorTestCase {

	public function testSubversionWireProtocolParser() {
	$this->assertSameSubversionMessages(
	'( ) ',
	array(
	array(
	),
	));

	$this->assertSameSubversionMessages(
	'( duck 5:quack 42 ( item1 item2 ) ) ',
	array(
	array(
	array(
	'type' => 'word',
	'value' => 'duck',
	),
	array(
	'type' => 'string',
	'value' => 'quack',
	),
	array(
	'type' => 'number',
	'value' => 42,
	),
	array(
	'type' => 'list',
	'value' => array(
	array(
	'type' => 'word',
	'value' => 'item1',
	),
	array(
	'type' => 'word',
	'value' => 'item2',
	),
	),
	),
	),
	));

	$this->assertSameSubversionMessages(
	'( msg1 ) ( msg2 ) ',
	array(
	array(
	array(
	'type' => 'word',
	'value' => 'msg1',
	),
	),
	array(
	array(
	'type' => 'word',
	'value' => 'msg2',
	),
	),
	));
	}

	public function testSubversionWireProtocolPartialFrame() {
	$proto = new DiffusionSubversionWireProtocol();

	// This is primarily a test that we don't hang when we write() a frame
	// which straddles a string boundary.
	$msg1 = $proto->writeData('( duck 5:qu');
	$msg2 = $proto->writeData('ack ) ');

	$this->assertEqual(array(), ipull($msg1, 'structure'));
	$this->assertEqual(
	array(
	array(
	array(
	'type' => 'word',
	'value' => 'duck',
	),
	array(
	- 'type'=> 'string',
	+ 'type' => 'string',
	'value' => 'quack',
	),
	),
	),
	ipull($msg2, 'structure'));
	}

	private function assertSameSubversionMessages($string, array $structs) {
	$proto = new DiffusionSubversionWireProtocol();

	// Verify that the wire message parses into the structs.
	$messages = $proto->writeData($string);
	$messages = ipull($messages, 'structure');
	$this->assertEqual($structs, $messages, 'parse<'.$string.'>');

	// Verify that the structs serialize into the wire message.
	$serial = array();
	foreach ($structs as $struct) {
	$serial[] = $proto->serializeStruct($struct);
	}
	$serial = implode('', $serial);
	$this->assertEqual($string, $serial, 'serialize<'.$string.'>');
	}
	}
	diff --git a/src/applications/diffusion/request/DiffusionRequest.php b/src/applications/diffusion/request/DiffusionRequest.php
	index e18f2a3578..a98a7080b6 100644
	--- a/src/applications/diffusion/request/DiffusionRequest.php
	+++ b/src/applications/diffusion/request/DiffusionRequest.php
	@@ -1,759 +1,759 @@
	<?php

	/**
	* Contains logic to parse Diffusion requests, which have a complicated URI
	* structure.
	*
	* @task new Creating Requests
	* @task uri Managing Diffusion URIs
	*/
	abstract class DiffusionRequest {

	protected $callsign;
	protected $path;
	protected $line;
	protected $branch;
	protected $lint;

	protected $symbolicCommit;
	protected $symbolicType;
	protected $stableCommit;

	protected $repository;
	protected $repositoryCommit;
	protected $repositoryCommitData;
	protected $arcanistProjects;

	private $initFromConduit = true;
	private $user;
	private $branchObject = false;

	abstract protected function getSupportsBranches();
	abstract protected function isStableCommit($symbol);

	protected function didInitialize() {
	return null;
	}


	/* -( Creating Requests )-------------------------------------------------- */


	/**
	* Create a new synthetic request from a parameter dictionary. If you need
	* a @{class:DiffusionRequest} object in order to issue a DiffusionQuery, you
	* can use this method to build one.
	*
	* Parameters are:
	*
	* - `callsign` Repository callsign. Provide this or `repository`.
	* - `user` Viewing user. Required if `callsign` is provided.
	* - `repository` Repository object. Provide this or `callsign`.
	* - `branch` Optional, branch name.
	* - `path` Optional, file path.
	* - `commit` Optional, commit identifier.
	* - `line` Optional, line range.
	*
	* @param map See documentation.
	* @return DiffusionRequest New request object.
	* @task new
	*/
	final public static function newFromDictionary(array $data) {
	if (isset($data['repository']) && isset($data['callsign'])) {
	throw new Exception(
	"Specify 'repository' or 'callsign', but not both.");
	} else if (!isset($data['repository']) && !isset($data['callsign'])) {
	throw new Exception(
	"One of 'repository' and 'callsign' is required.");
	} else if (isset($data['callsign']) && empty($data['user'])) {
	throw new Exception(
	"Parameter 'user' is required if 'callsign' is provided.");
	}

	if (isset($data['repository'])) {
	$object = self::newFromRepository($data['repository']);
	} else {
	$object = self::newFromCallsign($data['callsign'], $data['user']);
	}

	$object->initializeFromDictionary($data);

	return $object;
	}


	/**
	* Create a new request from an Aphront request dictionary. This is an
	* internal method that you generally should not call directly; instead,
	* call @{method:newFromDictionary}.
	*
	* @param map Map of Aphront request data.
	* @return DiffusionRequest New request object.
	* @task new
	*/
	final public static function newFromAphrontRequestDictionary(
	array $data,
	AphrontRequest $request) {

	$callsign = phutil_unescape_uri_path_component(idx($data, 'callsign'));
	$object = self::newFromCallsign($callsign, $request->getUser());

	$use_branches = $object->getSupportsBranches();
	$parsed = self::parseRequestBlob(idx($data, 'dblob'), $use_branches);

	$object->setUser($request->getUser());
	$object->initializeFromDictionary($parsed);
	$object->lint = $request->getStr('lint');
	return $object;
	}


	/**
	* Internal.
	*
	* @task new
	*/
	final private function __construct() {
	// <private>
	}


	/**
	* Internal. Use @{method:newFromDictionary}, not this method.
	*
	* @param string Repository callsign.
	* @param PhabricatorUser Viewing user.
	* @return DiffusionRequest New request object.
	* @task new
	*/
	final private static function newFromCallsign(
	$callsign,
	PhabricatorUser $viewer) {

	$repository = id(new PhabricatorRepositoryQuery())
	->setViewer($viewer)
	->withCallsigns(array($callsign))
	->executeOne();

	if (!$repository) {
	throw new Exception("No such repository '{$callsign}'.");
	}

	return self::newFromRepository($repository);
	}


	/**
	* Internal. Use @{method:newFromDictionary}, not this method.
	*
	* @param PhabricatorRepository Repository object.
	* @return DiffusionRequest New request object.
	* @task new
	*/
	final private static function newFromRepository(
	PhabricatorRepository $repository) {

	$map = array(
	PhabricatorRepositoryType::REPOSITORY_TYPE_GIT => 'DiffusionGitRequest',
	PhabricatorRepositoryType::REPOSITORY_TYPE_SVN => 'DiffusionSvnRequest',
	PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL =>
	'DiffusionMercurialRequest',
	);

	$class = idx($map, $repository->getVersionControlSystem());

	if (!$class) {
	throw new Exception('Unknown version control system!');
	}

	$object = new $class();

	$object->repository = $repository;
	$object->callsign = $repository->getCallsign();

	return $object;
	}


	/**
	* Internal. Use @{method:newFromDictionary}, not this method.
	*
	* @param map Map of parsed data.
	* @return void
	* @task new
	*/
	final private function initializeFromDictionary(array $data) {
	$this->path = idx($data, 'path');
	$this->line = idx($data, 'line');
	$this->initFromConduit = idx($data, 'initFromConduit', true);

	$this->symbolicCommit = idx($data, 'commit');
	if ($this->getSupportsBranches()) {
	$this->branch = idx($data, 'branch');
	}

	if (!$this->getUser()) {
	$user = idx($data, 'user');
	if (!$user) {
	throw new Exception(
	'You must provide a PhabricatorUser in the dictionary!');
	}
	$this->setUser($user);
	}

	$this->didInitialize();
	}

	final protected function shouldInitFromConduit() {
	return $this->initFromConduit;
	}

	final public function setUser(PhabricatorUser $user) {
	$this->user = $user;
	return $this;
	}
	final public function getUser() {
	return $this->user;
	}

	public function getRepository() {
	return $this->repository;
	}

	public function getCallsign() {
	return $this->callsign;
	}

	public function setPath($path) {
	$this->path = $path;
	return $this;
	}

	public function getPath() {
	return $this->path;
	}

	public function getLine() {
	return $this->line;
	}

	public function getCommit() {

	// TODO: Probably remove all of this.

	if ($this->getSymbolicCommit() !== null) {
	return $this->getSymbolicCommit();
	}

	return $this->getStableCommit();
	}

	/**
	* Get the symbolic commit associated with this request.
	*
	* A symbolic commit may be a commit hash, an abbreviated commit hash, a
	* branch name, a tag name, or an expression like "HEAD^^^". The symbolic
	* commit may also be absent.
	*
	* This method always returns the symbol present in the original request,
	* in unmodified form.
	*
	* See also @{method:getStableCommit}.
	*
	* @return string\|null Symbolic commit, if one was present in the request.
	*/
	public function getSymbolicCommit() {
	return $this->symbolicCommit;
	}


	/**
	* Modify the request to move the symbolic commit elsewhere.
	*
	* @param string New symbolic commit.
	* @return this
	*/
	public function updateSymbolicCommit($symbol) {
	$this->symbolicCommit = $symbol;
	$this->symbolicType = null;
	$this->stableCommit = null;
	return $this;
	}


	/**
	* Get the ref type (`commit` or `tag`) of the location associated with this
	* request.
	*
	* If a symbolic commit is present in the request, this method identifies
	* the type of the symbol. Otherwise, it identifies the type of symbol of
	* the location the request is implicitly associated with. This will probably
	* always be `commit`.
	*
	* @return string Symbolic commit type (`commit` or `tag`).
	*/
	public function getSymbolicType() {
	if ($this->symbolicType === null) {
	// As a side effect, this resolves the symbolic type.
	$this->getStableCommit();
	}
	return $this->symbolicType;
	}


	/**
	* Retrieve the stable, permanent commit name identifying the repository
	* location associated with this request.
	*
	* This returns a non-symbolic identifier for the current commit: in Git and
	* Mercurial, a 40-character SHA1; in SVN, a revision number.
	*
	* See also @{method:getSymbolicCommit}.
	*
	* @return string Stable commit name, like a git hash or SVN revision. Not
	* a symbolic commit reference.
	*/
	public function getStableCommit() {
	if (!$this->stableCommit) {
	if ($this->isStableCommit($this->symbolicCommit)) {
	$this->stableCommit = $this->symbolicCommit;
	$this->symbolicType = 'commit';
	} else {
	$this->queryStableCommit();
	}
	}
	return $this->stableCommit;
	}


	public function getBranch() {
	return $this->branch;
	}

	public function getLint() {
	return $this->lint;
	}

	protected function getArcanistBranch() {
	return $this->getBranch();
	}

	public function loadBranch() {
	// TODO: Get rid of this and do real Queries on real objects.

	if ($this->branchObject === false) {
	$this->branchObject = PhabricatorRepositoryBranch::loadBranch(
	$this->getRepository()->getID(),
	$this->getArcanistBranch());
	}

	return $this->branchObject;
	}

	public function loadCoverage() {
	// TODO: This should also die.
	$branch = $this->loadBranch();
	if (!$branch) {
	return;
	}

	$path = $this->getPath();
	$path_map = id(new DiffusionPathIDQuery(array($path)))->loadPathIDs();

	$coverage_row = queryfx_one(
	id(new PhabricatorRepository())->establishConnection('r'),
	'SELECT * FROM %T WHERE branchID = %d AND pathID = %d
	ORDER BY commitID DESC LIMIT 1',
	'repository_coverage',
	$branch->getID(),
	$path_map[$path]);

	if (!$coverage_row) {
	return null;
	}

	return idx($coverage_row, 'coverage');
	}


	public function loadCommit() {
	if (empty($this->repositoryCommit)) {
	$repository = $this->getRepository();

	// TODO: (T603) This should be a real query, but we need to sort out
	// the viewer.
	$commit = id(new PhabricatorRepositoryCommit())->loadOneWhere(
	'repositoryID = %d AND commitIdentifier = %s',
	$repository->getID(),
	$this->getStableCommit());
	if ($commit) {
	$commit->attachRepository($repository);
	}
	$this->repositoryCommit = $commit;
	}
	return $this->repositoryCommit;
	}

	public function loadArcanistProjects() {
	if (empty($this->arcanistProjects)) {
	$projects = id(new PhabricatorRepositoryArcanistProject())->loadAllWhere(
	'repositoryID = %d',
	$this->getRepository()->getID());
	$this->arcanistProjects = $projects;
	}
	return $this->arcanistProjects;
	}

	public function loadCommitData() {
	if (empty($this->repositoryCommitData)) {
	$commit = $this->loadCommit();
	$data = id(new PhabricatorRepositoryCommitData())->loadOneWhere(
	'commitID = %d',
	$commit->getID());
	if (!$data) {
	$data = new PhabricatorRepositoryCommitData();
	$data->setCommitMessage(
	'(This commit has not been fully parsed yet.)');
	}
	$this->repositoryCommitData = $data;
	}
	return $this->repositoryCommitData;
	}

	/* -( Managing Diffusion URIs )-------------------------------------------- */


	/**
	* Generate a Diffusion URI using this request to provide defaults. See
	* @{method:generateDiffusionURI} for details. This method is the same, but
	* preserves the request parameters if they are not overridden.
	*
	* @param map See @{method:generateDiffusionURI}.
	* @return PhutilURI Generated URI.
	* @task uri
	*/
	public function generateURI(array $params) {
	if (empty($params['stable'])) {
	$default_commit = $this->getSymbolicCommit();
	} else {
	$default_commit = $this->getStableCommit();
	}

	$defaults = array(
	'callsign' => $this->getCallsign(),
	'path' => $this->getPath(),
	'branch' => $this->getBranch(),
	'commit' => $default_commit,
	'lint' => idx($params, 'lint', $this->getLint()),
	);
	foreach ($defaults as $key => $val) {
	if (!isset($params[$key])) { // Overwrite NULL.
	$params[$key] = $val;
	}
	}
	return self::generateDiffusionURI($params);
	}


	/**
	* Generate a Diffusion URI from a parameter map. Applies the correct encoding
	* and formatting to the URI. Parameters are:
	*
	* - `action` One of `history`, `browse`, `change`, `lastmodified`,
	* `branch`, `tags`, `branches`, or `revision-ref`. The action specified
	* by the URI.
	* - `callsign` Repository callsign.
	* - `branch` Optional if action is not `branch`, branch name.
	* - `path` Optional, path to file.
	* - `commit` Optional, commit identifier.
	* - `line` Optional, line range.
	* - `lint` Optional, lint code.
	* - `params` Optional, query parameters.
	*
	* The function generates the specified URI and returns it.
	*
	* @param map See documentation.
	* @return PhutilURI Generated URI.
	* @task uri
	*/
	public static function generateDiffusionURI(array $params) {
	$action = idx($params, 'action');

	$callsign = idx($params, 'callsign');
	$path = idx($params, 'path');
	$branch = idx($params, 'branch');
	$commit = idx($params, 'commit');
	$line = idx($params, 'line');

	if (strlen($callsign)) {
	$callsign = phutil_escape_uri_path_component($callsign).'/';
	}

	if (strlen($branch)) {
	$branch = phutil_escape_uri_path_component($branch).'/';
	}

	if (strlen($path)) {
	$path = ltrim($path, '/');
	$path = str_replace(array(';', '$'), array(';;', '$$'), $path);
	$path = phutil_escape_uri($path);
	}

	$path = "{$branch}{$path}";

	if (strlen($commit)) {
	$commit = str_replace('$', '$$', $commit);
	$commit = ';'.phutil_escape_uri($commit);
	}

	if (strlen($line)) {
	$line = '$'.phutil_escape_uri($line);
	}

	$req_callsign = false;
	$req_branch = false;
	$req_commit = false;

	switch ($action) {
	case 'history':
	case 'browse':
	case 'change':
	case 'lastmodified':
	case 'tags':
	case 'branches':
	case 'lint':
	$req_callsign = true;
	break;
	case 'branch':
	$req_callsign = true;
	$req_branch = true;
	break;
	case 'commit':
	$req_callsign = true;
	$req_commit = true;
	break;
	}

	if ($req_callsign && !strlen($callsign)) {
	throw new Exception(
	"Diffusion URI action '{$action}' requires callsign!");
	}

	if ($req_commit && !strlen($commit)) {
	throw new Exception(
	"Diffusion URI action '{$action}' requires commit!");
	}

	switch ($action) {
	case 'change':
	case 'history':
	case 'browse':
	case 'lastmodified':
	case 'tags':
	case 'branches':
	case 'lint':
	case 'pathtree':
	$uri = "/diffusion/{$callsign}{$action}/{$path}{$commit}{$line}";
	break;
	case 'branch':
	if (strlen($path)) {
	$uri = "/diffusion/{$callsign}repository/{$path}";
	} else {
	$uri = "/diffusion/{$callsign}";
	}
	break;
	case 'external':
	$commit = ltrim($commit, ';');
	$uri = "/diffusion/external/{$commit}/";
	break;
	case 'rendering-ref':
	// This isn't a real URI per se, it's passed as a query parameter to
	// the ajax changeset stuff but then we parse it back out as though
	// it came from a URI.
	$uri = rawurldecode("{$path}{$commit}");
	break;
	case 'commit':
	$commit = ltrim($commit, ';');
	$callsign = rtrim($callsign, '/');
	$uri = "/r{$callsign}{$commit}";
	break;
	default:
	throw new Exception("Unknown Diffusion URI action '{$action}'!");
	}

	if ($action == 'rendering-ref') {
	return $uri;
	}

	$uri = new PhutilURI($uri);

	if (isset($params['lint'])) {
	$params['params'] = idx($params, 'params', array()) + array(
	'lint' => $params['lint'],
	);
	}

	if (idx($params, 'params')) {
	$uri->setQueryParams($params['params']);
	}

	return $uri;
	}


	/**
	* Internal. Public only for unit tests.
	*
	* Parse the request URI into components.
	*
	* @param string URI blob.
	* @param bool True if this VCS supports branches.
	* @return map Parsed URI.
	*
	* @task uri
	*/
	public static function parseRequestBlob($blob, $supports_branches) {
	$result = array(
	'branch' => null,
	'path' => null,
	'commit' => null,
	'line' => null,
	);

	$matches = null;

	if ($supports_branches) {
	// Consume the front part of the URI, up to the first "/". This is the
	// path-component encoded branch name.
	if (preg_match('@^([^/]+)/@', $blob, $matches)) {
	$result['branch'] = phutil_unescape_uri_path_component($matches[1]);
	$blob = substr($blob, strlen($matches[1]) + 1);
	}
	}

	// Consume the back part of the URI, up to the first "$". Use a negative
	// lookbehind to prevent matching '$$'. We double the '$' symbol when
	// encoding so that files with names like "money/$100" will survive.
	$pattern = '@(?:(?:^\|[^$])(?:[$][$])*)[$]([\d-,]+)$@';
	if (preg_match($pattern, $blob, $matches)) {
	$result['line'] = $matches[1];
	$blob = substr($blob, 0, -(strlen($matches[1]) + 1));
	}

	// We've consumed the line number if it exists, so unescape "$" in the
	// rest of the string.
	$blob = str_replace('$$', '$', $blob);

	// Consume the commit name, stopping on ';;'. We allow any character to
	// appear in commits names, as they can sometimes be symbolic names (like
	// tag names or refs).
	if (preg_match('@(?:(?:^\|[^;])(?:;;));([^;].)$@', $blob, $matches)) {
	$result['commit'] = $matches[1];
	$blob = substr($blob, 0, -(strlen($matches[1]) + 1));
	}

	// We've consumed the commit if it exists, so unescape ";" in the rest
	// of the string.
	$blob = str_replace(';;', ';', $blob);

	if (strlen($blob)) {
	$result['path'] = $blob;
	}

	$parts = explode('/', $result['path']);
	foreach ($parts as $part) {
	// Prevent any hyjinx since we're ultimately shipping this to the
	// filesystem under a lot of workflows.
	if ($part == '..') {
	throw new Exception('Invalid path URI.');
	}
	}

	return $result;
	}

	/**
	* Check that the working copy of the repository is present and readable.
	*
	* @param string Path to the working copy.
	*/
	protected function validateWorkingCopy($path) {
	if (!is_readable(dirname($path))) {
	$this->raisePermissionException();
	}

	if (!Filesystem::pathExists($path)) {
	$this->raiseCloneException();
	}
	}

	protected function raisePermissionException() {
	$host = php_uname('n');
	$callsign = $this->getRepository()->getCallsign();
	throw new DiffusionSetupException(
	- "The clone of this repository ('{$callsign}') on the local machine " .
	- "('{$host}') could not be read. Ensure that the repository is in a " .
	+ "The clone of this repository ('{$callsign}') on the local machine ".
	+ "('{$host}') could not be read. Ensure that the repository is in a ".
	"location where the web server has read permissions.");
	}

	protected function raiseCloneException() {
	$host = php_uname('n');
	$callsign = $this->getRepository()->getCallsign();
	throw new DiffusionSetupException(
	"The working copy for this repository ('{$callsign}') hasn't been ".
	"cloned yet on this machine ('{$host}'). Make sure you've started the ".
	"Phabricator daemons. If this problem persists for longer than a clone ".
	"should take, check the daemon logs (in the Daemon Console) to see if ".
	"there were errors cloning the repository. Consult the 'Diffusion User ".
	"Guide' in the documentation for help setting up repositories.");
	}

	private function queryStableCommit() {
	if ($this->symbolicCommit) {
	$ref = $this->symbolicCommit;
	} else {
	if ($this->getSupportsBranches()) {
	$ref = $this->getResolvableBranchName($this->getBranch());
	} else {
	$ref = 'HEAD';
	}
	}

	$results = $this->resolveRefs(array($ref));

	$matches = idx($results, $ref, array());
	if (count($matches) !== 1) {
	$message = pht('Ref "%s" is ambiguous or does not exist.', $ref);
	throw id(new DiffusionRefNotFoundException($message))
	->setRef($ref);
	}

	$match = head($matches);

	$this->stableCommit = $match['identifier'];
	$this->symbolicType = $match['type'];
	}

	protected function getResolvableBranchName($branch) {
	return $branch;
	}

	private function resolveRefs(array $refs) {
	if ($this->shouldInitFromConduit()) {
	return DiffusionQuery::callConduitWithDiffusionRequest(
	$this->getUser(),
	$this,
	'diffusion.resolverefs',
	array(
	'refs' => $refs,
	));
	} else {
	return id(new DiffusionLowLevelResolveRefsQuery())
	->setRepository($this->getRepository())
	->withRefs($refs)
	->execute();
	}
	}


	}
	diff --git a/src/applications/diffusion/view/DiffusionView.php b/src/applications/diffusion/view/DiffusionView.php
	index bc2172021b..44613f05cc 100644
	--- a/src/applications/diffusion/view/DiffusionView.php
	+++ b/src/applications/diffusion/view/DiffusionView.php
	@@ -1,167 +1,167 @@
	<?php

	abstract class DiffusionView extends AphrontView {

	private $diffusionRequest;

	final public function setDiffusionRequest(DiffusionRequest $request) {
	$this->diffusionRequest = $request;
	return $this;
	}

	final public function getDiffusionRequest() {
	return $this->diffusionRequest;
	}

	final public function linkChange($change_type, $file_type, $path = null,
	$commit_identifier = null) {

	$text = DifferentialChangeType::getFullNameForChangeType($change_type);
	if ($change_type == DifferentialChangeType::TYPE_CHILD) {
	// TODO: Don't link COPY_AWAY without a direct change.
	return $text;
	}
	if ($file_type == DifferentialChangeType::FILE_DIRECTORY) {
	return $text;
	}

	$href = $this->getDiffusionRequest()->generateURI(
	array(
	'action' => 'change',
	'path' => $path,
	'commit' => $commit_identifier,
	));

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

	final public function linkHistory($path) {
	$href = $this->getDiffusionRequest()->generateURI(
	array(
	'action' => 'history',
	'path' => $path,
	));

	return phutil_tag(
	'a',
	array(
	'href' => $href,
	),
	pht('History'));
	}

	final public function linkBrowse($path, array $details = array()) {

	$href = $this->getDiffusionRequest()->generateURI(
	$details + array(
	'action' => 'browse',
	'path' => $path,
	));

	if (isset($details['text'])) {
	$text = $details['text'];
	} else {
	$text = pht('Browse');
	}

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

	final public function linkExternal($hash, $uri, $text) {
	$href = id(new PhutilURI('/diffusion/external/'))
	->setQueryParams(
	array(
	'uri' => $uri,
	'id' => $hash,
	));

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

	final public static function nameCommit(
	PhabricatorRepository $repository,
	$commit) {

	switch ($repository->getVersionControlSystem()) {
	case PhabricatorRepositoryType::REPOSITORY_TYPE_GIT:
	case PhabricatorRepositoryType::REPOSITORY_TYPE_MERCURIAL:
	$commit_name = substr($commit, 0, 12);
	break;
	default:
	$commit_name = $commit;
	break;
	}

	$callsign = $repository->getCallsign();
	return "r{$callsign}{$commit_name}";
	}

	final public static function linkCommit(
	PhabricatorRepository $repository,
	$commit,
	$summary = '') {

	$commit_name = self::nameCommit($repository, $commit);
	$callsign = $repository->getCallsign();

	if (strlen($summary)) {
	- $commit_name .= ': ' . $summary;
	+ $commit_name .= ': '.$summary;
	}

	return phutil_tag(
	'a',
	array(
	'href' => "/r{$callsign}{$commit}",
	),
	$commit_name);
	}

	final public static function linkRevision($id) {
	if (!$id) {
	return null;
	}

	return phutil_tag(
	'a',
	array(
	'href' => "/D{$id}",
	),
	"D{$id}");
	}

	final public static function renderName($name) {
	$email = new PhutilEmailAddress($name);
	if ($email->getDisplayName() && $email->getDomainName()) {
	Javelin::initBehavior('phabricator-tooltips', array());
	require_celerity_resource('aphront-tooltip-css');
	return javelin_tag(
	'span',
	array(
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => $email->getAddress(),
	'align' => 'E',
	'size' => 'auto',
	),
	),
	$email->getDisplayName());
	}
	return hsprintf('%s', $name);
	}

	}
	diff --git a/src/applications/feed/conduit/ConduitAPI_feed_query_Method.php b/src/applications/feed/conduit/ConduitAPI_feed_query_Method.php
	index 3c40c3ec11..973e656f03 100644
	--- a/src/applications/feed/conduit/ConduitAPI_feed_query_Method.php
	+++ b/src/applications/feed/conduit/ConduitAPI_feed_query_Method.php
	@@ -1,146 +1,146 @@
	<?php

	/**
	* @group conduit
	*/
	final class ConduitAPI_feed_query_Method
	extends ConduitAPI_feed_Method {

	public function getMethodStatus() {
	return self::METHOD_STATUS_UNSTABLE;
	}

	public function getMethodDescription() {
	return 'Query the feed for stories';
	}

	private function getDefaultLimit() {
	return 100;
	}

	public function defineParamTypes() {
	return array(
	'filterPHIDs' => 'optional list <phid>',
	'limit' => 'optional int (default '.$this->getDefaultLimit().')',
	'after' => 'optional int',
	'before' => 'optional int',
	'view' => 'optional string (data, html, html-summary, text)',
	);
	}

	private function getSupportedViewTypes() {
	return array(
	'html' => 'Full HTML presentation of story',
	'data' => 'Dictionary with various data of the story',
	'html-summary' => 'Story contains only the title of the story',
	'text' => 'Simple one-line plain text representation of story',
	);
	}

	public function defineErrorTypes() {

	$view_types = array_keys($this->getSupportedViewTypes());
	$view_types = implode(', ', $view_types);

	return array(
	'ERR-UNKNOWN-TYPE' =>
	- 'Unsupported view type, possibles are: ' . $view_types
	+ 'Unsupported view type, possibles are: '.$view_types
	);
	}

	public function defineReturnType() {
	return 'nonempty dict';
	}

	protected function execute(ConduitAPIRequest $request) {

	$results = array();
	$user = $request->getUser();

	$view_type = $request->getValue('view');
	if (!$view_type) {
	$view_type = 'data';
	}

	$limit = $request->getValue('limit');
	if (!$limit) {
	$limit = $this->getDefaultLimit();
	}
	$filter_phids = $request->getValue('filterPHIDs');
	if (!$filter_phids) {
	$filter_phids = array();
	}

	$query = id(new PhabricatorFeedQuery())
	->setLimit($limit)
	->setFilterPHIDs($filter_phids)
	->setViewer($user);

	$after = $request->getValue('after');
	if (strlen($after)) {
	$query->setAfterID($after);
	}

	$before = $request->getValue('before');
	if (strlen($before)) {
	$query->setBeforeID($before);
	}

	$stories = $query->execute();

	if ($stories) {
	foreach ($stories as $story) {

	$story_data = $story->getStoryData();

	$data = null;

	try {
	$view = $story->renderView();
	} catch (Exception $ex) {
	// When stories fail to render, just fail that story.
	phlog($ex);
	continue;
	}

	$view->setEpoch($story->getEpoch());
	$view->setUser($user);

	switch ($view_type) {
	case 'html':
	$data = $view->render();
	break;
	case 'html-summary':
	$data = $view->render();
	break;
	case 'data':
	$data = array(
	'class' => $story_data->getStoryType(),
	'epoch' => $story_data->getEpoch(),
	'authorPHID' => $story_data->getAuthorPHID(),
	'chronologicalKey' => $story_data->getChronologicalKey(),
	'data' => $story_data->getStoryData(),
	);
	break;
	case 'text':
	$data = array(
	'class' => $story_data->getStoryType(),
	'epoch' => $story_data->getEpoch(),
	'authorPHID' => $story_data->getAuthorPHID(),
	'chronologicalKey' => $story_data->getChronologicalKey(),
	'objectPHID' => $story->getPrimaryObjectPHID(),
	'text' => $story->renderText()
	);
	break;
	default:
	throw new ConduitException('ERR-UNKNOWN-TYPE');
	}

	$results[$story_data->getPHID()] = $data;
	}
	}

	return $results;
	}

	}
	diff --git a/src/applications/herald/adapter/HeraldAdapter.php b/src/applications/herald/adapter/HeraldAdapter.php
	index 7cd571aa8a..dbfde93337 100644
	--- a/src/applications/herald/adapter/HeraldAdapter.php
	+++ b/src/applications/herald/adapter/HeraldAdapter.php
	@@ -1,1374 +1,1374 @@
	<?php

	/**
	* @task customfield Custom Field Integration
	*/
	abstract class HeraldAdapter {

	const FIELD_TITLE = 'title';
	const FIELD_BODY = 'body';
	const FIELD_AUTHOR = 'author';
	const FIELD_ASSIGNEE = 'assignee';
	const FIELD_REVIEWER = 'reviewer';
	const FIELD_REVIEWERS = 'reviewers';
	const FIELD_COMMITTER = 'committer';
	const FIELD_CC = 'cc';
	const FIELD_TAGS = 'tags';
	const FIELD_DIFF_FILE = 'diff-file';
	const FIELD_DIFF_CONTENT = 'diff-content';
	const FIELD_DIFF_ADDED_CONTENT = 'diff-added-content';
	const FIELD_DIFF_REMOVED_CONTENT = 'diff-removed-content';
	const FIELD_DIFF_ENORMOUS = 'diff-enormous';
	const FIELD_REPOSITORY = 'repository';
	const FIELD_REPOSITORY_PROJECTS = 'repository-projects';
	const FIELD_RULE = 'rule';
	const FIELD_AFFECTED_PACKAGE = 'affected-package';
	const FIELD_AFFECTED_PACKAGE_OWNER = 'affected-package-owner';
	const FIELD_CONTENT_SOURCE = 'contentsource';
	const FIELD_ALWAYS = 'always';
	const FIELD_AUTHOR_PROJECTS = 'authorprojects';
	const FIELD_PROJECTS = 'projects';
	const FIELD_PUSHER = 'pusher';
	const FIELD_PUSHER_PROJECTS = 'pusher-projects';
	const FIELD_DIFFERENTIAL_REVISION = 'differential-revision';
	const FIELD_DIFFERENTIAL_REVIEWERS = 'differential-reviewers';
	const FIELD_DIFFERENTIAL_CCS = 'differential-ccs';
	const FIELD_DIFFERENTIAL_ACCEPTED = 'differential-accepted';
	const FIELD_IS_MERGE_COMMIT = 'is-merge-commit';
	const FIELD_BRANCHES = 'branches';
	const FIELD_AUTHOR_RAW = 'author-raw';
	const FIELD_COMMITTER_RAW = 'committer-raw';
	const FIELD_IS_NEW_OBJECT = 'new-object';
	const FIELD_TASK_PRIORITY = 'taskpriority';
	const FIELD_ARCANIST_PROJECT = 'arcanist-project';
	const FIELD_PUSHER_IS_COMMITTER = 'pusher-is-committer';

	const CONDITION_CONTAINS = 'contains';
	const CONDITION_NOT_CONTAINS = '!contains';
	const CONDITION_IS = 'is';
	const CONDITION_IS_NOT = '!is';
	const CONDITION_IS_ANY = 'isany';
	const CONDITION_IS_NOT_ANY = '!isany';
	const CONDITION_INCLUDE_ALL = 'all';
	const CONDITION_INCLUDE_ANY = 'any';
	const CONDITION_INCLUDE_NONE = 'none';
	const CONDITION_IS_ME = 'me';
	const CONDITION_IS_NOT_ME = '!me';
	const CONDITION_REGEXP = 'regexp';
	const CONDITION_RULE = 'conditions';
	const CONDITION_NOT_RULE = '!conditions';
	const CONDITION_EXISTS = 'exists';
	const CONDITION_NOT_EXISTS = '!exists';
	const CONDITION_UNCONDITIONALLY = 'unconditionally';
	const CONDITION_NEVER = 'never';
	const CONDITION_REGEXP_PAIR = 'regexp-pair';
	const CONDITION_HAS_BIT = 'bit';
	const CONDITION_NOT_BIT = '!bit';
	const CONDITION_IS_TRUE = 'true';
	const CONDITION_IS_FALSE = 'false';

	const ACTION_ADD_CC = 'addcc';
	const ACTION_REMOVE_CC = 'remcc';
	const ACTION_EMAIL = 'email';
	const ACTION_NOTHING = 'nothing';
	const ACTION_AUDIT = 'audit';
	const ACTION_FLAG = 'flag';
	const ACTION_ASSIGN_TASK = 'assigntask';
	const ACTION_ADD_PROJECTS = 'addprojects';
	const ACTION_ADD_REVIEWERS = 'addreviewers';
	const ACTION_ADD_BLOCKING_REVIEWERS = 'addblockingreviewers';
	const ACTION_APPLY_BUILD_PLANS = 'applybuildplans';
	const ACTION_BLOCK = 'block';

	const VALUE_TEXT = 'text';
	const VALUE_NONE = 'none';
	const VALUE_EMAIL = 'email';
	const VALUE_USER = 'user';
	const VALUE_TAG = 'tag';
	const VALUE_RULE = 'rule';
	const VALUE_REPOSITORY = 'repository';
	const VALUE_OWNERS_PACKAGE = 'package';
	const VALUE_PROJECT = 'project';
	const VALUE_FLAG_COLOR = 'flagcolor';
	const VALUE_CONTENT_SOURCE = 'contentsource';
	const VALUE_USER_OR_PROJECT = 'userorproject';
	const VALUE_BUILD_PLAN = 'buildplan';
	const VALUE_TASK_PRIORITY = 'taskpriority';
	const VALUE_ARCANIST_PROJECT = 'arcanistprojects';

	private $contentSource;
	private $isNewObject;
	private $customFields = false;

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

	public function getIsNewObject() {
	if (is_bool($this->isNewObject)) {
	return $this->isNewObject;
	}

	throw new Exception(pht('You must setIsNewObject to a boolean first!'));
	}
	public function setIsNewObject($new) {
	$this->isNewObject = (bool) $new;
	return $this;
	}

	abstract public function getPHID();
	abstract public function getHeraldName();

	public function getHeraldField($field_name) {
	switch ($field_name) {
	case self::FIELD_RULE:
	return null;
	case self::FIELD_CONTENT_SOURCE:
	return $this->getContentSource()->getSource();
	case self::FIELD_ALWAYS:
	return true;
	case self::FIELD_IS_NEW_OBJECT:
	return $this->getIsNewObject();
	default:
	if ($this->isHeraldCustomKey($field_name)) {
	return $this->getCustomFieldValue($field_name);
	}

	throw new Exception(
	"Unknown field '{$field_name}'!");
	}
	}

	abstract public function applyHeraldEffects(array $effects);

	public function isAvailableToUser(PhabricatorUser $viewer) {
	$applications = id(new PhabricatorApplicationQuery())
	->setViewer($viewer)
	->withInstalled(true)
	->withClasses(array($this->getAdapterApplicationClass()))
	->execute();

	return !empty($applications);
	}


	/**
	* NOTE: You generally should not override this; it exists to support legacy
	* adapters which had hard-coded content types.
	*/
	public function getAdapterContentType() {
	return get_class($this);
	}

	abstract public function getAdapterContentName();
	abstract public function getAdapterContentDescription();
	abstract public function getAdapterApplicationClass();
	abstract public function getObject();

	public function supportsRuleType($rule_type) {
	return false;
	}

	public function canTriggerOnObject($object) {
	return false;
	}

	public function explainValidTriggerObjects() {
	return pht('This adapter can not trigger on objects.');
	}

	public function getTriggerObjectPHIDs() {
	return array($this->getPHID());
	}

	public function getAdapterSortKey() {
	return sprintf(
	'%08d%s',
	$this->getAdapterSortOrder(),
	$this->getAdapterContentName());
	}

	public function getAdapterSortOrder() {
	return 1000;
	}


	/* -( Fields )------------------------------------------------------------- */


	public function getFields() {
	$fields = array();

	$fields[] = self::FIELD_ALWAYS;
	$fields[] = self::FIELD_RULE;

	$custom_fields = $this->getCustomFields();
	if ($custom_fields) {
	foreach ($custom_fields->getFields() as $custom_field) {
	$key = $custom_field->getFieldKey();
	$fields[] = $this->getHeraldKeyFromCustomKey($key);
	}
	}

	return $fields;
	}

	public function getFieldNameMap() {
	return array(
	self::FIELD_TITLE => pht('Title'),
	self::FIELD_BODY => pht('Body'),
	self::FIELD_AUTHOR => pht('Author'),
	self::FIELD_ASSIGNEE => pht('Assignee'),
	self::FIELD_COMMITTER => pht('Committer'),
	self::FIELD_REVIEWER => pht('Reviewer'),
	self::FIELD_REVIEWERS => pht('Reviewers'),
	self::FIELD_CC => pht('CCs'),
	self::FIELD_TAGS => pht('Tags'),
	self::FIELD_DIFF_FILE => pht('Any changed filename'),
	self::FIELD_DIFF_CONTENT => pht('Any changed file content'),
	self::FIELD_DIFF_ADDED_CONTENT => pht('Any added file content'),
	self::FIELD_DIFF_REMOVED_CONTENT => pht('Any removed file content'),
	self::FIELD_DIFF_ENORMOUS => pht('Change is enormous'),
	self::FIELD_REPOSITORY => pht('Repository'),
	self::FIELD_REPOSITORY_PROJECTS => pht('Repository\'s projects'),
	self::FIELD_RULE => pht('Another Herald rule'),
	self::FIELD_AFFECTED_PACKAGE => pht('Any affected package'),
	self::FIELD_AFFECTED_PACKAGE_OWNER =>
	pht("Any affected package's owner"),
	self::FIELD_CONTENT_SOURCE => pht('Content Source'),
	self::FIELD_ALWAYS => pht('Always'),
	self::FIELD_AUTHOR_PROJECTS => pht("Author's projects"),
	self::FIELD_PROJECTS => pht('Projects'),
	self::FIELD_PUSHER => pht('Pusher'),
	self::FIELD_PUSHER_PROJECTS => pht("Pusher's projects"),
	self::FIELD_DIFFERENTIAL_REVISION => pht('Differential revision'),
	self::FIELD_DIFFERENTIAL_REVIEWERS => pht('Differential reviewers'),
	self::FIELD_DIFFERENTIAL_CCS => pht('Differential CCs'),
	self::FIELD_DIFFERENTIAL_ACCEPTED
	=> pht('Accepted Differential revision'),
	self::FIELD_IS_MERGE_COMMIT => pht('Commit is a merge'),
	self::FIELD_BRANCHES => pht('Commit\'s branches'),
	self::FIELD_AUTHOR_RAW => pht('Raw author name'),
	self::FIELD_COMMITTER_RAW => pht('Raw committer name'),
	self::FIELD_IS_NEW_OBJECT => pht('Is newly created?'),
	self::FIELD_TASK_PRIORITY => pht('Task priority'),
	self::FIELD_ARCANIST_PROJECT => pht('Arcanist Project'),
	self::FIELD_PUSHER_IS_COMMITTER => pht('Pusher same as committer'),
	) + $this->getCustomFieldNameMap();
	}


	/* -( Conditions )--------------------------------------------------------- */


	public function getConditionNameMap() {
	return array(
	self::CONDITION_CONTAINS => pht('contains'),
	self::CONDITION_NOT_CONTAINS => pht('does not contain'),
	self::CONDITION_IS => pht('is'),
	self::CONDITION_IS_NOT => pht('is not'),
	self::CONDITION_IS_ANY => pht('is any of'),
	self::CONDITION_IS_TRUE => pht('is true'),
	self::CONDITION_IS_FALSE => pht('is false'),
	self::CONDITION_IS_NOT_ANY => pht('is not any of'),
	self::CONDITION_INCLUDE_ALL => pht('include all of'),
	self::CONDITION_INCLUDE_ANY => pht('include any of'),
	self::CONDITION_INCLUDE_NONE => pht('do not include'),
	self::CONDITION_IS_ME => pht('is myself'),
	self::CONDITION_IS_NOT_ME => pht('is not myself'),
	self::CONDITION_REGEXP => pht('matches regexp'),
	self::CONDITION_RULE => pht('matches:'),
	self::CONDITION_NOT_RULE => pht('does not match:'),
	self::CONDITION_EXISTS => pht('exists'),
	self::CONDITION_NOT_EXISTS => pht('does not exist'),
	self::CONDITION_UNCONDITIONALLY => '', // don't show anything!
	self::CONDITION_NEVER => '', // don't show anything!
	self::CONDITION_REGEXP_PAIR => pht('matches regexp pair'),
	self::CONDITION_HAS_BIT => pht('has bit'),
	self::CONDITION_NOT_BIT => pht('lacks bit'),
	);
	}

	public function getConditionsForField($field) {
	switch ($field) {
	case self::FIELD_TITLE:
	case self::FIELD_BODY:
	case self::FIELD_COMMITTER_RAW:
	case self::FIELD_AUTHOR_RAW:
	return array(
	self::CONDITION_CONTAINS,
	self::CONDITION_NOT_CONTAINS,
	self::CONDITION_IS,
	self::CONDITION_IS_NOT,
	self::CONDITION_REGEXP,
	);
	case self::FIELD_REVIEWER:
	case self::FIELD_PUSHER:
	case self::FIELD_TASK_PRIORITY:
	case self::FIELD_ARCANIST_PROJECT:
	return array(
	self::CONDITION_IS_ANY,
	self::CONDITION_IS_NOT_ANY,
	);
	case self::FIELD_REPOSITORY:
	case self::FIELD_ASSIGNEE:
	case self::FIELD_AUTHOR:
	case self::FIELD_COMMITTER:
	return array(
	self::CONDITION_IS_ANY,
	self::CONDITION_IS_NOT_ANY,
	self::CONDITION_EXISTS,
	self::CONDITION_NOT_EXISTS,
	);
	case self::FIELD_TAGS:
	case self::FIELD_REVIEWERS:
	case self::FIELD_CC:
	case self::FIELD_AUTHOR_PROJECTS:
	case self::FIELD_PROJECTS:
	case self::FIELD_AFFECTED_PACKAGE:
	case self::FIELD_AFFECTED_PACKAGE_OWNER:
	case self::FIELD_PUSHER_PROJECTS:
	case self::FIELD_REPOSITORY_PROJECTS:
	return array(
	self::CONDITION_INCLUDE_ALL,
	self::CONDITION_INCLUDE_ANY,
	self::CONDITION_INCLUDE_NONE,
	self::CONDITION_EXISTS,
	self::CONDITION_NOT_EXISTS,
	);
	case self::FIELD_DIFF_FILE:
	case self::FIELD_BRANCHES:
	return array(
	self::CONDITION_CONTAINS,
	self::CONDITION_REGEXP,
	);
	case self::FIELD_DIFF_CONTENT:
	case self::FIELD_DIFF_ADDED_CONTENT:
	case self::FIELD_DIFF_REMOVED_CONTENT:
	return array(
	self::CONDITION_CONTAINS,
	self::CONDITION_REGEXP,
	self::CONDITION_REGEXP_PAIR,
	);
	case self::FIELD_RULE:
	return array(
	self::CONDITION_RULE,
	self::CONDITION_NOT_RULE,
	);
	case self::FIELD_CONTENT_SOURCE:
	return array(
	self::CONDITION_IS,
	self::CONDITION_IS_NOT,
	);
	case self::FIELD_ALWAYS:
	return array(
	self::CONDITION_UNCONDITIONALLY,
	);
	case self::FIELD_DIFFERENTIAL_REVIEWERS:
	return array(
	self::CONDITION_EXISTS,
	self::CONDITION_NOT_EXISTS,
	self::CONDITION_INCLUDE_ALL,
	self::CONDITION_INCLUDE_ANY,
	self::CONDITION_INCLUDE_NONE,
	);
	case self::FIELD_DIFFERENTIAL_CCS:
	return array(
	self::CONDITION_INCLUDE_ALL,
	self::CONDITION_INCLUDE_ANY,
	self::CONDITION_INCLUDE_NONE,
	);
	case self::FIELD_DIFFERENTIAL_REVISION:
	case self::FIELD_DIFFERENTIAL_ACCEPTED:
	return array(
	self::CONDITION_EXISTS,
	self::CONDITION_NOT_EXISTS,
	);
	case self::FIELD_IS_MERGE_COMMIT:
	case self::FIELD_DIFF_ENORMOUS:
	case self::FIELD_IS_NEW_OBJECT:
	case self::FIELD_PUSHER_IS_COMMITTER:
	return array(
	self::CONDITION_IS_TRUE,
	self::CONDITION_IS_FALSE,
	);
	default:
	if ($this->isHeraldCustomKey($field)) {
	return $this->getCustomFieldConditions($field);
	}
	throw new Exception(
	"This adapter does not define conditions for field '{$field}'!");
	}
	}

	public function doesConditionMatch(
	HeraldEngine $engine,
	HeraldRule $rule,
	HeraldCondition $condition,
	$field_value) {

	$condition_type = $condition->getFieldCondition();
	$condition_value = $condition->getValue();

	switch ($condition_type) {
	case self::CONDITION_CONTAINS:
	// "Contains" can take an array of strings, as in "Any changed
	// filename" for diffs.
	foreach ((array)$field_value as $value) {
	if (stripos($value, $condition_value) !== false) {
	return true;
	}
	}
	return false;
	case self::CONDITION_NOT_CONTAINS:
	return (stripos($field_value, $condition_value) === false);
	case self::CONDITION_IS:
	return ($field_value == $condition_value);
	case self::CONDITION_IS_NOT:
	return ($field_value != $condition_value);
	case self::CONDITION_IS_ME:
	return ($field_value == $rule->getAuthorPHID());
	case self::CONDITION_IS_NOT_ME:
	return ($field_value != $rule->getAuthorPHID());
	case self::CONDITION_IS_ANY:
	if (!is_array($condition_value)) {
	throw new HeraldInvalidConditionException(
	'Expected condition value to be an array.');
	}
	$condition_value = array_fuse($condition_value);
	return isset($condition_value[$field_value]);
	case self::CONDITION_IS_NOT_ANY:
	if (!is_array($condition_value)) {
	throw new HeraldInvalidConditionException(
	'Expected condition value to be an array.');
	}
	$condition_value = array_fuse($condition_value);
	return !isset($condition_value[$field_value]);
	case self::CONDITION_INCLUDE_ALL:
	if (!is_array($field_value)) {
	throw new HeraldInvalidConditionException(
	'Object produced non-array value!');
	}
	if (!is_array($condition_value)) {
	throw new HeraldInvalidConditionException(
	'Expected condition value to be an array.');
	}

	$have = array_select_keys(array_fuse($field_value), $condition_value);
	return (count($have) == count($condition_value));
	case self::CONDITION_INCLUDE_ANY:
	return (bool)array_select_keys(
	array_fuse($field_value),
	$condition_value);
	case self::CONDITION_INCLUDE_NONE:
	return !array_select_keys(
	array_fuse($field_value),
	$condition_value);
	case self::CONDITION_EXISTS:
	case self::CONDITION_IS_TRUE:
	return (bool)$field_value;
	case self::CONDITION_NOT_EXISTS:
	case self::CONDITION_IS_FALSE:
	return !$field_value;
	case self::CONDITION_UNCONDITIONALLY:
	return (bool)$field_value;
	case self::CONDITION_NEVER:
	return false;
	case self::CONDITION_REGEXP:
	foreach ((array)$field_value as $value) {
	// We add the 'S' flag because we use the regexp multiple times.
	// It shouldn't cause any troubles if the flag is already there
	// - /./S is evaluated same as /./SS.
	- $result = @preg_match($condition_value . 'S', $value);
	+ $result = @preg_match($condition_value.'S', $value);
	if ($result === false) {
	throw new HeraldInvalidConditionException(
	'Regular expression is not valid!');
	}
	if ($result) {
	return true;
	}
	}
	return false;
	case self::CONDITION_REGEXP_PAIR:
	// Match a JSON-encoded pair of regular expressions against a
	// dictionary. The first regexp must match the dictionary key, and the
	// second regexp must match the dictionary value. If any key/value pair
	// in the dictionary matches both regexps, the condition is satisfied.
	$regexp_pair = json_decode($condition_value, true);
	if (!is_array($regexp_pair)) {
	throw new HeraldInvalidConditionException(
	'Regular expression pair is not valid JSON!');
	}
	if (count($regexp_pair) != 2) {
	throw new HeraldInvalidConditionException(
	'Regular expression pair is not a pair!');
	}

	$key_regexp = array_shift($regexp_pair);
	$value_regexp = array_shift($regexp_pair);

	foreach ((array)$field_value as $key => $value) {
	$key_matches = @preg_match($key_regexp, $key);
	if ($key_matches === false) {
	throw new HeraldInvalidConditionException(
	'First regular expression is invalid!');
	}
	if ($key_matches) {
	$value_matches = @preg_match($value_regexp, $value);
	if ($value_matches === false) {
	throw new HeraldInvalidConditionException(
	'Second regular expression is invalid!');
	}
	if ($value_matches) {
	return true;
	}
	}
	}
	return false;
	case self::CONDITION_RULE:
	case self::CONDITION_NOT_RULE:
	$rule = $engine->getRule($condition_value);
	if (!$rule) {
	throw new HeraldInvalidConditionException(
	'Condition references a rule which does not exist!');
	}

	$is_not = ($condition_type == self::CONDITION_NOT_RULE);
	$result = $engine->doesRuleMatch($rule, $this);
	if ($is_not) {
	$result = !$result;
	}
	return $result;
	case self::CONDITION_HAS_BIT:
	return (($condition_value & $field_value) === (int) $condition_value);
	case self::CONDITION_NOT_BIT:
	return (($condition_value & $field_value) !== (int) $condition_value);
	default:
	throw new HeraldInvalidConditionException(
	"Unknown condition '{$condition_type}'.");
	}
	}

	public function willSaveCondition(HeraldCondition $condition) {
	$condition_type = $condition->getFieldCondition();
	$condition_value = $condition->getValue();

	switch ($condition_type) {
	case self::CONDITION_REGEXP:
	$ok = @preg_match($condition_value, '');
	if ($ok === false) {
	throw new HeraldInvalidConditionException(
	pht(
	'The regular expression "%s" is not valid. Regular expressions '.
	'must have enclosing characters (e.g. "@/path/to/file@", not '.
	'"/path/to/file") and be syntactically correct.',
	$condition_value));
	}
	break;
	case self::CONDITION_REGEXP_PAIR:
	$json = json_decode($condition_value, true);
	if (!is_array($json)) {
	throw new HeraldInvalidConditionException(
	pht(
	'The regular expression pair "%s" is not valid JSON. Enter a '.
	'valid JSON array with two elements.',
	$condition_value));
	}

	if (count($json) != 2) {
	throw new HeraldInvalidConditionException(
	pht(
	'The regular expression pair "%s" must have exactly two '.
	'elements.',
	$condition_value));
	}

	$key_regexp = array_shift($json);
	$val_regexp = array_shift($json);

	$key_ok = @preg_match($key_regexp, '');
	if ($key_ok === false) {
	throw new HeraldInvalidConditionException(
	pht(
	'The first regexp in the regexp pair, "%s", is not a valid '.
	'regexp.',
	$key_regexp));
	}

	$val_ok = @preg_match($val_regexp, '');
	if ($val_ok === false) {
	throw new HeraldInvalidConditionException(
	pht(
	'The second regexp in the regexp pair, "%s", is not a valid '.
	'regexp.',
	$val_regexp));
	}
	break;
	case self::CONDITION_CONTAINS:
	case self::CONDITION_NOT_CONTAINS:
	case self::CONDITION_IS:
	case self::CONDITION_IS_NOT:
	case self::CONDITION_IS_ANY:
	case self::CONDITION_IS_NOT_ANY:
	case self::CONDITION_INCLUDE_ALL:
	case self::CONDITION_INCLUDE_ANY:
	case self::CONDITION_INCLUDE_NONE:
	case self::CONDITION_IS_ME:
	case self::CONDITION_IS_NOT_ME:
	case self::CONDITION_RULE:
	case self::CONDITION_NOT_RULE:
	case self::CONDITION_EXISTS:
	case self::CONDITION_NOT_EXISTS:
	case self::CONDITION_UNCONDITIONALLY:
	case self::CONDITION_NEVER:
	case self::CONDITION_HAS_BIT:
	case self::CONDITION_NOT_BIT:
	case self::CONDITION_IS_TRUE:
	case self::CONDITION_IS_FALSE:
	// No explicit validation for these types, although there probably
	// should be in some cases.
	break;
	default:
	throw new HeraldInvalidConditionException(
	pht(
	'Unknown condition "%s"!',
	$condition_type));
	}
	}


	/* -( Actions )------------------------------------------------------------ */

	abstract public function getActions($rule_type);

	public function getActionNameMap($rule_type) {
	switch ($rule_type) {
	case HeraldRuleTypeConfig::RULE_TYPE_GLOBAL:
	case HeraldRuleTypeConfig::RULE_TYPE_OBJECT:
	return array(
	self::ACTION_NOTHING => pht('Do nothing'),
	self::ACTION_ADD_CC => pht('Add emails to CC'),
	self::ACTION_REMOVE_CC => pht('Remove emails from CC'),
	self::ACTION_EMAIL => pht('Send an email to'),
	self::ACTION_AUDIT => pht('Trigger an Audit by'),
	self::ACTION_FLAG => pht('Mark with flag'),
	self::ACTION_ASSIGN_TASK => pht('Assign task to'),
	self::ACTION_ADD_PROJECTS => pht('Add projects'),
	self::ACTION_ADD_REVIEWERS => pht('Add reviewers'),
	self::ACTION_ADD_BLOCKING_REVIEWERS => pht('Add blocking reviewers'),
	self::ACTION_APPLY_BUILD_PLANS => pht('Run build plans'),
	self::ACTION_BLOCK => pht('Block change with message'),
	);
	case HeraldRuleTypeConfig::RULE_TYPE_PERSONAL:
	return array(
	self::ACTION_NOTHING => pht('Do nothing'),
	self::ACTION_ADD_CC => pht('Add me to CC'),
	self::ACTION_REMOVE_CC => pht('Remove me from CC'),
	self::ACTION_EMAIL => pht('Send me an email'),
	self::ACTION_AUDIT => pht('Trigger an Audit by me'),
	self::ACTION_FLAG => pht('Mark with flag'),
	self::ACTION_ASSIGN_TASK => pht('Assign task to me'),
	self::ACTION_ADD_PROJECTS => pht('Add projects'),
	self::ACTION_ADD_REVIEWERS => pht('Add me as a reviewer'),
	self::ACTION_ADD_BLOCKING_REVIEWERS =>
	pht('Add me as a blocking reviewer'),
	);
	default:
	throw new Exception("Unknown rule type '{$rule_type}'!");
	}
	}

	public function willSaveAction(
	HeraldRule $rule,
	HeraldAction $action) {

	$target = $action->getTarget();
	if (is_array($target)) {
	$target = array_keys($target);
	}

	$author_phid = $rule->getAuthorPHID();

	$rule_type = $rule->getRuleType();
	if ($rule_type == HeraldRuleTypeConfig::RULE_TYPE_PERSONAL) {
	switch ($action->getAction()) {
	case self::ACTION_EMAIL:
	case self::ACTION_ADD_CC:
	case self::ACTION_REMOVE_CC:
	case self::ACTION_AUDIT:
	case self::ACTION_ASSIGN_TASK:
	case self::ACTION_ADD_REVIEWERS:
	case self::ACTION_ADD_BLOCKING_REVIEWERS:
	// For personal rules, force these actions to target the rule owner.
	$target = array($author_phid);
	break;
	case self::ACTION_FLAG:
	// Make sure flag color is valid; set to blue if not.
	$color_map = PhabricatorFlagColor::getColorNameMap();
	if (empty($color_map[$target])) {
	$target = PhabricatorFlagColor::COLOR_BLUE;
	}
	break;
	case self::ACTION_BLOCK:
	case self::ACTION_NOTHING:
	break;
	default:
	throw new HeraldInvalidActionException(
	pht(
	'Unrecognized action type "%s"!',
	$action->getAction()));
	}
	}

	$action->setTarget($target);
	}



	/* -( Values )------------------------------------------------------------- */


	public function getValueTypeForFieldAndCondition($field, $condition) {

	if ($this->isHeraldCustomKey($field)) {
	$value_type = $this->getCustomFieldValueTypeForFieldAndCondition(
	$field,
	$condition);
	if ($value_type !== null) {
	return $value_type;
	}
	}

	switch ($condition) {
	case self::CONDITION_CONTAINS:
	case self::CONDITION_NOT_CONTAINS:
	case self::CONDITION_REGEXP:
	case self::CONDITION_REGEXP_PAIR:
	return self::VALUE_TEXT;
	case self::CONDITION_IS:
	case self::CONDITION_IS_NOT:
	switch ($field) {
	case self::FIELD_CONTENT_SOURCE:
	return self::VALUE_CONTENT_SOURCE;
	default:
	return self::VALUE_TEXT;
	}
	break;
	case self::CONDITION_IS_ANY:
	case self::CONDITION_IS_NOT_ANY:
	switch ($field) {
	case self::FIELD_REPOSITORY:
	return self::VALUE_REPOSITORY;
	case self::FIELD_TASK_PRIORITY:
	return self::VALUE_TASK_PRIORITY;
	case self::FIELD_ARCANIST_PROJECT:
	return self::VALUE_ARCANIST_PROJECT;
	default:
	return self::VALUE_USER;
	}
	break;
	case self::CONDITION_INCLUDE_ALL:
	case self::CONDITION_INCLUDE_ANY:
	case self::CONDITION_INCLUDE_NONE:
	switch ($field) {
	case self::FIELD_REPOSITORY:
	return self::VALUE_REPOSITORY;
	case self::FIELD_CC:
	return self::VALUE_EMAIL;
	case self::FIELD_TAGS:
	return self::VALUE_TAG;
	case self::FIELD_AFFECTED_PACKAGE:
	return self::VALUE_OWNERS_PACKAGE;
	case self::FIELD_AUTHOR_PROJECTS:
	case self::FIELD_PUSHER_PROJECTS:
	case self::FIELD_PROJECTS:
	case self::FIELD_REPOSITORY_PROJECTS:
	return self::VALUE_PROJECT;
	case self::FIELD_REVIEWERS:
	return self::VALUE_USER_OR_PROJECT;
	default:
	return self::VALUE_USER;
	}
	break;
	case self::CONDITION_IS_ME:
	case self::CONDITION_IS_NOT_ME:
	case self::CONDITION_EXISTS:
	case self::CONDITION_NOT_EXISTS:
	case self::CONDITION_UNCONDITIONALLY:
	case self::CONDITION_NEVER:
	case self::CONDITION_IS_TRUE:
	case self::CONDITION_IS_FALSE:
	return self::VALUE_NONE;
	case self::CONDITION_RULE:
	case self::CONDITION_NOT_RULE:
	return self::VALUE_RULE;
	default:
	throw new Exception("Unknown condition '{$condition}'.");
	}
	}

	public static function getValueTypeForAction($action, $rule_type) {
	$is_personal = ($rule_type == HeraldRuleTypeConfig::RULE_TYPE_PERSONAL);

	if ($is_personal) {
	switch ($action) {
	case self::ACTION_ADD_CC:
	case self::ACTION_REMOVE_CC:
	case self::ACTION_EMAIL:
	case self::ACTION_NOTHING:
	case self::ACTION_AUDIT:
	case self::ACTION_ASSIGN_TASK:
	case self::ACTION_ADD_REVIEWERS:
	case self::ACTION_ADD_BLOCKING_REVIEWERS:
	return self::VALUE_NONE;
	case self::ACTION_FLAG:
	return self::VALUE_FLAG_COLOR;
	case self::ACTION_ADD_PROJECTS:
	return self::VALUE_PROJECT;
	default:
	throw new Exception("Unknown or invalid action '{$action}'.");
	}
	} else {
	switch ($action) {
	case self::ACTION_ADD_CC:
	case self::ACTION_REMOVE_CC:
	case self::ACTION_EMAIL:
	return self::VALUE_EMAIL;
	case self::ACTION_NOTHING:
	return self::VALUE_NONE;
	case self::ACTION_ADD_PROJECTS:
	return self::VALUE_PROJECT;
	case self::ACTION_FLAG:
	return self::VALUE_FLAG_COLOR;
	case self::ACTION_ASSIGN_TASK:
	return self::VALUE_USER;
	case self::ACTION_AUDIT:
	case self::ACTION_ADD_REVIEWERS:
	case self::ACTION_ADD_BLOCKING_REVIEWERS:
	return self::VALUE_USER_OR_PROJECT;
	case self::ACTION_APPLY_BUILD_PLANS:
	return self::VALUE_BUILD_PLAN;
	case self::ACTION_BLOCK:
	return self::VALUE_TEXT;
	default:
	throw new Exception("Unknown or invalid action '{$action}'.");
	}
	}
	}


	/* -( Repetition )--------------------------------------------------------- */


	public function getRepetitionOptions() {
	return array(
	HeraldRepetitionPolicyConfig::EVERY,
	);
	}


	public static function applyFlagEffect(HeraldEffect $effect, $phid) {
	$color = $effect->getTarget();

	// TODO: Silly that we need to load this again here.
	$rule = id(new HeraldRule())->load($effect->getRuleID());
	$user = id(new PhabricatorUser())->loadOneWhere(
	'phid = %s',
	$rule->getAuthorPHID());

	$flag = PhabricatorFlagQuery::loadUserFlag($user, $phid);
	if ($flag) {
	return new HeraldApplyTranscript(
	$effect,
	false,
	pht('Object already flagged.'));
	}

	$handle = id(new PhabricatorHandleQuery())
	->setViewer($user)
	->withPHIDs(array($phid))
	->executeOne();

	$flag = new PhabricatorFlag();
	$flag->setOwnerPHID($user->getPHID());
	$flag->setType($handle->getType());
	$flag->setObjectPHID($handle->getPHID());

	// TOOD: Should really be transcript PHID, but it doesn't exist yet.
	$flag->setReasonPHID($user->getPHID());

	$flag->setColor($color);
	$flag->setNote(
	pht('Flagged by Herald Rule "%s".', $rule->getName()));
	$flag->save();

	return new HeraldApplyTranscript(
	$effect,
	true,
	pht('Added flag.'));
	}

	public static function getAllAdapters() {
	static $adapters;
	if (!$adapters) {
	$adapters = id(new PhutilSymbolLoader())
	->setAncestorClass(__CLASS__)
	->loadObjects();
	$adapters = msort($adapters, 'getAdapterSortKey');
	}
	return $adapters;
	}

	public static function getAdapterForContentType($content_type) {
	$adapters = self::getAllAdapters();

	foreach ($adapters as $adapter) {
	if ($adapter->getAdapterContentType() == $content_type) {
	return $adapter;
	}
	}

	throw new Exception(
	pht(
	'No adapter exists for Herald content type "%s".',
	$content_type));
	}

	public static function getEnabledAdapterMap(PhabricatorUser $viewer) {
	$map = array();

	$adapters = HeraldAdapter::getAllAdapters();
	foreach ($adapters as $adapter) {
	if (!$adapter->isAvailableToUser($viewer)) {
	continue;
	}
	$type = $adapter->getAdapterContentType();
	$name = $adapter->getAdapterContentName();
	$map[$type] = $name;
	}

	return $map;
	}

	public function renderRuleAsText(HeraldRule $rule, array $handles) {
	assert_instances_of($handles, 'PhabricatorObjectHandle');

	require_celerity_resource('herald-css');

	$icon = id(new PHUIIconView())
	->setIconFont('fa-chevron-circle-right lightgreytext')
	->addClass('herald-list-icon');

	if ($rule->getMustMatchAll()) {
	$match_text = pht('When all of these conditions are met:');
	} else {
	$match_text = pht('When any of these conditions are met:');
	}

	$match_title = phutil_tag(
	'p',
	array(
	'class' => 'herald-list-description'
	),
	$match_text);

	$match_list = array();
	foreach ($rule->getConditions() as $condition) {
	$match_list[] = phutil_tag(
	'div',
	array(
	'class' => 'herald-list-item'
	),
	array(
	$icon,
	$this->renderConditionAsText($condition, $handles)));
	}

	$integer_code_for_every = HeraldRepetitionPolicyConfig::toInt(
	HeraldRepetitionPolicyConfig::EVERY);

	if ($rule->getRepetitionPolicy() == $integer_code_for_every) {
	$action_text =
	pht('Take these actions every time this rule matches:');
	} else {
	$action_text =
	pht('Take these actions the first time this rule matches:');
	}

	$action_title = phutil_tag(
	'p',
	array(
	'class' => 'herald-list-description'
	),
	$action_text);

	$action_list = array();
	foreach ($rule->getActions() as $action) {
	$action_list[] = phutil_tag(
	'div',
	array(
	'class' => 'herald-list-item'
	),
	array(
	$icon,
	$this->renderActionAsText($action, $handles))); }

	return array(
	$match_title,
	$match_list,
	$action_title,
	$action_list);
	}

	private function renderConditionAsText(
	HeraldCondition $condition,
	array $handles) {

	$field_type = $condition->getFieldName();

	$default = $this->isHeraldCustomKey($field_type)
	? pht('(Unknown Custom Field "%s")', $field_type)
	: pht('(Unknown Field "%s")', $field_type);

	$field_name = idx($this->getFieldNameMap(), $field_type, $default);

	$condition_type = $condition->getFieldCondition();
	$condition_name = idx($this->getConditionNameMap(), $condition_type);

	$value = $this->renderConditionValueAsText($condition, $handles);

	return hsprintf(' %s %s %s', $field_name, $condition_name, $value);
	}

	private function renderActionAsText(
	HeraldAction $action,
	array $handles) {
	$rule_global = HeraldRuleTypeConfig::RULE_TYPE_GLOBAL;

	$action_type = $action->getAction();
	$action_name = idx($this->getActionNameMap($rule_global), $action_type);

	$target = $this->renderActionTargetAsText($action, $handles);

	return hsprintf(' %s %s', $action_name, $target);
	}

	private function renderConditionValueAsText(
	HeraldCondition $condition,
	array $handles) {

	$value = $condition->getValue();
	if (!is_array($value)) {
	$value = array($value);
	}
	switch ($condition->getFieldName()) {
	case self::FIELD_TASK_PRIORITY:
	$priority_map = ManiphestTaskPriority::getTaskPriorityMap();
	foreach ($value as $index => $val) {
	$name = idx($priority_map, $val);
	if ($name) {
	$value[$index] = $name;
	}
	}
	break;
	case HeraldPreCommitRefAdapter::FIELD_REF_CHANGE:
	$change_map =
	PhabricatorRepositoryPushLog::getHeraldChangeFlagConditionOptions();
	foreach ($value as $index => $val) {
	$name = idx($change_map, $val);
	if ($name) {
	$value[$index] = $name;
	}
	}
	break;
	default:
	foreach ($value as $index => $val) {
	$handle = idx($handles, $val);
	if ($handle) {
	$value[$index] = $handle->renderLink();
	}
	}
	break;
	}
	$value = phutil_implode_html(', ', $value);
	return $value;
	}

	private function renderActionTargetAsText(
	HeraldAction $action,
	array $handles) {

	$target = $action->getTarget();
	if (!is_array($target)) {
	$target = array($target);
	}
	foreach ($target as $index => $val) {
	switch ($action->getAction()) {
	case self::ACTION_FLAG:
	$target[$index] = PhabricatorFlagColor::getColorName($val);
	break;
	default:
	$handle = idx($handles, $val);
	if ($handle) {
	$target[$index] = $handle->renderLink();
	}
	break;
	}
	}
	$target = phutil_implode_html(', ', $target);
	return $target;
	}

	/**
	* Given a @{class:HeraldRule}, this function extracts all the phids that
	* we'll want to load as handles later.
	*
	* This function performs a somewhat hacky approach to figuring out what
	* is and is not a phid - try to get the phid type and if the type is
	* not unknown assume its a valid phid.
	*
	* Don't try this at home. Use more strongly typed data at home.
	*
	* Think of the children.
	*/
	public static function getHandlePHIDs(HeraldRule $rule) {
	$phids = array($rule->getAuthorPHID());
	foreach ($rule->getConditions() as $condition) {
	$value = $condition->getValue();
	if (!is_array($value)) {
	$value = array($value);
	}
	foreach ($value as $val) {
	if (phid_get_type($val) !=
	PhabricatorPHIDConstants::PHID_TYPE_UNKNOWN) {
	$phids[] = $val;
	}
	}
	}

	foreach ($rule->getActions() as $action) {
	$target = $action->getTarget();
	if (!is_array($target)) {
	$target = array($target);
	}
	foreach ($target as $val) {
	if (phid_get_type($val) !=
	PhabricatorPHIDConstants::PHID_TYPE_UNKNOWN) {
	$phids[] = $val;
	}
	}
	}

	if ($rule->isObjectRule()) {
	$phids[] = $rule->getTriggerObjectPHID();
	}

	return $phids;
	}

	/* -( Custom Field Integration )------------------------------------------- */


	/**
	* Return an object which custom fields can be generated from while editing
	* rules. Adapters must return an object from this method to enable custom
	* field rules.
	*
	* Normally, you'll return an empty version of the adapted object, assuming
	* it implements @{interface:PhabricatorCustomFieldInterface}:
	*
	* return new ApplicationObject();
	*
	* This is normally the only adapter method you need to override to enable
	* Herald rules to run against custom fields.
	*
	* @return null\|PhabricatorCustomFieldInterface Template object.
	* @task customfield
	*/
	protected function getCustomFieldTemplateObject() {
	return null;
	}


	/**
	* Returns the prefix used to namespace Herald fields which are based on
	* custom fields.
	*
	* @return string Key prefix.
	* @task customfield
	*/
	private function getCustomKeyPrefix() {
	return 'herald.custom/';
	}


	/**
	* Determine if a field key is based on a custom field or a regular internal
	* field.
	*
	* @param string Field key.
	* @return bool True if the field key is based on a custom field.
	* @task customfield
	*/
	private function isHeraldCustomKey($key) {
	$prefix = $this->getCustomKeyPrefix();
	return (strncmp($key, $prefix, strlen($prefix)) == 0);
	}


	/**
	* Convert a custom field key into a Herald field key.
	*
	* @param string Custom field key.
	* @return string Herald field key.
	* @task customfield
	*/
	private function getHeraldKeyFromCustomKey($key) {
	return $this->getCustomKeyPrefix().$key;
	}


	/**
	* Get custom fields for this adapter, if appliable. This will either return
	* a field list or `null` if the adapted object does not implement custom
	* fields or the adapter does not support them.
	*
	* @return PhabricatorCustomFieldList\|null List of fields, or `null`.
	* @task customfield
	*/
	private function getCustomFields() {
	if ($this->customFields === false) {
	$this->customFields = null;


	$template_object = $this->getCustomFieldTemplateObject();
	if ($template_object) {
	$object = $this->getObject();
	if (!$object) {
	$object = $template_object;
	}

	$fields = PhabricatorCustomField::getObjectFields(
	$object,
	PhabricatorCustomField::ROLE_HERALD);
	$fields->setViewer(PhabricatorUser::getOmnipotentUser());
	$fields->readFieldsFromStorage($object);

	$this->customFields = $fields;
	}
	}

	return $this->customFields;
	}


	/**
	* Get a custom field by Herald field key, or `null` if it does not exist
	* or custom fields are not supported.
	*
	* @param string Herald field key.
	* @return PhabricatorCustomField\|null Matching field, if it exists.
	* @task customfield
	*/
	private function getCustomField($herald_field_key) {
	$fields = $this->getCustomFields();
	if (!$fields) {
	return null;
	}

	foreach ($fields->getFields() as $custom_field) {
	$key = $custom_field->getFieldKey();
	if ($this->getHeraldKeyFromCustomKey($key) == $herald_field_key) {
	return $custom_field;
	}
	}

	return null;
	}


	/**
	* Get the field map for custom fields.
	*
	* @return map<string, string> Map of Herald field keys to field names.
	* @task customfield
	*/
	private function getCustomFieldNameMap() {
	$fields = $this->getCustomFields();
	if (!$fields) {
	return array();
	}

	$map = array();
	foreach ($fields->getFields() as $field) {
	$key = $field->getFieldKey();
	$name = $field->getHeraldFieldName();
	$map[$this->getHeraldKeyFromCustomKey($key)] = $name;
	}

	return $map;
	}


	/**
	* Get the value for a custom field.
	*
	* @param string Herald field key.
	* @return wild Custom field value.
	* @task customfield
	*/
	private function getCustomFieldValue($field_key) {
	$field = $this->getCustomField($field_key);
	if (!$field) {
	return null;
	}

	return $field->getHeraldFieldValue();
	}


	/**
	* Get the Herald conditions for a custom field.
	*
	* @param string Herald field key.
	* @return list<const> List of Herald conditions.
	* @task customfield
	*/
	private function getCustomFieldConditions($field_key) {
	$field = $this->getCustomField($field_key);
	if (!$field) {
	return array(
	self::CONDITION_NEVER,
	);
	}

	return $field->getHeraldFieldConditions();
	}


	/**
	* Get the Herald value type for a custom field and condition.
	*
	* @param string Herald field key.
	* @param const Herald condition constant.
	* @return const\|null Herald value type constant, or null to use the default.
	* @task customfield
	*/
	private function getCustomFieldValueTypeForFieldAndCondition(
	$field_key,
	$condition) {

	$field = $this->getCustomField($field_key);
	if (!$field) {
	return self::VALUE_NONE;
	}

	return $field->getHeraldFieldValueType($condition);
	}


	}
	diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php
	index ecda679c83..48c296c096 100644
	--- a/src/applications/herald/controller/HeraldRuleController.php
	+++ b/src/applications/herald/controller/HeraldRuleController.php
	@@ -1,657 +1,657 @@
	<?php

	final class HeraldRuleController extends HeraldController {

	private $id;
	private $filter;

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

	public function processRequest() {

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

	$content_type_map = HeraldAdapter::getEnabledAdapterMap($user);
	$rule_type_map = HeraldRuleTypeConfig::getRuleTypeMap();

	if ($this->id) {
	$id = $this->id;
	$rule = id(new HeraldRuleQuery())
	->setViewer($user)
	->withIDs(array($id))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$rule) {
	return new Aphront404Response();
	}
	$cancel_uri = $this->getApplicationURI("rule/{$id}/");
	} else {
	$rule = new HeraldRule();
	$rule->setAuthorPHID($user->getPHID());
	$rule->setMustMatchAll(1);

	$content_type = $request->getStr('content_type');
	$rule->setContentType($content_type);

	$rule_type = $request->getStr('rule_type');
	if (!isset($rule_type_map[$rule_type])) {
	$rule_type = HeraldRuleTypeConfig::RULE_TYPE_PERSONAL;
	}
	$rule->setRuleType($rule_type);

	$adapter = HeraldAdapter::getAdapterForContentType(
	$rule->getContentType());

	if (!$adapter->supportsRuleType($rule->getRuleType())) {
	throw new Exception(
	pht(
	"This rule's content type does not support the selected rule ".
	"type."));
	}

	if ($rule->isObjectRule()) {
	$rule->setTriggerObjectPHID($request->getStr('targetPHID'));
	$object = id(new PhabricatorObjectQuery())
	->setViewer($user)
	->withPHIDs(array($rule->getTriggerObjectPHID()))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$object) {
	throw new Exception(
	pht('No valid object provided for object rule!'));
	}

	if (!$adapter->canTriggerOnObject($object)) {
	throw new Exception(
	pht('Object is of wrong type for adapter!'));
	}
	}

	$cancel_uri = $this->getApplicationURI();
	}

	if ($rule->isGlobalRule()) {
	$this->requireApplicationCapability(
	HeraldCapabilityManageGlobalRules::CAPABILITY);
	}

	$adapter = HeraldAdapter::getAdapterForContentType($rule->getContentType());

	$local_version = id(new HeraldRule())->getConfigVersion();
	if ($rule->getConfigVersion() > $local_version) {
	throw new Exception(
	pht(
	'This rule was created with a newer version of Herald. You can not '.
	'view or edit it in this older version. Upgrade your Phabricator '.
	'deployment.'));
	}

	// Upgrade rule version to our version, since we might add newly-defined
	// conditions, etc.
	$rule->setConfigVersion($local_version);

	$rule_conditions = $rule->loadConditions();
	$rule_actions = $rule->loadActions();

	$rule->attachConditions($rule_conditions);
	$rule->attachActions($rule_actions);

	$e_name = true;
	$errors = array();
	if ($request->isFormPost() && $request->getStr('save')) {
	list($e_name, $errors) = $this->saveRule($adapter, $rule, $request);
	if (!$errors) {
	$id = $rule->getID();
	$uri = $this->getApplicationURI("rule/{$id}/");
	return id(new AphrontRedirectResponse())->setURI($uri);
	}
	}

	$must_match_selector = $this->renderMustMatchSelector($rule);
	$repetition_selector = $this->renderRepetitionSelector($rule, $adapter);

	$handles = $this->loadHandlesForRule($rule);

	require_celerity_resource('herald-css');

	$content_type_name = $content_type_map[$rule->getContentType()];
	$rule_type_name = $rule_type_map[$rule->getRuleType()];

	$form = id(new AphrontFormView())
	->setUser($user)
	->setID('herald-rule-edit-form')
	->addHiddenInput('content_type', $rule->getContentType())
	->addHiddenInput('rule_type', $rule->getRuleType())
	->addHiddenInput('save', 1)
	->appendChild(
	// Build this explicitly (instead of using addHiddenInput())
	// so we can add a sigil to it.
	javelin_tag(
	'input',
	array(
	'type' => 'hidden',
	'name' => 'rule',
	'sigil' => 'rule',
	)))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Rule Name'))
	->setName('name')
	->setError($e_name)
	->setValue($rule->getName()));

	$trigger_object_control = false;
	if ($rule->isObjectRule()) {
	$trigger_object_control = id(new AphrontFormStaticControl())
	->setValue(
	pht(
	'This rule triggers for %s.',
	$handles[$rule->getTriggerObjectPHID()]->renderLink()));
	}


	$form
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setValue(pht(
	'This %s rule triggers for %s.',
	phutil_tag('strong', array(), $rule_type_name),
	phutil_tag('strong', array(), $content_type_name))))
	->appendChild($trigger_object_control)
	->appendChild(
	id(new AphrontFormInsetView())
	->setTitle(pht('Conditions'))
	->setRightButton(javelin_tag(
	'a',
	array(
	'href' => '#',
	'class' => 'button green',
	'sigil' => 'create-condition',
	'mustcapture' => true
	),
	pht('New Condition')))
	->setDescription(
	pht('When %s these conditions are met:', $must_match_selector))
	->setContent(javelin_tag(
	'table',
	array(
	'sigil' => 'rule-conditions',
	'class' => 'herald-condition-table'
	),
	'')))
	->appendChild(
	id(new AphrontFormInsetView())
	->setTitle(pht('Action'))
	->setRightButton(javelin_tag(
	'a',
	array(
	'href' => '#',
	'class' => 'button green',
	'sigil' => 'create-action',
	'mustcapture' => true,
	),
	pht('New Action')))
	->setDescription(pht(
	'Take these actions %s this rule matches:',
	$repetition_selector))
	->setContent(javelin_tag(
	'table',
	array(
	'sigil' => 'rule-actions',
	'class' => 'herald-action-table',
	),
	'')))
	->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Save Rule'))
	->addCancelButton($cancel_uri));

	$this->setupEditorBehavior($rule, $handles, $adapter);

	$title = $rule->getID()
	? pht('Edit Herald Rule')
	: pht('Create Herald Rule');

	$form_box = id(new PHUIObjectBoxView())
	->setHeaderText($title)
	->setFormErrors($errors)
	->setForm($form);

	$crumbs = $this
	->buildApplicationCrumbs()
	->addTextCrumb($title);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$form_box,
	),
	array(
	'title' => pht('Edit Rule'),
	'device' => true,
	));
	}

	private function saveRule(HeraldAdapter $adapter, $rule, $request) {
	$rule->setName($request->getStr('name'));
	$match_all = ($request->getStr('must_match') == 'all');
	$rule->setMustMatchAll((int)$match_all);

	$repetition_policy_param = $request->getStr('repetition_policy');
	$rule->setRepetitionPolicy(
	HeraldRepetitionPolicyConfig::toInt($repetition_policy_param));

	$e_name = true;
	$errors = array();

	if (!strlen($rule->getName())) {
	$e_name = pht('Required');
	$errors[] = pht('Rule must have a name.');
	}

	$data = json_decode($request->getStr('rule'), true);
	if (!is_array($data) \|\|
	!$data['conditions'] \|\|
	!$data['actions']) {
	throw new Exception('Failed to decode rule data.');
	}

	$conditions = array();
	foreach ($data['conditions'] as $condition) {
	if ($condition === null) {
	// We manage this as a sparse array on the client, so may receive
	// NULL if conditions have been removed.
	continue;
	}

	$obj = new HeraldCondition();
	$obj->setFieldName($condition[0]);
	$obj->setFieldCondition($condition[1]);

	if (is_array($condition[2])) {
	$obj->setValue(array_keys($condition[2]));
	} else {
	$obj->setValue($condition[2]);
	}

	try {
	$adapter->willSaveCondition($obj);
	} catch (HeraldInvalidConditionException $ex) {
	$errors[] = $ex->getMessage();
	}

	$conditions[] = $obj;
	}

	$actions = array();
	foreach ($data['actions'] as $action) {
	if ($action === null) {
	// Sparse on the client; removals can give us NULLs.
	continue;
	}

	if (!isset($action[1])) {
	// Legitimate for any action which doesn't need a target, like
	// "Do nothing".
	$action[1] = null;
	}

	$obj = new HeraldAction();
	$obj->setAction($action[0]);
	$obj->setTarget($action[1]);

	try {
	$adapter->willSaveAction($rule, $obj);
	} catch (HeraldInvalidActionException $ex) {
	$errors[] = $ex;
	}

	$actions[] = $obj;
	}

	$rule->attachConditions($conditions);
	$rule->attachActions($actions);

	if (!$errors) {
	try {

	$edit_action = $rule->getID() ? 'edit' : 'create';

	$rule->openTransaction();
	$rule->save();
	$rule->saveConditions($conditions);
	$rule->saveActions($actions);
	$rule->logEdit($request->getUser()->getPHID(), $edit_action);
	$rule->saveTransaction();

	} catch (AphrontQueryDuplicateKeyException $ex) {
	$e_name = pht('Not Unique');
	$errors[] = pht('Rule name is not unique. Choose a unique name.');
	}
	}

	return array($e_name, $errors);
	}

	private function setupEditorBehavior(
	HeraldRule $rule,
	array $handles,
	HeraldAdapter $adapter) {

	$serial_conditions = array(
	array('default', 'default', ''),
	);

	if ($rule->getConditions()) {
	$serial_conditions = array();
	foreach ($rule->getConditions() as $condition) {

	$value = $condition->getValue();
	switch ($condition->getFieldName()) {
	case HeraldAdapter::FIELD_TASK_PRIORITY:
	$value_map = array();
	$priority_map = ManiphestTaskPriority::getTaskPriorityMap();
	foreach ($value as $priority) {
	$value_map[$priority] = idx($priority_map, $priority);
	}
	$value = $value_map;
	break;
	default:
	if (is_array($value)) {
	$value_map = array();
	foreach ($value as $k => $fbid) {
	$value_map[$fbid] = $handles[$fbid]->getName();
	}
	$value = $value_map;
	}
	break;
	}
	$serial_conditions[] = array(
	$condition->getFieldName(),
	$condition->getFieldCondition(),
	$value,
	);
	}
	}

	$serial_actions = array(
	array('default', ''),
	);
	if ($rule->getActions()) {
	$serial_actions = array();
	foreach ($rule->getActions() as $action) {

	switch ($action->getAction()) {
	case HeraldAdapter::ACTION_FLAG:
	case HeraldAdapter::ACTION_BLOCK:
	$current_value = $action->getTarget();
	break;
	default:
	$target_map = array();
	foreach ((array)$action->getTarget() as $fbid) {
	$target_map[$fbid] = $handles[$fbid]->getName();
	}
	$current_value = $target_map;
	break;
	}

	$serial_actions[] = array(
	$action->getAction(),
	$current_value,
	);
	}
	}

	$all_rules = $this->loadRulesThisRuleMayDependUpon($rule);
	$all_rules = mpull($all_rules, 'getName', 'getPHID');
	asort($all_rules);

	$all_fields = $adapter->getFieldNameMap();
	$all_conditions = $adapter->getConditionNameMap();
	$all_actions = $adapter->getActionNameMap($rule->getRuleType());

	$fields = $adapter->getFields();
	$field_map = array_select_keys($all_fields, $fields);

	// Populate any fields which exist in the rule but which we don't know the
	// names of, so that saving a rule without touching anything doesn't change
	// it.
	foreach ($rule->getConditions() as $condition) {
	if (empty($field_map[$condition->getFieldName()])) {
	$field_map[$condition->getFieldName()] = pht('<Unknown Field>');
	}
	}

	$actions = $adapter->getActions($rule->getRuleType());
	$action_map = array_select_keys($all_actions, $actions);

	$config_info = array();
	$config_info['fields'] = $field_map;
	$config_info['conditions'] = $all_conditions;
	$config_info['actions'] = $action_map;

	foreach ($config_info['fields'] as $field => $name) {
	$field_conditions = $adapter->getConditionsForField($field);
	$config_info['conditionMap'][$field] = $field_conditions;
	}

	foreach ($config_info['fields'] as $field => $fname) {
	foreach ($config_info['conditionMap'][$field] as $condition) {
	$value_type = $adapter->getValueTypeForFieldAndCondition(
	$field,
	$condition);
	$config_info['values'][$field][$condition] = $value_type;
	}
	}

	$config_info['rule_type'] = $rule->getRuleType();

	foreach ($config_info['actions'] as $action => $name) {
	$config_info['targets'][$action] = $adapter->getValueTypeForAction(
	$action,
	$rule->getRuleType());
	}

	$changeflag_options =
	PhabricatorRepositoryPushLog::getHeraldChangeFlagConditionOptions();
	Javelin::initBehavior(
	'herald-rule-editor',
	array(
	'root' => 'herald-rule-edit-form',
	'conditions' => (object)$serial_conditions,
	'actions' => (object)$serial_actions,
	'select' => array(
	HeraldAdapter::VALUE_CONTENT_SOURCE => array(
	'options' => PhabricatorContentSource::getSourceNameMap(),
	'default' => PhabricatorContentSource::SOURCE_WEB,
	),
	HeraldAdapter::VALUE_FLAG_COLOR => array(
	'options' => PhabricatorFlagColor::getColorNameMap(),
	'default' => PhabricatorFlagColor::COLOR_BLUE,
	),
	HeraldPreCommitRefAdapter::VALUE_REF_TYPE => array(
	'options' => array(
	PhabricatorRepositoryPushLog::REFTYPE_BRANCH
	=> pht('branch (git/hg)'),
	PhabricatorRepositoryPushLog::REFTYPE_TAG
	=> pht('tag (git)'),
	PhabricatorRepositoryPushLog::REFTYPE_BOOKMARK
	=> pht('bookmark (hg)'),
	),
	'default' => PhabricatorRepositoryPushLog::REFTYPE_BRANCH,
	),
	HeraldPreCommitRefAdapter::VALUE_REF_CHANGE => array(
	'options' => $changeflag_options,
	'default' => PhabricatorRepositoryPushLog::CHANGEFLAG_ADD,
	),
	),
	'template' => $this->buildTokenizerTemplates($handles) + array(
	'rules' => $all_rules,
	),
	'author' => array($rule->getAuthorPHID() =>
	$handles[$rule->getAuthorPHID()]->getName()),
	'info' => $config_info,
	));
	}

	private function loadHandlesForRule($rule) {
	$phids = array();

	foreach ($rule->getActions() as $action) {
	if (!is_array($action->getTarget())) {
	continue;
	}
	foreach ($action->getTarget() as $target) {
	$target = (array)$target;
	foreach ($target as $phid) {
	$phids[] = $phid;
	}
	}
	}

	foreach ($rule->getConditions() as $condition) {
	$value = $condition->getValue();
	if (is_array($value)) {
	foreach ($value as $phid) {
	$phids[] = $phid;
	}
	}
	}

	$phids[] = $rule->getAuthorPHID();

	if ($rule->isObjectRule()) {
	$phids[] = $rule->getTriggerObjectPHID();
	}

	return $this->loadViewerHandles($phids);
	}


	/**
	* Render the selector for the "When (all of \| any of) these conditions are
	* met:" element.
	*/
	private function renderMustMatchSelector($rule) {
	return AphrontFormSelectControl::renderSelectTag(
	$rule->getMustMatchAll() ? 'all' : 'any',
	array(
	'all' => pht('all of'),
	'any' => pht('any of'),
	),
	array(
	'name' => 'must_match',
	));
	}


	/**
	* Render the selector for "Take these actions (every time \| only the first
	* time) this rule matches..." element.
	*/
	private function renderRepetitionSelector($rule, HeraldAdapter $adapter) {
	$repetition_policy = HeraldRepetitionPolicyConfig::toString(
	$rule->getRepetitionPolicy());

	$repetition_options = $adapter->getRepetitionOptions();
	$repetition_names = HeraldRepetitionPolicyConfig::getMap();
	$repetition_map = array_select_keys($repetition_names, $repetition_options);

	if (count($repetition_map) < 2) {
	return head($repetition_names);
	} else {
	return AphrontFormSelectControl::renderSelectTag(
	$repetition_policy,
	$repetition_map,
	array(
	'name' => 'repetition_policy',
	));
	}
	}


	protected function buildTokenizerTemplates(array $handles) {
	$template = new AphrontTokenizerTemplateView();
	$template = $template->render();

	return array(
	'source' => array(
	'email' => '/typeahead/common/mailable/',
	'user' => '/typeahead/common/accounts/',
	'repository' => '/typeahead/common/repositories/',
	'package' => '/typeahead/common/packages/',
	'project' => '/typeahead/common/projects/',
	'userorproject' => '/typeahead/common/accountsorprojects/',
	'buildplan' => '/typeahead/common/buildplans/',
	'taskpriority' => '/typeahead/common/taskpriority/',
	'arcanistprojects' => '/typeahead/common/arcanistprojects/',
	),
	'username' => $this->getRequest()->getUser()->getUserName(),
	'icons' => mpull($handles, 'getTypeIcon', 'getPHID'),
	'markup' => $template,
	);
	}


	/**
	* Load rules for the "Another Herald rule..." condition dropdown, which
	* allows one rule to depend upon the success or failure of another rule.
	*/
	private function loadRulesThisRuleMayDependUpon(HeraldRule $rule) {
	$viewer = $this->getRequest()->getUser();

	// Any rule can depend on a global rule.
	$all_rules = id(new HeraldRuleQuery())
	->setViewer($viewer)
	->withRuleTypes(array(HeraldRuleTypeConfig::RULE_TYPE_GLOBAL))
	->withContentTypes(array($rule->getContentType()))
	->execute();

	if ($rule->isObjectRule()) {
	// Object rules may depend on other rules for the same object.
	$all_rules += id(new HeraldRuleQuery())
	->setViewer($viewer)
	->withRuleTypes(array(HeraldRuleTypeConfig::RULE_TYPE_OBJECT))
	->withContentTypes(array($rule->getContentType()))
	->withTriggerObjectPHIDs(array($rule->getTriggerObjectPHID()))
	->execute();
	}

	if ($rule->isPersonalRule()) {
	// Personal rules may depend upon your other personal rules.
	$all_rules += id(new HeraldRuleQuery())
	->setViewer($viewer)
	->withRuleTypes(array(HeraldRuleTypeConfig::RULE_TYPE_PERSONAL))
	->withContentTypes(array($rule->getContentType()))
	->withAuthorPHIDs(array($rule->getAuthorPHID()))
	->execute();
	}

	// mark disabled rules as disabled since they are not useful as such;
	// don't filter though to keep edit cases sane / expected
	foreach ($all_rules as $current_rule) {
	if ($current_rule->getIsDisabled()) {
	$current_rule->makeEphemeral();
	- $current_rule->setName($rule->getName(). ' '.pht('(Disabled)'));
	+ $current_rule->setName($rule->getName().' '.pht('(Disabled)'));
	}
	}

	// A rule can not depend upon itself.
	unset($all_rules[$rule->getID()]);

	return $all_rules;
	}


	}
	diff --git a/src/applications/meta/controller/PhabricatorApplicationUninstallController.php b/src/applications/meta/controller/PhabricatorApplicationUninstallController.php
	index 052ef30222..80b0151cfa 100644
	--- a/src/applications/meta/controller/PhabricatorApplicationUninstallController.php
	+++ b/src/applications/meta/controller/PhabricatorApplicationUninstallController.php
	@@ -1,96 +1,96 @@
	<?php

	final class PhabricatorApplicationUninstallController
	extends PhabricatorApplicationsController {

	private $application;
	private $action;

	public function shouldRequireAdmin() {
	return true;
	}

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

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

	$selected = PhabricatorApplication::getByClass($this->application);

	if (!$selected) {
	return new Aphront404Response();
	}

	$view_uri = $this->getApplicationURI('view/'.$this->application);

	$beta_enabled = PhabricatorEnv::getEnvConfig(
	'phabricator.show-beta-applications');

	$dialog = id(new AphrontDialogView())
	->setUser($user)
	->addCancelButton($view_uri);

	if ($selected->isBeta() && !$beta_enabled) {
	$dialog
	->setTitle(pht('Beta Applications Not Enabled'))
	->appendChild(
	pht(
	'To manage beta applications, enable them by setting %s in your '.
	'Phabricator configuration.',
	phutil_tag('tt', array(), 'phabricator.show-beta-applications')));
	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	if ($request->isDialogFormPost()) {
	$this->manageApplication();
	return id(new AphrontRedirectResponse())->setURI($view_uri);
	}

	if ($this->action == 'install') {
	if ($selected->canUninstall()) {
	$dialog->setTitle('Confirmation')
	->appendChild(
	- 'Install '. $selected->getName(). ' application?')
	+ 'Install '.$selected->getName().' application?')
	->addSubmitButton('Install');

	} else {
	$dialog->setTitle('Information')
	->appendChild('You cannot install an installed application.');
	}
	} else {
	if ($selected->canUninstall()) {
	$dialog->setTitle('Confirmation')
	->appendChild(
	- 'Really Uninstall '. $selected->getName(). ' application?')
	+ 'Really Uninstall '.$selected->getName().' application?')
	->addSubmitButton('Uninstall');
	} else {
	$dialog->setTitle('Information')
	->appendChild(
	'This application cannot be uninstalled,
	because it is required for Phabricator to work.');
	}
	}
	return id(new AphrontDialogResponse())->setDialog($dialog);
	}

	public function manageApplication() {
	$key = 'phabricator.uninstalled-applications';
	$config_entry = PhabricatorConfigEntry::loadConfigEntry($key);
	$list = $config_entry->getValue();
	$uninstalled = PhabricatorEnv::getEnvConfig($key);

	if (isset($uninstalled[$this->application])) {
	unset($list[$this->application]);
	} else {
	$list[$this->application] = true;
	}

	PhabricatorConfigEditor::storeNewValue(
	$config_entry, $list, $this->getRequest());
	}

	}
	diff --git a/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php b/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php
	index 08414f2e97..4a9c2cc845 100644
	--- a/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php
	+++ b/src/applications/metamta/parser/__tests__/PhabricatorMetaMTAEmailBodyParserTestCase.php
	@@ -1,183 +1,183 @@
	<?php

	final class PhabricatorMetaMTAEmailBodyParserTestCase
	extends PhabricatorTestCase {

	public function testQuotedTextStripping() {
	$bodies = $this->getEmailBodies();
	foreach ($bodies as $body) {
	$parser = new PhabricatorMetaMTAEmailBodyParser();
	$stripped = $parser->stripTextBody($body);
	$this->assertEqual('OKAY', $stripped);
	}
	}

	public function testEmailBodyCommandParsing() {
	$bodies = $this->getEmailBodiesWithFullCommands();
	foreach ($bodies as $body) {
	$parser = new PhabricatorMetaMTAEmailBodyParser();
	$body_data = $parser->parseBody($body);
	$this->assertEqual('OKAY', $body_data['body']);
	$this->assertEqual('whatevs', $body_data['command']);
	$this->assertEqual('dude', $body_data['command_value']);
	}
	$bodies = $this->getEmailBodiesWithPartialCommands();
	foreach ($bodies as $body) {
	$parser = new PhabricatorMetaMTAEmailBodyParser();
	$body_data = $parser->parseBody($body);
	$this->assertEqual('OKAY', $body_data['body']);
	$this->assertEqual('whatevs', $body_data['command']);
	$this->assertEqual(null, $body_data['command_value']);
	}
	}

	public function testFalsePositiveForOnWrote() {
	$body = <<<EOEMAIL
	On which horse shall you ride?

	On Sep 23, alincoln wrote:

	> Hey bro do you want to go ride horses tomorrow?
	EOEMAIL;

	$parser = new PhabricatorMetaMTAEmailBodyParser();
	$stripped = $parser->stripTextBody($body);
	$this->assertEqual('On which horse shall you ride?', $stripped);
	}

	private function getEmailBodiesWithFullCommands() {
	$bodies = $this->getEmailBodies();
	$with_commands = array();
	foreach ($bodies as $body) {
	- $with_commands[] = "!whatevs dude\n" . $body;
	+ $with_commands[] = "!whatevs dude\n".$body;
	}
	return $with_commands;
	}

	private function getEmailBodiesWithPartialCommands() {
	$bodies = $this->getEmailBodies();
	$with_commands = array();
	foreach ($bodies as $body) {
	- $with_commands[] = "!whatevs\n" . $body;
	+ $with_commands[] = "!whatevs\n".$body;
	}
	return $with_commands;
	}


	private function getEmailBodies() {
	$trailing_space = ' ';

	return array(
	<<<EOEMAIL
	OKAY

	On May 30, 2011, at 8:36 PM, Someone wrote:

	> ...

	EOEMAIL
	,
	<<<EOEMAIL
	OKAY

	On Fri, May 27, 2011 at 9:39 AM, Someone <
	somebody@somewhere.com> wrote:

	> ...

	EOEMAIL
	,
	<<<EOEMAIL
	OKAY

	On Fri, May 27, 2011 at 9:39 AM, Someone
	<somebody@somewhere.com> wrote:

	> ...

	EOEMAIL
	,
	<<<EOEMAIL
	OKAY

	-----Oprindelig Meddelelse-----

	> ...
	EOEMAIL
	,
	<<<EOEMAIL
	OKAY

	-----Original Message-----

	> ...
	EOEMAIL
	,
	<<<EOEMAIL
	OKAY

	-----oprindelig meddelelse-----

	> ...
	EOEMAIL
	,
	<<<EOEMAIL
	OKAY

	-----original message-----

	> ...
	EOEMAIL
	,
	<<<EOEMAIL
	OKAY

	Sent from my HTC smartphone on the Now Network from Sprint!

	-Reply message ----- From: "somebody (someone)" <
	somebody@somewhere.com>
	To: <somebody@somewhere.com>
	Subject: Some Text Date: Mon, Apr 2, 2012 1:42 pm
	> ...
	EOEMAIL
	,
	<<<EOEMAIL
	OKAY

	--{$trailing_space}
	Abraham Lincoln
	Supreme Galactic Emperor
	EOEMAIL
	,
	<<<EOEMAIL
	OKAY

	Sent from my iPhone
	EOEMAIL
	,
	<<<EOMAIL
	OKAY

	________________________________________
	From: Abraham Lincoln <alincoln@logcab.in>
	Subject: Core World Tariffs
	EOMAIL
	,
	<<<EOMAIL
	OKAY

	> On 17 Oct 2013, at 17:47, "Someone" <somebody@somewhere> wrote:
	> ...
	EOMAIL
	,
	<<<EOMAIL
	OKAY

	> -----Original Message-----
	>
	> ...
	EOMAIL
	);
	}

	}
	diff --git a/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php b/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
	index eaa890ae37..64784a1963 100644
	--- a/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
	+++ b/src/applications/metamta/replyhandler/PhabricatorMailReplyHandler.php
	@@ -1,331 +1,331 @@
	<?php

	abstract class PhabricatorMailReplyHandler {

	private $mailReceiver;
	private $actor;
	private $excludePHIDs = array();

	final public function setMailReceiver($mail_receiver) {
	$this->validateMailReceiver($mail_receiver);
	$this->mailReceiver = $mail_receiver;
	return $this;
	}

	final public function getMailReceiver() {
	return $this->mailReceiver;
	}

	final public function setActor(PhabricatorUser $actor) {
	$this->actor = $actor;
	return $this;
	}

	final public function getActor() {
	return $this->actor;
	}

	final public function setExcludeMailRecipientPHIDs(array $exclude) {
	$this->excludePHIDs = $exclude;
	return $this;
	}

	final public function getExcludeMailRecipientPHIDs() {
	return $this->excludePHIDs;
	}

	abstract public function validateMailReceiver($mail_receiver);
	abstract public function getPrivateReplyHandlerEmailAddress(
	PhabricatorObjectHandle $handle);
	public function getReplyHandlerDomain() {
	return PhabricatorEnv::getEnvConfig(
	'metamta.reply-handler-domain');
	}
	abstract public function getReplyHandlerInstructions();
	abstract protected function receiveEmail(
	PhabricatorMetaMTAReceivedMail $mail);

	public function processEmail(PhabricatorMetaMTAReceivedMail $mail) {
	$this->dropEmptyMail($mail);

	return $this->receiveEmail($mail);
	}

	private function dropEmptyMail(PhabricatorMetaMTAReceivedMail $mail) {
	$body = $mail->getCleanTextBody();
	$attachments = $mail->getAttachments();

	if (strlen($body) \|\| $attachments) {
	return;
	}

	// Only send an error email if the user is talking to just Phabricator.
	// We can assume if there is only one "To" address it is a Phabricator
	// address since this code is running and everything.
	$is_direct_mail = (count($mail->getToAddresses()) == 1) &&
	(count($mail->getCCAddresses()) == 0);

	if ($is_direct_mail) {
	$status_code = MetaMTAReceivedMailStatus::STATUS_EMPTY;
	} else {
	$status_code = MetaMTAReceivedMailStatus::STATUS_EMPTY_IGNORED;
	}

	throw new PhabricatorMetaMTAReceivedMailProcessingException(
	$status_code,
	pht(
	'Your message does not contain any body text or attachments, so '.
	'Phabricator can not do anything useful with it. Make sure comment '.
	'text appears at the top of your message: quoted replies, inline '.
	'text, and signatures are discarded and ignored.'));
	}

	public function supportsPrivateReplies() {
	return (bool)$this->getReplyHandlerDomain() &&
	!$this->supportsPublicReplies();
	}

	public function supportsPublicReplies() {
	if (!PhabricatorEnv::getEnvConfig('metamta.public-replies')) {
	return false;
	}
	if (!$this->getReplyHandlerDomain()) {
	return false;
	}
	return (bool)$this->getPublicReplyHandlerEmailAddress();
	}

	final public function supportsReplies() {
	return $this->supportsPrivateReplies() \|\|
	$this->supportsPublicReplies();
	}

	public function getPublicReplyHandlerEmailAddress() {
	return null;
	}

	final public function getRecipientsSummary(
	array $to_handles,
	array $cc_handles) {
	assert_instances_of($to_handles, 'PhabricatorObjectHandle');
	assert_instances_of($cc_handles, 'PhabricatorObjectHandle');

	$body = '';

	if (PhabricatorEnv::getEnvConfig('metamta.recipients.show-hints')) {
	if ($to_handles) {
	$body .= "To: ".implode(', ', mpull($to_handles, 'getName'))."\n";
	}
	if ($cc_handles) {
	$body .= "Cc: ".implode(', ', mpull($cc_handles, 'getName'))."\n";
	}
	}

	return $body;
	}

	final public function multiplexMail(
	PhabricatorMetaMTAMail $mail_template,
	array $to_handles,
	array $cc_handles) {
	assert_instances_of($to_handles, 'PhabricatorObjectHandle');
	assert_instances_of($cc_handles, 'PhabricatorObjectHandle');

	$result = array();

	// If MetaMTA is configured to always multiplex, skip the single-email
	// case.
	if (!PhabricatorMetaMTAMail::shouldMultiplexAllMail()) {
	// If private replies are not supported, simply send one email to all
	// recipients and CCs. This covers cases where we have no reply handler,
	// or we have a public reply handler.
	if (!$this->supportsPrivateReplies()) {
	$mail = clone $mail_template;
	$mail->addTos(mpull($to_handles, 'getPHID'));
	$mail->addCCs(mpull($cc_handles, 'getPHID'));

	if ($this->supportsPublicReplies()) {
	$reply_to = $this->getPublicReplyHandlerEmailAddress();
	$mail->setReplyTo($reply_to);
	}

	$result[] = $mail;

	return $result;
	}
	}

	// TODO: This is pretty messy. We should really be doing all of this
	// multiplexing in the task queue, but that requires significant rewriting
	// in the general case. ApplicationTransactions can do it fairly easily,
	// but other mail sites currently can not, so we need to support this
	// junky version until they catch up and we can swap things over.

	$to_handles = $this->expandRecipientHandles($to_handles);
	$cc_handles = $this->expandRecipientHandles($cc_handles);

	$tos = mpull($to_handles, null, 'getPHID');
	$ccs = mpull($cc_handles, null, 'getPHID');

	// Merge all the recipients together. TODO: We could keep the CCs as real
	// CCs and send to a "noreply@domain.com" type address, but keep it simple
	// for now.
	$recipients = $tos + $ccs;

	// When multiplexing mail, explicitly include To/Cc information in the
	// message body and headers.

	$mail_template = clone $mail_template;

	$mail_template->addPHIDHeaders('X-Phabricator-To', array_keys($tos));
	$mail_template->addPHIDHeaders('X-Phabricator-Cc', array_keys($ccs));

	$body = $mail_template->getBody();
	$body .= "\n";
	$body .= $this->getRecipientsSummary($to_handles, $cc_handles);

	foreach ($recipients as $phid => $recipient) {


	$mail = clone $mail_template;
	if (isset($to_handles[$phid])) {
	$mail->addTos(array($phid));
	} else if (isset($cc_handles[$phid])) {
	$mail->addCCs(array($phid));
	} else {
	// not good - they should be a to or a cc
	continue;
	}

	$mail->setBody($body);

	$reply_to = null;
	if (!$reply_to && $this->supportsPrivateReplies()) {
	$reply_to = $this->getPrivateReplyHandlerEmailAddress($recipient);
	}

	if (!$reply_to && $this->supportsPublicReplies()) {
	$reply_to = $this->getPublicReplyHandlerEmailAddress();
	}

	if ($reply_to) {
	$mail->setReplyTo($reply_to);
	}

	$result[] = $mail;
	}

	return $result;
	}

	protected function getDefaultPublicReplyHandlerEmailAddress($prefix) {

	$receiver = $this->getMailReceiver();
	$receiver_id = $receiver->getID();
	$domain = $this->getReplyHandlerDomain();

	// We compute a hash using the object's own PHID to prevent an attacker
	// from blindly interacting with objects that they haven't ever received
	// mail about by just sending to D1@, D2@, etc...
	$hash = PhabricatorObjectMailReceiver::computeMailHash(
	$receiver->getMailKey(),
	$receiver->getPHID());

	$address = "{$prefix}{$receiver_id}+public+{$hash}@{$domain}";
	return $this->getSingleReplyHandlerPrefix($address);
	}

	protected function getSingleReplyHandlerPrefix($address) {
	$single_handle_prefix = PhabricatorEnv::getEnvConfig(
	'metamta.single-reply-handler-prefix');
	return ($single_handle_prefix)
	- ? $single_handle_prefix . '+' . $address
	+ ? $single_handle_prefix.'+'.$address
	: $address;
	}

	protected function getDefaultPrivateReplyHandlerEmailAddress(
	PhabricatorObjectHandle $handle,
	$prefix) {

	if ($handle->getType() != PhabricatorPeoplePHIDTypeUser::TYPECONST) {
	// You must be a real user to get a private reply handler address.
	return null;
	}

	$user = id(new PhabricatorPeopleQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withPHIDs(array($handle->getPHID()))
	->executeOne();

	if (!$user) {
	// This may happen if a user was subscribed to something, and was then
	// deleted.
	return null;
	}

	$receiver = $this->getMailReceiver();
	$receiver_id = $receiver->getID();
	$user_id = $user->getID();
	$hash = PhabricatorObjectMailReceiver::computeMailHash(
	$receiver->getMailKey(),
	$handle->getPHID());
	$domain = $this->getReplyHandlerDomain();

	$address = "{$prefix}{$receiver_id}+{$user_id}+{$hash}@{$domain}";
	return $this->getSingleReplyHandlerPrefix($address);
	}

	final protected function enhanceBodyWithAttachments(
	$body,
	array $attachments,
	$format = '- {F%d, layout=link}') {
	if (!$attachments) {
	return $body;
	}

	// TODO: (T603) What's the policy here?
	$files = id(new PhabricatorFile())
	->loadAllWhere('phid in (%Ls)', $attachments);

	// if we have some text then double return before adding our file list
	if ($body) {
	$body .= "\n\n";
	}

	foreach ($files as $file) {
	$file_str = sprintf($format, $file->getID());
	$body .= $file_str."\n";
	}

	return rtrim($body);
	}

	private function expandRecipientHandles(array $handles) {
	if (!$handles) {
	return array();
	}

	$phids = mpull($handles, 'getPHID');
	$map = id(new PhabricatorMetaMTAMemberQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withPHIDs($phids)
	->execute();

	$results = array();
	foreach ($phids as $phid) {
	if (isset($map[$phid])) {
	foreach ($map[$phid] as $expanded_phid) {
	$results[$expanded_phid] = $expanded_phid;
	}
	} else {
	$results[$phid] = $phid;
	}
	}

	return id(new PhabricatorHandleQuery())
	->setViewer(PhabricatorUser::getOmnipotentUser())
	->withPHIDs($results)
	->execute();
	}

	}
	diff --git a/src/applications/owners/conduit/ConduitAPI_owners_query_Method.php b/src/applications/owners/conduit/ConduitAPI_owners_query_Method.php
	index 6d93d659ba..45805eeb6f 100644
	--- a/src/applications/owners/conduit/ConduitAPI_owners_query_Method.php
	+++ b/src/applications/owners/conduit/ConduitAPI_owners_query_Method.php
	@@ -1,158 +1,158 @@
	<?php

	/**
	* @group conduit
	*/
	final class ConduitAPI_owners_query_Method
	extends ConduitAPI_owners_Method {

	public function getMethodDescription() {
	- return 'Query for packages by one of the following: repository/path, ' .
	- 'packages with a given user or project owner, or packages affiliated ' .
	- 'with a user (owned by either the user or a project they are a member ' .
	+ return 'Query for packages by one of the following: repository/path, '.
	+ 'packages with a given user or project owner, or packages affiliated '.
	+ 'with a user (owned by either the user or a project they are a member '.
	'of.) You should only provide at most one search query.';
	}

	public function defineParamTypes() {
	return array(
	'userOwner' => 'optional string',
	'projectOwner' => 'optional string',
	'userAffiliated' => 'optional string',
	'repositoryCallsign' => 'optional string',
	'path' => 'optional string',
	);

	}

	public function defineReturnType() {
	return 'dict<phid -> dict of package info>';
	}

	public function defineErrorTypes() {
	return array(
	'ERR-INVALID-USAGE' =>
	- 'Provide one of a single owner phid (user/project), a single ' .
	+ 'Provide one of a single owner phid (user/project), a single '.
	'affiliated user phid (user), or a repository/path.',
	'ERR-INVALID-PARAMETER' => 'parameter should be a phid',
	'ERR_REP_NOT_FOUND' => 'The repository callsign is not recognized',
	);
	}

	protected static function queryAll() {
	return id(new PhabricatorOwnersPackage())->loadAll();
	}

	protected static function queryByOwner($owner) {
	$is_valid_phid =
	phid_get_type($owner) == PhabricatorPeoplePHIDTypeUser::TYPECONST \|\|
	phid_get_type($owner) == PhabricatorProjectPHIDTypeProject::TYPECONST;

	if (!$is_valid_phid) {
	throw id(new ConduitException('ERR-INVALID-PARAMETER'))
	->setErrorDescription(
	'Expected user/project PHID for owner, got '.$owner);
	}

	$owners = id(new PhabricatorOwnersOwner())->loadAllWhere(
	'userPHID = %s',
	$owner);

	$package_ids = mpull($owners, 'getPackageID');
	$packages = array();
	foreach ($package_ids as $id) {
	$packages[] = id(new PhabricatorOwnersPackage())->load($id);
	}
	return $packages;
	}

	private static function queryByPath(
	PhabricatorUser $viewer,
	$repo_callsign,
	$path) {

	$repository = id(new PhabricatorRepositoryQuery())
	->setViewer($viewer)
	->withCallsigns(array($repo_callsign))
	->executeOne();

	if (!$repository) {
	throw id(new ConduitException('ERR_REP_NOT_FOUND'))
	->setErrorDescription(
	'Repository callsign '.$repo_callsign.' not recognized');
	}
	if ($path == null) {
	return PhabricatorOwnersPackage::loadPackagesForRepository($repository);
	} else {
	return PhabricatorOwnersPackage::loadOwningPackages(
	$repository, $path);
	}
	}

	public static function buildPackageInformationDictionaries($packages) {
	assert_instances_of($packages, 'PhabricatorOwnersPackage');

	$result = array();
	foreach ($packages as $package) {
	$p_owners = $package->loadOwners();
	$p_paths = $package->loadPaths();

	$owners = array_values(mpull($p_owners, 'getUserPHID'));
	$paths = array();
	foreach ($p_paths as $p) {
	$paths[] = array($p->getRepositoryPHID(), $p->getPath());
	}

	$result[$package->getPHID()] = array(
	'phid' => $package->getPHID(),
	'name' => $package->getName(),
	'description' => $package->getDescription(),
	'primaryOwner' => $package->getPrimaryOwnerPHID(),
	'owners' => $owners,
	'paths' => $paths
	);
	}
	return $result;
	}

	protected function execute(ConduitAPIRequest $request) {
	$is_owner_query =
	($request->getValue('userOwner') \|\|
	$request->getValue('projectOwner')) ?
	1 : 0;

	$is_affiliated_query = $request->getValue('userAffiliated') ?
	1 : 0;

	$repo = $request->getValue('repositoryCallsign');
	$path = $request->getValue('path');
	$is_path_query = $repo ? 1 : 0;

	if ($is_owner_query + $is_path_query + $is_affiliated_query === 0) {
	// if no search terms are provided, return everything
	$packages = self::queryAll();
	} else if ($is_owner_query + $is_path_query + $is_affiliated_query > 1) {
	// otherwise, exactly one of these should be provided
	throw new ConduitException('ERR-INVALID-USAGE');
	}

	if ($is_affiliated_query) {
	$query = id(new PhabricatorOwnersPackageQuery())
	->setViewer($request->getUser());

	$query->withOwnerPHIDs(array($request->getValue('userAffiliated')));

	$packages = $query->execute();
	} else if ($is_owner_query) {
	$owner = nonempty(
	$request->getValue('userOwner'),
	$request->getValue('projectOwner'));

	$packages = self::queryByOwner($owner);

	} else if ($is_path_query) {
	$packages = self::queryByPath($request->getUser(), $repo, $path);
	}

	return self::buildPackageInformationDictionaries($packages);
	}
	}
	diff --git a/src/applications/owners/mail/PackageMail.php b/src/applications/owners/mail/PackageMail.php
	index b0110caad2..58060d9633 100644
	--- a/src/applications/owners/mail/PackageMail.php
	+++ b/src/applications/owners/mail/PackageMail.php
	@@ -1,210 +1,210 @@
	<?php

	abstract class PackageMail extends PhabricatorMail {

	protected $package;
	protected $handles;
	protected $owners;
	protected $paths;
	protected $mailTo;

	public function __construct(PhabricatorOwnersPackage $package) {
	$this->package = $package;
	}

	abstract protected function getVerb();

	abstract protected function isNewThread();

	final protected function getPackage() {
	return $this->package;
	}

	final protected function getHandles() {
	return $this->handles;
	}

	final protected function getOwners() {
	return $this->owners;
	}

	final protected function getPaths() {
	return $this->paths;
	}

	final protected function getMailTo() {
	return $this->mailTo;
	}

	final protected function renderPackageTitle() {
	return $this->getPackage()->getName();
	}

	final protected function renderRepoSubSection($repository_phid, $paths) {
	$handles = $this->getHandles();
	$section = array();
	$section[] = ' In repository '.$handles[$repository_phid]->getName().
	- ' - '. PhabricatorEnv::getProductionURI($handles[$repository_phid]
	+ ' - '.PhabricatorEnv::getProductionURI($handles[$repository_phid]
	->getURI());
	foreach ($paths as $path => $excluded) {
	$section[] = ' '.($excluded ? 'Excluded' : 'Included').' '.$path;
	}

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

	protected function needSend() {
	return true;
	}

	protected function loadData() {
	$package = $this->getPackage();
	$owners = $package->loadOwners();
	$this->owners = $owners;

	$owner_phids = mpull($owners, 'getUserPHID');
	$primary_owner_phid = $package->getPrimaryOwnerPHID();
	$mail_to = $owner_phids;
	if (!in_array($primary_owner_phid, $owner_phids)) {
	$mail_to[] = $primary_owner_phid;
	}
	$this->mailTo = $mail_to;

	$this->paths = array();
	$repository_paths = mgroup($package->loadPaths(), 'getRepositoryPHID');
	foreach ($repository_paths as $repository_phid => $paths) {
	$this->paths[$repository_phid] = mpull($paths, 'getExcluded', 'getPath');
	}

	$phids = array_merge(
	$this->mailTo,
	array($package->getActorPHID()),
	array_keys($this->paths));
	$this->handles = id(new PhabricatorHandleQuery())
	->setViewer($this->getActor())
	->withPHIDs($phids)
	->execute();
	}

	final protected function renderSummarySection() {
	$package = $this->getPackage();
	$handles = $this->getHandles();
	$section = array();
	$section[] = $handles[$package->getActorPHID()]->getName().' '.
	strtolower($this->getVerb()).' '.$this->renderPackageTitle().'.';
	$section[] = '';

	$section[] = 'PACKAGE DETAIL';
	$section[] = ' '.PhabricatorEnv::getProductionURI(
	'/owners/package/'.$package->getID().'/');

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

	protected function renderDescriptionSection() {
	return "PACKAGE DESCRIPTION\n".
	' '.$this->getPackage()->getDescription();
	}

	protected function renderPrimaryOwnerSection() {
	$handles = $this->getHandles();
	return "PRIMARY OWNER\n".
	' '.$handles[$this->getPackage()->getPrimaryOwnerPHID()]->getName();
	}

	protected function renderOwnersSection() {
	$handles = $this->getHandles();
	$owners = $this->getOwners();
	if (!$owners) {
	return null;
	}

	$owners = mpull($owners, 'getUserPHID');
	$owners = array_select_keys($handles, $owners);
	$owners = mpull($owners, 'getName');
	return "OWNERS\n".
	' '.implode(', ', $owners);
	}

	protected function renderAuditingEnabledSection() {
	return "AUDITING ENABLED STATUS\n".
	' '.($this->getPackage()->getAuditingEnabled() ? 'Enabled' : 'Disabled');
	}

	protected function renderPathsSection() {
	$section = array();
	$section[] = 'PATHS';
	foreach ($this->paths as $repository_phid => $paths) {
	$section[] = $this->renderRepoSubSection($repository_phid, $paths);
	}

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

	final protected function renderBody() {
	$body = array();
	$body[] = $this->renderSummarySection();
	$body[] = $this->renderDescriptionSection();
	$body[] = $this->renderPrimaryOwnerSection();
	$body[] = $this->renderOwnersSection();
	$body[] = $this->renderAuditingEnabledSection();
	$body[] = $this->renderPathsSection();
	$body = array_filter($body);
	return implode("\n\n", $body)."\n";
	}

	final public function send() {
	$mails = $this->prepareMails();

	foreach ($mails as $mail) {
	$mail->saveAndSend();
	}
	}

	final public function prepareMails() {
	if (!$this->needSend()) {
	return array();
	}

	$this->loadData();

	$package = $this->getPackage();
	$prefix = PhabricatorEnv::getEnvConfig('metamta.package.subject-prefix');
	$verb = $this->getVerb();
	$threading = $this->getMailThreading();
	list($thread_id, $thread_topic) = $threading;

	$template = id(new PhabricatorMetaMTAMail())
	->setSubject($this->renderPackageTitle())
	->setSubjectPrefix($prefix)
	->setVarySubjectPrefix("[{$verb}]")
	->setFrom($package->getActorPHID())
	->setThreadID($thread_id, $this->isNewThread())
	->addHeader('Thread-Topic', $thread_topic)
	->setRelatedPHID($package->getPHID())
	->setIsBulk(true)
	->setBody($this->renderBody());

	$reply_handler = $this->newReplyHandler();
	$mails = $reply_handler->multiplexMail(
	$template,
	array_select_keys($this->getHandles(), $this->getMailTo()),
	array());
	return $mails;
	}

	private function getMailThreading() {
	return array(
	'package-'.$this->getPackage()->getPHID(),
	'Package '.$this->getPackage()->getOriginalName(),
	);
	}

	private function newReplyHandler() {
	$reply_handler = PhabricatorEnv::newObjectFromConfig(
	'metamta.package.reply-handler');
	$reply_handler->setMailReceiver($this->getPackage());
	return $reply_handler;
	}

	}
	diff --git a/src/applications/owners/mail/PackageModifyMail.php b/src/applications/owners/mail/PackageModifyMail.php
	index 740100a0ae..206fece688 100644
	--- a/src/applications/owners/mail/PackageModifyMail.php
	+++ b/src/applications/owners/mail/PackageModifyMail.php
	@@ -1,160 +1,160 @@
	<?php

	final class PackageModifyMail extends PackageMail {

	protected $addOwners;
	protected $removeOwners;
	protected $allOwners;
	protected $touchedRepos;
	protected $addPaths;
	protected $removePaths;

	public function __construct(
	PhabricatorOwnersPackage $package,
	$add_owners,
	$remove_owners,
	$all_owners,
	$touched_repos,
	$add_paths,
	$remove_paths) {

	$this->package = $package;

	$this->addOwners = $add_owners;
	$this->removeOwners = $remove_owners;
	$this->allOwners = $all_owners;
	$this->touchedRepos = $touched_repos;
	$this->addPaths = $add_paths;
	$this->removePaths = $remove_paths;
	}

	protected function getVerb() {
	return 'Modified';
	}

	protected function isNewThread() {
	return false;
	}

	protected function needSend() {
	$package = $this->getPackage();
	if ($package->getOldPrimaryOwnerPHID() !== $package->getPrimaryOwnerPHID()
	\|\| $package->getOldAuditingEnabled() != $package->getAuditingEnabled()
	\|\| $this->addOwners
	\|\| $this->removeOwners
	\|\| $this->addPaths
	\|\| $this->removePaths) {
	return true;
	} else {
	return false;
	}
	}

	protected function loadData() {
	$this->mailTo = $this->allOwners;

	$phids = array_merge(
	$this->allOwners,
	$this->touchedRepos,
	array(
	$this->getPackage()->getActorPHID(),
	));
	$this->handles = id(new PhabricatorHandleQuery())
	->setViewer($this->getActor())
	->withPHIDs($phids)
	->execute();
	}

	protected function renderDescriptionSection() {
	return null;
	}

	protected function renderPrimaryOwnerSection() {
	$package = $this->getPackage();
	$handles = $this->getHandles();

	$old_primary_owner_phid = $package->getOldPrimaryOwnerPHID();
	$primary_owner_phid = $package->getPrimaryOwnerPHID();
	if ($old_primary_owner_phid == $primary_owner_phid) {
	return null;
	}

	$section = array();
	$section[] = 'PRIMARY OWNER CHANGE';
	- $section[] = ' Old owner: ' .
	+ $section[] = ' Old owner: '.
	$handles[$old_primary_owner_phid]->getName();
	- $section[] = ' New owner: ' .
	+ $section[] = ' New owner: '.
	$handles[$primary_owner_phid]->getName();

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

	protected function renderOwnersSection() {
	$section = array();
	$add_owners = $this->addOwners;
	$remove_owners = $this->removeOwners;
	$handles = $this->getHandles();

	if ($add_owners) {
	$add_owners = array_select_keys($handles, $add_owners);
	$add_owners = mpull($add_owners, 'getName');
	$section[] = 'ADDED OWNERS';
	$section[] = ' '.implode(', ', $add_owners);
	}

	if ($remove_owners) {
	if ($add_owners) {
	$section[] = '';
	}
	$remove_owners = array_select_keys($handles, $remove_owners);
	$remove_owners = mpull($remove_owners, 'getName');
	$section[] = 'REMOVED OWNERS';
	$section[] = ' '.implode(', ', $remove_owners);
	}

	if ($section) {
	return implode("\n", $section);
	} else {
	return null;
	}
	}

	protected function renderAuditingEnabledSection() {
	$package = $this->getPackage();
	$old_auditing_enabled = $package->getOldAuditingEnabled();
	$auditing_enabled = $package->getAuditingEnabled();
	if ($old_auditing_enabled == $auditing_enabled) {
	return null;
	}

	$section = array();
	$section[] = 'AUDITING ENABLED STATUS CHANGE';
	$section[] = ' Old value: '.
	($old_auditing_enabled ? 'Enabled' : 'Disabled');
	$section[] = ' New value: '.
	($auditing_enabled ? 'Enabled' : 'Disabled');
	return implode("\n", $section);
	}

	protected function renderPathsSection() {
	$section = array();
	if ($this->addPaths) {
	$section[] = 'ADDED PATHS';
	foreach ($this->addPaths as $repository_phid => $paths) {
	$section[] = $this->renderRepoSubSection($repository_phid, $paths);
	}
	}

	if ($this->removePaths) {
	if ($this->addPaths) {
	$section[] = '';
	}
	$section[] = 'REMOVED PATHS';
	foreach ($this->removePaths as $repository_phid => $paths) {
	$section[] = $this->renderRepoSubSection($repository_phid, $paths);
	}
	}
	return implode("\n", $section);
	}

	}
	diff --git a/src/applications/owners/query/PhabricatorOwnerPathQuery.php b/src/applications/owners/query/PhabricatorOwnerPathQuery.php
	index e80e4e3e48..0e13b21bea 100644
	--- a/src/applications/owners/query/PhabricatorOwnerPathQuery.php
	+++ b/src/applications/owners/query/PhabricatorOwnerPathQuery.php
	@@ -1,32 +1,32 @@
	<?php

	final class PhabricatorOwnerPathQuery {

	public static function loadAffectedPaths(
	PhabricatorRepository $repository,
	PhabricatorRepositoryCommit $commit,
	PhabricatorUser $user) {

	$drequest = DiffusionRequest::newFromDictionary(
	array(
	'user' => $user,
	'repository' => $repository,
	'commit' => $commit->getCommitIdentifier(),
	));

	$path_query = DiffusionPathChangeQuery::newFromDiffusionRequest(
	$drequest);
	$paths = $path_query->loadChanges();

	$result = array();
	foreach ($paths as $path) {
	- $basic_path = '/' . $path->getPath();
	+ $basic_path = '/'.$path->getPath();
	if ($path->getFileType() == DifferentialChangeType::FILE_DIRECTORY) {
	- $basic_path = rtrim($basic_path, '/') . '/';
	+ $basic_path = rtrim($basic_path, '/').'/';
	}
	$result[] = $basic_path;
	}
	return $result;
	}

	}
	diff --git a/src/applications/pholio/query/PholioMockSearchEngine.php b/src/applications/pholio/query/PholioMockSearchEngine.php
	index 96b546160e..822d318f99 100644
	--- a/src/applications/pholio/query/PholioMockSearchEngine.php
	+++ b/src/applications/pholio/query/PholioMockSearchEngine.php
	@@ -1,147 +1,147 @@
	<?php

	final class PholioMockSearchEngine
	extends PhabricatorApplicationSearchEngine {

	public function getApplicationClassName() {
	return 'PhabricatorApplicationPholio';
	}

	public function buildSavedQueryFromRequest(AphrontRequest $request) {
	$saved = new PhabricatorSavedQuery();
	$saved->setParameter(
	'authorPHIDs',
	$this->readUsersFromRequest($request, 'authors'));
	$saved->setParameter(
	'statuses',
	$request->getStrList('status'));

	return $saved;
	}

	public function buildQueryFromSavedQuery(PhabricatorSavedQuery $saved) {
	$query = id(new PholioMockQuery())
	->needCoverFiles(true)
	->needImages(true)
	->needTokenCounts(true)
	->withAuthorPHIDs($saved->getParameter('authorPHIDs', array()))
	->withStatuses($saved->getParameter('statuses', array()));

	return $query;
	}

	public function buildSearchForm(
	AphrontFormView $form,
	PhabricatorSavedQuery $saved_query) {

	$phids = $saved_query->getParameter('authorPHIDs', array());
	$author_handles = id(new PhabricatorHandleQuery())
	->setViewer($this->requireViewer())
	->withPHIDs($phids)
	->execute();

	$statuses = array(
	- ''=>pht('Any Status'),
	- 'closed'=>pht('Closed'),
	- 'open'=>pht('Open'));
	+ '' => pht('Any Status'),
	+ 'closed' => pht('Closed'),
	+ 'open' => pht('Open'));

	$status = $saved_query->getParameter('statuses', array());
	$status = head($status);

	$form
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setDatasource('/typeahead/common/users/')
	->setName('authors')
	->setLabel(pht('Authors'))
	->setValue($author_handles))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Status'))
	->setName('status')
	->setOptions($statuses)
	->setValue($status));
	}

	protected function getURI($path) {
	return '/pholio/'.$path;
	}

	public function getBuiltinQueryNames() {
	$names = array(
	'open' => pht('Open Mocks'),
	'all' => pht('All Mocks'),
	);

	if ($this->requireViewer()->isLoggedIn()) {
	$names['authored'] = pht('Authored');
	}

	return $names;
	}

	public function buildSavedQueryFromBuiltin($query_key) {

	$query = $this->newSavedQuery();
	$query->setQueryKey($query_key);

	switch ($query_key) {
	case 'open':
	return $query->setParameter(
	'statuses',
	array('open'));
	case 'all':
	return $query;
	case 'authored':
	return $query->setParameter(
	'authorPHIDs',
	array($this->requireViewer()->getPHID()));
	}

	return parent::buildSavedQueryFromBuiltin($query_key);
	}

	protected function getRequiredHandlePHIDsForResultList(
	array $mocks,
	PhabricatorSavedQuery $query) {
	return mpull($mocks, 'getAuthorPHID');
	}

	protected function renderResultList(
	array $mocks,
	PhabricatorSavedQuery $query,
	array $handles) {
	assert_instances_of($mocks, 'PholioMock');

	$viewer = $this->requireViewer();

	$board = new PHUIPinboardView();
	foreach ($mocks as $mock) {

	$header = 'M'.$mock->getID().' '.$mock->getName();
	if ($mock->isClosed()) {
	$header = pht('%s (Closed)', $header);
	}

	$item = id(new PHUIPinboardItemView())
	->setHeader($header)
	->setURI('/M'.$mock->getID())
	->setImageURI($mock->getCoverFile()->getThumb280x210URI())
	->setImageSize(280, 210)
	->addIconCount('fa-picture-o', count($mock->getImages()))
	->addIconCount('fa-trophy', $mock->getTokenCount());

	if ($mock->getAuthorPHID()) {
	$author_handle = $handles[$mock->getAuthorPHID()];
	$datetime = phabricator_date($mock->getDateCreated(), $viewer);
	$item->appendChild(
	pht('By %s on %s', $author_handle->renderLink(), $datetime));
	}

	$board->addItem($item);
	}

	return $board;
	}

	}
	diff --git a/src/applications/phrequent/controller/PhrequentTrackController.php b/src/applications/phrequent/controller/PhrequentTrackController.php
	index 0dd5219d7a..b4b167550f 100644
	--- a/src/applications/phrequent/controller/PhrequentTrackController.php
	+++ b/src/applications/phrequent/controller/PhrequentTrackController.php
	@@ -1,146 +1,146 @@
	<?php

	final class PhrequentTrackController
	extends PhrequentController {

	private $verb;
	private $phid;

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

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

	$phid = $this->phid;
	$handle = id(new PhabricatorHandleQuery())
	->setViewer($user)
	->withPHIDs(array($phid))
	->executeOne();

	if (!$this->isStartingTracking() &&
	!$this->isStoppingTracking()) {
	- throw new Exception('Unrecognized verb: ' . $this->verb);
	+ throw new Exception('Unrecognized verb: '.$this->verb);
	}

	switch ($this->verb) {
	case 'start':
	$button_text = pht('Start Tracking');
	$title_text = pht('Start Tracking Time');
	$inner_text = pht('What time did you start working?');
	$action_text = pht('Start Timer');
	$label_text = pht('Start Time');
	break;
	case 'stop':
	$button_text = pht('Stop Tracking');
	$title_text = pht('Stop Tracking Time');
	$inner_text = pht('What time did you stop working?');
	$action_text = pht('Stop Timer');
	$label_text = pht('Stop Time');
	break;
	}

	$epoch_control = id(new AphrontFormDateControl())
	->setUser($user)
	->setName('epoch')
	->setLabel($action_text)
	->setValue(time());

	$err = array();

	if ($request->isDialogFormPost()) {
	$timestamp = $epoch_control->readValueFromRequest($request);
	$note = $request->getStr('note');

	if (!$epoch_control->isValid() \|\| $timestamp > time()) {
	$err[] = pht('Invalid date, please enter a valid non-future date');
	}

	if (!$err) {
	if ($this->isStartingTracking()) {
	$this->startTracking($user, $this->phid, $timestamp);
	} else if ($this->isStoppingTracking()) {
	$this->stopTracking($user, $this->phid, $timestamp, $note);
	}
	return id(new AphrontRedirectResponse());
	}

	}

	$dialog = $this->newDialog()
	->setTitle($title_text)
	->setWidth(AphrontDialogView::WIDTH_FORM);

	if ($err) {
	$dialog->setErrors($err);
	}

	$form = new PHUIFormLayoutView();
	$form
	->appendChild(hsprintf(
	'<p>%s</p><br />', $inner_text));

	$form->appendChild($epoch_control);

	if ($this->isStoppingTracking()) {
	$form
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Note'))
	->setName('note'));
	}

	$dialog->appendChild($form);

	$dialog->addCancelButton($handle->getURI());
	$dialog->addSubmitButton($action_text);

	return $dialog;
	}

	private function isStartingTracking() {
	return $this->verb === 'start';
	}

	private function isStoppingTracking() {
	return $this->verb === 'stop';
	}

	private function startTracking($user, $phid, $timestamp) {
	$usertime = new PhrequentUserTime();
	$usertime->setDateStarted($timestamp);
	$usertime->setUserPHID($user->getPHID());
	$usertime->setObjectPHID($phid);
	$usertime->save();
	}

	private function stopTracking($user, $phid, $timestamp, $note) {
	if (!PhrequentUserTimeQuery::isUserTrackingObject($user, $phid)) {
	// Don't do anything, it's not being tracked.
	return;
	}

	$usertime_dao = new PhrequentUserTime();
	$conn = $usertime_dao->establishConnection('r');

	queryfx(
	$conn,
	'UPDATE %T usertime '.
	'SET usertime.dateEnded = %d, '.
	'usertime.note = %s '.
	'WHERE usertime.userPHID = %s '.
	'AND usertime.objectPHID = %s '.
	'AND usertime.dateEnded IS NULL '.
	'ORDER BY usertime.dateStarted, usertime.id DESC '.
	'LIMIT 1',
	$usertime_dao->getTableName(),
	$timestamp,
	$note,
	$user->getPHID(),
	$phid);
	}

	}
	diff --git a/src/applications/project/controller/PhabricatorProjectEditIconController.php b/src/applications/project/controller/PhabricatorProjectEditIconController.php
	index c38baa510d..e2ad4e2bf9 100644
	--- a/src/applications/project/controller/PhabricatorProjectEditIconController.php
	+++ b/src/applications/project/controller/PhabricatorProjectEditIconController.php
	@@ -1,111 +1,111 @@
	<?php

	final class PhabricatorProjectEditIconController
	extends PhabricatorProjectController {

	private $id;

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

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

	$project = id(new PhabricatorProjectQuery())
	->setViewer($viewer)
	->withIDs(array($this->id))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$project) {
	return new Aphront404Response();
	}

	$view_uri = '/tag/'.$project->getPrimarySlug().'/';
	$edit_uri = $this->getApplicationURI('edit/'.$project->getID().'/');

	if ($request->isFormPost()) {
	$v_icon = $request->getStr('icon');
	$type_icon = PhabricatorProjectTransaction::TYPE_ICON;
	$xactions = array(id(new PhabricatorProjectTransaction())
	->setTransactionType($type_icon)
	->setNewValue($v_icon));

	$editor = id(new PhabricatorProjectTransactionEditor())
	->setActor($viewer)
	->setContentSourceFromRequest($request)
	->setContinueOnMissingFields(true)
	->setContinueOnNoEffect(true);

	$editor->applyTransactions($project, $xactions);

	return id(new AphrontReloadResponse())->setURI($edit_uri);
	}

	require_celerity_resource('project-icon-css');
	Javelin::initBehavior('phabricator-tooltips');

	$project_icons = PhabricatorProjectIcon::getIconMap();
	$ii = 0;
	$buttons = array();
	foreach ($project_icons as $icon => $label) {
	$view = id(new PHUIIconView())
	->setIconFont($icon.' bluegrey');

	$aural = javelin_tag(
	'span',
	array(
	'aural' => true,
	),
	pht('Choose "%s" Icon', $label));

	if ($icon == $project->getIcon()) {
	$class_extra = ' selected';
	- $tip = $label . pht(' - selected');
	+ $tip = $label.pht(' - selected');
	} else {
	$class_extra = null;
	$tip = $label;
	}

	$buttons[] = javelin_tag(
	'button',
	array(
	'class' => 'icon-button'.$class_extra,
	'name' => 'icon',
	'value' => $icon,
	'type' => 'submit',
	'sigil' => 'has-tooltip',
	'meta' => array(
	'tip' => $tip,
	)
	),
	array(
	$aural,
	$view,
	));
	if ((++$ii % 4) == 0) {
	$buttons[] = phutil_tag('br');
	}
	}

	$buttons = phutil_tag(
	'div',
	array(
	'class' => 'icon-grid',
	),
	$buttons);

	$dialog = id(new AphrontDialogView())
	->setUser($viewer)
	->setTitle(pht('Choose Project Icon'))
	->appendChild($buttons)
	->addCancelButton($edit_uri);

	return id(new AphrontDialogResponse())->setDialog($dialog);
	}
	}
	diff --git a/src/applications/releeph/controller/product/ReleephProductEditController.php b/src/applications/releeph/controller/product/ReleephProductEditController.php
	index bd852dcd50..855ef06530 100644
	--- a/src/applications/releeph/controller/product/ReleephProductEditController.php
	+++ b/src/applications/releeph/controller/product/ReleephProductEditController.php
	@@ -1,279 +1,279 @@
	<?php

	final class ReleephProductEditController extends ReleephProductController {

	private $productID;

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

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

	$product = id(new ReleephProductQuery())
	->setViewer($viewer)
	->withIDs(array($this->productID))
	->needArcanistProjects(true)
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$product) {
	return new Aphront404Response();
	}
	$this->setProduct($product);

	$e_name = true;
	$e_trunk_branch = true;
	$e_branch_template = false;
	$errors = array();

	$product_name = $request->getStr('name', $product->getName());

	$trunk_branch = $request->getStr('trunkBranch', $product->getTrunkBranch());
	$branch_template = $request->getStr('branchTemplate');
	if ($branch_template === null) {
	$branch_template = $product->getDetail('branchTemplate');
	}
	$pick_failure_instructions = $request->getStr('pickFailureInstructions',
	$product->getDetail('pick_failure_instructions'));
	$test_paths = $request->getStr('testPaths');
	if ($test_paths !== null) {
	$test_paths = array_filter(explode("\n", $test_paths));
	} else {
	$test_paths = $product->getDetail('testPaths', array());
	}

	$arc_project_id = $product->getArcanistProjectID();

	if ($request->isFormPost()) {
	$pusher_phids = $request->getArr('pushers');

	if (!$product_name) {
	$e_name = pht('Required');
	$errors[] =
	pht('Your releeph product should have a simple descriptive name.');
	}

	if (!$trunk_branch) {
	$e_trunk_branch = pht('Required');
	$errors[] =
	pht('You must specify which branch you will be picking from.');
	}

	$other_releeph_products = id(new ReleephProject())
	->loadAllWhere('id != %d', $product->getID());
	$other_releeph_product_names = mpull($other_releeph_products,
	'getName', 'getID');

	if (in_array($product_name, $other_releeph_product_names)) {
	$errors[] = pht('Releeph product name %s is already taken',
	$product_name);
	}

	foreach ($test_paths as $test_path) {
	$result = @preg_match($test_path, '');
	$is_a_valid_regexp = $result !== false;
	if (!$is_a_valid_regexp) {
	$errors[] = pht('Please provide a valid regular expression: '.
	'%s is not valid', $test_path);
	}
	}

	$product
	->setTrunkBranch($trunk_branch)
	->setDetail('pushers', $pusher_phids)
	->setDetail('pick_failure_instructions', $pick_failure_instructions)
	->setDetail('branchTemplate', $branch_template)
	->setDetail('testPaths', $test_paths);

	$fake_commit_handle =
	ReleephBranchTemplate::getFakeCommitHandleFor($arc_project_id);

	if ($branch_template) {
	list($branch_name, $template_errors) = id(new ReleephBranchTemplate())
	->setCommitHandle($fake_commit_handle)
	->setReleephProjectName($product_name)
	->interpolate($branch_template);

	if ($template_errors) {
	$e_branch_template = pht('Whoopsies!');
	foreach ($template_errors as $template_error) {
	$errors[] = "Template error: {$template_error}";
	}
	}
	}

	if (!$errors) {
	$product->save();

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

	$pusher_phids = $request->getArr(
	'pushers',
	$product->getDetail('pushers', array()));

	$handles = id(new PhabricatorHandleQuery())
	->setViewer($request->getUser())
	->withPHIDs($pusher_phids)
	->execute();

	$pusher_handles = array_select_keys($handles, $pusher_phids);

	$form = id(new AphrontFormView())
	->setUser($request->getUser())
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Name'))
	->setName('name')
	->setValue($product_name)
	->setError($e_name)
	->setCaption(pht('A name like "Thrift" but not "Thrift releases".')))
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel(pht('Repository'))
	->setValue(
	$product->getRepository()->getName()))
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel(pht('Arc Project'))
	->setValue(
	$product->getArcanistProject()->getName()))
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel(pht('Releeph Project PHID'))
	->setValue(
	$product->getPHID()))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Trunk'))
	->setValue($trunk_branch)
	->setName('trunkBranch')
	->setError($e_trunk_branch))
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel(pht('Pick Instructions'))
	->setValue($pick_failure_instructions)
	->setName('pickFailureInstructions')
	->setCaption(
	- pht('Instructions for pick failures, which will be used ' .
	+ pht('Instructions for pick failures, which will be used '.
	'in emails generated by failed picks')))
	->appendChild(
	id(new AphrontFormTextAreaControl())
	->setLabel(pht('Tests paths'))
	->setValue(implode("\n", $test_paths))
	->setName('testPaths')
	->setCaption(
	pht('List of strings that all test files contain in their path '.
	'in this project. One string per line. '.
	'Examples: \'__tests__\', \'/javatests/\'...')));

	$branch_template_input = id(new AphrontFormTextControl())
	->setName('branchTemplate')
	->setValue($branch_template)
	->setLabel('Branch Template')
	->setError($e_branch_template)
	->setCaption(
	pht("Leave this blank to use your installation's default."));

	$branch_template_preview = id(new ReleephBranchPreviewView())
	->setLabel(pht('Preview'))
	->addControl('template', $branch_template_input)
	->addStatic('arcProjectID', $arc_project_id)
	->addStatic('isSymbolic', false)
	->addStatic('projectName', $product->getName());

	$form
	->appendChild(
	id(new AphrontFormTokenizerControl())
	->setLabel(pht('Pushers'))
	->setName('pushers')
	->setDatasource('/typeahead/common/users/')
	->setValue($pusher_handles))
	->appendChild($branch_template_input)
	->appendChild($branch_template_preview)
	->appendRemarkupInstructions($this->getBranchHelpText());

	$form
	->appendChild(
	id(new AphrontFormSubmitControl())
	->addCancelButton('/releeph/product/')
	->setValue(pht('Save')));

	$box = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Edit Releeph Product'))
	->setFormErrors($errors)
	->appendChild($form);

	$crumbs = $this->buildApplicationCrumbs();
	$crumbs->addTextCrumb(pht('Edit Product'));

	return $this->buildStandardPageResponse(
	array(
	$crumbs,
	$box,
	),
	array(
	'title' => pht('Edit Releeph Product'),
	'device' => true,
	));
	}

	private function getBranchHelpText() {
	return <<<EOTEXT

	==== Interpolations ====

	\| Code \| Meaning
	\| ----- \| -------
	\| `%P` \| The name of your product, with spaces changed to "-".
	\| `%p` \| Like %P, but all lowercase.
	\| `%Y` \| The four digit year associated with the branch date.
	\| `%m` \| The two digit month.
	\| `%d` \| The two digit day.
	\| `%v` \| The handle of the commit where the branch was cut ("rXYZa4b3c2d1").
	\| `%V` \| The abbreviated commit id where the branch was cut ("a4b3c2d1").
	\| `%..` \| Any other sequence interpreted by `strftime()`.
	\| `%%` \| A literal percent sign.


	==== Tips for Branch Templates ====

	Use a directory to separate your release branches from other branches:

	lang=none
	releases/%Y-%M-%d-%v
	=> releases/2012-30-16-rHERGE32cd512a52b7

	Include a second hierarchy if you share your repository with other products:

	lang=none
	releases/%P/%p-release-%Y%m%d-%V
	=> releases/Tintin/tintin-release-20121116-32cd512a52b7

	Keep your branch names simple, avoiding strange punctuation, most of which is
	forbidden or escaped anyway:

	lang=none, counterexample
	releases//..clown-releases..//`date --iso=seconds`-$(sudo halt)

	Include the date early in your template, in an order which sorts properly:

	lang=none
	releases/%Y%m%d-%v
	=> releases/20121116-rHERGE32cd512a52b7 (good!)

	releases/%V-%m.%d.%Y
	=> releases/32cd512a52b7-11.16.2012 (awful!)


	EOTEXT;
	}

	}
	diff --git a/src/applications/releeph/controller/request/ReleephRequestEditController.php b/src/applications/releeph/controller/request/ReleephRequestEditController.php
	index 608ae83780..c8e74185c9 100644
	--- a/src/applications/releeph/controller/request/ReleephRequestEditController.php
	+++ b/src/applications/releeph/controller/request/ReleephRequestEditController.php
	@@ -1,313 +1,313 @@
	<?php

	final class ReleephRequestEditController extends ReleephBranchController {

	private $requestID;
	private $branchID;

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

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

	if ($this->requestID) {
	$pull = id(new ReleephRequestQuery())
	->setViewer($viewer)
	->withIDs(array($this->requestID))
	->requireCapabilities(
	array(
	PhabricatorPolicyCapability::CAN_VIEW,
	PhabricatorPolicyCapability::CAN_EDIT,
	))
	->executeOne();
	if (!$pull) {
	return new Aphront404Response();
	}

	$branch = $pull->getBranch();

	$is_edit = true;
	} else {
	$branch = id(new ReleephBranchQuery())
	->setViewer($viewer)
	->withIDs(array($this->branchID))
	->executeOne();
	if (!$branch) {
	return new Aphront404Response();
	}

	$pull = id(new ReleephRequest())
	->setRequestUserPHID($viewer->getPHID())
	->setBranchID($branch->getID())
	->setInBranch(0)
	->attachBranch($branch);

	$is_edit = false;
	}
	$this->setBranch($branch);

	$product = $branch->getProduct();

	$request_identifier = $request->getStr('requestIdentifierRaw');
	$e_request_identifier = true;

	// Load all the ReleephFieldSpecifications
	$selector = $branch->getProduct()->getReleephFieldSelector();
	$fields = $selector->getFieldSpecifications();
	foreach ($fields as $field) {
	$field
	->setReleephProject($product)
	->setReleephBranch($branch)
	->setReleephRequest($pull);
	}

	$field_list = PhabricatorCustomField::getObjectFields(
	$pull,
	PhabricatorCustomField::ROLE_EDIT);
	foreach ($field_list->getFields() as $field) {
	$field
	->setReleephProject($product)
	->setReleephBranch($branch)
	->setReleephRequest($pull);
	}
	$field_list->readFieldsFromStorage($pull);


	if ($this->branchID) {
	$cancel_uri = $this->getApplicationURI('branch/'.$this->branchID.'/');
	} else {
	$cancel_uri = '/'.$pull->getMonogram();
	}

	// Make edits
	$errors = array();
	if ($request->isFormPost()) {
	$xactions = array();

	// The commit-identifier being requested...
	if (!$is_edit) {
	if ($request_identifier ===
	ReleephRequestTypeaheadControl::PLACEHOLDER) {

	$errors[] = 'No commit ID was provided.';
	$e_request_identifier = 'Required';
	} else {
	$pr_commit = null;
	$finder = id(new ReleephCommitFinder())
	->setUser($viewer)
	->setReleephProject($product);
	try {
	$pr_commit = $finder->fromPartial($request_identifier);
	} catch (Exception $e) {
	$e_request_identifier = 'Invalid';
	$errors[] =
	"Request {$request_identifier} is probably not a valid commit";
	$errors[] = $e->getMessage();
	}

	if (!$errors) {
	$object_phid = $finder->getRequestedObjectPHID();
	if (!$object_phid) {
	$object_phid = $pr_commit->getPHID();
	}

	$pull->setRequestedObjectPHID($object_phid);
	}
	}

	if (!$errors) {
	$existing = id(new ReleephRequest())
	->loadOneWhere('requestCommitPHID = %s AND branchID = %d',
	$pr_commit->getPHID(), $branch->getID());
	if ($existing) {
	return id(new AphrontRedirectResponse())
	->setURI('/releeph/request/edit/'.$existing->getID().
	'?existing=1');
	}

	$xactions[] = id(new ReleephRequestTransaction())
	->setTransactionType(ReleephRequestTransaction::TYPE_REQUEST)
	->setNewValue($pr_commit->getPHID());

	$xactions[] = id(new ReleephRequestTransaction())
	->setTransactionType(ReleephRequestTransaction::TYPE_USER_INTENT)
	// To help hide these implicit intents...
	->setMetadataValue('isRQCreate', true)
	->setMetadataValue('userPHID', $viewer->getPHID())
	->setMetadataValue(
	'isAuthoritative',
	$product->isAuthoritative($viewer))
	->setNewValue(ReleephRequest::INTENT_WANT);
	}
	}

	// TODO: This should happen implicitly while building transactions
	// instead.
	foreach ($field_list->getFields() as $field) {
	$field->readValueFromRequest($request);
	}

	if (!$errors) {
	foreach ($fields as $field) {
	if ($field->isEditable()) {
	try {
	$data = $request->getRequestData();
	$value = idx($data, $field->getRequiredStorageKey());
	$field->validate($value);
	$xactions[] = id(new ReleephRequestTransaction())
	->setTransactionType(ReleephRequestTransaction::TYPE_EDIT_FIELD)
	->setMetadataValue('fieldClass', get_class($field))
	->setNewValue($value);
	} catch (ReleephFieldParseException $ex) {
	$errors[] = $ex->getMessage();
	}
	}
	}
	}

	if (!$errors) {
	$editor = id(new ReleephRequestTransactionalEditor())
	->setActor($viewer)
	->setContinueOnNoEffect(true)
	->setContentSourceFromRequest($request);
	$editor->applyTransactions($pull, $xactions);
	return id(new AphrontRedirectResponse())->setURI($cancel_uri);
	}
	}

	$handle_phids = array(
	$pull->getRequestUserPHID(),
	$pull->getRequestCommitPHID(),
	);
	$handle_phids = array_filter($handle_phids);
	if ($handle_phids) {
	$handles = id(new PhabricatorHandleQuery())
	->setViewer($viewer)
	->withPHIDs($handle_phids)
	->execute();
	} else {
	$handles = array();
	}

	$age_string = '';
	if ($is_edit) {
	$age_string = phabricator_format_relative_time(
	- time() - $pull->getDateCreated()) . ' ago';
	+ time() - $pull->getDateCreated()).' ago';
	}

	// Warn the user if we've been redirected here because we tried to
	// re-request something.
	$notice_view = null;
	if ($request->getInt('existing')) {
	$notice_messages = array(
	'You are editing an existing pick request!',
	hsprintf(
	'Requested %s by %s',
	$age_string,
	$handles[$pull->getRequestUserPHID()]->renderLink())
	);
	$notice_view = id(new AphrontErrorView())
	->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
	->setErrors($notice_messages);
	}

	$form = id(new AphrontFormView())
	->setUser($viewer);

	if ($is_edit) {
	$form
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel('Original Commit')
	->setValue(
	$handles[$pull->getRequestCommitPHID()]->renderLink()))
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setLabel('Requestor')
	->setValue(hsprintf(
	'%s %s',
	$handles[$pull->getRequestUserPHID()]->renderLink(),
	$age_string)));
	} else {
	$origin = null;
	$diff_rev_id = $request->getStr('D');
	if ($diff_rev_id) {
	$diff_rev = id(new DifferentialRevisionQuery())
	->setViewer($viewer)
	->withIDs(array($diff_rev_id))
	->executeOne();
	$origin = '/D'.$diff_rev->getID();
	$title = sprintf(
	'D%d: %s',
	$diff_rev_id,
	$diff_rev->getTitle());
	$form
	->addHiddenInput('requestIdentifierRaw', 'D'.$diff_rev_id)
	->appendChild(
	id(new AphrontFormStaticControl())
	->setLabel('Diff')
	->setValue($title));
	} else {
	$origin = $branch->getURI();
	$repo = $product->getRepository();
	$branch_cut_point = id(new PhabricatorRepositoryCommit())
	->loadOneWhere(
	'phid = %s',
	$branch->getCutPointCommitPHID());
	$form->appendChild(
	id(new ReleephRequestTypeaheadControl())
	->setName('requestIdentifierRaw')
	->setLabel('Commit ID')
	->setRepo($repo)
	->setValue($request_identifier)
	->setError($e_request_identifier)
	->setStartTime($branch_cut_point->getEpoch())
	->setCaption(
	'Start typing to autocomplete on commit title, '.
	'or give a Phabricator commit identifier like rFOO1234'));
	}
	}

	$field_list->appendFieldsToForm($form);

	$crumbs = $this->buildApplicationCrumbs();

	if ($is_edit) {
	$title = pht('Edit Pull Request');
	$submit_name = pht('Save');

	$crumbs->addTextCrumb($pull->getMonogram(), '/'.$pull->getMonogram());
	$crumbs->addTextCrumb(pht('Edit'));
	} else {
	$title = pht('Create Pull Request');
	$submit_name = pht('Create Pull Request');

	$crumbs->addTextCrumb(pht('New Pull Request'));
	}

	$form->appendChild(
	id(new AphrontFormSubmitControl())
	->addCancelButton($cancel_uri, 'Cancel')
	->setValue($submit_name));

	$box = id(new PHUIObjectBoxView())
	->setHeaderText($title)
	->setFormErrors($errors)
	->appendChild($form);

	return $this->buildApplicationPage(
	array(
	$crumbs,
	$notice_view,
	$box,
	),
	array(
	'title' => $title,
	'device' => true,
	));
	}
	}
	diff --git a/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php b/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php
	index 47ae324df4..a464227b85 100644
	--- a/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php
	+++ b/src/applications/settings/panel/PhabricatorSettingsPanelDisplayPreferences.php
	@@ -1,178 +1,178 @@
	<?php

	final class PhabricatorSettingsPanelDisplayPreferences
	extends PhabricatorSettingsPanel {

	public function getPanelKey() {
	return 'display';
	}

	public function getPanelName() {
	return pht('Display Preferences');
	}

	public function getPanelGroup() {
	return pht('Application Settings');
	}

	public function processRequest(AphrontRequest $request) {
	$user = $request->getUser();
	$preferences = $user->loadPreferences();

	$pref_monospaced = PhabricatorUserPreferences::PREFERENCE_MONOSPACED;
	$pref_editor = PhabricatorUserPreferences::PREFERENCE_EDITOR;
	$pref_multiedit = PhabricatorUserPreferences::PREFERENCE_MULTIEDIT;
	$pref_titles = PhabricatorUserPreferences::PREFERENCE_TITLES;
	$pref_monospaced_textareas =
	PhabricatorUserPreferences::PREFERENCE_MONOSPACED_TEXTAREAS;

	$errors = array();
	$e_editor = null;
	if ($request->isFormPost()) {
	$monospaced = $request->getStr($pref_monospaced);

	// Prevent the user from doing stupid things.
	$monospaced = preg_replace('/[^a-z0-9 ,"]+/i', '', $monospaced);

	$preferences->setPreference($pref_titles, $request->getStr($pref_titles));
	$preferences->setPreference($pref_editor, $request->getStr($pref_editor));
	$preferences->setPreference(
	$pref_multiedit,
	$request->getStr($pref_multiedit));
	$preferences->setPreference($pref_monospaced, $monospaced);
	$preferences->setPreference(
	$pref_monospaced_textareas,
	$request->getStr($pref_monospaced_textareas));

	$editor_pattern = $preferences->getPreference($pref_editor);
	if (strlen($editor_pattern)) {
	$ok = PhabricatorHelpEditorProtocolController::hasAllowedProtocol(
	$editor_pattern);
	if (!$ok) {
	$allowed_key = 'uri.allowed-editor-protocols';
	$allowed_protocols = PhabricatorEnv::getEnvConfig($allowed_key);

	$proto_names = array();
	foreach (array_keys($allowed_protocols) as $protocol) {
	$proto_names[] = $protocol.'://';
	}

	$errors[] = pht(
	'Editor link has an invalid or missing protocol. You must '.
	'use a whitelisted editor protocol from this list: %s. To '.
	'add protocols, update %s.',
	implode(', ', $proto_names),
	phutil_tag('tt', array(), $allowed_key));

	$e_editor = pht('Invalid');
	}
	}

	if (!$errors) {
	$preferences->save();
	return id(new AphrontRedirectResponse())
	->setURI($this->getPanelURI('?saved=true'));
	}
	}

	$example_string = <<<EXAMPLE
	// This is what your monospaced font currently looks like.
	function helloWorld() {
	alert("Hello world!");
	}
	EXAMPLE;

	$editor_doc_link = phutil_tag(
	'a',
	array(
	'href' => PhabricatorEnv::getDoclink(
	'User Guide: Configuring an External Editor'),
	),
	pht('User Guide: Configuring an External Editor'));

	$font_default = PhabricatorEnv::getEnvConfig('style.monospace');

	$pref_monospaced_textareas_value = $preferences
	->getPreference($pref_monospaced_textareas);
	if (!$pref_monospaced_textareas_value) {
	$pref_monospaced_textareas_value = 'disabled';
	}

	$editor_instructions = pht('Link to edit files in external editor. '.
	'%%f is replaced by filename, %%l by line number, %%r by repository '.
	'callsign, %%%% by literal %%. For documentation, see: %s',
	$editor_doc_link);

	$form = id(new AphrontFormView())
	->setUser($user)
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Page Titles'))
	->setName($pref_titles)
	->setValue($preferences->getPreference($pref_titles))
	->setOptions(
	array(
	'glyph' =>
	- pht("In page titles, show Tool names as unicode glyphs: " .
	+ pht("In page titles, show Tool names as unicode glyphs: ".
	"\xE2\x9A\x99"),
	'text' =>
	- pht('In page titles, show Tool names as plain text: ' .
	+ pht('In page titles, show Tool names as plain text: '.
	'[Differential]'),
	)))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Editor Link'))
	->setName($pref_editor)
	->setCaption($editor_instructions)
	->setError($e_editor)
	->setValue($preferences->getPreference($pref_editor)))
	->appendChild(
	id(new AphrontFormSelectControl())
	->setLabel(pht('Edit Multiple Files'))
	->setName($pref_multiedit)
	->setOptions(array(
	'' => pht('Supported (paths separated by spaces)'),
	'disable' => pht('Not Supported'),
	))
	->setValue($preferences->getPreference($pref_multiedit)))
	->appendChild(
	id(new AphrontFormTextControl())
	->setLabel(pht('Monospaced Font'))
	->setName($pref_monospaced)
	// Check plz
	->setCaption(hsprintf(
	'%s<br />(%s: %s)',
	pht('Overrides default fonts in tools like Differential.'),
	pht('Default'),
	$font_default))
	->setValue($preferences->getPreference($pref_monospaced)))
	->appendChild(
	id(new AphrontFormMarkupControl())
	->setValue(phutil_tag(
	'pre',
	array('class' => 'PhabricatorMonospaced'),
	$example_string)))
	->appendChild(
	id(new AphrontFormRadioButtonControl())
	->setLabel(pht('Monospaced Textareas'))
	->setName($pref_monospaced_textareas)
	->setValue($pref_monospaced_textareas_value)
	->addButton('enabled', pht('Enabled'),
	pht('Show all textareas using the monospaced font defined above.'))
	->addButton('disabled', pht('Disabled'), null));

	$form->appendChild(
	id(new AphrontFormSubmitControl())
	->setValue(pht('Save Preferences')));

	$form_box = id(new PHUIObjectBoxView())
	->setHeaderText(pht('Display Preferences'))
	->setFormErrors($errors)
	->setFormSaved($request->getStr('saved') === 'true')
	->setForm($form);

	return array(
	$form_box,
	);
	}
	}
	diff --git a/src/infrastructure/daemon/bot/handler/PhabricatorBotFeedNotificationHandler.php b/src/infrastructure/daemon/bot/handler/PhabricatorBotFeedNotificationHandler.php
	index 731a2d4067..81520518d9 100644
	--- a/src/infrastructure/daemon/bot/handler/PhabricatorBotFeedNotificationHandler.php
	+++ b/src/infrastructure/daemon/bot/handler/PhabricatorBotFeedNotificationHandler.php
	@@ -1,183 +1,183 @@
	<?php

	/**
	* Watches the feed and puts notifications into channel(s) of choice
	*
	* @group irc
	*/
	final class PhabricatorBotFeedNotificationHandler
	extends PhabricatorBotHandler {

	private $startupDelay = 30;
	private $lastSeenChronoKey = 0;

	private $typesNeedURI = array('DREV', 'TASK');

	private function shouldShowStory($story) {
	$story_objectphid = $story['objectPHID'];
	$story_text = $story['text'];

	$show = $this->getConfig('notification.types');

	if ($show) {
	$obj_type = phid_get_type($story_objectphid);
	if (!in_array(strtolower($obj_type), $show)) {
	return false;
	}
	}

	$verbosity = $this->getConfig('notification.verbosity', 3);

	$verbs = array();

	switch ($verbosity) {
	case 2:
	$verbs[] = array(
	'commented',
	'added',
	'changed',
	'resigned',
	'explained',
	'modified',
	'attached',
	'edited',
	'joined',
	'left',
	'removed'
	);
	// fallthrough
	case 1:
	$verbs[] = array(
	'updated',
	'accepted',
	'requested',
	'planned',
	'claimed',
	'summarized',
	'commandeered',
	'assigned'
	);
	// fallthrough
	case 0:
	$verbs[] = array(
	'created',
	'closed',
	'raised',
	'committed',
	'abandoned',
	'reclaimed',
	'reopened',
	'deleted'
	);
	break;

	case 3:
	default:
	return true;
	break;
	}

	$verbs = '/('.implode('\|', array_mergev($verbs)).')/';

	if (preg_match($verbs, $story_text)) {
	return true;
	}

	return false;
	}

	public function receiveMessage(PhabricatorBotMessage $message) {
	return;
	}

	public function runBackgroundTasks() {
	if ($this->startupDelay > 0) {
	// the event loop runs every 1s so delay enough to fully conenct
	$this->startupDelay--;

	return;
	}
	if ($this->lastSeenChronoKey == 0) {
	// Since we only want to post notifications about new stories, skip
	// everything that's happened in the past when we start up so we'll
	// only process real-time stories.
	$latest = $this->getConduit()->callMethodSynchronous(
	'feed.query',
	array(
	- 'limit'=>1
	+ 'limit' => 1,
	));

	foreach ($latest as $story) {
	if ($story['chronologicalKey'] > $this->lastSeenChronoKey) {
	$this->lastSeenChronoKey = $story['chronologicalKey'];
	}
	}

	return;
	}

	$config_max_pages = $this->getConfig('notification.max_pages', 5);
	$config_page_size = $this->getConfig('notification.page_size', 10);

	$last_seen_chrono_key = $this->lastSeenChronoKey;
	$chrono_key_cursor = 0;

	// Not efficient but works due to feed.query API
	for ($max_pages = $config_max_pages; $max_pages > 0; $max_pages--) {
	$stories = $this->getConduit()->callMethodSynchronous(
	'feed.query',
	array(
	- 'limit'=>$config_page_size,
	- 'after'=>$chrono_key_cursor,
	- 'view'=>'text'
	+ 'limit' => $config_page_size,
	+ 'after' => $chrono_key_cursor,
	+ 'view' => 'text',
	));

	foreach ($stories as $story) {
	if ($story['chronologicalKey'] == $last_seen_chrono_key) {
	// Caught up on feed
	return;
	}
	if ($story['chronologicalKey'] > $this->lastSeenChronoKey) {
	// Keep track of newest seen story
	$this->lastSeenChronoKey = $story['chronologicalKey'];
	}
	if (!$chrono_key_cursor \|\|
	$story['chronologicalKey'] < $chrono_key_cursor) {
	// Keep track of oldest story on this page
	$chrono_key_cursor = $story['chronologicalKey'];
	}

	if (!$story['text'] \|\|
	!$this->shouldShowStory($story)) {
	continue;
	}

	$message = $story['text'];

	$story_object_type = phid_get_type($story['objectPHID']);
	if (in_array($story_object_type, $this->typesNeedURI)) {
	$objects = $this->getConduit()->callMethodSynchronous(
	'phid.lookup',
	array(
	'names' => array($story['objectPHID']),
	));
	$message .= ' '.$objects[$story['objectPHID']]['uri'];
	}

	$channels = $this->getConfig('join');
	foreach ($channels as $channel_name) {

	$channel = id(new PhabricatorBotChannel())
	->setName($channel_name);

	$this->writeMessage(
	id(new PhabricatorBotMessage())
	->setCommand('MESSAGE')
	->setTarget($channel)
	->setBody($message));
	}
	}
	}
	}

	}
	diff --git a/src/infrastructure/sms/adapter/PhabricatorSMSImplementationTwilioAdapter.php b/src/infrastructure/sms/adapter/PhabricatorSMSImplementationTwilioAdapter.php
	index d5101965b5..56a91f7caf 100644
	--- a/src/infrastructure/sms/adapter/PhabricatorSMSImplementationTwilioAdapter.php
	+++ b/src/infrastructure/sms/adapter/PhabricatorSMSImplementationTwilioAdapter.php
	@@ -1,99 +1,99 @@
	<?php

	final class PhabricatorSMSImplementationTwilioAdapter
	extends PhabricatorSMSImplementationAdapter {

	public function getProviderShortName() {
	return 'twilio';
	}

	/**
	* @phutil-external-symbol class Services_Twilio
	*/
	private function buildClient() {
	$root = dirname(phutil_get_library_root('phabricator'));
	require_once $root.'/externals/twilio-php/Services/Twilio.php';
	$account_sid = PhabricatorEnv::getEnvConfig('twilio.account-sid');
	$auth_token = PhabricatorEnv::getEnvConfig('twilio.auth-token');
	return new Services_Twilio($account_sid, $auth_token);
	}

	/**
	* @phutil-external-symbol class Services_Twilio_RestException
	*/
	public function send() {
	$client = $this->buildClient();

	try {
	$message = $client->account->sms_messages->create(
	$this->formatNumberForSMS($this->getFrom()),
	$this->formatNumberForSMS($this->getTo()),
	$this->getBody(),
	array());
	} catch (Services_Twilio_RestException $e) {
	$message = sprintf(
	'HTTP Code %d: %s',
	$e->getStatus(),
	$e->getMessage());

	// Twilio tries to provide a link to more specific details if they can.
	if ($e->getInfo()) {
	$message .= sprintf(' For more information, see %s.', $e->getInfo());
	}
	throw new PhabricatorWorkerPermanentFailureException($message);
	}
	return $message;
	}

	public function getSMSDataFromResult($result) {
	return array($result->sid, $this->getSMSStatus($result->status));
	}

	public function pollSMSSentStatus(PhabricatorSMS $sms) {
	$client = $this->buildClient();
	$message = $client->account->messages->get($sms->getProviderSMSID());

	return $this->getSMSStatus($message->status);
	}

	/**
	* See https://www.twilio.com/docs/api/rest/sms#sms-status-values.
	*/
	private function getSMSStatus($twilio_status) {
	switch ($twilio_status) {
	case 'failed':
	$status = PhabricatorSMS::STATUS_FAILED;
	break;
	case 'sent':
	$status = PhabricatorSMS::STATUS_SENT;
	break;
	case 'sending':
	case 'queued':
	default:
	$status = PhabricatorSMS::STATUS_SENT_UNCONFIRMED;
	break;
	}
	return $status;
	}

	/**
	* We expect numbers to be plainly entered - i.e. the preg_replace here
	* should do nothing - but try hard to format anyway.
	*
	* Twilio uses E164 format, e.g. +15551234567
	*/
	private function formatNumberForSMS($number) {
	$number = preg_replace('/[^0-9]/', '', $number);
	$first_char = substr($number, 0, 1);
	switch ($first_char) {
	case '1':
	$prepend = '+';
	break;
	default:
	$prepend = '+1';
	break;
	}
	- return $prepend . $number;
	+ return $prepend.$number;
	}

	}
	diff --git a/src/view/control/AphrontCursorPagerView.php b/src/view/control/AphrontCursorPagerView.php
	index 59fc86493e..fe6089c4b0 100644
	--- a/src/view/control/AphrontCursorPagerView.php
	+++ b/src/view/control/AphrontCursorPagerView.php
	@@ -1,178 +1,178 @@
	<?php

	final class AphrontCursorPagerView extends AphrontView {

	private $afterID;
	private $beforeID;

	private $pageSize = 100;

	private $nextPageID;
	private $prevPageID;
	private $moreResults;

	private $uri;

	final public function setPageSize($page_size) {
	$this->pageSize = max(1, $page_size);
	return $this;
	}

	final public function getPageSize() {
	return $this->pageSize;
	}

	final public function setURI(PhutilURI $uri) {
	$this->uri = $uri;
	return $this;
	}

	final public function readFromRequest(AphrontRequest $request) {
	$this->uri = $request->getRequestURI();
	$this->afterID = $request->getStr('after');
	$this->beforeID = $request->getStr('before');
	return $this;
	}

	final public function setAfterID($after_id) {
	$this->afterID = $after_id;
	return $this;
	}

	final public function getAfterID() {
	return $this->afterID;
	}

	final public function setBeforeID($before_id) {
	$this->beforeID = $before_id;
	return $this;
	}

	final public function getBeforeID() {
	return $this->beforeID;
	}

	final public function setNextPageID($next_page_id) {
	$this->nextPageID = $next_page_id;
	return $this;
	}

	final public function getNextPageID() {
	return $this->nextPageID;
	}

	final public function setPrevPageID($prev_page_id) {
	$this->prevPageID = $prev_page_id;
	return $this;
	}

	final public function getPrevPageID() {
	return $this->prevPageID;
	}

	final public function sliceResults(array $results) {
	if (count($results) > $this->getPageSize()) {
	$offset = ($this->beforeID ? count($results) - $this->getPageSize() : 0);
	$results = array_slice($results, $offset, $this->getPageSize(), true);
	$this->moreResults = true;
	}
	return $results;
	}

	public function willShowPagingControls() {
	return $this->prevPageID \|\|
	$this->nextPageID \|\|
	$this->afterID \|\|
	($this->beforeID && $this->moreResults);
	}

	public function getFirstPageURI() {
	if (!$this->uri) {
	throw new Exception(
	pht('You must call setURI() before you can call getFirstPageURI().'));
	}

	if (!$this->afterID && !($this->beforeID && $this->moreResults)) {
	return null;
	}

	return $this->uri
	->alter('before', null)
	->alter('after', null);
	}

	public function getPrevPageURI() {
	if (!$this->uri) {
	throw new Exception(
	pht('You must call setURI() before you can call getPrevPageURI().'));
	}

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

	return $this->uri
	->alter('after', null)
	->alter('before', $this->prevPageID);
	}

	public function getNextPageURI() {
	if (!$this->uri) {
	throw new Exception(
	pht('You must call setURI() before you can call getNextPageURI().'));
	}

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

	return $this->uri
	->alter('after', $this->nextPageID)
	->alter('before', null);
	}

	public function render() {
	if (!$this->uri) {
	throw new Exception(
	pht('You must call setURI() before you can call render().'));
	}

	$links = array();

	$first_uri = $this->getFirstPageURI();
	if ($first_uri) {
	$links[] = phutil_tag(
	'a',
	array(
	'href' => $first_uri,
	),
	- "\xC2\xAB ". pht('First'));
	+ "\xC2\xAB ".pht('First'));
	}

	$prev_uri = $this->getPrevPageURI();
	if ($prev_uri) {
	$links[] = phutil_tag(
	'a',
	array(
	'href' => $prev_uri,
	),
	- "\xE2\x80\xB9 " . pht('Prev'));
	+ "\xE2\x80\xB9 ".pht('Prev'));
	}

	$next_uri = $this->getNextPageURI();
	if ($next_uri) {
	$links[] = phutil_tag(
	'a',
	array(
	'href' => $next_uri,
	),
	- pht('Next') . " \xE2\x80\xBA");
	+ pht('Next')." \xE2\x80\xBA");
	}

	return phutil_tag(
	'div',
	array('class' => 'aphront-pager-view'),
	$links);
	}

	}
	diff --git a/src/view/layout/PhabricatorSourceCodeView.php b/src/view/layout/PhabricatorSourceCodeView.php
	index 05fab2301c..4eaa6356df 100644
	--- a/src/view/layout/PhabricatorSourceCodeView.php
	+++ b/src/view/layout/PhabricatorSourceCodeView.php
	@@ -1,131 +1,131 @@
	<?php

	final class PhabricatorSourceCodeView extends AphrontView {

	private $lines;
	private $limit;
	private $uri;
	private $highlights = array();
	private $canClickHighlight = true;

	public function setLimit($limit) {
	$this->limit = $limit;
	return $this;
	}

	public function setLines(array $lines) {
	$this->lines = $lines;
	return $this;
	}

	public function setURI(PhutilURI $uri) {
	$this->uri = $uri;
	return $this;
	}

	public function setHighlights(array $array) {
	$this->highlights = array_fuse($array);
	return $this;
	}

	public function disableHighlightOnClick() {
	$this->canClickHighlight = false;
	return $this;
	}

	public function render() {
	require_celerity_resource('phabricator-source-code-view-css');
	require_celerity_resource('syntax-highlighting-css');

	Javelin::initBehavior('phabricator-oncopy', array());
	if ($this->canClickHighlight) {
	Javelin::initBehavior('phabricator-line-linker');
	}

	$line_number = 1;

	$rows = array();

	foreach ($this->lines as $line) {
	$hit_limit = $this->limit &&
	($line_number == $this->limit) &&
	(count($this->lines) != $this->limit);

	if ($hit_limit) {
	$content_number = '';
	$content_line = phutil_tag(
	'span',
	array(
	'class' => 'c',
	),
	pht('...'));
	} else {
	$content_number = $line_number;
	// NOTE: See phabricator-oncopy behavior.
	$content_line = hsprintf("\xE2\x80\x8B%s", $line);
	}

	$row_attributes = array();
	if (isset($this->highlights[$line_number])) {
	$row_attributes['class'] = 'phabricator-source-highlight';
	}

	if ($this->canClickHighlight) {
	- $line_uri = $this->uri . '$' . $line_number;
	+ $line_uri = $this->uri.'$'.$line_number;
	$line_href = (string) new PhutilURI($line_uri);

	$tag_number = javelin_tag(
	'a',
	array(
	'href' => $line_href
	),
	$line_number);
	} else {
	$tag_number = javelin_tag(
	'span',
	array(),
	$line_number);
	}

	$rows[] = phutil_tag(
	'tr',
	$row_attributes,
	array(
	javelin_tag(
	'th',
	array(
	'class' => 'phabricator-source-line',
	'sigil' => 'phabricator-source-line'
	),
	$tag_number),
	phutil_tag(
	'td',
	array(
	'class' => 'phabricator-source-code'
	),
	$content_line)));

	if ($hit_limit) {
	break;
	}

	$line_number++;
	}

	$classes = array();
	$classes[] = 'phabricator-source-code-view';
	$classes[] = 'remarkup-code';
	$classes[] = 'PhabricatorMonospaced';

	return phutil_tag_div(
	'phabricator-source-code-container',
	javelin_tag(
	'table',
	array(
	'class' => implode(' ', $classes),
	'sigil' => 'phabricator-source'
	),
	phutil_implode_html('', $rows)));
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Thu, Oct 16, 4:48 AM (1 d, 13 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 272429
Default Alt Text: (376 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions